Test for CargoTrackingController.

Set command class in controller constructor, since it's tightly coupled to code, not configurable.

Use assertEquals in repository test, making it pass.

Added spring-test jar to pom.

No logfile appender in test-logging.

dddsample/pom.xml

@@ -99,6 +99,12 @@
       <version>2.5</version>
     </dependency>
     <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-test</artifactId>
+      <version>2.5</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
       <groupId>org.hibernate</groupId>
       <artifactId>hibernate</artifactId>
       <version>3.2.5.ga</version>

dddsample/src/main/java/se/citerus/dddsample/web/CargoTrackingController.java

@@ -20,6 +20,10 @@ public class CargoTrackingController extends SimpleFormController {
    */
   private CargoService cargoService;
 
+  public CargoTrackingController() {
+    setCommandClass(TrackCommand.class);
+  }
+
   @Override
   public ModelAndView onSubmit(final Object command) throws ServletException {
     final Map<String, Object> model = new HashMap<String, Object>();

dddsample/src/main/webapp/WEB-INF/dispatch-servlet.xml

@@ -1,21 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
 
   <bean name="/start.html" class="se.citerus.dddsample.web.CargoTrackingController">
     <property name="sessionForm" value="true"/>
     <property name="commandName" value="trackCommand"/>
-    <property name="commandClass" value="se.citerus.dddsample.web.TrackCommand"/>
     <property name="formView" value="start"/>
     <property name="successView" value="cargo"/>
     <property name="cargoService" ref="cargoService"/>
   </bean>
 
   <bean id="viewResolver" class="org.springframework.web.servlet.view.InternalResourceViewResolver">
-    <property name="viewClass" value="org.springframework.web.servlet.view.JstlView"></property>
-    <property name="prefix" value="/WEB-INF/jsp/"></property>
-    <property name="suffix" value=".jsp"></property>
+    <property name="viewClass" value="org.springframework.web.servlet.view.JstlView"/>
+    <property name="prefix" value="/WEB-INF/jsp/"/>
+    <property name="suffix" value=".jsp"/>
   </bean>
 
 </beans>

dddsample/src/test/java/se/citerus/dddsample/domain/CargoRepositoryTest.java

@@ -19,7 +19,7 @@ public class CargoRepositoryTest extends AbstractTransactionalDataSourceSpringCo
     final TrackingId trackingId = new TrackingId("XYZ");
     Cargo cargo = cargoRepository.find(trackingId);
 
-    assertSame(trackingId, cargo.trackingId());
+    assertEquals(trackingId, cargo.trackingId());
   }
 
 }

dddsample/src/test/java/se/citerus/dddsample/web/CargoTrackingControllerTest.java

@@ -0,0 +1,64 @@
+package se.citerus.dddsample.web;
+
+import junit.framework.TestCase;
+import org.springframework.mock.web.MockHttpServletRequest;
+import org.springframework.mock.web.MockHttpServletResponse;
+import org.springframework.mock.web.MockHttpSession;
+import org.springframework.mock.web.MockServletContext;
+import org.springframework.web.servlet.ModelAndView;
+import se.citerus.dddsample.domain.Cargo;
+import se.citerus.dddsample.domain.Location;
+import se.citerus.dddsample.domain.TrackingId;
+import se.citerus.dddsample.service.CargoService;
+
+public class CargoTrackingControllerTest extends TestCase {
+
+  CargoTrackingController controller;
+  MockHttpServletRequest request;
+  MockHttpServletResponse response;
+  MockHttpSession session;
+  MockServletContext servletContext;
+
+  protected void setUp() throws Exception {
+    servletContext = new MockServletContext("test");
+    request = new MockHttpServletRequest(servletContext);
+    response = new MockHttpServletResponse();
+    session = new MockHttpSession(servletContext);
+    request.setSession(session);
+    controller = new CargoTrackingController();
+    controller.setFormView("test-form");
+    controller.setSuccessView("test-success");
+    controller.setCommandName("test-command-name");
+    controller.setCargoService(new CargoService() {
+      public Cargo find(String trackingId) {
+        Cargo cargo = new Cargo(
+          new TrackingId(trackingId),
+          new Location("AAA"),
+          new Location("BBB"));
+        return cargo;
+      }
+    });
+  }
+
+  public void testHandleGet() throws Exception {
+    request.setMethod("GET");
+
+    ModelAndView mav = controller.handleRequest(request, response);
+
+    assertEquals("test-form", mav.getViewName());
+    assertEquals(2, mav.getModel().size());
+    assertTrue(mav.getModel().get("test-command-name") instanceof TrackCommand);
+  }
+
+  public void testHandlePost() throws Exception {
+    request.setMethod("POST");
+
+    ModelAndView mav = controller.handleRequest(request, response);
+
+    assertEquals("test-success", mav.getViewName());
+    assertEquals(1, mav.getModel().size());
+    Location location = (Location) mav.getModel().get("location");
+    assertEquals("AAA", location.unlocode());
+  }
+
+}

dddsample/src/test/resources/log4j.properties

@@ -1,6 +1,6 @@
 # For JBoss: Avoid to setup Log4J outside $JBOSS_HOME/server/default/deploy/log4j.xml!
 # For all other servers: Comment out the Log4J listener in web.xml to activate Log4J.
-log4j.rootLogger=INFO, stdout, logfile
+log4j.rootLogger=INFO, stdout
 
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout