Removed tests for previously removed classes.

dddsample/tracking/core/src/test/java/se/citerus/dddsample/tracking/core/interfaces/tracking/CargoTrackingControllerTest.java

@@ -1,96 +0,0 @@
-package se.citerus.dddsample.tracking.core.interfaces.tracking;
-
-import junit.framework.TestCase;
-import org.easymock.EasyMock;
-import org.springframework.context.support.StaticApplicationContext;
-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.validation.BindingResult;
-import org.springframework.validation.Errors;
-import org.springframework.validation.FieldError;
-import org.springframework.web.servlet.ModelAndView;
-import se.citerus.dddsample.tracking.core.domain.model.cargo.CargoRepository;
-import se.citerus.dddsample.tracking.core.domain.model.handling.HandlingEventRepository;
-import se.citerus.dddsample.tracking.core.infrastructure.persistence.inmemory.CargoRepositoryInMem;
-import se.citerus.dddsample.tracking.core.infrastructure.persistence.inmemory.HandlingEventRepositoryInMem;
-
-public class CargoTrackingControllerTest extends TestCase {
-  CargoTrackingController controller;
-  MockHttpServletRequest request;
-  MockHttpServletResponse response;
-  MockHttpSession session;
-  MockServletContext servletContext;
-  CargoRepositoryInMem cargoRepository;
-  HandlingEventRepository handlingEventRepository;
-
-  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();
-    StaticApplicationContext applicationContext = new StaticApplicationContext();
-    controller.setApplicationContext(applicationContext);
-    controller.setFormView("test-form");
-    controller.setSuccessView("test-success");
-    controller.setCommandName("test-command-name");
-    cargoRepository = new CargoRepositoryInMem();
-    cargoRepository.init();
-
-    handlingEventRepository = new HandlingEventRepositoryInMem();
-    controller.setHandlingEventRepository(handlingEventRepository);
-  }
-
-  public void testHandleGet() throws Exception {
-    controller.setCargoRepository(new CargoRepositoryInMem());
-    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 {
-    controller.setCargoRepository(cargoRepository);
-    request.addParameter("trackingId", "ABC");
-    request.setMethod("POST");
-
-    ModelAndView mav = controller.handleRequest(request, response);
-
-    assertEquals("test-form", mav.getViewName());
-    // Errors, command are two standard map attributes, the third should be the cargo object
-    assertEquals(3, mav.getModel().size());
-    CargoTrackingViewAdapter cargo = (CargoTrackingViewAdapter) mav.getModel().get("cargo");
-    assertEquals("ABC", cargo.getTrackingId());
-  }
-
-  public void testUnknownCargo() throws Exception {
-    CargoRepository cargoRepository = EasyMock.createNiceMock(CargoRepository.class);
-    EasyMock.replay(cargoRepository);
-    controller.setCargoRepository(cargoRepository);
-
-    request.setMethod("POST");
-    request.setParameter("trackingId", "unknown-id");
-
-    ModelAndView mav = controller.handleRequest(request, response);
-
-    assertEquals("test-form", mav.getViewName());
-    assertEquals(2, mav.getModel().size());
-
-    TrackCommand command = (TrackCommand) mav.getModel().get(controller.getCommandName());
-    assertEquals("unknown-id", command.getTrackingId());
-
-    Errors errors = (Errors) mav.getModel().get(BindingResult.MODEL_KEY_PREFIX + controller.getCommandName());
-    FieldError fe = errors.getFieldError("trackingId");
-    assertEquals("cargo.unknown_id", fe.getCode());
-    assertEquals(1, fe.getArguments().length);
-    assertEquals(command.getTrackingId(), fe.getArguments()[0]);
-  }
-
-}

dddsample/tracking/core/src/test/java/se/citerus/dddsample/tracking/core/interfaces/tracking/CargoTrackingViewAdapterTest.java

