KAA-1: Improve cassandra dao unit tests. Fix kaa node tests.

kaaproject · Jan 27, 2016 · a5c6f36 · a5c6f36
1 parent 1da2f36
commit a5c6f36
Show file tree

Hide file tree

Showing 18 changed files with 80 additions and 237 deletions.
diff --git a/...ain/java/org/kaaproject/kaa/server/common/dao/impl/sql/HibernateCTLSchemaMetaInfoDao.java b/...ain/java/org/kaaproject/kaa/server/common/dao/impl/sql/HibernateCTLSchemaMetaInfoDao.java
@@ -71,7 +71,7 @@ public CTLSchemaMetaInfo incrementCount(CTLSchemaMetaInfo metaInfo) {
     }
 
     @Override
-    @Transactional(readOnly = true, propagation = Propagation.SUPPORTS)
+    @Transactional(readOnly = true, propagation = Propagation.REQUIRES_NEW)
     public CTLSchemaMetaInfo findByFqnAndVersion(String fqn, Integer version) {
         LOG.debug("Searching ctl metadata by fqn [{}] and version [{}]", fqn, version);
         CTLSchemaMetaInfo ctlSchema = findOneByCriterion(Restrictions.and(

diff --git a/server/common/nosql/cassandra-dao/pom.xml b/server/common/nosql/cassandra-dao/pom.xml
@@ -75,6 +75,11 @@
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.takari.junit</groupId>
+            <artifactId>takari-cpsuite</artifactId>
+            <version>1.2.7</version>
+        </dependency>        
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
@@ -126,6 +131,15 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <includes>
+                        <include>**/*TestSuite.java</include>
+                    </includes>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/...osql/cassandra-dao/src/test/java/org/kaaproject/kaa/server/common/CassandraTestSuite.java b/...osql/cassandra-dao/src/test/java/org/kaaproject/kaa/server/common/CassandraTestSuite.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2014-2016 CyberVision, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.kaaproject.kaa.server.common;
+
+import org.cassandraunit.CassandraCQLUnit;
+import org.cassandraunit.dataset.cql.ClassPathCQLDataSet;
+import org.junit.ClassRule;
+import org.junit.extensions.cpsuite.ClasspathSuite;
+import org.junit.extensions.cpsuite.ClasspathSuite.ClassnameFilters;
+import org.junit.runner.RunWith;
+
+@RunWith(ClasspathSuite.class)
+@ClassnameFilters({"org.kaaproject.kaa.server.common.dao.service.Cassandra.*Test", 
+                   "org.kaaproject.kaa.server.common.nosql.cassandra.dao.*Test"})
+public class CassandraTestSuite {
+
+    @ClassRule
+    public static CassandraCQLUnit cassandraUnit = new CassandraCQLUnit(new ClassPathCQLDataSet("cassandra.cql", false, false));
+
+}
diff --git a/.../cassandra-dao/src/test/java/org/kaaproject/kaa/server/common/CustomCassandraCQLUnit.java b/.../cassandra-dao/src/test/java/org/kaaproject/kaa/server/common/CustomCassandraCQLUnit.java
diff --git a/...ava/org/kaaproject/kaa/server/common/dao/service/CassandraApplicationServiceImplTest.java b/...ava/org/kaaproject/kaa/server/common/dao/service/CassandraApplicationServiceImplTest.java
@@ -15,11 +15,7 @@
  */
 package org.kaaproject.kaa.server.common.dao.service;
 
-import org.cassandraunit.dataset.cql.ClassPathCQLDataSet;
-import org.junit.AfterClass;
-import org.junit.ClassRule;
 import org.junit.runner.RunWith;
-import org.kaaproject.kaa.server.common.CustomCassandraCQLUnit;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -29,13 +25,4 @@
 @DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_CLASS)
 public class CassandraApplicationServiceImplTest extends ApplicationServiceImplTest {
 
-    @ClassRule
-    public static CustomCassandraCQLUnit cassandraUnit = new CustomCassandraCQLUnit(new ClassPathCQLDataSet("cassandra.cql", false, false));
-
-    @AfterClass
-    public static void after() throws Exception {
-        cassandraUnit.cluster.close();
-        while (!cassandraUnit.cluster.isClosed()) {
-        }
-    }
 }
diff --git a/.../java/org/kaaproject/kaa/server/common/dao/service/CassandraCTLSchemaServiceImplTest.java b/.../java/org/kaaproject/kaa/server/common/dao/service/CassandraCTLSchemaServiceImplTest.java
@@ -16,11 +16,7 @@
 
 package org.kaaproject.kaa.server.common.dao.service;
 
-import org.cassandraunit.dataset.cql.ClassPathCQLDataSet;
-import org.junit.AfterClass;
-import org.junit.ClassRule;
 import org.junit.runner.RunWith;
-import org.kaaproject.kaa.server.common.CustomCassandraCQLUnit;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -30,12 +26,4 @@
 @DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_CLASS)
 public class CassandraCTLSchemaServiceImplTest extends CTLServiceImplTest {
 
-    @ClassRule
-    public static CustomCassandraCQLUnit cassandraUnit = new CustomCassandraCQLUnit(new ClassPathCQLDataSet("cassandra.cql", false, false));
-
-    @AfterClass
-    public static void after() throws Exception {
-        cassandraUnit.cluster.close();
-        while (!cassandraUnit.cluster.isClosed()){}
-    }
 }
diff --git a/...a/org/kaaproject/kaa/server/common/dao/service/CassandraConfigurationServiceImplTest.java b/...a/org/kaaproject/kaa/server/common/dao/service/CassandraConfigurationServiceImplTest.java
@@ -15,11 +15,7 @@
  */
 package org.kaaproject.kaa.server.common.dao.service;
 
-import org.cassandraunit.dataset.cql.ClassPathCQLDataSet;
-import org.junit.AfterClass;
-import org.junit.ClassRule;
 import org.junit.runner.RunWith;
-import org.kaaproject.kaa.server.common.CustomCassandraCQLUnit;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -29,13 +25,4 @@
 @DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_CLASS)
 public class CassandraConfigurationServiceImplTest extends ConfigurationServiceImplTest {
 
-    @ClassRule
-    public static CustomCassandraCQLUnit cassandraUnit = new CustomCassandraCQLUnit(new ClassPathCQLDataSet("cassandra.cql", false, false));
-
-    @AfterClass
-    public static void after() throws Exception {
-        cassandraUnit.cluster.close();
-        while (!cassandraUnit.cluster.isClosed()){}
-    }
-
 }
