KAA-1: Improve cassandra dao unit tests.

kaaproject · Jan 26, 2016 · 5b9418a · 5b9418a
1 parent cff26c8
commit 5b9418a
Show file tree

Hide file tree

Showing 13 changed files with 25 additions and 31 deletions.
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
@@ -24,24 +24,18 @@
 
 public class CustomCassandraCQLUnit extends CassandraCQLUnit {
 
-    private static long DEFAULT_CASSANDRA_TIMEOUT = 20000L;
+    private static long DEFAULT_CASSANDRA_TIMEOUT = 30000L;
-
-    private CQLDataSet dataSet;
-
 
     public CustomCassandraCQLUnit(CQLDataSet dataSet) {
         super(dataSet);
-        this.dataSet = dataSet;
     }
 
     public CustomCassandraCQLUnit(CQLDataSet dataSet, String configurationFileName) {
         super(dataSet, configurationFileName);
-        this.dataSet = dataSet;
     }
 
     public CustomCassandraCQLUnit(CQLDataSet dataSet, String configurationFileName, String hostIp, int port) {
         super(dataSet, configurationFileName, hostIp, port);
-        this.dataSet = dataSet;
     }
 
     @Override

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,11 @@
  */
 package org.kaaproject.kaa.server.common.dao.service;
 
-import org.cassandraunit.CassandraCQLUnit;
 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,7 +30,7 @@
 public class CassandraApplicationServiceImplTest extends ApplicationServiceImplTest {
 
     @ClassRule
-    public static CassandraCQLUnit cassandraUnit = new CassandraCQLUnit(new ClassPathCQLDataSet("cassandra.cql", false, false));
+    public static CustomCassandraCQLUnit cassandraUnit = new CustomCassandraCQLUnit(new ClassPathCQLDataSet("cassandra.cql", false, false));
 
     @AfterClass
     public static void after() throws Exception {

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,11 @@
 
 package org.kaaproject.kaa.server.common.dao.service;
 
-import org.cassandraunit.CassandraCQLUnit;
 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;
@@ -31,7 +31,7 @@
 public class CassandraCTLSchemaServiceImplTest extends CTLServiceImplTest {
 
     @ClassRule
-    public static CassandraCQLUnit cassandraUnit = new CassandraCQLUnit(new ClassPathCQLDataSet("cassandra.cql", false, false));
+    public static CustomCassandraCQLUnit cassandraUnit = new CustomCassandraCQLUnit(new ClassPathCQLDataSet("cassandra.cql", false, false));
 
     @AfterClass
     public static void after() throws Exception {

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,11 @@
  */
 package org.kaaproject.kaa.server.common.dao.service;
 
-import org.cassandraunit.CassandraCQLUnit;
 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,7 +30,7 @@
 public class CassandraConfigurationServiceImplTest extends ConfigurationServiceImplTest {
 
     @ClassRule
-    public static CassandraCQLUnit cassandraUnit = new CassandraCQLUnit(new ClassPathCQLDataSet("cassandra.cql", false, false));
+    public static CustomCassandraCQLUnit cassandraUnit = new CustomCassandraCQLUnit(new ClassPathCQLDataSet("cassandra.cql", false, false));
 
     @AfterClass
     public static void after() throws Exception {

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,11 @@
  */
 package org.kaaproject.kaa.server.common.dao.service;
 
-import org.cassandraunit.CassandraCQLUnit;
 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,7 +30,7 @@
 public class CassandraEndpointServiceImplTest extends EndpointServiceImplTest {
 
     @ClassRule
-    public static CassandraCQLUnit cassandraUnit = new CassandraCQLUnit(new ClassPathCQLDataSet("cassandra.cql", false, false));
+    public static CustomCassandraCQLUnit cassandraUnit = new CustomCassandraCQLUnit(new ClassPathCQLDataSet("cassandra.cql", false, false));
 
     @AfterClass
     public static void after() throws Exception {

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,11 @@
  */
 package org.kaaproject.kaa.server.common.dao.service;
 
-import org.cassandraunit.CassandraCQLUnit;
 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,7 +30,7 @@
 public class CassandraHistoryServiceImplTest extends HistoryServiceImplTest {
 
     @ClassRule
-    public static CassandraCQLUnit cassandraUnit = new CassandraCQLUnit(new ClassPathCQLDataSet("cassandra.cql", false, false));
+    public static CustomCassandraCQLUnit cassandraUnit = new CustomCassandraCQLUnit(new ClassPathCQLDataSet("cassandra.cql", false, false));
 
     @AfterClass
     public static void after() throws Exception {

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,11 @@
  */
 package org.kaaproject.kaa.server.common.dao.service;
 
-import org.cassandraunit.CassandraCQLUnit;
 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,7 +30,7 @@
 public class CassandraLogAppenderServiceImplTest extends LogAppenderServiceImplTest {
 
     @ClassRule
-    public static CassandraCQLUnit cassandraUnit = new CassandraCQLUnit(new ClassPathCQLDataSet("cassandra.cql", false, false));
+    public static CustomCassandraCQLUnit cassandraUnit = new CustomCassandraCQLUnit(new ClassPathCQLDataSet("cassandra.cql", false, false));
 
     @AfterClass
     public static void after() throws Exception {

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,11 @@
  */
 package org.kaaproject.kaa.server.common.dao.service;
 
-import org.cassandraunit.CassandraCQLUnit;
 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,7 +30,7 @@
 public class CassandraLogSchemaServiceImplTest extends LogSchemaServiceImplTest {
 
     @ClassRule
-    public static CassandraCQLUnit cassandraUnit = new CassandraCQLUnit(new ClassPathCQLDataSet("cassandra.cql", false, false));
+    public static CustomCassandraCQLUnit cassandraUnit = new CustomCassandraCQLUnit(new ClassPathCQLDataSet("cassandra.cql", false, false));
 
     @AfterClass
     public static void after() throws Exception {

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,11 @@
  */
 package org.kaaproject.kaa.server.common.dao.service;
 
-import org.cassandraunit.CassandraCQLUnit;
 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,7 +30,7 @@
 public class CassandraProfileServiceImplTest extends ProfileServiceImplTest {
 
     @ClassRule
-    public static CassandraCQLUnit cassandraUnit = new CassandraCQLUnit(new ClassPathCQLDataSet("cassandra.cql", false, false));
+    public static CustomCassandraCQLUnit cassandraUnit = new CustomCassandraCQLUnit(new ClassPathCQLDataSet("cassandra.cql", false, false));
 
     @AfterClass
     public static void after() throws Exception {

diff --git a/.../java/org/kaaproject/kaa/server/common/dao/service/CassandraServerProfileServiceImpl.java b/.../java/org/kaaproject/kaa/server/common/dao/service/CassandraServerProfileServiceImpl.java
@@ -16,11 +16,11 @@
 
 package org.kaaproject.kaa.server.common.dao.service;
 
-import org.cassandraunit.CassandraCQLUnit;
 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;
@@ -31,7 +31,7 @@
 public class CassandraServerProfileServiceImpl extends ServerProfileServiceImplTest {
 
     @ClassRule
-    public static CassandraCQLUnit cassandraUnit = new CassandraCQLUnit(new ClassPathCQLDataSet("cassandra.cql", false, false));
+    public static CustomCassandraCQLUnit cassandraUnit = new CustomCassandraCQLUnit(new ClassPathCQLDataSet("cassandra.cql", false, false));
 
     @AfterClass
     public static void after() throws Exception {

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,11 @@
  */
 package org.kaaproject.kaa.server.common.dao.service;
 
-import org.cassandraunit.CassandraCQLUnit;
 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,7 +30,7 @@
 public class CassandraTopicServiceImplTest extends TopicServiceImplTest {
 
     @ClassRule
-    public static CassandraCQLUnit cassandraUnit = new CassandraCQLUnit(new ClassPathCQLDataSet("cassandra.cql", false, false));
+    public static CustomCassandraCQLUnit cassandraUnit = new CustomCassandraCQLUnit(new ClassPathCQLDataSet("cassandra.cql", false, false));
 
     @AfterClass
     public static void after() throws Exception {

diff --git a/...g/kaaproject/kaa/server/common/dao/service/CassandraUserConfigurationServiceImplTest.java b/...g/kaaproject/kaa/server/common/dao/service/CassandraUserConfigurationServiceImplTest.java
@@ -15,11 +15,11 @@
  */
 package org.kaaproject.kaa.server.common.dao.service;
 
-import org.cassandraunit.CassandraCQLUnit;
 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,7 +30,7 @@
 public class CassandraUserConfigurationServiceImplTest  extends UserConfigurationServiceImplTest {
 
     @ClassRule
-    public static CassandraCQLUnit cassandraUnit = new CassandraCQLUnit(new ClassPathCQLDataSet("cassandra.cql", false, false));
+    public static CustomCassandraCQLUnit cassandraUnit = new CustomCassandraCQLUnit(new ClassPathCQLDataSet("cassandra.cql", false, false));
 
     @AfterClass
     public static void after() throws Exception {

diff --git a/.../test/java/org/kaaproject/kaa/server/common/dao/service/CassandraUserServiceImplTest.java b/.../test/java/org/kaaproject/kaa/server/common/dao/service/CassandraUserServiceImplTest.java
@@ -15,11 +15,11 @@
  */
 package org.kaaproject.kaa.server.common.dao.service;
 
-import org.cassandraunit.CassandraCQLUnit;
 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,7 +30,7 @@
 public class CassandraUserServiceImplTest extends UserServiceImplTest {
 
     @ClassRule
-    public static CassandraCQLUnit cassandraUnit = new CassandraCQLUnit(new ClassPathCQLDataSet("cassandra.cql", false, false));
+    public static CustomCassandraCQLUnit cassandraUnit = new CustomCassandraCQLUnit(new ClassPathCQLDataSet("cassandra.cql", false, false));
 
     @AfterClass
     public static void after() throws Exception {