Index: testing/android/junit/java/src/org/chromium/testing/local/JunitTestMain.java |
diff --git a/testing/android/junit/java/src/org/chromium/testing/local/JunitTestMain.java b/testing/android/junit/java/src/org/chromium/testing/local/JunitTestMain.java |
index 3a305faff5f8dd6eb4abf8a0042acd0494b44d7c..b242a3494fbf49cd0f34c9a2b014b86a6e0bba26 100644 |
--- a/testing/android/junit/java/src/org/chromium/testing/local/JunitTestMain.java |
+++ b/testing/android/junit/java/src/org/chromium/testing/local/JunitTestMain.java |
@@ -32,10 +32,19 @@ public final class JunitTestMain { |
/** |
* Finds all classes on the class path annotated with RunWith. |
*/ |
- public static Class[] findClassesFromClasspath() { |
+ public static Class[] findClassesFromClasspath(String[] testJars) { |
String[] jarPaths = COLON.split(System.getProperty("java.class.path")); |
+ LinkedList<String> testJarPaths = new LinkedList<String>(); |
jbudorick
2015/04/02 14:21:43
I know I'm responsible for the code below that you
mikecase (-- gone --)
2015/04/02 17:11:40
Done.
|
+ for (String testJar: testJars) { |
+ for (String jarPath: jarPaths) { |
+ if (jarPath.endsWith(testJar)) { |
+ testJarPaths.add(jarPath); |
+ break; |
+ } |
+ } |
+ } |
LinkedList<Class> classes = new LinkedList<Class>(); |
- for (String jp : jarPaths) { |
+ for (String jp : testJarPaths) { |
try { |
JarFile jf = new JarFile(jp); |
for (Enumeration<JarEntry> eje = jf.entries(); eje.hasMoreElements();) { |
@@ -80,8 +89,9 @@ public final class JunitTestMain { |
core.addListener(new GtestListener(gtestLogger)); |
JsonLogger jsonLogger = new JsonLogger(parser.getJsonOutputFile()); |
core.addListener(new JsonListener(jsonLogger)); |
- Class[] classes = findClassesFromClasspath(); |
+ Class[] classes = findClassesFromClasspath(parser.getTestJars()); |
Request testRequest = Request.classes(new GtestComputer(gtestLogger), classes); |
+ |
for (String packageFilter : parser.getPackageFilters()) { |
testRequest = testRequest.filterWith(new PackageFilter(packageFilter)); |
} |