Replace use of deprecated TradeFed tearDown method

Stop using the deprecated tearDown overload which was changed into a no-op in go/aog/1194418. Without this fix the apps never get uninstalled from device after test, overflowing devices with small storage space.

Change-Id: Ib74199e48afb08ebf12ea5fa0922996ae72e474a
Fix: 149440355
Test: unit test, launch test

2 files changed, 7 insertions, 11 deletions

diff --git a/harness/src/main/java/com/android/compatibility/targetprep/AppSetupPreparer.java b/harness/src/main/java/com/android/compatibility/targetprep/AppSetupPreparer.java
index 2624e4f..a929bfd 100644
--- a/harness/src/main/java/com/android/compatibility/targetprep/AppSetupPreparer.java
+++ b/harness/src/main/java/com/android/compatibility/targetprep/AppSetupPreparer.java
@@ -23,6 +23,7 @@ import com.android.tradefed.build.IBuildInfo;
 import com.android.tradefed.config.Option;
 import com.android.tradefed.device.DeviceNotAvailableException;
 import com.android.tradefed.device.ITestDevice;
+import com.android.tradefed.invoker.TestInformation;
 import com.android.tradefed.targetprep.BuildError;
 import com.android.tradefed.targetprep.ITargetPreparer;
 import com.android.tradefed.targetprep.TargetSetupError;
@@ -103,9 +104,8 @@ public final class AppSetupPreparer implements ITargetPreparer {
 
     /** {@inheritDoc} */
     @Override
-    public void tearDown(ITestDevice device, IBuildInfo buildInfo, Throwable e)
-            throws DeviceNotAvailableException {
-        appInstallSetup.tearDown(device, buildInfo, e);
+    public void tearDown(TestInformation testInfo, Throwable e) throws DeviceNotAvailableException {
+        appInstallSetup.tearDown(testInfo, e);
     }
 
     private List<String> listApkFilePaths(File downloadDir) throws IOException {
diff --git a/harness/src/test/java/com/android/compatibility/targetprep/AppSetupPreparerTest.java b/harness/src/test/java/com/android/compatibility/targetprep/AppSetupPreparerTest.java
index 3307494..b154adb 100644
--- a/harness/src/test/java/com/android/compatibility/targetprep/AppSetupPreparerTest.java
+++ b/harness/src/test/java/com/android/compatibility/targetprep/AppSetupPreparerTest.java
@@ -27,6 +27,7 @@ import com.android.tradefed.build.IBuildInfo;
 import com.android.tradefed.build.BuildInfo;
 import com.android.tradefed.device.DeviceNotAvailableException;
 import com.android.tradefed.device.ITestDevice;
+import com.android.tradefed.invoker.TestInformation;
 import com.android.tradefed.targetprep.TargetSetupError;
 import com.android.tradefed.targetprep.TestAppInstallSetup;
 
@@ -39,7 +40,6 @@ import org.junit.runners.JUnit4;
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
-import java.nio.file.Path;
 import java.nio.file.Paths;
 
 @RunWith(JUnit4.class)
@@ -121,15 +121,11 @@ public class AppSetupPreparerTest {
 
     @Test
     public void tearDown() throws Exception {
-        File gcsApkDir = tempFolder.newFolder("gcs_apk_dir");
-        createPackageFile(gcsApkDir, "package_name", "apk_name_1.apk");
-        createPackageFile(gcsApkDir, "package_name", "apk_name_2.apk");
-        mBuildInfo.addBuildAttribute(OPTION_GCS_APK_DIR, gcsApkDir.getPath());
-        preparer.setUp(NULL_DEVICE, mBuildInfo);
+        TestInformation testInfo = TestInformation.newBuilder().build();
 
-        preparer.tearDown(NULL_DEVICE, mBuildInfo, mock(Throwable.class));
+        preparer.tearDown(testInfo, null);
 
-        verify(mockAppInstallSetup, times(1)).tearDown(any(), any(), any());
+        verify(mockAppInstallSetup, times(1)).tearDown(testInfo, null);
     }
 
     private File createPackageFile(File parentDir, String packageName, String apkName)