From b0194e90d712e95e996ed5821ec3b6c43aadc937 Mon Sep 17 00:00:00 2001 From: Julien Desprez Date: Tue, 21 May 2019 14:06:08 -0700 Subject: Ensure we don't set the Test Package if class filter file is set In case we set filter via file, ensure we unset test package to prevent conflict in the AJUR runner. Test: unit tests ./cts-tradefed run cts -m CtsLibcoreWycheproofBCTestCases ./cts-tradefed run retry --retry 0 Bug: 131611003 Change-Id: I18b3cd1d0857a6aca410940dcb06353ae4fd7a3b Merged-In: I414811186a85f87067122b42fec2f2ac4f064ef5 --- tests/src/com/android/tradefed/testtype/AndroidJUnitTestTest.java | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'tests') diff --git a/tests/src/com/android/tradefed/testtype/AndroidJUnitTestTest.java b/tests/src/com/android/tradefed/testtype/AndroidJUnitTestTest.java index 072557b9f..2a5c5658c 100644 --- a/tests/src/com/android/tradefed/testtype/AndroidJUnitTestTest.java +++ b/tests/src/com/android/tradefed/testtype/AndroidJUnitTestTest.java @@ -201,6 +201,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); @@ -255,7 +256,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()); @@ -323,7 +326,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()); -- cgit v1.2.3