Merge branch 'bump-java-and-spring' of https://github.com/citerus/dddsample-core into bump-java-and-spring

pom.xml

@@ -127,7 +127,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.4</version>
+      <version>4.12</version>
       <scope>test</scope>
     </dependency>
     <dependency>

src/test/java/se/citerus/dddsample/infrastructure/persistence/hibernate/AbstractRepositoryTest.java

@@ -1,76 +0,0 @@
-package se.citerus.dddsample.infrastructure.persistence.hibernate;
-
-import org.hibernate.SessionFactory;
-import org.springframework.jdbc.core.simple.SimpleJdbcTemplate;
-import org.springframework.transaction.support.TransactionTemplate;
-import se.citerus.dddsample.application.util.SampleDataGenerator;
-import se.citerus.dddsample.domain.model.handling.HandlingEventFactory;
-import se.citerus.dddsample.domain.model.handling.HandlingEventRepository;
-
-import java.lang.reflect.Field;
-
-/*public abstract class AbstractRepositoryTest extends AbstractTransactionalDataSourceSpringContextTests {
-
-  SessionFactory sessionFactory;
-  SimpleJdbcTemplate sjt;
-  HandlingEventFactory handlingEventFactory;
-  HandlingEventRepository handlingEventRepository;
-
-  public void setHandlingEventFactory(HandlingEventFactory handlingEventFactory) {
-    this.handlingEventFactory = handlingEventFactory;
-  }
-
-  public void setHandlingEventRepository(HandlingEventRepository handlingEventRepository) {
-    this.handlingEventRepository = handlingEventRepository;
-  }
-
-  protected AbstractRepositoryTest() {
-    setAutowireMode(AUTOWIRE_BY_NAME);
-    setDependencyCheck(false);
-  }
-
-  public void setSessionFactory(SessionFactory sessionFactory) {
-    this.sessionFactory = sessionFactory;
-    transactionManager = new HibernateTransactionManager(sessionFactory);
-  }
-
-  public SessionFactory getSessionFactory() {
-    return sessionFactory;
-  }
-
-  protected void flush() {
-    sessionFactory.getCurrentSession().flush();
-  }
-
-  @Override
-  protected String[] getConfigLocations() {
-    return new String[] {"/context-infrastructure-persistence.xml", "context-domain.xml"};
-  }
-
-  @Override
-  protected void onSetUpInTransaction() throws Exception {
-    // TODO store Sample* and object instances here instead of handwritten SQL
-    SampleDataGenerator.loadSampleData(jdbcTemplate, new TransactionTemplate(transactionManager));
-    sjt = new SimpleJdbcTemplate(jdbcTemplate);
-  }
-
-  protected Session getSession() {
-    return sessionFactory.getCurrentSession();
-  }
-
-  // Instead of exposing a getId() on persistent classes
-  protected Long getLongId(Object o) {
-    if (getSession().contains(o)) {
-      return (Long) getSession().getIdentifier(o);
-    } else {
-      try {
-        Field id = o.getClass().getDeclaredField("id");
-        id.setAccessible(true);
-        return (Long) id.get(o);
-      } catch (Exception e) {
-        throw new RuntimeException(e);
-      }
-    }
-  }
-}
-*/

src/test/java/se/citerus/dddsample/infrastructure/persistence/hibernate/CargoRepositoryTest.java

@@ -1,171 +1,231 @@
 package se.citerus.dddsample.infrastructure.persistence.hibernate;
 
+import org.hibernate.SessionFactory;
+import org.hibernate.classic.Session;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.orm.hibernate3.HibernateTransactionManager;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.transaction.TransactionConfiguration;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionTemplate;
 import se.citerus.dddsample.application.util.SampleDataGenerator;
 import se.citerus.dddsample.domain.model.cargo.*;
 import se.citerus.dddsample.domain.model.handling.HandlingEvent;
