diff options
Diffstat (limited to 'ONAP-PDP/src/test/java')
| -rw-r--r-- | ONAP-PDP/src/test/java/org/onap/policy/xacml/action/FindActionTest.java | 9 | ||||
| -rw-r--r-- | ONAP-PDP/src/test/java/org/onap/policy/xacml/pdp/OnapPdpEngineFactoryTest.java | 9 |
2 files changed, 11 insertions, 7 deletions
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 5403f8ff1..f8729d696 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 @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * ONAP-PDP * ================================================================================ - * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -46,6 +46,7 @@ import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; import org.onap.policy.common.endpoints.http.server.HttpServletServer; +import org.onap.policy.common.endpoints.http.server.HttpServletServerFactoryInstance; import org.onap.policy.common.utils.network.NetworkUtil; import org.onap.policy.xacml.custom.OnapFunctionDefinitionFactory; @@ -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 = HttpServletServerFactoryInstance.getServerFactory().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(); + HttpServletServerFactoryInstance.getServerFactory().destroy(); } /** diff --git a/ONAP-PDP/src/test/java/org/onap/policy/xacml/pdp/OnapPdpEngineFactoryTest.java b/ONAP-PDP/src/test/java/org/onap/policy/xacml/pdp/OnapPdpEngineFactoryTest.java index d3ee544a5..9447a951a 100644 --- a/ONAP-PDP/src/test/java/org/onap/policy/xacml/pdp/OnapPdpEngineFactoryTest.java +++ b/ONAP-PDP/src/test/java/org/onap/policy/xacml/pdp/OnapPdpEngineFactoryTest.java @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * ONAP-PDP * ================================================================================ - * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2017-2018, 2020 AT&T Intellectual Property. All rights reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -33,10 +33,13 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mockito; import org.powermock.api.mockito.PowerMockito; +import org.powermock.core.classloader.annotations.PowerMockIgnore; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; @RunWith(PowerMockRunner.class) +@PowerMockIgnore({"com.sun.org.apache.xerces.*", "jdk.internal.reflect.*", "javax.xml.*", "org.xml.*"}) +@PrepareForTest(OnapPdpEngineFactory.class) public class OnapPdpEngineFactoryTest { @Test public final void testNewEngine() { @@ -61,7 +64,7 @@ public class OnapPdpEngineFactoryTest { @PrepareForTest({ EvaluationContextFactory.class, FactoryFinder.class }) @Test(expected = FactoryException.class) - public void negTestEngine() throws FactoryException { + public void testNegTestEngine() throws FactoryException { // Setup test data PowerMockito.mockStatic(FactoryFinder.class); PowerMockito.when(FactoryFinder.find(Mockito.any(), Mockito.any(), Mockito.any())).thenReturn(null); @@ -74,7 +77,7 @@ public class OnapPdpEngineFactoryTest { @PrepareForTest({ EvaluationContextFactory.class, FactoryFinder.class }) @Test(expected = FactoryException.class) - public void negTestEngine2() throws FactoryException { + public void testNegTestEngine2() throws FactoryException { // Setup test data PowerMockito.mockStatic(FactoryFinder.class); PowerMockito.when(FactoryFinder.find(Mockito.any(), Mockito.any(), Mockito.any())).thenReturn(null); |