Updated junit to 4.12 and created a base for the hibernate tests

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/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());
+    }
+
+}