diff options
| author |   Pamela Dragosh <pdragosh@research.att.com> | 2018-07-27 16:16:22 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-07-27 16:16:22 +0000 |
| commit | 1df87df1af0d215b9ff908dd15089393b9be270b (patch) | |
| tree | d9c6e0dd33275415092f08a2b1770e8395e63070 | |
| parent | dd986507648898887715a20c2f962bc714e28882 (diff) | |
| parent | 63f2140962365fe095c04d779691600f5a0fb4ab (diff) | |
Merge "Copy policy-endpoints from drools-pdp to common"
| -rw-r--r-- | ONAP-PDP/pom.xml | 4 | ||||
| -rw-r--r-- | ONAP-PDP/src/test/java/org/onap/policy/xacml/action/FindActionTest.java | 11 |
2 files changed, 8 insertions, 7 deletions
diff --git a/ONAP-PDP/pom.xml b/ONAP-PDP/pom.xml index d664cf4db..a616edd96 100644 --- a/ONAP-PDP/pom.xml +++ b/ONAP-PDP/pom.xml @@ -81,9 +81,9 @@ </exclusions> </dependency> <dependency> - <groupId>org.onap.policy.drools-pdp</groupId> + <groupId>org.onap.policy.common</groupId> <artifactId>policy-endpoints</artifactId> - <version>${project.version}</version> + <version>${project.version}</version> <scope>test</scope> </dependency> </dependencies> diff --git a/ONAP-PDP/src/test/java/org/onap/policy/xacml/action/FindActionTest.java b/ONAP-PDP/src/test/java/org/onap/policy/xacml/action/FindActionTest.java index f8a5e4b4a..93cb28546 100644 --- a/ONAP-PDP/src/test/java/org/onap/policy/xacml/action/FindActionTest.java +++ b/ONAP-PDP/src/test/java/org/onap/policy/xacml/action/FindActionTest.java @@ -45,8 +45,9 @@ import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import org.onap.policy.drools.http.server.HttpServletServer; -import org.onap.policy.drools.utils.NetworkUtil; +import org.onap.policy.common.endpoints.http.server.HttpServletServer; +import org.onap.policy.common.endpoints.http.server.impl.IndexedHttpServletServerFactory; +import org.onap.policy.common.utils.network.NetworkUtil; import org.onap.policy.xacml.custom.OnapFunctionDefinitionFactory; public class FindActionTest { @@ -68,8 +69,8 @@ public class FindActionTest { @BeforeClass public static void setUpServer() { try { - final HttpServletServer testServer = - HttpServletServer.factory.build("dmaapSim", "localhost", MOCK_SERVER_PORT, "/", false, true); + final HttpServletServer testServer = IndexedHttpServletServerFactory.getInstance().build("dmaapSim", + "localhost", MOCK_SERVER_PORT, "/", false, true); testServer.addServletClass("/*", DummyRest.class.getName()); testServer.waitedStart(2000); if (!NetworkUtil.isTcpPortOpen("localhost", testServer.getPort(), 5, 10000L)) { @@ -83,7 +84,7 @@ public class FindActionTest { @AfterClass public static void tearDownSimulator() { - HttpServletServer.factory.destroy(); + IndexedHttpServletServerFactory.getInstance().destroy(); } /** |