use random ports;

tests for the Daemon

src/main/java/de/kosit/validationtool/daemon/Daemon.java

@@ -6,7 +6,6 @@ import java.util.concurrent.Executors;
 
 import com.sun.net.httpserver.HttpServer;
 
-import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
@@ -23,7 +22,6 @@ import de.kosit.validationtool.model.daemon.HealthType;
  */
 @RequiredArgsConstructor
 @Setter
-@Getter
 @Slf4j
 public class Daemon {
 

src/main/java/de/kosit/validationtool/impl/xml/StrictRelativeResolvingStrategy.java

@@ -1,7 +1,6 @@
 package de.kosit.validationtool.impl.xml;
 
 import java.io.Reader;
-import java.io.UnsupportedEncodingException;
 import java.net.URI;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
@@ -15,6 +14,7 @@ import javax.xml.validation.SchemaFactory;
 import javax.xml.validation.Validator;
 
 import lombok.RequiredArgsConstructor;
+import lombok.SneakyThrows;
 
 import net.sf.saxon.Configuration;
 import net.sf.saxon.expr.XPathContext;
@@ -98,12 +98,9 @@ public class StrictRelativeResolvingStrategy extends BaseResolvingStrategy {
         return processor;
     }
 
+    @SneakyThrows
     private static String encode(final String input) {
-        try {
-            return URLEncoder.encode(input, StandardCharsets.UTF_8.name());
-        } catch (final UnsupportedEncodingException e) {
-            throw new IllegalStateException("Error encoding property while initializing saxon", e);
-        }
+        return URLEncoder.encode(input, StandardCharsets.UTF_8.name());
     }
 
     @Override

src/test/java/de/kosit/validationtool/daemon/BaseIT.java

@@ -0,0 +1,26 @@
+package de.kosit.validationtool.daemon;
+
+import org.junit.Before;
+
+import io.restassured.RestAssured;
+
+/**
+ * Base for integration tests.
+ * 
+ * @author Andreas Penski
+ */
+public abstract class BaseIT {
+
+    @Before
+    public void setup() {
+        final String port = System.getProperty("daemon.port");
+        if (port != null) {
+            RestAssured.port = Integer.valueOf(port);
+        }
+        final String baseHost = System.getProperty("daemon.host");
+        if (baseHost != null) {
+            RestAssured.baseURI = baseHost;
+        }
+        RestAssured.enableLoggingOfRequestAndResponseIfValidationFails();
+    }
+}

src/test/java/de/kosit/validationtool/daemon/CheckHandlerIT.java

@@ -1,4 +1,4 @@
-package de.kosit.validationtool.cmd;
+package de.kosit.validationtool.daemon;
 
 import static io.restassured.RestAssured.given;
 
@@ -6,13 +6,11 @@ import java.io.IOException;
 import java.io.InputStream;
 
 import org.apache.commons.io.IOUtils;
-import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
 
 import de.kosit.validationtool.impl.Helper.Simple;
 
-import io.restassured.RestAssured;
 import io.restassured.http.ContentType;
 
 /**
@@ -20,24 +18,13 @@ import io.restassured.http.ContentType;
  *
  * @author Roula Antoun
  */
-public class DaemonIT {
+public class CheckHandlerIT extends BaseIT {
 
 
     private static final String APPLICATION_XML = "application/xml";
 
 
-    @Before
-    public void setup() {
-        final String port = System.getProperty("daemon.port");
-        if (port != null) {
-            RestAssured.port = Integer.valueOf(port);
-        }
-        final String baseHost = System.getProperty("daemon.host");
-        if (baseHost != null) {
-            RestAssured.baseURI = baseHost;
-        }
-        RestAssured.enableLoggingOfRequestAndResponseIfValidationFails();
-    }
+
 
     @Test
     public void makeSureThatSuccessTest() throws IOException {

src/test/java/de/kosit/validationtool/daemon/ConfigHandlerIT.java

@@ -0,0 +1,20 @@
+package de.kosit.validationtool.daemon;
+
+import static io.restassured.RestAssured.given;
+
+import org.junit.Test;
+
+import io.restassured.http.ContentType;
+
+/**
+ * Integration test for the {@link ConfigHandler}.
+ * 
+ * @author Andreas Penski
+ */
+public class ConfigHandlerIT extends BaseIT {
+
+    @Test
+    public void checkHealth() {
+        given().when().get("/server/config").then().statusCode(200).and().contentType(ContentType.XML);
+    }
+}

src/test/java/de/kosit/validationtool/daemon/HealthHandlerIT.java

@@ -0,0 +1,20 @@
+package de.kosit.validationtool.daemon;
+
+import static io.restassured.RestAssured.given;
+
+import org.junit.Test;
+
+import io.restassured.http.ContentType;
+
+/**
+ * Checks the health endpoint.
+ * 
+ * @author Andreas Penski
+ */
+public class HealthHandlerIT extends BaseIT {
+
+    @Test
+    public void checkHealth() {
+        given().when().get("/server/health").then().statusCode(200).and().contentType(ContentType.XML);
+    }
+}