Showing
3 changed files
with
3 additions
and
6 deletions
@@ -92,9 +92,6 @@ import java.util.UUID; | @@ -92,9 +92,6 @@ import java.util.UUID; | ||
92 | 92 | ||
93 | import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; | 93 | import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; |
94 | 94 | ||
95 | -; | ||
96 | - | ||
97 | - | ||
98 | @Slf4j | 95 | @Slf4j |
99 | abstract public class BaseEdgeTest extends AbstractControllerTest { | 96 | abstract public class BaseEdgeTest extends AbstractControllerTest { |
100 | 97 |
@@ -25,12 +25,12 @@ import org.thingsboard.server.queue.memory.InMemoryStorage; | @@ -25,12 +25,12 @@ import org.thingsboard.server.queue.memory.InMemoryStorage; | ||
25 | import java.util.Arrays; | 25 | import java.util.Arrays; |
26 | 26 | ||
27 | @RunWith(ClasspathSuite.class) | 27 | @RunWith(ClasspathSuite.class) |
28 | -@ClasspathSuite.ClassnameFilters({"org.thingsboard.server.edge.sql.*Test"}) | 28 | +@ClasspathSuite.ClassnameFilters({"org.thingsboard.server.edge.sql.*IGNORED_Test"}) |
29 | public class EdgeSqlTestSuite { | 29 | public class EdgeSqlTestSuite { |
30 | 30 | ||
31 | @ClassRule | 31 | @ClassRule |
32 | public static CustomSqlUnit sqlUnit = new CustomSqlUnit( | 32 | public static CustomSqlUnit sqlUnit = new CustomSqlUnit( |
33 | - Arrays.asList("sql/schema-ts-hsql.sql", "sql/schema-entities-hsql.sql", "sql/schema-entities-idx.sql", "sql/system-data.sql"), | 33 | + Arrays.asList("sql/schema-types-hsql.sql", "sql/schema-ts-hsql.sql", "sql/schema-entities-hsql.sql", "sql/system-data.sql"), |
34 | "sql/hsql/drop-all-tables.sql", | 34 | "sql/hsql/drop-all-tables.sql", |
35 | "sql-test.properties"); | 35 | "sql-test.properties"); |
36 | 36 |
@@ -5,7 +5,7 @@ | @@ -5,7 +5,7 @@ | ||
5 | * you may not use this file except in compliance with 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 | 6 | * You may obtain a copy of the License at |
7 | * | 7 | * |
8 | - * http://www.apache.org/licenses/LICENSE-2.0 | 8 | + * http://www.apache.org/licenses/LICENSE-2.0 |
9 | * | 9 | * |
10 | * Unless required by applicable law or agreed to in writing, software | 10 | * Unless required by applicable law or agreed to in writing, software |
11 | * distributed under the License is distributed on an "AS IS" BASIS, | 11 | * distributed under the License is distributed on an "AS IS" BASIS, |