diff options
Diffstat (limited to 'feature-test-transaction/src/test')
2 files changed, 20 insertions, 19 deletions
diff --git a/feature-test-transaction/src/test/java/org/onap/policy/drools/testtransaction/TestTransactionAdditionalTest.java b/feature-test-transaction/src/test/java/org/onap/policy/drools/testtransaction/TestTransactionAdditionalTest.java index 23fdc215..352779df 100644 --- a/feature-test-transaction/src/test/java/org/onap/policy/drools/testtransaction/TestTransactionAdditionalTest.java +++ b/feature-test-transaction/src/test/java/org/onap/policy/drools/testtransaction/TestTransactionAdditionalTest.java @@ -119,7 +119,7 @@ public class TestTransactionAdditionalTest { @Test public void testTestTransactionImpl() { - assertNotNull(TtImpl.manager); + assertNotNull(TestTransactionConstants.getManager()); } @Test @@ -153,7 +153,7 @@ public class TestTransactionAdditionalTest { // unregister again - stop() should not be called again impl.unregister(controller3); verify(task3).stop(); - + // unregister original controller - no stop() should be called again impl.unregister(controller); verify(task, never()).stop(); diff --git a/feature-test-transaction/src/test/java/org/onap/policy/drools/testtransaction/TestTransactionTest.java b/feature-test-transaction/src/test/java/org/onap/policy/drools/testtransaction/TestTransactionTest.java index e0779ba0..e3c2ed91 100644 --- a/feature-test-transaction/src/test/java/org/onap/policy/drools/testtransaction/TestTransactionTest.java +++ b/feature-test-transaction/src/test/java/org/onap/policy/drools/testtransaction/TestTransactionTest.java @@ -33,10 +33,11 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import org.junit.BeforeClass; import org.junit.Test; -import org.onap.policy.drools.persistence.SystemPersistence; -import org.onap.policy.drools.properties.DroolsProperties; +import org.onap.policy.drools.persistence.SystemPersistenceConstants; +import org.onap.policy.drools.properties.DroolsPropertyConstants; import org.onap.policy.drools.system.PolicyController; -import org.onap.policy.drools.system.PolicyEngine; +import org.onap.policy.drools.system.PolicyControllerConstants; +import org.onap.policy.drools.system.PolicyEngineConstants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -55,7 +56,7 @@ public class TestTransactionTest { /** * Start up. - * + * * @throws IOException exception */ @BeforeClass @@ -65,20 +66,20 @@ public class TestTransactionTest { cleanUpWorkingDir(); /* ensure presence of config directory */ - SystemPersistence.manager.setConfigurationDir(null); + SystemPersistenceConstants.getManager().setConfigurationDir(null); } @Test public void registerUnregisterTest() throws InterruptedException { final Properties controllerProperties = new Properties(); - controllerProperties.put(DroolsProperties.PROPERTY_CONTROLLER_NAME, TEST_CONTROLLER_NAME); + controllerProperties.put(DroolsPropertyConstants.PROPERTY_CONTROLLER_NAME, TEST_CONTROLLER_NAME); final PolicyController controller = - PolicyEngine.manager.createPolicyController(TEST_CONTROLLER_NAME, controllerProperties); - assertNotNull(PolicyController.factory.get(TEST_CONTROLLER_NAME)); + PolicyEngineConstants.getManager().createPolicyController(TEST_CONTROLLER_NAME, controllerProperties); + assertNotNull(PolicyControllerConstants.getFactory().get(TEST_CONTROLLER_NAME)); logger.info(controller.toString()); - + CountDownLatch latch = new CountDownLatch(1); - + // use our own impl so we can decrement the latch when run() completes TtImpl impl = new TtImpl() { @Override @@ -90,11 +91,11 @@ public class TestTransactionTest { latch.countDown(); } }; - } + } }; impl.register(controller); - assertNotNull(TestTransaction.manager); + assertNotNull(TestTransactionConstants.getManager()); /* * Unregistering the controller should terminate its TestTransaction thread if it hasn't already @@ -108,7 +109,7 @@ public class TestTransactionTest { /** * Returns thread object based on String name. - * @param latch indicates when the thread has finished running + * @param latch indicates when the thread has finished running * @param threadName thread name * @return the thread * @throws InterruptedException exception @@ -129,8 +130,8 @@ public class TestTransactionTest { /** clean up working directory. */ protected static void cleanUpWorkingDir() { final Path testControllerPath = - Paths.get( - SystemPersistence.manager.getConfigurationPath().toString(), TEST_CONTROLLER_FILE); + Paths.get(SystemPersistenceConstants.getManager().getConfigurationPath().toString(), + TEST_CONTROLLER_FILE); try { Files.deleteIfExists(testControllerPath); } catch (final Exception e) { @@ -138,8 +139,8 @@ public class TestTransactionTest { } final Path testControllerBakPath = - Paths.get( - SystemPersistence.manager.getConfigurationPath().toString(), TEST_CONTROLLER_FILE_BAK); + Paths.get(SystemPersistenceConstants.getManager().getConfigurationPath().toString(), + TEST_CONTROLLER_FILE_BAK); try { Files.deleteIfExists(testControllerBakPath); } catch (final Exception e) { |