commit 1771ae1d176bd2d40ae508435cc16af8cea0b427
author Yuexi Ma <yuexima@google.com> Mon Dec 20 15:24:54 2021 -0800
committer Yuexi Ma <yuexima@google.com> Wed Dec 22 10:56:48 2021 -0800
tree 33aa587055a105fd8870b358e47aea97eccac1f1
parent 9dc50a9f327eb7e7891366cef3dea1b3ce309eaf

Move a method mock to setUp in an unit test

It makes more sense to mock the device serial in the setUp.

Test: presubmit
Change-Id: I1d48ae994c50bee8aaf15bba2162fda9782423fa

harness/src/test/java/com/android/csuite/core/AppCrawlTesterTest.java

diff --git a/harness/src/test/java/com/android/csuite/core/AppCrawlTesterTest.java b/harness/src/test/java/com/android/csuite/core/AppCrawlTesterTest.java
index 53b22e0..22c6cc4 100644
--- a/harness/src/test/java/com/android/csuite/core/AppCrawlTesterTest.java
+++ b/harness/src/test/java/com/android/csuite/core/AppCrawlTesterTest.java
@@ -65,6 +65,7 @@
 
     @Before
     public void setUp() throws Exception {
+        Mockito.when(mDevice.getSerialNumber()).thenReturn("serial");
         mTestInfo = createTestInfo();
         mTestUtils = createTestUtils();
     }
@@ -384,7 +385,6 @@
 
     private AppCrawlTester createPreparedTestSubject(Path apkPath)
             throws IOException, ConfigurationException, TargetSetupError {
-        Mockito.when(mDevice.getSerialNumber()).thenReturn("serial");
         simulatePreparerWasExecutedSuccessfully();
         Mockito.when(mRunUtil.runTimedCmd(Mockito.anyLong(), ArgumentMatchers.<String>any()))
                 .thenReturn(createSuccessfulCommandResult());