diff --git a/...t/java/org/kaaproject/kaa/server/common/dao/service/CassandraEndpointServiceImplTest.java b/...t/java/org/kaaproject/kaa/server/common/dao/service/CassandraEndpointServiceImplTest.java
@@ -15,11 +15,7 @@
  */
 package org.kaaproject.kaa.server.common.dao.service;
 
-import org.cassandraunit.dataset.cql.ClassPathCQLDataSet;
-import org.junit.AfterClass;
-import org.junit.ClassRule;
 import org.junit.runner.RunWith;
-import org.kaaproject.kaa.server.common.CustomCassandraCQLUnit;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -29,13 +25,4 @@
 @DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_CLASS)
 public class CassandraEndpointServiceImplTest extends EndpointServiceImplTest {
 
-    @ClassRule
-    public static CustomCassandraCQLUnit cassandraUnit = new CustomCassandraCQLUnit(new ClassPathCQLDataSet("cassandra.cql", false, false));
-
-    @AfterClass
-    public static void after() throws Exception {
-        cassandraUnit.cluster.close();
-        while (!cassandraUnit.cluster.isClosed()){}
-    }
-
 }
diff --git a/...st/java/org/kaaproject/kaa/server/common/dao/service/CassandraHistoryServiceImplTest.java b/...st/java/org/kaaproject/kaa/server/common/dao/service/CassandraHistoryServiceImplTest.java
@@ -15,11 +15,7 @@
  */
 package org.kaaproject.kaa.server.common.dao.service;
 
-import org.cassandraunit.dataset.cql.ClassPathCQLDataSet;
-import org.junit.AfterClass;
-import org.junit.ClassRule;
 import org.junit.runner.RunWith;
-import org.kaaproject.kaa.server.common.CustomCassandraCQLUnit;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -29,13 +25,4 @@
 @DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_CLASS)
 public class CassandraHistoryServiceImplTest extends HistoryServiceImplTest {
 
-    @ClassRule
-    public static CustomCassandraCQLUnit cassandraUnit = new CustomCassandraCQLUnit(new ClassPathCQLDataSet("cassandra.cql", false, false));
-
-    @AfterClass
-    public static void after() throws Exception {
-        cassandraUnit.cluster.close();
-        while (!cassandraUnit.cluster.isClosed()){}
-    }
-
 }
diff --git a/...ava/org/kaaproject/kaa/server/common/dao/service/CassandraLogAppenderServiceImplTest.java b/...ava/org/kaaproject/kaa/server/common/dao/service/CassandraLogAppenderServiceImplTest.java
@@ -15,11 +15,7 @@
  */
 package org.kaaproject.kaa.server.common.dao.service;
 
-import org.cassandraunit.dataset.cql.ClassPathCQLDataSet;
-import org.junit.AfterClass;
-import org.junit.ClassRule;
 import org.junit.runner.RunWith;
-import org.kaaproject.kaa.server.common.CustomCassandraCQLUnit;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -29,13 +25,4 @@
 @DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_CLASS)
 public class CassandraLogAppenderServiceImplTest extends LogAppenderServiceImplTest {
 
-    @ClassRule
-    public static CustomCassandraCQLUnit cassandraUnit = new CustomCassandraCQLUnit(new ClassPathCQLDataSet("cassandra.cql", false, false));
-
-    @AfterClass
-    public static void after() throws Exception {
-        cassandraUnit.cluster.close();
-        while (!cassandraUnit.cluster.isClosed()){}
-    }
-
 }
