Commit 9668b8a2311e94fc17573dfbe88fe9588f4bb829

Authored by Igor Kulikov
Committed by GitHub
2 parents 10c32f63 281a540c

Merge pull request #69 from thingsboard/feature/TB-43

TB-43: Disable check updates in test mode.
@@ -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
@@ -4,6 +4,6 @@ @@ -4,6 +4,6 @@
4 net stop ${pkg.name} 4 net stop ${pkg.name}
5 5
6 @ECHO Uninstalling ${pkg.name} ... 6 @ECHO Uninstalling ${pkg.name} ...
7 -${pkg.name}.exe uninstall 7 +%~dp0${pkg.name}.exe uninstall
8 8
9 @ECHO DONE. 9 @ECHO DONE.
@@ -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