Commit 9668b8a2311e94fc17573dfbe88fe9588f4bb829
Committed by
GitHub
Merge pull request #69 from thingsboard/feature/TB-43
TB-43: Disable check updates in test mode.
Showing
5 changed files
with
5 additions
and
4 deletions
@@ -73,7 +73,7 @@ IF "%JRE_PATH2%" == "" GOTO JAVA_NOT_INSTALLED | @@ -73,7 +73,7 @@ IF "%JRE_PATH2%" == "" GOTO JAVA_NOT_INSTALLED | ||
73 | 73 | ||
74 | @ECHO Java 1.8 found! | 74 | @ECHO Java 1.8 found! |
75 | @ECHO Installing ${pkg.name} ... | 75 | @ECHO Installing ${pkg.name} ... |
76 | -${pkg.name}.exe install | 76 | +%~dp0${pkg.name}.exe install |
77 | 77 | ||
78 | @ECHO DONE. | 78 | @ECHO DONE. |
79 | 79 |
@@ -89,7 +89,7 @@ import static org.springframework.test.web.servlet.setup.MockMvcBuilders.webAppC | @@ -89,7 +89,7 @@ import static org.springframework.test.web.servlet.setup.MockMvcBuilders.webAppC | ||
89 | @ActiveProfiles("test") | 89 | @ActiveProfiles("test") |
90 | @RunWith(SpringJUnit4ClassRunner.class) | 90 | @RunWith(SpringJUnit4ClassRunner.class) |
91 | @ContextConfiguration(classes=AbstractControllerTest.class, loader=SpringApplicationContextLoader.class) | 91 | @ContextConfiguration(classes=AbstractControllerTest.class, loader=SpringApplicationContextLoader.class) |
92 | -@TestPropertySource("classpath:cassandra-test.properties") | 92 | +@TestPropertySource(locations = {"classpath:cassandra-test.properties", "classpath:thingsboard-test.properties"}) |
93 | @DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_CLASS) | 93 | @DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_CLASS) |
94 | @Configuration | 94 | @Configuration |
95 | @EnableAutoConfiguration | 95 | @EnableAutoConfiguration |
@@ -43,7 +43,7 @@ import static org.junit.Assert.assertNotNull; | @@ -43,7 +43,7 @@ import static org.junit.Assert.assertNotNull; | ||
43 | @ActiveProfiles("default") | 43 | @ActiveProfiles("default") |
44 | @RunWith(SpringJUnit4ClassRunner.class) | 44 | @RunWith(SpringJUnit4ClassRunner.class) |
45 | @ContextConfiguration(classes= MqttTelemetryIntergrationTest.class, loader=SpringApplicationContextLoader.class) | 45 | @ContextConfiguration(classes= MqttTelemetryIntergrationTest.class, loader=SpringApplicationContextLoader.class) |
46 | -@TestPropertySource("classpath:cassandra-test.properties") | 46 | +@TestPropertySource(locations = {"classpath:cassandra-test.properties", "classpath:thingsboard-test.properties"}) |
47 | @DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_CLASS) | 47 | @DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_CLASS) |
48 | @Configuration | 48 | @Configuration |
49 | @EnableAutoConfiguration | 49 | @EnableAutoConfiguration |
1 | +updates.enabled=false |