Refactor resetStatistics()

Author: Lemick

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

@@ -25,8 +25,4 @@ public HibernateStatementAssertionResult generateSelectStatementAssertion(int ex
     public HibernateStatementAssertionResult generateDeleteStatementAssertion(int expectedDeleteStatementCount, Supplier<HibernateStatistics> statisticsSupplier) {
         return new HibernateStatementAssertionResult(DELETE, statisticsSupplier.get().getDeleteStatementCount(), expectedDeleteStatementCount);
     }
-
-    public void resetStatistics() {
-        HibernateStatementCountInspector.resetStatistics();
-    }
 }

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

@@ -14,11 +14,6 @@ public String inspect(String sql) {
         return sql;
     }
 
-    public static void resetStatistics() {
-        statisticsStore.remove();
-        statisticsStore.set(new HibernateStatistics());
-    }
-
     public static HibernateStatistics getStatistics() {
         return statisticsStore.get();
     }

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

@@ -7,6 +7,13 @@ public class HibernateStatistics implements HibernateStatementCountListener{
     private int insertStatementCount = 0;
     private int deleteStatementCount = 0;
 
+    public void resetStatistics() {
+        selectStatementCount = 0;
+        updateStatementCount = 0;
+        insertStatementCount = 0;
+        deleteStatementCount = 0;
+    }
+
     @Override
     public void notifySelectStatement() {
         selectStatementCount++;

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

@@ -20,7 +20,7 @@ public class HibernateStatementCountTestListener implements TestExecutionListene
 
     @Override
     public void beforeTestMethod(TestContext testContext) {
-        hibernateStatementAssertionsProvider.resetStatistics();
+        statisticsSupplier.get().resetStatistics();
     }
 
     @Override

src/test/java/com/lemick/integration/hibernate/HibernateStatementCountInspectorTest.java

@@ -25,13 +25,4 @@ public void _inspect() {
         assertEquals("SELECT * FROM Post", actual, "output is the same as the input");
         verify(statementParser, description("parser is called")).parseSqlStatement("SELECT * FROM Post", HibernateStatementCountInspector.getStatistics());
     }
-
-    @Test
-    public void _resetStatistics() {
-        HibernateStatistics beforeStatistics = HibernateStatementCountInspector.getStatistics();
-
-        HibernateStatementCountInspector.resetStatistics();
-
-        assertNotSame(beforeStatistics, HibernateStatementCountInspector.getStatistics(), "the statistics has been recreated");
-    }
 }

src/test/java/com/lemick/integration/hibernate/HibernateStatisticsTest.java

@@ -21,6 +21,21 @@ public void _default_state() {
         assertEquals(0, model.getDeleteStatementCount(), "the count is initialized to 0");
     }
 
+    @Test
+    public void _reset() {
+        model.notifySelectStatement();
+        model.notifyInsertStatement();
+        model.notifyUpdateStatement();
+        model.notifyDeleteStatement();
+
+        model.resetStatistics();
+
+        assertEquals(0, model.getSelectStatementCount(), "the count is reset to 0");
+        assertEquals(0, model.getInsertStatementCount(), "the count is reset to 0");
+        assertEquals(0, model.getUpdateStatementCount(), "the count is reset to 0");
+        assertEquals(0, model.getDeleteStatementCount(), "the count is reset to 0");
+    }
+
     @Test
     public void _notify_increments() {
         model.notifySelectStatement();

src/test/java/com/lemick/integration/spring/HibernateStatementCountTestListenerTest.java

@@ -8,6 +8,7 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
+import org.mockito.Spy;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.test.context.TestContext;
 
@@ -43,16 +44,20 @@ public void notAnnotatedMethod() {
 
     @Test
     public void _beforeTestMethod_no_annotation() {
+        when(statisticsSupplier.get()).thenReturn(mock(HibernateStatistics.class));
+
         model.beforeTestMethod(testContext);
 
-        verify(hibernateStatementAssertUtils, description("the reset method is called")).resetStatistics();
+        verify(statisticsSupplier.get(), description("the reset method is called")).resetStatistics();
     }
 
     @Test
     public void _beforeTestMethod_with_annotation() {
+        when(statisticsSupplier.get()).thenReturn(mock(HibernateStatistics.class));
+
         model.beforeTestMethod(testContext);
 
-        verify(hibernateStatementAssertUtils, description("the reset method is called")).resetStatistics();
+        verify(statisticsSupplier.get(), description("the reset method is called")).resetStatistics();
     }
 
     @Test