重构自动化测试模块

HaojunRen · HaojunRen · commit fe5ff9a7938c · 2019-08-17T06:47:37.000+08:00
diff --git a/discovery-plugin-test-starter/src/main/java/com/nepxion/discovery/plugin/test/aop/TestInterceptor.java b/discovery-plugin-test-starter/src/main/java/com/nepxion/discovery/plugin/test/aop/TestInterceptor.java
@@ -21,7 +21,7 @@
 import com.nepxion.discovery.plugin.test.annotation.DTest;
 import com.nepxion.discovery.plugin.test.annotation.DTestConfig;
 import com.nepxion.discovery.plugin.test.constant.TestConstant;
-import com.nepxion.discovery.plugin.test.gray.TestOperation;
+import com.nepxion.discovery.plugin.test.operation.TestOperation;
 import com.nepxion.matrix.proxy.aop.AbstractInterceptor;
 
 public class TestInterceptor extends AbstractInterceptor {
@@ -30,8 +30,8 @@ public class TestInterceptor extends AbstractInterceptor {
     @Autowired
     private TestOperation testOperation;
 
-    @Value("${" + TestConstant.SPRING_APPLICATION_TEST_GRAY_AWAIT_TIME + ":3000}")
-    private Integer awaitTime;
+    @Value("${" + TestConstant.SPRING_APPLICATION_TEST_CONFIG_OPERATION_AWAIT_TIME + ":3000}")
+    private Integer configOperationAwaitTime;
 
     @Override
     public Object invoke(MethodInvocation invocation) throws Throwable {
@@ -63,7 +63,7 @@ public Object invoke(MethodInvocation invocation) throws Throwable {
 
                 testOperation.update(group, serviceId, executePath);
 
-                Thread.sleep(awaitTime);
+                Thread.sleep(configOperationAwaitTime);
 
                 try {
                     object = invocation.proceed();
@@ -74,7 +74,7 @@ public Object invoke(MethodInvocation invocation) throws Throwable {
                         testOperation.clear(group, serviceId);
                     }
 
-                    Thread.sleep(awaitTime);
+                    Thread.sleep(configOperationAwaitTime);
                 }
             }
 
diff --git a/discovery-plugin-test-starter/src/main/java/com/nepxion/discovery/plugin/test/configuration/TestAutoConfiguration.java b/discovery-plugin-test-starter/src/main/java/com/nepxion/discovery/plugin/test/configuration/TestAutoConfiguration.java
@@ -19,7 +19,7 @@
 import com.nepxion.discovery.plugin.test.aop.TestAutoScanProxy;
 import com.nepxion.discovery.plugin.test.aop.TestInterceptor;
 import com.nepxion.discovery.plugin.test.constant.TestConstant;
-import com.nepxion.discovery.plugin.test.gray.TestOperation;
+import com.nepxion.discovery.plugin.test.operation.TestOperation;
 
 @Configuration
 public class TestAutoConfiguration {
diff --git a/discovery-plugin-test-starter/src/main/java/com/nepxion/discovery/plugin/test/constant/TestConstant.java b/discovery-plugin-test-starter/src/main/java/com/nepxion/discovery/plugin/test/constant/TestConstant.java
@@ -11,9 +11,9 @@
 
 public class TestConstant {
     public static final String SPRING_APPLICATION_TEST_SCAN_PACKAGES = "spring.application.test.scan.packages";
-    public static final String SPRING_APPLICATION_TEST_GRAY_CONFIGCENTER_ENABLED = "spring.application.test.gray.configcenter.enabled";
-    public static final String SPRING_APPLICATION_TEST_GRAY_CONFIG_PRINT_ENABLED = "spring.application.test.gray.config.print.enabled";
-    public static final String SPRING_APPLICATION_TEST_GRAY_AWAIT_TIME = "spring.application.test.gray.await.time";
+    public static final String SPRING_APPLICATION_TEST_CONFIGCENTER_ENABLED = "spring.application.test.configcenter.enabled";
+    public static final String SPRING_APPLICATION_TEST_CONFIG_PRINT_ENABLED = "spring.application.test.config.print.enabled";
+    public static final String SPRING_APPLICATION_TEST_CONFIG_OPERATION_AWAIT_TIME = "spring.application.test.config.operation.await.time";
     public static final String SPRING_APPLICATION_TEST_CONSOLE_URL = "spring.application.test.console.url";
 
     public static final String REMOTE_UPDATE_URL = "console/remote-config/update";
diff --git a/discovery-plugin-test-starter/src/main/java/com/nepxion/discovery/plugin/test/operation/TestOperation.java b/discovery-plugin-test-starter/src/main/java/com/nepxion/discovery/plugin/test/operation/TestOperation.java
@@ -1,4 +1,4 @@
-package com.nepxion.discovery.plugin.test.gray;
+package com.nepxion.discovery.plugin.test.operation;
 
 /**
  * <p>Title: Nepxion Discovery</p>
@@ -29,10 +29,10 @@ public class TestOperation {
     @Value("${" + TestConstant.SPRING_APPLICATION_TEST_CONSOLE_URL + "}")
     private String consoleUrl;
 
-    @Value("${" + TestConstant.SPRING_APPLICATION_TEST_GRAY_CONFIGCENTER_ENABLED + ":true}")
+    @Value("${" + TestConstant.SPRING_APPLICATION_TEST_CONFIGCENTER_ENABLED + ":true}")
     private Boolean configCenterEnabled;
 
-    @Value("${" + TestConstant.SPRING_APPLICATION_TEST_GRAY_CONFIG_PRINT_ENABLED + ":true}")
+    @Value("${" + TestConstant.SPRING_APPLICATION_TEST_CONFIG_PRINT_ENABLED + ":true}")
     private Boolean configPrintEnabled;
 
     @Autowired