diff --git a/.../java/org/kaaproject/kaa/server/common/dao/service/CassandraLogSchemaServiceImplTest.java b/.../java/org/kaaproject/kaa/server/common/dao/service/CassandraLogSchemaServiceImplTest.java
@@ -15,11 +15,7 @@
  */
 package org.kaaproject.kaa.server.common.dao.service;
 
-import org.cassandraunit.dataset.cql.ClassPathCQLDataSet;
-import org.junit.AfterClass;
-import org.junit.ClassRule;
 import org.junit.runner.RunWith;
-import org.kaaproject.kaa.server.common.CustomCassandraCQLUnit;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -29,12 +25,4 @@
 @DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_CLASS)
 public class CassandraLogSchemaServiceImplTest extends LogSchemaServiceImplTest {
 
-    @ClassRule
-    public static CustomCassandraCQLUnit cassandraUnit = new CustomCassandraCQLUnit(new ClassPathCQLDataSet("cassandra.cql", false, false));
-
-    @AfterClass
-    public static void after() throws Exception {
-        cassandraUnit.cluster.close();
-        while (!cassandraUnit.cluster.isClosed()){}
-    }
 }
diff --git a/...st/java/org/kaaproject/kaa/server/common/dao/service/CassandraProfileServiceImplTest.java b/...st/java/org/kaaproject/kaa/server/common/dao/service/CassandraProfileServiceImplTest.java
@@ -15,11 +15,7 @@
  */
 package org.kaaproject.kaa.server.common.dao.service;
 
-import org.cassandraunit.dataset.cql.ClassPathCQLDataSet;
-import org.junit.AfterClass;
-import org.junit.ClassRule;
 import org.junit.runner.RunWith;
-import org.kaaproject.kaa.server.common.CustomCassandraCQLUnit;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -29,13 +25,4 @@
 @DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_CLASS)
 public class CassandraProfileServiceImplTest extends ProfileServiceImplTest {
 
-    @ClassRule
-    public static CustomCassandraCQLUnit cassandraUnit = new CustomCassandraCQLUnit(new ClassPathCQLDataSet("cassandra.cql", false, false));
-
-    @AfterClass
-    public static void after() throws Exception {
-        cassandraUnit.cluster.close();
-        while (!cassandraUnit.cluster.isClosed()){}
-    }
-
 }
diff --git a/...ce/CassandraServerProfileServiceImpl.java → ...assandraServerProfileServiceImplTest.java b/...ce/CassandraServerProfileServiceImpl.java → ...assandraServerProfileServiceImplTest.java
@@ -16,27 +16,15 @@
 
 package org.kaaproject.kaa.server.common.dao.service;
 
-import org.cassandraunit.dataset.cql.ClassPathCQLDataSet;
-import org.junit.AfterClass;
-import org.junit.ClassRule;
 import org.junit.runner.RunWith;
-import org.kaaproject.kaa.server.common.CustomCassandraCQLUnit;
+import org.kaaproject.kaa.server.common.dao.service.ServerProfileServiceImplTest;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = "/cassandra-dao-test-context.xml")
 @DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_CLASS)
-public class CassandraServerProfileServiceImpl extends ServerProfileServiceImplTest {
+public class CassandraServerProfileServiceImplTest extends ServerProfileServiceImplTest {
 
-    @ClassRule
-    public static CustomCassandraCQLUnit cassandraUnit = new CustomCassandraCQLUnit(new ClassPathCQLDataSet("cassandra.cql", false, false));
-
-    @AfterClass
-    public static void after() throws Exception {
-        cassandraUnit.cluster.close();
-        while (!cassandraUnit.cluster.isClosed()) {
-        }
-    }
 }
diff --git a/...test/java/org/kaaproject/kaa/server/common/dao/service/CassandraTopicServiceImplTest.java b/...test/java/org/kaaproject/kaa/server/common/dao/service/CassandraTopicServiceImplTest.java
@@ -15,11 +15,7 @@
  */
 package org.kaaproject.kaa.server.common.dao.service;
 
-import org.cassandraunit.dataset.cql.ClassPathCQLDataSet;
-import org.junit.AfterClass;
-import org.junit.ClassRule;
 import org.junit.runner.RunWith;
-import org.kaaproject.kaa.server.common.CustomCassandraCQLUnit;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -29,12 +25,4 @@
 @DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_CLASS)
 public class CassandraTopicServiceImplTest extends TopicServiceImplTest {
 
-    @ClassRule
-    public static CustomCassandraCQLUnit cassandraUnit = new CustomCassandraCQLUnit(new ClassPathCQLDataSet("cassandra.cql", false, false));
-
-    @AfterClass
-    public static void after() throws Exception {
-        cassandraUnit.cluster.close();
-        while (!cassandraUnit.cluster.isClosed()){}
-    }
 }