Improve tests & thread-safety

Author: Lemick

.idea/uiDesigner.xml

@@ -7,19 +7,23 @@
 
 public class HibernateStatementAssertUtils {
 
-    public static HibernateStatementAssertionResult assertInsertStatementCount(int expectedInsertStatementCount) {
-        return new HibernateStatementAssertionResult(SELECT, HibernateStatementCountInspector.getInsertStatementCount(), expectedInsertStatementCount);
+    public HibernateStatementAssertionResult assertInsertStatementCount(int expectedInsertStatementCount) {
+        return new HibernateStatementAssertionResult(INSERT, HibernateStatementCountInspector.getStatistics().getInsertStatementCount(), expectedInsertStatementCount);
     }
 
-    public static HibernateStatementAssertionResult assertUpdateStatementCount(int expectedUpdateStatementCount) {
-        return new HibernateStatementAssertionResult(UPDATE, HibernateStatementCountInspector.getUpdateStatementCount(), expectedUpdateStatementCount);
+    public HibernateStatementAssertionResult assertUpdateStatementCount(int expectedUpdateStatementCount) {
+        return new HibernateStatementAssertionResult(UPDATE, HibernateStatementCountInspector.getStatistics().getUpdateStatementCount(), expectedUpdateStatementCount);
     }
 
-    public static HibernateStatementAssertionResult assertSelectStatementCount(int expectedSelectStatementCount) {
-        return new HibernateStatementAssertionResult(SELECT, HibernateStatementCountInspector.getSelectStatementCount(), expectedSelectStatementCount);
+    public HibernateStatementAssertionResult assertSelectStatementCount(int expectedSelectStatementCount) {
+        return new HibernateStatementAssertionResult(SELECT, HibernateStatementCountInspector.getStatistics().getSelectStatementCount(), expectedSelectStatementCount);
     }
 
-    public static HibernateStatementAssertionResult assertDeleteStatementCount(int expectedDeleteStatementCount) {
-        return new HibernateStatementAssertionResult(DELETE, HibernateStatementCountInspector.getDeleteStatementCount(), expectedDeleteStatementCount);
+    public HibernateStatementAssertionResult assertDeleteStatementCount(int expectedDeleteStatementCount) {
+        return new HibernateStatementAssertionResult(DELETE, HibernateStatementCountInspector.getStatistics().getDeleteStatementCount(), expectedDeleteStatementCount);
+    }
+
+    public void resetCounts() {
+        HibernateStatementCountInspector.resetStatistics();
     }
 }

src/main/java/com/lemick/assertions/HibernateStatementAssertUtils.java

@@ -2,61 +2,25 @@
 
 import org.hibernate.resource.jdbc.spi.StatementInspector;
 
-public class HibernateStatementCountInspector implements StatementInspector, HibernateStatementCountListener {
+public class HibernateStatementCountInspector implements StatementInspector {
 
-    private static int selectStatementCount = 0;
-    private static int updateStatementCount = 0;
-    private static int insertStatementCount = 0;
-    private static int deleteStatementCount = 0;
+    private static final ThreadLocal<HibernateStatistics> statisticsStore = ThreadLocal.withInitial(HibernateStatistics::new);
 
     private HibernateStatementParser statementParser = new JSQLHibernateStatementParser();
 
     @Override
     public String inspect(String sql) {
-        statementParser.parseSqlStatement(sql, this);
+        statementParser.parseSqlStatement(sql, statisticsStore.get());
         return sql;
     }
 
-    @Override
-    public void notifySelectStatement() {
-        selectStatementCount++;
+    public static void resetStatistics() {
+        statisticsStore.remove();
+        statisticsStore.set(new HibernateStatistics());
     }
 
-    @Override
-    public void notifyUpdateStatement() {
-        updateStatementCount++;
-    }
-
-    @Override
-    public void notifyInsertStatement() {
-        insertStatementCount++;
+    public static HibernateStatistics getStatistics() {
+        return statisticsStore.get();
     }
 
-    @Override
-    public void notifyDeleteStatement() {
-        deleteStatementCount++;
-    }
-
-    public static void resetCounts() {
-        selectStatementCount = 0;
-        updateStatementCount = 0;
-        insertStatementCount = 0;
-        deleteStatementCount = 0;
-    }
-
-    public static int getSelectStatementCount() {
-        return selectStatementCount;
-    }
-
-    public static int getUpdateStatementCount() {
-        return updateStatementCount;
-    }
-
-    public static int getInsertStatementCount() {
-        return insertStatementCount;
-    }
-
-    public static int getDeleteStatementCount() {
-        return deleteStatementCount;
-    }
 }

src/main/java/com/lemick/integration/hibernate/HibernateStatementCountInspector.java

@@ -0,0 +1,45 @@
+package com.lemick.integration.hibernate;
+
+public class HibernateStatistics implements HibernateStatementCountListener{
+
+    private int selectStatementCount = 0;
+    private int updateStatementCount = 0;
+    private int insertStatementCount = 0;
+    private int deleteStatementCount = 0;
+
+    @Override
+    public void notifySelectStatement() {
+        selectStatementCount++;
+    }
+
+    @Override
+    public void notifyUpdateStatement() {
+        updateStatementCount++;
+    }
+
+    @Override
+    public void notifyInsertStatement() {
+        insertStatementCount++;
+    }
+
+    @Override
+    public void notifyDeleteStatement() {
+        deleteStatementCount++;
+    }
+
+    public int getSelectStatementCount() {
+        return selectStatementCount;
+    }
+
+    public int getUpdateStatementCount() {
+        return updateStatementCount;
+    }
+
+    public int getInsertStatementCount() {
+        return insertStatementCount;
+    }
+
+    public int getDeleteStatementCount() {
+        return deleteStatementCount;
+    }
+}

src/main/java/com/lemick/integration/hibernate/HibernateStatistics.java

@@ -4,20 +4,27 @@
 import com.lemick.api.AssertSQLStatementCount;
 import com.lemick.assertions.HibernateStatementAssertUtils;
 import com.lemick.assertions.HibernateStatementAssertionResults;
-import com.lemick.integration.hibernate.HibernateStatementCountInspector;
 import org.springframework.core.Ordered;
 import org.springframework.test.context.TestContext;
 import org.springframework.test.context.TestExecutionListener;
 
 import java.util.List;
 
+/**
+ * TODO
+ * Permettre les asserts dans le test
+ * Augmenter les type d'assert (mise en cache, etc...)
+ * Classe Thread-safe
+ */
 public class HibernateStatementCountTestListener implements TestExecutionListener, Ordered {
 
+    private HibernateStatementAssertUtils hibernateStatementAssertUtils = new HibernateStatementAssertUtils();
+
     @Override
     public void beforeTestMethod(TestContext testContext) {
         AssertSQLStatementCount annotation = testContext.getTestMethod().getAnnotation(AssertSQLStatementCount.class);
         if (annotation != null) {
-            HibernateStatementCountInspector.resetCounts();
+            hibernateStatementAssertUtils.resetCounts();
         }
     }
 
@@ -26,10 +33,10 @@ public void afterTestMethod(TestContext testContext) {
         AssertSQLStatementCount annotation = testContext.getTestMethod().getAnnotation(AssertSQLStatementCount.class);
         if (annotation != null) {
             HibernateStatementAssertionResults assertionResults = new HibernateStatementAssertionResults(List.of(
-                    HibernateStatementAssertUtils.assertSelectStatementCount(annotation.selects()),
-                    HibernateStatementAssertUtils.assertUpdateStatementCount(annotation.updates()),
-                    HibernateStatementAssertUtils.assertInsertStatementCount(annotation.inserts()),
-                    HibernateStatementAssertUtils.assertDeleteStatementCount(annotation.deletes())
+                    hibernateStatementAssertUtils.assertSelectStatementCount(annotation.selects()),
+                    hibernateStatementAssertUtils.assertUpdateStatementCount(annotation.updates()),
+                    hibernateStatementAssertUtils.assertInsertStatementCount(annotation.inserts()),
+                    hibernateStatementAssertUtils.assertDeleteStatementCount(annotation.deletes())
             ));
             assertionResults.validate();
         }

src/main/java/com/lemick/integration/spring/HibernateStatementCountTestListener.java

@@ -7,8 +7,7 @@
 import org.mockito.junit.jupiter.MockitoExtension;
 
 import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.Mockito.description;
-import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.*;
 
 @ExtendWith(MockitoExtension.class)
 class HibernateStatementCountInspectorTest {
@@ -24,26 +23,15 @@ public void _inspect() {
         String actual = model.inspect("SELECT * FROM Post");
 
         assertEquals("SELECT * FROM Post", actual, "output is the same as the input");
-        verify(statementParser, description("parser is called")).parseSqlStatement("SELECT * FROM Post", model);
+        verify(statementParser, description("parser is called")).parseSqlStatement("SELECT * FROM Post", HibernateStatementCountInspector.getStatistics());
     }
 
     @Test
-    public void _notify_increments() {
-        model.notifySelectStatement();
-        model.notifyInsertStatement();
-        model.notifyUpdateStatement();
-        model.notifyDeleteStatement();
-
-        assertEquals(1, HibernateStatementCountInspector.getSelectStatementCount(), "the count is incremented");
-        assertEquals(1, HibernateStatementCountInspector.getInsertStatementCount(), "the count is incremented");
-        assertEquals(1, HibernateStatementCountInspector.getUpdateStatementCount(), "the count is incremented");
-        assertEquals(1, HibernateStatementCountInspector.getDeleteStatementCount(), "the count is incremented");
-
-        HibernateStatementCountInspector.resetCounts();
-
-        assertEquals(0, HibernateStatementCountInspector.getSelectStatementCount(), "the count is reset");
-        assertEquals(0, HibernateStatementCountInspector.getInsertStatementCount(), "the count is reset");
-        assertEquals(0, HibernateStatementCountInspector.getUpdateStatementCount(), "the count is reset");
-        assertEquals(0, HibernateStatementCountInspector.getDeleteStatementCount(), "the count is reset");
+    public void _resetStatistics() {
+        HibernateStatistics beforeStatistics = HibernateStatementCountInspector.getStatistics();
+
+        HibernateStatementCountInspector.resetStatistics();
+
+        assertNotSame(beforeStatistics, HibernateStatementCountInspector.getStatistics(), "the statistics has been recreated");
     }
 }