diff options
author | Brett Chabot <> | 2009-03-31 17:07:19 -0700 |
---|---|---|
committer | The Android Open Source Project <initial-contribution@android.com> | 2009-03-31 17:07:19 -0700 |
commit | 2c62f84add1fdddd51b38d0cc373be6b8b75a28b (patch) | |
tree | f6a719667d9f23adfc45c1c57e448286b6f28e6c /test-runner | |
parent | f70188aa4716625781d9952c6b883180528d4644 (diff) | |
download | frameworks_base-2c62f84add1fdddd51b38d0cc373be6b8b75a28b.zip frameworks_base-2c62f84add1fdddd51b38d0cc373be6b8b75a28b.tar.gz frameworks_base-2c62f84add1fdddd51b38d0cc373be6b8b75a28b.tar.bz2 |
AI 143872: am: CL 143870 am: CL 143869 Change InstrumentationTestRunner so all tests in the application are run when no other arguments are supplied, instead of running only tests in the app's package.
Original author: brettchabot
Merged from: //branches/cupcake/...
Original author: android-build
Merged from: //branches/donutburger/...
Automated import of CL 143872
Diffstat (limited to 'test-runner')
-rw-r--r-- | test-runner/android/test/ClassPathPackageInfoSource.java | 5 | ||||
-rw-r--r-- | test-runner/android/test/InstrumentationTestRunner.java | 15 |
2 files changed, 12 insertions, 8 deletions
diff --git a/test-runner/android/test/ClassPathPackageInfoSource.java b/test-runner/android/test/ClassPathPackageInfoSource.java index 12bc7f3..877075f 100644 --- a/test-runner/android/test/ClassPathPackageInfoSource.java +++ b/test-runner/android/test/ClassPathPackageInfoSource.java @@ -226,8 +226,11 @@ public class ClassPathPackageInfoSource { String className = apkClassNames.nextElement(); if (className.startsWith(packageName)) { + String subPackageName = packageName; int lastPackageSeparator = className.lastIndexOf('.'); - String subPackageName = className.substring(0, lastPackageSeparator); + if (lastPackageSeparator > 0) { + subPackageName = className.substring(0, lastPackageSeparator); + } if (subPackageName.length() > packageName.length()) { subpackageNames.add(subPackageName); } else if (isToplevelClass(className)) { diff --git a/test-runner/android/test/InstrumentationTestRunner.java b/test-runner/android/test/InstrumentationTestRunner.java index f038612..044f555 100644 --- a/test-runner/android/test/InstrumentationTestRunner.java +++ b/test-runner/android/test/InstrumentationTestRunner.java @@ -300,16 +300,17 @@ public class InstrumentationTestRunner extends Instrumentation implements TestSu } if (testClassesArg == null) { - TestSuite testSuite = null; if (mPackageOfTests != null) { testSuiteBuilder.includePackages(mPackageOfTests); } else { - testSuite = getTestSuite(); - testSuiteBuilder.addTestSuite(testSuite); - } - - if (testSuite == null) { - testSuiteBuilder.includePackages(getTargetContext().getPackageName()); + TestSuite testSuite = getTestSuite(); + if (testSuite != null) { + testSuiteBuilder.addTestSuite(testSuite); + } else { + // no package or class bundle arguments were supplied, and no test suite + // provided so add all tests in application + testSuiteBuilder.includePackages(""); + } } } else { parseTestClasses(testClassesArg, testSuiteBuilder); |