diff options
| -rw-r--r-- | src/com/android/tradefed/testtype/AndroidJUnitTest.java | 4 | ||||
| -rw-r--r-- | tests/src/com/android/tradefed/testtype/AndroidJUnitTestTest.java | 5 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/com/android/tradefed/testtype/AndroidJUnitTest.java b/src/com/android/tradefed/testtype/AndroidJUnitTest.java index df3a55554..8eb5cf0d9 100644 --- a/src/com/android/tradefed/testtype/AndroidJUnitTest.java +++ b/src/com/android/tradefed/testtype/AndroidJUnitTest.java @@ -242,10 +242,12 @@ public class AndroidJUnitTest extends InstrumentationTest implements IRuntimeHin } boolean pushedFile = false; // if mIncludeTestFile is set, perform filtering with this file - if (mIncludeTestFile != null) { + if (mIncludeTestFile != null && mIncludeTestFile.length() > 0) { mDeviceIncludeFile = mTestFilterDir.replaceAll("/$", "") + "/" + INCLUDE_FILE; pushTestFile(mIncludeTestFile, mDeviceIncludeFile, listener); pushedFile = true; + // If an explicit include file filter is provided, do not use the package + setTestPackageName(null); } // if mExcludeTestFile is set, perform filtering with this file diff --git a/tests/src/com/android/tradefed/testtype/AndroidJUnitTestTest.java b/tests/src/com/android/tradefed/testtype/AndroidJUnitTestTest.java index 223dba0a7..07a70962c 100644 --- a/tests/src/com/android/tradefed/testtype/AndroidJUnitTestTest.java +++ b/tests/src/com/android/tradefed/testtype/AndroidJUnitTestTest.java @@ -208,6 +208,7 @@ public class AndroidJUnitTestTest extends TestCase { EasyMock.replay(mMockRemoteRunner, mMockTestDevice); File tmpFile = FileUtil.createTempFile("testFile", ".txt"); + FileUtil.writeToFile(TEST1.toString(), tmpFile); try { mAndroidJUnitTest.setIncludeTestFile(tmpFile); mAndroidJUnitTest.run(mMockListener); @@ -264,7 +265,9 @@ public class AndroidJUnitTestTest extends TestCase { EasyMock.replay(mMockRemoteRunner, mMockTestDevice); File tmpFileInclude = FileUtil.createTempFile("includeFile", ".txt"); + FileUtil.writeToFile(TEST1.toString(), tmpFileInclude); File tmpFileExclude = FileUtil.createTempFile("excludeFile", ".txt"); + FileUtil.writeToFile(TEST2.toString(), tmpFileExclude); try { mAndroidJUnitTest.addIncludeFilter(TEST1.getClassName()); mAndroidJUnitTest.addExcludeFilter(TEST2.toString()); @@ -333,7 +336,9 @@ public class AndroidJUnitTestTest extends TestCase { EasyMock.replay(mMockRemoteRunner, mMockTestDevice); File tmpFileInclude = FileUtil.createTempFile("includeFile", ".txt"); + FileUtil.writeToFile(TEST1.toString(), tmpFileInclude); File tmpFileExclude = FileUtil.createTempFile("excludeFile", ".txt"); + FileUtil.writeToFile(TEST2.toString(), tmpFileExclude); try { OptionSetter setter = new OptionSetter(mAndroidJUnitTest); setter.setOptionValue("test-file-include-filter", tmpFileInclude.getAbsolutePath()); |