-import static se.citerus.dddsample.domain.model.handling.HandlingEvent.Type.LOAD;
-import static se.citerus.dddsample.domain.model.handling.HandlingEvent.Type.RECEIVE;
+import se.citerus.dddsample.domain.model.handling.HandlingEventRepository;
 import se.citerus.dddsample.domain.model.location.Location;
 import se.citerus.dddsample.domain.model.location.LocationRepository;
-import static se.citerus.dddsample.domain.model.location.SampleLocations.*;
 import se.citerus.dddsample.domain.model.location.UnLocode;
-import static se.citerus.dddsample.domain.model.voyage.SampleVoyages.CM004;
 import se.citerus.dddsample.domain.model.voyage.Voyage;
 import se.citerus.dddsample.domain.model.voyage.VoyageNumber;
 import se.citerus.dddsample.domain.model.voyage.VoyageRepository;
+import static se.citerus.dddsample.domain.model.location.SampleLocations.*;
+import static se.citerus.dddsample.domain.model.voyage.SampleVoyages.*;
+import static se.citerus.dddsample.domain.model.handling.HandlingEvent.Type.*;
+
+import javax.sql.DataSource;
 
+import java.lang.reflect.Field;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
-/*public class CargoRepositoryTest extends AbstractRepositoryTest {
+import static org.junit.Assert.*;
 
-  CargoRepository cargoRepository;
-  LocationRepository locationRepository;
-  VoyageRepository voyageRepository;
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(value = {"/context-infrastructure-persistence.xml", "/context-domain.xml"})
+@TransactionConfiguration(transactionManager = "transactionManager")
+@Transactional
+public class CargoRepositoryTest {
 
-  public void setCargoRepository(CargoRepository cargoRepository) {
-    this.cargoRepository = cargoRepository;
-  }
+    @Autowired
+    CargoRepository cargoRepository;
 
-  public void setLocationRepository(LocationRepository locationRepository) {
-    this.locationRepository = locationRepository;
-  }
+    @Autowired
+    LocationRepository locationRepository;
 
-  public void setVoyageRepository(VoyageRepository voyageRepository) {
-    this.voyageRepository = voyageRepository;
-  }
+    @Autowired
+    VoyageRepository voyageRepository;
 
-  public void testFindByCargoId() {
-    final TrackingId trackingId = new TrackingId("FGH");
-    final Cargo cargo = cargoRepository.find(trackingId);
-    assertEquals(STOCKHOLM, cargo.origin());
-    assertEquals(HONGKONG, cargo.routeSpecification().origin());
-    assertEquals(HELSINKI, cargo.routeSpecification().destination());
+    @Autowired
+    HandlingEventRepository handlingEventRepository;
 
-    assertNotNull(cargo.delivery());
+    @Autowired
+    SessionFactory sessionFactory;
 
-    final List<HandlingEvent> events = handlingEventRepository.lookupHandlingHistoryOfCargo(trackingId).distinctEventsByCompletionTime();
-    assertEquals(2, events.size());
+    @Autowired
+    private DataSource dataSource;
 
-    HandlingEvent firstEvent = events.get(0);
-    assertHandlingEvent(cargo, firstEvent, RECEIVE, HONGKONG, 100, 160, Voyage.NONE);
+    @Autowired
+    private HibernateTransactionManager transactionManager;
 
-    HandlingEvent secondEvent = events.get(1);
+    private JdbcTemplate jdbcTemplate;
 
-    Voyage hongkongMelbourneTokyoAndBack = new Voyage.Builder(
-      new VoyageNumber("0303"), HONGKONG).
-      addMovement(MELBOURNE, new Date(), new Date()).
-      addMovement(TOKYO, new Date(), new Date()).
-      addMovement(HONGKONG, new Date(), new Date()).
-      build();
-    
-    assertHandlingEvent(cargo, secondEvent, LOAD, HONGKONG, 150, 110, hongkongMelbourneTokyoAndBack);
+    @Before
+    public void setup() {
+        jdbcTemplate = new JdbcTemplate(dataSource);
+        SampleDataGenerator.loadSampleData(jdbcTemplate, new TransactionTemplate(transactionManager));
+    }
 
-    List<Leg> legs = cargo.itinerary().legs();
-    assertEquals(3, legs.size());
+    @Test
+    public void testFindByCargoId() {
+        final TrackingId trackingId = new TrackingId("FGH");
+        final Cargo cargo = cargoRepository.find(trackingId);
+        assertEquals(STOCKHOLM, cargo.origin());
+        assertEquals(HONGKONG, cargo.routeSpecification().origin());
+        assertEquals(HELSINKI, cargo.routeSpecification().destination());
 
-    Leg firstLeg = legs.get(0);
-    assertLeg(firstLeg, "0101", HONGKONG, MELBOURNE);
+        assertNotNull(cargo.delivery());
 
-    Leg secondLeg = legs.get(1);
-    assertLeg(secondLeg, "0101", MELBOURNE, STOCKHOLM);
+        final List<HandlingEvent> events = handlingEventRepository.lookupHandlingHistoryOfCargo(trackingId).distinctEventsByCompletionTime();
+        assertEquals(2, events.size());
 
-    Leg thirdLeg = legs.get(2);
-    assertLeg(thirdLeg, "0101", STOCKHOLM, HELSINKI);
-  }
+        HandlingEvent firstEvent = events.get(0);
+        assertHandlingEvent(cargo, firstEvent, RECEIVE, HONGKONG, 100, 160, Voyage.NONE);
 
-  private void assertHandlingEvent(Cargo cargo, HandlingEvent event, HandlingEvent.Type expectedEventType, Location expectedLocation, int completionTimeMs, int registrationTimeMs, Voyage voyage) {
-    assertEquals(expectedEventType, event.type());
-    assertEquals(expectedLocation, event.location());
+        HandlingEvent secondEvent = events.get(1);
 
-    Date expectedCompletionTime = SampleDataGenerator.offset(completionTimeMs);
-    assertEquals(expectedCompletionTime, event.completionTime());
+        Voyage hongkongMelbourneTokyoAndBack = new Voyage.Builder(
+                new VoyageNumber("0303"), HONGKONG).
+                addMovement(MELBOURNE, new Date(), new Date()).
+                addMovement(TOKYO, new Date(), new Date()).
+                addMovement(HONGKONG, new Date(), new Date()).
+                build();
 
-    Date expectedRegistrationTime = SampleDataGenerator.offset(registrationTimeMs);
-    assertEquals(expectedRegistrationTime, event.registrationTime());
+        assertHandlingEvent(cargo, secondEvent, LOAD, HONGKONG, 150, 110, hongkongMelbourneTokyoAndBack);
 
-    assertEquals(voyage, event.voyage());
-    assertEquals(cargo, event.cargo());
-  }
+        List<Leg> legs = cargo.itinerary().legs();
+        assertEquals(3, legs.size());
 
-  public void testFindByCargoIdUnknownId() {
-    assertNull(cargoRepository.find(new TrackingId("UNKNOWN")));
-  }
+        Leg firstLeg = legs.get(0);
+        assertLeg(firstLeg, "0101", HONGKONG, MELBOURNE);
 
-  private void assertLeg(Leg firstLeg, String vn, Location expectedFrom, Location expectedTo) {
-    assertEquals(new VoyageNumber(vn), firstLeg.voyage().voyageNumber());
-    assertEquals(expectedFrom, firstLeg.loadLocation());
-    assertEquals(expectedTo, firstLeg.unloadLocation());
-  }
+        Leg secondLeg = legs.get(1);
+        assertLeg(secondLeg, "0101", MELBOURNE, STOCKHOLM);
 
-  public void testSave() {
-    TrackingId trackingId = new TrackingId("AAA");
-    Location origin = locationRepository.find(STOCKHOLM.unLocode());
-    Location destination = locationRepository.find(MELBOURNE.unLocode());
+        Leg thirdLeg = legs.get(2);
+        assertLeg(thirdLeg, "0101", STOCKHOLM, HELSINKI);
+    }
 
-    Cargo cargo = new Cargo(trackingId, new RouteSpecification(origin, destination, new Date()));
-    cargoRepository.store(cargo);
+    private void assertHandlingEvent(Cargo cargo, HandlingEvent event, HandlingEvent.Type expectedEventType, Location expectedLocation, int completionTimeMs, int registrationTimeMs, Voyage voyage) {
+        assertEquals(expectedEventType, event.type());
+        assertEquals(expectedLocation, event.location());
 
-    cargo.assignToRoute(new Itinerary(Arrays.asList(
-      new Leg(
-        voyageRepository.find(new VoyageNumber("0101")),
-        locationRepository.find(STOCKHOLM.unLocode()),
-        locationRepository.find(MELBOURNE.unLocode()),
-        new Date(), new Date())
-    )));
-    
-    flush();
+        Date expectedCompletionTime = SampleDataGenerator.offset(completionTimeMs);
+        assertEquals(expectedCompletionTime, event.completionTime());
 
-    Map<String, Object> map = sjt.queryForMap(
-      "select * from Cargo where tracking_id = ?", trackingId.idString());
+        Date expectedRegistrationTime = SampleDataGenerator.offset(registrationTimeMs);
+        assertEquals(expectedRegistrationTime, event.registrationTime());
 
-    assertEquals("AAA", map.get("TRACKING_ID"));
+        assertEquals(voyage, event.voyage());
+        assertEquals(cargo, event.cargo());
+    }
 
-    Long originId = getLongId(origin);
-    assertEquals(originId, map.get("SPEC_ORIGIN_ID"));
+    @Test
+    public void testFindByCargoIdUnknownId() {
+        assertNull(cargoRepository.find(new TrackingId("UNKNOWN")));
+    }
 
-    Long destinationId = getLongId(destination);
-    assertEquals(destinationId, map.get("SPEC_DESTINATION_ID"));
+    private void assertLeg(Leg firstLeg, String vn, Location expectedFrom, Location expectedTo) {
+        assertEquals(new VoyageNumber(vn), firstLeg.voyage().voyageNumber());
+        assertEquals(expectedFrom, firstLeg.loadLocation());
+        assertEquals(expectedTo, firstLeg.unloadLocation());
+    }
 
-    getSession().clear();
+    @Test
+    public void testSave() {
+        TrackingId trackingId = new TrackingId("AAA");
+        Location origin = locationRepository.find(STOCKHOLM.unLocode());
+        Location destination = locationRepository.find(MELBOURNE.unLocode());
 
-    final Cargo loadedCargo = cargoRepository.find(trackingId);
-    assertEquals(1, loadedCargo.itinerary().legs().size());
-  }
+        Cargo cargo = new Cargo(trackingId, new RouteSpecification(origin, destination, new Date()));
+        cargoRepository.store(cargo);
 
-  public void testReplaceItinerary() {
-    Cargo cargo = cargoRepository.find(new TrackingId("FGH"));
-    Long cargoId = getLongId(cargo);
-    assertEquals(3, sjt.queryForInt("select count(*) from Leg where cargo_id = ?", cargoId));
+        cargo.assignToRoute(new Itinerary(Arrays.asList(
+                new Leg(
+                        voyageRepository.find(new VoyageNumber("0101")),
+                        locationRepository.find(STOCKHOLM.unLocode()),
+                        locationRepository.find(MELBOURNE.unLocode()),
+                        new Date(), new Date())
+        )));
 
-    Location legFrom = locationRepository.find(new UnLocode("FIHEL"));
-    Location legTo = locationRepository.find(new UnLocode("DEHAM"));
-    Itinerary newItinerary = new Itinerary(Arrays.asList(new Leg(CM004, legFrom, legTo, new Date(), new Date())));
+        flush();
 
-    cargo.assignToRoute(newItinerary);
+        Map<String, Object> map = jdbcTemplate.queryForMap(
+                "select * from Cargo where tracking_id = ?", trackingId.idString());
 
-    cargoRepository.store(cargo);
-    flush();
+        assertEquals("AAA", map.get("TRACKING_ID"));
 
-    assertEquals(1, sjt.queryForInt("select count(*) from Leg where cargo_id = ?", cargoId));
-  }
+        Long originId = getLongId(origin);
+        assertEquals(originId, map.get("SPEC_ORIGIN_ID"));
 
+        Long destinationId = getLongId(destination);
+        assertEquals(destinationId, map.get("SPEC_DESTINATION_ID"));
+
+        sessionFactory.getCurrentSession().clear();
+
+        final Cargo loadedCargo = cargoRepository.find(trackingId);
+        assertEquals(1, loadedCargo.itinerary().legs().size());
+    }
+
+    @Test
+    public void testReplaceItinerary() {
+        Cargo cargo = cargoRepository.find(new TrackingId("FGH"));
+        Long cargoId = getLongId(cargo);
+        assertEquals(3, jdbcTemplate.queryForInt("select count(*) from Leg where cargo_id = ?", cargoId));
 
-  public void testFindAll() {
-    List<Cargo> all = cargoRepository.findAll();
-    assertNotNull(all);
-    assertEquals(6, all.size());
-  }
+        Location legFrom = locationRepository.find(new UnLocode("FIHEL"));
+        Location legTo = locationRepository.find(new UnLocode("DEHAM"));
+        Itinerary newItinerary = new Itinerary(Arrays.asList(new Leg(CM004, legFrom, legTo, new Date(), new Date())));
 
-  public void testNextTrackingId() {
-    TrackingId trackingId = cargoRepository.nextTrackingId();
-    assertNotNull(trackingId);
+        cargo.assignToRoute(newItinerary);
 
-    TrackingId trackingId2 = cargoRepository.nextTrackingId();
-    assertNotNull(trackingId2);
-    assertFalse(trackingId.equals(trackingId2));
-  }
+        cargoRepository.store(cargo);
+        flush();
 
-}*/
+        assertEquals(1, jdbcTemplate.queryForInt("select count(*) from Leg where cargo_id = ?", cargoId));
+    }
+
+    @Test
+    public void testFindAll() {
+        List<Cargo> all = cargoRepository.findAll();
+        assertNotNull(all);
+        assertEquals(6, all.size());
+    }
+
+    @Test
+    public void testNextTrackingId() {
+        TrackingId trackingId = cargoRepository.nextTrackingId();
+        assertNotNull(trackingId);
+
+        TrackingId trackingId2 = cargoRepository.nextTrackingId();
+        assertNotNull(trackingId2);
+        assertFalse(trackingId.equals(trackingId2));
+    }
+
+
+    private void flush() {
+        sessionFactory.getCurrentSession().flush();
+    }
+
+    private Long getLongId(Object o) {
+        final Session session = sessionFactory.getCurrentSession();
+        if (session.contains(o)) {
+            return (Long) session.getIdentifier(o);
+        } else {
+            try {
+                Field id = o.getClass().getDeclaredField("id");
+                id.setAccessible(true);
+                return (Long) id.get(o);
+            } catch (Exception e) {
+                throw new RuntimeException();
+            }
+        }
+    }
+
+}

