added method in TestDataLoader to clear the entity cache without clearing the database

Author: Daniel Behrwind

src/main/groovy/de/triology/blog/testdataloader/TestDataLoader.groovy

@@ -57,7 +57,7 @@ class TestDataLoader {
 
     // TODO: javadoc -> hint that client needs to take care of transaction management when JTA is specified
     TestDataLoader(EntityManager entityManager, TransactionType transactionType) {
-        if(transactionType == null) throw new IllegalArgumentException("transactionType must not be null")
+        if (transactionType == null) throw new IllegalArgumentException("transactionType must not be null")
         checkTransactionType(entityManager, transactionType)
         this.entityManager = entityManager
         entityBuilder = EntityBuilder.instance()
@@ -66,13 +66,13 @@ class TestDataLoader {
     }
 
     private void checkTransactionType(EntityManager entityManager, TransactionType transactionType) {
-        if(transactionType == TransactionType.RESOURCE_LOCAL) {
+        if (transactionType == TransactionType.RESOURCE_LOCAL) {
             makeSureTransactionsAreResourceLocal(entityManager)
         }
     }
 
     private static void makeSureTransactionsAreResourceLocal(EntityManager entityManager) {
-        try{
+        try {
             entityManager.getTransaction()
         } catch (IllegalStateException e) {
             throw new IllegalStateException(
@@ -128,13 +128,21 @@ class TestDataLoader {
      * Clears all previously built entities so that they are no longer available through the {@code getEntityByName}
      * method and deletes all data from the database.
      */
-    void clear() {
+    void clearEntityCacheAndDatabase() {
         withTransaction {
             entityDeleter.deleteAllEntities()
-            entityBuilder.clear();
+            clearEntityCache()
         }
     }
 
+    /**
+     * Clears all previously built entities so that they are no longer available through the {@code getEntityByName}
+     * method.
+     */
+    void clearEntityCache() {
+        entityBuilder.clear();
+    }
+
     private void withTransaction(Closure doWithinTransaction) {
         if (newTransactionRequired()) {
             withNewTransaction(doWithinTransaction)

src/test/java/de/triology/blog/testdataloader/EntityBuilderTest.java

@@ -217,7 +217,7 @@ public void clearsEntities() throws Exception {
             builder.getEntityByName("basicEntity", BasicTestEntity.class);
         } catch (NoSuchElementException e) {
             e.printStackTrace();
-            fail("basicEntity already was not available before calling clear");
+            fail("basicEntity already was not available before calling clearEntityCacheAndDatabase");
         }
 
         builder.clear();

src/test/java/de/triology/blog/testdataloader/TestDataLoaderTest.java

@@ -87,18 +87,18 @@ public void clearsEntitiesFromMemory() throws Exception {
             testDataLoader.getEntityByName("basicEntity", BasicTestEntity.class);
         } catch (NoSuchElementException e) {
             e.printStackTrace();
-            fail("basicEntity already was not available before calling clear");
+            fail("basicEntity already was not available before calling clearEntityCacheAndDatabase");
         }
 
-        testDataLoader.clear();
+        testDataLoader.clearEntityCacheAndDatabase();
         testDataLoader.getEntityByName("basicEntity", BasicTestEntity.class);
     }
 
     @Test
     public void clearsEntitiesFromDatabase() throws Exception {
         when(entityManagerMock.merge(any())).then(returnsFirstArg());
         testDataLoader.loadTestData(Collections.singletonList("tests/testEntityDefinitions.groovy"));
-        testDataLoader.clear();
+        testDataLoader.clearEntityCacheAndDatabase();
         verify(entityManagerMock, times(12)).remove(any());
     }
 

src/test/java/de/triology/blog/testdataloader/demo/Demo.java

@@ -51,7 +51,7 @@ public void setUp() throws Exception {
 
     @After
     public void tearDown() throws Exception {
-        testDataLoader.clear();
+        testDataLoader.clearEntityCacheAndDatabase();
         assertEquals(0L, entityManager.createQuery("select count(u) from User u").getSingleResult());
         assertEquals(0L, entityManager.createQuery("select count(d) from Department d").getSingleResult());
     }