Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

checkstyle: Also check test sources

Browse Source
This commit is contained in:
Daniel Martí 2015-10-09 11:19:41 +02:00
parent 6b573db3f4
commit b60afa2dc0
13 changed files with 548 additions and 548 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
F-Droid/build.gradle
View File

@ -190,7 +190,7 @@ android {
task checkstyle(type: Checkstyle) { task checkstyle(type: Checkstyle) {
configFile file("${project.rootDir}/config/checkstyle/checkstyle.xml") configFile file("${project.rootDir}/config/checkstyle/checkstyle.xml")
source 'src' source 'src', 'test/src'
include '**/*.java' include '**/*.java'
exclude '**/gen/**' exclude '**/gen/**'

2
F-Droid/test/src/android/test/ProviderTestCase2MockContext.java
View File

@ -116,7 +116,7 @@ public abstract class ProviderTestCase2MockContext<T extends ContentProvider> ex
return mProvider; return mProvider;
} }
abstract protected Context createMockContext(Context delegate); protected abstract Context createMockContext(Context delegate);
/** /**
* Sets up the environment for the test fixture. * Sets up the environment for the test fixture.

4
F-Droid/test/src/org/fdroid/fdroid/ApkProviderHelperTest.java
View File

@ -57,7 +57,7 @@ public class ApkProviderHelperTest extends BaseApkProviderTest {
String[] projection = { String[] projection = {
ApkProvider.DataColumns.APK_ID, ApkProvider.DataColumns.APK_ID,
ApkProvider.DataColumns.VERSION_CODE ApkProvider.DataColumns.VERSION_CODE,
}; };
List<Apk> knownApks = ApkProvider.Helper.knownApks(getMockContext(), apksToCheck, projection); List<Apk> knownApks = ApkProvider.Helper.knownApks(getMockContext(), apksToCheck, projection);
@ -181,7 +181,7 @@ public class ApkProviderHelperTest extends BaseApkProviderTest {
String[] projection = { String[] projection = {
ApkProvider.DataColumns.APK_ID, ApkProvider.DataColumns.APK_ID,
ApkProvider.DataColumns.HASH ApkProvider.DataColumns.HASH,
}; };
Apk apkLessFields = ApkProvider.Helper.find(getMockContext(), "com.example", 11, projection); Apk apkLessFields = ApkProvider.Helper.find(getMockContext(), "com.example", 11, projection);

8
F-Droid/test/src/org/fdroid/fdroid/ApkProviderTest.java
View File

@ -175,10 +175,10 @@ public class ApkProviderTest extends BaseApkProviderTest {
assertCantDelete(Uri.withAppendedPath(ApkProvider.getContentUri(), "some-random-path")); assertCantDelete(Uri.withAppendedPath(ApkProvider.getContentUri(), "some-random-path"));
} }
public void testRepoApks() { private static final long REPO_KEEP = 1;
private static final long REPO_DELETE = 2;
final long REPO_KEEP = 1; public void testRepoApks() {
final long REPO_DELETE = 2;
// Insert apks into two repos, one of which we will later purge the // Insert apks into two repos, one of which we will later purge the
// the apks from. // the apks from.
@ -280,7 +280,7 @@ public class ApkProviderTest extends BaseApkProviderTest {
RepoProvider.DataColumns.ADDRESS, RepoProvider.DataColumns.ADDRESS,
RepoProvider.DataColumns.FINGERPRINT, RepoProvider.DataColumns.FINGERPRINT,
RepoProvider.DataColumns.NAME, RepoProvider.DataColumns.NAME,
RepoProvider.DataColumns.PUBLIC_KEY RepoProvider.DataColumns.PUBLIC_KEY,
}; };
for (String field : repoFields) { for (String field : repoFields) {

10
F-Droid/test/src/org/fdroid/fdroid/AppProviderTest.java
View File

@ -38,7 +38,7 @@ public class AppProviderTest extends FDroidProviderTest<AppProvider> {
protected String[] getMinimalProjection() { protected String[] getMinimalProjection() {
return new String[] { return new String[] {
AppProvider.DataColumns.APP_ID, AppProvider.DataColumns.APP_ID,
AppProvider.DataColumns.NAME AppProvider.DataColumns.NAME,
}; };
} }
@ -217,7 +217,7 @@ public class AppProviderTest extends FDroidProviderTest<AppProvider> {
// is should only ignore if "ignored version" is >= suggested // is should only ignore if "ignored version" is >= suggested
"installed, old version, ignore all", "installed, old version, ignore all",
"installed, old version, ignore latest" "installed, old version, ignore latest",
// NOT "installed, old version, ignore newer, but not latest" // NOT "installed, old version, ignore newer, but not latest"
// for the same reason as above. // for the same reason as above.
}; };
@ -305,7 +305,7 @@ public class AppProviderTest extends FDroidProviderTest<AppProvider> {
getMockContext().getResources().getString(R.string.category_All), getMockContext().getResources().getString(R.string.category_All),
"Animal", "Animal",
"Mineral", "Mineral",
"Vegetable" "Vegetable",
}; };
TestUtils.assertContainsOnly(categories, expected); TestUtils.assertContainsOnly(categories, expected);
} }
@ -323,7 +323,7 @@ public class AppProviderTest extends FDroidProviderTest<AppProvider> {
"Animal", "Animal",
"Mineral", "Mineral",
"Vegetable" "Vegetable",
}; };
TestUtils.assertContainsOnly(categories, expected); TestUtils.assertContainsOnly(categories, expected);
@ -350,7 +350,7 @@ public class AppProviderTest extends FDroidProviderTest<AppProvider> {
"Blah", "Blah",
"Test category", "Test category",
"The quick brown fox jumps over the lazy dog", "The quick brown fox jumps over the lazy dog",
"With apostrophe's" "With apostrophe's",
}; };
TestUtils.assertContainsOnly(categoriesLonger, expectedLonger); TestUtils.assertContainsOnly(categoriesLonger, expectedLonger);

2
F-Droid/test/src/org/fdroid/fdroid/BaseApkProviderTest.java
View File

@ -29,7 +29,7 @@ abstract class BaseApkProviderTest extends FDroidProviderTest<ApkProvider> {
ApkProvider.DataColumns.APK_ID, ApkProvider.DataColumns.APK_ID,
ApkProvider.DataColumns.VERSION_CODE, ApkProvider.DataColumns.VERSION_CODE,
ApkProvider.DataColumns.NAME, ApkProvider.DataColumns.NAME,
ApkProvider.DataColumns.REPO_ID ApkProvider.DataColumns.REPO_ID,
}; };
} }

2
F-Droid/test/src/org/fdroid/fdroid/InstalledAppCacheTest.java
View File

@ -28,7 +28,7 @@ public class InstalledAppCacheTest extends FDroidProviderTest<InstalledAppProvid
@Override @Override
protected String[] getMinimalProjection() { protected String[] getMinimalProjection() {
return new String[] { return new String[] {
InstalledAppProvider.DataColumns.APP_ID InstalledAppProvider.DataColumns.APP_ID,
}; };
} }

2
F-Droid/test/src/org/fdroid/fdroid/RepoXMLHandlerTest.java
View File

@ -68,7 +68,7 @@ public class RepoXMLHandlerTest extends AndroidTestCase {
"info.guardianproject.otr.app.im", "info.guardianproject.otr.app.im",
"org.torproject.android", "org.torproject.android",
"org.gege.caldavsyncadapter", "org.gege.caldavsyncadapter",
"info.guardianproject.checkey" "info.guardianproject.checkey",
}); });
} }