diff options
author | Julien Desprez <jdesprez@google.com> | 2021-02-24 17:55:25 -0800 |
---|---|---|
committer | Yiming Pan <yimingpan@google.com> | 2021-04-20 18:16:34 +0000 |
commit | 9eee1bbdaa7b1ce0b29b75d7c3b05b343fa33f8d (patch) | |
tree | 2e8d93b4b8e18babce68b263dc58f613bfa1b138 | |
parent | 7a2410e629ddf11f5faea02e97495d4501f1a9c1 (diff) | |
download | tradefederation-9eee1bbdaa7b1ce0b29b75d7c3b05b343fa33f8d.tar.gz |
Change a test to be robust to env.
* delete a duplicated coverage test
* Avoid using a random file, instead create a tmp
file location for the test.
Test: unit tests
Bug; 181171606
Change-Id: I62a74c025a01accc23f06aa62c65bc23fb0ec07f
(cherry picked from commit 64d813b195d54c302bc43e51b7369836ba1ffb35)
-rw-r--r-- | tests/src/com/android/tradefed/device/contentprovider/ContentProviderHandlerTest.java | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/tests/src/com/android/tradefed/device/contentprovider/ContentProviderHandlerTest.java b/tests/src/com/android/tradefed/device/contentprovider/ContentProviderHandlerTest.java index a9f453352..e72b23a21 100644 --- a/tests/src/com/android/tradefed/device/contentprovider/ContentProviderHandlerTest.java +++ b/tests/src/com/android/tradefed/device/contentprovider/ContentProviderHandlerTest.java @@ -190,28 +190,16 @@ public class ContentProviderHandlerTest { /** Test {@link ContentProviderHandler#pullFile(String, File)}. */ @Test public void testPullFile_createLocalFileIfNotExist() throws Exception { - File pullTo = new File("content-provider-test.txt"); + File pullTo = FileUtil.createTempFile("content-provider-test", ".txt"); + // Delete to test unexisting file. + pullTo.delete(); String devicePath = "path/somewhere/file.txt"; mockPullFileSuccess(); try { assertFalse(pullTo.exists()); - mProvider.pullFile(devicePath, pullTo); - assertTrue(pullTo.exists()); - } finally { - FileUtil.deleteFile(pullTo); - } - } - - /** Test {@link ContentProviderHandler#pullFile(String, File)}. */ - @Test - public void testPullFile_success() throws Exception { - File pullTo = new File("content-provider-test.txt"); - String devicePath = "path/somewhere/file.txt"; - - try { - mockPullFileSuccess(); assertTrue(mProvider.pullFile(devicePath, pullTo)); + assertTrue(pullTo.exists()); } finally { FileUtil.deleteFile(pullTo); } |