Commit b91bfddf181bfa1d797f8e79c2d113d90e8b19ef
1 parent
b88ce866
Separate controller and mqtt suite
Showing
2 changed files
with
41 additions
and
4 deletions
application/src/test/java/org/thingsboard/server/controller/ControllerTestSuite.java
renamed from
application/src/test/java/org/thingsboard/server/ApplicationServerTestSuite.java
@@ -13,7 +13,7 @@ | @@ -13,7 +13,7 @@ | ||
13 | * See the License for the specific language governing permissions and | 13 | * See the License for the specific language governing permissions and |
14 | * limitations under the License. | 14 | * limitations under the License. |
15 | */ | 15 | */ |
16 | -package org.thingsboard.server; | 16 | +package org.thingsboard.server.controller; |
17 | 17 | ||
18 | import org.cassandraunit.dataset.cql.ClassPathCQLDataSet; | 18 | import org.cassandraunit.dataset.cql.ClassPathCQLDataSet; |
19 | import org.junit.ClassRule; | 19 | import org.junit.ClassRule; |
@@ -25,9 +25,8 @@ import java.util.Arrays; | @@ -25,9 +25,8 @@ import java.util.Arrays; | ||
25 | 25 | ||
26 | @RunWith(ClasspathSuite.class) | 26 | @RunWith(ClasspathSuite.class) |
27 | @ClasspathSuite.ClassnameFilters({ | 27 | @ClasspathSuite.ClassnameFilters({ |
28 | - "org.thingsboard.server.controller.*Test", | ||
29 | - "org.thingsboard.server.mqtt.*.*Test"}) | ||
30 | -public class ApplicationServerTestSuite { | 28 | + "org.thingsboard.server.controller.*Test"}) |
29 | +public class ControllerTestSuite { | ||
31 | 30 | ||
32 | @ClassRule | 31 | @ClassRule |
33 | public static CustomCassandraCQLUnit cassandraUnit = | 32 | public static CustomCassandraCQLUnit cassandraUnit = |
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.mqtt; | ||
17 | + | ||
18 | +import org.cassandraunit.dataset.cql.ClassPathCQLDataSet; | ||
19 | +import org.junit.ClassRule; | ||
20 | +import org.junit.extensions.cpsuite.ClasspathSuite; | ||
21 | +import org.junit.runner.RunWith; | ||
22 | +import org.thingsboard.server.dao.CustomCassandraCQLUnit; | ||
23 | + | ||
24 | +import java.util.Arrays; | ||
25 | + | ||
26 | +@RunWith(ClasspathSuite.class) | ||
27 | +@ClasspathSuite.ClassnameFilters({ | ||
28 | + "org.thingsboard.server.mqtt.*.*Test"}) | ||
29 | +public class MqttTestSuite { | ||
30 | + | ||
31 | + @ClassRule | ||
32 | + public static CustomCassandraCQLUnit cassandraUnit = | ||
33 | + new CustomCassandraCQLUnit( | ||
34 | + Arrays.asList( | ||
35 | + new ClassPathCQLDataSet("cassandra/schema.cql", false, false), | ||
36 | + new ClassPathCQLDataSet("cassandra/system-data.cql", false, false)), | ||
37 | + "cassandra-test.yaml", 30000l); | ||
38 | +} |