src/test/java/se/citerus/dddsample/infrastructure/persistence/hibernate/CarrierMovementRepositoryTest.java

@@ -1,27 +1,64 @@
-package se.citerus.dddsample.infrastructure.persistence.hibernate;
-
-import se.citerus.dddsample.domain.model.voyage.Voyage;
-import se.citerus.dddsample.domain.model.voyage.VoyageNumber;
-import se.citerus.dddsample.domain.model.voyage.VoyageRepository;
-
-//public class CarrierMovementRepositoryTest extends AbstractRepositoryTest {
-//
-//  VoyageRepository voyageRepository;
-//
-//  public void setVoyageRepository(VoyageRepository voyageRepository) {
-//    this.voyageRepository = voyageRepository;
-//  }
-//
-//  public void testFind() throws Exception {
-//    Voyage voyage = voyageRepository.find(new VoyageNumber("0101"));
-//    assertNotNull(voyage);
-//    assertEquals("0101", voyage.voyageNumber().idString());
-//    /* TODO adapt
-//    assertEquals(STOCKHOLM, carrierMovement.departureLocation());
-//    assertEquals(HELSINKI, carrierMovement.arrivalLocation());
-//    assertEquals(DateTestUtil.toDate("2007-09-23", "02:00"), carrierMovement.departureTime());
-//    assertEquals(DateTestUtil.toDate("2007-09-23", "03:00"), carrierMovement.arrivalTime());
-//    */
-//  }
-//
-//}
+package se.citerus.dddsample.infrastructure.persistence.hibernate;
+
+import org.hibernate.SessionFactory;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.orm.hibernate3.HibernateTransactionManager;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.transaction.TransactionConfiguration;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionTemplate;
+import se.citerus.dddsample.application.util.SampleDataGenerator;
+import se.citerus.dddsample.domain.model.voyage.Voyage;
+import se.citerus.dddsample.domain.model.voyage.VoyageNumber;
+import se.citerus.dddsample.domain.model.voyage.VoyageRepository;
+
+import javax.sql.DataSource;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(value = {"/context-infrastructure-persistence.xml", "/context-domain.xml"})
+@TransactionConfiguration(transactionManager = "transactionManager")
+@Transactional
+public class CarrierMovementRepositoryTest {
+
+    @Autowired
+    VoyageRepository voyageRepository;
+
+    @Autowired
+    SessionFactory sessionFactory;
+
+    @Autowired
+    private DataSource dataSource;
+
+    @Autowired
+    private HibernateTransactionManager transactionManager;
+
+    private JdbcTemplate jdbcTemplate;
+
+    @Before
+    public void setup() {
+        jdbcTemplate = new JdbcTemplate(dataSource);
+        SampleDataGenerator.loadSampleData(jdbcTemplate, new TransactionTemplate(transactionManager));
+    }
+
+    @Test
+    public void testFind() throws Exception {
+        Voyage voyage = voyageRepository.find(new VoyageNumber("0101"));
+        assertNotNull(voyage);
+        assertEquals("0101", voyage.voyageNumber().idString());
+    /* TODO adapt
+    assertEquals(STOCKHOLM, carrierMovement.departureLocation());
+    assertEquals(HELSINKI, carrierMovement.arrivalLocation());
+    assertEquals(DateTestUtil.toDate("2007-09-23", "02:00"), carrierMovement.departureTime());
+    assertEquals(DateTestUtil.toDate("2007-09-23", "03:00"), carrierMovement.arrivalTime());
+    */
+    }
+
+}

