X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=runtime%2Forg.argeo.slc.server%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fserver%2Funit%2FAbstractHttpClientTestCase.java;h=5abb3f6e948b4b9d77196235fab97dd2b776be48;hb=c013d066971b9ac23b7b488bd1cc6193c83b6227;hp=5d5dcea5ec77add2f6332fa4df94747c12f119ec;hpb=3f86e5c908d7db1d85e3f12b0798104654a1e12b;p=gpl%2Fargeo-slc.git

diff --git a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/server/unit/AbstractHttpClientTestCase.java b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/server/unit/AbstractHttpClientTestCase.java
index 5d5dcea5e..5abb3f6e9 100644
--- a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/server/unit/AbstractHttpClientTestCase.java
+++ b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/server/unit/AbstractHttpClientTestCase.java
@@ -1,6 +1,5 @@
 package org.argeo.slc.server.unit;
 
-import org.argeo.slc.SlcException;
 import org.argeo.slc.msg.ExecutionAnswer;
 import org.argeo.slc.server.client.SlcServerHttpClient;
 import org.argeo.slc.unit.AbstractSpringTestCase;
@@ -8,18 +7,10 @@ import org.argeo.slc.unit.AbstractSpringTestCase;
 public abstract class AbstractHttpClientTestCase extends AbstractSpringTestCase {
 	private SlcServerHttpClient httpClient = null;
 
-	private String isServerReadyService = "isServerReady.service";
-
 	protected void setUp() throws Exception {
 		super.setUp();
 		httpClient = createHttpClient();
-	}
-
-	protected void waitForServerToBeReady() {
-		ExecutionAnswer answer = httpClient.callServiceSafe(
-				isServerReadyService, null, getServerReadyTimeout());
-		if (!answer.isOk())
-			throw new SlcException("Server is not ready: " + answer);
+		httpClient.waitForServerToBeReady();
 	}
 
 	protected SlcServerHttpClient createHttpClient() {
@@ -31,8 +22,9 @@ public abstract class AbstractHttpClientTestCase extends AbstractSpringTestCase
 		return httpClient;
 	}
 
-	/** Default is 120s */
-	protected Long getServerReadyTimeout() {
-		return 120 * 1000l;
+	protected void assertAnswerOk(ExecutionAnswer answer) {
+		if (!answer.isOk()) {
+			fail("Server execution answer is not ok: " + answer.getMessage());
+		}
 	}
 }