From 2808374bda04dbe709253ca079dfb89d5dbea7dd Mon Sep 17 00:00:00 2001 From: Jim Hahn Date: Thu, 29 Nov 2018 09:33:02 -0500 Subject: Remove Factory from various drools-pdp classes Also merged changes from 'Rename test classes in drools-pdp'. Change-Id: I4d0a3a1b0b5523eadf38d1edb5aa86c404b69d19 Issue-ID: POLICY-1288 Signed-off-by: Jim Hahn --- .../internal/AggregatedPolicyControllerTest.java | 90 ++++++++++++---------- 1 file changed, 48 insertions(+), 42 deletions(-) (limited to 'policy-management/src/test/java/org/onap') diff --git a/policy-management/src/test/java/org/onap/policy/drools/system/internal/AggregatedPolicyControllerTest.java b/policy-management/src/test/java/org/onap/policy/drools/system/internal/AggregatedPolicyControllerTest.java index 4f26419f..bb944fc9 100644 --- a/policy-management/src/test/java/org/onap/policy/drools/system/internal/AggregatedPolicyControllerTest.java +++ b/policy-management/src/test/java/org/onap/policy/drools/system/internal/AggregatedPolicyControllerTest.java @@ -37,9 +37,7 @@ import java.util.List; import java.util.Properties; import java.util.function.BiConsumer; import java.util.function.Consumer; -import org.junit.AfterClass; import org.junit.Before; -import org.junit.BeforeClass; import org.junit.Test; import org.onap.policy.common.endpoints.event.comm.Topic.CommInfrastructure; import org.onap.policy.common.endpoints.event.comm.TopicEndpoint; @@ -50,16 +48,9 @@ import org.onap.policy.drools.controller.DroolsControllerFactory; import org.onap.policy.drools.features.PolicyControllerFeatureAPI; import org.onap.policy.drools.persistence.SystemPersistence; import org.onap.policy.drools.protocol.configuration.DroolsConfiguration; -import org.onap.policy.drools.system.internal.AggregatedPolicyController.Factory; -import org.powermock.reflect.Whitebox; public class AggregatedPolicyControllerTest { - /** - * Name of the "factory" field within the {@link AggregatedPolicyController} class. - */ - private static final String FACTORY_FIELD = "factory"; - private static final String AGG_NAME = "agg-name"; private static final String SINK_TOPIC1 = "sink-a"; private static final String SINK_TOPIC2 = "sink-b"; @@ -78,10 +69,7 @@ public class AggregatedPolicyControllerTest { private static final String GROUP2 = "group-b"; private static final String VERSION2 = "version-b"; - private static Factory savedFactory; - private Properties properties; - private Factory factory; private TopicEndpoint endpointMgr; private List sources; private TopicSource source1; @@ -98,16 +86,6 @@ public class AggregatedPolicyControllerTest { private PolicyControllerFeatureAPI prov2; private AggregatedPolicyController apc; - @BeforeClass - public static void setUpBeforeClass() { - savedFactory = Whitebox.getInternalState(AggregatedPolicyController.class, FACTORY_FIELD); - } - - @AfterClass - public static void tearDownAfterClass() { - Whitebox.setInternalState(AggregatedPolicyController.class, FACTORY_FIELD, savedFactory); - } - /** * Initializes the object to be tested. */ @@ -158,26 +136,16 @@ public class AggregatedPolicyControllerTest { providers = Arrays.asList(prov1, prov2); - factory = mock(Factory.class); - Whitebox.setInternalState(AggregatedPolicyController.class, FACTORY_FIELD, factory); - - when(factory.getEndpointManager()).thenReturn(endpointMgr); - when(factory.getPersistenceManager()).thenReturn(persist); - when(factory.getDroolsFactory()).thenReturn(droolsFactory); - when(factory.getFeatureProviders()).thenReturn(providers); - - apc = new AggregatedPolicyController(AGG_NAME, properties); + apc = new AggregatedPolicyControllerImpl(AGG_NAME, properties); } @Test public void testFactory() { - assertNotNull(savedFactory); - - Factory factory = new Factory(); - assertNotNull(factory.getDroolsFactory()); - assertNotNull(factory.getEndpointManager()); - assertNotNull(factory.getFeatureProviders()); - assertNotNull(factory.getPersistenceManager()); + apc = new AggregatedPolicyController(AGG_NAME, properties); + assertNotNull(apc.getDroolsFactory()); + assertNotNull(apc.getEndpointManager()); + assertNotNull(apc.getProviders()); + assertNotNull(apc.getPersistenceManager()); } @Test @@ -187,14 +155,22 @@ public class AggregatedPolicyControllerTest { @Test(expected = IllegalArgumentException.class) public void testInitDrools_Ex() { - when(factory.getDroolsFactory()).thenThrow(new RuntimeException(EXPECTED)); - new AggregatedPolicyController(AGG_NAME, properties); + new AggregatedPolicyControllerImpl(AGG_NAME, properties) { + @Override + protected DroolsControllerFactory getDroolsFactory() { + throw new RuntimeException(EXPECTED); + } + }; } @Test(expected = IllegalArgumentException.class) public void testInitDrools_Error() { - when(factory.getDroolsFactory()).thenThrow(new LinkageError(EXPECTED)); - new AggregatedPolicyController(AGG_NAME, properties); + new AggregatedPolicyControllerImpl(AGG_NAME, properties) { + @Override + protected DroolsControllerFactory getDroolsFactory() { + throw new LinkageError(EXPECTED); + } + }; } @Test @@ -945,4 +921,34 @@ public class AggregatedPolicyControllerTest { assertThrows(AssertionError.class, () -> verifyAfter.accept(prov1)); assertThrows(AssertionError.class, () -> verifyAfter.accept(prov2)); } + + /** + * Controller with overrides. + */ + private class AggregatedPolicyControllerImpl extends AggregatedPolicyController { + + public AggregatedPolicyControllerImpl(String name, Properties properties) { + super(name, properties); + } + + @Override + protected SystemPersistence getPersistenceManager() { + return persist; + } + + @Override + protected TopicEndpoint getEndpointManager() { + return endpointMgr; + } + + @Override + protected DroolsControllerFactory getDroolsFactory() { + return droolsFactory; + } + + @Override + protected List getProviders() { + return providers; + } + } } -- cgit 1.2.3-korg