Splitted nosql and sql suites

dao/src/test/java/org/thingsboard/server/dao/DaoServiceTestSuite.java → dao/src/test/java/org/thingsboard/server/dao/NoSqlDaoServiceTestSuite.java

@@ -25,9 +25,9 @@ import java.util.Arrays;
 
 @RunWith(ClasspathSuite.class)
 @ClassnameFilters({
-        "org.thingsboard.server.dao.service.*Test"
+        "org.thingsboard.server.dao.service.*ServiceNoSqlTest"
 })
-public class DaoServiceTestSuite {
+public class NoSqlDaoServiceTestSuite {
 
     @ClassRule
     public static CustomCassandraCQLUnit cassandraUnit =
@@ -37,9 +37,4 @@ public class DaoServiceTestSuite {
                             new ClassPathCQLDataSet("system-test.cql", false, false)),
                     "cassandra-test.yaml", 30000L);
 
-    @ClassRule
-    public static CustomPostgresUnit postgresUnit = new CustomPostgresUnit(
-            Arrays.asList("postgres/schema.sql", "postgres/system-data.sql", "system-test.sql"),
-            "postgres-embedded-test.properties");
-
 }

dao/src/test/java/org/thingsboard/server/dao/SqlDaoServiceTestSuite.java

@@ -0,0 +1,36 @@
+/**
+ * Copyright © 2016-2017 The Thingsboard Authors
+ *
+ * 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.thingsboard.server.dao;
+
+import org.junit.ClassRule;
+import org.junit.extensions.cpsuite.ClasspathSuite;
+import org.junit.extensions.cpsuite.ClasspathSuite.ClassnameFilters;
+import org.junit.runner.RunWith;
+
+import java.util.Arrays;
+
+@RunWith(ClasspathSuite.class)
+@ClassnameFilters({
+        "org.thingsboard.server.dao.service.*ServiceSqlTest"
+})
+public class SqlDaoServiceTestSuite {
+
+    @ClassRule
+    public static CustomPostgresUnit postgresUnit = new CustomPostgresUnit(
+            Arrays.asList("postgres/schema.sql", "postgres/system-data.sql", "system-test.sql"),
+            "postgres-embedded-test.properties");
+
+}