diff options
| author | Paul Duffin <paulduffin@google.com> | 2017-06-27 11:09:09 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-06-27 11:09:09 +0000 |
| commit | 2d6ef698950e81567eb340d91e07b2befdf9d19a (patch) | |
| tree | 93449db8ad7a627ef96dc121e4421c8e938b9626 /test-runner/src/android/test/suitebuilder/TestGrouping.java | |
| parent | 7b02a2f41a613d8f49ea1a2fdbce4e73c167dfa4 (diff) | |
| parent | 06620ee22dca4af6646a2d0f6f25b2ecd755d9fd (diff) | |
Merge "Clean up ClassPathPackageInfoSource" am: 8c7026c5a3 am: 1c6a5ad92e am: 88d54c3080
am: 06620ee22d
Change-Id: I1a4de01fe23a03b42c052f23733d95e07135ab73
Diffstat (limited to 'test-runner/src/android/test/suitebuilder/TestGrouping.java')
| -rw-r--r-- | test-runner/src/android/test/suitebuilder/TestGrouping.java | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/test-runner/src/android/test/suitebuilder/TestGrouping.java b/test-runner/src/android/test/suitebuilder/TestGrouping.java index 307afb55e47a..030bc426ac19 100644 --- a/test-runner/src/android/test/suitebuilder/TestGrouping.java +++ b/test-runner/src/android/test/suitebuilder/TestGrouping.java @@ -16,9 +16,7 @@ package android.test.suitebuilder; -import android.test.ClassPathPackageInfo; import android.test.ClassPathPackageInfoSource; -import android.test.PackageInfoSources; import android.util.Log; import com.android.internal.util.Predicate; import junit.framework.TestCase; @@ -131,10 +129,9 @@ class TestGrouping { } private List<Class<? extends TestCase>> testCaseClassesInPackage(String packageName) { - ClassPathPackageInfoSource source = PackageInfoSources.forClassPath(classLoader); - ClassPathPackageInfo packageInfo = source.getPackageInfo(packageName); + ClassPathPackageInfoSource source = ClassPathPackageInfoSource.forClassPath(classLoader); - return selectTestClasses(packageInfo.getTopLevelClassesRecursive()); + return selectTestClasses(source.getTopLevelClassesRecursive(packageName)); } @SuppressWarnings("unchecked") |