This is an automated email from the ASF dual-hosted git repository. wujimin pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-java-chassis.git
commit 108288e41df417bf7bf42bfcfc35c76a28e26ef1 Author: zhengyangyong <[email protected]> AuthorDate: Fri May 11 14:47:03 2018 +0800 SCB-548 reorganization springmvc it (spring-springmvc-tests and springmvc-tests) make four independent module in order to eliminate disturbance(from gracefully shutdown) Signed-off-by: zhengyangyong <[email protected]> --- .../core/TestCseApplicationListener.java | 3 ++ integration-tests/pom.xml | 1 - integration-tests/springmvc-tests/pom.xml | 12 +++++- .../{ => springmvc-tests-common}/pom.xml | 46 ++-------------------- .../tests/SpringMvcIntegrationTestBase.java | 2 +- .../tests/endpoints/CodeFirstSpringmvc.java | 0 .../tests/endpoints/CodeFirstSpringmvcBase.java | 0 ...eFirstSpringmvcSimplifiedMappingAnnotation.java | 0 .../springmvc/tests/endpoints/ControllerBase.java | 0 .../springmvc/tests/endpoints/ControllerImpl.java | 0 .../ControllerSimplifiedMappingAnnotationImpl.java | 0 .../endpoints/EnglishGreetingRestEndpoint.java | 0 .../endpoints/EnglishGreetingRestEndpointBase.java | 0 ...ingSimplifiedMappingAnnotationRestEndpoint.java | 0 .../endpoints/FrenchGreetingRestEndpoint.java | 0 .../endpoints/FrenchGreetingRestEndpointBase.java | 0 ...ingSimplifiedMappingAnnotationRestEndpoint.java | 0 .../pom.xml | 29 +++----------- .../tests/SpringMvcSpringIntegrationTest.java | 7 +++- .../demo/springmvc/tests/SpringMvcSpringMain.java | 0 .../src/test/resources/log4j.properties | 0 .../src/test/resources/microservice.yaml | 0 .../src/test/resources/registry.yaml | 0 .../springmvc-tests-general}/pom.xml | 45 +++------------------ .../tests/RawSpringMvcIntegrationTest.java | 3 ++ .../demo/springmvc/tests/SpringMvcTestMain.java | 0 .../src/test/resources/microservice.yaml | 0 .../src/test/resources/registry.yaml | 0 .../pom.xml | 29 +++----------- .../demo/springmvc/tests/SpringMvcSpringMain.java | 0 ...SimplifiedMappingAnnotationIntegrationTest.java | 7 +++- .../src/test/resources/log4j.properties | 0 .../src/test/resources/microservice.yaml | 0 .../src/test/resources/registry.yaml | 0 .../springmvc-tests-simplified-mapping}/pom.xml | 45 +++------------------ ...SimplifiedMappingAnnotationIntegrationTest.java | 3 ++ .../demo/springmvc/tests/SpringMvcTestMain.java | 0 .../src/test/resources/microservice.yaml | 0 .../src/test/resources/registry.yaml | 0 39 files changed, 59 insertions(+), 173 deletions(-) diff --git a/core/src/test/java/org/apache/servicecomb/core/TestCseApplicationListener.java b/core/src/test/java/org/apache/servicecomb/core/TestCseApplicationListener.java index e5eaec8..43fd873 100644 --- a/core/src/test/java/org/apache/servicecomb/core/TestCseApplicationListener.java +++ b/core/src/test/java/org/apache/servicecomb/core/TestCseApplicationListener.java @@ -35,6 +35,7 @@ import org.apache.servicecomb.core.BootListener.BootEvent; import org.apache.servicecomb.core.BootListener.EventType; import org.apache.servicecomb.core.definition.loader.SchemaListenerManager; import org.apache.servicecomb.core.endpoint.AbstractEndpointsCache; +import org.apache.servicecomb.core.handler.ShutdownHookHandler; import org.apache.servicecomb.core.provider.consumer.ConsumerProviderManager; import org.apache.servicecomb.core.provider.consumer.ReferenceConfigUtils; import org.apache.servicecomb.core.provider.producer.ProducerProviderManager; @@ -167,6 +168,8 @@ public class TestCseApplicationListener { CseApplicationListener cal = new CseApplicationListener(); ContextClosedEvent event = new ContextClosedEvent(context); + ShutdownHookHandler.INSTANCE.ALL_INVOCATION_FINISHED.release(); + List<EventType> eventTypes = new ArrayList<>(); BootListener bootListener = e -> { eventTypes.add(e.getEventType()); diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index 52c37a2..62152e4 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -37,7 +37,6 @@ <module>test-common</module> <module>spring-jaxrs-tests</module> <module>pojo-test</module> - <module>spring-springmvc-tests</module> <module>spring-zuul-tracing-tests</module> <module>spring-pojo-tests</module> <module>dynamic-config-tests</module> diff --git a/integration-tests/springmvc-tests/pom.xml b/integration-tests/springmvc-tests/pom.xml index ba4f674..8b907a2 100644 --- a/integration-tests/springmvc-tests/pom.xml +++ b/integration-tests/springmvc-tests/pom.xml @@ -27,7 +27,17 @@ <modelVersion>4.0.0</modelVersion> <artifactId>springmvc-tests</artifactId> - <name>Java Chassis::Integration Tests::Raw Spring MVC</name> + <packaging>pom</packaging> + <name>Java Chassis::Integration Tests::Spring MVC</name> + + <modules> + <module>springmvc-tests-common</module> + <module>springmvc-tests-general</module> + <module>springmvc-tests-simplified-mapping</module> + <module>springmvc-tests-general-with-springboot</module> + <module>springmvc-tests-simplified-mapping-with-springboot</module> + </modules> + <dependencies> <dependency> <groupId>org.apache.servicecomb.demo</groupId> diff --git a/integration-tests/springmvc-tests/pom.xml b/integration-tests/springmvc-tests/springmvc-tests-common/pom.xml similarity index 50% copy from integration-tests/springmvc-tests/pom.xml copy to integration-tests/springmvc-tests/springmvc-tests-common/pom.xml index ba4f674..885d512 100644 --- a/integration-tests/springmvc-tests/pom.xml +++ b/integration-tests/springmvc-tests/springmvc-tests-common/pom.xml @@ -20,51 +20,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <parent> - <artifactId>integration-tests</artifactId> + <artifactId>springmvc-tests</artifactId> <groupId>org.apache.servicecomb.tests</groupId> <version>1.0.0-m2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <artifactId>springmvc-tests</artifactId> - <name>Java Chassis::Integration Tests::Raw Spring MVC</name> - <dependencies> - <dependency> - <groupId>org.apache.servicecomb.demo</groupId> - <artifactId>demo-schema</artifactId> - <exclusions> - <exclusion> - <groupId>org.apache.servicecomb.demo</groupId> - <artifactId>demo-signature</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.servicecomb</groupId> - <artifactId>provider-springmvc</artifactId> - </dependency> - </dependencies> + <name>Java Chassis::Integration Tests::Spring MVC Common</name> + <artifactId>springmvc-tests-common</artifactId> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>test-jar</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <forkCount>1</forkCount> - </configuration> - </plugin> - </plugins> - </build> -</project> +</project> \ No newline at end of file diff --git a/integration-tests/springmvc-tests/src/test/java/org/apache/servicecomb/demo/springmvc/tests/SpringMvcIntegrationTestBase.java b/integration-tests/springmvc-tests/springmvc-tests-common/src/test/java/org/apache/servicecomb/demo/springmvc/tests/SpringMvcIntegrationTestBase.java similarity index 99% rename from integration-tests/springmvc-tests/src/test/java/org/apache/servicecomb/demo/springmvc/tests/SpringMvcIntegrationTestBase.java rename to integration-tests/springmvc-tests/springmvc-tests-common/src/test/java/org/apache/servicecomb/demo/springmvc/tests/SpringMvcIntegrationTestBase.java index 611916c..6d3fdf9 100644 --- a/integration-tests/springmvc-tests/src/test/java/org/apache/servicecomb/demo/springmvc/tests/SpringMvcIntegrationTestBase.java +++ b/integration-tests/springmvc-tests/springmvc-tests-common/src/test/java/org/apache/servicecomb/demo/springmvc/tests/SpringMvcIntegrationTestBase.java @@ -84,7 +84,7 @@ public class SpringMvcIntegrationTestBase { private final String controllerUrl = baseUrl + "springmvc/controller/"; - static void setUpLocalRegistry() { + public static void setUpLocalRegistry() { ClassLoader loader = Thread.currentThread().getContextClassLoader(); URL resource = loader.getResource("registry.yaml"); assert resource != null; diff --git a/integration-tests/springmvc-tests/src/test/java/org/apache/servicecomb/demo/springmvc/tests/endpoints/CodeFirstSpringmvc.java b/integration-tests/springmvc-tests/springmvc-tests-common/src/test/java/org/apache/servicecomb/demo/springmvc/tests/endpoints/CodeFirstSpringmvc.java similarity index 100% rename from integration-tests/springmvc-tests/src/test/java/org/apache/servicecomb/demo/springmvc/tests/endpoints/CodeFirstSpringmvc.java rename to integration-tests/springmvc-tests/springmvc-tests-common/src/test/java/org/apache/servicecomb/demo/springmvc/tests/endpoints/CodeFirstSpringmvc.java diff --git a/integration-tests/springmvc-tests/src/test/java/org/apache/servicecomb/demo/springmvc/tests/endpoints/CodeFirstSpringmvcBase.java b/integration-tests/springmvc-tests/springmvc-tests-common/src/test/java/org/apache/servicecomb/demo/springmvc/tests/endpoints/CodeFirstSpringmvcBase.java similarity index 100% rename from integration-tests/springmvc-tests/src/test/java/org/apache/servicecomb/demo/springmvc/tests/endpoints/CodeFirstSpringmvcBase.java rename to integration-tests/springmvc-tests/springmvc-tests-common/src/test/java/org/apache/servicecomb/demo/springmvc/tests/endpoints/CodeFirstSpringmvcBase.java diff --git a/integration-tests/springmvc-tests/src/test/java/org/apache/servicecomb/demo/springmvc/tests/endpoints/CodeFirstSpringmvcSimplifiedMappingAnnotation.java b/integration-tests/springmvc-tests/springmvc-tests-common/src/test/java/org/apache/servicecomb/demo/springmvc/tests/endpoints/CodeFirstSpringmvcSimplifiedMappingAnnotation.java similarity index 100% rename from integration-tests/springmvc-tests/src/test/java/org/apache/servicecomb/demo/springmvc/tests/endpoints/CodeFirstSpringmvcSimplifiedMappingAnnotation.java rename to integration-tests/springmvc-tests/springmvc-tests-common/src/test/java/org/apache/servicecomb/demo/springmvc/tests/endpoints/CodeFirstSpringmvcSimplifiedMappingAnnotation.java diff --git a/integration-tests/springmvc-tests/src/test/java/org/apache/servicecomb/demo/springmvc/tests/endpoints/ControllerBase.java b/integration-tests/springmvc-tests/springmvc-tests-common/src/test/java/org/apache/servicecomb/demo/springmvc/tests/endpoints/ControllerBase.java similarity index 100% rename from integration-tests/springmvc-tests/src/test/java/org/apache/servicecomb/demo/springmvc/tests/endpoints/ControllerBase.java rename to integration-tests/springmvc-tests/springmvc-tests-common/src/test/java/org/apache/servicecomb/demo/springmvc/tests/endpoints/ControllerBase.java diff --git a/integration-tests/springmvc-tests/src/test/java/org/apache/servicecomb/demo/springmvc/tests/endpoints/ControllerImpl.java b/integration-tests/springmvc-tests/springmvc-tests-common/src/test/java/org/apache/servicecomb/demo/springmvc/tests/endpoints/ControllerImpl.java similarity index 100% rename from integration-tests/springmvc-tests/src/test/java/org/apache/servicecomb/demo/springmvc/tests/endpoints/ControllerImpl.java rename to integration-tests/springmvc-tests/springmvc-tests-common/src/test/java/org/apache/servicecomb/demo/springmvc/tests/endpoints/ControllerImpl.java diff --git a/integration-tests/springmvc-tests/src/test/java/org/apache/servicecomb/demo/springmvc/tests/endpoints/ControllerSimplifiedMappingAnnotationImpl.java b/integration-tests/springmvc-tests/springmvc-tests-common/src/test/java/org/apache/servicecomb/demo/springmvc/tests/endpoints/ControllerSimplifiedMappingAnnotationImpl.java similarity index 100% rename from integration-tests/springmvc-tests/src/test/java/org/apache/servicecomb/demo/springmvc/tests/endpoints/ControllerSimplifiedMappingAnnotationImpl.java rename to integration-tests/springmvc-tests/springmvc-tests-common/src/test/java/org/apache/servicecomb/demo/springmvc/tests/endpoints/ControllerSimplifiedMappingAnnotationImpl.java diff --git a/integration-tests/springmvc-tests/src/test/java/org/apache/servicecomb/demo/springmvc/tests/endpoints/EnglishGreetingRestEndpoint.java b/integration-tests/springmvc-tests/springmvc-tests-common/src/test/java/org/apache/servicecomb/demo/springmvc/tests/endpoints/EnglishGreetingRestEndpoint.java similarity index 100% rename from integration-tests/springmvc-tests/src/test/java/org/apache/servicecomb/demo/springmvc/tests/endpoints/EnglishGreetingRestEndpoint.java rename to integration-tests/springmvc-tests/springmvc-tests-common/src/test/java/org/apache/servicecomb/demo/springmvc/tests/endpoints/EnglishGreetingRestEndpoint.java diff --git a/integration-tests/springmvc-tests/src/test/java/org/apache/servicecomb/demo/springmvc/tests/endpoints/EnglishGreetingRestEndpointBase.java b/integration-tests/springmvc-tests/springmvc-tests-common/src/test/java/org/apache/servicecomb/demo/springmvc/tests/endpoints/EnglishGreetingRestEndpointBase.java similarity index 100% rename from integration-tests/springmvc-tests/src/test/java/org/apache/servicecomb/demo/springmvc/tests/endpoints/EnglishGreetingRestEndpointBase.java rename to integration-tests/springmvc-tests/springmvc-tests-common/src/test/java/org/apache/servicecomb/demo/springmvc/tests/endpoints/EnglishGreetingRestEndpointBase.java diff --git a/integration-tests/springmvc-tests/src/test/java/org/apache/servicecomb/demo/springmvc/tests/endpoints/EnglishGreetingSimplifiedMappingAnnotationRestEndpoint.java b/integration-tests/springmvc-tests/springmvc-tests-common/src/test/java/org/apache/servicecomb/demo/springmvc/tests/endpoints/EnglishGreetingSimplifiedMappingAnnotationRestEndpoint.java similarity index 100% rename from integration-tests/springmvc-tests/src/test/java/org/apache/servicecomb/demo/springmvc/tests/endpoints/EnglishGreetingSimplifiedMappingAnnotationRestEndpoint.java rename to integration-tests/springmvc-tests/springmvc-tests-common/src/test/java/org/apache/servicecomb/demo/springmvc/tests/endpoints/EnglishGreetingSimplifiedMappingAnnotationRestEndpoint.java diff --git a/integration-tests/springmvc-tests/src/test/java/org/apache/servicecomb/demo/springmvc/tests/endpoints/FrenchGreetingRestEndpoint.java b/integration-tests/springmvc-tests/springmvc-tests-common/src/test/java/org/apache/servicecomb/demo/springmvc/tests/endpoints/FrenchGreetingRestEndpoint.java similarity index 100% rename from integration-tests/springmvc-tests/src/test/java/org/apache/servicecomb/demo/springmvc/tests/endpoints/FrenchGreetingRestEndpoint.java rename to integration-tests/springmvc-tests/springmvc-tests-common/src/test/java/org/apache/servicecomb/demo/springmvc/tests/endpoints/FrenchGreetingRestEndpoint.java diff --git a/integration-tests/springmvc-tests/src/test/java/org/apache/servicecomb/demo/springmvc/tests/endpoints/FrenchGreetingRestEndpointBase.java b/integration-tests/springmvc-tests/springmvc-tests-common/src/test/java/org/apache/servicecomb/demo/springmvc/tests/endpoints/FrenchGreetingRestEndpointBase.java similarity index 100% rename from integration-tests/springmvc-tests/src/test/java/org/apache/servicecomb/demo/springmvc/tests/endpoints/FrenchGreetingRestEndpointBase.java rename to integration-tests/springmvc-tests/springmvc-tests-common/src/test/java/org/apache/servicecomb/demo/springmvc/tests/endpoints/FrenchGreetingRestEndpointBase.java diff --git a/integration-tests/springmvc-tests/src/test/java/org/apache/servicecomb/demo/springmvc/tests/endpoints/FrenchGreetingSimplifiedMappingAnnotationRestEndpoint.java b/integration-tests/springmvc-tests/springmvc-tests-common/src/test/java/org/apache/servicecomb/demo/springmvc/tests/endpoints/FrenchGreetingSimplifiedMappingAnnotationRestEndpoint.java similarity index 100% rename from integration-tests/springmvc-tests/src/test/java/org/apache/servicecomb/demo/springmvc/tests/endpoints/FrenchGreetingSimplifiedMappingAnnotationRestEndpoint.java rename to integration-tests/springmvc-tests/springmvc-tests-common/src/test/java/org/apache/servicecomb/demo/springmvc/tests/endpoints/FrenchGreetingSimplifiedMappingAnnotationRestEndpoint.java diff --git a/integration-tests/spring-springmvc-tests/pom.xml b/integration-tests/springmvc-tests/springmvc-tests-general-with-springboot/pom.xml similarity index 74% copy from integration-tests/spring-springmvc-tests/pom.xml copy to integration-tests/springmvc-tests/springmvc-tests-general-with-springboot/pom.xml index 2840574..6832ba8 100644 --- a/integration-tests/spring-springmvc-tests/pom.xml +++ b/integration-tests/springmvc-tests/springmvc-tests-general-with-springboot/pom.xml @@ -20,26 +20,21 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <parent> - <artifactId>integration-tests</artifactId> + <artifactId>springmvc-tests</artifactId> <groupId>org.apache.servicecomb.tests</groupId> <version>1.0.0-m2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <artifactId>spring-springmvc-tests</artifactId> - <name>Java Chassis::Integration Tests::Spring MVC</name> + <name>Java Chassis::Integration Tests::Spring MVC General With Spring Boot</name> + <artifactId>springmvc-tests-general-with-springboot</artifactId> + <dependencies> <dependency> <groupId>org.apache.servicecomb.tests</groupId> - <artifactId>springmvc-tests</artifactId> + <artifactId>springmvc-tests-common</artifactId> <version>1.0.0-m2-SNAPSHOT</version> <type>test-jar</type> - <exclusions> - <exclusion> - <groupId>org.apache.servicecomb.demo</groupId> - <artifactId>demo-signature</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.apache.servicecomb</groupId> @@ -59,16 +54,4 @@ </dependency> </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <forkCount>1</forkCount> - </configuration> - </plugin> - </plugins> - </build> - -</project> +</project> \ No newline at end of file diff --git a/integration-tests/spring-springmvc-tests/src/test/java/org/apache/servicecomb/demo/springmvc/tests/SpringMvcSpringIntegrationTest.java b/integration-tests/springmvc-tests/springmvc-tests-general-with-springboot/src/test/java/org/apache/servicecomb/demo/springmvc/tests/SpringMvcSpringIntegrationTest.java similarity index 87% rename from integration-tests/spring-springmvc-tests/src/test/java/org/apache/servicecomb/demo/springmvc/tests/SpringMvcSpringIntegrationTest.java rename to integration-tests/springmvc-tests/springmvc-tests-general-with-springboot/src/test/java/org/apache/servicecomb/demo/springmvc/tests/SpringMvcSpringIntegrationTest.java index 75d6693..c0caef6 100644 --- a/integration-tests/spring-springmvc-tests/src/test/java/org/apache/servicecomb/demo/springmvc/tests/SpringMvcSpringIntegrationTest.java +++ b/integration-tests/springmvc-tests/springmvc-tests-general-with-springboot/src/test/java/org/apache/servicecomb/demo/springmvc/tests/SpringMvcSpringIntegrationTest.java @@ -17,6 +17,7 @@ package org.apache.servicecomb.demo.springmvc.tests; +import org.apache.servicecomb.core.handler.ShutdownHookHandler; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.runner.RunWith; @@ -29,14 +30,16 @@ public class SpringMvcSpringIntegrationTest extends SpringMvcIntegrationTestBase private static ConfigurableApplicationContext context; @BeforeClass - public static void init() throws Exception { + public static void init() { System.setProperty("cse.uploads.directory", "/tmp"); setUpLocalRegistry(); context = SpringApplication.run(SpringMvcSpringMain.class); } @AfterClass - public static void shutdown() throws Exception { + public static void shutdown() { + //sim system.exit(0) + ShutdownHookHandler.INSTANCE.ALL_INVOCATION_FINISHED.release(); context.close(); } } diff --git a/integration-tests/spring-springmvc-tests/src/test/java/org/apache/servicecomb/demo/springmvc/tests/SpringMvcSpringMain.java b/integration-tests/springmvc-tests/springmvc-tests-general-with-springboot/src/test/java/org/apache/servicecomb/demo/springmvc/tests/SpringMvcSpringMain.java similarity index 100% copy from integration-tests/spring-springmvc-tests/src/test/java/org/apache/servicecomb/demo/springmvc/tests/SpringMvcSpringMain.java copy to integration-tests/springmvc-tests/springmvc-tests-general-with-springboot/src/test/java/org/apache/servicecomb/demo/springmvc/tests/SpringMvcSpringMain.java diff --git a/integration-tests/spring-springmvc-tests/src/test/resources/log4j.properties b/integration-tests/springmvc-tests/springmvc-tests-general-with-springboot/src/test/resources/log4j.properties similarity index 100% copy from integration-tests/spring-springmvc-tests/src/test/resources/log4j.properties copy to integration-tests/springmvc-tests/springmvc-tests-general-with-springboot/src/test/resources/log4j.properties diff --git a/integration-tests/springmvc-tests/src/test/resources/microservice.yaml b/integration-tests/springmvc-tests/springmvc-tests-general-with-springboot/src/test/resources/microservice.yaml similarity index 100% copy from integration-tests/springmvc-tests/src/test/resources/microservice.yaml copy to integration-tests/springmvc-tests/springmvc-tests-general-with-springboot/src/test/resources/microservice.yaml diff --git a/integration-tests/springmvc-tests/src/test/resources/registry.yaml b/integration-tests/springmvc-tests/springmvc-tests-general-with-springboot/src/test/resources/registry.yaml similarity index 100% copy from integration-tests/springmvc-tests/src/test/resources/registry.yaml copy to integration-tests/springmvc-tests/springmvc-tests-general-with-springboot/src/test/resources/registry.yaml diff --git a/integration-tests/spring-springmvc-tests/pom.xml b/integration-tests/springmvc-tests/springmvc-tests-general/pom.xml similarity index 54% copy from integration-tests/spring-springmvc-tests/pom.xml copy to integration-tests/springmvc-tests/springmvc-tests-general/pom.xml index 2840574..6b07517 100644 --- a/integration-tests/spring-springmvc-tests/pom.xml +++ b/integration-tests/springmvc-tests/springmvc-tests-general/pom.xml @@ -20,55 +20,22 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <parent> - <artifactId>integration-tests</artifactId> + <artifactId>springmvc-tests</artifactId> <groupId>org.apache.servicecomb.tests</groupId> <version>1.0.0-m2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <artifactId>spring-springmvc-tests</artifactId> - <name>Java Chassis::Integration Tests::Spring MVC</name> + <name>Java Chassis::Integration Tests::Spring MVC General</name> + <artifactId>springmvc-tests-general</artifactId> + <dependencies> <dependency> <groupId>org.apache.servicecomb.tests</groupId> - <artifactId>springmvc-tests</artifactId> + <artifactId>springmvc-tests-common</artifactId> <version>1.0.0-m2-SNAPSHOT</version> <type>test-jar</type> - <exclusions> - <exclusion> - <groupId>org.apache.servicecomb.demo</groupId> - <artifactId>demo-signature</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.servicecomb</groupId> - <artifactId>spring-boot-starter-provider</artifactId> - </dependency> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-test</artifactId> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-test</artifactId> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-validator</artifactId> </dependency> </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <forkCount>1</forkCount> - </configuration> - </plugin> - </plugins> - </build> - -</project> +</project> \ No newline at end of file diff --git a/integration-tests/springmvc-tests/src/test/java/org/apache/servicecomb/demo/springmvc/tests/RawSpringMvcIntegrationTest.java b/integration-tests/springmvc-tests/springmvc-tests-general/src/test/java/org/apache/servicecomb/demo/springmvc/tests/RawSpringMvcIntegrationTest.java similarity index 91% rename from integration-tests/springmvc-tests/src/test/java/org/apache/servicecomb/demo/springmvc/tests/RawSpringMvcIntegrationTest.java rename to integration-tests/springmvc-tests/springmvc-tests-general/src/test/java/org/apache/servicecomb/demo/springmvc/tests/RawSpringMvcIntegrationTest.java index 7149755..c0fc7e3 100644 --- a/integration-tests/springmvc-tests/src/test/java/org/apache/servicecomb/demo/springmvc/tests/RawSpringMvcIntegrationTest.java +++ b/integration-tests/springmvc-tests/springmvc-tests-general/src/test/java/org/apache/servicecomb/demo/springmvc/tests/RawSpringMvcIntegrationTest.java @@ -18,6 +18,7 @@ package org.apache.servicecomb.demo.springmvc.tests; import org.apache.servicecomb.core.CseApplicationListener; +import org.apache.servicecomb.core.handler.ShutdownHookHandler; import org.apache.servicecomb.foundation.common.utils.BeanUtils; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -34,6 +35,8 @@ public class RawSpringMvcIntegrationTest extends SpringMvcIntegrationTestBase { @AfterClass public static void shutdown() { + //sim system.exit(0) + ShutdownHookHandler.INSTANCE.ALL_INVOCATION_FINISHED.release(); CseApplicationListener cal = BeanUtils.getBean("org.apache.servicecomb.core.CseApplicationListener"); ContextClosedEvent event = new ContextClosedEvent(BeanUtils.getContext()); cal.onApplicationEvent(event); diff --git a/integration-tests/springmvc-tests/src/test/java/org/apache/servicecomb/demo/springmvc/tests/SpringMvcTestMain.java b/integration-tests/springmvc-tests/springmvc-tests-general/src/test/java/org/apache/servicecomb/demo/springmvc/tests/SpringMvcTestMain.java similarity index 100% copy from integration-tests/springmvc-tests/src/test/java/org/apache/servicecomb/demo/springmvc/tests/SpringMvcTestMain.java copy to integration-tests/springmvc-tests/springmvc-tests-general/src/test/java/org/apache/servicecomb/demo/springmvc/tests/SpringMvcTestMain.java diff --git a/integration-tests/springmvc-tests/src/test/resources/microservice.yaml b/integration-tests/springmvc-tests/springmvc-tests-general/src/test/resources/microservice.yaml similarity index 100% copy from integration-tests/springmvc-tests/src/test/resources/microservice.yaml copy to integration-tests/springmvc-tests/springmvc-tests-general/src/test/resources/microservice.yaml diff --git a/integration-tests/springmvc-tests/src/test/resources/registry.yaml b/integration-tests/springmvc-tests/springmvc-tests-general/src/test/resources/registry.yaml similarity index 100% copy from integration-tests/springmvc-tests/src/test/resources/registry.yaml copy to integration-tests/springmvc-tests/springmvc-tests-general/src/test/resources/registry.yaml diff --git a/integration-tests/spring-springmvc-tests/pom.xml b/integration-tests/springmvc-tests/springmvc-tests-simplified-mapping-with-springboot/pom.xml similarity index 74% copy from integration-tests/spring-springmvc-tests/pom.xml copy to integration-tests/springmvc-tests/springmvc-tests-simplified-mapping-with-springboot/pom.xml index 2840574..a98aea3 100644 --- a/integration-tests/spring-springmvc-tests/pom.xml +++ b/integration-tests/springmvc-tests/springmvc-tests-simplified-mapping-with-springboot/pom.xml @@ -20,26 +20,21 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <parent> - <artifactId>integration-tests</artifactId> + <artifactId>springmvc-tests</artifactId> <groupId>org.apache.servicecomb.tests</groupId> <version>1.0.0-m2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <artifactId>spring-springmvc-tests</artifactId> - <name>Java Chassis::Integration Tests::Spring MVC</name> + <name>Java Chassis::Integration Tests::Spring MVC Simplified Mapping With Spring Boot</name> + <artifactId>springmvc-tests-simplified-mapping-with-springboot</artifactId> + <dependencies> <dependency> <groupId>org.apache.servicecomb.tests</groupId> - <artifactId>springmvc-tests</artifactId> + <artifactId>springmvc-tests-common</artifactId> <version>1.0.0-m2-SNAPSHOT</version> <type>test-jar</type> - <exclusions> - <exclusion> - <groupId>org.apache.servicecomb.demo</groupId> - <artifactId>demo-signature</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.apache.servicecomb</groupId> @@ -59,16 +54,4 @@ </dependency> </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <forkCount>1</forkCount> - </configuration> - </plugin> - </plugins> - </build> - -</project> +</project> \ No newline at end of file diff --git a/integration-tests/spring-springmvc-tests/src/test/java/org/apache/servicecomb/demo/springmvc/tests/SpringMvcSpringMain.java b/integration-tests/springmvc-tests/springmvc-tests-simplified-mapping-with-springboot/src/test/java/org/apache/servicecomb/demo/springmvc/tests/SpringMvcSpringMain.java similarity index 100% rename from integration-tests/spring-springmvc-tests/src/test/java/org/apache/servicecomb/demo/springmvc/tests/SpringMvcSpringMain.java rename to integration-tests/springmvc-tests/springmvc-tests-simplified-mapping-with-springboot/src/test/java/org/apache/servicecomb/demo/springmvc/tests/SpringMvcSpringMain.java diff --git a/integration-tests/spring-springmvc-tests/src/test/java/org/apache/servicecomb/demo/springmvc/tests/SpringMvcSpringSimplifiedMappingAnnotationIntegrationTest.java b/integration-tests/springmvc-tests/springmvc-tests-simplified-mapping-with-springboot/src/test/java/org/apache/servicecomb/demo/springmvc/tests/SpringMvcSpringSimplifiedMappingAnnotationIntegrationTest.java similarity index 87% rename from integration-tests/spring-springmvc-tests/src/test/java/org/apache/servicecomb/demo/springmvc/tests/SpringMvcSpringSimplifiedMappingAnnotationIntegrationTest.java rename to integration-tests/springmvc-tests/springmvc-tests-simplified-mapping-with-springboot/src/test/java/org/apache/servicecomb/demo/springmvc/tests/SpringMvcSpringSimplifiedMappingAnnotationIntegrationTest.java index 089d3d0..dfc0ca8 100644 --- a/integration-tests/spring-springmvc-tests/src/test/java/org/apache/servicecomb/demo/springmvc/tests/SpringMvcSpringSimplifiedMappingAnnotationIntegrationTest.java +++ b/integration-tests/springmvc-tests/springmvc-tests-simplified-mapping-with-springboot/src/test/java/org/apache/servicecomb/demo/springmvc/tests/SpringMvcSpringSimplifiedMappingAnnotationIntegrationTest.java @@ -17,6 +17,7 @@ package org.apache.servicecomb.demo.springmvc.tests; +import org.apache.servicecomb.core.handler.ShutdownHookHandler; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.runner.RunWith; @@ -29,7 +30,7 @@ public class SpringMvcSpringSimplifiedMappingAnnotationIntegrationTest extends S private static ConfigurableApplicationContext context; @BeforeClass - public static void init() throws Exception { + public static void init() { System.setProperty("spring.profiles.active", "SimplifiedMapping"); System.setProperty("cse.uploads.directory", "/tmp"); setUpLocalRegistry(); @@ -37,7 +38,9 @@ public class SpringMvcSpringSimplifiedMappingAnnotationIntegrationTest extends S } @AfterClass - public static void shutdown() throws Exception { + public static void shutdown() { + //sim system.exit(0) + ShutdownHookHandler.INSTANCE.ALL_INVOCATION_FINISHED.release(); context.close(); } } diff --git a/integration-tests/spring-springmvc-tests/src/test/resources/log4j.properties b/integration-tests/springmvc-tests/springmvc-tests-simplified-mapping-with-springboot/src/test/resources/log4j.properties similarity index 100% rename from integration-tests/spring-springmvc-tests/src/test/resources/log4j.properties rename to integration-tests/springmvc-tests/springmvc-tests-simplified-mapping-with-springboot/src/test/resources/log4j.properties diff --git a/integration-tests/springmvc-tests/src/test/resources/microservice.yaml b/integration-tests/springmvc-tests/springmvc-tests-simplified-mapping-with-springboot/src/test/resources/microservice.yaml similarity index 100% copy from integration-tests/springmvc-tests/src/test/resources/microservice.yaml copy to integration-tests/springmvc-tests/springmvc-tests-simplified-mapping-with-springboot/src/test/resources/microservice.yaml diff --git a/integration-tests/springmvc-tests/src/test/resources/registry.yaml b/integration-tests/springmvc-tests/springmvc-tests-simplified-mapping-with-springboot/src/test/resources/registry.yaml similarity index 100% copy from integration-tests/springmvc-tests/src/test/resources/registry.yaml copy to integration-tests/springmvc-tests/springmvc-tests-simplified-mapping-with-springboot/src/test/resources/registry.yaml diff --git a/integration-tests/spring-springmvc-tests/pom.xml b/integration-tests/springmvc-tests/springmvc-tests-simplified-mapping/pom.xml similarity index 54% rename from integration-tests/spring-springmvc-tests/pom.xml rename to integration-tests/springmvc-tests/springmvc-tests-simplified-mapping/pom.xml index 2840574..1940d98 100644 --- a/integration-tests/spring-springmvc-tests/pom.xml +++ b/integration-tests/springmvc-tests/springmvc-tests-simplified-mapping/pom.xml @@ -20,55 +20,22 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <parent> - <artifactId>integration-tests</artifactId> + <artifactId>springmvc-tests</artifactId> <groupId>org.apache.servicecomb.tests</groupId> <version>1.0.0-m2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <artifactId>spring-springmvc-tests</artifactId> - <name>Java Chassis::Integration Tests::Spring MVC</name> + <name>Java Chassis::Integration Tests::Spring MVC Simplified Mapping</name> + <artifactId>springmvc-tests-simplified-mapping</artifactId> + <dependencies> <dependency> <groupId>org.apache.servicecomb.tests</groupId> - <artifactId>springmvc-tests</artifactId> + <artifactId>springmvc-tests-common</artifactId> <version>1.0.0-m2-SNAPSHOT</version> <type>test-jar</type> - <exclusions> - <exclusion> - <groupId>org.apache.servicecomb.demo</groupId> - <artifactId>demo-signature</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.servicecomb</groupId> - <artifactId>spring-boot-starter-provider</artifactId> - </dependency> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-test</artifactId> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-test</artifactId> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-validator</artifactId> </dependency> </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <forkCount>1</forkCount> - </configuration> - </plugin> - </plugins> - </build> - -</project> +</project> \ No newline at end of file diff --git a/integration-tests/springmvc-tests/src/test/java/org/apache/servicecomb/demo/springmvc/tests/RawSpringMvcSimplifiedMappingAnnotationIntegrationTest.java b/integration-tests/springmvc-tests/springmvc-tests-simplified-mapping/src/test/java/org/apache/servicecomb/demo/springmvc/tests/RawSpringMvcSimplifiedMappingAnnotationIntegrationTest.java similarity index 91% rename from integration-tests/springmvc-tests/src/test/java/org/apache/servicecomb/demo/springmvc/tests/RawSpringMvcSimplifiedMappingAnnotationIntegrationTest.java rename to integration-tests/springmvc-tests/springmvc-tests-simplified-mapping/src/test/java/org/apache/servicecomb/demo/springmvc/tests/RawSpringMvcSimplifiedMappingAnnotationIntegrationTest.java index f25f080..d6d2cfc 100644 --- a/integration-tests/springmvc-tests/src/test/java/org/apache/servicecomb/demo/springmvc/tests/RawSpringMvcSimplifiedMappingAnnotationIntegrationTest.java +++ b/integration-tests/springmvc-tests/springmvc-tests-simplified-mapping/src/test/java/org/apache/servicecomb/demo/springmvc/tests/RawSpringMvcSimplifiedMappingAnnotationIntegrationTest.java @@ -18,6 +18,7 @@ package org.apache.servicecomb.demo.springmvc.tests; import org.apache.servicecomb.core.CseApplicationListener; +import org.apache.servicecomb.core.handler.ShutdownHookHandler; import org.apache.servicecomb.foundation.common.utils.BeanUtils; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -35,6 +36,8 @@ public class RawSpringMvcSimplifiedMappingAnnotationIntegrationTest extends Spri @AfterClass public static void shutdown() { + //sim system.exit(0) + ShutdownHookHandler.INSTANCE.ALL_INVOCATION_FINISHED.release(); CseApplicationListener cal = BeanUtils.getBean("org.apache.servicecomb.core.CseApplicationListener"); ContextClosedEvent event = new ContextClosedEvent(BeanUtils.getContext()); cal.onApplicationEvent(event); diff --git a/integration-tests/springmvc-tests/src/test/java/org/apache/servicecomb/demo/springmvc/tests/SpringMvcTestMain.java b/integration-tests/springmvc-tests/springmvc-tests-simplified-mapping/src/test/java/org/apache/servicecomb/demo/springmvc/tests/SpringMvcTestMain.java similarity index 100% rename from integration-tests/springmvc-tests/src/test/java/org/apache/servicecomb/demo/springmvc/tests/SpringMvcTestMain.java rename to integration-tests/springmvc-tests/springmvc-tests-simplified-mapping/src/test/java/org/apache/servicecomb/demo/springmvc/tests/SpringMvcTestMain.java diff --git a/integration-tests/springmvc-tests/src/test/resources/microservice.yaml b/integration-tests/springmvc-tests/springmvc-tests-simplified-mapping/src/test/resources/microservice.yaml similarity index 100% rename from integration-tests/springmvc-tests/src/test/resources/microservice.yaml rename to integration-tests/springmvc-tests/springmvc-tests-simplified-mapping/src/test/resources/microservice.yaml diff --git a/integration-tests/springmvc-tests/src/test/resources/registry.yaml b/integration-tests/springmvc-tests/springmvc-tests-simplified-mapping/src/test/resources/registry.yaml similarity index 100% rename from integration-tests/springmvc-tests/src/test/resources/registry.yaml rename to integration-tests/springmvc-tests/springmvc-tests-simplified-mapping/src/test/resources/registry.yaml -- To stop receiving notification emails like this one, please contact [email protected].
