diff --git a/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/impl/sql/HibernateCTLSchemaMetaInfoDao.java b/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/impl/sql/HibernateCTLSchemaMetaInfoDao.java index d195658358..d27ebc8cd9 100644 --- a/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/impl/sql/HibernateCTLSchemaMetaInfoDao.java +++ b/server/common/dao/src/main/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 index 181d285272..d0d80183e2 100644 --- a/server/common/nosql/cassandra-dao/pom.xml +++ b/server/common/nosql/cassandra-dao/pom.xml @@ -75,6 +75,11 @@ junit junit + + io.takari.junit + takari-cpsuite + 1.2.7 + com.google.guava guava @@ -126,6 +131,15 @@ + + org.apache.maven.plugins + maven-surefire-plugin + + + **/*TestSuite.java + + + diff --git a/server/common/nosql/cassandra-dao/src/test/java/org/kaaproject/kaa/server/common/CassandraTestSuite.java b/server/common/nosql/cassandra-dao/src/test/java/org/kaaproject/kaa/server/common/CassandraTestSuite.java new file mode 100644 index 0000000000..8301c9a9b2 --- /dev/null +++ b/server/common/nosql/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/server/common/nosql/cassandra-dao/src/test/java/org/kaaproject/kaa/server/common/CustomCassandraCQLUnit.java b/server/common/nosql/cassandra-dao/src/test/java/org/kaaproject/kaa/server/common/CustomCassandraCQLUnit.java deleted file mode 100644 index bce6b11187..0000000000 --- a/server/common/nosql/cassandra-dao/src/test/java/org/kaaproject/kaa/server/common/CustomCassandraCQLUnit.java +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Copyright 2014 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.CQLDataSet; -import org.cassandraunit.utils.EmbeddedCassandraServerHelper; - -import java.util.concurrent.TimeUnit; - -public class CustomCassandraCQLUnit extends CassandraCQLUnit { - - private static long DEFAULT_CASSANDRA_TIMEOUT = 30000L; - - public CustomCassandraCQLUnit(CQLDataSet dataSet) { - super(dataSet); - } - - public CustomCassandraCQLUnit(CQLDataSet dataSet, String configurationFileName) { - super(dataSet, configurationFileName); - } - - public CustomCassandraCQLUnit(CQLDataSet dataSet, String configurationFileName, String hostIp, int port) { - super(dataSet, configurationFileName, hostIp, port); - } - - @Override - protected void before() throws Exception { - /* start an embedded Cassandra */ - if (configurationFileName != null) { - EmbeddedCassandraServerHelper.startEmbeddedCassandra(configurationFileName, DEFAULT_CASSANDRA_TIMEOUT); - } else { - EmbeddedCassandraServerHelper.startEmbeddedCassandra(DEFAULT_CASSANDRA_TIMEOUT); - } - - /* create structure and load data */ - load(); - } - - @Override - protected void load() { - try { - TimeUnit.SECONDS.sleep(10); - } catch (InterruptedException e) { - e.printStackTrace(); - } - super.load(); - } -} diff --git a/server/common/nosql/cassandra-dao/src/test/java/org/kaaproject/kaa/server/common/dao/service/CassandraApplicationServiceImplTest.java b/server/common/nosql/cassandra-dao/src/test/java/org/kaaproject/kaa/server/common/dao/service/CassandraApplicationServiceImplTest.java index 682b085f0e..9b50425eab 100644 --- a/server/common/nosql/cassandra-dao/src/test/java/org/kaaproject/kaa/server/common/dao/service/CassandraApplicationServiceImplTest.java +++ b/server/common/nosql/cassandra-dao/src/test/java/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/server/common/nosql/cassandra-dao/src/test/java/org/kaaproject/kaa/server/common/dao/service/CassandraCTLSchemaServiceImplTest.java b/server/common/nosql/cassandra-dao/src/test/java/org/kaaproject/kaa/server/common/dao/service/CassandraCTLSchemaServiceImplTest.java index 761019f8b8..3a366edd82 100644 --- a/server/common/nosql/cassandra-dao/src/test/java/org/kaaproject/kaa/server/common/dao/service/CassandraCTLSchemaServiceImplTest.java +++ b/server/common/nosql/cassandra-dao/src/test/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/server/common/nosql/cassandra-dao/src/test/java/org/kaaproject/kaa/server/common/dao/service/CassandraConfigurationServiceImplTest.java b/server/common/nosql/cassandra-dao/src/test/java/org/kaaproject/kaa/server/common/dao/service/CassandraConfigurationServiceImplTest.java index 7dac44b0ed..76a5170c15 100644 --- a/server/common/nosql/cassandra-dao/src/test/java/org/kaaproject/kaa/server/common/dao/service/CassandraConfigurationServiceImplTest.java +++ b/server/common/nosql/cassandra-dao/src/test/java/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/server/common/nosql/cassandra-dao/src/test/java/org/kaaproject/kaa/server/common/dao/service/CassandraEndpointServiceImplTest.java b/server/common/nosql/cassandra-dao/src/test/java/org/kaaproject/kaa/server/common/dao/service/CassandraEndpointServiceImplTest.java index 906b86f0e0..d4381ba1b7 100644 --- a/server/common/nosql/cassandra-dao/src/test/java/org/kaaproject/kaa/server/common/dao/service/CassandraEndpointServiceImplTest.java +++ b/server/common/nosql/cassandra-dao/src/test/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/server/common/nosql/cassandra-dao/src/test/java/org/kaaproject/kaa/server/common/dao/service/CassandraHistoryServiceImplTest.java b/server/common/nosql/cassandra-dao/src/test/java/org/kaaproject/kaa/server/common/dao/service/CassandraHistoryServiceImplTest.java index f9cfa42933..1b3e561754 100644 --- a/server/common/nosql/cassandra-dao/src/test/java/org/kaaproject/kaa/server/common/dao/service/CassandraHistoryServiceImplTest.java +++ b/server/common/nosql/cassandra-dao/src/test/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/server/common/nosql/cassandra-dao/src/test/java/org/kaaproject/kaa/server/common/dao/service/CassandraLogAppenderServiceImplTest.java b/server/common/nosql/cassandra-dao/src/test/java/org/kaaproject/kaa/server/common/dao/service/CassandraLogAppenderServiceImplTest.java index 7c0dfab36d..091748b737 100644 --- a/server/common/nosql/cassandra-dao/src/test/java/org/kaaproject/kaa/server/common/dao/service/CassandraLogAppenderServiceImplTest.java +++ b/server/common/nosql/cassandra-dao/src/test/java/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/server/common/nosql/cassandra-dao/src/test/java/org/kaaproject/kaa/server/common/dao/service/CassandraLogSchemaServiceImplTest.java b/server/common/nosql/cassandra-dao/src/test/java/org/kaaproject/kaa/server/common/dao/service/CassandraLogSchemaServiceImplTest.java index f081c5f455..0ebf2ab49f 100644 --- a/server/common/nosql/cassandra-dao/src/test/java/org/kaaproject/kaa/server/common/dao/service/CassandraLogSchemaServiceImplTest.java +++ b/server/common/nosql/cassandra-dao/src/test/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/server/common/nosql/cassandra-dao/src/test/java/org/kaaproject/kaa/server/common/dao/service/CassandraProfileServiceImplTest.java b/server/common/nosql/cassandra-dao/src/test/java/org/kaaproject/kaa/server/common/dao/service/CassandraProfileServiceImplTest.java index 10a3701451..641af3e716 100644 --- a/server/common/nosql/cassandra-dao/src/test/java/org/kaaproject/kaa/server/common/dao/service/CassandraProfileServiceImplTest.java +++ b/server/common/nosql/cassandra-dao/src/test/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/server/common/nosql/cassandra-dao/src/test/java/org/kaaproject/kaa/server/common/dao/service/CassandraServerProfileServiceImpl.java b/server/common/nosql/cassandra-dao/src/test/java/org/kaaproject/kaa/server/common/dao/service/CassandraServerProfileServiceImplTest.java similarity index 64% rename from server/common/nosql/cassandra-dao/src/test/java/org/kaaproject/kaa/server/common/dao/service/CassandraServerProfileServiceImpl.java rename to server/common/nosql/cassandra-dao/src/test/java/org/kaaproject/kaa/server/common/dao/service/CassandraServerProfileServiceImplTest.java index 58f13b71c0..6d89fd1bde 100644 --- a/server/common/nosql/cassandra-dao/src/test/java/org/kaaproject/kaa/server/common/dao/service/CassandraServerProfileServiceImpl.java +++ b/server/common/nosql/cassandra-dao/src/test/java/org/kaaproject/kaa/server/common/dao/service/CassandraServerProfileServiceImplTest.java @@ -16,11 +16,8 @@ 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; @@ -28,15 +25,6 @@ @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/server/common/nosql/cassandra-dao/src/test/java/org/kaaproject/kaa/server/common/dao/service/CassandraTopicServiceImplTest.java b/server/common/nosql/cassandra-dao/src/test/java/org/kaaproject/kaa/server/common/dao/service/CassandraTopicServiceImplTest.java index 634d08079e..3f295dd377 100644 --- a/server/common/nosql/cassandra-dao/src/test/java/org/kaaproject/kaa/server/common/dao/service/CassandraTopicServiceImplTest.java +++ b/server/common/nosql/cassandra-dao/src/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()){} - } } diff --git a/server/common/nosql/cassandra-dao/src/test/java/org/kaaproject/kaa/server/common/dao/service/CassandraUserConfigurationServiceImplTest.java b/server/common/nosql/cassandra-dao/src/test/java/org/kaaproject/kaa/server/common/dao/service/CassandraUserConfigurationServiceImplTest.java index 795bd8f257..3791e1c471 100644 --- a/server/common/nosql/cassandra-dao/src/test/java/org/kaaproject/kaa/server/common/dao/service/CassandraUserConfigurationServiceImplTest.java +++ b/server/common/nosql/cassandra-dao/src/test/java/org/kaaproject/kaa/server/common/dao/service/CassandraUserConfigurationServiceImplTest.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 CassandraUserConfigurationServiceImplTest extends UserConfigurationServiceImplTest { - @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/server/common/nosql/cassandra-dao/src/test/java/org/kaaproject/kaa/server/common/dao/service/CassandraUserServiceImplTest.java b/server/common/nosql/cassandra-dao/src/test/java/org/kaaproject/kaa/server/common/dao/service/CassandraUserServiceImplTest.java index 5eea892e28..ca16e11ba3 100644 --- a/server/common/nosql/cassandra-dao/src/test/java/org/kaaproject/kaa/server/common/dao/service/CassandraUserServiceImplTest.java +++ b/server/common/nosql/cassandra-dao/src/test/java/org/kaaproject/kaa/server/common/dao/service/CassandraUserServiceImplTest.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 CassandraUserServiceImplTest extends UserServiceImplTest { - @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/server/common/nosql/cassandra-dao/src/test/java/org/kaaproject/kaa/server/common/nosql/cassandra/dao/AbstractCassandraTest.java b/server/common/nosql/cassandra-dao/src/test/java/org/kaaproject/kaa/server/common/nosql/cassandra/dao/AbstractCassandraTest.java index e981268f55..43a99d5967 100644 --- a/server/common/nosql/cassandra-dao/src/test/java/org/kaaproject/kaa/server/common/nosql/cassandra/dao/AbstractCassandraTest.java +++ b/server/common/nosql/cassandra-dao/src/test/java/org/kaaproject/kaa/server/common/nosql/cassandra/dao/AbstractCassandraTest.java @@ -16,15 +16,19 @@ package org.kaaproject.kaa.server.common.nosql.cassandra.dao; -import org.cassandraunit.dataset.cql.ClassPathCQLDataSet; -import org.junit.ClassRule; +import java.nio.ByteBuffer; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Random; +import java.util.UUID; + import org.kaaproject.kaa.common.dto.CTLDataDto; import org.kaaproject.kaa.common.dto.EndpointGroupStateDto; import org.kaaproject.kaa.common.dto.EndpointProfileDto; import org.kaaproject.kaa.common.dto.EndpointUserDto; import org.kaaproject.kaa.common.dto.NotificationDto; import org.kaaproject.kaa.common.dto.NotificationTypeDto; -import org.kaaproject.kaa.server.common.CustomCassandraCQLUnit; import org.kaaproject.kaa.server.common.dao.impl.EndpointConfigurationDao; import org.kaaproject.kaa.server.common.dao.impl.EndpointNotificationDao; import org.kaaproject.kaa.server.common.dao.impl.EndpointProfileDao; @@ -36,21 +40,11 @@ import org.kaaproject.kaa.server.common.nosql.cassandra.dao.model.CassandraNotification; import org.springframework.beans.factory.annotation.Autowired; -import java.nio.ByteBuffer; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.Random; -import java.util.UUID; - -public class AbstractCassandraTest { +public abstract class AbstractCassandraTest { protected static final Random RANDOM = new Random(); private static final String TEST_ENDPOINT_GROUP_ID = "124"; - @ClassRule - public static CustomCassandraCQLUnit cassandraUnit = new CustomCassandraCQLUnit(new ClassPathCQLDataSet("cassandra.cql", "kaa")); - @Autowired protected EndpointNotificationDao unicastNotificationDao; @Autowired diff --git a/server/node/src/test/java/org/kaaproject/kaa/server/control/ControlServerProfileFilterIT.java b/server/node/src/test/java/org/kaaproject/kaa/server/control/ControlServerProfileFilterIT.java index f31f927d15..5d71520a27 100644 --- a/server/node/src/test/java/org/kaaproject/kaa/server/control/ControlServerProfileFilterIT.java +++ b/server/node/src/test/java/org/kaaproject/kaa/server/control/ControlServerProfileFilterIT.java @@ -16,6 +16,7 @@ package org.kaaproject.kaa.server.control; +import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -23,12 +24,11 @@ import org.junit.Test; import org.kaaproject.kaa.common.dto.ApplicationDto; import org.kaaproject.kaa.common.dto.EndpointGroupDto; +import org.kaaproject.kaa.common.dto.EndpointProfileSchemaDto; import org.kaaproject.kaa.common.dto.ProfileFilterDto; import org.kaaproject.kaa.common.dto.ProfileFilterRecordDto; -import org.kaaproject.kaa.common.dto.EndpointProfileSchemaDto; import org.kaaproject.kaa.common.dto.ProfileVersionPairDto; import org.kaaproject.kaa.common.dto.UpdateStatus; -import org.kaaproject.kaa.common.dto.VersionDto; import org.kaaproject.kaa.common.dto.ctl.CTLSchemaInfoDto; import org.kaaproject.kaa.common.dto.ctl.CTLSchemaScopeDto; @@ -81,16 +81,31 @@ public void testGetProfileFilterRecordsByEndpointGroupId() throws Exception { loginTenantDeveloper(tenantDeveloperDto.getUsername()); EndpointGroupDto endpointGroup = createEndpointGroup(application.getId()); + + List profileFilters = new ArrayList(2); - ProfileFilterDto profileFilter1 = createProfileFilter(null, null, endpointGroup.getId()); - ProfileFilterDto profileFilter2 = createProfileFilter(null, null, endpointGroup.getId()); + profileFilters.add(createProfileFilter(null, null, endpointGroup.getId())); + profileFilters.add(createProfileFilter(null, null, endpointGroup.getId())); + + Collections.sort(profileFilters, new IdComparator()); List profileFilterRecords = client.getProfileFilterRecords(endpointGroup.getId(), false); Assert.assertNotNull(profileFilterRecords); Assert.assertEquals(2, profileFilterRecords.size()); - assertProfileFiltersEquals(profileFilter1, profileFilterRecords.get(1).getInactiveStructureDto()); - assertProfileFiltersEquals(profileFilter2, profileFilterRecords.get(0).getInactiveStructureDto()); + + List storedProfileFilters = new ArrayList(2); + for (ProfileFilterRecordDto profileFilterRecord : profileFilterRecords) { + storedProfileFilters.add(profileFilterRecord.getInactiveStructureDto()); + } + + Collections.sort(storedProfileFilters, new IdComparator()); + + for (int i=0;i