dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
TB-43: Disable check updates in test mode.
This commit is contained in:
Igor Kulikov 2017-03-09 12:15:22 +02:00 committed by GitHub
commit 9668b8a231
5 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/src/main/scripts/windows/install.bat
View File

@ -73,7 +73,7 @@ IF "%JRE_PATH2%" == "" GOTO JAVA_NOT_INSTALLED
@ECHO Java 1.8 found! @ECHO Java 1.8 found!
@ECHO Installing ${pkg.name} ... @ECHO Installing ${pkg.name} ...
${pkg.name}.exe install %~dp0${pkg.name}.exe install
@ECHO DONE. @ECHO DONE.

2
application/src/main/scripts/windows/uninstall.bat
View File

@ -4,6 +4,6 @@
net stop ${pkg.name} net stop ${pkg.name}
@ECHO Uninstalling ${pkg.name} ... @ECHO Uninstalling ${pkg.name} ...
${pkg.name}.exe uninstall %~dp0${pkg.name}.exe uninstall
@ECHO DONE. @ECHO DONE.

2
application/src/test/java/org/thingsboard/server/controller/AbstractControllerTest.java
View File

@ -89,7 +89,7 @@ import static org.springframework.test.web.servlet.setup.MockMvcBuilders.webAppC
@ActiveProfiles("test") @ActiveProfiles("test")
@RunWith(SpringJUnit4ClassRunner.class) @RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration(classes=AbstractControllerTest.class, loader=SpringApplicationContextLoader.class) @ContextConfiguration(classes=AbstractControllerTest.class, loader=SpringApplicationContextLoader.class)
@TestPropertySource("classpath:cassandra-test.properties") @TestPropertySource(locations = {"classpath:cassandra-test.properties", "classpath:thingsboard-test.properties"})
@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_CLASS) @DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_CLASS)
@Configuration @Configuration
@EnableAutoConfiguration @EnableAutoConfiguration

2
application/src/test/java/org/thingsboard/server/mqtt/AbstractFeatureIntegrationTest.java
View File

@ -43,7 +43,7 @@ import static org.junit.Assert.assertNotNull;
@ActiveProfiles("default") @ActiveProfiles("default")
@RunWith(SpringJUnit4ClassRunner.class) @RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration(classes= MqttTelemetryIntergrationTest.class, loader=SpringApplicationContextLoader.class) @ContextConfiguration(classes= MqttTelemetryIntergrationTest.class, loader=SpringApplicationContextLoader.class)
@TestPropertySource("classpath:cassandra-test.properties") @TestPropertySource(locations = {"classpath:cassandra-test.properties", "classpath:thingsboard-test.properties"})
@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_CLASS) @DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_CLASS)
@Configuration @Configuration
@EnableAutoConfiguration @EnableAutoConfiguration

1
application/src/test/resources/thingsboard-test.properties Normal file
View File

@ -0,0 +1 @@
updates.enabled=false