Add L2C tracking of hits, misses and puts | Renaming

Author: Lemick

README.md

@@ -29,9 +29,9 @@ The assertion will work seamlessly whether you're testing Spring repositories or
             blogPostRepository.save(post_2);
         }
 
-    If the actual count is different, an exception is thrown with the executed statements:
+If the actual count is different, an exception is thrown with the executed statements:
 
-        com.mickaelb.assertions.HibernateStatementCountException: 
+        com.mickaelb.assertions.HibernateAssertCountException: 
         Expected 5 INSERT but got 6:
              => '/* insert com.lemick.demo.entity.BlogPost */ insert into blog_post (id, title) values (default, ?)'
              => '/* insert com.lemick.demo.entity.PostComment */ insert into post_comment (id, blog_post_id, content) values (default, ?, ?)'
@@ -54,7 +54,7 @@ The assertion will work seamlessly whether you're testing Spring repositories or
         spring:
             jpa:
                 properties:
-                    hibernate.session_factory.statement_inspector: com.mickaelb.integration.hibernate.HibernateStatementCountInspector
+                    hibernate.session_factory.statement_inspector: com.mickaelb.integration.hibernate.HibernateStatementInspector
 
 3. Register the Spring TestListener that will launch the SQL inspection if the annotation is present:
 
@@ -71,5 +71,5 @@ The assertion will work seamlessly whether you're testing Spring repositories or
 
     * **OR** by adding a **META-INF/spring.factories** file that contains the definition, that will register the listener for all your tests:
 
-	      org.springframework.test.context.TestExecutionListener=com.mickaelb.integration.spring.HibernateStatementCountTestListener
+	      org.springframework.test.context.TestExecutionListener=com.mickaelb.integration.spring.HibernateAssertTestListener
 

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.mickaelb</groupId>
     <artifactId>hibernate-query-asserts</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.0.0</version>
 
     <name>${project.groupId}:${project.artifactId}</name>
     <description>A library that can assert SQL statement count generated by Hibernate in Spring tests</description>

src/main/java/com/mickaelb/api/AssertHibernateL2CCount.java

@@ -0,0 +1,17 @@
+package com.mickaelb.api;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface AssertHibernateL2CCount {
+
+    int hits() default 0;
+
+    int misses() default 0;
+
+    int puts() default 0;
+}

src/main/java/com/mickaelb/assertions/HibernateStatementCountException.java

@@ -6,9 +6,9 @@
  * NOT Thread-Safe since it is meant to be used by Spring tests that are not multi-threaded
  * ThreadLocal does not work because a test can span on multiple threads (ex: a test executing a HTTP request on the server)
  */
-public class HibernateStatementCountInspector implements StatementInspector {
+public class HibernateStatementInspector implements StatementInspector {
 
-    private static final HibernateStatistics statistics = new HibernateStatistics();
+    private static final HibernateStatementStatistics statistics = new HibernateStatementStatistics();
 
     private HibernateStatementParser statementParser = new JSQLHibernateStatementParser();
 
@@ -18,7 +18,7 @@ public String inspect(String sql) {
         return sql;
     }
 
-    public static HibernateStatistics getStatistics() {
+    public static HibernateStatementStatistics getStatistics() {
         return statistics;
     }
 

src/main/java/com/mickaelb/integration/hibernate/HibernateStatementCountInspector.java renamed to src/main/java/com/mickaelb/integration/hibernate/HibernateStatementInspector.java

@@ -1,6 +1,6 @@
 package com.mickaelb.integration.hibernate;
 
-public interface HibernateStatementCountListener {
+public interface HibernateStatementListener {
 
     void notifySelectStatement(String sql);
     void notifyUpdateStatement(String sql);

src/main/java/com/mickaelb/integration/hibernate/HibernateStatementCountListener.java renamed to src/main/java/com/mickaelb/integration/hibernate/HibernateStatementListener.java

@@ -2,5 +2,5 @@
 
 public interface HibernateStatementParser {
 
-    void parseSqlStatement(String sql, HibernateStatementCountListener statementCountListener);
+    void parseSqlStatement(String sql, HibernateStatementListener statementCountListener);
 }

src/main/java/com/mickaelb/integration/hibernate/HibernateStatementParser.java

@@ -3,7 +3,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-public class HibernateStatistics implements HibernateStatementCountListener{
+public class HibernateStatementStatistics implements HibernateStatementListener {
 
     private final List<String> selectStatements = new ArrayList<>();
     private final List<String> updateStatements = new ArrayList<>();

src/main/java/com/mickaelb/integration/hibernate/HibernateStatistics.java renamed to src/main/java/com/mickaelb/integration/hibernate/HibernateStatementStatistics.java

@@ -12,7 +12,7 @@
 public class JSQLHibernateStatementParser implements HibernateStatementParser {
 
     @Override
-    public void parseSqlStatement(String sql, HibernateStatementCountListener statementCountListener) {
+    public void parseSqlStatement(String sql, HibernateStatementListener statementCountListener) {
         try {
             Statement statement = CCJSqlParserUtil.parse(sql);
             statement.accept(new StatementVisitorAdapter() {

src/main/java/com/mickaelb/integration/hibernate/JSQLHibernateStatementParser.java

@@ -0,0 +1,10 @@
+package com.mickaelb.integration.spring;
+
+import org.springframework.test.context.TestContext;
+
+public interface AssertTestListener {
+
+   void beforeTestClass(TestContext testContext);
+   void beforeTestMethod(TestContext testContext);
+   void afterTestMethod(TestContext testContext);
+}