Bugfix: uninstall app before XCTest to clear data (#533)

microsoft · Jul 13, 2023 · 0a4cd05 · 0a4cd05
1 parent dd34de9
commit 0a4cd05
Showing 1 changed file with 8 additions and 0 deletions.
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
@@ -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) {