SystemTestSuite split to Sql and NoSql. Dao Test annotations renamed

@@ -251,6 +251,11 @@
             <artifactId>spring-test-dbunit</artifactId>
             <artifactId>spring-test-dbunit</artifactId>
             <scope>test</scope>
             <scope>test</scope>
         </dependency>
         </dependency>
+        <dependency>
+            <groupId>ru.yandex.qatools.embed</groupId>
+            <artifactId>postgresql-embedded</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
     </dependencies>
 
 
     <build>
     <build>

@@ -35,7 +35,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
 /**
 /**
  * @author Andrew Shvayka
  * @author Andrew Shvayka
  */
  */
-public class HttpDeviceApiTest extends AbstractControllerTest {
+public abstract class BaseHttpDeviceApiTest extends AbstractControllerTest {
 
 
     private static final AtomicInteger idSeq = new AtomicInteger(new Random(System.currentTimeMillis()).nextInt());
     private static final AtomicInteger idSeq = new AtomicInteger(new Random(System.currentTimeMillis()).nextInt());
 
 

@@ -27,8 +27,8 @@ import java.util.Arrays;
  * @author Andrew Shvayka
  * @author Andrew Shvayka
  */
  */
 @RunWith(ClasspathSuite.class)
 @RunWith(ClasspathSuite.class)
-@ClasspathSuite.ClassnameFilters({"org.thingsboard.server.system.*Test"})
-public class SystemTestSuite {
+@ClasspathSuite.ClassnameFilters({"org.thingsboard.server.system.*NoSqlTest"})
+public class SystemNoSqlTestSuite {
 
 
     @ClassRule
     @ClassRule
     public static CustomCassandraCQLUnit cassandraUnit =
     public static CustomCassandraCQLUnit cassandraUnit =

+package org.thingsboard.server.system;
+
+import org.junit.ClassRule;
+import org.junit.extensions.cpsuite.ClasspathSuite;
+import org.junit.runner.RunWith;
+import org.thingsboard.server.dao.CustomPostgresUnit;
+
+import java.util.Arrays;
+
+/**
+ * Created by Valerii Sosliuk on 6/27/2017.
+ */
+@RunWith(ClasspathSuite.class)
+@ClasspathSuite.ClassnameFilters({"org.thingsboard.server.system.sql.*SqlTest"})
+public class SystemSqlTestSuite {
+
+    @ClassRule
+    public static CustomPostgresUnit postgresUnit = new CustomPostgresUnit(
+            Arrays.asList("postgres/schema.sql", "postgres/system-data.sql"),
+            "postgres-embedded-test.properties");
+
+
+}

+package org.thingsboard.server.system.nosql;
+
+import org.thingsboard.server.dao.service.DaoNoSqlTest;
+import org.thingsboard.server.dao.util.NoSqlDao;
+import org.thingsboard.server.system.BaseHttpDeviceApiTest;
+
+/**
+ * Created by Valerii Sosliuk on 6/27/2017.
+ */
+@DaoNoSqlTest
+public class DeviceApiNoSqlTest extends BaseHttpDeviceApiTest {
+}

+package org.thingsboard.server.system.sql;
+
+import org.thingsboard.server.dao.service.DaoSqlTest;
+import org.thingsboard.server.system.BaseHttpDeviceApiTest;
+
+/**
+ * Created by Valerii Sosliuk on 6/27/2017.
+ */
+@DaoSqlTest
+public class DeviceApiSqlTest extends BaseHttpDeviceApiTest{
+}

@@ -170,11 +170,6 @@
             <scope>test</scope>
             <scope>test</scope>
         </dependency>
         </dependency>
         <dependency>
         <dependency>
-            <groupId>com.h2database</groupId>
-            <artifactId>h2</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
             <groupId>ru.yandex.qatools.embed</groupId>
             <groupId>ru.yandex.qatools.embed</groupId>
             <artifactId>postgresql-embedded</artifactId>
             <artifactId>postgresql-embedded</artifactId>
             <scope>test</scope>
             <scope>test</scope>

@@ -30,7 +30,9 @@ public abstract class DaoUtil {
         if (toDataList != null && !toDataList.isEmpty()) {
         if (toDataList != null && !toDataList.isEmpty()) {
             list = new ArrayList<>();
             list = new ArrayList<>();
             for (ToData<T> object : toDataList) {
             for (ToData<T> object : toDataList) {
-                list.add(object.toData());
+                if (object != null) {
+                    list.add(object.toData());
+                }
             }
             }
         }
         }
         return list;
         return list;

@@ -24,5 +24,5 @@ import java.lang.annotation.*;
 @Inherited
 @Inherited
 @Documented
 @Documented
 @TestPropertySource(locations = {"classpath:cassandra-test.properties", "classpath:application-test.properties", "classpath:nosql-test.properties"})
 @TestPropertySource(locations = {"classpath:cassandra-test.properties", "classpath:application-test.properties", "classpath:nosql-test.properties"})
-public @interface DaoServiceNoSqlTest {
+public @interface DaoNoSqlTest {
 }
 }

@@ -24,5 +24,5 @@ import java.lang.annotation.*;
 @Inherited
 @Inherited
 @Documented
 @Documented
 @TestPropertySource(locations = {"classpath:application-test.properties", "classpath:sql-test.properties"})
 @TestPropertySource(locations = {"classpath:application-test.properties", "classpath:sql-test.properties"})
-public @interface DaoServiceSqlTest {
+public @interface DaoSqlTest {
 }
 }

@@ -15,9 +15,9 @@
  */
  */
 package org.thingsboard.server.dao.service.attributes.nosql;
 package org.thingsboard.server.dao.service.attributes.nosql;
 
 
-import org.thingsboard.server.dao.service.DaoServiceNoSqlTest;
+import org.thingsboard.server.dao.service.DaoNoSqlTest;
 import org.thingsboard.server.dao.service.attributes.BaseAttributesServiceTest;
 import org.thingsboard.server.dao.service.attributes.BaseAttributesServiceTest;
 
 
-@DaoServiceNoSqlTest
+@DaoNoSqlTest
 public class AttributesServiceNoSqlTest extends BaseAttributesServiceTest {
 public class AttributesServiceNoSqlTest extends BaseAttributesServiceTest {
 }
 }

@@ -15,9 +15,9 @@
  */
  */
 package org.thingsboard.server.dao.service.attributes.sql;
 package org.thingsboard.server.dao.service.attributes.sql;
 
 
-import org.thingsboard.server.dao.service.DaoServiceSqlTest;
+import org.thingsboard.server.dao.service.DaoSqlTest;
 import org.thingsboard.server.dao.service.attributes.BaseAttributesServiceTest;
 import org.thingsboard.server.dao.service.attributes.BaseAttributesServiceTest;
 
 
-@DaoServiceSqlTest
+@DaoSqlTest
 public class AttributesServiceSqlTest extends BaseAttributesServiceTest {
 public class AttributesServiceSqlTest extends BaseAttributesServiceTest {
 }
 }

@@ -15,9 +15,9 @@
  */
  */
 package org.thingsboard.server.dao.service.event.nosql;
 package org.thingsboard.server.dao.service.event.nosql;
 
 
-import org.thingsboard.server.dao.service.DaoServiceNoSqlTest;
+import org.thingsboard.server.dao.service.DaoNoSqlTest;
 import org.thingsboard.server.dao.service.event.BaseEventServiceTest;
 import org.thingsboard.server.dao.service.event.BaseEventServiceTest;
 
 
-@DaoServiceNoSqlTest
+@DaoNoSqlTest
 public class EventServiceNoSqlTest extends BaseEventServiceTest {
 public class EventServiceNoSqlTest extends BaseEventServiceTest {
 }
 }

@@ -15,9 +15,9 @@
  */
  */
 package org.thingsboard.server.dao.service.event.sql;
 package org.thingsboard.server.dao.service.event.sql;
 
 
-import org.thingsboard.server.dao.service.DaoServiceSqlTest;
+import org.thingsboard.server.dao.service.DaoSqlTest;
 import org.thingsboard.server.dao.service.event.BaseEventServiceTest;
 import org.thingsboard.server.dao.service.event.BaseEventServiceTest;
 
 
-@DaoServiceSqlTest
+@DaoSqlTest
 public class EventServiceSqlTest extends BaseEventServiceTest {
 public class EventServiceSqlTest extends BaseEventServiceTest {
 }
 }

@@ -15,9 +15,9 @@
  */
  */
 package org.thingsboard.server.dao.service.nosql;
 package org.thingsboard.server.dao.service.nosql;
 
 
-import org.thingsboard.server.dao.service.DaoServiceNoSqlTest;
+import org.thingsboard.server.dao.service.DaoNoSqlTest;
 import org.thingsboard.server.dao.service.BaseAdminSettingsServiceTest;
 import org.thingsboard.server.dao.service.BaseAdminSettingsServiceTest;
 
 
-@DaoServiceNoSqlTest
+@DaoNoSqlTest
 public class AdminSettingsServiceNoSqlTest extends BaseAdminSettingsServiceTest {
 public class AdminSettingsServiceNoSqlTest extends BaseAdminSettingsServiceTest {
 }
 }

@@ -15,9 +15,9 @@
  */
  */
 package org.thingsboard.server.dao.service.nosql;
 package org.thingsboard.server.dao.service.nosql;
 
 
-import org.thingsboard.server.dao.service.DaoServiceNoSqlTest;
+import org.thingsboard.server.dao.service.DaoNoSqlTest;
 import org.thingsboard.server.dao.service.BaseAlarmServiceTest;
 import org.thingsboard.server.dao.service.BaseAlarmServiceTest;
 
 
-@DaoServiceNoSqlTest
+@DaoNoSqlTest
 public class AlarmServiceNoSqlTest extends BaseAlarmServiceTest {
 public class AlarmServiceNoSqlTest extends BaseAlarmServiceTest {
 }
 }

@@ -15,9 +15,9 @@
  */
  */
 package org.thingsboard.server.dao.service.nosql;
 package org.thingsboard.server.dao.service.nosql;
 
 
-import org.thingsboard.server.dao.service.DaoServiceNoSqlTest;
+import org.thingsboard.server.dao.service.DaoNoSqlTest;
 import org.thingsboard.server.dao.service.BaseAssetServiceTest;
 import org.thingsboard.server.dao.service.BaseAssetServiceTest;
 
 
-@DaoServiceNoSqlTest
+@DaoNoSqlTest
 public class AssetServiceNoSqlTest extends BaseAssetServiceTest {
 public class AssetServiceNoSqlTest extends BaseAssetServiceTest {
 }
 }

@@ -15,9 +15,9 @@
  */
  */
 package org.thingsboard.server.dao.service.nosql;
 package org.thingsboard.server.dao.service.nosql;
 
 
-import org.thingsboard.server.dao.service.DaoServiceNoSqlTest;
+import org.thingsboard.server.dao.service.DaoNoSqlTest;
 import org.thingsboard.server.dao.service.BaseCustomerServiceTest;
 import org.thingsboard.server.dao.service.BaseCustomerServiceTest;
 
 
-@DaoServiceNoSqlTest
+@DaoNoSqlTest
 public class CustomerServiceNoSqlTest extends BaseCustomerServiceTest {
 public class CustomerServiceNoSqlTest extends BaseCustomerServiceTest {
 }
 }

@@ -15,9 +15,9 @@
  */
  */
 package org.thingsboard.server.dao.service.nosql;
 package org.thingsboard.server.dao.service.nosql;
 
 
-import org.thingsboard.server.dao.service.DaoServiceNoSqlTest;
+import org.thingsboard.server.dao.service.DaoNoSqlTest;
 import org.thingsboard.server.dao.service.BaseDashboardServiceTest;
 import org.thingsboard.server.dao.service.BaseDashboardServiceTest;
 
 
-@DaoServiceNoSqlTest
+@DaoNoSqlTest
 public class DashboardServiceNoSqlTest extends BaseDashboardServiceTest {
 public class DashboardServiceNoSqlTest extends BaseDashboardServiceTest {
 }
 }

@@ -15,9 +15,9 @@
  */
  */
 package org.thingsboard.server.dao.service.nosql;
 package org.thingsboard.server.dao.service.nosql;
 
 
-import org.thingsboard.server.dao.service.DaoServiceNoSqlTest;
+import org.thingsboard.server.dao.service.DaoNoSqlTest;
 import org.thingsboard.server.dao.service.BaseDeviceCredentialsCacheTest;
 import org.thingsboard.server.dao.service.BaseDeviceCredentialsCacheTest;
 
 
-@DaoServiceNoSqlTest
+@DaoNoSqlTest
 public class DeviceCredentialCacheNoSqlTest extends BaseDeviceCredentialsCacheTest {
 public class DeviceCredentialCacheNoSqlTest extends BaseDeviceCredentialsCacheTest {
 }
 }

@@ -15,9 +15,9 @@
  */
  */
 package org.thingsboard.server.dao.service.nosql;
 package org.thingsboard.server.dao.service.nosql;
 
 
-import org.thingsboard.server.dao.service.DaoServiceNoSqlTest;
+import org.thingsboard.server.dao.service.DaoNoSqlTest;
 import org.thingsboard.server.dao.service.BaseDeviceCredentialsServiceTest;
 import org.thingsboard.server.dao.service.BaseDeviceCredentialsServiceTest;
 
 
-@DaoServiceNoSqlTest
+@DaoNoSqlTest
 public class DeviceCredentialServiceNoSqlTest extends BaseDeviceCredentialsServiceTest {
 public class DeviceCredentialServiceNoSqlTest extends BaseDeviceCredentialsServiceTest {
 }
 }

@@ -15,9 +15,9 @@
  */
  */
 package org.thingsboard.server.dao.service.nosql;
 package org.thingsboard.server.dao.service.nosql;
 
 
-import org.thingsboard.server.dao.service.DaoServiceNoSqlTest;
+import org.thingsboard.server.dao.service.DaoNoSqlTest;
 import org.thingsboard.server.dao.service.BaseDeviceServiceTest;
 import org.thingsboard.server.dao.service.BaseDeviceServiceTest;
 
 
-@DaoServiceNoSqlTest
+@DaoNoSqlTest
 public class DeviceServiceNoSqlTest extends BaseDeviceServiceTest {
 public class DeviceServiceNoSqlTest extends BaseDeviceServiceTest {
 }
 }

@@ -15,9 +15,9 @@
  */
  */
 package org.thingsboard.server.dao.service.nosql;
 package org.thingsboard.server.dao.service.nosql;
 
 
-import org.thingsboard.server.dao.service.DaoServiceNoSqlTest;
+import org.thingsboard.server.dao.service.DaoNoSqlTest;
 import org.thingsboard.server.dao.service.BaseRelationServiceTest;
 import org.thingsboard.server.dao.service.BaseRelationServiceTest;
 
 
-@DaoServiceNoSqlTest
+@DaoNoSqlTest
 public class RelationServiceNoSqlTest extends BaseRelationServiceTest {
 public class RelationServiceNoSqlTest extends BaseRelationServiceTest {
 }
 }

@@ -15,9 +15,9 @@
  */
  */
 package org.thingsboard.server.dao.service.nosql;
 package org.thingsboard.server.dao.service.nosql;
 
 
-import org.thingsboard.server.dao.service.DaoServiceNoSqlTest;
+import org.thingsboard.server.dao.service.DaoNoSqlTest;
 import org.thingsboard.server.dao.service.BaseTenantServiceTest;
 import org.thingsboard.server.dao.service.BaseTenantServiceTest;
 
 
-@DaoServiceNoSqlTest
+@DaoNoSqlTest
 public class TenantServiceNoSqlTest extends BaseTenantServiceTest {
 public class TenantServiceNoSqlTest extends BaseTenantServiceTest {
 }
 }

@@ -15,9 +15,9 @@
  */
  */
 package org.thingsboard.server.dao.service.nosql;
 package org.thingsboard.server.dao.service.nosql;
 
 
-import org.thingsboard.server.dao.service.DaoServiceNoSqlTest;
+import org.thingsboard.server.dao.service.DaoNoSqlTest;
 import org.thingsboard.server.dao.service.BaseUserServiceTest;
 import org.thingsboard.server.dao.service.BaseUserServiceTest;
 
 
-@DaoServiceNoSqlTest
+@DaoNoSqlTest
 public class UserServiceNoSqlTest extends BaseUserServiceTest {
 public class UserServiceNoSqlTest extends BaseUserServiceTest {
 }
 }

@@ -15,9 +15,9 @@
  */
  */
 package org.thingsboard.server.dao.service.nosql;
 package org.thingsboard.server.dao.service.nosql;
 
 
-import org.thingsboard.server.dao.service.DaoServiceNoSqlTest;
+import org.thingsboard.server.dao.service.DaoNoSqlTest;
 import org.thingsboard.server.dao.service.BaseWidgetTypeServiceTest;
 import org.thingsboard.server.dao.service.BaseWidgetTypeServiceTest;
 
 
-@DaoServiceNoSqlTest
+@DaoNoSqlTest
 public class WidgetTypeServiceNoSqlTest extends BaseWidgetTypeServiceTest {
 public class WidgetTypeServiceNoSqlTest extends BaseWidgetTypeServiceTest {
 }
 }

@@ -15,9 +15,9 @@
  */
  */
 package org.thingsboard.server.dao.service.nosql;
 package org.thingsboard.server.dao.service.nosql;
 
 
-import org.thingsboard.server.dao.service.DaoServiceNoSqlTest;
+import org.thingsboard.server.dao.service.DaoNoSqlTest;
 import org.thingsboard.server.dao.service.BaseWidgetsBundleServiceTest;
 import org.thingsboard.server.dao.service.BaseWidgetsBundleServiceTest;
 
 
-@DaoServiceNoSqlTest
+@DaoNoSqlTest
 public class WidgetsBundleServiceNoSqlTest extends BaseWidgetsBundleServiceTest {
 public class WidgetsBundleServiceNoSqlTest extends BaseWidgetsBundleServiceTest {
 }
 }

@@ -15,9 +15,9 @@
  */
  */
 package org.thingsboard.server.dao.service.plugin.nosql;
 package org.thingsboard.server.dao.service.plugin.nosql;
 
 
-import org.thingsboard.server.dao.service.DaoServiceNoSqlTest;
+import org.thingsboard.server.dao.service.DaoNoSqlTest;
 import org.thingsboard.server.dao.service.plugin.BasePluginServiceTest;
 import org.thingsboard.server.dao.service.plugin.BasePluginServiceTest;
 
 
-@DaoServiceNoSqlTest
+@DaoNoSqlTest
 public class PluginServiceNoSqlTest extends BasePluginServiceTest {
 public class PluginServiceNoSqlTest extends BasePluginServiceTest {
 }
 }

@@ -15,9 +15,9 @@
  */
  */
 package org.thingsboard.server.dao.service.plugin.sql;
 package org.thingsboard.server.dao.service.plugin.sql;
 
 
-import org.thingsboard.server.dao.service.DaoServiceSqlTest;
+import org.thingsboard.server.dao.service.DaoSqlTest;
 import org.thingsboard.server.dao.service.plugin.BasePluginServiceTest;
 import org.thingsboard.server.dao.service.plugin.BasePluginServiceTest;
 
 
-@DaoServiceSqlTest
+@DaoSqlTest
 public class PluginServiceSqlTest extends BasePluginServiceTest {
 public class PluginServiceSqlTest extends BasePluginServiceTest {
 }
 }

@@ -15,9 +15,9 @@
  */
  */
 package org.thingsboard.server.dao.service.rule.nosql;
 package org.thingsboard.server.dao.service.rule.nosql;
 
 
-import org.thingsboard.server.dao.service.DaoServiceNoSqlTest;
+import org.thingsboard.server.dao.service.DaoNoSqlTest;
 import org.thingsboard.server.dao.service.rule.BaseRuleServiceTest;
 import org.thingsboard.server.dao.service.rule.BaseRuleServiceTest;
 
 
-@DaoServiceNoSqlTest
+@DaoNoSqlTest
 public class RuleServiceNoSqlTest extends BaseRuleServiceTest {
 public class RuleServiceNoSqlTest extends BaseRuleServiceTest {
 }
 }

@@ -15,9 +15,9 @@
  */
  */
 package org.thingsboard.server.dao.service.rule.sql;
 package org.thingsboard.server.dao.service.rule.sql;
 
 
-import org.thingsboard.server.dao.service.DaoServiceSqlTest;
+import org.thingsboard.server.dao.service.DaoSqlTest;
 import org.thingsboard.server.dao.service.rule.BaseRuleServiceTest;
 import org.thingsboard.server.dao.service.rule.BaseRuleServiceTest;
 
 
-@DaoServiceSqlTest
+@DaoSqlTest
 public class RuleServiceSqlTest extends BaseRuleServiceTest {
 public class RuleServiceSqlTest extends BaseRuleServiceTest {
 }
 }

@@ -15,9 +15,9 @@
  */
  */
 package org.thingsboard.server.dao.service.sql;
 package org.thingsboard.server.dao.service.sql;
 
 
-import org.thingsboard.server.dao.service.DaoServiceSqlTest;
+import org.thingsboard.server.dao.service.DaoSqlTest;
 import org.thingsboard.server.dao.service.BaseAdminSettingsServiceTest;
 import org.thingsboard.server.dao.service.BaseAdminSettingsServiceTest;
 
 
-@DaoServiceSqlTest
+@DaoSqlTest
 public class AdminSettingsServiceSqlTest extends BaseAdminSettingsServiceTest {
 public class AdminSettingsServiceSqlTest extends BaseAdminSettingsServiceTest {
 }
 }

@@ -15,9 +15,9 @@
  */
  */
 package org.thingsboard.server.dao.service.sql;
 package org.thingsboard.server.dao.service.sql;
 
 
-import org.thingsboard.server.dao.service.DaoServiceSqlTest;
+import org.thingsboard.server.dao.service.DaoSqlTest;
 import org.thingsboard.server.dao.service.BaseAlarmServiceTest;
 import org.thingsboard.server.dao.service.BaseAlarmServiceTest;
 
 
-@DaoServiceSqlTest
+@DaoSqlTest
 public class AlarmServiceSqlTest extends BaseAlarmServiceTest {
 public class AlarmServiceSqlTest extends BaseAlarmServiceTest {
 }
 }

@@ -15,9 +15,9 @@
  */
  */
 package org.thingsboard.server.dao.service.sql;
 package org.thingsboard.server.dao.service.sql;
 
 
-import org.thingsboard.server.dao.service.DaoServiceSqlTest;
+import org.thingsboard.server.dao.service.DaoSqlTest;
 import org.thingsboard.server.dao.service.BaseAssetServiceTest;
 import org.thingsboard.server.dao.service.BaseAssetServiceTest;
 
 
-@DaoServiceSqlTest
+@DaoSqlTest
 public class AssetServiceSqlTest extends BaseAssetServiceTest {
 public class AssetServiceSqlTest extends BaseAssetServiceTest {
 }
 }

@@ -15,9 +15,9 @@
  */
  */
 package org.thingsboard.server.dao.service.sql;
 package org.thingsboard.server.dao.service.sql;
 
 
-import org.thingsboard.server.dao.service.DaoServiceSqlTest;
+import org.thingsboard.server.dao.service.DaoSqlTest;
 import org.thingsboard.server.dao.service.BaseCustomerServiceTest;
 import org.thingsboard.server.dao.service.BaseCustomerServiceTest;
 
 
-@DaoServiceSqlTest
+@DaoSqlTest
 public class CustomerServiceSqlTest extends BaseCustomerServiceTest {
 public class CustomerServiceSqlTest extends BaseCustomerServiceTest {
 }
 }

@@ -15,9 +15,9 @@
  */
  */
 package org.thingsboard.server.dao.service.sql;
 package org.thingsboard.server.dao.service.sql;
 
 
-import org.thingsboard.server.dao.service.DaoServiceSqlTest;
+import org.thingsboard.server.dao.service.DaoSqlTest;
 import org.thingsboard.server.dao.service.BaseDashboardServiceTest;
 import org.thingsboard.server.dao.service.BaseDashboardServiceTest;
 
 
-@DaoServiceSqlTest
+@DaoSqlTest
 public class DashboardServiceSqlTest extends BaseDashboardServiceTest {
 public class DashboardServiceSqlTest extends BaseDashboardServiceTest {
 }
 }

@@ -15,9 +15,9 @@
  */
  */
 package org.thingsboard.server.dao.service.sql;
 package org.thingsboard.server.dao.service.sql;
 
 
-import org.thingsboard.server.dao.service.DaoServiceSqlTest;
+import org.thingsboard.server.dao.service.DaoSqlTest;
 import org.thingsboard.server.dao.service.BaseDeviceCredentialsCacheTest;
 import org.thingsboard.server.dao.service.BaseDeviceCredentialsCacheTest;
 
 
-@DaoServiceSqlTest
+@DaoSqlTest
 public class DeviceCredentialsCacheSqlTest extends BaseDeviceCredentialsCacheTest {
 public class DeviceCredentialsCacheSqlTest extends BaseDeviceCredentialsCacheTest {
 }
 }

@@ -15,9 +15,9 @@
  */
  */
 package org.thingsboard.server.dao.service.sql;
 package org.thingsboard.server.dao.service.sql;
 
 
-import org.thingsboard.server.dao.service.DaoServiceSqlTest;
+import org.thingsboard.server.dao.service.DaoSqlTest;
 import org.thingsboard.server.dao.service.BaseDeviceCredentialsServiceTest;
 import org.thingsboard.server.dao.service.BaseDeviceCredentialsServiceTest;
 
 
-@DaoServiceSqlTest
+@DaoSqlTest
 public class DeviceCredentialsServiceSqlTest extends BaseDeviceCredentialsServiceTest {
 public class DeviceCredentialsServiceSqlTest extends BaseDeviceCredentialsServiceTest {
 }
 }

@@ -15,9 +15,9 @@
  */
  */
 package org.thingsboard.server.dao.service.sql;
 package org.thingsboard.server.dao.service.sql;
 
 
-import org.thingsboard.server.dao.service.DaoServiceSqlTest;
+import org.thingsboard.server.dao.service.DaoSqlTest;
 import org.thingsboard.server.dao.service.BaseDeviceServiceTest;
 import org.thingsboard.server.dao.service.BaseDeviceServiceTest;
 
 
-@DaoServiceSqlTest
+@DaoSqlTest
 public class DeviceServiceSqlTest extends BaseDeviceServiceTest {
 public class DeviceServiceSqlTest extends BaseDeviceServiceTest {
 }
 }

@@ -15,9 +15,9 @@
  */
  */
 package org.thingsboard.server.dao.service.sql;
 package org.thingsboard.server.dao.service.sql;
 
 
-import org.thingsboard.server.dao.service.DaoServiceSqlTest;
+import org.thingsboard.server.dao.service.DaoSqlTest;
 import org.thingsboard.server.dao.service.BaseRelationServiceTest;
 import org.thingsboard.server.dao.service.BaseRelationServiceTest;
 
 
-@DaoServiceSqlTest
+@DaoSqlTest
 public class RelationServiceSqlTest extends BaseRelationServiceTest {
 public class RelationServiceSqlTest extends BaseRelationServiceTest {
 }
 }

@@ -15,9 +15,9 @@
  */
  */
 package org.thingsboard.server.dao.service.sql;
 package org.thingsboard.server.dao.service.sql;
 
 
-import org.thingsboard.server.dao.service.DaoServiceSqlTest;
+import org.thingsboard.server.dao.service.DaoSqlTest;
 import org.thingsboard.server.dao.service.BaseTenantServiceTest;
 import org.thingsboard.server.dao.service.BaseTenantServiceTest;
 
 
-@DaoServiceSqlTest
+@DaoSqlTest
 public class TenantServiceSqlTest extends BaseTenantServiceTest {
 public class TenantServiceSqlTest extends BaseTenantServiceTest {
 }
 }

@@ -15,9 +15,9 @@
  */
  */
 package org.thingsboard.server.dao.service.sql;
 package org.thingsboard.server.dao.service.sql;
 
 
-import org.thingsboard.server.dao.service.DaoServiceSqlTest;
+import org.thingsboard.server.dao.service.DaoSqlTest;
 import org.thingsboard.server.dao.service.BaseUserServiceTest;
 import org.thingsboard.server.dao.service.BaseUserServiceTest;
 
 
-@DaoServiceSqlTest
+@DaoSqlTest
 public class UserServiceSqlTest extends BaseUserServiceTest {
 public class UserServiceSqlTest extends BaseUserServiceTest {
 }
 }

@@ -15,9 +15,9 @@
  */
  */
 package org.thingsboard.server.dao.service.sql;
 package org.thingsboard.server.dao.service.sql;
 
 
-import org.thingsboard.server.dao.service.DaoServiceSqlTest;
+import org.thingsboard.server.dao.service.DaoSqlTest;
 import org.thingsboard.server.dao.service.BaseWidgetTypeServiceTest;
 import org.thingsboard.server.dao.service.BaseWidgetTypeServiceTest;
 
 
-@DaoServiceSqlTest
+@DaoSqlTest
 public class WidgetTypeServiceSqlTest extends BaseWidgetTypeServiceTest {
 public class WidgetTypeServiceSqlTest extends BaseWidgetTypeServiceTest {
 }
 }

@@ -15,9 +15,9 @@
  */
  */
 package org.thingsboard.server.dao.service.sql;
 package org.thingsboard.server.dao.service.sql;
 
 
-import org.thingsboard.server.dao.service.DaoServiceSqlTest;
+import org.thingsboard.server.dao.service.DaoSqlTest;
 import org.thingsboard.server.dao.service.BaseWidgetsBundleServiceTest;
 import org.thingsboard.server.dao.service.BaseWidgetsBundleServiceTest;
 
 
-@DaoServiceSqlTest
+@DaoSqlTest
 public class WidgetsBundleServiceSqlTest extends BaseWidgetsBundleServiceTest {
 public class WidgetsBundleServiceSqlTest extends BaseWidgetsBundleServiceTest {
 }
 }

@@ -15,9 +15,9 @@
  */
  */
 package org.thingsboard.server.dao.service.timeseries.nosql;
 package org.thingsboard.server.dao.service.timeseries.nosql;
 
 
-import org.thingsboard.server.dao.service.DaoServiceNoSqlTest;
+import org.thingsboard.server.dao.service.DaoNoSqlTest;
 import org.thingsboard.server.dao.service.timeseries.BaseTimeseriesServiceTest;
 import org.thingsboard.server.dao.service.timeseries.BaseTimeseriesServiceTest;
 
 
-@DaoServiceNoSqlTest
+@DaoNoSqlTest
 public class TimeseriesServiceNoSqlTest extends BaseTimeseriesServiceTest {
 public class TimeseriesServiceNoSqlTest extends BaseTimeseriesServiceTest {
 }
 }

@@ -15,9 +15,9 @@
  */
  */
 package org.thingsboard.server.dao.service.timeseries.sql;
 package org.thingsboard.server.dao.service.timeseries.sql;
 
 
-import org.thingsboard.server.dao.service.DaoServiceSqlTest;
+import org.thingsboard.server.dao.service.DaoSqlTest;
 import org.thingsboard.server.dao.service.timeseries.BaseTimeseriesServiceTest;
 import org.thingsboard.server.dao.service.timeseries.BaseTimeseriesServiceTest;
 
 
-@DaoServiceSqlTest
+@DaoSqlTest
 public class TimeseriesServiceSqlTest extends BaseTimeseriesServiceTest {
 public class TimeseriesServiceSqlTest extends BaseTimeseriesServiceTest {
 }
 }

@@ -71,7 +71,6 @@
         <springfox-swagger.version>2.6.1</springfox-swagger.version>
         <springfox-swagger.version>2.6.1</springfox-swagger.version>
         <bouncycastle.version>1.56</bouncycastle.version>
         <bouncycastle.version>1.56</bouncycastle.version>
         <winsw.version>2.0.1</winsw.version>
         <winsw.version>2.0.1</winsw.version>
-        <h2.version>1.4.194</h2.version>
         <dbunit.version>2.5.3</dbunit.version>
         <dbunit.version>2.5.3</dbunit.version>
         <spring-test-dbunit.version>1.2.1</spring-test-dbunit.version>
         <spring-test-dbunit.version>1.2.1</spring-test-dbunit.version>
         <postgresql.driver.version>9.4.1211</postgresql.driver.version>
         <postgresql.driver.version>9.4.1211</postgresql.driver.version>
@@ -742,12 +741,6 @@
                 <version>${bouncycastle.version}</version>
                 <version>${bouncycastle.version}</version>
             </dependency>
             </dependency>
             <dependency>
             <dependency>
-                <groupId>com.h2database</groupId>
-                <artifactId>h2</artifactId>
-                <version>${h2.version}</version>
-                <scope>test</scope>
-            </dependency>
-            <dependency>
                 <groupId>ru.yandex.qatools.embed</groupId>
                 <groupId>ru.yandex.qatools.embed</groupId>
                 <artifactId>postgresql-embedded</artifactId>
                 <artifactId>postgresql-embedded</artifactId>
                 <version>2.2</version>
                 <version>2.2</version>