Showing
2 changed files
with
38 additions
and
7 deletions
dao/src/test/java/org/thingsboard/server/dao/NoSqlDaoServiceTestSuite.java
renamed from
dao/src/test/java/org/thingsboard/server/dao/DaoServiceTestSuite.java
... | ... | @@ -25,9 +25,9 @@ import java.util.Arrays; |
25 | 25 | |
26 | 26 | @RunWith(ClasspathSuite.class) |
27 | 27 | @ClassnameFilters({ |
28 | - "org.thingsboard.server.dao.service.*Test" | |
28 | + "org.thingsboard.server.dao.service.*ServiceNoSqlTest" | |
29 | 29 | }) |
30 | -public class DaoServiceTestSuite { | |
30 | +public class NoSqlDaoServiceTestSuite { | |
31 | 31 | |
32 | 32 | @ClassRule |
33 | 33 | public static CustomCassandraCQLUnit cassandraUnit = |
... | ... | @@ -37,9 +37,4 @@ public class DaoServiceTestSuite { |
37 | 37 | new ClassPathCQLDataSet("system-test.cql", false, false)), |
38 | 38 | "cassandra-test.yaml", 30000L); |
39 | 39 | |
40 | - @ClassRule | |
41 | - public static CustomPostgresUnit postgresUnit = new CustomPostgresUnit( | |
42 | - Arrays.asList("postgres/schema.sql", "postgres/system-data.sql", "system-test.sql"), | |
43 | - "postgres-embedded-test.properties"); | |
44 | - | |
45 | 40 | } | ... | ... |
1 | +/** | |
2 | + * Copyright © 2016-2017 The Thingsboard Authors | |
3 | + * | |
4 | + * Licensed under the Apache License, Version 2.0 (the "License"); | |
5 | + * you may not use this file except in compliance with the License. | |
6 | + * You may obtain a copy of the License at | |
7 | + * | |
8 | + * http://www.apache.org/licenses/LICENSE-2.0 | |
9 | + * | |
10 | + * Unless required by applicable law or agreed to in writing, software | |
11 | + * distributed under the License is distributed on an "AS IS" BASIS, | |
12 | + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | |
13 | + * See the License for the specific language governing permissions and | |
14 | + * limitations under the License. | |
15 | + */ | |
16 | +package org.thingsboard.server.dao; | |
17 | + | |
18 | +import org.junit.ClassRule; | |
19 | +import org.junit.extensions.cpsuite.ClasspathSuite; | |
20 | +import org.junit.extensions.cpsuite.ClasspathSuite.ClassnameFilters; | |
21 | +import org.junit.runner.RunWith; | |
22 | + | |
23 | +import java.util.Arrays; | |
24 | + | |
25 | +@RunWith(ClasspathSuite.class) | |
26 | +@ClassnameFilters({ | |
27 | + "org.thingsboard.server.dao.service.*ServiceSqlTest" | |
28 | +}) | |
29 | +public class SqlDaoServiceTestSuite { | |
30 | + | |
31 | + @ClassRule | |
32 | + public static CustomPostgresUnit postgresUnit = new CustomPostgresUnit( | |
33 | + Arrays.asList("postgres/schema.sql", "postgres/system-data.sql", "system-test.sql"), | |
34 | + "postgres-embedded-test.properties"); | |
35 | + | |
36 | +} | ... | ... |