@update:79; First end-to-end integration test

[gpl/argeo-slc.git] / runtime / org.argeo.slc.server / src / main / java / org / argeo / slc / server / unit / AbstractHttpClientTestCase.java

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 f0142ba50f38f53dc0fc5edfd6bb7cf6e52b27b6..5abb3f6e948b4b9d77196235fab97dd2b776be48 100644 (file)
--- 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,19 +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();
-               waitForServerToBeReady();
-       }
-
-       protected void waitForServerToBeReady() {
-               ExecutionAnswer answer = httpClient.callServiceSafe(
-                               isServerReadyService, null, null, getServerReadyTimeout());
-               if (!answer.isOk())
-                       throw new SlcException("Server is not ready: " + answer);
+               httpClient.waitForServerToBeReady();
        }
 
        protected SlcServerHttpClient createHttpClient() {
@@ -32,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());
+               }
        }
 }