aboutsummaryrefslogtreecommitdiffstats
path: root/testsuites/integration/integration-context-test/src
diff options
context:
space:
mode:
Diffstat (limited to 'testsuites/integration/integration-context-test/src')
-rw-r--r--testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/TestConcurrentContext.java507
-rw-r--r--testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/distribution/ContextAlbumUpdate.java121
-rw-r--r--testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/distribution/ContextInstantiation.java496
-rw-r--r--testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/distribution/ContextUpdate.java147
-rw-r--r--testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/distribution/HazelcastContextDistributorTest.java135
-rw-r--r--testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/distribution/InfinispanContextDistributorTest.java153
-rw-r--r--testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/distribution/SequentialContextInstantiation.java329
-rw-r--r--testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/distribution/package-info.java28
-rw-r--r--testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/entities/ArtifactKeyTestEntity.java146
-rw-r--r--testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/entities/ReferenceKeyTestEntity.java146
-rw-r--r--testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/entities/package-info.java27
-rw-r--r--testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/factory/TestContextAlbumFactory.java216
-rw-r--r--testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/factory/package-info.java28
-rw-r--r--testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/lock/modifier/AlbumModifier.java43
-rw-r--r--testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/lock/modifier/LockType.java102
-rw-r--r--testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/lock/modifier/NoLockAlbumModifier.java52
-rw-r--r--testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/lock/modifier/ReadLockAlbumModifier.java67
-rw-r--r--testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/lock/modifier/SingleValueWriteLockAlbumModifier.java72
-rw-r--r--testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/lock/modifier/WriteLockAlbumModifier.java69
-rw-r--r--testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/lock/modifier/package-info.java26
-rw-r--r--testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/locking/ConcurrentContext.java165
-rw-r--r--testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/locking/ConcurrentContextJvm.java231
-rw-r--r--testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/locking/ConcurrentContextJvmThread.java132
-rw-r--r--testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/locking/ConcurrentContextThread.java92
-rw-r--r--testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/locking/package-info.java28
-rw-r--r--testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/utils/ConfigrationProvider.java145
-rw-r--r--testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/utils/ConfigrationProviderImpl.java176
-rw-r--r--testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/utils/Constants.java79
-rw-r--r--testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/utils/IntegrationThreadFactory.java59
-rw-r--r--testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/utils/NetworkUtils.java65
-rw-r--r--testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/utils/ZooKeeperServerServiceProvider.java105
-rwxr-xr-xtestsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/utils/package-info.java28
-rw-r--r--testsuites/integration/integration-context-test/src/test/resources/hazelcast/hazelcast.xml63
-rw-r--r--testsuites/integration/integration-context-test/src/test/resources/infinispan/default-jgroups-tcp.xml76
-rw-r--r--testsuites/integration/integration-context-test/src/test/resources/infinispan/default-jgroups-udp.xml87
-rw-r--r--testsuites/integration/integration-context-test/src/test/resources/infinispan/infinispan-context-test.xml35
36 files changed, 0 insertions, 4476 deletions
diff --git a/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/TestConcurrentContext.java b/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/TestConcurrentContext.java
deleted file mode 100644
index 8af964985..000000000
--- a/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/TestConcurrentContext.java
+++ /dev/null
@@ -1,507 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * Modifications Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.testsuites.integration.context;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.onap.policy.apex.context.parameters.DistributorParameters.DEFAULT_DISTRIBUTOR_PLUGIN_CLASS;
-import static org.onap.policy.apex.testsuites.integration.context.utils.Constants.TEST_VALUE;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.InetSocketAddress;
-import java.util.Map;
-import java.util.SortedSet;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
-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;
-import org.onap.policy.apex.context.parameters.DistributorParameters;
-import org.onap.policy.apex.context.parameters.SchemaParameters;
-import org.onap.policy.apex.context.test.concepts.TestContextLongItem;
-import org.onap.policy.apex.model.basicmodel.concepts.ApexException;
-import org.onap.policy.apex.model.basicmodel.handling.ApexModelException;
-import org.onap.policy.apex.plugins.context.distribution.hazelcast.HazelcastContextDistributor;
-import org.onap.policy.apex.plugins.context.distribution.infinispan.InfinispanContextDistributor;
-import org.onap.policy.apex.plugins.context.distribution.infinispan.InfinispanDistributorParameters;
-import org.onap.policy.apex.plugins.context.locking.curator.CuratorLockManager;
-import org.onap.policy.apex.plugins.context.locking.curator.CuratorLockManagerParameters;
-import org.onap.policy.apex.plugins.context.locking.hazelcast.HazelcastLockManager;
-import org.onap.policy.apex.testsuites.integration.context.lock.modifier.LockType;
-import org.onap.policy.apex.testsuites.integration.context.locking.ConcurrentContext;
-import org.onap.policy.apex.testsuites.integration.context.utils.ConfigrationProvider;
-import org.onap.policy.apex.testsuites.integration.context.utils.ConfigrationProviderImpl;
-import org.onap.policy.apex.testsuites.integration.context.utils.Constants;
-import org.onap.policy.apex.testsuites.integration.context.utils.NetworkUtils;
-import org.onap.policy.apex.testsuites.integration.context.utils.ZooKeeperServerServiceProvider;
-import org.onap.policy.common.parameters.ParameterService;
-import org.onap.policy.common.utils.resources.ResourceUtils;
-import org.slf4j.ext.XLogger;
-import org.slf4j.ext.XLoggerFactory;
-
-/**
- * The Class TestConcurrentContext tests concurrent use of context.
- *
- * @author Liam Fallon (liam.fallon@ericsson.com)
- */
-public class TestConcurrentContext {
- private static final String HAZELCAST_CONFIG = "hazelcast.config";
-
- private static final String JAVA_NET_PREFER_IPV4_STACK = "java.net.preferIPv4Stack";
- private static final String HAZELCAST_XML_FILE = "src/test/resources/hazelcast/hazelcast.xml";
-
- // Logger for this class
- private static final XLogger logger = XLoggerFactory.getXLogger(TestConcurrentContext.class);
-
- // Test parameters
- private static final String ZOOKEEPER_ADDRESS = "127.0.0.1";
- private static final int ZOOKEEPER_START_PORT = 62181;
- private static final int TEST_JVM_COUNT_SINGLE_JVM = 1;
- private static final int TEST_JVM_COUNT_MULTI_JVM = 3;
- private static final int TEST_THREAD_COUNT_SINGLE_JVM = 64;
- private static final int TEST_THREAD_COUNT_MULTI_JVM = 20;
- private static final int TEST_THREAD_LOOPS = 100;
-
- // We need to increment the Zookeeper port because sometimes the port is not released at the end
- // of the test for a few seconds.
- private static int nextZookeeperPort = ZOOKEEPER_START_PORT;
-
- private int zookeeperPort;
-
- private static SchemaParameters schemaParameters;
-
- @Rule
- public final TemporaryFolder folder = new TemporaryFolder();
-
- private ZooKeeperServerServiceProvider zooKeeperServerServiceProvider;
-
- /**
- * Configure.
- *
- * @throws Exception the exception
- */
- @BeforeClass
- public static void configure() throws Exception {
- System.setProperty(JAVA_NET_PREFER_IPV4_STACK, "true");
- final String hazelCastfileLocation = ResourceUtils.getFilePath4Resource(HAZELCAST_XML_FILE);
- System.setProperty(HAZELCAST_CONFIG, hazelCastfileLocation);
-
- final SortedSet<String> ipAddressSet = NetworkUtils.getIPv4NonLoopAddresses();
-
- if (ipAddressSet.size() == 0) {
- throw new Exception("cound not find real IP address for test");
- }
- logger.info("For Infinispan, setting jgroups.tcp.address to: {}", ipAddressSet.first());
- System.setProperty("jgroups.tcp.address", ipAddressSet.first());
-
- schemaParameters = new SchemaParameters();
-
- schemaParameters.setName(ContextParameterConstants.SCHEMA_GROUP_NAME);
- schemaParameters.getSchemaHelperParameterMap().put("JAVA", new JavaSchemaHelperParameters());
-
- ParameterService.register(schemaParameters, true);
- }
-
- /**
- * Clear configuration.
- */
- @AfterClass
- public static void clear() {
- ParameterService.deregister(schemaParameters);
- }
-
- /**
- * Start zookeeper server.
- *
- * @throws Exception the exception
- */
- private void startZookeeperServer() throws Exception {
- final File zookeeperDirectory = folder.newFolder("zookeeperDirectory");
-
- zookeeperPort = nextZookeeperPort++;
- final InetSocketAddress addr = new InetSocketAddress(zookeeperPort);
- zooKeeperServerServiceProvider = new ZooKeeperServerServiceProvider(zookeeperDirectory, addr);
- zooKeeperServerServiceProvider.startZookeeperServer();
- }
-
- /**
- * Stop zookeeper server.
- */
- private void stopZookeeperServer() {
- if (zooKeeperServerServiceProvider != null) {
- zooKeeperServerServiceProvider.stopZookeeperServer();
- }
- }
-
- /**
- * Test concurrent context jvm local var set.
- *
- * @throws Exception the exception
- */
- @Test
- public void testConcurrentContextJvmLocalVarSet() throws Exception {
- logger.debug("Running testConcurrentContextJVMLocalVarSet test . . .");
-
- final ContextParameters contextParameters = new ContextParameters();
- contextParameters.getLockManagerParameters().setPluginClass(JvmLocalLockManager.class.getName());
- setContextParmetersInParameterService(contextParameters);
-
- final ConfigrationProvider configrationProvider = getConfigrationProvider("JVMLocalVarSet",
- TEST_JVM_COUNT_SINGLE_JVM, TEST_THREAD_COUNT_SINGLE_JVM, TEST_THREAD_LOOPS);
-
- final ConcurrentContext concurrentContext = new ConcurrentContext(configrationProvider);
- final Map<String, TestContextLongItem> result = concurrentContext.testConcurrentContext();
-
- assertFalse(result.isEmpty());
-
- final int expected = TEST_JVM_COUNT_SINGLE_JVM * TEST_THREAD_COUNT_SINGLE_JVM * TEST_THREAD_LOOPS;
- final TestContextLongItem actual = result.get(TEST_VALUE);
- assertNotNull(actual);
- assertEquals(expected, actual.getLongValue());
-
- clearContextParmetersInParameterService(contextParameters);
-
- logger.debug("Ran testConcurrentContextJVMLocalVarSet test");
- }
-
- /**
- * Test concurrent context jvm local no var set.
- *
- * @throws Exception the exception
- */
- @Test
- public void testConcurrentContextJvmLocalNoVarSet() throws Exception {
- logger.debug("Running testConcurrentContextJVMLocalNoVarSet test . . .");
-
- final ContextParameters contextParameters = new ContextParameters();
- setContextParmetersInParameterService(contextParameters);
-
- final ConfigrationProvider configrationProvider = getConfigrationProvider("JVMLocalNoVarSet",
- TEST_JVM_COUNT_SINGLE_JVM, TEST_THREAD_COUNT_SINGLE_JVM, TEST_THREAD_LOOPS);
-
- final ConcurrentContext concurrentContext = new ConcurrentContext(configrationProvider);
- final Map<String, TestContextLongItem> result = concurrentContext.testConcurrentContext();
-
- final int expected = TEST_JVM_COUNT_SINGLE_JVM * TEST_THREAD_COUNT_SINGLE_JVM * TEST_THREAD_LOOPS;
- final TestContextLongItem actual = result.get(Constants.TEST_VALUE);
- assertNotNull(actual);
- assertEquals(expected, actual.getLongValue());
-
- clearContextParmetersInParameterService(contextParameters);
- logger.debug("Ran testConcurrentContextJVMLocalNoVarSet test");
- }
-
- /**
- * Test concurrent context multi jvm no lock.
- *
- * @throws Exception the exception
- */
- @Test
- public void testConcurrentContextMultiJvmNoLock() throws Exception {
- logger.debug("Running testConcurrentContextMultiJVMNoLock test . . .");
-
- final ContextParameters contextParameters = new ContextParameters();
- contextParameters.getDistributorParameters().setPluginClass(JvmLocalDistributor.class.getName());
- contextParameters.getLockManagerParameters().setPluginClass(JvmLocalLockManager.class.getName());
- setContextParmetersInParameterService(contextParameters);
-
- final ConfigrationProvider configrationProvider = getConfigrationProvider("testConcurrentContextMultiJVMNoLock",
- TEST_JVM_COUNT_MULTI_JVM, TEST_THREAD_COUNT_MULTI_JVM, TEST_THREAD_LOOPS);
-
- final ConcurrentContext concurrentContext = new ConcurrentContext(configrationProvider);
- final Map<String, TestContextLongItem> result = concurrentContext.testConcurrentContext();
-
- // No concurrent map so result will be zero
- final TestContextLongItem actual = result.get(TEST_VALUE);
- assertNotNull(actual);
- assertEquals(0, actual.getLongValue());
-
- clearContextParmetersInParameterService(contextParameters);
- logger.debug("Ran testConcurrentContextMultiJVMNoLock test");
- }
-
- /**
- * Test concurrent context hazelcast lock.
- *
- * @throws Exception the exception
- */
- @Test
- public void testConcurrentContextHazelcastLock() throws Exception {
- logger.debug("Running testConcurrentContextHazelcastLock test . . .");
-
- final ContextParameters contextParameters = new ContextParameters();
- contextParameters.getDistributorParameters().setPluginClass(DEFAULT_DISTRIBUTOR_PLUGIN_CLASS);
- contextParameters.getLockManagerParameters().setPluginClass(HazelcastLockManager.class.getName());
- setContextParmetersInParameterService(contextParameters);
-
- final ConfigrationProvider configrationProvider = getConfigrationProvider("HazelcastLock",
- TEST_JVM_COUNT_SINGLE_JVM, TEST_THREAD_COUNT_SINGLE_JVM, TEST_THREAD_LOOPS);
-
- final ConcurrentContext concurrentContext = new ConcurrentContext(configrationProvider);
- final Map<String, TestContextLongItem> result = concurrentContext.testConcurrentContext();
-
- final int expected = TEST_JVM_COUNT_SINGLE_JVM * TEST_THREAD_COUNT_SINGLE_JVM * TEST_THREAD_LOOPS;
- final TestContextLongItem actual = result.get(TEST_VALUE);
- assertNotNull(actual);
- assertEquals(expected, actual.getLongValue());
-
- clearContextParmetersInParameterService(contextParameters);
- logger.debug("Ran testConcurrentContextHazelcastLock test");
- }
-
- /**
- * Test concurrent context curator lock.
- *
- * @throws Exception the exception
- */
- @Test
- public void testConcurrentContextCuratorLock() throws Exception {
- logger.debug("Running testConcurrentContextCuratorLock test . . .");
- final ContextParameters contextParameters = new ContextParameters();
- try {
- startZookeeperServer();
- final DistributorParameters distributorParameters = contextParameters.getDistributorParameters();
- distributorParameters.setPluginClass(DEFAULT_DISTRIBUTOR_PLUGIN_CLASS);
-
- final CuratorLockManagerParameters curatorParameters = new CuratorLockManagerParameters();
- curatorParameters.setPluginClass(CuratorLockManager.class.getName());
- curatorParameters.setZookeeperAddress(ZOOKEEPER_ADDRESS + ":" + zookeeperPort);
- contextParameters.setLockManagerParameters(curatorParameters);
- setContextParmetersInParameterService(contextParameters);
-
- final ConfigrationProvider configrationProvider = getConfigrationProvider("CuratorLock",
- TEST_JVM_COUNT_SINGLE_JVM, TEST_THREAD_COUNT_SINGLE_JVM, TEST_THREAD_LOOPS);
-
- final ConcurrentContext concurrentContext = new ConcurrentContext(configrationProvider);
- final Map<String, TestContextLongItem> result = concurrentContext.testConcurrentContext();
-
- final int expected = TEST_JVM_COUNT_SINGLE_JVM * TEST_THREAD_COUNT_SINGLE_JVM * TEST_THREAD_LOOPS;
- final TestContextLongItem actual = result.get(TEST_VALUE);
- assertNotNull(actual);
- assertEquals(expected, actual.getLongValue());
- logger.debug("Ran testConcurrentContextCuratorLock test");
- } finally {
- stopZookeeperServer();
- clearContextParmetersInParameterService(contextParameters);
- }
- }
-
- /**
- * Test concurrent context hazelcast multi jvm hazelcast lock.
- *
- * @throws Exception the exception
- */
- @Test
- public void testConcurrentContextHazelcastMultiJvmHazelcastLock() throws Exception {
- logger.debug("Running testConcurrentContextHazelcastMultiJVMHazelcastLock test . . .");
-
- final ContextParameters contextParameters = new ContextParameters();
- final DistributorParameters distributorParameters = contextParameters.getDistributorParameters();
- distributorParameters.setPluginClass(HazelcastContextDistributor.class.getName());
- contextParameters.getLockManagerParameters().setPluginClass(HazelcastLockManager.class.getName());
- setContextParmetersInParameterService(contextParameters);
-
- final ConfigrationProvider configrationProvider = getConfigrationProvider("HazelcastMultiHazelcastlock",
- TEST_JVM_COUNT_MULTI_JVM, TEST_THREAD_COUNT_MULTI_JVM, TEST_THREAD_LOOPS);
-
- final ConcurrentContext concurrentContext = new ConcurrentContext(configrationProvider);
- final Map<String, TestContextLongItem> result = concurrentContext.testConcurrentContext();
-
- final int expected = TEST_JVM_COUNT_MULTI_JVM * TEST_THREAD_COUNT_MULTI_JVM * TEST_THREAD_LOOPS;
- final TestContextLongItem actual = result.get(TEST_VALUE);
- assertNotNull(actual);
- assertEquals(expected, actual.getLongValue());
-
- clearContextParmetersInParameterService(contextParameters);
- logger.debug("Ran testConcurrentContextHazelcastMultiJVMHazelcastLock test");
- }
-
- /**
- * Test concurrent context infinispan multi jvm hazelcastlock.
- *
- * @throws ApexModelException the apex model exception
- * @throws IOException Signals that an I/O exception has occurred.
- * @throws ApexException the apex exception
- */
- @Test
- public void testConcurrentContextInfinispanMultiJvmHazelcastlock()
- throws ApexModelException, IOException, ApexException {
- logger.debug("Running testConcurrentContextInfinispanMultiJVMHazelcastlock test . . .");
-
- final ContextParameters contextParameters = new ContextParameters();
- final InfinispanDistributorParameters infinispanParameters = new InfinispanDistributorParameters();
- infinispanParameters.setPluginClass(InfinispanContextDistributor.class.getName());
- infinispanParameters.setConfigFile("infinispan/infinispan-context-test.xml");
- contextParameters.setDistributorParameters(infinispanParameters);
- contextParameters.getLockManagerParameters().setPluginClass(HazelcastLockManager.class.getName());
- setContextParmetersInParameterService(contextParameters);
-
- final ConfigrationProvider configrationProvider = getConfigrationProvider("InfinispanMultiHazelcastlock",
- TEST_JVM_COUNT_MULTI_JVM, TEST_THREAD_COUNT_MULTI_JVM, TEST_THREAD_LOOPS);
-
- final ConcurrentContext concurrentContext = new ConcurrentContext(configrationProvider);
- final Map<String, TestContextLongItem> result = concurrentContext.testConcurrentContext();
-
- final int expected = TEST_JVM_COUNT_MULTI_JVM * TEST_THREAD_COUNT_MULTI_JVM * TEST_THREAD_LOOPS;
- final TestContextLongItem actual = result.get(TEST_VALUE);
- assertNotNull(actual);
- assertEquals(expected, actual.getLongValue());
-
- clearContextParmetersInParameterService(contextParameters);
- logger.debug("Ran testConcurrentContextInfinispanMultiJVMHazelcastlock test");
- }
-
- /**
- * Test concurrent context infinispan multi jvm curator lock.
- *
- * @throws Exception the exception
- */
- @Test
- public void testConcurrentContextInfinispanMultiJvmCuratorLock() throws Exception {
- logger.debug("Running testConcurrentContextInfinispanMultiJVMCuratorLock test . . .");
-
- final ContextParameters contextParameters = new ContextParameters();
- try {
- startZookeeperServer();
-
- final InfinispanDistributorParameters infinispanParameters = new InfinispanDistributorParameters();
- infinispanParameters.setPluginClass(InfinispanContextDistributor.class.getName());
- infinispanParameters.setConfigFile("infinispan/infinispan-context-test.xml");
- contextParameters.setDistributorParameters(infinispanParameters);
-
- final CuratorLockManagerParameters curatorParameters = new CuratorLockManagerParameters();
- curatorParameters.setPluginClass(CuratorLockManager.class.getName());
- curatorParameters.setZookeeperAddress(ZOOKEEPER_ADDRESS + ":" + zookeeperPort);
- contextParameters.setLockManagerParameters(curatorParameters);
- setContextParmetersInParameterService(contextParameters);
-
- final ConfigrationProvider configrationProvider = getConfigrationProvider("InfinispanMultiCuratorLock",
- TEST_JVM_COUNT_MULTI_JVM, TEST_THREAD_COUNT_MULTI_JVM, TEST_THREAD_LOOPS);
-
- final ConcurrentContext concurrentContext = new ConcurrentContext(configrationProvider);
- final Map<String, TestContextLongItem> result = concurrentContext.testConcurrentContext();
-
- final int expected = TEST_JVM_COUNT_MULTI_JVM * TEST_THREAD_COUNT_MULTI_JVM * TEST_THREAD_LOOPS;
- final TestContextLongItem actual = result.get(TEST_VALUE);
- assertNotNull(actual);
- assertEquals(expected, actual.getLongValue());
- } finally {
- stopZookeeperServer();
- clearContextParmetersInParameterService(contextParameters);
- }
-
- logger.debug("Ran testConcurrentContextInfinispanMultiJVMCuratorLock test");
- }
-
- /**
- * Test concurrent context hazelcast multi jvm curator lock.
- *
- * @throws Exception the exception
- */
- @Test
- public void testConcurrentContextHazelcastMultiJvmCuratorLock() throws Exception {
- logger.debug("Running testConcurrentContextHazelcastMultiJVMCuratorLock test . . .");
-
- final ContextParameters contextParameters = new ContextParameters();
- try {
- startZookeeperServer();
-
- contextParameters.getDistributorParameters()
- .setPluginClass(HazelcastContextDistributor.class.getName());
-
- final CuratorLockManagerParameters curatorParameters = new CuratorLockManagerParameters();
- curatorParameters.setPluginClass(CuratorLockManager.class.getName());
- curatorParameters.setZookeeperAddress(ZOOKEEPER_ADDRESS + ":" + zookeeperPort);
- contextParameters.setLockManagerParameters(curatorParameters);
- setContextParmetersInParameterService(contextParameters);
-
- final ConfigrationProvider configrationProvider = getConfigrationProvider("HazelcastMultiCuratorLock",
- TEST_JVM_COUNT_MULTI_JVM, TEST_THREAD_COUNT_MULTI_JVM, TEST_THREAD_LOOPS);
- final Map<String, TestContextLongItem> result =
- new ConcurrentContext(configrationProvider).testConcurrentContext();
-
- final int expected = TEST_JVM_COUNT_MULTI_JVM * TEST_THREAD_COUNT_MULTI_JVM * TEST_THREAD_LOOPS;
- final TestContextLongItem actual = result.get(TEST_VALUE);
- assertNotNull(actual);
- assertEquals(expected, actual.getLongValue());
- } finally {
- stopZookeeperServer();
- clearContextParmetersInParameterService(contextParameters);
- }
- logger.debug("Ran testConcurrentContextHazelcastMultiJVMCuratorLock test");
- }
-
- /**
- * Gets the configration provider.
- *
- * @param testType the test type
- * @param jvmCount the jvm count
- * @param threadCount the thread count
- * @param threadLoops the thread loops
- * @return the configration provider
- */
- ConfigrationProvider getConfigrationProvider(final String testType, final int jvmCount, final int threadCount,
- final int threadLoops) {
- return new ConfigrationProviderImpl(testType, jvmCount, threadCount, threadLoops, 16,
- LockType.WRITE_LOCK_SINGLE_VALUE_UPDATE.getValue()) {
- @Override
- public Map<String, Object> getContextAlbumInitValues() {
- final Map<String, Object> initValues = super.getContextAlbumInitValues();
- initValues.put(TEST_VALUE, new TestContextLongItem(0L));
- return initValues;
- }
-
- };
- }
-
- /**
- * Set the context parameters in the parameter service.
- *
- * @param contextParameters The parameters to set.
- */
- private void setContextParmetersInParameterService(final ContextParameters contextParameters) {
- ParameterService.register(contextParameters);
- ParameterService.register(contextParameters.getDistributorParameters());
- ParameterService.register(contextParameters.getLockManagerParameters());
- ParameterService.register(contextParameters.getPersistorParameters());
- }
-
- /**
- * Clear the context parameters in the parameter service.
- *
- * @param contextParameters The parameters to set.
- */
- private void clearContextParmetersInParameterService(final ContextParameters contextParameters) {
- ParameterService.deregister(contextParameters.getPersistorParameters());
- ParameterService.deregister(contextParameters.getLockManagerParameters());
- ParameterService.deregister(contextParameters.getDistributorParameters());
- ParameterService.deregister(contextParameters);
-
- }
-}
diff --git a/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/distribution/ContextAlbumUpdate.java b/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/distribution/ContextAlbumUpdate.java
deleted file mode 100644
index 97bfa9efd..000000000
--- a/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/distribution/ContextAlbumUpdate.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * Modifications Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.testsuites.integration.context.distribution;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.onap.policy.apex.testsuites.integration.context.utils.Constants.APEX_DISTRIBUTOR;
-import static org.onap.policy.apex.testsuites.integration.context.utils.Constants.VERSION;
-
-import org.onap.policy.apex.context.ContextAlbum;
-import org.onap.policy.apex.context.Distributor;
-import org.onap.policy.apex.context.impl.distribution.DistributorFactory;
-import org.onap.policy.apex.model.basicmodel.concepts.ApexException;
-import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
-import org.onap.policy.apex.model.contextmodel.concepts.AxContextAlbum;
-import org.onap.policy.apex.model.contextmodel.concepts.AxContextModel;
-import org.onap.policy.apex.model.utilities.comparison.KeyedMapComparer;
-import org.onap.policy.apex.model.utilities.comparison.KeyedMapDifference;
-import org.onap.policy.apex.testsuites.integration.context.factory.TestContextAlbumFactory;
-import org.slf4j.ext.XLogger;
-import org.slf4j.ext.XLoggerFactory;
-
-/**
- * The Class ContextAlbumUpdate is used to test Context Album updates.
- */
-public class ContextAlbumUpdate {
- private static final XLogger LOGGER = XLoggerFactory.getXLogger(ContextAlbumUpdate.class);
-
- /**
- * Test context album update.
- *
- * @throws ApexException the apex exception
- */
- public void testContextAlbumUpdate() throws ApexException {
- LOGGER.debug("Running TestContextAlbumUpdate test . . .");
-
- final AxArtifactKey distributorKey = new AxArtifactKey(APEX_DISTRIBUTOR, VERSION);
- final Distributor contextDistributor = new DistributorFactory().getDistributor(distributorKey);
-
- final AxContextModel longModel = TestContextAlbumFactory.createLongContextModel();
- contextDistributor.registerModel(longModel);
-
- final AxContextAlbum longAlbum1Def = longModel.getAlbums().get(new AxArtifactKey("LongContextAlbum1", VERSION));
- final ContextAlbum longAlbum1 = contextDistributor.createContextAlbum(longAlbum1Def.getKey());
-
- assertNotNull(longAlbum1);
-
- final AxContextAlbum longAlbum2Def = longModel.getAlbums().get(new AxArtifactKey("LongContextAlbum2", VERSION));
- final ContextAlbum longAlbum2 = contextDistributor.createContextAlbum(longAlbum2Def.getKey());
-
- assertNotNull(longAlbum2);
-
- longAlbum1.put("0", (long) 0);
- longAlbum1.put("1", (long) 1);
- longAlbum1.put("2", (long) 2);
- longAlbum1.put("3", (long) 3);
-
- final KeyedMapDifference<String, Object> result0 =
- new KeyedMapComparer<String, Object>().compareMaps(longAlbum1, longAlbum2);
-
- assertEquals(0, result0.getDifferentValues().size());
- assertEquals(0, result0.getIdenticalValues().size());
- assertEquals(0, result0.getRightOnly().size());
- assertEquals(4, result0.getLeftOnly().size());
-
- longAlbum2.putAll(longAlbum1);
-
- final KeyedMapDifference<String, Object> result1 =
- new KeyedMapComparer<String, Object>().compareMaps(longAlbum1, longAlbum2);
-
-
- assertEquals(0, result1.getDifferentValues().size());
- assertEquals(4, result1.getIdenticalValues().size());
- assertEquals(0, result1.getRightOnly().size());
- assertEquals(0, result1.getLeftOnly().size());
-
- longAlbum1.put("4", (long) 4);
- longAlbum2.put("5", (long) 5);
- longAlbum1.put("67", (long) 6);
- longAlbum2.put("67", (long) 7);
-
- final KeyedMapDifference<String, Object> result2 =
- new KeyedMapComparer<String, Object>().compareMaps(longAlbum1, longAlbum2);
-
- assertEquals(1, result2.getDifferentValues().size());
- assertEquals(4, result2.getIdenticalValues().size());
- assertEquals(1, result2.getRightOnly().size());
- assertEquals(1, result2.getLeftOnly().size());
-
- longAlbum1.remove("0");
- longAlbum2.remove("3");
-
- final KeyedMapDifference<String, Object> result3 =
- new KeyedMapComparer<String, Object>().compareMaps(longAlbum1, longAlbum2);
-
- assertEquals(1, result3.getDifferentValues().size());
- assertEquals(2, result3.getIdenticalValues().size());
- assertEquals(2, result3.getRightOnly().size());
- assertEquals(2, result3.getLeftOnly().size());
- contextDistributor.clear();
- }
-}
diff --git a/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/distribution/ContextInstantiation.java b/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/distribution/ContextInstantiation.java
deleted file mode 100644
index fa3612fe9..000000000
--- a/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/distribution/ContextInstantiation.java
+++ /dev/null
@@ -1,496 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * Modifications Copyright (C) 2019-2020 Nordix Foundation.
- * Modifications Copyright (C) 2021 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.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.testsuites.integration.context.distribution;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.onap.policy.apex.testsuites.integration.context.factory.TestContextAlbumFactory.createPolicyContextModel;
-import static org.onap.policy.apex.testsuites.integration.context.utils.Constants.BYTE_VAL;
-import static org.onap.policy.apex.testsuites.integration.context.utils.Constants.EXTERNAL_CONTEXT;
-import static org.onap.policy.apex.testsuites.integration.context.utils.Constants.EXTERNAL_CONTEXT_ALBUM;
-import static org.onap.policy.apex.testsuites.integration.context.utils.Constants.FLOAT_VAL;
-import static org.onap.policy.apex.testsuites.integration.context.utils.Constants.GLOBAL_CONTEXT_ALBUM;
-import static org.onap.policy.apex.testsuites.integration.context.utils.Constants.GLOBAL_CONTEXT_KEY;
-import static org.onap.policy.apex.testsuites.integration.context.utils.Constants.INT_VAL;
-import static org.onap.policy.apex.testsuites.integration.context.utils.Constants.INT_VAL_2;
-import static org.onap.policy.apex.testsuites.integration.context.utils.Constants.INT_VAL_3;
-import static org.onap.policy.apex.testsuites.integration.context.utils.Constants.LONG_VAL;
-import static org.onap.policy.apex.testsuites.integration.context.utils.Constants.PI_VAL;
-import static org.onap.policy.apex.testsuites.integration.context.utils.Constants.POLICY_CONTEXT_ALBUM;
-import static org.onap.policy.apex.testsuites.integration.context.utils.Constants.STRING_EXT_VAL;
-import static org.onap.policy.apex.testsuites.integration.context.utils.Constants.STRING_GLOBAL_VAL;
-import static org.onap.policy.apex.testsuites.integration.context.utils.Constants.STRING_VAL;
-import static org.onap.policy.apex.testsuites.integration.context.utils.Constants.TEST_POLICY_CONTEXT_ITEM;
-import static org.onap.policy.apex.testsuites.integration.context.utils.Constants.TIME_ZONE;
-import static org.onap.policy.apex.testsuites.integration.context.utils.Constants.VERSION;
-
-import java.util.Collection;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-import java.util.TreeSet;
-import org.onap.policy.apex.context.ContextAlbum;
-import org.onap.policy.apex.context.ContextException;
-import org.onap.policy.apex.context.ContextRuntimeException;
-import org.onap.policy.apex.context.Distributor;
-import org.onap.policy.apex.context.impl.distribution.DistributorFactory;
-import org.onap.policy.apex.context.test.concepts.TestContextBooleanItem;
-import org.onap.policy.apex.context.test.concepts.TestContextByteItem;
-import org.onap.policy.apex.context.test.concepts.TestContextDateItem;
-import org.onap.policy.apex.context.test.concepts.TestContextDateLocaleItem;
-import org.onap.policy.apex.context.test.concepts.TestContextDateTzItem;
-import org.onap.policy.apex.context.test.concepts.TestContextDoubleItem;
-import org.onap.policy.apex.context.test.concepts.TestContextFloatItem;
-import org.onap.policy.apex.context.test.concepts.TestContextIntItem;
-import org.onap.policy.apex.context.test.concepts.TestContextLongItem;
-import org.onap.policy.apex.context.test.concepts.TestContextLongObjectItem;
-import org.onap.policy.apex.context.test.concepts.TestContextStringItem;
-import org.onap.policy.apex.context.test.concepts.TestContextTreeMapItem;
-import org.onap.policy.apex.context.test.concepts.TestContextTreeSetItem;
-import org.onap.policy.apex.context.test.concepts.TestExternalContextItem;
-import org.onap.policy.apex.context.test.concepts.TestGlobalContextItem;
-import org.onap.policy.apex.context.test.concepts.TestPolicyContextItem;
-import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
-import org.onap.policy.apex.model.basicmodel.concepts.AxValidationResult;
-import org.onap.policy.apex.model.contextmodel.concepts.AxContextModel;
-import org.onap.policy.apex.testsuites.integration.context.factory.TestContextAlbumFactory;
-import org.onap.policy.apex.testsuites.integration.context.utils.Constants;
-import org.slf4j.ext.XLogger;
-import org.slf4j.ext.XLoggerFactory;
-
-/**
- * The Class TestContextInstantiation is used to test Apex context insitiation
- * is correct.
- *
- * @author Sergey Sachkov (sergey.sachkov@ericsson.com)
- */
-public class ContextInstantiation {
- // Logger for this class
- private static final XLogger LOGGER = XLoggerFactory.getXLogger(ContextInstantiation.class);
-
- // Recurring string constants
- private static final String TEST_POLICY_CONTEXT_ITEM000 = "TestPolicyContextItem000";
- private static final String TEST_POLICY_CONTEXT_ITEM005 = "TestPolicyContextItem005";
- private static final String TEST_POLICY_CONTEXT_ITEM004 = "TestPolicyContextItem004";
- private static final String TEST_POLICY_CONTEXT_ITEM003 = "TestPolicyContextItem003";
- private static final String TEST_POLICY_CONTEXT_ITEM002 = "TestPolicyContextItem002";
- private static final String TEST_POLICY_CONTEXT_ITEM001 = "TestPolicyContextItem001";
- private static final String NULL_ILLEGAL = "album \"ExternalContextAlbum:0.0.1\" null values are illegal on key ";
-
- private static final TreeSet<String> TEST_TREE_SET = new TreeSet<>();
- private static final Map<String, String> TEST_HASH_MAP = new HashMap<>();
-
- static {
- TEST_TREE_SET.add("one hundred");
- TEST_TREE_SET.add("one hundred and one");
- TEST_TREE_SET.add("one hundred and two");
- TEST_TREE_SET.add("one hundred and three");
- TEST_TREE_SET.add("one hundred and four");
-
- TEST_HASH_MAP.put("0", "zero");
- TEST_HASH_MAP.put("1", "one");
- TEST_HASH_MAP.put("2", "two");
- TEST_HASH_MAP.put("3", "three");
- TEST_HASH_MAP.put("4", "four");
-
- }
-
- /**
- * Test context instantiation.
- *
- * @throws ContextException the context exception
- */
- public void testContextInstantiation() throws ContextException {
- LOGGER.debug("Running TestContextInstantiation test . . .");
-
- final Distributor contextDistributor = getDistributor();
-
- final ContextAlbum policyContextAlbum = contextDistributor
- .createContextAlbum(new AxArtifactKey(POLICY_CONTEXT_ALBUM, VERSION));
-
- assertNotNull(policyContextAlbum);
- policyContextAlbum.setUserArtifactStack(Constants.getAxArtifactKeyArray());
-
- final Date testDate = new Date();
-
- final TestContextDateTzItem tci9 = getTestContextDateTzItem(testDate);
- final TestContextDateLocaleItem tciA = getTestContextDateLocaleItem(testDate);
-
- final TestPolicyContextItem policyContext = getTestPolicyContextItem(policyContextAlbum, testDate);
-
- final Map<String, Object> valueMap0 = new HashMap<>();
- valueMap0.put(TEST_POLICY_CONTEXT_ITEM, policyContext);
-
- policyContextAlbum.putAll(valueMap0);
-
- final TestPolicyContextItem contextItem = (TestPolicyContextItem) policyContextAlbum
- .get(TEST_POLICY_CONTEXT_ITEM);
- assertEquals(STRING_VAL, contextItem.getTestPolicyContextItem000().getStringValue());
-
- assertEquals(LONG_VAL, contextItem.getTestPolicyContextItem001().getLongValue());
- assertDouble(contextItem.getTestPolicyContextItem002().getDoubleValue(), PI_VAL);
- assertTrue(contextItem.getTestPolicyContextItem003().isFlag());
- assertEquals(contextItem.getTestPolicyContextItem004().getLongValue(), testDate.getTime());
- assertEquals(TEST_HASH_MAP, contextItem.getTestPolicyContextItem005().getMapValue());
-
- final TestGlobalContextItem globalContext = getTestGlobalContextItem(contextDistributor, testDate, tci9, tciA);
-
- final Map<String, Object> valueMap1 = new HashMap<>();
- valueMap1.put(GLOBAL_CONTEXT_KEY, globalContext);
-
- final ContextAlbum globalContextAlbum = getContextAlbum(contextDistributor);
-
- globalContextAlbum.putAll(valueMap1);
-
- final TestGlobalContextItem globalContextItem = (TestGlobalContextItem) globalContextAlbum
- .get(GLOBAL_CONTEXT_KEY);
-
- assertFalse(globalContextItem.getTestGlobalContextItem000().isFlag());
-
- assertEquals(BYTE_VAL, globalContextItem.getTestGlobalContextItem001().getByteValue());
-
- assertEquals(INT_VAL, globalContextItem.getTestGlobalContextItem002().getIntValue());
- assertEquals(LONG_VAL, globalContextItem.getTestGlobalContextItem003().getLongValue());
- assertFloat(FLOAT_VAL, globalContextItem.getTestGlobalContextItem004().getFloatValue());
-
- assertDouble(PI_VAL, globalContextItem.getTestGlobalContextItem005().getDoubleValue());
- assertEquals(STRING_GLOBAL_VAL, globalContextItem.getTestGlobalContextItem006().getStringValue());
-
- assertEquals((Long) testDate.getTime(), globalContextItem.getTestGlobalContextItem007().getLongValue());
- assertEquals(testDate, globalContextItem.getTestGlobalContextItem008().getDateValue());
- assertEquals(tci9.getDateValue().getTime(),
- globalContextItem.getTestGlobalContextItem009().getDateValue().getTime());
-
- assertEquals(tciA.getDateValue().getTime(),
- globalContextItem.getTestGlobalContextItem00A().getDateValue().getTime());
-
- assertEquals(TEST_TREE_SET, globalContextItem.getTestGlobalContextItem00B().getSetValue());
- assertEquals(TEST_HASH_MAP, globalContextItem.getTestGlobalContextItem00C().getMapValue());
-
- final AxContextModel externalContextModel = TestContextAlbumFactory.createExternalContextModel();
-
- final TestContextDateTzItem tci9A = new TestContextDateTzItem(tci9);
- final TestContextDateLocaleItem tciAa = new TestContextDateLocaleItem(tciA);
- final TestExternalContextItem externalContext = getTestExternalContextItem(testDate, tci9A, tciAa);
-
- final Map<String, Object> valueMap2 = new HashMap<>();
- valueMap2.put(EXTERNAL_CONTEXT, externalContext);
-
- contextDistributor.clear();
- contextDistributor.init(new AxArtifactKey("ClearedandInittedDistributor", VERSION));
- contextDistributor.registerModel(externalContextModel);
-
- final AxArtifactKey axContextAlbumKey = new AxArtifactKey(EXTERNAL_CONTEXT_ALBUM, VERSION);
- final ContextAlbum externalContextAlbum = contextDistributor.createContextAlbum(axContextAlbumKey);
- assertNotNull(externalContextAlbum);
- externalContextAlbum.setUserArtifactStack(Constants.getAxArtifactKeyArray());
-
- externalContextAlbum.putAll(valueMap2);
- externalContextAlbum.getAlbumDefinition().setWritable(false);
-
- TestExternalContextItem externalContextItem = (TestExternalContextItem) externalContextAlbum
- .get(EXTERNAL_CONTEXT);
-
- assertFalse(externalContextItem.getTestExternalContextItem000().isFlag());
- assertEquals(BYTE_VAL, externalContextItem.getTestExternalContextItem001().getByteValue());
- assertEquals(INT_VAL, externalContextItem.getTestExternalContextItem002().getIntValue());
-
- assertFloat(LONG_VAL, externalContextItem.getTestExternalContextItem003().getLongValue());
- assertFloat(FLOAT_VAL, externalContextItem.getTestExternalContextItem004().getFloatValue());
-
- assertDouble(PI_VAL, externalContextItem.getTestExternalContextItem005().getDoubleValue());
- assertEquals(STRING_EXT_VAL, externalContextItem.getTestExternalContextItem006().getStringValue());
- assertEquals((Long) testDate.getTime(), externalContextItem.getTestExternalContextItem007().getLongValue());
- assertEquals(testDate, externalContextItem.getTestExternalContextItem008().getDateValue());
- assertEquals(tci9A.getDateValue().getTime(),
- externalContextItem.getTestExternalContextItem009().getDateValue().getTime());
-
- assertEquals(tciAa.getDateValue().getTime(),
- externalContextItem.getTestExternalContextItem00A().getDateValue().getTime());
- assertEquals(TEST_TREE_SET, externalContextItem.getTestExternalContextItem00B().getSetValue());
- assertEquals(TEST_HASH_MAP, externalContextItem.getTestExternalContextItem00C().getMapValue());
-
- final Collection<Object> mapValues = externalContextAlbum.values();
- assertTrue(externalContextAlbum.values().containsAll(mapValues));
-
- // Check that clearing does not work
- assertThatThrownBy(() -> externalContextAlbum.clear()).isInstanceOf(ContextRuntimeException.class)
- .hasMessageContaining("album \"ExternalContextAlbum:0.0.1\" clear() not allowed on read only albums");
- assertEquals(1, externalContextAlbum.size());
-
- assertContextAlbumContains(externalContext, externalContextAlbum);
-
- final Set<Entry<String, Object>> entrySet = externalContextAlbum.entrySet();
- assertEquals(1, entrySet.size());
-
- assertThatThrownBy(() -> externalContextAlbum.get(null)).isInstanceOf(ContextRuntimeException.class)
- .hasMessageContaining("album \"ExternalContextAlbum:0.0.1\" null keys are illegal on keys for get()");
- final Object aObject = externalContextAlbum.get(EXTERNAL_CONTEXT);
- assertEquals(aObject, externalContext);
-
- // put null keys should fail, throws a runtime exception
- assertThatThrownBy(() -> externalContextAlbum.put(null, null))
- .hasMessageContaining("album \"ExternalContextAlbum:0.0.1\" null keys are illegal on keys for put()");
- assertThatThrownBy(() -> externalContextAlbum.put("TestExternalContextItem00A", null))
- .hasMessageContaining(NULL_ILLEGAL + "\"TestExternalContextItem00A\" for put()");
- assertEquals(tciAa, externalContextItem.getTestExternalContextItem00A());
-
- // Should return the hash set
- assertEquals(TEST_TREE_SET, externalContextItem.getTestExternalContextItem00B().getSetValue());
-
- assertTrue(externalContextAlbum.values().containsAll(mapValues));
-
- // Set the write flag back as it should be
- externalContextAlbum.getAlbumDefinition().setWritable(true);
-
- // Put should return the previous contextItem
- final TestExternalContextItem externalContextOther = new TestExternalContextItem();
- externalContextOther.setTestExternalContextItem002(new TestContextIntItem());
- externalContextOther.getTestExternalContextItem002().setIntValue(INT_VAL_2);
-
- assertThat(externalContextAlbum.put(EXTERNAL_CONTEXT, externalContextOther)).isEqualTo(externalContext);
- externalContextItem = (TestExternalContextItem) externalContextAlbum.get(EXTERNAL_CONTEXT);
- assertEquals(INT_VAL_2, externalContextItem.getTestExternalContextItem002().getIntValue());
- assertThat(externalContextAlbum.put(EXTERNAL_CONTEXT, externalContext)).isEqualTo(externalContextOther);
- externalContextItem = (TestExternalContextItem) externalContextAlbum.get(EXTERNAL_CONTEXT);
- assertEquals(INT_VAL_3, externalContextItem.getTestExternalContextItem002().getIntValue());
- assertThatThrownBy(() -> externalContextAlbum.put("TestExternalContextItem00A", null))
- .hasMessageContaining(NULL_ILLEGAL + "\"TestExternalContextItem00A\" for put()");
-
- assertThat(externalContextAlbum.get(EXTERNAL_CONTEXT)).isEqualTo(externalContext);
-
- assertThatThrownBy(() -> externalContextAlbum.put("TestExternalContextItemFFF", null))
- .hasMessageContaining(NULL_ILLEGAL + "\"TestExternalContextItemFFF\" for put()");
- assertEquals(1, externalContextAlbum.size());
-
- assertThatThrownBy(() -> externalContextAlbum.put("TestExternalContextItemFFF", null))
- .hasMessageContaining(NULL_ILLEGAL + "\"TestExternalContextItemFFF\" for put()");
- assertEquals(1, externalContextAlbum.size());
-
- // Should ignore remove
- externalContextAlbum.remove("TestExternalContextItem017");
- assertEquals(1, externalContextAlbum.size());
- assertEquals(1, externalContextAlbum.values().size());
- assertTrue(externalContextAlbum.values().containsAll(mapValues));
-
- contextDistributor.clear();
- }
-
- private void assertContextAlbumContains(final TestExternalContextItem externalContext,
- final ContextAlbum externalContextAlbum) {
- assertThatThrownBy(() -> externalContextAlbum.containsKey(null))
- .hasMessageContaining("null values are illegal on method parameter \"key\"");
- assertTrue(externalContextAlbum.containsKey(EXTERNAL_CONTEXT));
- assertTrue(!externalContextAlbum.containsKey(GLOBAL_CONTEXT_KEY));
-
- assertThatThrownBy(() -> externalContextAlbum.containsValue(null))
- .hasMessageContaining("null values are illegal on method parameter \"value\"");
- assertTrue(externalContextAlbum.containsValue(externalContext));
- assertFalse(externalContextAlbum.containsValue("Hello"));
- }
-
- private ContextAlbum getContextAlbum(final Distributor contextDistributor) throws ContextException {
- final ContextAlbum globalContextAlbum = contextDistributor
- .createContextAlbum(new AxArtifactKey(GLOBAL_CONTEXT_ALBUM, VERSION));
- assertNotNull(globalContextAlbum);
- globalContextAlbum.setUserArtifactStack(Constants.getAxArtifactKeyArray());
- return globalContextAlbum;
- }
-
- private TestGlobalContextItem getTestGlobalContextItem(final Distributor contextDistributor, final Date testDate,
- final TestContextDateTzItem tci9, final TestContextDateLocaleItem tciA) throws ContextException {
- final AxContextModel globalContextModel = TestContextAlbumFactory.createGlobalContextModel();
- final TestGlobalContextItem globalContext = getTestGlobalContextItem(testDate, tci9, tciA);
- contextDistributor.registerModel(globalContextModel);
- return globalContext;
- }
-
- private TestGlobalContextItem getTestGlobalContextItem(final Date testDate, final TestContextDateTzItem tci9,
- final TestContextDateLocaleItem tciA) {
- final TestGlobalContextItem globalContext = new TestGlobalContextItem();
-
- final TestContextBooleanItem testGlobalContextItem000 = new TestContextBooleanItem(false);
- final TestContextByteItem testGlobalContextItem001 = new TestContextByteItem(BYTE_VAL);
- final TestContextIntItem testGlobalContextItem002 = new TestContextIntItem(INT_VAL);
- final TestContextLongItem testGlobalContextItem003 = new TestContextLongItem(LONG_VAL);
- final TestContextFloatItem testGlobalContextItem004 = new TestContextFloatItem(FLOAT_VAL);
- final TestContextDoubleItem testGlobalContextItem005 = new TestContextDoubleItem(PI_VAL);
- final TestContextStringItem testGlobalContextItem006 = new TestContextStringItem(STRING_GLOBAL_VAL);
- final TestContextLongObjectItem testGlobalContextItem007 = new TestContextLongObjectItem(testDate.getTime());
-
- final TestContextDateItem testGlobalContextItem008 = new TestContextDateItem(testDate);
- final TestContextTreeSetItem testGlobalContextItem00B = new TestContextTreeSetItem(TEST_TREE_SET);
- final TestContextTreeMapItem testGlobalContextItem00C = new TestContextTreeMapItem(TEST_HASH_MAP);
-
- globalContext.setTestGlobalContextItem000(testGlobalContextItem000);
- globalContext.setTestGlobalContextItem001(testGlobalContextItem001);
- globalContext.setTestGlobalContextItem002(testGlobalContextItem002);
- globalContext.setTestGlobalContextItem003(testGlobalContextItem003);
- globalContext.setTestGlobalContextItem004(testGlobalContextItem004);
- globalContext.setTestGlobalContextItem005(testGlobalContextItem005);
- globalContext.setTestGlobalContextItem006(testGlobalContextItem006);
- globalContext.setTestGlobalContextItem007(testGlobalContextItem007);
- globalContext.setTestGlobalContextItem008(testGlobalContextItem008);
- globalContext.setTestGlobalContextItem009(tci9);
- globalContext.setTestGlobalContextItem00A(tciA);
- globalContext.setTestGlobalContextItem00B(testGlobalContextItem00B);
- globalContext.setTestGlobalContextItem00C(testGlobalContextItem00C);
- return globalContext;
- }
-
- private TestPolicyContextItem getTestPolicyContextItem(final ContextAlbum policyContextAlbum, final Date testDate) {
- final TestContextStringItem contextStringItem = new TestContextStringItem(STRING_VAL);
- final TestContextLongItem contextLongItem = new TestContextLongItem(LONG_VAL);
- final TestContextDoubleItem contextDoubleItem = new TestContextDoubleItem(PI_VAL);
- final TestContextBooleanItem contextBooleanItem = new TestContextBooleanItem(true);
- final TestContextLongItem contextLongItem2 = new TestContextLongItem(testDate.getTime());
- final TestContextTreeMapItem contextTreeMapItem = new TestContextTreeMapItem(TEST_HASH_MAP);
-
- final Map<String, Object> valueMapA = new LinkedHashMap<>();
- valueMapA.put(TEST_POLICY_CONTEXT_ITEM001, contextLongItem);
- valueMapA.put(TEST_POLICY_CONTEXT_ITEM002, contextDoubleItem);
- valueMapA.put(TEST_POLICY_CONTEXT_ITEM003, contextBooleanItem);
- valueMapA.put(TEST_POLICY_CONTEXT_ITEM004, contextLongItem2);
- valueMapA.put(TEST_POLICY_CONTEXT_ITEM005, contextTreeMapItem);
- valueMapA.put(TEST_POLICY_CONTEXT_ITEM000, contextStringItem);
-
- assertPutMethods(policyContextAlbum, contextStringItem, valueMapA);
-
- final TestPolicyContextItem policyContext = new TestPolicyContextItem();
-
- LOGGER.debug(policyContextAlbum.toString());
-
- policyContext.setTestPolicyContextItem000(contextStringItem);
- policyContext.setTestPolicyContextItem001(contextLongItem);
- policyContext.setTestPolicyContextItem002(contextDoubleItem);
- policyContext.setTestPolicyContextItem003(contextBooleanItem);
- policyContext.setTestPolicyContextItem004(contextLongItem2);
- policyContext.setTestPolicyContextItem005(contextTreeMapItem);
- return policyContext;
- }
-
- private void assertPutMethods(final ContextAlbum policyContextAlbum, final TestContextStringItem contextStringItem,
- final Map<String, Object> valueMapA) {
- assertThatThrownBy(() -> policyContextAlbum.put(TEST_POLICY_CONTEXT_ITEM000, contextStringItem))
- .hasMessageContaining(getMessage(TEST_POLICY_CONTEXT_ITEM000, "TestContextItem006",
- TestContextStringItem.class.getName(), "stringValue=" + STRING_VAL));
- assertThatThrownBy(() -> policyContextAlbum.putAll(valueMapA))
- .hasMessageContaining(getMessage(TEST_POLICY_CONTEXT_ITEM001, "TestContextItem003",
- TestContextLongItem.class.getName(), "longValue=" + INT_VAL_3));
- }
-
- private AxContextModel getAxContextModel() {
- final AxContextModel policyContextModel = createPolicyContextModel();
- final AxValidationResult result = new AxValidationResult();
- policyContextModel.validate(result);
- LOGGER.debug(result.toString());
-
- assertTrue(result.isValid());
- return policyContextModel;
- }
-
- private TestContextDateLocaleItem getTestContextDateLocaleItem(final Date testDate) {
- final TestContextDateLocaleItem tciA = new TestContextDateLocaleItem();
- tciA.setDateValue(new TestContextDateItem(testDate));
- tciA.setTzValue(TIME_ZONE.getDisplayName());
- tciA.setDst(true);
- tciA.setUtcOffset(-600);
- tciA.setLocale(Locale.ENGLISH);
- return tciA;
- }
-
- private TestContextDateTzItem getTestContextDateTzItem(final Date testDate) {
- final TestContextDateTzItem tci9 = new TestContextDateTzItem();
- tci9.setDateValue(new TestContextDateItem(testDate));
- tci9.setTzValue(TIME_ZONE.getDisplayName());
- tci9.setDst(true);
- return tci9;
- }
-
- private TestExternalContextItem getTestExternalContextItem(final Date testDate, final TestContextDateTzItem tci9A,
- final TestContextDateLocaleItem tciAa) {
- final TestExternalContextItem externalContext = new TestExternalContextItem();
-
- final TestContextBooleanItem testExternalContextItem000 = new TestContextBooleanItem(false);
- final TestContextByteItem testExternalContextItem001 = new TestContextByteItem(BYTE_VAL);
- final TestContextIntItem testExternalContextItem002 = new TestContextIntItem(INT_VAL);
- final TestContextLongItem testExternalContextItem003 = new TestContextLongItem(LONG_VAL);
- final TestContextFloatItem testExternalContextItem004 = new TestContextFloatItem(3.14159265359F);
- final TestContextDoubleItem testExternalContextItem005 = new TestContextDoubleItem(PI_VAL);
- final TestContextStringItem testExternalContextItem006 = new TestContextStringItem(STRING_EXT_VAL);
- final TestContextLongObjectItem testExternalContextItem007 = new TestContextLongObjectItem(testDate.getTime());
- final TestContextDateItem testExternalContextItem008 = new TestContextDateItem(testDate);
- final TestContextTreeSetItem testExternalContextItem00B = new TestContextTreeSetItem(TEST_TREE_SET);
- final TestContextTreeMapItem testExternalContextItem00C = new TestContextTreeMapItem(TEST_HASH_MAP);
-
- externalContext.setTestExternalContextItem000(testExternalContextItem000);
- externalContext.setTestExternalContextItem001(testExternalContextItem001);
- externalContext.setTestExternalContextItem002(testExternalContextItem002);
- externalContext.setTestExternalContextItem003(testExternalContextItem003);
- externalContext.setTestExternalContextItem004(testExternalContextItem004);
- externalContext.setTestExternalContextItem005(testExternalContextItem005);
- externalContext.setTestExternalContextItem006(testExternalContextItem006);
- externalContext.setTestExternalContextItem007(testExternalContextItem007);
- externalContext.setTestExternalContextItem008(testExternalContextItem008);
- externalContext.setTestExternalContextItem009(tci9A);
- externalContext.setTestExternalContextItem00A(tciAa);
- externalContext.setTestExternalContextItem00B(testExternalContextItem00B);
- externalContext.setTestExternalContextItem00C(testExternalContextItem00C);
- return externalContext;
- }
-
- private String getMessage(final String key, final String objName, final String clazzName, final String valString) {
- return getMessage(key, objName, clazzName, valString, TestPolicyContextItem.class.getName());
- }
-
- private String getMessage(final String key, final String objName, final String clazzName, final String valString,
- final String compatibleClazzName) {
- return "Failed to set context value for key \"" + key + "\" in album \"PolicyContextAlbum:0.0.1\": "
- + "PolicyContextAlbum:0.0.1: object \"" + objName + " [" + valString + "]\" " + "of class \"" + clazzName
- + "\"" + " not compatible with class \"" + compatibleClazzName + "\"";
- }
-
- private void assertFloat(final float actual, final float expected) {
- assertThat(actual).isEqualTo(expected);
- }
-
- private void assertDouble(final double actual, final double expected) {
- assertThat(actual).isEqualTo(expected);
- }
-
- private Distributor getDistributor() throws ContextException {
- final AxArtifactKey distributorKey = new AxArtifactKey("ApexDistributorInit", VERSION);
- final Distributor distributor = new DistributorFactory().getDistributor(distributorKey);
- final AxContextModel policyContextModel = getAxContextModel();
- distributor.registerModel(policyContextModel);
- return distributor;
- }
-}
diff --git a/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/distribution/ContextUpdate.java b/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/distribution/ContextUpdate.java
deleted file mode 100644
index 8d5b702b0..000000000
--- a/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/distribution/ContextUpdate.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * Modifications Copyright (C) 2019-2020,2022 Nordix Foundation.
- * Modifications Copyright (C) 2021 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.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.testsuites.integration.context.distribution;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.onap.policy.apex.testsuites.integration.context.utils.Constants.APEX_DISTRIBUTOR;
-import static org.onap.policy.apex.testsuites.integration.context.utils.Constants.DATE_CONTEXT_ALBUM;
-import static org.onap.policy.apex.testsuites.integration.context.utils.Constants.LONG_CONTEXT_ALBUM;
-import static org.onap.policy.apex.testsuites.integration.context.utils.Constants.MAP_CONTEXT_ALBUM;
-import static org.onap.policy.apex.testsuites.integration.context.utils.Constants.TIME_ZONE;
-import static org.onap.policy.apex.testsuites.integration.context.utils.Constants.VERSION;
-import static org.onap.policy.apex.testsuites.integration.context.utils.Constants.getAxArtifactKeyArray;
-
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
-import org.onap.policy.apex.context.ContextAlbum;
-import org.onap.policy.apex.context.ContextException;
-import org.onap.policy.apex.context.Distributor;
-import org.onap.policy.apex.context.impl.distribution.DistributorFactory;
-import org.onap.policy.apex.context.test.concepts.TestContextDateItem;
-import org.onap.policy.apex.context.test.concepts.TestContextDateLocaleItem;
-import org.onap.policy.apex.context.test.concepts.TestContextTreeMapItem;
-import org.onap.policy.apex.model.basicmodel.concepts.ApexException;
-import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
-import org.onap.policy.apex.model.contextmodel.concepts.AxContextModel;
-import org.onap.policy.apex.testsuites.integration.context.factory.TestContextAlbumFactory;
-import org.slf4j.ext.XLogger;
-import org.slf4j.ext.XLoggerFactory;
-
-/**
- * The Class TestContextUpdate checks context updates.
- *
- * @author Sergey Sachkov (sergey.sachkov@ericsson.com)
- */
-public class ContextUpdate {
- private static final String ZERO = "zero";
- private static final String NUMBER_ZERO = "0";
- // Logger for this class
- private static final XLogger LOGGER = XLoggerFactory.getXLogger(ContextUpdate.class);
-
- /**
- * Test context update.
- *
- * @throws ApexException the apex exception
- */
- public void testContextUpdate() throws ApexException {
- LOGGER.debug("Running TestContextUpdate test . . .");
-
- final Distributor contextDistributor = getDistributor();
-
- final ContextAlbum longContextAlbum = getContextAlbum(LONG_CONTEXT_ALBUM, contextDistributor);
- final ContextAlbum dateContextAlbum = getContextAlbum(DATE_CONTEXT_ALBUM, contextDistributor);
- final ContextAlbum mapContextAlbum = getContextAlbum(MAP_CONTEXT_ALBUM, contextDistributor);
-
- final TestContextDateLocaleItem tciA = getTestContextDateLocaleItem();
- final TestContextTreeMapItem tciC = getTestContextTreeMapItem();
-
- longContextAlbum.put(NUMBER_ZERO, (long) 0);
- longContextAlbum.put(NUMBER_ZERO, 0);
- longContextAlbum.put(NUMBER_ZERO, NUMBER_ZERO);
-
- assertThatThrownBy(() -> longContextAlbum.put(NUMBER_ZERO, ZERO))
- .hasMessage("Failed to set context value for key \"0\" in album \"LongContextAlbum:0.0.1\":"
- + " LongContextAlbum:0.0.1: object \"zero\" of class \"java.lang.String\" not compatible with"
- + " class \"java.lang.Long\"");
- assertThatThrownBy(() -> longContextAlbum.put(NUMBER_ZERO, ""))
- .hasMessage("Failed to set context value for key \"0\" in album \"LongContextAlbum:0.0.1\": "
- + "LongContextAlbum:0.0.1: object \"\" of class \"java.lang.String\" not "
- + "compatible with class \"java.lang.Long\"");
- assertThatThrownBy(() -> longContextAlbum.put(NUMBER_ZERO, null))
- .hasMessage("album \"LongContextAlbum:0.0.1\" null values are illegal on key \"0\" for put()");
- assertThatThrownBy(() -> longContextAlbum.put(null, null))
- .hasMessage("album \"LongContextAlbum:0.0.1\" null keys are illegal on keys for put()");
-
- assertNull(dateContextAlbum.put("date0", tciA));
- assertThat(dateContextAlbum.put("date0", tciA)).isEqualTo(tciA);
-
- assertNull(mapContextAlbum.put("map0", tciC));
- assertThat(mapContextAlbum.put("map0", tciC)).isEqualTo(tciC);
-
- contextDistributor.clear();
- }
-
- private TestContextTreeMapItem getTestContextTreeMapItem() {
- final Map<String, String> testHashMap = new HashMap<>();
- testHashMap.put(NUMBER_ZERO, ZERO);
- testHashMap.put("1", "one");
- testHashMap.put("2", "two");
- testHashMap.put("3", "three");
- testHashMap.put("4", "four");
-
- return new TestContextTreeMapItem(testHashMap);
- }
-
- private TestContextDateLocaleItem getTestContextDateLocaleItem() {
- final TestContextDateLocaleItem tciA = new TestContextDateLocaleItem();
- tciA.setDateValue(new TestContextDateItem(new Date()));
- tciA.setTzValue(TIME_ZONE.getDisplayName());
- tciA.setDst(true);
- tciA.setUtcOffset(-600);
- tciA.setLocale(Locale.ENGLISH);
- return tciA;
- }
-
- private ContextAlbum getContextAlbum(final String albumKey, final Distributor contextDistributor)
- throws ContextException {
- final ContextAlbum longContextAlbum = contextDistributor
- .createContextAlbum(new AxArtifactKey(albumKey, VERSION));
- assertNotNull(longContextAlbum);
- longContextAlbum.setUserArtifactStack(getAxArtifactKeyArray());
- return longContextAlbum;
- }
-
- private Distributor getDistributor() throws ContextException {
- final AxArtifactKey distributorKey = new AxArtifactKey(APEX_DISTRIBUTOR, VERSION);
- final Distributor contextDistributor = new DistributorFactory().getDistributor(distributorKey);
-
- final AxContextModel multiModel = TestContextAlbumFactory.createMultiAlbumsContextModel();
- contextDistributor.registerModel(multiModel);
- return contextDistributor;
- }
-}
diff --git a/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/distribution/HazelcastContextDistributorTest.java b/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/distribution/HazelcastContextDistributorTest.java
deleted file mode 100644
index f38dfe453..000000000
--- a/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/distribution/HazelcastContextDistributorTest.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * Copyright (C) 2016-2018 Ericsson. 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.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.testsuites.integration.context.distribution;
-
-import java.io.IOException;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-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;
-import org.onap.policy.apex.context.parameters.SchemaParameters;
-import org.onap.policy.apex.model.basicmodel.concepts.ApexException;
-import org.onap.policy.apex.model.basicmodel.handling.ApexModelException;
-import org.onap.policy.apex.plugins.context.distribution.hazelcast.HazelcastContextDistributor;
-import org.onap.policy.common.parameters.ParameterService;
-import org.slf4j.ext.XLogger;
-import org.slf4j.ext.XLoggerFactory;
-
-/**
- * The Class HazelcastContextDistributorTest.
- */
-public class HazelcastContextDistributorTest {
- private static final String HAZEL_CAST_PLUGIN_CLASS = HazelcastContextDistributor.class.getName();
- // Logger for this class
- private static final XLogger logger = XLoggerFactory.getXLogger(HazelcastContextDistributorTest.class);
-
- private SchemaParameters schemaParameters;
- private ContextParameters contextParameters;
-
- /**
- * Before test.
- */
- @Before
- public void beforeTest() {
- contextParameters = new ContextParameters();
-
- contextParameters.setName(ContextParameterConstants.MAIN_GROUP_NAME);
- contextParameters.getDistributorParameters().setName(ContextParameterConstants.DISTRIBUTOR_GROUP_NAME);
- contextParameters.getLockManagerParameters().setName(ContextParameterConstants.LOCKING_GROUP_NAME);
- contextParameters.getPersistorParameters().setName(ContextParameterConstants.PERSISTENCE_GROUP_NAME);
-
- contextParameters.getDistributorParameters().setPluginClass(HAZEL_CAST_PLUGIN_CLASS);
-
- ParameterService.register(contextParameters);
- 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());
-
- ParameterService.register(schemaParameters);
- }
-
- /**
- * After test.
- */
- @After
- public void afterTest() {
- ParameterService.deregister(schemaParameters);
-
- ParameterService.deregister(contextParameters.getDistributorParameters());
- ParameterService.deregister(contextParameters.getLockManagerParameters());
- ParameterService.deregister(contextParameters.getPersistorParameters());
- ParameterService.deregister(contextParameters);
- }
-
- /**
- * Test context album update hazelcast.
- *
- * @throws ApexModelException the apex model exception
- * @throws IOException Signals that an I/O exception has occurred.
- * @throws ApexException the apex exception
- */
- @Test
- public void testContextAlbumUpdateHazelcast() throws ApexModelException, IOException, ApexException {
- logger.debug("Running testContextAlbumUpdateHazelcast test . . .");
-
- new ContextAlbumUpdate().testContextAlbumUpdate();
-
- logger.debug("Ran testContextAlbumUpdateHazelcast test");
- }
-
- /**
- * Test context instantiation hazelcast.
- *
- * @throws ApexModelException the apex model exception
- * @throws IOException Signals that an I/O exception has occurred.
- * @throws ApexException the apex exception
- */
- @Test
- public void testContextInstantiationHazelcast() throws ApexModelException, IOException, ApexException {
- logger.debug("Running testContextInstantiationHazelcast test . . .");
-
- new ContextInstantiation().testContextInstantiation();
-
- logger.debug("Ran testContextInstantiationHazelcast test");
- }
-
- /**
- * Test context update hazelcast.
- *
- * @throws ApexModelException the apex model exception
- * @throws IOException Signals that an I/O exception has occurred.
- * @throws ApexException the apex exception
- */
- @Test
- public void testContextUpdateHazelcast() throws ApexModelException, IOException, ApexException {
- logger.debug("Running testContextUpdateHazelcast test . . .");
-
- new ContextUpdate().testContextUpdate();
-
- logger.debug("Ran testContextUpdateHazelcast test");
- }
-}
diff --git a/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/distribution/InfinispanContextDistributorTest.java b/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/distribution/InfinispanContextDistributorTest.java
deleted file mode 100644
index a162ebecc..000000000
--- a/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/distribution/InfinispanContextDistributorTest.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * Copyright (C) 2018 Ericsson. 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.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.testsuites.integration.context.distribution;
-
-import java.io.IOException;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-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;
-import org.onap.policy.apex.context.parameters.SchemaParameters;
-import org.onap.policy.apex.model.basicmodel.concepts.ApexException;
-import org.onap.policy.apex.model.basicmodel.handling.ApexModelException;
-import org.onap.policy.apex.plugins.context.distribution.infinispan.InfinispanContextDistributor;
-import org.onap.policy.apex.plugins.context.distribution.infinispan.InfinispanDistributorParameters;
-import org.onap.policy.common.parameters.ParameterService;
-import org.slf4j.ext.XLogger;
-import org.slf4j.ext.XLoggerFactory;
-
-/**
- * The Class InfinispanContextDistributorTest.
- */
-public class InfinispanContextDistributorTest {
- private static final XLogger logger = XLoggerFactory.getXLogger(InfinispanContextDistributorTest.class);
-
- private static final String PLUGIN_CLASS = InfinispanContextDistributor.class.getName();
-
- private SchemaParameters schemaParameters;
- private ContextParameters contextParameters;
-
- /**
- * Before test.
- */
- @Before
- public void beforeTest() {
- contextParameters = new ContextParameters();
-
- contextParameters.setName(ContextParameterConstants.MAIN_GROUP_NAME);
- InfinispanDistributorParameters inifinispanDistributorParameters = new InfinispanDistributorParameters();
- inifinispanDistributorParameters.setName(ContextParameterConstants.DISTRIBUTOR_GROUP_NAME);
- inifinispanDistributorParameters.setPluginClass(PLUGIN_CLASS);
- contextParameters.setDistributorParameters(inifinispanDistributorParameters);
- contextParameters.getLockManagerParameters().setName(ContextParameterConstants.LOCKING_GROUP_NAME);
- contextParameters.getPersistorParameters().setName(ContextParameterConstants.PERSISTENCE_GROUP_NAME);
-
- ParameterService.register(contextParameters);
- 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());
-
- ParameterService.register(schemaParameters);
- }
-
- /**
- * After test.
- */
- @After
- public void afterTest() {
- ParameterService.deregister(schemaParameters);
-
- ParameterService.deregister(contextParameters.getDistributorParameters());
- ParameterService.deregister(contextParameters.getLockManagerParameters());
- ParameterService.deregister(contextParameters.getPersistorParameters());
- ParameterService.deregister(contextParameters);
- }
-
- /**
- * Test context album update infinispan.
- *
- * @throws ApexModelException the apex model exception
- * @throws IOException Signals that an I/O exception has occurred.
- * @throws ApexException the apex exception
- */
- @Test
- public void testContextAlbumUpdateInfinispan() throws ApexModelException, IOException, ApexException {
- logger.debug("Running testContextAlbumUpdateInfinispan test . . .");
-
- new ContextAlbumUpdate().testContextAlbumUpdate();
-
- logger.debug("Ran testContextAlbumUpdateInfinispan test");
- }
-
- /**
- * Test context instantiation infinispan.
- *
- * @throws ApexModelException the apex model exception
- * @throws IOException Signals that an I/O exception has occurred.
- * @throws ApexException the apex exception
- */
- @Test
- public void testContextInstantiationInfinispan() throws ApexModelException, IOException, ApexException {
- logger.debug("Running testContextInstantiationInfinispan test . . .");
-
- new ContextInstantiation().testContextInstantiation();
-
- logger.debug("Ran testContextInstantiationInfinispan test");
- }
-
- /**
- * Test context update infinispan.
- *
- * @throws ApexModelException the apex model exception
- * @throws IOException Signals that an I/O exception has occurred.
- * @throws ApexException the apex exception
- */
- @Test
- public void testContextUpdateInfinispan() throws ApexModelException, IOException, ApexException {
- logger.debug("Running testContextUpdateInfinispan test . . .");
-
- new ContextUpdate().testContextUpdate();
-
- logger.debug("Ran testContextUpdateInfinispan test");
- }
-
- /**
- * Test sequential context instantiation infinispan.
- *
- * @throws ApexModelException the apex model exception
- * @throws IOException Signals that an I/O exception has occurred.
- * @throws ApexException the apex exception
- */
- @Test
- public void testSequentialContextInstantiationInfinispan() throws ApexModelException, IOException, ApexException {
- logger.debug("Running testSequentialContextInstantiationInfinispan test . . .");
-
- new SequentialContextInstantiation().testSequentialContextInstantiation();
-
- logger.debug("Ran testSequentialContextInstantiationInfinispan test");
- }
-}
diff --git a/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/distribution/SequentialContextInstantiation.java b/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/distribution/SequentialContextInstantiation.java
deleted file mode 100644
index 50ca52a6b..000000000
--- a/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/distribution/SequentialContextInstantiation.java
+++ /dev/null
@@ -1,329 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * Modifications Copyright (C) 2019-2020 Nordix Foundation.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.testsuites.integration.context.distribution;
-
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.onap.policy.apex.testsuites.integration.context.factory.TestContextAlbumFactory.createMultiAlbumsContextModel;
-import static org.onap.policy.apex.testsuites.integration.context.utils.Constants.APEX_DISTRIBUTOR;
-import static org.onap.policy.apex.testsuites.integration.context.utils.Constants.BYTE_VAL;
-import static org.onap.policy.apex.testsuites.integration.context.utils.Constants.DATE_CONTEXT_ALBUM;
-import static org.onap.policy.apex.testsuites.integration.context.utils.Constants.FLOAT_VAL;
-import static org.onap.policy.apex.testsuites.integration.context.utils.Constants.INT_VAL;
-import static org.onap.policy.apex.testsuites.integration.context.utils.Constants.LONG_VAL;
-import static org.onap.policy.apex.testsuites.integration.context.utils.Constants.PI_VAL;
-import static org.onap.policy.apex.testsuites.integration.context.utils.Constants.STRING_GLOBAL_VAL;
-import static org.onap.policy.apex.testsuites.integration.context.utils.Constants.TIME_ZONE;
-import static org.onap.policy.apex.testsuites.integration.context.utils.Constants.VERSION;
-
-import java.util.Collection;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-import java.util.TimeZone;
-import org.onap.policy.apex.context.ContextAlbum;
-import org.onap.policy.apex.context.ContextException;
-import org.onap.policy.apex.context.Distributor;
-import org.onap.policy.apex.context.impl.distribution.DistributorFactory;
-import org.onap.policy.apex.context.test.concepts.TestContextBooleanItem;
-import org.onap.policy.apex.context.test.concepts.TestContextByteItem;
-import org.onap.policy.apex.context.test.concepts.TestContextDateItem;
-import org.onap.policy.apex.context.test.concepts.TestContextDateLocaleItem;
-import org.onap.policy.apex.context.test.concepts.TestContextDateTzItem;
-import org.onap.policy.apex.context.test.concepts.TestContextDoubleItem;
-import org.onap.policy.apex.context.test.concepts.TestContextFloatItem;
-import org.onap.policy.apex.context.test.concepts.TestContextIntItem;
-import org.onap.policy.apex.context.test.concepts.TestContextLongItem;
-import org.onap.policy.apex.context.test.concepts.TestContextLongObjectItem;
-import org.onap.policy.apex.context.test.concepts.TestContextStringItem;
-import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
-import org.onap.policy.apex.testsuites.integration.context.utils.Constants;
-import org.slf4j.ext.XLogger;
-import org.slf4j.ext.XLoggerFactory;
-
-/**
- * The Class SequentialContextInstantiation checks sequential initiation of
- * context.
- *
- * @author Sergey Sachkov (sergey.sachkov@ericsson.com)
- */
-public class SequentialContextInstantiation {
- // Logger for this class
- private static final XLogger LOGGER = XLoggerFactory.getXLogger(SequentialContextInstantiation.class);
-
- // Recurring string constants.
- private static final String TEST_AB = "TestAB";
- private static final String TEST_AA = "TestAA";
- private static final String ITEM_NULL = "ItemNull";
- private static final String ITEM06 = "Item06";
- private static final String ITEM05 = "Item05";
- private static final String ITEM03 = "Item03";
- private static final String ITEM02 = "Item02";
- private static final String ITEM01 = "Item01";
- private static final String ITEM00_2 = "Item00_2";
-
- // Recurring string constants.
- private static final String DV1 = "dv1";
- private static final String DV0 = "dv0";
-
- /**
- * Test sequential context instantiation.
- *
- * @throws ContextException the context exception
- */
- public void testSequentialContextInstantiation() throws ContextException {
- LOGGER.debug("Running TestContextInstantiation test . . .");
-
- final Distributor contextDistributor = getDistributor();
-
- try {
- final ContextAlbum dateAlbum = getContextAlbum(DATE_CONTEXT_ALBUM, contextDistributor);
- final Date testDate = new Date();
- final TestContextDateLocaleItem tciA00 = getTestContextDateLocaleItem();
-
- dateAlbum.put(DV0, tciA00);
- assertEquals(tciA00, dateAlbum.get(DV0));
-
- dateAlbum.put(DV1, tciA00);
- assertEquals(tciA00, dateAlbum.get(DV1));
-
- final TestContextDateTzItem tci9 = getTestContextDateTzItem(testDate);
-
- assertThatThrownBy(() -> dateAlbum.put("tci9", tci9))
- .hasMessageContaining("class \"" + TestContextDateTzItem.class.getName()
- + "\" not compatible with class \"" + TestContextDateLocaleItem.class.getName() + "\"");
-
- final TestContextDateLocaleItem tciA01 = new TestContextDateLocaleItem(tciA00);
- final TestContextDateLocaleItem tciA02 = new TestContextDateLocaleItem(tciA00);
- final TestContextDateLocaleItem tciA03 = new TestContextDateLocaleItem(tciA00);
-
- final Map<String, Object> valueMap0 = new HashMap<>();
- valueMap0.put(ITEM01, tciA01);
- valueMap0.put(ITEM02, tciA02);
- valueMap0.put(ITEM03, tciA03);
-
- dateAlbum.putAll(valueMap0);
- assertEquals(5, dateAlbum.size());
- assertEquals(tciA01, dateAlbum.get(ITEM01));
- assertEquals(tciA02, dateAlbum.get(ITEM02));
- assertEquals(tciA03, dateAlbum.get(ITEM03));
-
- final Map<String, Object> valueMap1 = getMap(testDate, tciA00, tci9);
-
- // Get another reference to the album
- final ContextAlbum dateAlbum1 = getContextAlbum(DATE_CONTEXT_ALBUM, contextDistributor);
-
- assertThatThrownBy(() -> dateAlbum1.putAll(valueMap1)).hasMessageContaining(
- "not compatible with class \"" + TestContextDateLocaleItem.class.getName() + "\"");
- assertEquals(5, dateAlbum1.size());
-
- valueMap1.clear();
- valueMap1.put(ITEM00_2, tciA00);
- dateAlbum1.putAll(valueMap1);
- assertEquals(6, dateAlbum1.size());
-
- assertEquals(tciA00, dateAlbum1.get(ITEM00_2));
- dateAlbum.remove(ITEM00_2);
- assertEquals(5, dateAlbum1.size());
-
- final ContextAlbum dateAlbumCopy = getContextAlbum(DATE_CONTEXT_ALBUM, contextDistributor);
-
- final Map<String, Object> valueMap2 = new HashMap<>();
- valueMap2.put("Item04", tciA01);
- valueMap2.put(ITEM05, tciA02);
- valueMap2.put(ITEM06, tciA03);
-
- dateAlbumCopy.putAll(valueMap2);
- assertEquals(8, dateAlbumCopy.size());
-
- assertEquals(tciA03, dateAlbumCopy.get(ITEM06));
-
- final Collection<Object> mapValues = dateAlbum.values();
- assertTrue(dateAlbumCopy.values().containsAll(mapValues));
-
- // Check that clearing works
- dateAlbum1.clear();
- assertTrue(dateAlbum1.isEmpty());
-
- dateAlbum.put("Item00", tciA00);
- final Map<String, Object> valueMap3 = new HashMap<>();
- valueMap3.put(ITEM01, tciA01);
- valueMap3.put(ITEM02, tciA02);
- valueMap3.put(ITEM03, tciA03);
- dateAlbum.putAll(valueMap3);
-
- final Map<String, Object> valueMap4 = new HashMap<>();
- valueMap4.put("Item04", tciA01);
- valueMap4.put(ITEM05, tciA02);
- valueMap4.put(ITEM06, tciA03);
-
- dateAlbumCopy.putAll(valueMap4);
-
- assertContains(dateAlbum, tciA01);
-
- final Set<Entry<String, Object>> entrySet = dateAlbum.entrySet();
- assertEquals(7, entrySet.size());
-
- assertAlbumGetAndPutMethods(dateAlbum, tciA03, tciA00);
-
- // Should do removes
- dateAlbum.remove(TEST_AA);
- dateAlbum.remove(TEST_AB);
- dateAlbum.remove(ITEM_NULL);
- assertEquals(7, entrySet.size());
- assertTrue(dateAlbumCopy.values().containsAll(mapValues));
- // CHECKSTYLE:ON: checkstyle:magicNumber
- } finally {
- contextDistributor.clear();
- }
- }
-
- private void assertContains(final ContextAlbum dateAlbum, final TestContextDateLocaleItem tciA01) {
- assertThatThrownBy(() -> dateAlbum.containsKey(null))
- .hasMessageContaining("null values are illegal on method parameter \"key\"");
-
- assertTrue(dateAlbum.containsKey(ITEM05));
- assertTrue(!dateAlbum.containsKey("Item07"));
-
- assertThatThrownBy(() -> dateAlbum.containsValue(null))
- .hasMessageContaining("null values are illegal on method parameter \"value\"");
-
- assertTrue(dateAlbum.containsValue(tciA01));
- assertTrue(!dateAlbum.containsValue("Hello"));
- }
-
- private void assertAlbumGetAndPutMethods(final ContextAlbum dateAlbum, final TestContextDateLocaleItem tciA03,
- final TestContextDateLocaleItem tciA00) {
- assertThatThrownBy(() -> dateAlbum.get(null))
- .hasMessageContaining("album \"DateContextAlbum:0.0.1\" null keys are illegal on keys for get()");
-
- final Object aObject = dateAlbum.get(ITEM03);
- assertEquals(tciA03, aObject);
- assertThatThrownBy(() -> dateAlbum.put(null, null))
- .hasMessageContaining("album \"DateContextAlbum:0.0.1\" null keys are illegal on keys for put()");
-
- // Put null ContextItem should work (return null)
- assertThatThrownBy(() -> dateAlbum.put(ITEM_NULL, null)).hasMessageContaining(
- "album \"DateContextAlbum:0.0.1\" null values are illegal on " + "key \"ItemNull\" for put()");
-
- // Should return null
- assertNull(dateAlbum.get(ITEM_NULL));
- // Put should return the previous contextItem
- tciA00.setDst(false);
- final TestContextDateLocaleItem tciA03Clone = new TestContextDateLocaleItem(tciA03);
- tciA03Clone.setDst(true);
- TestContextDateLocaleItem retItem = (TestContextDateLocaleItem) dateAlbum.put(ITEM03, tciA03Clone);
- assertEquals(tciA03, retItem);
- retItem = (TestContextDateLocaleItem) dateAlbum.put(ITEM03, tciA03);
- assertEquals(tciA03Clone, retItem);
-
- assertThatThrownBy(() -> dateAlbum.put(ITEM_NULL, null)).hasMessageContaining(
- "album \"DateContextAlbum:0.0.1\" null values are illegal on " + "key \"ItemNull\" for put()");
-
- dateAlbum.put(TEST_AA, tciA00);
- assertEquals(tciA00, dateAlbum.get(TEST_AA));
-
- // Should print warning
- assertThatThrownBy(() -> dateAlbum.put(TEST_AA, null)).hasMessageContaining(
- "album \"DateContextAlbum:0.0.1\" null values are illegal on key \"TestAA\" " + "for put()");
- assertEquals(8, dateAlbum.size());
- assertThatThrownBy(() -> dateAlbum.put(TEST_AB, null)).hasMessageContaining(
- "album \"DateContextAlbum:0.0.1\" null values are illegal on key \"TestAB\" " + "for put()");
- assertEquals(8, dateAlbum.size());
- }
-
- private Map<String, Object> getMap(final Date testDate, final TestContextDateLocaleItem tciA00,
- final TestContextDateTzItem tci9) {
- final TestContextBooleanItem testBadItem000 = new TestContextBooleanItem();
- final TestContextByteItem testBadItem001 = new TestContextByteItem();
- final TestContextIntItem testBadItem002 = new TestContextIntItem();
- final TestContextLongItem testBadItem003 = new TestContextLongItem();
- final TestContextFloatItem testBadItem004 = new TestContextFloatItem();
- final TestContextDoubleItem testBadItem005 = new TestContextDoubleItem();
- final TestContextStringItem testBadItem006 = new TestContextStringItem();
- final TestContextLongObjectItem testBadItem007 = new TestContextLongObjectItem();
- final TestContextDateItem testBadItem008 = new TestContextDateItem();
-
- testBadItem000.setFlag(false);
- testBadItem001.setByteValue(BYTE_VAL);
- testBadItem002.setIntValue(INT_VAL);
- testBadItem003.setLongValue(LONG_VAL);
- testBadItem004.setFloatValue(FLOAT_VAL);
- testBadItem005.setDoubleValue(PI_VAL);
- testBadItem006.setStringValue(STRING_GLOBAL_VAL);
- testBadItem007.setLongValue(testDate.getTime());
- testBadItem008.setDateValue(testDate);
-
- final Map<String, Object> values = new HashMap<>();
- values.put("TestBadItem000", testBadItem000);
- values.put("TestBadItem001", testBadItem001);
- values.put("TestBadItem002", testBadItem002);
- values.put("TestBadItem003", testBadItem003);
- values.put("TestBadItem004", testBadItem004);
- values.put("TestBadItem005", testBadItem005);
- values.put("TestBadItem006", testBadItem006);
- values.put("TestBadItem007", testBadItem007);
- values.put("TestBadItem008", testBadItem008);
- values.put("TestBadItem009", tci9);
- values.put(ITEM00_2, tciA00);
- return values;
- }
-
- private TestContextDateTzItem getTestContextDateTzItem(final Date testDate) {
- final TestContextDateTzItem tci9 = new TestContextDateTzItem();
- tci9.setDateValue(new TestContextDateItem(testDate));
- tci9.setTzValue(TimeZone.getTimeZone("Europe/Dublin").getDisplayName());
- tci9.setDst(true);
- return tci9;
- }
-
- private TestContextDateLocaleItem getTestContextDateLocaleItem() {
- final TestContextDateLocaleItem tciA00 = new TestContextDateLocaleItem();
- tciA00.setDateValue(new TestContextDateItem(new Date()));
- tciA00.setTzValue(TIME_ZONE.getDisplayName());
- tciA00.setDst(true);
- tciA00.setUtcOffset(-600);
- tciA00.setLocale(Locale.ENGLISH);
- return tciA00;
- }
-
- private ContextAlbum getContextAlbum(final String albumName, final Distributor contextDistributor)
- throws ContextException {
- final ContextAlbum dateAlbum = contextDistributor.createContextAlbum(new AxArtifactKey(albumName, VERSION));
- assertNotNull(dateAlbum);
- dateAlbum.setUserArtifactStack(Constants.getAxArtifactKeyArray());
- return dateAlbum;
- }
-
- private Distributor getDistributor() throws ContextException {
- final AxArtifactKey distributorKey = new AxArtifactKey(APEX_DISTRIBUTOR, VERSION);
- final Distributor contextDistributor = new DistributorFactory().getDistributor(distributorKey);
- contextDistributor.registerModel(createMultiAlbumsContextModel());
- return contextDistributor;
- }
-}
diff --git a/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/distribution/package-info.java b/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/distribution/package-info.java
deleted file mode 100644
index 04230aaae..000000000
--- a/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/distribution/package-info.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * Modifications Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-/**
- * Runs context distribution tests in APEX.
- *
- * @author Liam Fallon (liam.fallon@ericsson.com)
- */
-
-package org.onap.policy.apex.testsuites.integration.context.distribution;
diff --git a/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/entities/ArtifactKeyTestEntity.java b/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/entities/ArtifactKeyTestEntity.java
deleted file mode 100644
index ae56d15d9..000000000
--- a/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/entities/ArtifactKeyTestEntity.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * Modifications Copyright (C) 2019,2022-2023 Nordix Foundation.
- * Modifications Copyright (C) 2021 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.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.testsuites.integration.context.entities;
-
-import jakarta.xml.bind.annotation.XmlElement;
-import java.util.Arrays;
-import java.util.List;
-import lombok.AllArgsConstructor;
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.ToString;
-import org.apache.commons.lang3.builder.CompareToBuilder;
-import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
-import org.onap.policy.apex.model.basicmodel.concepts.AxConcept;
-import org.onap.policy.apex.model.basicmodel.concepts.AxKey;
-import org.onap.policy.apex.model.basicmodel.concepts.AxValidationResult;
-
-/**
- * The Class ArtifactKeyTestEntity is an entity for testing artifact keys.
- */
-@Getter
-@Setter
-@ToString
-@EqualsAndHashCode(callSuper = false)
-@AllArgsConstructor
-public class ArtifactKeyTestEntity extends AxConcept {
- private static final long serialVersionUID = -2962570563281067896L;
-
- @XmlElement(name = "key", required = true)
- protected AxArtifactKey key;
-
- private double doubleValue;
-
- /**
- * Instantiates a new artifact key test entity.
- */
- public ArtifactKeyTestEntity() {
- this.key = new AxArtifactKey();
- this.doubleValue = 0;
- }
-
- /**
- * Instantiates a new artifact key test entity.
- *
- * @param doubleValue the double value
- */
- public ArtifactKeyTestEntity(final Double doubleValue) {
- this.key = new AxArtifactKey();
- this.doubleValue = doubleValue;
- }
-
- /**
- * {@inheritDoc}.
- */
- @Override
- public List<AxKey> getKeys() {
- return Arrays.asList((AxKey) getKey());
- }
-
- /**
- * Check set key.
- *
- * @return true, if successful
- */
- public boolean checkSetKey() {
- return (this.key != null);
- }
-
- /**
- * {@inheritDoc}.
- */
- @Override
- public AxValidationResult validate(final AxValidationResult result) {
- return key.validate(result);
- }
-
- /**
- * {@inheritDoc}.
- */
- @Override
- public void clean() {
- key.clean();
- }
-
- /**
- * {@inheritDoc}.
- */
- @Override
- public AxConcept copyTo(final AxConcept target) {
- final Object copyObject = ((target == null) ? new ArtifactKeyTestEntity() : target);
- if (copyObject instanceof ArtifactKeyTestEntity) {
- final ArtifactKeyTestEntity copy = ((ArtifactKeyTestEntity) copyObject);
- if (this.checkSetKey()) {
- copy.setKey(new AxArtifactKey(key));
- } else {
- copy.key = null;
- }
- copy.doubleValue = doubleValue;
- return copy;
- } else {
- return null;
- }
- }
-
- /**
- * {@inheritDoc}.
- */
- @Override
- public int compareTo(final AxConcept otherObj) {
- if (otherObj == null) {
- return -1;
- }
- if (this == otherObj) {
- return 0;
- }
- if (getClass() != otherObj.getClass()) {
- return -1;
- }
- final ArtifactKeyTestEntity other = (ArtifactKeyTestEntity) otherObj;
- return new CompareToBuilder()
- .append(key, other.key)
- .append(doubleValue, other.doubleValue)
- .toComparison();
- }
-}
diff --git a/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/entities/ReferenceKeyTestEntity.java b/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/entities/ReferenceKeyTestEntity.java
deleted file mode 100644
index 0da996483..000000000
--- a/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/entities/ReferenceKeyTestEntity.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * Modifications Copyright (C) 2019,2022-2023 Nordix Foundation.
- * Modifications Copyright (C) 2021 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.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.testsuites.integration.context.entities;
-
-import jakarta.xml.bind.annotation.XmlElement;
-import java.util.Arrays;
-import java.util.List;
-import lombok.AllArgsConstructor;
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.ToString;
-import org.apache.commons.lang3.builder.CompareToBuilder;
-import org.onap.policy.apex.model.basicmodel.concepts.AxConcept;
-import org.onap.policy.apex.model.basicmodel.concepts.AxKey;
-import org.onap.policy.apex.model.basicmodel.concepts.AxReferenceKey;
-import org.onap.policy.apex.model.basicmodel.concepts.AxValidationResult;
-
-/**
- * The Class ReferenceKeyTestEntity provides a reference key test concept.
- */
-@Getter
-@Setter
-@ToString
-@EqualsAndHashCode(callSuper = false)
-@AllArgsConstructor
-public class ReferenceKeyTestEntity extends AxConcept {
- private static final long serialVersionUID = -2962570563281067895L;
-
- @XmlElement(name = "key", required = true)
- protected AxReferenceKey key;
-
- private double doubleValue;
-
- /**
- * Instantiates a new reference key test entity.
- */
- public ReferenceKeyTestEntity() {
- this.key = new AxReferenceKey();
- this.doubleValue = 0;
- }
-
- /**
- * Instantiates a new reference key test entity.
- *
- * @param doubleValue the double value
- */
- public ReferenceKeyTestEntity(final Double doubleValue) {
- this.key = new AxReferenceKey();
- this.doubleValue = doubleValue;
- }
-
- /**
- * {@inheritDoc}.
- */
- @Override
- public List<AxKey> getKeys() {
- return Arrays.asList((AxKey) getKey());
- }
-
- /**
- * Check set key.
- *
- * @return true, if successful
- */
- public boolean checkSetKey() {
- return (this.key != null);
- }
-
- /**
- * {@inheritDoc}.
- */
- @Override
- public AxValidationResult validate(final AxValidationResult result) {
- return key.validate(result);
- }
-
- /**
- * {@inheritDoc}.
- */
- @Override
- public void clean() {
- key.clean();
- }
-
- /**
- * {@inheritDoc}.
- */
- @Override
- public AxConcept copyTo(final AxConcept target) {
- final Object copyObject = ((target == null) ? new ReferenceKeyTestEntity() : target);
- if (copyObject instanceof ReferenceKeyTestEntity) {
- final ReferenceKeyTestEntity copy = ((ReferenceKeyTestEntity) copyObject);
- if (this.checkSetKey()) {
- copy.setKey(new AxReferenceKey(key));
- } else {
- copy.key = null;
- }
- copy.doubleValue = doubleValue;
- return copy;
- } else {
- return null;
- }
- }
-
- /**
- * {@inheritDoc}.
- */
- @Override
- public int compareTo(final AxConcept otherObj) {
- if (otherObj == null) {
- return -1;
- }
- if (this == otherObj) {
- return 0;
- }
- if (getClass() != otherObj.getClass()) {
- return -1;
- }
- final ReferenceKeyTestEntity other = (ReferenceKeyTestEntity) otherObj;
- return new CompareToBuilder()
- .append(key, other.key)
- .append(doubleValue, other.doubleValue)
- .toComparison();
- }
-}
diff --git a/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/entities/package-info.java b/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/entities/package-info.java
deleted file mode 100644
index 8824a16f5..000000000
--- a/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/entities/package-info.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * Copyright (C) 2018 Ericsson. All rights reserved.
- * Modifications Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-/**
- * Contains common test entities.
- * @author Dinh Danh Le (dinh.danh.le@ericsson.com)
- *
- */
-package org.onap.policy.apex.testsuites.integration.context.entities;
diff --git a/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/factory/TestContextAlbumFactory.java b/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/factory/TestContextAlbumFactory.java
deleted file mode 100644
index be4a379aa..000000000
--- a/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/factory/TestContextAlbumFactory.java
+++ /dev/null
@@ -1,216 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * Modifications Copyright (C) 2019 Nordix Foundation.
- * Modifications Copyright (C) 2021 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.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.testsuites.integration.context.factory;
-
-import static org.onap.policy.apex.testsuites.integration.context.utils.Constants.DATE_CONTEXT_ALBUM;
-import static org.onap.policy.apex.testsuites.integration.context.utils.Constants.EXTERNAL_CONTEXT_ALBUM;
-import static org.onap.policy.apex.testsuites.integration.context.utils.Constants.GLOBAL_CONTEXT_ALBUM;
-import static org.onap.policy.apex.testsuites.integration.context.utils.Constants.LONG_CONTEXT_ALBUM;
-import static org.onap.policy.apex.testsuites.integration.context.utils.Constants.MAP_CONTEXT_ALBUM;
-import static org.onap.policy.apex.testsuites.integration.context.utils.Constants.POLICY_CONTEXT_ALBUM;
-import static org.onap.policy.apex.testsuites.integration.context.utils.Constants.VERSION;
-
-import lombok.AccessLevel;
-import lombok.NoArgsConstructor;
-import org.onap.policy.apex.context.test.concepts.TestContextDateLocaleItem;
-import org.onap.policy.apex.context.test.concepts.TestContextLongItem;
-import org.onap.policy.apex.context.test.concepts.TestContextTreeMapItem;
-import org.onap.policy.apex.context.test.concepts.TestExternalContextItem;
-import org.onap.policy.apex.context.test.concepts.TestGlobalContextItem;
-import org.onap.policy.apex.context.test.concepts.TestPolicyContextItem;
-import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
-import org.onap.policy.apex.model.basicmodel.concepts.AxKeyInformation;
-import org.onap.policy.apex.model.contextmodel.concepts.AxContextAlbum;
-import org.onap.policy.apex.model.contextmodel.concepts.AxContextAlbums;
-import org.onap.policy.apex.model.contextmodel.concepts.AxContextModel;
-import org.onap.policy.apex.model.contextmodel.concepts.AxContextSchema;
-import org.onap.policy.apex.model.contextmodel.concepts.AxContextSchemas;
-
-/**
- * The Class TestContextAlbumFactory creates test context albums.
- *
- * @author Liam Fallon (liam.fallon@ericsson.com)
- */
-@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class TestContextAlbumFactory {
- // Recurring string constants.
- private static final String CONTEXT = "context";
- private static final String SCHEMAS2 = "Schemas";
- private static final String KEY_INFO_MAP_KEY = "KeyInfoMapKey";
- private static final String APPLICATION = "APPLICATION";
- private static final String JAVA_LONG = Long.class.getName();
- private static final String JAVA_FLAVOUR = "Java";
-
- /**
- * Creates the policy context model.
- *
- * @return the ax context model
- */
- public static AxContextModel createPolicyContextModel() {
- final AxContextSchema policySchema = new AxContextSchema(new AxArtifactKey("PolicySchema", VERSION),
- JAVA_FLAVOUR, TestPolicyContextItem.class.getName());
- final AxContextAlbum albumDefinition = new AxContextAlbum(new AxArtifactKey(POLICY_CONTEXT_ALBUM, VERSION),
- APPLICATION, true, policySchema.getKey());
-
- final AxContextSchemas schemas = new AxContextSchemas(new AxArtifactKey(SCHEMAS2, VERSION));
- schemas.getSchemasMap().put(policySchema.getKey(), policySchema);
- final AxContextAlbums albums = new AxContextAlbums(new AxArtifactKey(CONTEXT, VERSION));
- albums.getAlbumsMap().put(albumDefinition.getKey(), albumDefinition);
-
- final AxKeyInformation keyInformation = new AxKeyInformation(new AxArtifactKey(KEY_INFO_MAP_KEY, VERSION));
- final AxContextModel contextModel =
- new AxContextModel(new AxArtifactKey("PolicyContextModel", VERSION), schemas, albums, keyInformation);
- contextModel.setKeyInformation(keyInformation);
- keyInformation.generateKeyInfo(contextModel);
-
- return contextModel;
- }
-
- /**
- * Creates the global context model.
- *
- * @return the ax context model
- */
- public static AxContextModel createGlobalContextModel() {
- final AxContextSchema globalSchema = new AxContextSchema(new AxArtifactKey("GlobalSchema", VERSION),
- JAVA_FLAVOUR, TestGlobalContextItem.class.getName());
- final AxContextAlbum albumDefinition = new AxContextAlbum(new AxArtifactKey(GLOBAL_CONTEXT_ALBUM, VERSION),
- "GLOBAL", true, globalSchema.getKey());
-
- final AxContextSchemas schemas = new AxContextSchemas(new AxArtifactKey(SCHEMAS2, VERSION));
- schemas.getSchemasMap().put(globalSchema.getKey(), globalSchema);
- final AxContextAlbums albums = new AxContextAlbums(new AxArtifactKey(CONTEXT, VERSION));
- albums.getAlbumsMap().put(albumDefinition.getKey(), albumDefinition);
-
- final AxKeyInformation keyInformation = new AxKeyInformation(new AxArtifactKey(KEY_INFO_MAP_KEY, VERSION));
- final AxContextModel contextModel =
- new AxContextModel(new AxArtifactKey("GlobalContextModel", VERSION), schemas, albums, keyInformation);
- contextModel.setKeyInformation(keyInformation);
- keyInformation.generateKeyInfo(contextModel);
-
- return contextModel;
- }
-
- /**
- * Creates the external context model.
- *
- * @return the ax context model
- */
- public static AxContextModel createExternalContextModel() {
- final AxContextSchema externalSchema = new AxContextSchema(new AxArtifactKey("ExternalSchema", VERSION),
- JAVA_FLAVOUR, TestExternalContextItem.class.getName());
- final AxContextAlbum albumDefinition = new AxContextAlbum(new AxArtifactKey(EXTERNAL_CONTEXT_ALBUM, VERSION),
- "EXTERNAL", true, externalSchema.getKey());
-
- final AxContextSchemas schemas = new AxContextSchemas(new AxArtifactKey(SCHEMAS2, VERSION));
- schemas.getSchemasMap().put(externalSchema.getKey(), externalSchema);
- final AxContextAlbums albums = new AxContextAlbums(new AxArtifactKey(CONTEXT, VERSION));
- albums.getAlbumsMap().put(albumDefinition.getKey(), albumDefinition);
-
- final AxKeyInformation keyInformation = new AxKeyInformation(new AxArtifactKey(KEY_INFO_MAP_KEY, VERSION));
- final AxContextModel contextModel =
- new AxContextModel(new AxArtifactKey("ExternalContextModel", VERSION), schemas, albums, keyInformation);
- contextModel.setKeyInformation(keyInformation);
- keyInformation.generateKeyInfo(contextModel);
-
- return contextModel;
- }
-
- /**
- * Creates the long context model.
- *
- * @return the ax context model
- */
- public static AxContextModel createLongContextModel() {
- final AxArtifactKey longSchemaKey = new AxArtifactKey("LongSchema", VERSION);
- final AxContextSchema longSchema = new AxContextSchema(longSchemaKey, JAVA_FLAVOUR, JAVA_LONG);
-
- final AxArtifactKey longContextAlbumKey = new AxArtifactKey("LongContextAlbum1", VERSION);
- final AxContextAlbum albumDefinition1 =
- new AxContextAlbum(longContextAlbumKey, APPLICATION, true, longSchema.getKey());
-
- final AxArtifactKey longContextAlbumKey2 = new AxArtifactKey("LongContextAlbum2", VERSION);
- final AxContextAlbum albumDefinition2 =
- new AxContextAlbum(longContextAlbumKey2, APPLICATION, true, longSchema.getKey());
-
- final AxContextSchemas schemas = new AxContextSchemas(new AxArtifactKey(SCHEMAS2, VERSION));
- schemas.getSchemasMap().put(longSchema.getKey(), longSchema);
- final AxContextAlbums albums = new AxContextAlbums(new AxArtifactKey(CONTEXT, VERSION));
- albums.getAlbumsMap().put(albumDefinition1.getKey(), albumDefinition1);
- albums.getAlbumsMap().put(albumDefinition2.getKey(), albumDefinition2);
-
- final AxKeyInformation keyInformation = new AxKeyInformation(new AxArtifactKey(KEY_INFO_MAP_KEY, VERSION));
- final AxContextModel contextModel =
- new AxContextModel(new AxArtifactKey("LongContextModel", VERSION), schemas, albums, keyInformation);
- contextModel.setKeyInformation(keyInformation);
- keyInformation.generateKeyInfo(contextModel);
-
- return contextModel;
- }
-
- /**
- * Creates the multi albums context model.
- *
- * @return the ax context model
- */
- public static AxContextModel createMultiAlbumsContextModel() {
- final AxContextSchema longSchema =
- new AxContextSchema(new AxArtifactKey("LongSchema", VERSION), JAVA_FLAVOUR, JAVA_LONG);
- final AxContextSchema lTypeSchema = new AxContextSchema(new AxArtifactKey("LTypeSchema", VERSION), JAVA_FLAVOUR,
- TestContextLongItem.class.getName());
- final AxContextSchema dateSchema = new AxContextSchema(new AxArtifactKey("DateSchema", VERSION), JAVA_FLAVOUR,
- TestContextDateLocaleItem.class.getName());
- final AxContextSchema mapSchema = new AxContextSchema(new AxArtifactKey("MapSchema", VERSION), JAVA_FLAVOUR,
- TestContextTreeMapItem.class.getName());
-
- final AxContextSchemas schemas = new AxContextSchemas(new AxArtifactKey(SCHEMAS2, VERSION));
- schemas.getSchemasMap().put(longSchema.getKey(), longSchema);
- schemas.getSchemasMap().put(lTypeSchema.getKey(), lTypeSchema);
- schemas.getSchemasMap().put(dateSchema.getKey(), dateSchema);
- schemas.getSchemasMap().put(mapSchema.getKey(), mapSchema);
-
- final AxContextAlbum longAlbumDefinition = new AxContextAlbum(new AxArtifactKey(LONG_CONTEXT_ALBUM, VERSION),
- APPLICATION, true, longSchema.getKey());
- final AxContextAlbum lTypeAlbumDefinition = new AxContextAlbum(new AxArtifactKey("LTypeContextAlbum", VERSION),
- APPLICATION, true, lTypeSchema.getKey());
- final AxContextAlbum dateAlbumDefinition = new AxContextAlbum(new AxArtifactKey(DATE_CONTEXT_ALBUM, VERSION),
- APPLICATION, true, dateSchema.getKey());
- final AxContextAlbum mapAlbumDefinition = new AxContextAlbum(new AxArtifactKey(MAP_CONTEXT_ALBUM, VERSION),
- APPLICATION, true, mapSchema.getKey());
-
- final AxContextAlbums albums = new AxContextAlbums(new AxArtifactKey(CONTEXT, VERSION));
- albums.getAlbumsMap().put(longAlbumDefinition.getKey(), longAlbumDefinition);
- albums.getAlbumsMap().put(lTypeAlbumDefinition.getKey(), lTypeAlbumDefinition);
- albums.getAlbumsMap().put(dateAlbumDefinition.getKey(), dateAlbumDefinition);
- albums.getAlbumsMap().put(mapAlbumDefinition.getKey(), mapAlbumDefinition);
-
- final AxKeyInformation keyInformation = new AxKeyInformation(new AxArtifactKey(KEY_INFO_MAP_KEY, VERSION));
- final AxContextModel contextModel = new AxContextModel(new AxArtifactKey("MultiAlbumsContextModel", VERSION),
- schemas, albums, keyInformation);
- contextModel.setKeyInformation(keyInformation);
- keyInformation.generateKeyInfo(contextModel);
-
- return contextModel;
- }
-
-}
diff --git a/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/factory/package-info.java b/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/factory/package-info.java
deleted file mode 100644
index 3d946eec1..000000000
--- a/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/factory/package-info.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * Modifications Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-/**
- * Contains factories for creating test context albums.
- *
- * @author Liam Fallon (liam.fallon@ericsson.com)
- */
-
-package org.onap.policy.apex.testsuites.integration.context.factory;
diff --git a/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/lock/modifier/AlbumModifier.java b/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/lock/modifier/AlbumModifier.java
deleted file mode 100644
index f9f94c980..000000000
--- a/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/lock/modifier/AlbumModifier.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * Copyright (C) 2018 Ericsson. All rights reserved.
- * Modifications Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.testsuites.integration.context.lock.modifier;
-
-import org.onap.policy.apex.context.ContextAlbum;
-import org.onap.policy.apex.context.ContextException;
-
-/**
- * The Interface AlbumModifier defines the interface to allow context albums be modified during context tests.
- */
-@FunctionalInterface
-public interface AlbumModifier {
-
- /**
- * Modify album.
- *
- * @param contextAlbum the context album
- * @param loopSize the loop size
- * @param arraySize the array size
- * @throws ContextException the context exception
- */
- void modifyAlbum(final ContextAlbum contextAlbum, final int loopSize, final int arraySize) throws ContextException;
-
-}
diff --git a/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/lock/modifier/LockType.java b/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/lock/modifier/LockType.java
deleted file mode 100644
index dc9cd94e7..000000000
--- a/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/lock/modifier/LockType.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * Copyright (C) 2018 Ericsson. All rights reserved.
- * Modifications Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.testsuites.integration.context.lock.modifier;
-
-import org.onap.policy.apex.context.ContextRuntimeException;
-
-/**
- * The Enum LockType defines the type of lock on a test context album.
- */
-public enum LockType {
-
- NO_LOCK(0) {
- @Override
- public AlbumModifier getAlbumModifier() {
- return NO_LOCK_MODIFER;
- }
- },
- READ_LOCK(1) {
- @Override
- public AlbumModifier getAlbumModifier() {
- return READ_LOCK_MODIFER;
- }
- },
- WRITE_LOCK(2) {
- @Override
- public AlbumModifier getAlbumModifier() {
- return WRITE_LOCK_MODIFER;
- }
- },
- WRITE_LOCK_SINGLE_VALUE_UPDATE(3) {
- @Override
- public AlbumModifier getAlbumModifier() {
- return WRITE_LOCK_SINGLE_VALUE_MODIFER;
- }
- };
-
- private static final AlbumModifier NO_LOCK_MODIFER = new NoLockAlbumModifier();
- private static final AlbumModifier READ_LOCK_MODIFER = new ReadLockAlbumModifier();
- private static final AlbumModifier WRITE_LOCK_MODIFER = new WriteLockAlbumModifier();
- private static final AlbumModifier WRITE_LOCK_SINGLE_VALUE_MODIFER = new SingleValueWriteLockAlbumModifier();
-
- private final int value;
-
- /**
- * Instantiates a new lock type.
- *
- * @param value the value
- */
- LockType(final int value) {
- this.value = value;
- }
-
- /**
- * Gets the value.
- *
- * @return the value
- */
- public int getValue() {
- return value;
- }
-
- /**
- * Get the lock type given an int value.
- * @param value the value of lock type
- * @return the lock type
- */
- public static LockType getLockType(final int value) {
- for (final LockType lockType : LockType.values()) {
- if (lockType.getValue() == value) {
- return lockType;
- }
- }
- throw new ContextRuntimeException("Invalid Lock type value: " + value);
- }
-
- /**
- * Gets the album modifier.
- *
- * @return the album modifier
- */
- public abstract AlbumModifier getAlbumModifier();
-
-}
diff --git a/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/lock/modifier/NoLockAlbumModifier.java b/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/lock/modifier/NoLockAlbumModifier.java
deleted file mode 100644
index 3f4bc45a4..000000000
--- a/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/lock/modifier/NoLockAlbumModifier.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * Copyright (C) 2018 Ericsson. All rights reserved.
- * Modifications Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.testsuites.integration.context.lock.modifier;
-
-import java.util.Random;
-import org.onap.policy.apex.context.ContextAlbum;
-import org.onap.policy.apex.context.test.concepts.TestContextLongItem;
-import org.slf4j.ext.XLogger;
-import org.slf4j.ext.XLoggerFactory;
-
-/**
- * The Class NoLockAlbumModifier implements a non lock context album.
- */
-public class NoLockAlbumModifier implements AlbumModifier {
- private static final XLogger LOGGER = XLoggerFactory.getXLogger(NoLockAlbumModifier.class);
-
- /**
- * {@inheritDoc}.
- */
- @Override
- public void modifyAlbum(final ContextAlbum contextAlbum, final int loopSize, final int arraySize) {
- final Random rand = new Random();
- for (int i = 0; i < loopSize; i++) {
- final String nextLongKey = Integer.toString(rand.nextInt(arraySize));
- final TestContextLongItem item = (TestContextLongItem) contextAlbum.get(nextLongKey);
- final long value = item.getLongValue();
- if (LOGGER.isTraceEnabled()) {
- LOGGER.trace("lock type={}, value={}", LockType.NO_LOCK, value);
- }
- }
- }
-
-}
diff --git a/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/lock/modifier/ReadLockAlbumModifier.java b/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/lock/modifier/ReadLockAlbumModifier.java
deleted file mode 100644
index 9d29c7dfe..000000000
--- a/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/lock/modifier/ReadLockAlbumModifier.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * Copyright (C) 2018 Ericsson. All rights reserved.
- * Modifications Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.testsuites.integration.context.lock.modifier;
-
-import java.util.Random;
-import org.onap.policy.apex.context.ContextAlbum;
-import org.onap.policy.apex.context.ContextException;
-import org.onap.policy.apex.context.test.concepts.TestContextLongItem;
-import org.slf4j.ext.XLogger;
-import org.slf4j.ext.XLoggerFactory;
-
-/**
- * The Class ReadLockAlbumModifier implements a read lock context album.
- */
-public class ReadLockAlbumModifier implements AlbumModifier {
- private static final XLogger LOGGER = XLoggerFactory.getXLogger(ReadLockAlbumModifier.class);
-
- /**
- * {@inheritDoc}.
- */
- @Override
- public void modifyAlbum(final ContextAlbum contextAlbum, final int loopSize, final int arraySize) {
- final Random rand = new Random();
- for (int i = 0; i < loopSize; i++) {
- final String nextLongKey = Integer.toString(rand.nextInt(arraySize));
- try {
- contextAlbum.lockForReading(nextLongKey);
- } catch (final ContextException e) {
- LOGGER.error("could not acquire read lock on context album, key=" + nextLongKey, e);
- continue;
- }
-
- final TestContextLongItem item = (TestContextLongItem) contextAlbum.get(nextLongKey);
- final long value = item.getLongValue();
- if (LOGGER.isTraceEnabled()) {
- LOGGER.trace("lock type={}, value={}", LockType.READ_LOCK, value);
- }
-
- try {
- contextAlbum.unlockForReading(nextLongKey);
- } catch (final ContextException e) {
- LOGGER.error("could not release read lock on context album, key=" + nextLongKey, e);
- }
- }
-
- }
-
-}
diff --git a/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/lock/modifier/SingleValueWriteLockAlbumModifier.java b/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/lock/modifier/SingleValueWriteLockAlbumModifier.java
deleted file mode 100644
index 1f6e399a9..000000000
--- a/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/lock/modifier/SingleValueWriteLockAlbumModifier.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * Copyright (C) 2018 Ericsson. All rights reserved.
- * Modifications Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.testsuites.integration.context.lock.modifier;
-
-import static org.onap.policy.apex.testsuites.integration.context.utils.Constants.TEST_VALUE;
-
-import org.onap.policy.apex.context.ContextAlbum;
-import org.onap.policy.apex.context.ContextException;
-import org.onap.policy.apex.context.test.concepts.TestContextLongItem;
-import org.slf4j.ext.XLogger;
-import org.slf4j.ext.XLoggerFactory;
-
-/**
- * The Class SingleValueWriteLockAlbumModifier implements a single value lock context album.
- */
-public class SingleValueWriteLockAlbumModifier implements AlbumModifier {
- private static final XLogger LOGGER = XLoggerFactory.getXLogger(SingleValueWriteLockAlbumModifier.class);
-
- /**
- * {@inheritDoc}.
- */
- @Override
- public void modifyAlbum(final ContextAlbum contextAlbum, final int loopSize, final int arraySize)
- throws ContextException {
- for (int i = 0; i < loopSize; i++) {
- try {
- contextAlbum.lockForWriting(TEST_VALUE);
- TestContextLongItem item = (TestContextLongItem) contextAlbum.get(TEST_VALUE);
- if (item != null) {
- long value = item.getLongValue();
- item.setLongValue(++value);
- } else {
- item = new TestContextLongItem(0L);
- }
- contextAlbum.put(TEST_VALUE, item);
- } finally {
- contextAlbum.unlockForWriting(TEST_VALUE);
- }
- }
-
- try {
- contextAlbum.lockForWriting(TEST_VALUE);
- final TestContextLongItem item = (TestContextLongItem) contextAlbum.get(TEST_VALUE);
- final long value = item.getLongValue();
- LOGGER.info("Value after modification: ", value);
- } catch (final Exception e) {
- LOGGER.error("could not read the value in the test context album", e);
- } finally {
- contextAlbum.unlockForWriting(TEST_VALUE);
- }
- }
-
-}
diff --git a/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/lock/modifier/WriteLockAlbumModifier.java b/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/lock/modifier/WriteLockAlbumModifier.java
deleted file mode 100644
index fbb4adbbe..000000000
--- a/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/lock/modifier/WriteLockAlbumModifier.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * Copyright (C) 2018 Ericsson. All rights reserved.
- * Modifications Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.testsuites.integration.context.lock.modifier;
-
-import java.util.Random;
-import org.onap.policy.apex.context.ContextAlbum;
-import org.onap.policy.apex.context.ContextException;
-import org.onap.policy.apex.context.test.concepts.TestContextLongItem;
-import org.slf4j.ext.XLogger;
-import org.slf4j.ext.XLoggerFactory;
-
-/**
- * The Class WriteLockAlbumModifier implements a write lock context album.
- */
-public class WriteLockAlbumModifier implements AlbumModifier {
- private static final XLogger LOGGER = XLoggerFactory.getXLogger(WriteLockAlbumModifier.class);
-
- /**
- * {@inheritDoc}.
- */
- @Override
- public void modifyAlbum(final ContextAlbum contextAlbum, final int loopSize, final int arraySize) {
- final Random rand = new Random();
- for (int i = 0; i < loopSize; i++) {
- final String nextLongKey = Integer.toString(rand.nextInt(arraySize));
- try {
- contextAlbum.lockForWriting(nextLongKey);
- } catch (final ContextException e) {
- LOGGER.error("could not acquire write lock on context album, key=" + nextLongKey, e);
- continue;
- }
-
- final TestContextLongItem item = (TestContextLongItem) contextAlbum.get(nextLongKey);
- long value = item.getLongValue();
- if (LOGGER.isTraceEnabled()) {
- LOGGER.trace("lock type={}, value={}", LockType.WRITE_LOCK, value);
- }
- item.setLongValue(++value);
- contextAlbum.put(nextLongKey, item);
-
- try {
- contextAlbum.unlockForWriting(nextLongKey);
- } catch (final ContextException e) {
- LOGGER.error("could not release write lock on context album, key=" + nextLongKey, e);
- }
- }
-
- }
-
-}
diff --git a/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/lock/modifier/package-info.java b/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/lock/modifier/package-info.java
deleted file mode 100644
index cf38edb7b..000000000
--- a/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/lock/modifier/package-info.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * Modifications Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-/**
- * Provides modifiers that allow the locking on a contest album to be modified in various ways.
- */
-
-package org.onap.policy.apex.testsuites.integration.context.lock.modifier;
diff --git a/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/locking/ConcurrentContext.java b/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/locking/ConcurrentContext.java
deleted file mode 100644
index 08ac654e1..000000000
--- a/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/locking/ConcurrentContext.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * Modifications Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.testsuites.integration.context.locking;
-
-import java.io.Closeable;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.TimeUnit;
-import org.onap.policy.apex.context.ContextAlbum;
-import org.onap.policy.apex.context.ContextException;
-import org.onap.policy.apex.context.Distributor;
-import org.onap.policy.apex.context.test.concepts.TestContextLongItem;
-import org.onap.policy.apex.model.basicmodel.concepts.ApexException;
-import org.onap.policy.apex.testsuites.integration.context.utils.ConfigrationProvider;
-import org.slf4j.ext.XLogger;
-import org.slf4j.ext.XLoggerFactory;
-
-/**
- * The Class TestConcurrentContext tests concurrent use of context.
- *
- * @author Liam Fallon (liam.fallon@ericsson.com)
- */
-public class ConcurrentContext {
- // Logger for this class
- private static final XLogger LOGGER = XLoggerFactory.getXLogger(ConcurrentContext.class);
-
- // The context distributor and map used by each test
- private Distributor contextDistributor = null;
- private ContextAlbum ltypeAlbum = null;
-
- private final ConfigrationProvider configrationProvider;
-
- public ConcurrentContext(final ConfigrationProvider configrationProvider) {
- this.configrationProvider = configrationProvider;
- }
-
- /**
- * The method tests concurrent use of context.
- *
- * @return the verified context
- * @throws ApexException the Apex exception occurs in handling Apex
- */
- public Map<String, TestContextLongItem> testConcurrentContext() throws ApexException {
-
- try {
- setupAndVerifyContext();
- } catch (final Exception exception) {
- LOGGER.error("Error occured while setting up and verifying concurrent context", exception);
- throw exception;
- }
-
- LOGGER.debug("starting JVMs and threads . . .");
-
- final ExecutorService executorService = configrationProvider.getExecutorService();
-
- final List<Closeable> tasks = new ArrayList<>(configrationProvider.getThreadCount());
-
- addShutDownHook(tasks);
-
- // Check if we have a single JVM or multiple JVMs
- if (configrationProvider.getJvmCount() == 1) {
- // Run everything in this JVM
- for (int t = 0; t < configrationProvider.getThreadCount(); t++) {
- final ConcurrentContextThread task = new ConcurrentContextThread(0, t, configrationProvider);
- tasks.add(task);
- executorService.execute(task);
- }
-
- } else {
- // Spawn JVMs to run the tests
- for (int j = 0; j < configrationProvider.getJvmCount(); j++) {
- final ConcurrentContextJvmThread task = new ConcurrentContextJvmThread(j, configrationProvider);
- tasks.add(task);
- executorService.execute(task);
- }
- }
-
- try {
- executorService.shutdown();
- // wait for threads to finish, if not Timeout
- executorService.awaitTermination(10, TimeUnit.MINUTES);
- } catch (final InterruptedException interruptedException) {
- LOGGER.error("Exception while waiting for threads to finish", interruptedException);
- // restore the interrupt status
- Thread.currentThread().interrupt();
- }
-
- LOGGER.info("Shutting down now ...");
- executorService.shutdownNow();
-
- return verifyAndClearContext();
- }
-
-
- private void addShutDownHook(final List<Closeable> tasks) {
- Runtime.getRuntime().addShutdownHook(new Thread() {
- @Override
- public void run() {
- LOGGER.info("Shutting down ...");
- for (final Closeable task : tasks) {
- try {
- task.close();
- } catch (final IOException ioException) {
- LOGGER.error("Unable to close task ... ", ioException);
- }
- }
- }
- });
- }
-
- /**
- * Setup and verify context.
- *
- * @throws ContextException the context exception
- */
- private void setupAndVerifyContext() {
- contextDistributor = configrationProvider.getDistributor();
- ltypeAlbum = configrationProvider.getContextAlbum(contextDistributor);
- final Map<String, Object> initValues = configrationProvider.getContextAlbumInitValues();
-
- for (final Entry<String, Object> entry : initValues.entrySet()) {
- ltypeAlbum.put(entry.getKey(), entry.getValue());
- }
- }
-
- private Map<String, TestContextLongItem> verifyAndClearContext() throws ContextException {
- final Map<String, TestContextLongItem> values = new HashMap<>();
- try {
-
- for (final Entry<String, Object> entry : ltypeAlbum.entrySet()) {
- values.put(entry.getKey(), (TestContextLongItem) entry.getValue());
- }
- } catch (final Exception exception) {
- LOGGER.error("Error: ", exception);
- }
- contextDistributor.clear();
- contextDistributor = null;
-
- return values;
- }
-}
diff --git a/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/locking/ConcurrentContextJvm.java b/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/locking/ConcurrentContextJvm.java
deleted file mode 100644
index 21a40d846..000000000
--- a/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/locking/ConcurrentContextJvm.java
+++ /dev/null
@@ -1,231 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * Modifications Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.testsuites.integration.context.locking;
-
-import com.google.gson.Gson;
-import java.net.InetAddress;
-import java.net.NetworkInterface;
-import java.net.SocketException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.List;
-import java.util.Map.Entry;
-import java.util.TreeSet;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-import org.onap.policy.apex.context.ContextAlbum;
-import org.onap.policy.apex.context.Distributor;
-import org.onap.policy.apex.model.basicmodel.concepts.ApexException;
-import org.onap.policy.apex.model.basicmodel.concepts.ApexRuntimeException;
-import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
-import org.onap.policy.apex.testsuites.integration.context.utils.ConfigrationProvider;
-import org.onap.policy.apex.testsuites.integration.context.utils.ConfigrationProviderImpl;
-import org.onap.policy.apex.testsuites.integration.context.utils.Constants;
-import org.onap.policy.common.parameters.ParameterGroup;
-import org.onap.policy.common.parameters.ParameterService;
-import org.slf4j.ext.XLogger;
-import org.slf4j.ext.XLoggerFactory;
-
-
-/**
- * The Class ConcurrentContextJVM tests concurrent use of context in a single JVM.
- *
- * @author Liam Fallon (liam.fallon@ericsson.com)
- */
-public final class ConcurrentContextJvm {
- // Logger for this class
- private static final XLogger LOGGER = XLoggerFactory.getXLogger(ConcurrentContextJvm.class);
-
- private static final int IPV4_ADDRESS_LENGTH = 4;
-
- private final int jvmNo;
-
- private final ExecutorService executorService;
-
- private final ConfigrationProvider configrationProvider;
-
- private ConcurrentContextJvm(final int jvmNo, final ConfigrationProvider configrationProvider) {
- this.jvmNo = jvmNo;
- this.configrationProvider = configrationProvider;
- final String name = configrationProvider.getTestName() + ":ConcurrentContextThread_" + jvmNo;
- this.executorService = configrationProvider.getExecutorService(name, configrationProvider.getThreadCount());
- }
-
- /**
- * This method executes the test of concurrent use of context in a single JVM.
- *
- * @throws ApexException the Apex exception occurs while running the test
- */
- public void execute() throws ApexException {
- LOGGER.debug("starting JVMs and threads . . .");
-
- final AxArtifactKey distributorKey = new AxArtifactKey("ApexDistributor" + jvmNo, "0.0.1");
- final Distributor distributor = configrationProvider.getDistributor(distributorKey);
- final ContextAlbum contextAlbum = configrationProvider.getContextAlbum(distributor);
- assert (contextAlbum != null);
-
- final List<Future<?>> tasks = new ArrayList<>(configrationProvider.getThreadCount());
-
- for (int t = 0; t < configrationProvider.getThreadCount(); t++) {
- tasks.add(executorService.submit(new ConcurrentContextThread(jvmNo, t, configrationProvider)));
- }
-
- try {
- executorService.shutdown();
- // wait for threads to finish, if not Timeout
- executorService.awaitTermination(10, TimeUnit.MINUTES);
- } catch (final InterruptedException interruptedException) {
- LOGGER.error("Exception while waiting for threads to finish", interruptedException);
- // restore the interrupt status
- Thread.currentThread().interrupt();
- }
-
- LOGGER.debug("threads finished, end value is {}", contextAlbum.get(Constants.TEST_VALUE));
-
- distributor.clear();
-
- LOGGER.info("Shutting down now ... ");
- executorService.shutdownNow();
- }
-
-
-
- /**
- * The main method.
- *
- * @param args the args
- * @throws Exception Any exception thrown by the test code
- */
- @SuppressWarnings("unchecked")
- public static void main(final String[] args) throws Exception {
- configure();
-
- LOGGER.info("JVM Arguments: " + Arrays.toString(args));
- // CHECKSTYLE:OFF: checkstyle:magicNumber
-
- // An even number of arguments greater than 3
- if (args.length < 9) {
- LOGGER.error("invalid arguments: " + Arrays.toString(args));
- LOGGER.error("usage: TestConcurrentContextJVM testType jvmNo threadCount threadLoops albumSize "
- + "lockType [parameterKey parameterJson].... ");
- return;
- }
-
-
- final String testName = getStringValue("testType", args, 0);
- final int jvmNo = getIntValue("jvmNo", args, 1);
- final int threadCount = getIntValue("threadCount", args, 2);
- final int threadLoops = getIntValue("threadLoops", args, 3);
- final int albumSize = getIntValue("albumSize", args, 4);
- final int lockType = getIntValue("lockType", args, 5);
- final String hazelCastfileLocation = getStringValue("hazelcast file location", args, 6);
-
- System.setProperty("hazelcast.config", hazelCastfileLocation);
-
- for (int p = 7; p < args.length - 1; p += 2) {
- @SuppressWarnings("rawtypes")
- final Class parametersClass = Class.forName(args[p]);
- final ParameterGroup parameters = (ParameterGroup) new Gson().fromJson(args[p + 1], parametersClass);
- ParameterService.register(parameters);
- }
-
- for (final Entry<String, ParameterGroup> parameterEntry : ParameterService.getAll()) {
- LOGGER.info("Parameter class " + parameterEntry.getKey() + "=" + parameterEntry.getValue().toString());
- }
-
- try {
- final ConfigrationProvider configrationProvider =
- new ConfigrationProviderImpl(testName, 1, threadCount, threadLoops, albumSize, lockType);
- final ConcurrentContextJvm concurrentContextJvm = new ConcurrentContextJvm(jvmNo, configrationProvider);
- concurrentContextJvm.execute();
-
- } catch (final Exception e) {
- LOGGER.error("error running test in JVM", e);
- }
- // CHECKSTYLE:ON: checkstyle:magicNumber
- }
-
- private static String getStringValue(final String key, final String[] args, final int position) {
- try {
- return args[position];
- } catch (final Exception e) {
- final String msg = "invalid argument " + key;
- LOGGER.error(msg, e);
- throw new ApexRuntimeException(msg, e);
- }
- }
-
- private static int getIntValue(final String key, final String[] args, final int position) {
- final String value = getStringValue(key, args, position);
- try {
- return Integer.parseInt(value);
- } catch (final Exception e) {
- final String msg = "Expects number found " + value;
- LOGGER.error(msg, e);
- throw new ApexRuntimeException(msg, e);
- }
- }
-
-
- /**
- * This method sets up any static configuration required by the JVM.
- *
- * @throws ApexException on configuration errors
- */
- public static void configure() throws ApexException {
- System.setProperty("java.net.preferIPv4Stack", "true");
- // The JGroups IP address must be set to a real (not loopback) IP address for Infinispan to
- // work. IN order to
- // ensure that all
- // the JVMs in a test pick up the same IP address, this function sets te address to be the
- // first non-loopback
- // IPv4 address
- // on a host
- final TreeSet<String> ipAddressSet = new TreeSet<>();
-
- Enumeration<NetworkInterface> nets;
- try {
- nets = NetworkInterface.getNetworkInterfaces();
- } catch (final SocketException e) {
- throw new ApexException("cound not get network interfaces for test", e);
- }
-
- for (final NetworkInterface netint : Collections.list(nets)) {
- final Enumeration<InetAddress> inetAddresses = netint.getInetAddresses();
- for (final InetAddress inetAddress : Collections.list(inetAddresses)) {
- // Look for real IPv4 Internet addresses
- if (!inetAddress.isLoopbackAddress() && inetAddress.getAddress().length == IPV4_ADDRESS_LENGTH) {
- ipAddressSet.add(inetAddress.getHostAddress());
- }
- }
- }
-
- if (ipAddressSet.isEmpty()) {
- throw new ApexException("cound not find real IP address for test");
- }
- LOGGER.info("Setting jgroups.tcp.address to: " + ipAddressSet.first());
- System.setProperty("jgroups.tcp.address", ipAddressSet.first());
- }
-}
diff --git a/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/locking/ConcurrentContextJvmThread.java b/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/locking/ConcurrentContextJvmThread.java
deleted file mode 100644
index b8717f0b6..000000000
--- a/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/locking/ConcurrentContextJvmThread.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * Modifications Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.testsuites.integration.context.locking;
-
-import com.google.gson.Gson;
-import java.io.BufferedReader;
-import java.io.Closeable;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map.Entry;
-import org.onap.policy.apex.testsuites.integration.context.utils.ConfigrationProvider;
-import org.onap.policy.common.parameters.ParameterGroup;
-import org.onap.policy.common.parameters.ParameterService;
-import org.slf4j.ext.XLogger;
-import org.slf4j.ext.XLoggerFactory;
-
-
-
-/**
- * The Class TestConcurrentContextThread tests concurrent use of context.
- *
- * @author Liam Fallon (liam.fallon@ericsson.com)
- */
-public class ConcurrentContextJvmThread implements Runnable, Closeable {
- // Logger for this class
- private static final XLogger LOGGER = XLoggerFactory.getXLogger(ConcurrentContextJvmThread.class);
-
- private final int jvm;
- private final ConfigrationProvider configrationProvider;
- private Process process = null;
-
- public ConcurrentContextJvmThread(final int jvm, final ConfigrationProvider configrationProvider) {
- this.jvm = jvm;
- this.configrationProvider = configrationProvider;
- }
-
- /**
- * {@inheritDoc}.
- */
- @Override
- public void run() {
- final List<String> commandList = new ArrayList<>();
- commandList.add(System.getProperty("java.home") + System.getProperty("file.separator") + "bin"
- + System.getProperty("file.separator") + "java");
- commandList.add("-Xms512m");
- commandList.add("-Xmx512m");
- commandList.add("-cp");
- commandList.add(System.getProperty("java.class.path"));
- commandList.add(ConcurrentContextJvm.class.getName());
- commandList.add(configrationProvider.getTestName());
- commandList.add(Integer.toString(jvm));
- commandList.add(Integer.toString(configrationProvider.getThreadCount()));
- commandList.add(Integer.toString(configrationProvider.getLoopSize()));
- commandList.add(Integer.toString(configrationProvider.getAlbumSize()));
- commandList.add(Integer.toString(configrationProvider.getLockType().getValue()));
- commandList.add(System.getProperty("hazelcast.config", ""));
-
- for (final Entry<String, ParameterGroup> parameterServiceEntry : ParameterService.getAll()) {
- commandList.add(parameterServiceEntry.getValue().getClass().getName());
- commandList.add(new Gson().toJson(parameterServiceEntry.getValue()));
- }
-
- LOGGER.info("starting JVM " + jvm);
-
- // Run the JVM
- final ProcessBuilder processBuilder = new ProcessBuilder(commandList);
- processBuilder.redirectErrorStream(true);
-
- try {
- process = processBuilder.start();
-
- final InputStream is = process.getInputStream();
- final InputStreamReader isr = new InputStreamReader(is);
- final BufferedReader br = new BufferedReader(isr);
- String line;
- LOGGER.info("JVM Output for command " + commandList + "\n");
- while ((line = br.readLine()) != null) {
- LOGGER.info(line);
- }
-
- waitForExitValue();
-
- } catch (final Exception ioException) {
- LOGGER.error("Error occured while writing JVM Output for command ", ioException);
- }
- }
-
- /**
- * Wait for an exit value from the the JVM.
- */
- private void waitForExitValue() {
- // Wait to get exit value
- try {
- final int exitValue = process.waitFor();
- LOGGER.info("\n\nJVM " + jvm + " finished, exit value is " + exitValue);
- } catch (final InterruptedException e) {
- LOGGER.warn("Thread was interrupted");
- Thread.currentThread().interrupt();
- }
- }
-
-
- @Override
- public void close() {
- LOGGER.info("Shutting down {} thread ...", Thread.currentThread().getName());
- if (process != null) {
- LOGGER.info("Destroying process ...");
- process.destroy();
- }
- }
-}
diff --git a/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/locking/ConcurrentContextThread.java b/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/locking/ConcurrentContextThread.java
deleted file mode 100644
index fcfe046b4..000000000
--- a/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/locking/ConcurrentContextThread.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * Modifications Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.testsuites.integration.context.locking;
-
-import java.io.Closeable;
-import org.onap.policy.apex.context.ContextAlbum;
-import org.onap.policy.apex.context.Distributor;
-import org.onap.policy.apex.context.parameters.ContextParameters;
-import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
-import org.onap.policy.apex.testsuites.integration.context.lock.modifier.AlbumModifier;
-import org.onap.policy.apex.testsuites.integration.context.utils.ConfigrationProvider;
-import org.slf4j.ext.XLogger;
-import org.slf4j.ext.XLoggerFactory;
-
-/**
- * The Class TestConcurrentContextThread tests concurrent use of context.
- *
- * @author Liam Fallon (liam.fallon@ericsson.com)
- */
-public class ConcurrentContextThread implements Runnable, Closeable {
- // Logger for this class
- private static final XLogger LOGGER = XLoggerFactory.getXLogger(ConcurrentContextThread.class);
- private final int jvm;
- private final int instance;
- private final ConfigrationProvider configrationProvider;
-
- /**
- * The Constructor.
- *
- * @param jvm the jvm
- * @param instance the instance
- * @param configrationProvider the configuration provider
- */
- public ConcurrentContextThread(final int jvm, final int instance, final ConfigrationProvider configrationProvider) {
- this.jvm = jvm;
- this.instance = instance;
- this.configrationProvider = configrationProvider;
-
- new ContextParameters();
- }
-
- /**
- * {@inheritDoc}.
- */
- @Override
- public void run() {
- LOGGER.info("running TestConcurrentContextThread_" + jvm + "_" + instance + " . . .");
-
-
- final AxArtifactKey distributorKey = new AxArtifactKey("ApexDistributor_" + jvm + "_" + instance, "0.0.1");
- final Distributor distributor = configrationProvider.getDistributor(distributorKey);
-
- try {
- final long startTime = System.currentTimeMillis();
- final ContextAlbum contextAlbum = configrationProvider.getContextAlbum(distributor);
-
- final AlbumModifier albumModifier = configrationProvider.getAlbumModifier();
- albumModifier.modifyAlbum(contextAlbum, configrationProvider.getLoopSize(),
- configrationProvider.getAlbumSize());
- LOGGER.info("Took {} ms to modify album", (System.currentTimeMillis() - startTime));
-
- } catch (final Exception e) {
- LOGGER.error("Unexpected error occured while processing", e);
- }
-
- LOGGER.info("finished TestConcurrentContextThread_" + jvm + "_" + instance + " . . .");
- }
-
- @Override
- public void close() {
- LOGGER.info("Shutting down {} thread ...", Thread.currentThread().getName());
- }
-}
diff --git a/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/locking/package-info.java b/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/locking/package-info.java
deleted file mode 100644
index ce32762d1..000000000
--- a/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/locking/package-info.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * Modifications Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-/**
- * Contains tests to check APEX context album distributed locking.
- *
- * @author Liam Fallon (liam.fallon@ericsson.com)
- */
-
-package org.onap.policy.apex.testsuites.integration.context.locking;
diff --git a/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/utils/ConfigrationProvider.java b/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/utils/ConfigrationProvider.java
deleted file mode 100644
index 2d21a1f8c..000000000
--- a/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/utils/ConfigrationProvider.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * Copyright (C) 2018 Ericsson. All rights reserved.
- * Modifications Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.testsuites.integration.context.utils;
-
-import java.util.Map;
-import java.util.concurrent.ExecutorService;
-import org.onap.policy.apex.context.ContextAlbum;
-import org.onap.policy.apex.context.ContextException;
-import org.onap.policy.apex.context.Distributor;
-import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
-import org.onap.policy.apex.testsuites.integration.context.lock.modifier.AlbumModifier;
-import org.onap.policy.apex.testsuites.integration.context.lock.modifier.LockType;
-
-/**
- * The Interface ConfigrationProvider provides the configuration for a context test to a context test executor.
- */
-public interface ConfigrationProvider {
-
- /**
- * Gets the test name.
- *
- * @return the test name
- */
- String getTestName();
-
- /**
- * Gets the loop size.
- *
- * @return the loop size
- */
- int getLoopSize();
-
- /**
- * Gets the thread count.
- *
- * @return the thread count
- */
- int getThreadCount();
-
- /**
- * Gets the jvm count.
- *
- * @return the jvm count
- */
- int getJvmCount();
-
- /**
- * Gets the album size.
- *
- * @return the album size
- */
- int getAlbumSize();
-
- /**
- * Gets the executor service.
- *
- * @return the executor service
- */
- ExecutorService getExecutorService();
-
- /**
- * Gets the executor service.
- *
- * @param threadFactoryName the thread factory name
- * @param threadPoolSize the thread pool size
- * @return the executor service
- */
- ExecutorService getExecutorService(final String threadFactoryName, final int threadPoolSize);
-
- /**
- * Gets the distributor.
- *
- * @param key the key
- * @return the distributor
- */
- Distributor getDistributor(final AxArtifactKey key);
-
- /**
- * Gets the distributor.
- *
- * @return the distributor
- */
- Distributor getDistributor();
-
- /**
- * Gets the context album.
- *
- * @param distributor the distributor
- * @return the context album
- */
- ContextAlbum getContextAlbum(final Distributor distributor);
-
- /**
- * Gets the context album.
- *
- * @param distributor the distributor
- * @param axContextAlbumKey the ax context album key
- * @param artifactKeys the artifact keys
- * @return the context album
- * @throws ContextException the context exception
- */
- ContextAlbum getContextAlbum(final Distributor distributor, AxArtifactKey axContextAlbumKey,
- AxArtifactKey[] artifactKeys) throws ContextException;
-
- /**
- * Gets the context album init values.
- *
- * @return the context album init values
- */
- Map<String, Object> getContextAlbumInitValues();
-
- /**
- * Gets the album modifier.
- *
- * @return the album modifier
- */
- AlbumModifier getAlbumModifier();
-
- /**
- * Gets the lock type.
- *
- * @return the lock type
- */
- LockType getLockType();
-
-}
diff --git a/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/utils/ConfigrationProviderImpl.java b/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/utils/ConfigrationProviderImpl.java
deleted file mode 100644
index 0b3ac82c2..000000000
--- a/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/utils/ConfigrationProviderImpl.java
+++ /dev/null
@@ -1,176 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * Copyright (C) 2018 Ericsson. All rights reserved.
- * Modifications Copyright (C) 2019 Nordix Foundation.
- * Modifications Copyright (C) 2021 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.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.testsuites.integration.context.utils;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import lombok.Getter;
-import lombok.ToString;
-import org.onap.policy.apex.context.ContextAlbum;
-import org.onap.policy.apex.context.ContextException;
-import org.onap.policy.apex.context.ContextRuntimeException;
-import org.onap.policy.apex.context.Distributor;
-import org.onap.policy.apex.context.impl.distribution.DistributorFactory;
-import org.onap.policy.apex.context.test.concepts.TestContextLongItem;
-import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
-import org.onap.policy.apex.model.contextmodel.concepts.AxContextModel;
-import org.onap.policy.apex.testsuites.integration.context.factory.TestContextAlbumFactory;
-import org.onap.policy.apex.testsuites.integration.context.lock.modifier.AlbumModifier;
-import org.onap.policy.apex.testsuites.integration.context.lock.modifier.LockType;
-import org.onap.policy.common.utils.validation.Assertions;
-
-/**
- * The Class ConfigrationProviderImpl provides configuration information for a context test back to the caller.
- */
-@Getter
-@ToString
-public class ConfigrationProviderImpl implements ConfigrationProvider {
-
- private final String testName;
- private final int jvmCount;
- private final int threadCount;
- private final int loopSize;
- private final int albumSize;
- private final LockType lockType;
-
- /**
- * The parameterized ConfigrationProviderImpl constructor.
- *
- * @param testType the test type
- * @param jvmCount the JVM count
- * @param threadCount the thread count
- * @param loopSize the size of loop
- * @param albumSize the size of album
- * @param lockType the lock type
- */
- public ConfigrationProviderImpl(final String testType, final int jvmCount, final int threadCount,
- final int loopSize, final int albumSize, final int lockType) {
- this.testName = testType;
- this.jvmCount = jvmCount;
- this.threadCount = threadCount;
- this.loopSize = loopSize;
- this.albumSize = albumSize;
- this.lockType = LockType.getLockType(lockType);
- }
-
- /**
- * {@inheritDoc}.
- */
- @Override
- public ExecutorService getExecutorService() {
- final String name = getThreadFactoryName(jvmCount, testName);
- final IntegrationThreadFactory threadFactory = new IntegrationThreadFactory(name);
- return Executors.newFixedThreadPool(threadCount, threadFactory);
- }
-
- /**
- * {@inheritDoc}.
- */
- @Override
- public ExecutorService getExecutorService(final String threadFactoryName, final int threadPoolSize) {
- final IntegrationThreadFactory threadFactory = new IntegrationThreadFactory(threadFactoryName);
- return Executors.newFixedThreadPool(threadPoolSize, threadFactory);
- }
-
- /**
- * {@inheritDoc}.
- */
- @Override
- public Distributor getDistributor(final AxArtifactKey key) {
- try {
- return new DistributorFactory().getDistributor(key);
- } catch (ContextException e) {
- throw new ContextRuntimeException("Unable to create Distributor", e);
- }
- }
-
- /**
- * {@inheritDoc}.
- */
- @Override
- public Distributor getDistributor() {
- final AxArtifactKey distributorKey = new AxArtifactKey("ApexDistributor", "0.0.1");
- return getDistributor(distributorKey);
- }
-
- /**
- * {@inheritDoc}.
- */
- @Override
- public ContextAlbum getContextAlbum(final Distributor distributor) {
- return getContextAlbum(distributor, Constants.L_TYPE_CONTEXT_ALBUM, Constants.getAxArtifactKeyArray());
- }
-
- /**
- * {@inheritDoc}.
- *[])
- */
- @Override
- public ContextAlbum getContextAlbum(final Distributor distributor, final AxArtifactKey axContextAlbumKey,
- final AxArtifactKey[] artifactKeys) {
- final AxContextModel axContextModel = TestContextAlbumFactory.createMultiAlbumsContextModel();
- try {
- distributor.registerModel(axContextModel);
- final ContextAlbum contextAlbum = distributor.createContextAlbum(axContextAlbumKey);
- Assertions.argumentNotNull(contextAlbum, "ContextAlbum should not be null");
- contextAlbum.setUserArtifactStack(artifactKeys);
- return contextAlbum;
- } catch (ContextException e) {
- throw new ContextRuntimeException("Unable to create ContextAlbum", e);
- }
- }
-
- /**
- * {@inheritDoc}.
- */
- @Override
- public Map<String, Object> getContextAlbumInitValues() {
- final Map<String, Object> values = new HashMap<>();
- for (int i = 0; i < albumSize; i++) {
- values.put(Integer.toString(i), new TestContextLongItem(0L));
- }
- return values;
- }
-
- /**
- * {@inheritDoc}.
- */
- @Override
- public AlbumModifier getAlbumModifier() {
- return lockType.getAlbumModifier();
- }
-
- /**
- * Gets the thread factory name.
- *
- * @param jvmCount the jvm count
- * @param testType the test type
- * @return the thread factory name
- */
- private String getThreadFactoryName(final int jvmCount, final String testType) {
- return jvmCount == 1 ? testType + ":TestConcurrentContextThread_0_"
- : testType + ":TestConcurrentContextJVMThread_";
- }
-}
diff --git a/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/utils/Constants.java b/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/utils/Constants.java
deleted file mode 100644
index a5eabd753..000000000
--- a/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/utils/Constants.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * Copyright (C) 2018 Ericsson. All rights reserved.
- * Modifications Copyright (C) 2019 Nordix Foundation.
- * Modifications Copyright (C) 2021 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.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.testsuites.integration.context.utils;
-
-import java.util.TimeZone;
-import lombok.AccessLevel;
-import lombok.NoArgsConstructor;
-import org.onap.policy.apex.context.test.concepts.TestPolicyContextItem;
-import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
-
-/**
- * The Class Constants provides constants for context tests.
- */
-@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class Constants {
- public static final String MAP_CONTEXT_ALBUM = "MapContextAlbum";
- public static final String LONG_CONTEXT_ALBUM = "LongContextAlbum";
- public static final String DATE_CONTEXT_ALBUM = "DateContextAlbum";
-
- public static final String EXTERNAL_CONTEXT_ALBUM = "ExternalContextAlbum";
- public static final String GLOBAL_CONTEXT_ALBUM = "GlobalContextAlbum";
- public static final String POLICY_CONTEXT_ALBUM = "PolicyContextAlbum";
-
- public static final String APEX_DISTRIBUTOR = "ApexDistributor";
- public static final String VERSION = "0.0.1";
- public static final int INT_VAL = 0xFFFFFFFF;
- public static final int INT_VAL_2 = 2000;
- public static final int INT_VAL_3 = -1;
- public static final String EXCEPTION_MESSAGE = "Test should throw an exception";
- public static final byte BYTE_VAL = (byte) 0xFF;
- public static final double PI_VAL = Math.PI;
- public static final float FLOAT_VAL = 3.14159265359F;
- public static final String EXTERNAL_CONTEXT = "externalContext";
- public static final String GLOBAL_CONTEXT_KEY = "globalContext";
- public static final String STRING_GLOBAL_VAL = "This is a global context string";
- public static final String STRING_VAL = "This is a policy context string";
- public static final String STRING_EXT_VAL = "This is an external context string";
- public static final long LONG_VAL = 0xFFFFFFFFFFFFFFFFL;
- public static final String TEST_POLICY_CONTEXT_ITEM = TestPolicyContextItem.class.getName();
- public static final TimeZone TIME_ZONE = TimeZone.getTimeZone("Europe/Dublin");
-
- public static final AxArtifactKey L_TYPE_CONTEXT_ALBUM = new AxArtifactKey("LTypeContextAlbum", VERSION);
- public static final String TEST_VALUE = "testValue";
-
- private static final AxArtifactKey KEY = new AxArtifactKey("testC-top", VERSION);
- private static final AxArtifactKey KEY3 = new AxArtifactKey("testC-bot", VERSION);
- private static final AxArtifactKey KEY2 = new AxArtifactKey("testC-next", VERSION);
-
- private static final AxArtifactKey[] USED_ARTIFACT_STACK_ARRAY = new AxArtifactKey[] {KEY, KEY2, KEY3};
-
- /**
- * Gets the ax artifact key array.
- *
- * @return the ax artifact key array
- */
- public static final AxArtifactKey[] getAxArtifactKeyArray() {
- return USED_ARTIFACT_STACK_ARRAY;
- }
-}
diff --git a/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/utils/IntegrationThreadFactory.java b/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/utils/IntegrationThreadFactory.java
deleted file mode 100644
index aba2d238a..000000000
--- a/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/utils/IntegrationThreadFactory.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * Copyright (C) 2018 Ericsson. All rights reserved.
- * Modifications Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.testsuites.integration.context.utils;
-
-import java.util.concurrent.ThreadFactory;
-import java.util.concurrent.atomic.AtomicInteger;
-import org.slf4j.ext.XLogger;
-import org.slf4j.ext.XLoggerFactory;
-
-/**
- * A factory for creating IntegrationThread objects.
- */
-public class IntegrationThreadFactory implements ThreadFactory {
- private static final XLogger LOGGER = XLoggerFactory.getXLogger(IntegrationThreadFactory.class);
-
-
- private final String threadFactoryName;
-
- private final AtomicInteger counter = new AtomicInteger();
-
- /**
- * Instantiates a new integration thread factory.
- *
- * @param threadFactoryName the thread factory name
- */
- public IntegrationThreadFactory(final String threadFactoryName) {
- this.threadFactoryName = threadFactoryName;
- }
-
- /**
- * {@inheritDoc}.
- */
- @Override
- public Thread newThread(final Runnable runnable) {
- final Thread thread = new Thread(runnable);
- thread.setName(threadFactoryName + "_" + counter.getAndIncrement());
- LOGGER.debug("started thread " + thread.getName());
- return thread;
- }
-}
diff --git a/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/utils/NetworkUtils.java b/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/utils/NetworkUtils.java
deleted file mode 100644
index a4a110659..000000000
--- a/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/utils/NetworkUtils.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * Copyright (C) 2018 Ericsson. All rights reserved.
- * Modifications Copyright (C) 2019 Nordix Foundation.
- * Modifications Copyright (C) 2021 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.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.testsuites.integration.context.utils;
-
-import java.net.InetAddress;
-import java.net.NetworkInterface;
-import java.net.SocketException;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.SortedSet;
-import java.util.TreeSet;
-import lombok.AccessLevel;
-import lombok.NoArgsConstructor;
-
-/**
- * The Class NetworkUtils contains some utility functions for getting network information for context tests.
- */
-@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class NetworkUtils {
-
- /**
- * The JGroups IP address must be set to a real (not loopback) IP address for Infinispan to work. In order to ensure
- * that all the JVMs in a test pick up the same IP address, this function sets the address to be the first
- * non-loopback IPv4 address on a host
- *
- * @return Set of IPv4 addresses
- * @throws SocketException throw socket exception if error occurs
- */
- public static SortedSet<String> getIPv4NonLoopAddresses() throws SocketException {
- final TreeSet<String> ipAddressSet = new TreeSet<>();
-
- final Enumeration<NetworkInterface> nets = NetworkInterface.getNetworkInterfaces();
- for (final NetworkInterface netint : Collections.list(nets)) {
- final Enumeration<InetAddress> inetAddresses = netint.getInetAddresses();
- for (final InetAddress inetAddress : Collections.list(inetAddresses)) {
- // Look for real IPv4 internet addresses
- if (!inetAddress.isLoopbackAddress() && inetAddress.getAddress().length == 4) {
- ipAddressSet.add(inetAddress.getHostAddress());
- }
- }
- }
- return ipAddressSet;
- }
-
-}
diff --git a/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/utils/ZooKeeperServerServiceProvider.java b/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/utils/ZooKeeperServerServiceProvider.java
deleted file mode 100644
index b562d984e..000000000
--- a/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/utils/ZooKeeperServerServiceProvider.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * Copyright (C) 2018 Ericsson. All rights reserved.
- * Modifications Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.testsuites.integration.context.utils;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.InetSocketAddress;
-import org.apache.zookeeper.server.NIOServerCnxnFactory;
-import org.apache.zookeeper.server.ZooKeeperServer;
-import org.onap.policy.apex.model.basicmodel.concepts.ApexException;
-import org.slf4j.ext.XLogger;
-import org.slf4j.ext.XLoggerFactory;
-
-/**
- * The Class ZooKeeperServerServiceProvider provides a zookeeper service to a caller.
- */
-public class ZooKeeperServerServiceProvider {
- private static final XLogger LOGGER = XLoggerFactory.getXLogger(ZooKeeperServerServiceProvider.class);
-
- private NIOServerCnxnFactory zookeeperFactory;
- private File zookeeperDirectory;
- private InetSocketAddress addr;
-
- /**
- * Instantiates a new zoo keeper server service provider.
- *
- * @param zookeeperDirectory the zookeeper directory
- * @param addr the addr
- */
- public ZooKeeperServerServiceProvider(final File zookeeperDirectory, final InetSocketAddress addr) {
- this.zookeeperDirectory = zookeeperDirectory;
- this.addr = addr;
- }
-
- /**
- * Instantiates a new zoo keeper server service provider.
- *
- * @param zookeeperDirectory the zookeeper directory
- * @param addr the addr
- * @param port the port
- */
- public ZooKeeperServerServiceProvider(final File zookeeperDirectory, final String addr, final int port) {
- this.zookeeperDirectory = zookeeperDirectory;
- this.addr = new InetSocketAddress(addr, port);
- }
-
- /**
- * Start the Zookeeper server.
- *
- * @throws ApexException on configuration errors
- */
- public void startZookeeperServer() throws ApexException {
- LOGGER.info("Starting up ZooKeeperServer using address: {} and port: {}", addr.getAddress(), addr.getPort());
-
- ZooKeeperServer server;
- try {
- server = new ZooKeeperServer(zookeeperDirectory, zookeeperDirectory, 5000);
- zookeeperFactory = new NIOServerCnxnFactory();
- zookeeperFactory.configure(addr, 100);
- } catch (final IOException ioe) {
- final String message = "exception on starting Zookeeper server";
- LOGGER.warn(message, ioe);
- throw new ApexException(message, ioe);
- }
-
- try {
- zookeeperFactory.startup(server);
- } catch (InterruptedException | IOException ie) {
- final String message = "Zookeeper server start failed";
- LOGGER.warn(message, ie);
- Thread.currentThread().interrupt();
- throw new ApexException(message, ie);
- }
-
- }
-
- /**
- * Stop the Zookeeper server.
- */
- public void stopZookeeperServer() {
- LOGGER.info("Stopping ZooKeeperServer for address: {} and port: {}", addr.getAddress(), addr.getPort());
- if (zookeeperFactory != null) {
- zookeeperFactory.shutdown();
- }
- }
-}
diff --git a/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/utils/package-info.java b/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/utils/package-info.java
deleted file mode 100755
index d195331a6..000000000
--- a/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/utils/package-info.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * Modifications Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-/**
- * Contains utilities for context tests.
- *
- * @author Liam Fallon (liam.fallon@ericsson.com)
- */
-
-package org.onap.policy.apex.testsuites.integration.context.utils;
diff --git a/testsuites/integration/integration-context-test/src/test/resources/hazelcast/hazelcast.xml b/testsuites/integration/integration-context-test/src/test/resources/hazelcast/hazelcast.xml
deleted file mode 100644
index f6f010c1b..000000000
--- a/testsuites/integration/integration-context-test/src/test/resources/hazelcast/hazelcast.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ============LICENSE_START=======================================================
- Copyright (C) 2016-2018 Ericsson. 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.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- SPDX-License-Identifier: Apache-2.0
- ============LICENSE_END=========================================================
--->
-
-<hazelcast xmlns="http://www.hazelcast.com/schema/config" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <group>
- <name>ApexHazelcastGroup</name>
- <password>ApexHazelcastGroupPassword</password>
- </group>
- <network>
- <port auto-increment="true">5706</port>
- <join>
- <multicast enabled="false">
- <multicast-group>224.2.2.10</multicast-group>
- <multicast-port>54327</multicast-port>
- </multicast>
- <tcp-ip enabled="true">
- <members>127.0.0.1</members>
- </tcp-ip>
- </join>
- <interfaces enabled="false">
- <!-- This value will allow hazelcast to run locally from the IDE -->
- <interface>127.0.0.*</interface>
- </interfaces>
- </network>
- <properties>
- <property name="hazelcast.icmp.enabled">false</property>
- <property name="hazelcast.logging.type">slf4j</property>
- <!-- disable the hazelcast shutdown hook - prefer to control the shutdown
- in code -->
- <property name="hazelcast.shutdownhook.enabled">false</property>
- <property name="hazelcast.graceful.shutdown.max.wait">60</property>
- <property name="hazelcast.operation.generic.thread.count">1</property>
- <property name="hazelcast.operation.thread.count">1</property>
- <property name="hazelcast.clientengine.thread.count">1</property>
- <property name="hazelcast.client.event.thread.count">1</property>
- <property name="hazelcast.event.thread.count">1</property>
- <property name="hazelcast.io.output.thread.count">1</property>
- <property name="hazelcast.io.thread.count">1</property>
- <property name="hazelcast.executor.client.thread.count">1</property>
- <property name="hazelcast.clientengine.thread.count">1</property>
- </properties>
- <executor-service>
- <pool-size>2</pool-size>
- </executor-service>
-</hazelcast>
diff --git a/testsuites/integration/integration-context-test/src/test/resources/infinispan/default-jgroups-tcp.xml b/testsuites/integration/integration-context-test/src/test/resources/infinispan/default-jgroups-tcp.xml
deleted file mode 100644
index 028cf1df6..000000000
--- a/testsuites/integration/integration-context-test/src/test/resources/infinispan/default-jgroups-tcp.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ============LICENSE_START=======================================================
- Copyright (C) 2016-2018 Ericsson. 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.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- SPDX-License-Identifier: Apache-2.0
- ============LICENSE_END=========================================================
--->
-
-<config xmlns="urn:org:jgroups"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:org:jgroups http://www.jgroups.org/schema/jgroups-4.0.xsd">
- <TCP bind_addr="${jgroups.tcp.address:127.0.0.1}"
- bind_port="${jgroups.tcp.port:7800}"
- enable_diagnostics="false"
- thread_naming_pattern="pl"
- send_buf_size="640k"
- sock_conn_timeout="300"
- bundler_type="no-bundler"
-
- thread_pool.min_threads="${jgroups.thread_pool.min_threads:0}"
- thread_pool.max_threads="${jgroups.thread_pool.max_threads:200}"
- thread_pool.keep_alive_time="60000"
- />
- <MPING bind_addr="${jgroups.tcp.address:127.0.0.1}"
- mcast_addr="${jgroups.mping.mcast_addr:228.2.4.6}"
- mcast_port="${jgroups.mping.mcast_port:43366}"
- ip_ttl="${jgroups.udp.ip_ttl:2}"
- />
- <MERGE3 min_interval="10000"
- max_interval="30000"
- />
- <FD_SOCK />
- <FD_ALL timeout="60000"
- interval="15000"
- timeout_check_interval="5000"
- />
- <VERIFY_SUSPECT timeout="5000" />
- <pbcast.NAKACK2 use_mcast_xmit="false"
- xmit_interval="100"
- xmit_table_num_rows="50"
- xmit_table_msgs_per_row="1024"
- xmit_table_max_compaction_time="30000"
- resend_last_seqno="true"
- />
- <UNICAST3 xmit_interval="100"
- xmit_table_num_rows="50"
- xmit_table_msgs_per_row="1024"
- xmit_table_max_compaction_time="30000"
- conn_expiry_timeout="0"
- />
- <pbcast.STABLE stability_delay="500"
- desired_avg_gossip="5000"
- max_bytes="1M"
- />
- <pbcast.GMS print_local_addr="false"
- install_view_locally_first="true"
- join_timeout="${jgroups.join_timeout:5000}"
- />
- <MFC max_credits="2m"
- min_threshold="0.40"
- />
- <FRAG3/>
-</config>
diff --git a/testsuites/integration/integration-context-test/src/test/resources/infinispan/default-jgroups-udp.xml b/testsuites/integration/integration-context-test/src/test/resources/infinispan/default-jgroups-udp.xml
deleted file mode 100644
index 79a3d0633..000000000
--- a/testsuites/integration/integration-context-test/src/test/resources/infinispan/default-jgroups-udp.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ============LICENSE_START=======================================================
- Copyright (C) 2016-2018 Ericsson. 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.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- SPDX-License-Identifier: Apache-2.0
- ============LICENSE_END=========================================================
--->
-
-<config
- xmlns="urn:org:jgroups"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:org:jgroups http://www.jgroups.org/schema/jgroups-4.0.xsd">
- <UDP
- mcast_addr="${jgroups.udp.mcast_addr:228.6.7.8}"
- mcast_port="${jgroups.udp.mcast_port:46655}"
- bind_port="${jgroups.udp.mcast.bind_port:63005}"
- bind_addr="${jgroups.udp.mcast.bind_addr:127.0.0.1}"
- ucast_send_buf_size="1m"
- mcast_send_buf_size="1m"
- ucast_recv_buf_size="20m"
- mcast_recv_buf_size="25m"
- ip_ttl="${jgroups.ip_ttl:2}"
- thread_naming_pattern="pl"
- enable_diagnostics="false"
- bundler_type="no-bundler"
- max_bundle_size="8500"
-
- thread_pool.min_threads="${jgroups.thread_pool.min_threads:0}"
- thread_pool.max_threads="${jgroups.thread_pool.max_threads:200}"
- thread_pool.keep_alive_time="60000" />
- <PING />
- <MERGE3
- min_interval="10000"
- max_interval="30000" />
- <FD_SOCK />
- <FD_SOCK
- bind_addr="${jgroups.udp.mcast.bind_addr:127.0.0.1}"
- sock_conn_timeout="60000"
- start_port="${jgroups.udp.fd.sock.start_port:63010}"
- port_range="1000" />
-
- <FD_ALL
- timeout="60000"
- interval="15000"
- timeout_check_interval="5000" />
- <VERIFY_SUSPECT timeout="5000" />
- <pbcast.NAKACK2
- xmit_interval="100"
- xmit_table_num_rows="50"
- xmit_table_msgs_per_row="1024"
- xmit_table_max_compaction_time="30000"
- resend_last_seqno="true" />
- <UNICAST3
- xmit_interval="100"
- xmit_table_num_rows="50"
- xmit_table_msgs_per_row="1024"
- xmit_table_max_compaction_time="30000"
- conn_expiry_timeout="0" />
- <pbcast.STABLE
- stability_delay="500"
- desired_avg_gossip="5000"
- max_bytes="1M" />
- <pbcast.GMS
- print_local_addr="false"
- install_view_locally_first="true"
- join_timeout="${jgroups.join_timeout:5000}" />
- <UFC
- max_credits="2m"
- min_threshold="0.40" />
- <MFC
- max_credits="2m"
- min_threshold="0.40" />
- <FRAG3 frag_size="8000" />
-</config>
diff --git a/testsuites/integration/integration-context-test/src/test/resources/infinispan/infinispan-context-test.xml b/testsuites/integration/integration-context-test/src/test/resources/infinispan/infinispan-context-test.xml
deleted file mode 100644
index 9fa7a2a14..000000000
--- a/testsuites/integration/integration-context-test/src/test/resources/infinispan/infinispan-context-test.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ============LICENSE_START=======================================================
- Copyright (C) 2016-2018 Ericsson. 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.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- SPDX-License-Identifier: Apache-2.0
- ============LICENSE_END=========================================================
--->
-
-<infinispan xmlns="urn:infinispan:config:8.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:infinispan:config:8.0 http://infinispan.org/schemas/infinispan-config-8.0.xsd">
- <jgroups>
- <stack-file name="tcpStack" path="infinispan/default-jgroups-tcp.xml" />
- </jgroups>
-
- <cache-container name="ApexCacheContainer" default-cache="LTypeContextAlbum_0.0.1">
- <transport cluster="apexCluster" stack="tcpStack" />
- <jmx />
- <replicated-cache name="LTypeContextAlbum_0.0.1" mode="SYNC" statistics="true">
- <state-transfer enabled="true" />
- </replicated-cache>
- </cache-container>
-</infinispan>