dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SystemTestSuite split to Sql and NoSql. Dao Test annotations renamed

Browse Source
This commit is contained in:
mp-loki 2017-06-27 19:14:49 -04:00
parent 0c2342239d
commit bdb6d2589b
47 changed files with 131 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
application/pom.xml
View File

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

2
application/src/test/java/org/thingsboard/server/system/HttpDeviceApiTest.java → application/src/test/java/org/thingsboard/server/system/BaseHttpDeviceApiTest.java
View File

@ -35,7 +35,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
/**
* @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());

4
application/src/test/java/org/thingsboard/server/system/SystemTestSuite.java → application/src/test/java/org/thingsboard/server/system/SystemNoSqlTestSuite.java
View File

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

23
application/src/test/java/org/thingsboard/server/system/SystemSqlTestSuite.java Normal file
View File

@ -0,0 +1,23 @@
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");
}

12
application/src/test/java/org/thingsboard/server/system/nosql/DeviceApiNoSqlTest.java Normal file
View File

@ -0,0 +1,12 @@
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 {
}

11
application/src/test/java/org/thingsboard/server/system/sql/DeviceApiSqlTest.java Normal file
View File

@ -0,0 +1,11 @@
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{
}

5
dao/pom.xml
View File

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

4
dao/src/main/java/org/thingsboard/server/dao/DaoUtil.java
View File

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

2
dao/src/test/java/org/thingsboard/server/dao/service/DaoServiceNoSqlTest.java → dao/src/test/java/org/thingsboard/server/dao/service/DaoNoSqlTest.java
View File

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

2
dao/src/test/java/org/thingsboard/server/dao/service/DaoServiceSqlTest.java → dao/src/test/java/org/thingsboard/server/dao/service/DaoSqlTest.java
View File

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

4
dao/src/test/java/org/thingsboard/server/dao/service/attributes/nosql/AttributesServiceNoSqlTest.java
View File

@ -15,9 +15,9 @@
*/
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;
@DaoServiceNoSqlTest
@DaoNoSqlTest
public class AttributesServiceNoSqlTest extends BaseAttributesServiceTest {
}

4
dao/src/test/java/org/thingsboard/server/dao/service/attributes/sql/AttributesServiceSqlTest.java
View File

@ -15,9 +15,9 @@
*/
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;
@DaoServiceSqlTest
@DaoSqlTest
public class AttributesServiceSqlTest extends BaseAttributesServiceTest {
}

4
dao/src/test/java/org/thingsboard/server/dao/service/event/nosql/EventServiceNoSqlTest.java
View File

@ -15,9 +15,9 @@
*/
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;
@DaoServiceNoSqlTest
@DaoNoSqlTest
public class EventServiceNoSqlTest extends BaseEventServiceTest {
}

4
dao/src/test/java/org/thingsboard/server/dao/service/event/sql/EventServiceSqlTest.java
View File

@ -15,9 +15,9 @@
*/
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;
@DaoServiceSqlTest
@DaoSqlTest
public class EventServiceSqlTest extends BaseEventServiceTest {
}

4
dao/src/test/java/org/thingsboard/server/dao/service/nosql/AdminSettingsServiceNoSqlTest.java
View File

@ -15,9 +15,9 @@
*/
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;
@DaoServiceNoSqlTest
@DaoNoSqlTest
public class AdminSettingsServiceNoSqlTest extends BaseAdminSettingsServiceTest {
}

4
dao/src/test/java/org/thingsboard/server/dao/service/nosql/AlarmServiceNoSqlTest.java
View File

@ -15,9 +15,9 @@
*/
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;
@DaoServiceNoSqlTest
@DaoNoSqlTest
public class AlarmServiceNoSqlTest extends BaseAlarmServiceTest {
}

4
dao/src/test/java/org/thingsboard/server/dao/service/nosql/AssetServiceNoSqlTest.java
View File

@ -15,9 +15,9 @@
*/
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;
@DaoServiceNoSqlTest
@DaoNoSqlTest
public class AssetServiceNoSqlTest extends BaseAssetServiceTest {
}

4
dao/src/test/java/org/thingsboard/server/dao/service/nosql/CustomerServiceNoSqlTest.java
View File

@ -15,9 +15,9 @@
*/
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;
@DaoServiceNoSqlTest
@DaoNoSqlTest
public class CustomerServiceNoSqlTest extends BaseCustomerServiceTest {
}

4
dao/src/test/java/org/thingsboard/server/dao/service/nosql/DashboardServiceNoSqlTest.java
View File

