Spring/spring-data-neo4j
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

improved the server status tests after server startup to see if this helps cut down on test failures

Browse Source
This commit is contained in:
Thomas Risberg
2011-07-19 10:12:53 -04:00
parent 42962e025b
commit 9e8e15d5d4
1 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/LocalTestServer.java
View File

@@ -32,6 +32,7 @@ import org.neo4j.server.modules.ThirdPartyJAXRSModule;
import org.neo4j.server.startup.healthcheck.StartupHealthCheck;
import org.neo4j.server.startup.healthcheck.StartupHealthCheckRule;
import org.neo4j.server.web.Jetty6WebServer;
import org.springframework.dao.DataAccessResourceFailureException;
import java.io.File;
import java.io.IOException;
@@ -107,9 +108,27 @@ public class LocalTestServer {
neoServer.start();
neoServer.getWebServer().getJetty().setStopAtShutdown(true);
// let the server get fully started
try {
Thread.sleep(1000L);
} catch (InterruptedException e) {}
int sleepCount = 0;
while (!neoServer.getWebServer().getJetty().isStarted()) {
System.out.println( "Neo4j Server Status: " +
(neoServer.getWebServer().getJetty().isStarting() ? "STARTING" :
neoServer.getWebServer().getJetty().isStarted() ? "STARTED" :
neoServer.getWebServer().getJetty().isFailed() ? "FAILED" :
"UNKNOWN"));
if (neoServer.getWebServer().getJetty().isFailed()) {
throw new DataAccessResourceFailureException("Neo4j Server startup failed");
}
if (sleepCount > 5) {
throw new DataAccessResourceFailureException("Neo4j Server startup unsuccessful after waiting 5 times");
}
try {
sleepCount++;
System.out.println( "Sleeping ...");
Thread.sleep(500L);
} catch (InterruptedException e) {
System.out.println( "Interrupted " + e.getMessage());
}
}
}
public void stop() {