I need help -- can't autowire WebApplicationContext instance in cucum…

…ber's context.
cucumber · Jan 10, 2013 · efc7bf2 · efc7bf2
1 parent 6006892
commit efc7bf2
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 26 deletions.
diff --git a/examples/spring-txn/pom.xml b/examples/spring-txn/pom.xml
@@ -19,7 +19,6 @@
         <hsqldb.version>2.2.8</hsqldb.version>
         <log4j.version>1.2.17</log4j.version>
         <slf4j.version>1.7.1</slf4j.version>
-        <spring.test.mvc.version>1.0.0.M2</spring.test.mvc.version>
         <spring.data.version>1.1.0.RELEASE</spring.data.version>
     </properties>
 
@@ -122,25 +121,11 @@
             <version>${spring.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-test-mvc</artifactId>
-            <version>${spring.test.mvc.version}</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.dbunit</groupId>
             <artifactId>dbunit</artifactId>
             <version>${dbunit.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
-
-    <repositories>
-        <repository>
-            <id>repository.springframework.milestone</id>
-            <name>Spring Framework Maven Milestone Repository</name>
-            <url>http://maven.springframework.org/milestone</url>
-        </repository>
-    </repositories>
 </project>
diff --git a/examples/spring-txn/src/test/java/cucumber/examples/spring/txn/SeeMessagesSteps.java b/examples/spring-txn/src/test/java/cucumber/examples/spring/txn/SeeMessagesSteps.java
@@ -4,19 +4,25 @@
 import cucumber.api.java.en.Then;
 import cucumber.api.java.en.When;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.web.server.MockMvc;
-import org.springframework.test.web.server.ResultActions;
-
-import static org.hamcrest.Matchers.containsString;
-import static org.springframework.test.web.server.request.MockMvcRequestBuilders.get;
-import static org.springframework.test.web.server.result.MockMvcResultMatchers.content;
-import static org.springframework.test.web.server.result.MockMvcResultMatchers.status;
-import static org.springframework.test.web.server.setup.MockMvcBuilders.xmlConfigSetup;
-
+import org.springframework.test.context.web.WebAppConfiguration;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.ResultActions;
+import org.springframework.web.context.WebApplicationContext;
+
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+import static org.springframework.test.web.servlet.setup.MockMvcBuilders.webAppContextSetup;
+
+@WebAppConfiguration
 public class SeeMessagesSteps {
     @Autowired
     private UserRepository userRepository;
 
+    @Autowired
+    private WebApplicationContext wac;
+
     @Autowired
     private MessageRepository messageRepository;
 
@@ -50,8 +56,7 @@ public void I_should_see(String content) throws Throwable {
     }
 
     private MockMvc getMockMvc() {
-        return xmlConfigSetup(contextLocation)
-                .configureWebAppRootDir(warRootDir, false).build();
+        return webAppContextSetup(wac).build();
     }
 
 }