You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by wu...@apache.org on 2019/10/10 06:23:45 UTC
[skywalking] branch master updated: [test/plugin] rename the
package of testcases (#3587)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking.git
The following commit(s) were added to refs/heads/master by this push:
new 9b2672a [test/plugin] rename the package of testcases (#3587)
9b2672a is described below
commit 9b2672aa59b4f5828a3d0a9520425c17ff772fc1
Author: Daming <zt...@foxmail.com>
AuthorDate: Thu Oct 10 14:23:36 2019 +0800
[test/plugin] rename the package of testcases (#3587)
* remove profiles and rename the package
* remove profiles
---
test/plugin/run.sh | 2 +-
.../scenarios/httpclient-4.3.x-scenario/pom.xml | 88 ----------------------
.../apm/testcase/httpclient/CaseServlet.java | 2 +-
.../testcase/httpclient/HealthCheckServlet.java | 2 +-
.../httpclient/ServletForContextPropagate.java | 2 +-
.../src/main/webapp/WEB-INF/web.xml | 6 +-
6 files changed, 7 insertions(+), 95 deletions(-)
diff --git a/test/plugin/run.sh b/test/plugin/run.sh
index b11fc67..896da3a 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 9241d76..7be002d 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 33e7cc1..574fdcf 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 0731aa7..1d39d0a 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 734d80f..2a3f2a3 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 3484a78..363f224 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>