diff options
| author | Aaron Holden <aaronholden@google.com> | 2017-06-06 11:46:16 -0700 |
|---|---|---|
| committer | Aaron Holden <aaronholden@google.com> | 2017-06-06 19:35:30 +0000 |
| commit | a964e1c6f797020de70ac47105cb96d40bcfc042 (patch) | |
| tree | 721397baa9fae07c08f84a005b511013f27befad | |
| parent | bbf4a1332beea607a0cd5f7898367dcd120739a2 (diff) | |
| download | tradefederation-a964e1c6f797020de70ac47105cb96d40bcfc042.tar.gz | |
Remove pushed test filtering files after AndroidJUnitTest completes
bug: 35331486
Test: run unit tests
Change-Id: I98a45d2bca01708966706c66159204738c96f630
| -rw-r--r-- | src/com/android/tradefed/testtype/AndroidJUnitTest.java | 11 | ||||
| -rw-r--r-- | tests/src/com/android/tradefed/testtype/AndroidJUnitTestTest.java | 17 |
2 files changed, 26 insertions, 2 deletions
diff --git a/src/com/android/tradefed/testtype/AndroidJUnitTest.java b/src/com/android/tradefed/testtype/AndroidJUnitTest.java index 39a031972..2af7fe94d 100644 --- a/src/com/android/tradefed/testtype/AndroidJUnitTest.java +++ b/src/com/android/tradefed/testtype/AndroidJUnitTest.java @@ -231,6 +231,12 @@ public class AndroidJUnitTest extends InstrumentationTest implements IRuntimeHin return; } super.run(listener); + if (mIncludeTestFile != null) { + removeTestFile(mDeviceIncludeFile); + } + if (mExcludeTestFile != null) { + removeTestFile(mDeviceExcludeFile); + } } /** @@ -317,6 +323,11 @@ public class AndroidJUnitTest extends InstrumentationTest implements IRuntimeHin } } + private void removeTestFile(String deviceTestFile) throws DeviceNotAvailableException { + ITestDevice device = getDevice(); + device.executeShellCommand(String.format("rm %s", deviceTestFile)); + } + /** * Return if a string is the name of a Class or a Method. */ diff --git a/tests/src/com/android/tradefed/testtype/AndroidJUnitTestTest.java b/tests/src/com/android/tradefed/testtype/AndroidJUnitTestTest.java index 6a29916ea..49a85a11c 100644 --- a/tests/src/com/android/tradefed/testtype/AndroidJUnitTestTest.java +++ b/tests/src/com/android/tradefed/testtype/AndroidJUnitTestTest.java @@ -193,6 +193,8 @@ public class AndroidJUnitTestTest extends TestCase { setRunTestExpectations(); EasyMock.expect(mMockTestDevice.pushFile( EasyMock.<File>anyObject(), EasyMock.<String>anyObject())).andReturn(Boolean.TRUE); + EasyMock.expect(mMockTestDevice.executeShellCommand(EasyMock.<String>anyObject())) + .andReturn(""); EasyMock.replay(mMockRemoteRunner, mMockTestDevice); File tmpFile = FileUtil.createTempFile("testFile", ".txt"); @@ -215,6 +217,8 @@ public class AndroidJUnitTestTest extends TestCase { setRunTestExpectations(); EasyMock.expect(mMockTestDevice.pushFile( EasyMock.<File>anyObject(), EasyMock.<String>anyObject())).andReturn(Boolean.TRUE); + EasyMock.expect(mMockTestDevice.executeShellCommand(EasyMock.<String>anyObject())) + .andReturn(""); EasyMock.replay(mMockRemoteRunner, mMockTestDevice); File tmpFile = FileUtil.createTempFile("notTestFile", ".txt"); @@ -241,6 +245,9 @@ public class AndroidJUnitTestTest extends TestCase { setRunTestExpectations(); EasyMock.expect(mMockTestDevice.pushFile(EasyMock.<File>anyObject(), EasyMock.<String>anyObject())).andReturn(Boolean.TRUE).times(2); + EasyMock.expect(mMockTestDevice.executeShellCommand(EasyMock.<String>anyObject())) + .andReturn("") + .times(2); EasyMock.replay(mMockRemoteRunner, mMockTestDevice); File tmpFileInclude = FileUtil.createTempFile("includeFile", ".txt"); @@ -267,8 +274,14 @@ public class AndroidJUnitTestTest extends TestCase { mMockRemoteRunner.addInstrumentationArg( EasyMock.eq("notTestFile"), EasyMock.<String>anyObject()); setRunTestExpectations(); - EasyMock.expect(mMockTestDevice.pushFile(EasyMock.<File>anyObject(), - EasyMock.<String>anyObject())).andReturn(Boolean.TRUE).times(2); + EasyMock.expect( + mMockTestDevice.pushFile( + EasyMock.<File>anyObject(), EasyMock.<String>anyObject())) + .andReturn(Boolean.TRUE) + .times(2); + EasyMock.expect(mMockTestDevice.executeShellCommand(EasyMock.<String>anyObject())) + .andReturn("") + .times(2); EasyMock.replay(mMockRemoteRunner, mMockTestDevice); File tmpFileInclude = FileUtil.createTempFile("includeFile", ".txt"); |