From 0a4cd053adb89ec51ad83e3c220d86ebae8b795d Mon Sep 17 00:00:00 2001
From: Le Zhou <2428499107@qq.com>
Date: Thu, 13 Jul 2023 15:57:05 +0800
Subject: [PATCH] Bugfix: uninstall app before XCTest to clear data (#533)

---
 .../hydralab/agent/runner/xctest/XCTestRunner.java        | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/agent/src/main/java/com/microsoft/hydralab/agent/runner/xctest/XCTestRunner.java b/agent/src/main/java/com/microsoft/hydralab/agent/runner/xctest/XCTestRunner.java
index 5163771cd..3a17ce16f 100644
--- a/agent/src/main/java/com/microsoft/hydralab/agent/runner/xctest/XCTestRunner.java
+++ b/agent/src/main/java/com/microsoft/hydralab/agent/runner/xctest/XCTestRunner.java
@@ -13,6 +13,7 @@
 import com.microsoft.hydralab.common.util.Const;
 import com.microsoft.hydralab.common.util.FileUtil;
 import com.microsoft.hydralab.common.util.ShellUtils;
+import com.microsoft.hydralab.common.util.ThreadUtils;
 import com.microsoft.hydralab.performance.PerformanceTestManagementService;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -69,6 +70,13 @@ private void initializeTest(TestRunDevice testRunDevice, TestTask testTask, Test
 
     @Override
     protected void reInstallApp(TestRunDevice testRunDevice, TestTask testTask, Logger logger) {
+        checkTestTaskCancel(testTask);
+        if (testTask.getNeedUninstall()) {
+            testRunDeviceOrchestrator.uninstallApp(testRunDevice, testTask.getPkgName(), logger);
+            ThreadUtils.safeSleep(3000);
+        } else if (testTask.getNeedClearData()) {
+            testRunDeviceOrchestrator.resetPackage(testRunDevice, testTask.getPkgName(), logger);
+        }
     }
 
     private void unzipXctestFolder(File zipFile, TestRun testRun, Logger logger) {