Add TestRunThreadContext and move ITestRun to the same package. (#233)

* Add TestRunThreadContext and move ITestRun to the same package.

* Reserve the method invoke point

* add copy right

Co-authored-by: shbu <shaopeng@microsoft.com>

Author: hydraxman

agent/src/main/java/com/microsoft/hydralab/agent/runner/TestRunner.java

@@ -57,6 +57,7 @@ public void runTestOnDevice(TestTask testTask, DeviceInfo deviceInfo, Logger log
 
     private void runByFutureTask(DeviceInfo deviceInfo, TestTask testTask, TestRun testRun) throws Exception {
         FutureTask<String> futureTask = new FutureTask<>(() -> {
+            initTestRunThreadContext(testRun);
             run(deviceInfo, testTask, testRun);
             return null;
         });
@@ -74,6 +75,14 @@ private void runByFutureTask(DeviceInfo deviceInfo, TestTask testTask, TestRun t
         }
     }
 
+    /**
+     * TODO Call {@link TestRunThreadContext#init(ITestRun)}
+     * This method must be called in the test run execution thread.
+     */
+    private void initTestRunThreadContext(TestRun testRun) {
+
+    }
+
     private static void saveErrorSummary(TestRun testRun, Exception e) {
         String errorStr = e.getClass().getName() + ": " + e.getMessage();
         if (errorStr.length() > 255) {
@@ -201,7 +210,7 @@ protected void reInstallApp(DeviceInfo deviceInfo, TestTask testTask, Logger rep
     }
 
     protected void reInstallTestApp(DeviceInfo deviceInfo, TestTask testTask, Logger reportLogger) throws Exception {
-        if(!shouldInstallTestPackageAsApp()){
+        if (!shouldInstallTestPackageAsApp()) {
             return;
         }
         if (testTask.getTestAppFile() == null) {

common/src/main/java/com/microsoft/hydralab/common/entity/common/TestRun.java

@@ -4,7 +4,7 @@
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.microsoft.hydralab.ITestRun;
+import com.microsoft.hydralab.agent.runner.ITestRun;
 import com.microsoft.hydralab.common.util.Const;
 import lombok.Data;
 import org.slf4j.Logger;

common/src/main/java/com/microsoft/hydralab/performance/PerformanceTestManagementService.java

@@ -1,6 +1,9 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
 package com.microsoft.hydralab.performance;
 
-import com.microsoft.hydralab.ITestRun;
+import com.microsoft.hydralab.agent.runner.ITestRun;
+import com.microsoft.hydralab.agent.runner.TestRunThreadContext;
 import com.microsoft.hydralab.performance.inspectors.AndroidBatteryInfoInspector;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.util.Assert;
@@ -52,11 +55,10 @@ private static PerformanceTestResult createPerformanceTestResult(PerformanceInsp
     }
 
     /**
-     * TODO
      * @return the test run object from TestRunThreadContext
      */
     private ITestRun getTestRun() {
-        return null;
+        return TestRunThreadContext.getTestRun();
     }
 
     @Override

sdk/src/main/java/com/microsoft/hydralab/ITestRun.java renamed to sdk/src/main/java/com/microsoft/hydralab/agent/runner/ITestRun.java

@@ -1,4 +1,4 @@
-package com.microsoft.hydralab;
+package com.microsoft.hydralab.agent.runner;
 
 import java.io.File;
 

sdk/src/main/java/com/microsoft/hydralab/agent/runner/TestRunThreadContext.java

@@ -0,0 +1,28 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+package com.microsoft.hydralab.agent.runner;
+
+/**
+ * We will gradually deprecate ThreadParam and AppiumParam, and migrate to this.
+ *
+ */
+public class TestRunThreadContext {
+    private static final InheritableThreadLocal<ITestRun> testRunThreadLocal = new InheritableThreadLocal<>();
+
+    /**
+     * Should be called in the TestRunner setup lifecycle
+     * @param testRun
+     */
+    static void init(ITestRun testRun) {
+        clean();
+        testRunThreadLocal.set(testRun);
+    }
+
+    public static void clean() {
+        testRunThreadLocal.remove();
+    }
+
+    public static ITestRun getTestRun() {
+        return testRunThreadLocal.get();
+    }
+}