src/test/java/se/citerus/dddsample/infrastructure/persistence/hibernate/HandlingEventRepositoryTest.java

@@ -1,5 +1,19 @@
 package se.citerus.dddsample.infrastructure.persistence.hibernate;
 
+import org.hibernate.SessionFactory;
+import org.hibernate.classic.Session;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.orm.hibernate3.HibernateTransactionManager;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.transaction.TransactionConfiguration;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionTemplate;
+import se.citerus.dddsample.application.util.SampleDataGenerator;
 import se.citerus.dddsample.domain.model.cargo.Cargo;
 import se.citerus.dddsample.domain.model.cargo.CargoRepository;
 import se.citerus.dddsample.domain.model.cargo.TrackingId;
@@ -9,52 +23,91 @@ import se.citerus.dddsample.domain.model.location.Location;
 import se.citerus.dddsample.domain.model.location.LocationRepository;
 import se.citerus.dddsample.domain.model.location.UnLocode;
 
+import javax.sql.DataSource;
+import java.lang.reflect.Field;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
-/*public class HandlingEventRepositoryTest extends AbstractRepositoryTest {
+import static org.junit.Assert.assertEquals;
 
-  HandlingEventRepository handlingEventRepository;
-  CargoRepository cargoRepository;
-  LocationRepository locationRepository;
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(value = {"/context-infrastructure-persistence.xml", "/context-domain.xml"})
+@TransactionConfiguration(transactionManager = "transactionManager")
+@Transactional
+public class HandlingEventRepositoryTest {
 
-  public void setHandlingEventRepository(HandlingEventRepository handlingEventRepository) {
-    this.handlingEventRepository = handlingEventRepository;
-  }
+    @Autowired
+    HandlingEventRepository handlingEventRepository;
 
-  public void setCargoRepository(CargoRepository cargoRepository) {
-    this.cargoRepository = cargoRepository;
-  }
+    @Autowired
+    CargoRepository cargoRepository;
 
-  public void setLocationRepository(LocationRepository locationRepository) {
-    this.locationRepository = locationRepository;
-  }
+    @Autowired
+    LocationRepository locationRepository;
 
-  public void testSave() {
-    Location location = locationRepository.find(new UnLocode("SESTO"));
+    @Autowired
+    SessionFactory sessionFactory;
 
-    Cargo cargo = cargoRepository.find(new TrackingId("XYZ"));
-    Date completionTime = new Date(10);
-    Date registrationTime = new Date(20);
-    HandlingEvent event = new HandlingEvent(cargo, completionTime, registrationTime, HandlingEvent.Type.CLAIM, location);
+    @Autowired
+    private DataSource dataSource;
 
-    handlingEventRepository.store(event);
+    @Autowired
+    private HibernateTransactionManager transactionManager;
 
-    flush();
+    private JdbcTemplate jdbcTemplate;
 
-    Map<String,Object> result = sjt.queryForMap("select * from HandlingEvent where id = ?", getLongId(event));
-    assertEquals(1L, result.get("CARGO_ID"));
-    assertEquals(new Date(10), result.get("COMPLETIONTIME"));
-    assertEquals(new Date(20), result.get("REGISTRATIONTIME"));
-    assertEquals("CLAIM", result.get("TYPE"));
-    // TODO: the rest of the columns
-  }
+    @Before
+    public void setup() {
+        jdbcTemplate = new JdbcTemplate(dataSource);
+        SampleDataGenerator.loadSampleData(jdbcTemplate, new TransactionTemplate(transactionManager));
+    }
 
-  public void testFindEventsForCargo() throws Exception {
-    TrackingId trackingId = new TrackingId("XYZ");
-    List<HandlingEvent> handlingEvents = handlingEventRepository.lookupHandlingHistoryOfCargo(trackingId).distinctEventsByCompletionTime();
-    assertEquals(12, handlingEvents.size());
-  }
+    @Test
+    public void testSave() {
+        Location location = locationRepository.find(new UnLocode("SESTO"));
 
-}*/
+        Cargo cargo = cargoRepository.find(new TrackingId("XYZ"));
+        Date completionTime = new Date(10);
+        Date registrationTime = new Date(20);
+        HandlingEvent event = new HandlingEvent(cargo, completionTime, registrationTime, HandlingEvent.Type.CLAIM, location);
+
+        handlingEventRepository.store(event);
+
+        flush();
+
+        Map<String, Object> result = jdbcTemplate.queryForMap("select * from HandlingEvent where id = ?", getLongId(event));
+        assertEquals(1L, result.get("CARGO_ID"));
+        assertEquals(new Date(10), result.get("COMPLETIONTIME"));
+        assertEquals(new Date(20), result.get("REGISTRATIONTIME"));
+        assertEquals("CLAIM", result.get("TYPE"));
+        // TODO: the rest of the columns
+    }
+
+    private void flush() {
+        sessionFactory.getCurrentSession().flush();
+    }
+
+    private Long getLongId(Object o) {
+        final Session session = sessionFactory.getCurrentSession();
+        if (session.contains(o)) {
+            return (Long) session.getIdentifier(o);
+        } else {
+            try {
+                Field id = o.getClass().getDeclaredField("id");
+                id.setAccessible(true);
+                return (Long) id.get(o);
+            } catch (Exception e) {
+                throw new RuntimeException();
+            }
+        }
+    }
+
+    @Test
+    public void testFindEventsForCargo() throws Exception {
+        TrackingId trackingId = new TrackingId("XYZ");
+        List<HandlingEvent> handlingEvents = handlingEventRepository.lookupHandlingHistoryOfCargo(trackingId).distinctEventsByCompletionTime();
+        assertEquals(12, handlingEvents.size());
+    }
+
+}

