Upman tests are using random server port

Author: golbi

integration-tests/src/test/resources/unityServer.conf

@@ -8,6 +8,7 @@ unityServer.core.pkiConfigFile=src/test/resources/pki.properties
 unityServer.core.templatesFile=src/test/resources/msgTemplates.properties
 unityServer.core.workspaceDirectory=target/workspace
 unityServer.core.defaultWebContentDirectory=../vaadin-styles/src/main/resources
+unityServer.core.defaultWebPath=/home
 
 unityServer.core.asyncStateUpdateInterval=20
 unityServer.core.auditEventLogsEnabled=true

web-upman/src/test/java/io/imunity/upman/rest/UpmanRESTTestBase.java

@@ -88,19 +88,22 @@ public void setup() throws Exception
 		host = getHost();
 	}
 
-	protected HttpHost getHost() {
-		return new HttpHost("https", "localhost", 53458);
+	protected HttpHost getHost()
+	{
+		int port = httpServer.getUrls()[0].getPort();
+		return new HttpHost("https", "localhost", port);
 	}
 
-	protected HttpClient getClient() throws Exception
+	private HttpClient getClient() throws Exception
 	{
 		DefaultClientConfiguration clientCfg = new DefaultClientConfiguration();
 		clientCfg.setCredential(getDemoCredential());
 		clientCfg.setValidator(getDemoValidator());
 		clientCfg.setSslEnabled(true);
 		clientCfg.setSslAuthn(false);
 		clientCfg.setHttpAuthn(true);
-		return HttpUtils.createClient("https://localhost:53456", clientCfg);
+		int port = httpServer.getUrls()[0].getPort();
+		return HttpUtils.createClient("https://localhost:"+port, clientCfg);
 	}
 
 	protected HttpClientContext getClientContext(HttpHost host)

web-upman/src/test/resources/unityServer.conf

@@ -8,7 +8,7 @@ unityServer.core.pkiConfigFile=src/test/resources/pki.properties
 unityServer.core.workspaceDirectory=target/workspace
 unityServer.core.auditEventLogsEnabled=false
 
-unityServer.core.httpServer.port=53458
+unityServer.core.httpServer.port=0
 unityServer.core.httpServer.host=localhost
 unityServer.core.httpServer.fastRandom=true