@ -15,9 +15,9 @@
*/
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;
@DaoServiceNoSqlTest
@DaoNoSqlTest
public class DashboardServiceNoSqlTest extends BaseDashboardServiceTest {
}

4
dao/src/test/java/org/thingsboard/server/dao/service/nosql/DeviceCredentialCacheNoSqlTest.java
View File

@ -15,9 +15,9 @@
*/
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;
@DaoServiceNoSqlTest
@DaoNoSqlTest
public class DeviceCredentialCacheNoSqlTest extends BaseDeviceCredentialsCacheTest {
}

4
dao/src/test/java/org/thingsboard/server/dao/service/nosql/DeviceCredentialServiceNoSqlTest.java
View File

@ -15,9 +15,9 @@
*/
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;
@DaoServiceNoSqlTest
@DaoNoSqlTest
public class DeviceCredentialServiceNoSqlTest extends BaseDeviceCredentialsServiceTest {
}

4
dao/src/test/java/org/thingsboard/server/dao/service/nosql/DeviceServiceNoSqlTest.java
View File

@ -15,9 +15,9 @@
*/
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;
@DaoServiceNoSqlTest
@DaoNoSqlTest
public class DeviceServiceNoSqlTest extends BaseDeviceServiceTest {
}

4
dao/src/test/java/org/thingsboard/server/dao/service/nosql/RelationServiceNoSqlTest.java
View File

@ -15,9 +15,9 @@
*/
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;
@DaoServiceNoSqlTest
@DaoNoSqlTest
public class RelationServiceNoSqlTest extends BaseRelationServiceTest {
}

4
dao/src/test/java/org/thingsboard/server/dao/service/nosql/TenantServiceNoSqlTest.java
View File

@ -15,9 +15,9 @@
*/
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;
@DaoServiceNoSqlTest
@DaoNoSqlTest
public class TenantServiceNoSqlTest extends BaseTenantServiceTest {
}

4
dao/src/test/java/org/thingsboard/server/dao/service/nosql/UserServiceNoSqlTest.java
View File

@ -15,9 +15,9 @@
*/
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;
@DaoServiceNoSqlTest
@DaoNoSqlTest
public class UserServiceNoSqlTest extends BaseUserServiceTest {
}

4
dao/src/test/java/org/thingsboard/server/dao/service/nosql/WidgetTypeServiceNoSqlTest.java
View File

@ -15,9 +15,9 @@
*/
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;
@DaoServiceNoSqlTest
@DaoNoSqlTest
public class WidgetTypeServiceNoSqlTest extends BaseWidgetTypeServiceTest {
}

4
dao/src/test/java/org/thingsboard/server/dao/service/nosql/WidgetsBundleServiceNoSqlTest.java
View File

@ -15,9 +15,9 @@
*/
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;
@DaoServiceNoSqlTest
@DaoNoSqlTest
public class WidgetsBundleServiceNoSqlTest extends BaseWidgetsBundleServiceTest {
}

4
dao/src/test/java/org/thingsboard/server/dao/service/plugin/nosql/PluginServiceNoSqlTest.java
View File

@ -15,9 +15,9 @@
*/
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;
@DaoServiceNoSqlTest
@DaoNoSqlTest
public class PluginServiceNoSqlTest extends BasePluginServiceTest {
}

4
dao/src/test/java/org/thingsboard/server/dao/service/plugin/sql/PluginServiceSqlTest.java
View File

@ -15,9 +15,9 @@
*/
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;
@DaoServiceSqlTest
@DaoSqlTest
public class PluginServiceSqlTest extends BasePluginServiceTest {
}

4
dao/src/test/java/org/thingsboard/server/dao/service/rule/nosql/RuleServiceNoSqlTest.java
View File

@ -15,9 +15,9 @@
*/
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;
@DaoServiceNoSqlTest
@DaoNoSqlTest
public class RuleServiceNoSqlTest extends BaseRuleServiceTest {
}

4
dao/src/test/java/org/thingsboard/server/dao/service/rule/sql/RuleServiceSqlTest.java
View File

@ -15,9 +15,9 @@
*/
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;
@DaoServiceSqlTest
@DaoSqlTest
public class RuleServiceSqlTest extends BaseRuleServiceTest {
}

4
dao/src/test/java/org/thingsboard/server/dao/service/sql/AdminSettingsServiceSqlTest.java
View File

@ -15,9 +15,9 @@
*/
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;
@DaoServiceSqlTest
@DaoSqlTest
public class AdminSettingsServiceSqlTest extends BaseAdminSettingsServiceTest {
}

