Bladeren bron

更新报告生成jar包

LiHaoyu 5 jaren geleden
bovenliggende
commit
e89773aa22

+ 1 - 1
src/main/java/net/mooctest/www/android_auto_test/Scripts/DefaultScript.java

@@ -328,7 +328,7 @@ public class DefaultScript extends AbstractBaseScript {
         InputFinder finder = new InputFinder();
         try {
             inputValue = finder.getInputValue(AddressUtil.getHumanScriptPath(),component.getResource_id());
-        } catch (IOException e) {
+        } catch (Exception e) {
             PrintUtil.print("Find input value error!", TAG, udid, myTestLogWriter, PrintUtil.ANSI_RED);
             e.printStackTrace();
         }

+ 17 - 10
src/main/java/net/mooctest/www/android_auto_test/utils/CoverageTest.java

@@ -90,7 +90,7 @@ public class CoverageTest extends Thread{
             install();
             //覆盖安装
             PrintUtil.print("Cover install", this.udid, TAG);
-            install();
+            coverInstall();
             //统计冷启动时间
             measureColdStartTime();
             PrintUtil.print("Uninstall", this.udid, TAG);
@@ -304,6 +304,20 @@ public class CoverageTest extends Thread{
         }
     }
 
+    private void coverInstall() {
+        try {
+            checkDeviceOnline();
+            String command = "adb -s " + this.udid + " install -r " + this.apkPath;
+            String msg = OsUtil.runCommand(command);
+            BufferedWriter writer = new BufferedWriter(new FileWriter(
+                    new File(this.logPath + File.separator + "CoverInstall.log"), false));
+            writer.write(msg);
+            writer.close();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
     private void measureColdStartTime() {
         checkDeviceOnline();
         String command = "adb -s " + this.udid + " shell am start -W " + this.apkInfo.getPackageName() + "/" + this.apkInfo.getLaunchableActivity();
@@ -418,15 +432,8 @@ public class CoverageTest extends Thread{
     }
 
     private void killAppAndGoHome(){
-        try {
-            String pressHomeButton = "adb -s " + udid + " shell input keyevent 3";
-            OsUtil.runCommand(pressHomeButton);
-            Thread.sleep(1500);
-            String killApp = "adb -s " + udid + " shell am kill " + this.apkInfo.getPackageName();
-            OsUtil.runCommand(killApp);
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        }
+        String killApp = "adb -s " + udid + " shell am kill " + this.apkInfo.getPackageName();
+        OsUtil.runCommand(killApp);
     }
 
     private static void stopAppiumServer(String Port) {

BIN
tasks/BugReport.jar