diff options
Diffstat (limited to 'testsuites/integration')
4 files changed, 6 insertions, 7 deletions
diff --git a/testsuites/integration/integration-uservice-test/pom.xml b/testsuites/integration/integration-uservice-test/pom.xml index b1ab55061..8fff75d82 100644 --- a/testsuites/integration/integration-uservice-test/pom.xml +++ b/testsuites/integration/integration-uservice-test/pom.xml @@ -1,6 +1,7 @@ <!-- ============LICENSE_START======================================================= Copyright (C) 2018 Ericsson. All rights reserved. + Modifications Copyright (C) 2019 Nordix Foundation. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -175,7 +176,6 @@ <dependency> <groupId>org.glassfish.jersey.core</groupId> <artifactId>jersey-client</artifactId> - <version>${version.jersey}</version> </dependency> <dependency> <groupId>org.awaitility</groupId> @@ -187,12 +187,10 @@ <dependency> <groupId>org.glassfish.jersey.containers</groupId> <artifactId>jersey-container-servlet-core</artifactId> - <version>${version.jersey}</version> </dependency> <dependency> <groupId>org.glassfish.jersey.inject</groupId> <artifactId>jersey-hk2</artifactId> - <version>${version.jersey}</version> </dependency> </dependencies> diff --git a/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/restclient/TestExecutionPropertyRest.java b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/restclient/TestExecutionPropertyRest.java index f3ce83c5a..3ad6f9881 100644 --- a/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/restclient/TestExecutionPropertyRest.java +++ b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/restclient/TestExecutionPropertyRest.java @@ -27,6 +27,7 @@ import java.io.PrintStream; import javax.ws.rs.client.Client; import javax.ws.rs.client.ClientBuilder; import javax.ws.rs.core.Response; + import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; @@ -48,7 +49,6 @@ public class TestExecutionPropertyRest { private static final XLogger LOGGER = XLoggerFactory.getXLogger(TestExecutionPropertyRest.class); - private static final String BASE_URI = "http://localhost:32801/TestExecutionRest"; private static HttpServletServer server; private static final int PORT = 32801; @@ -96,7 +96,7 @@ public class TestExecutionPropertyRest { server.start(); - if (!NetworkUtil.isTcpPortOpen("localHost", PORT, 60, 500L)) { + if (!NetworkUtil.isTcpPortOpen("localHost", PORT, 2000, 1L)) { throw new IllegalStateException("port " + PORT + " is still not in use"); } diff --git a/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/restclient/TestFile2Rest.java b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/restclient/TestFile2Rest.java index 6393f3f04..0ae8f703d 100644 --- a/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/restclient/TestFile2Rest.java +++ b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/restclient/TestFile2Rest.java @@ -25,6 +25,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import com.google.gson.Gson; + import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.PrintStream; @@ -32,6 +33,7 @@ import java.util.Map; import javax.ws.rs.client.Client; import javax.ws.rs.client.ClientBuilder; import javax.ws.rs.core.Response; + import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; @@ -53,7 +55,6 @@ import org.slf4j.ext.XLoggerFactory; public class TestFile2Rest { private static final XLogger LOGGER = XLoggerFactory.getXLogger(TestFile2Rest.class); - private static final String BASE_URI = "http://localhost:32801/TestFile2Rest"; private static final int PORT = 32801; private static HttpServletServer server; diff --git a/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/restclient/TestRest2File.java b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/restclient/TestRest2File.java index 5dd2f0546..1a0570c1f 100644 --- a/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/restclient/TestRest2File.java +++ b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/restclient/TestRest2File.java @@ -27,6 +27,7 @@ import java.io.ByteArrayOutputStream; import java.io.File; import java.io.IOException; import java.io.PrintStream; + import org.junit.After; import org.junit.AfterClass; import org.junit.Before; @@ -49,7 +50,6 @@ import org.slf4j.ext.XLoggerFactory; public class TestRest2File { private static final XLogger LOGGER = XLoggerFactory.getXLogger(TestRest2File.class); - private static final String BASE_URI = "http://localhost:32801/TestRest2File"; private static final int PORT = 32801; private static HttpServletServer server; |