@@ -1,70 +0,0 @@
-package se.citerus.dddsample.tracking.core.interfaces.tracking;
-
-import junit.framework.TestCase;
-import org.springframework.context.support.StaticApplicationContext;
-import se.citerus.dddsample.tracking.core.domain.model.cargo.Cargo;
-import se.citerus.dddsample.tracking.core.domain.model.cargo.RouteSpecification;
-import se.citerus.dddsample.tracking.core.domain.model.cargo.TrackingId;
-import se.citerus.dddsample.tracking.core.domain.model.handling.HandlingEvent;
-import static se.citerus.dddsample.tracking.core.domain.model.location.SampleLocations.HANGZOU;
-import static se.citerus.dddsample.tracking.core.domain.model.location.SampleLocations.HELSINKI;
-import se.citerus.dddsample.tracking.core.domain.model.shared.HandlingActivity;
-import static se.citerus.dddsample.tracking.core.domain.model.voyage.SampleVoyages.CM001;
-
-import java.util.*;
-
-public class CargoTrackingViewAdapterTest extends TestCase {
-
-  public void testCreate() {
-    // Disable test for now, CargoTrackingViewAdapter is being reconsidered 
-    if (true) return;
-
-    Cargo cargo = new Cargo(new TrackingId("XYZ"), new RouteSpecification(HANGZOU, HELSINKI, new Date()));
-//	TODO: Need to put an itinerary on the Cargo in order to test the
-//	isExpected(). Those assertions are commented out because they only
-//	worked as a side-effect of the incorrect (now corrected) behavior of 
-//  Itinerary, which previously said than an empty itinerary considered all
-//  events as "expected", whereas an empty itinerary should actually consider
-//  any event unexpected. (ie empty itinerary means nothing happens.)
-
-    cargo.handled(new HandlingActivity(HandlingEvent.Type.RECEIVE, HANGZOU));
-    cargo.handled(new HandlingActivity(HandlingEvent.Type.LOAD, HANGZOU, CM001));
-    cargo.handled(new HandlingActivity(HandlingEvent.Type.UNLOAD, HELSINKI, CM001));
-
-    StaticApplicationContext applicationContext = new StaticApplicationContext();
-    applicationContext.addMessage("cargo.status.IN_PORT", Locale.GERMAN, "In port {0}");
-    applicationContext.refresh();
-
-    List<HandlingEvent> events = new ArrayList<HandlingEvent>();
-    CargoTrackingViewAdapter adapter = new CargoTrackingViewAdapter(cargo, applicationContext, Locale.GERMAN, events);
-
-    assertEquals("XYZ", adapter.getTrackingId());
-    assertEquals("Hangzhou", adapter.getOrigin());
-    assertEquals("Helsinki", adapter.getDestination());
-    assertEquals("In port Helsinki", adapter.getStatusText());
-
-    Iterator<CargoTrackingViewAdapter.HandlingEventViewAdapter> it = adapter.getEvents().iterator();
-
-    CargoTrackingViewAdapter.HandlingEventViewAdapter event = it.next();
-    assertEquals("RECEIVE", event.getType());
-    assertEquals("Hangzhou", event.getLocation());
-    assertEquals("1970-01-01 08:00 CST", event.getTime());
-    assertEquals("", event.getVoyageNumber());
-//    assertTrue(event.isExpected());
-
-    event = it.next();
-    assertEquals("LOAD", event.getType());
-    assertEquals("Hangzhou", event.getLocation());
-    assertEquals("1970-01-01 08:00 CST", event.getTime());
-    assertEquals("CM001", event.getVoyageNumber());
-//    assertTrue(event.isExpected());
-
-    event = it.next();
-    assertEquals("UNLOAD", event.getType());
-    assertEquals("Helsinki", event.getLocation());
-    assertEquals("1970-01-01 01:00 CET", event.getTime());
-    assertEquals("CM001", event.getVoyageNumber());
-//    assertTrue(event.isExpected());
-  }
-
-}

dddsample/tracking/core/src/test/java/se/citerus/dddsample/tracking/core/interfaces/tracking/TrackCommandValidatorTest.java

@@ -1,37 +0,0 @@
-package se.citerus.dddsample.tracking.core.interfaces.tracking;
-
-import junit.framework.TestCase;
-import org.springframework.validation.BeanPropertyBindingResult;
-import org.springframework.validation.BindingResult;
-import org.springframework.validation.FieldError;
-
-public class TrackCommandValidatorTest extends TestCase {
-
-  TrackCommandValidator validator;
-  TrackCommand command;
-  BindingResult errors;
-
-  protected void setUp() throws Exception {
-    validator = new TrackCommandValidator();
-    command = new TrackCommand();
-    errors = new BeanPropertyBindingResult(command, "command");
-  }
-
-  public void testValidateIllegalId() throws Exception {
-    validator.validate(command, errors);
-
-    assertEquals(1, errors.getErrorCount());
-    FieldError error = errors.getFieldError("trackingId");
-    assertNotNull(error);
-    assertNull(error.getRejectedValue());
-    assertEquals("error.required", error.getCode());
-  }
-
-  public void testValidateSuccess() throws Exception {
-    command.setTrackingId("non-empty");
-    validator.validate(command, errors);
-
-    assertFalse(errors.hasErrors());
-  }
-
-}