diff options
| author | Julien Desprez <jdesprez@google.com> | 2019-06-03 10:59:12 -0700 |
|---|---|---|
| committer | Julien Desprez <jdesprez@google.com> | 2019-06-03 10:59:12 -0700 |
| commit | b31de7855a8793f624c02412bd75a83831c1d894 (patch) | |
| tree | db5fad062985cf130dfb783ec15a058e98953b6e /tests/src | |
| parent | ad7ca52458974dcdd00f8c0f3436783a53643945 (diff) | |
| parent | cd6fa02756252d903cc91f1b95b1818c7e075d84 (diff) | |
| download | tradefederation-b31de7855a8793f624c02412bd75a83831c1d894.tar.gz | |
resolve merge conflicts of cd6fa02756252d903cc91f1b95b1818c7e075d84 to pie-cts-dev
Test: I solemnly swear I tested this conflict resolution.
Bug: None
Change-Id: Iefc47affc979128432bfea23e38fcfc2cc40f4e9
Diffstat (limited to 'tests/src')
| -rw-r--r-- | tests/src/com/android/tradefed/testtype/AndroidJUnitTestTest.java | 5 |
1 files changed, 5 insertions, 0 deletions
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()); |