4
dao/src/test/java/org/thingsboard/server/dao/service/sql/AlarmServiceSqlTest.java
View File

@ -15,9 +15,9 @@
*/
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;
@DaoServiceSqlTest
@DaoSqlTest
public class AlarmServiceSqlTest extends BaseAlarmServiceTest {
}

4
dao/src/test/java/org/thingsboard/server/dao/service/sql/AssetServiceSqlTest.java
View File

@ -15,9 +15,9 @@
*/
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;
@DaoServiceSqlTest
@DaoSqlTest
public class AssetServiceSqlTest extends BaseAssetServiceTest {
}

4
dao/src/test/java/org/thingsboard/server/dao/service/sql/CustomerServiceSqlTest.java
View File

@ -15,9 +15,9 @@
*/
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;
@DaoServiceSqlTest
@DaoSqlTest
public class CustomerServiceSqlTest extends BaseCustomerServiceTest {
}

4
dao/src/test/java/org/thingsboard/server/dao/service/sql/DashboardServiceSqlTest.java
View File

@ -15,9 +15,9 @@
*/
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;
@DaoServiceSqlTest
@DaoSqlTest
public class DashboardServiceSqlTest extends BaseDashboardServiceTest {
}

4
dao/src/test/java/org/thingsboard/server/dao/service/sql/DeviceCredentialsCacheSqlTest.java
View File

@ -15,9 +15,9 @@
*/
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;
@DaoServiceSqlTest
@DaoSqlTest
public class DeviceCredentialsCacheSqlTest extends BaseDeviceCredentialsCacheTest {
}

4
dao/src/test/java/org/thingsboard/server/dao/service/sql/DeviceCredentialsServiceSqlTest.java
View File

@ -15,9 +15,9 @@
*/
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;
@DaoServiceSqlTest
@DaoSqlTest
public class DeviceCredentialsServiceSqlTest extends BaseDeviceCredentialsServiceTest {
}

4
dao/src/test/java/org/thingsboard/server/dao/service/sql/DeviceServiceSqlTest.java
View File

@ -15,9 +15,9 @@
*/
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;
@DaoServiceSqlTest
@DaoSqlTest
public class DeviceServiceSqlTest extends BaseDeviceServiceTest {
}

4
dao/src/test/java/org/thingsboard/server/dao/service/sql/RelationServiceSqlTest.java
View File

@ -15,9 +15,9 @@
*/
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;
@DaoServiceSqlTest
@DaoSqlTest
public class RelationServiceSqlTest extends BaseRelationServiceTest {
}

4
dao/src/test/java/org/thingsboard/server/dao/service/sql/TenantServiceSqlTest.java
View File

@ -15,9 +15,9 @@
*/
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;
@DaoServiceSqlTest
@DaoSqlTest
public class TenantServiceSqlTest extends BaseTenantServiceTest {
}

4
dao/src/test/java/org/thingsboard/server/dao/service/sql/UserServiceSqlTest.java
View File

@ -15,9 +15,9 @@
*/
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;
@DaoServiceSqlTest
@DaoSqlTest
public class UserServiceSqlTest extends BaseUserServiceTest {
}

4
dao/src/test/java/org/thingsboard/server/dao/service/sql/WidgetTypeServiceSqlTest.java
View File

@ -15,9 +15,9 @@
*/
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;
@DaoServiceSqlTest
@DaoSqlTest
public class WidgetTypeServiceSqlTest extends BaseWidgetTypeServiceTest {
}

4
dao/src/test/java/org/thingsboard/server/dao/service/sql/WidgetsBundleServiceSqlTest.java
View File

@ -15,9 +15,9 @@
*/
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;
@DaoServiceSqlTest
@DaoSqlTest
public class WidgetsBundleServiceSqlTest extends BaseWidgetsBundleServiceTest {
}

4
dao/src/test/java/org/thingsboard/server/dao/service/timeseries/nosql/TimeseriesServiceNoSqlTest.java
View File

@ -15,9 +15,9 @@
*/
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;
@DaoServiceNoSqlTest
@DaoNoSqlTest
public class TimeseriesServiceNoSqlTest extends BaseTimeseriesServiceTest {
}

4
dao/src/test/java/org/thingsboard/server/dao/service/timeseries/sql/TimeseriesServiceSqlTest.java
View File

@ -15,9 +15,9 @@
*/
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;
@DaoServiceSqlTest
@DaoSqlTest
public class TimeseriesServiceSqlTest extends BaseTimeseriesServiceTest {
}

7
pom.xml
View File

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