BaseDao testing for DAO v. 2 0 added actionCount for testing

diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/BaseDaoTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/BaseDaoTest.java
index f4007ef3d422242db58611bda78ca5eddefac1b9..59e5d301c15ab64f942633925d803ad18ff29c40 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/db/BaseDaoTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/db/BaseDaoTest.java
@@ -25,8 +25,6 @@ import org.junit.BeforeClass;
 import org.junit.ClassRule;
 import org.junit.Test;
 import org.sonar.api.utils.System2;
-import org.sonar.core.cluster.ClusterAction;
-import org.sonar.core.cluster.WorkQueue;
 import org.sonar.core.persistence.DbSession;
 import org.sonar.core.persistence.MyBatis;
 import org.sonar.core.persistence.TestDatabase;
@@ -35,33 +33,15 @@ import org.sonar.server.db.fake.FakeDto;
 import org.sonar.server.db.fake.FakeMapper;
 
 import java.util.Date;
-import java.util.List;
 import java.util.UUID;
 
 import static org.fest.assertions.Assertions.assertThat;
 
 public class BaseDaoTest {
 
-  public static FakeQueue queue = new FakeQueue();
-
   @ClassRule
   public static TestDatabase db = new TestDatabase()
-    .schema(BaseDaoTest.class, "schema.sql")
-    .setQueue(queue);
-
-  private static class FakeQueue implements WorkQueue<ClusterAction> {
-
-    private int count = 0;
-
-    @Override
-    public void enqueue(List<ClusterAction> actions) {
-      count = actions.size();
-    }
-
-    public int getCount() {
-      return count;
-    }
-  }
+    .schema(BaseDaoTest.class, "schema.sql");
 
   private static final String DTO_ALIAS = "fake";
 
@@ -120,7 +100,7 @@ public class BaseDaoTest {
       .setKey(UUID.randomUUID().toString());
     dao.insert(session, myDto);
     session.commit();
-    assertThat(queue.getCount()).isEqualTo(1);
+    assertThat(session.getActionCount()).isEqualTo(1);
   }
 
   @Test
@@ -133,9 +113,9 @@ public class BaseDaoTest {
     dao.insert(session, myDto);
 
     session.commit();
-    assertThat(queue.getCount()).isEqualTo(1);
+    assertThat(session.getActionCount()).isEqualTo(1);
 
     dao.synchronizeAfter(session, new Date(t0));
-    assertThat(queue.getCount()).isEqualTo(2);
+    assertThat(session.getActionCount()).isEqualTo(2);
   }
 }

diff --git a/sonar-core/src/main/java/org/sonar/core/persistence/DbSession.java b/sonar-core/src/main/java/org/sonar/core/persistence/DbSession.java
index 5e4560c24c0d31e2af119f8a53df404e5aee5319..103ad98297cc50f892a66988c523730a8be0d7e2 100644 (file)
--- a/sonar-core/src/main/java/org/sonar/core/persistence/DbSession.java
+++ b/sonar-core/src/main/java/org/sonar/core/persistence/DbSession.java
@@ -39,6 +39,7 @@ public class DbSession implements SqlSession {
 
   private WorkQueue queue;
   private SqlSession session;
+  private int actionCount = 0;
 
   DbSession(WorkQueue queue, SqlSession session) {
     this.session = session;
@@ -47,12 +48,17 @@ public class DbSession implements SqlSession {
   }
 
   public void enqueue(ClusterAction action) {
+    actionCount++;
     this.actions.add(action);
     if (this.actions.size() > IMPLICIT_COMMIT_SIZE) {
       this.commit();
     }
   }
 
+  public int getActionCount() {
+    return actionCount;
+  }
+
   @Override
   public void commit() {
     session.commit();