diff options
Diffstat (limited to 'context/context-test-utils/src/test')
6 files changed, 69 insertions, 33 deletions
diff --git a/context/context-test-utils/src/test/java/org/onap/policy/apex/context/test/distribution/TestContextAlbumUpdate.java b/context/context-test-utils/src/test/java/org/onap/policy/apex/context/test/distribution/TestContextAlbumUpdate.java index 6b9ba15ad..54440370c 100644 --- a/context/context-test-utils/src/test/java/org/onap/policy/apex/context/test/distribution/TestContextAlbumUpdate.java +++ b/context/context-test-utils/src/test/java/org/onap/policy/apex/context/test/distribution/TestContextAlbumUpdate.java @@ -24,7 +24,7 @@ import java.io.IOException; import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.onap.policy.apex.context.impl.distribution.jvmlocal.JVMLocalDistributor; +import org.onap.policy.apex.context.impl.distribution.jvmlocal.JvmLocalDistributor; import org.onap.policy.apex.context.impl.schema.java.JavaSchemaHelperParameters; import org.onap.policy.apex.context.parameters.ContextParameterConstants; import org.onap.policy.apex.context.parameters.ContextParameters; @@ -42,6 +42,9 @@ public class TestContextAlbumUpdate { private SchemaParameters schemaParameters; private ContextParameters contextParameters; + /** + * Set up context data. + */ @Before public void beforeTest() { contextParameters = new ContextParameters(); @@ -55,7 +58,7 @@ public class TestContextAlbumUpdate { ParameterService.register(contextParameters.getDistributorParameters()); ParameterService.register(contextParameters.getLockManagerParameters()); ParameterService.register(contextParameters.getPersistorParameters()); - + schemaParameters = new SchemaParameters(); schemaParameters.setName(ContextParameterConstants.SCHEMA_GROUP_NAME); schemaParameters.getSchemaHelperParameterMap().put("JAVA", new JavaSchemaHelperParameters()); @@ -63,6 +66,9 @@ public class TestContextAlbumUpdate { ParameterService.register(schemaParameters); } + /** + * Clear down context data. + */ @After public void afterTest() { ParameterService.deregister(schemaParameters); @@ -74,17 +80,17 @@ public class TestContextAlbumUpdate { } @Test - public void testContextAlbumUpdateJVMLocalVarSet() throws ApexModelException, IOException, ApexException { + public void testContextAlbumUpdateJvmLocalVarSet() throws ApexModelException, IOException, ApexException { logger.debug("Running testContextAlbumUpdateJVMLocalVarSet test . . ."); - contextParameters.getDistributorParameters().setPluginClass(JVMLocalDistributor.class.getCanonicalName()); + contextParameters.getDistributorParameters().setPluginClass(JvmLocalDistributor.class.getCanonicalName()); new ContextAlbumUpdate().testContextAlbumUpdate(); logger.debug("Ran testContextAlbumUpdateJVMLocalVarSet test"); } @Test - public void testContextAlbumUpdateJVMLocalVarNotSet() throws ApexModelException, IOException, ApexException { + public void testContextAlbumUpdateJvmLocalVarNotSet() throws ApexModelException, IOException, ApexException { logger.debug("Running testContextAlbumUpdateJVMLocalVarNotSet test . . ."); new ContextAlbumUpdate().testContextAlbumUpdate(); diff --git a/context/context-test-utils/src/test/java/org/onap/policy/apex/context/test/distribution/TestContextInstantiation.java b/context/context-test-utils/src/test/java/org/onap/policy/apex/context/test/distribution/TestContextInstantiation.java index b10bc685c..ba402da24 100644 --- a/context/context-test-utils/src/test/java/org/onap/policy/apex/context/test/distribution/TestContextInstantiation.java +++ b/context/context-test-utils/src/test/java/org/onap/policy/apex/context/test/distribution/TestContextInstantiation.java @@ -24,7 +24,7 @@ import java.io.IOException; import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.onap.policy.apex.context.impl.distribution.jvmlocal.JVMLocalDistributor; +import org.onap.policy.apex.context.impl.distribution.jvmlocal.JvmLocalDistributor; import org.onap.policy.apex.context.impl.schema.java.JavaSchemaHelperParameters; import org.onap.policy.apex.context.parameters.ContextParameterConstants; import org.onap.policy.apex.context.parameters.ContextParameters; @@ -47,6 +47,9 @@ public class TestContextInstantiation { private SchemaParameters schemaParameters; private ContextParameters contextParameters; + /** + * Set up context for tests. + */ @Before public void beforeTest() { contextParameters = new ContextParameters(); @@ -68,6 +71,9 @@ public class TestContextInstantiation { ParameterService.register(schemaParameters); } + /** + * Clear down context for tests. + */ @After public void afterTest() { ParameterService.deregister(schemaParameters); @@ -79,17 +85,17 @@ public class TestContextInstantiation { } @Test - public void testContextInstantiationJVMLocalVarSet() throws ApexModelException, IOException, ApexException { + public void testContextInstantiationJvmLocalVarSet() throws ApexModelException, IOException, ApexException { logger.debug("Running testContextInstantiationJVMLocalVarSet test . . ."); - contextParameters.getDistributorParameters().setPluginClass(JVMLocalDistributor.class.getCanonicalName()); + contextParameters.getDistributorParameters().setPluginClass(JvmLocalDistributor.class.getCanonicalName()); new ContextInstantiation().testContextInstantiation(); logger.debug("Ran testContextInstantiationJVMLocalVarSet test"); } @Test - public void testContextInstantiationJVMLocalVarNotSet() throws ApexModelException, IOException, ApexException { + public void testContextInstantiationJvmLocalVarNotSet() throws ApexModelException, IOException, ApexException { logger.debug("Running testContextInstantiationJVMLocalVarNotSet test . . ."); new ContextInstantiation().testContextInstantiation(); diff --git a/context/context-test-utils/src/test/java/org/onap/policy/apex/context/test/distribution/TestContextUpdate.java b/context/context-test-utils/src/test/java/org/onap/policy/apex/context/test/distribution/TestContextUpdate.java index 07a0cbe47..8ef8bf005 100644 --- a/context/context-test-utils/src/test/java/org/onap/policy/apex/context/test/distribution/TestContextUpdate.java +++ b/context/context-test-utils/src/test/java/org/onap/policy/apex/context/test/distribution/TestContextUpdate.java @@ -25,7 +25,7 @@ import java.io.IOException; import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.onap.policy.apex.context.impl.distribution.jvmlocal.JVMLocalDistributor; +import org.onap.policy.apex.context.impl.distribution.jvmlocal.JvmLocalDistributor; import org.onap.policy.apex.context.impl.schema.java.JavaSchemaHelperParameters; import org.onap.policy.apex.context.parameters.ContextParameterConstants; import org.onap.policy.apex.context.parameters.ContextParameters; @@ -48,6 +48,9 @@ public class TestContextUpdate { private SchemaParameters schemaParameters; private ContextParameters contextParameters; + /** + * Set up context for tests. + */ @Before public void beforeTest() { contextParameters = new ContextParameters(); @@ -69,6 +72,9 @@ public class TestContextUpdate { ParameterService.register(schemaParameters); } + /** + * Clear down context for tests. + */ @After public void afterTest() { ParameterService.deregister(schemaParameters); @@ -80,17 +86,17 @@ public class TestContextUpdate { } @Test - public void testContextUpdateJVMLocalVarSet() throws ApexModelException, IOException, ApexException { + public void testContextUpdateJvmLocalVarSet() throws ApexModelException, IOException, ApexException { logger.debug("Running testContextUpdateJVMLocalVarSet test . . ."); - contextParameters.getDistributorParameters().setPluginClass(JVMLocalDistributor.class.getCanonicalName()); + contextParameters.getDistributorParameters().setPluginClass(JvmLocalDistributor.class.getCanonicalName()); new ContextUpdate().testContextUpdate(); logger.debug("Ran testContextUpdateJVMLocalVarSet test"); } @Test - public void testContextUpdateJVMLocalVarNotSet() throws ApexModelException, IOException, ApexException { + public void testContextUpdateJvmLocalVarNotSet() throws ApexModelException, IOException, ApexException { logger.debug("Running testContextUpdateJVMLocalVarNotSet test . . ."); new ContextUpdate().testContextUpdate(); diff --git a/context/context-test-utils/src/test/java/org/onap/policy/apex/context/test/distribution/TestSequentialContextInstantiation.java b/context/context-test-utils/src/test/java/org/onap/policy/apex/context/test/distribution/TestSequentialContextInstantiation.java index b37c8eafa..d1cdc6d97 100644 --- a/context/context-test-utils/src/test/java/org/onap/policy/apex/context/test/distribution/TestSequentialContextInstantiation.java +++ b/context/context-test-utils/src/test/java/org/onap/policy/apex/context/test/distribution/TestSequentialContextInstantiation.java @@ -24,7 +24,7 @@ import java.io.IOException; import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.onap.policy.apex.context.impl.distribution.jvmlocal.JVMLocalDistributor; +import org.onap.policy.apex.context.impl.distribution.jvmlocal.JvmLocalDistributor; import org.onap.policy.apex.context.impl.schema.java.JavaSchemaHelperParameters; import org.onap.policy.apex.context.parameters.ContextParameterConstants; import org.onap.policy.apex.context.parameters.ContextParameters; @@ -43,10 +43,13 @@ import org.slf4j.ext.XLoggerFactory; public class TestSequentialContextInstantiation { // Logger for this class private static final XLogger logger = XLoggerFactory.getXLogger(TestSequentialContextInstantiation.class); - + private SchemaParameters schemaParameters; private ContextParameters contextParameters; + /** + * Set up context for tests. + */ @Before public void beforeTest() { contextParameters = new ContextParameters(); @@ -60,7 +63,7 @@ public class TestSequentialContextInstantiation { ParameterService.register(contextParameters.getDistributorParameters()); ParameterService.register(contextParameters.getLockManagerParameters()); ParameterService.register(contextParameters.getPersistorParameters()); - + schemaParameters = new SchemaParameters(); schemaParameters.setName(ContextParameterConstants.SCHEMA_GROUP_NAME); schemaParameters.getSchemaHelperParameterMap().put("JAVA", new JavaSchemaHelperParameters()); @@ -68,6 +71,9 @@ public class TestSequentialContextInstantiation { ParameterService.register(schemaParameters); } + /** + * Clear down context for tests. + */ @After public void afterTest() { ParameterService.deregister(schemaParameters); @@ -79,20 +85,20 @@ public class TestSequentialContextInstantiation { } @Test - public void testSequentialContextInstantiationJVMLocalVarSet() - throws ApexModelException, IOException, ApexException { + public void testSequentialContextInstantiationJvmLocalVarSet() + throws ApexModelException, IOException, ApexException { logger.debug("Running testSequentialContextInstantiationJVMLocalVarSet test . . ."); - contextParameters.getDistributorParameters().setPluginClass(JVMLocalDistributor.class.getCanonicalName()); - + contextParameters.getDistributorParameters().setPluginClass(JvmLocalDistributor.class.getCanonicalName()); + new SequentialContextInstantiation().testSequentialContextInstantiation(); logger.debug("Ran testSequentialContextInstantiationJVMLocalVarSet test"); } @Test - public void testSequentialContextInstantiationJVMLocalVarNotSet() - throws ApexModelException, IOException, ApexException { + public void testSequentialContextInstantiationJvmLocalVarNotSet() + throws ApexModelException, IOException, ApexException { logger.debug("Running testSequentialContextInstantiationJVMLocalVarNotSet test . . ."); new ContextParameters(); diff --git a/context/context-test-utils/src/test/java/org/onap/policy/apex/context/test/locking/TestConcurrentContext.java b/context/context-test-utils/src/test/java/org/onap/policy/apex/context/test/locking/TestConcurrentContext.java index 8fca90b07..ed9aff0c1 100644 --- a/context/context-test-utils/src/test/java/org/onap/policy/apex/context/test/locking/TestConcurrentContext.java +++ b/context/context-test-utils/src/test/java/org/onap/policy/apex/context/test/locking/TestConcurrentContext.java @@ -31,8 +31,8 @@ import java.util.Map; import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.onap.policy.apex.context.impl.distribution.jvmlocal.JVMLocalDistributor; -import org.onap.policy.apex.context.impl.locking.jvmlocal.JVMLocalLockManager; +import org.onap.policy.apex.context.impl.distribution.jvmlocal.JvmLocalDistributor; +import org.onap.policy.apex.context.impl.locking.jvmlocal.JvmLocalLockManager; import org.onap.policy.apex.context.impl.schema.java.JavaSchemaHelperParameters; import org.onap.policy.apex.context.parameters.ContextParameterConstants; import org.onap.policy.apex.context.parameters.ContextParameters; @@ -66,6 +66,9 @@ public class TestConcurrentContext { private SchemaParameters schemaParameters; private ContextParameters contextParameters; + /** + * Set up context for tests. + */ @Before public void beforeTest() { contextParameters = new ContextParameters(); @@ -87,6 +90,9 @@ public class TestConcurrentContext { ParameterService.register(schemaParameters); } + /** + * Clear down context for tests. + */ @After public void afterTest() { ParameterService.deregister(schemaParameters); @@ -98,10 +104,10 @@ public class TestConcurrentContext { } @Test - public void testConcurrentContextJVMLocalVarSet() throws Exception { + public void testConcurrentContextJvmLocalVarSet() throws Exception { logger.debug("Running testConcurrentContextJVMLocalVarSet test . . ."); - contextParameters.getLockManagerParameters().setPluginClass(JVMLocalLockManager.class.getCanonicalName()); + contextParameters.getLockManagerParameters().setPluginClass(JvmLocalLockManager.class.getCanonicalName()); final ConfigrationProvider configrationProvider = getConfigrationProvider("JVMLocalVarSet", TEST_JVM_COUNT_SINGLE_JVM, TEST_THREAD_COUNT_SINGLE_JVM, TEST_THREAD_LOOPS); @@ -120,7 +126,7 @@ public class TestConcurrentContext { } @Test - public void testConcurrentContextJVMLocalNoVarSet() throws Exception { + public void testConcurrentContextJvmLocalNoVarSet() throws Exception { logger.debug("Running testConcurrentContextJVMLocalNoVarSet test . . ."); final ConfigrationProvider configrationProvider = getConfigrationProvider("JVMLocalNoVarSet", @@ -139,11 +145,11 @@ public class TestConcurrentContext { } @Test - public void testConcurrentContextMultiJVMNoLock() throws Exception { + public void testConcurrentContextMultiJvmNoLock() throws Exception { logger.debug("Running testConcurrentContextMultiJVMNoLock test . . ."); - contextParameters.getDistributorParameters().setPluginClass(JVMLocalDistributor.class.getCanonicalName()); - contextParameters.getLockManagerParameters().setPluginClass(JVMLocalLockManager.class.getCanonicalName()); + contextParameters.getDistributorParameters().setPluginClass(JvmLocalDistributor.class.getCanonicalName()); + contextParameters.getLockManagerParameters().setPluginClass(JvmLocalLockManager.class.getCanonicalName()); final ConfigrationProvider configrationProvider = getConfigrationProvider("testConcurrentContextMultiJVMNoLock", TEST_JVM_COUNT_MULTI_JVM, TEST_THREAD_COUNT_MULTI_JVM, TEST_THREAD_LOOPS); diff --git a/context/context-test-utils/src/test/java/org/onap/policy/apex/context/test/persistence/TestPersistentContextInstantiation.java b/context/context-test-utils/src/test/java/org/onap/policy/apex/context/test/persistence/TestPersistentContextInstantiation.java index c8628935c..9aad0ad78 100644 --- a/context/context-test-utils/src/test/java/org/onap/policy/apex/context/test/persistence/TestPersistentContextInstantiation.java +++ b/context/context-test-utils/src/test/java/org/onap/policy/apex/context/test/persistence/TestPersistentContextInstantiation.java @@ -83,6 +83,9 @@ public class TestPersistentContextInstantiation { new File("derby.log").delete(); } + /** + * Set up context for tests. + */ @Before public void beforeTest() { contextParameters = new ContextParameters(); @@ -104,6 +107,9 @@ public class TestPersistentContextInstantiation { ParameterService.register(schemaParameters); } + /** + * Clear down context for tests. + */ @After public void afterTest() { ParameterService.deregister(schemaParameters); @@ -166,8 +172,8 @@ public class TestPersistentContextInstantiation { final TestContextDateItem testDate = new TestContextDateItem(new Date()); final TestContextDateLocaleItem tci00A = new TestContextDateLocaleItem(); tci00A.setDateValue(testDate); - tci00A.setTZValue(TimeZone.getTimeZone("Europe/Dublin").toString()); - tci00A.setDST(true); + tci00A.setTzValue(TimeZone.getTimeZone("Europe/Dublin").toString()); + tci00A.setDst(true); final Map<String, Object> valueMap1 = new HashMap<String, Object>(); valueMap1.put("TestPolicyContextItem00A", tci00A); @@ -176,7 +182,7 @@ public class TestPersistentContextInstantiation { assertEquals(((TestContextDateLocaleItem) contextAlbumForDate.get("TestPolicyContextItem00A")).getDateValue(), testDate); - assertEquals(((TestContextDateLocaleItem) contextAlbumForDate.get("TestPolicyContextItem00A")).getDST(), true); + assertEquals(((TestContextDateLocaleItem) contextAlbumForDate.get("TestPolicyContextItem00A")).getDst(), true); contextAlbumForDate.flush(); |