From 9b2672aa59b4f5828a3d0a9520425c17ff772fc1 Mon Sep 17 00:00:00 2001
From: Daming <zteny@foxmail.com>
Date: Thu, 10 Oct 2019 14:23:36 +0800
Subject: [PATCH] [test/plugin] rename the package of testcases (#3587)

* remove profiles and rename the package

* remove profiles
---
 test/plugin/run.sh                            |  2 +-
 .../httpclient-4.3.x-scenario/pom.xml         | 88 -------------------
 .../apm/testcase/httpclient/CaseServlet.java  |  2 +-
 .../httpclient/HealthCheckServlet.java        |  2 +-
 .../ServletForContextPropagate.java           |  2 +-
 .../src/main/webapp/WEB-INF/web.xml           |  6 +-
 6 files changed, 7 insertions(+), 95 deletions(-)
 rename test/plugin/scenarios/httpclient-4.3.x-scenario/src/main/java/{test => org}/apache/skywalking/apm/testcase/httpclient/CaseServlet.java (97%)
 rename test/plugin/scenarios/httpclient-4.3.x-scenario/src/main/java/{test => org}/apache/skywalking/apm/testcase/httpclient/HealthCheckServlet.java (96%)
 rename test/plugin/scenarios/httpclient-4.3.x-scenario/src/main/java/{test => org}/apache/skywalking/apm/testcase/httpclient/ServletForContextPropagate.java (96%)

diff --git a/test/plugin/run.sh b/test/plugin/run.sh
index b11fc67d39..896da3a969 100644
--- a/test/plugin/run.sh
+++ b/test/plugin/run.sh
@@ -149,7 +149,7 @@ do
     cp ./config/expectedData.yaml ${case_work_base}/data
 
     # echo "build ${testcase_name}"
-    ${mvnw} clean package -P${testcase_name}
+    ${mvnw} clean package -Dtest.framework.version=${version}
 
     mv ./target/${scenario_name}.war ${case_work_base}
 
diff --git a/test/plugin/scenarios/httpclient-4.3.x-scenario/pom.xml b/test/plugin/scenarios/httpclient-4.3.x-scenario/pom.xml
index 9241d76e8d..7be002d608 100644
--- a/test/plugin/scenarios/httpclient-4.3.x-scenario/pom.xml
+++ b/test/plugin/scenarios/httpclient-4.3.x-scenario/pom.xml
@@ -30,7 +30,6 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <compiler.version>1.8</compiler.version>
 
-
         <test.framework>Httpclient</test.framework>
         <test.framework.version>4.3</test.framework.version>
     </properties>
@@ -61,93 +60,6 @@
         </dependency>
     </dependencies>
 
-    <profiles>
-        <profile>
-            <id>httpclient-4.3.x-scenario-4.3</id>
-            <properties>
-                <test.framework.version>4.3</test.framework.version>
-            </properties>
-        </profile>
-        <profile>
-            <id>httpclient-4.3.x-scenario-4.5.3</id>
-            <properties>
-                <test.framework.version>4.5.3</test.framework.version>
-            </properties>
-        </profile>
-        <profile>
-            <id>httpclient-4.3.x-scenario-4.5.4</id>
-            <properties>
-                <test.framework.version>4.5.4</test.framework.version>
-            </properties>
-        </profile>
-        <profile>
-            <id>httpclient-4.3.x-scenario-4.5.2</id>
-            <properties>
-                <test.framework.version>4.5.2</test.framework.version>
-            </properties>
-        </profile>
-        <profile>
-            <id>httpclient-4.3.x-scenario-4.5.1</id>
-            <properties>
-                <test.framework.version>4.5.1</test.framework.version>
-            </properties>
-        </profile>
-        <profile>
-            <id>httpclient-4.3.x-scenario-4.5</id>
-            <properties>
-                <test.framework.version>4.5</test.framework.version>
-            </properties>
-        </profile>
-        <profile>
-            <id>httpclient-4.3.x-scenario-4.4.1</id>
-            <properties>
-                <test.framework.version>4.4.1</test.framework.version>
-            </properties>
-        </profile>
-        <profile>
-            <id>httpclient-4.3.x-scenario-4.4</id>
-            <properties>
-                <test.framework.version>4.4</test.framework.version>
-            </properties>
-        </profile>
-        <profile>
-            <id>httpclient-4.3.x-scenario-4.3.6</id>
-            <properties>
-                <test.framework.version>4.3.6</test.framework.version>
-            </properties>
-        </profile>
-        <profile>
-            <id>httpclient-4.3.x-scenario-4.3.5</id>
-            <properties>
-                <test.framework.version>4.3.5</test.framework.version>
-            </properties>
-        </profile>
-        <profile>
-            <id>httpclient-4.3.x-scenario-4.3.4</id>
-            <properties>
-                <test.framework.version>4.3.4</test.framework.version>
-            </properties>
-        </profile>
-        <profile>
-            <id>httpclient-4.3.x-scenario-4.3.3</id>
-            <properties>
-                <test.framework.version>4.3.3</test.framework.version>
-            </properties>
-        </profile>
-        <profile>
-            <id>httpclient-4.3.x-scenario-4.3.2</id>
-            <properties>
-                <test.framework.version>4.3.2</test.framework.version>
-            </properties>
-        </profile>
-        <profile>
-            <id>httpclient-4.3.x-scenario-4.3.1</id>
-            <properties>
-                <test.framework.version>4.3.1</test.framework.version>
-            </properties>
-        </profile>
-    </profiles>
-
     <build>
         <finalName>httpclient-4.3.x-scenario</finalName>
         <plugins>
diff --git a/test/plugin/scenarios/httpclient-4.3.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/httpclient/CaseServlet.java b/test/plugin/scenarios/httpclient-4.3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/httpclient/CaseServlet.java
similarity index 97%
rename from test/plugin/scenarios/httpclient-4.3.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/httpclient/CaseServlet.java
rename to test/plugin/scenarios/httpclient-4.3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/httpclient/CaseServlet.java
index 33e7cc129e..574fdcfbf4 100644
--- a/test/plugin/scenarios/httpclient-4.3.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/httpclient/CaseServlet.java
+++ b/test/plugin/scenarios/httpclient-4.3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/httpclient/CaseServlet.java
@@ -16,7 +16,7 @@
  *
  */
 
-package test.apache.skywalking.apm.testcase.httpclient;
+package org.apache.skywalking.apm.testcase.httpclient;
 
 import java.io.IOException;
 import java.io.PrintWriter;
diff --git a/test/plugin/scenarios/httpclient-4.3.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/httpclient/HealthCheckServlet.java b/test/plugin/scenarios/httpclient-4.3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/httpclient/HealthCheckServlet.java
similarity index 96%
rename from test/plugin/scenarios/httpclient-4.3.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/httpclient/HealthCheckServlet.java
rename to test/plugin/scenarios/httpclient-4.3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/httpclient/HealthCheckServlet.java
index 0731aa788b..1d39d0a2ab 100644
--- a/test/plugin/scenarios/httpclient-4.3.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/httpclient/HealthCheckServlet.java
+++ b/test/plugin/scenarios/httpclient-4.3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/httpclient/HealthCheckServlet.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package test.apache.skywalking.apm.testcase.httpclient;
+package org.apache.skywalking.apm.testcase.httpclient;
 
 import java.io.IOException;
 import java.io.PrintWriter;
diff --git a/test/plugin/scenarios/httpclient-4.3.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/httpclient/ServletForContextPropagate.java b/test/plugin/scenarios/httpclient-4.3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/httpclient/ServletForContextPropagate.java
similarity index 96%
rename from test/plugin/scenarios/httpclient-4.3.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/httpclient/ServletForContextPropagate.java
rename to test/plugin/scenarios/httpclient-4.3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/httpclient/ServletForContextPropagate.java
index 734d80f0e5..2a3f2a3203 100644
--- a/test/plugin/scenarios/httpclient-4.3.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/httpclient/ServletForContextPropagate.java
+++ b/test/plugin/scenarios/httpclient-4.3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/httpclient/ServletForContextPropagate.java
@@ -16,7 +16,7 @@
  *
  */
 
-package test.apache.skywalking.apm.testcase.httpclient;
+package org.apache.skywalking.apm.testcase.httpclient;
 
 import java.io.IOException;
 import java.io.PrintWriter;
diff --git a/test/plugin/scenarios/httpclient-4.3.x-scenario/src/main/webapp/WEB-INF/web.xml b/test/plugin/scenarios/httpclient-4.3.x-scenario/src/main/webapp/WEB-INF/web.xml
index 3484a78446..363f2244c9 100644
--- a/test/plugin/scenarios/httpclient-4.3.x-scenario/src/main/webapp/WEB-INF/web.xml
+++ b/test/plugin/scenarios/httpclient-4.3.x-scenario/src/main/webapp/WEB-INF/web.xml
@@ -24,12 +24,12 @@
 
     <servlet>
         <servlet-name>caseServlet</servlet-name>
-        <servlet-class>test.apache.skywalking.apm.testcase.httpclient.CaseServlet</servlet-class>
+        <servlet-class>org.apache.skywalking.apm.testcase.httpclient.CaseServlet</servlet-class>
     </servlet>
 
     <servlet>
         <servlet-name>healthCheck</servlet-name>
-        <servlet-class>test.apache.skywalking.apm.testcase.httpclient.HealthCheckServlet</servlet-class>
+        <servlet-class>org.apache.skywalking.apm.testcase.httpclient.HealthCheckServlet</servlet-class>
     </servlet>
 
     <servlet-mapping>
@@ -44,7 +44,7 @@
 
     <servlet>
         <servlet-name>servletForContextPropagate</servlet-name>
-        <servlet-class>test.apache.skywalking.apm.testcase.httpclient.ServletForContextPropagate</servlet-class>
+        <servlet-class>org.apache.skywalking.apm.testcase.httpclient.ServletForContextPropagate</servlet-class>
     </servlet>
 
     <servlet-mapping>
-- 
GitLab