From e9f3cfd7c6e872d86b84132c98b760da2b33eca0 Mon Sep 17 00:00:00 2001 From: DOHA Date: Mon, 17 Oct 2016 19:43:48 +0200 Subject: [PATCH] add integration test profile --- spring-mvc-web-vs-initializer/pom.xml | 67 ++++++++++++++++--- ...t.java => JavaServletIntegrationTest.java} | 2 +- ...st.java => XmlServletIntegrationTest.java} | 2 +- 3 files changed, 59 insertions(+), 12 deletions(-) rename spring-mvc-web-vs-initializer/src/test/java/org/baeldung/controller/{JavaServletTest.java => JavaServletIntegrationTest.java} (97%) rename spring-mvc-web-vs-initializer/src/test/java/org/baeldung/controller/{XmlServletTest.java => XmlServletIntegrationTest.java} (97%) diff --git a/spring-mvc-web-vs-initializer/pom.xml b/spring-mvc-web-vs-initializer/pom.xml index 0d735e7188..b448673ef8 100644 --- a/spring-mvc-web-vs-initializer/pom.xml +++ b/spring-mvc-web-vs-initializer/pom.xml @@ -146,17 +146,64 @@ - - spring-mvc-web-vs-initializer - - - src/main/resources - true - - - - + + spring-mvc-web-vs-initializer + + + src/main/resources + true + + + + + org.apache.maven.plugins + maven-surefire-plugin + ${maven-surefire-plugin.version} + + + **/*IntegrationTest.java + **/*LiveTest.java + + + + + + + + integration + + + + org.apache.maven.plugins + maven-surefire-plugin + + + integration-test + + test + + + + **/*LiveTest.java + + + **/*IntegrationTest.java + + + + + + + json + + + + + + + + 4.3.1.RELEASE diff --git a/spring-mvc-web-vs-initializer/src/test/java/org/baeldung/controller/JavaServletTest.java b/spring-mvc-web-vs-initializer/src/test/java/org/baeldung/controller/JavaServletIntegrationTest.java similarity index 97% rename from spring-mvc-web-vs-initializer/src/test/java/org/baeldung/controller/JavaServletTest.java rename to spring-mvc-web-vs-initializer/src/test/java/org/baeldung/controller/JavaServletIntegrationTest.java index 99b5ef8c2f..0461cc8fcc 100644 --- a/spring-mvc-web-vs-initializer/src/test/java/org/baeldung/controller/JavaServletTest.java +++ b/spring-mvc-web-vs-initializer/src/test/java/org/baeldung/controller/JavaServletIntegrationTest.java @@ -20,7 +20,7 @@ import org.springframework.web.servlet.ModelAndView; @RunWith(SpringJUnit4ClassRunner.class) @WebAppConfiguration @ContextConfiguration(loader=AnnotationConfigWebContextLoader.class, classes = MvcConfig.class) -public class JavaServletTest { +public class JavaServletIntegrationTest { private MockMvc mockMvc; diff --git a/spring-mvc-web-vs-initializer/src/test/java/org/baeldung/controller/XmlServletTest.java b/spring-mvc-web-vs-initializer/src/test/java/org/baeldung/controller/XmlServletIntegrationTest.java similarity index 97% rename from spring-mvc-web-vs-initializer/src/test/java/org/baeldung/controller/XmlServletTest.java rename to spring-mvc-web-vs-initializer/src/test/java/org/baeldung/controller/XmlServletIntegrationTest.java index e7695e36c0..e1273f8f88 100644 --- a/spring-mvc-web-vs-initializer/src/test/java/org/baeldung/controller/XmlServletTest.java +++ b/spring-mvc-web-vs-initializer/src/test/java/org/baeldung/controller/XmlServletIntegrationTest.java @@ -19,7 +19,7 @@ import org.springframework.web.servlet.ModelAndView; @RunWith(SpringJUnit4ClassRunner.class) @WebAppConfiguration @ContextConfiguration(loader=GenericXmlWebContextLoader.class, locations = "classpath*:mvc-configuration.xml") -public class XmlServletTest { +public class XmlServletIntegrationTest { private MockMvc mockMvc;