src/test/java/se/citerus/dddsample/infrastructure/persistence/hibernate/LocationRepositoryTest.java

@@ -1,31 +1,62 @@
 package se.citerus.dddsample.infrastructure.persistence.hibernate;
 
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.orm.hibernate3.HibernateTransactionManager;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.transaction.TransactionConfiguration;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionTemplate;
+import se.citerus.dddsample.application.util.SampleDataGenerator;
 import se.citerus.dddsample.domain.model.location.Location;
 import se.citerus.dddsample.domain.model.location.LocationRepository;
 import se.citerus.dddsample.domain.model.location.UnLocode;
 
+import javax.sql.DataSource;
 import java.util.List;
 
-/*public class LocationRepositoryTest extends AbstractRepositoryTest {
-  private LocationRepository locationRepository;
-  
-  public void testFind() throws Exception {
-    final UnLocode melbourne = new UnLocode("AUMEL");
-    Location location = locationRepository.find(melbourne);
-    assertNotNull(location);
-    assertEquals(melbourne, location.unLocode());
-
-    assertNull(locationRepository.find(new UnLocode("NOLOC")));
-  }
-
-  public void testFindAll() throws Exception {
-    List<Location> allLocations = locationRepository.findAll();
-
-    assertNotNull(allLocations);
-    assertEquals(7, allLocations.size());
-  }
-
-  public void setLocationRepository(LocationRepository locationRepository) {
-    this.locationRepository = locationRepository;
-  }
-}*/
+import static org.junit.Assert.*;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(value = {"/context-infrastructure-persistence.xml", "/context-domain.xml"})
+@TransactionConfiguration(transactionManager = "transactionManager")
+@Transactional
+public class LocationRepositoryTest {
+    @Autowired
+    private LocationRepository locationRepository;
+
+    @Autowired
+    private DataSource dataSource;
+
+    @Autowired
+    private HibernateTransactionManager transactionManager;
+
+    @Before
+    public void setup() {
+        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
+        SampleDataGenerator.loadSampleData(jdbcTemplate, new TransactionTemplate(transactionManager));
+    }
+
+    @Test
+    public void testFind() throws Exception {
+        final UnLocode melbourne = new UnLocode("AUMEL");
+        Location location = locationRepository.find(melbourne);
+        assertNotNull(location);
+        assertEquals(melbourne, location.unLocode());
+
+        assertNull(locationRepository.find(new UnLocode("NOLOC")));
+    }
+
+    @Test
+    public void testFindAll() throws Exception {
+        List<Location> allLocations = locationRepository.findAll();
+
+        assertNotNull(allLocations);
+        assertEquals(7, allLocations.size());
+    }
+
+}