/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * Modifications Copyright (C) 2019-2020 Nordix Foundation.
+ * Modifications Copyright (C) 2019-2020, 2024 Nordix Foundation.
* Modifications Copyright (C) 2021-2022 Bell Canada. All rights reserved.
* Modifications Copyright (C) 2021 AT&T Intellectual Property. All rights reserved.
* ================================================================================
}
private void updateTaskBasedOnStateOutput(AxPolicyModel apexPolicyModel, Set<AxArtifactKey> updatedTasks,
- AxState state, AxArtifactKey taskKey, AxStateTaskReference taskRef, AxTask task) {
+ AxState state, AxArtifactKey taskKey, AxStateTaskReference taskRef,
+ AxTask task) {
Map<String, AxEvent> outputEvents = new TreeMap<>();
AxStateOutput stateOutput = null;
if (AxStateTaskOutputType.LOGIC.equals(taskRef.getStateTaskOutputType())) {
}
// Stop the engine if it is in state READY, if it is in state EXECUTING, wait for execution to finish
for (int increment = ApexEngineConstants.STOP_EXECUTION_WAIT_TIMEOUT; increment > 0;
- increment -= ApexEngineConstants.APEX_ENGINE_STOP_EXECUTION_WAIT_INCREMENT) {
+ increment -= ApexEngineConstants.APEX_ENGINE_STOP_EXECUTION_WAIT_INCREMENT) {
ThreadUtilities.sleep(ApexEngineConstants.APEX_ENGINE_STOP_EXECUTION_WAIT_INCREMENT);
synchronized (stateLockObj) {
switch (state) {
// Engine is OK to stop or has been stopped on return of an event
- case READY:
- case STOPPED:
+ case READY, STOPPED:
state = AxEngineState.STOPPED;
updateStatePrometheusMetric();
stateMachineHandler.stop();
String message = "execute(): triggered by event " + incomingEvent.toString();
LOGGER.debug(message);
- // By default we return a null event on errors
+ // By default, we return a null event on errors
Collection<EnEvent> outgoingEvents = null;
try {
engineStats.executionEnter(incomingEvent.getKey());
try {
synchronized (eventListeners) {
if (eventListeners.isEmpty()) {
- LOGGER.debug("handleEvent()<-{},{}, There is no listener registered to recieve outgoing event: {}",
+ LOGGER.debug("handleEvent()<-{},{}, There is no listener registered to receive outgoing event: {}",
key.getId(), state, outgoingEvents);
}
for (final EnEventListener axEventListener : eventListeners.values()) {
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * Modifications Copyright (C) 2019 Nordix Foundation.
+ * Modifications Copyright (C) 2019, 2024 Nordix Foundation.
* Modifications Copyright (C) 2021 Bell Canada. All rights reserved.
* Modifications Copyright (C) 2021 AT&T Intellectual Property. All rights reserved.
* ================================================================================
public Collection<EnEvent> execute(final long executionId, final Properties executionProperties,
final EnEvent incomingEvent) throws StateMachineException, ContextException {
// Check if there are any states on the state machine
- if (stateExecutorMap.size() == 0) {
+ if (stateExecutorMap.isEmpty()) {
throw new StateMachineException("no states defined on state machine");
}
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * Modifications Copyright (C) 2020-2021 Nordix Foundation.
+ * Modifications Copyright (C) 2020-2021, 2024 Nordix Foundation.
* Modifications Copyright (C) 2021 AT&T Intellectual Property. All rights reserved.
* Modifications Copyright (C) 2021 Bell Canada. All rights reserved.
* ================================================================================
/**
* Logger for state finalizer execution, state finalizer logic can use this field to access and log to Apex logging.
*/
- public final XLogger logger = EXCEUTION_LOGGER;
+ public static final XLogger logger = EXCEUTION_LOGGER;
// CHECKSTYLE:ON: checkstyle:visibilityModifier
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * Modifications Copyright (C) 2020 Nordix Foundation.
+ * Modifications Copyright (C) 2020, 2024 Nordix Foundation.
* Modifications Copyright (C) 2021 AT&T Intellectual Property. All rights reserved.
* Modifications Copyright (C) 2021 Bell Canada. All rights reserved.
* ================================================================================
/**
* Logger for task execution, task logic can use this field to access and log to Apex logging.
*/
- public final XLogger logger = EXECUTION_LOGGER;
+ public static final XLogger logger = EXECUTION_LOGGER;
// CHECKSTYLE:ON: checkstyle:VisibilityModifier
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * Modifications Copyright (C) 2020 Nordix Foundation.
+ * Modifications Copyright (C) 2020, 2024 Nordix Foundation.
* Modifications Copyright (C) 2021 AT&T Intellectual Property. All rights reserved.
* Modifications Copyright (C) 2021 Bell Canada. All rights reserved.
* ================================================================================
/**
* Logger for task selection execution, task selection logic can use this field to access and log to Apex logging.
*/
- public final XLogger logger = EXECUTION_LOGGER;
+ public static final XLogger logger = EXECUTION_LOGGER;
// CHECKSTYLE:ON: checkstyle:VisibilityModifier
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * Modifications Copyright (C) 2019-2020 Nordix Foundation.
+ * Modifications Copyright (C) 2019-2020, 2024 Nordix Foundation.
* Modifications Copyright (C) 2021 Bell Canada. All rights reserved.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
}
// Get the class for the executor using reflection
- Class<? extends Object> executorPluginClass = null;
+ Class<?> executorPluginClass;
try {
executorPluginClass = Class.forName(executorClassName);
} catch (final ClassNotFoundException e) {
- LOGGER.error("Apex executor class not found for executor plugin \"" + executorClassName + "\"", e);
+ LOGGER.error("Apex executor class not found for executor plugin \"{}\"", executorClassName, e);
throw new StateMachineException(
"Apex executor class not found for executor plugin \"" + executorClassName + "\"", e);
}
// Check the class is an executor
if (!Executor.class.isAssignableFrom(executorPluginClass)) {
- LOGGER.error("Specified Apex executor plugin class \"{}\" does not implment the Executor interface",
+ LOGGER.error("Specified Apex executor plugin class \"{}\" does not implement the Executor interface",
executorClassName);
throw new StateMachineException("Specified Apex executor plugin class \"" + executorClassName
- + "\" does not implment the Executor interface");
+ + "\" does not implement the Executor interface");
}
return (Class<Executor<?, ?, ?, ?>>) executorPluginClass;
* Get an instance of an executor plugin class of the specified type and super type.
*
* @param logicFlavour The logic flavour of the logic
- * @param executorClass The sub-class of the executor type to be instantiated
+ * @param executorClass The subclass of the executor type to be instantiated
* @param executorSuperClass The super type of the class of executor to be instantiated
* @return The instantiated class
*/
private Executor<?, ?, ?, ?> createExecutor(final String logicFlavour,
final Class<Executor<?, ?, ?, ?>> executorClass,
final Class<? extends Executor<?, ?, ?, ?>> executorSuperClass) {
- // It's OK for an executor class not to be defined but it's not all right to try and create
+ // It's OK for an executor class not to be defined, but it's not all right to try and create
// a non-defined
// executor class
if (executorClass == null) {
}
// Create an executor for the specified logic flavour
- Object executorObject = null;
+ Executor<?, ?, ?, ?> executorObject;
try {
executorObject = executorClass.getDeclaredConstructor().newInstance();
} catch (final Exception e) {
throw new StateMachineRuntimeException(errorMessage);
}
- return (Executor<?, ?, ?, ?>) executorObject;
+ return executorObject;
}
}
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2018 Ericsson. All rights reserved.
- * Modifications Copyright (C) 2020 Nordix Foundation.
+ * Modifications Copyright (C) 2020, 2024 Nordix Foundation.
* Modifications Copyright (C) 2021 AT&T Intellectual Property. All rights reserved.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
package org.onap.policy.apex.core.engine;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.onap.policy.apex.context.parameters.ContextParameters;
import org.onap.policy.common.parameters.ParameterService;
/**
* Test the executor parameters.
- *
*/
-public class EngineParametersTest {
+class EngineParametersTest {
@Test
- public void test() {
+ void test() {
EngineParameters pars = new EngineParameters();
pars.setName("Name");
assertEquals("Name", pars.getName());
}
@Test
- public void test_invalid() {
+ void test_invalid() {
EngineParameters pars = new EngineParameters();
pars.setName("Name");
assertEquals("Name", pars.getName());
/*-
* ============LICENSE_START=======================================================
- * Copyright (C) 2018 Ericsson. All rights reserved.
- * Modifications Copyright (C) 2021 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2018 Ericsson. All rights reserved.
+ * Modifications Copyright (C) 2021 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2024 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
package org.onap.policy.apex.core.engine;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.onap.policy.common.parameters.ParameterService;
/**
* Test the executor parameters.
- *
*/
-public class ExecutorParametersTest {
+class ExecutorParametersTest {
@Test
- public void test() {
+ void test() {
ExecutorParameters pars = new ExecutorParameters();
pars.setName("Name");
assertEquals("Name", pars.getName());
assertEquals("some.task.selection.executor.plugin.class", pars.getTaskSelectionExecutorPluginClass());
assertEquals("ExecutorParameters [name=Name, taskExecutorPluginClass=some.task.executor.plugin.class, "
- + "taskSelectionExecutorPluginClass=some.task.selection.executor.plugin.class, "
- + "stateFinalizerExecutorPluginClass=some.state.finalizer.plugin.class]", pars.toString());
+ + "taskSelectionExecutorPluginClass=some.task.selection.executor.plugin.class, "
+ + "stateFinalizerExecutorPluginClass=some.state.finalizer.plugin.class]", pars.toString());
assertThat(pars.validate().getResult()).isNull();
assertTrue(pars.validate().isValid());
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2018 Ericsson. All rights reserved.
- * Modifications Copyright (C) 2019-2020 Nordix Foundation.
+ * Modifications Copyright (C) 2019-2020, 2024 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
package org.onap.policy.apex.core.engine.context;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.onap.policy.apex.context.ContextException;
import org.onap.policy.apex.context.parameters.ContextParameterConstants;
import org.onap.policy.apex.context.parameters.DistributorParameters;
/**
* Test the Apex engine internal context class.
*/
-public class ApexInternalContextTest {
+class ApexInternalContextTest {
private AxPolicyModel policyModel;
private AxPolicyModel newVersionPolicyModel;
private AxPolicyModel newPolicyModel;
private AxContextAlbum album;
- private AxContextAlbum newAlbum;
private AxPolicyModel incompatiblePolicyModel;
/**
* Initialize parameters.
*/
- @Before
- public void registerParameters() {
+ @BeforeEach
+ void registerParameters() {
ParameterService.register(new SchemaParameters());
ParameterService.register(new DistributorParameters());
ParameterService.register(new LockManagerParameters());
/**
* Create policy model.
*/
- @Before
- public void createPolicyModels() {
+ @BeforeEach
+ void createPolicyModels() {
AxArtifactKey modelKey = new AxArtifactKey("PolicyModel:0.0.1");
policyModel = new AxPolicyModel(modelKey);
newPolicyModel.getSchemas().getSchemasMap().put(newSchemaKey, newSchema);
AxArtifactKey newAlbumKey = new AxArtifactKey("NewAlbum:0.0.1");
- newAlbum = new AxContextAlbum(newAlbumKey, "Policy", true, newSchemaKey);
+ AxContextAlbum newAlbum = new AxContextAlbum(newAlbumKey, "Policy", true, newSchemaKey);
newPolicyModel.getAlbums().getAlbumsMap().put(newAlbumKey, newAlbum);
}
/**
* Deregister parameters.
*/
- @After
- public void deregisterParameters() {
+ @AfterEach
+ void deregisterParameters() {
ParameterService.deregister(ContextParameterConstants.DISTRIBUTOR_GROUP_NAME);
ParameterService.deregister(ContextParameterConstants.LOCKING_GROUP_NAME);
ParameterService.deregister(ContextParameterConstants.PERSISTENCE_GROUP_NAME);
}
@Test
- public void testAlbumInit() throws ContextException {
+ void testAlbumInit() throws ContextException {
assertThatThrownBy(() -> new ApexInternalContext(null))
.hasMessage("internal context update failed, supplied model is null");
ApexInternalContext context = new ApexInternalContext(policyModel);
assertEquals(album.getId(), context.get(albumKey.getName(), albumKey.getVersion()).getKey().getId());
assertEquals(album.getId(), context.getAll(albumKey.getName()).iterator().next().getKey().getId());
assertEquals(album.getId(),
- context.getAll(albumKey.getName(), albumKey.getVersion()).iterator().next().getKey().getId());
+ context.getAll(albumKey.getName(), albumKey.getVersion()).iterator().next().getKey().getId());
context.clear();
assertEquals(1, context.getContextAlbums().size());
assertEquals("ApexInternalContext [contextAlbums={AxArtifactKey:(name=Album,version=0.0.1)",
- context.toString().substring(0, 76));
+ context.toString().substring(0, 76));
}
@Test
- public void testAlbumUpdate() throws ContextException {
+ void testAlbumUpdate() throws ContextException {
ApexInternalContext context = new ApexInternalContext(policyModel);
assertThatThrownBy(() -> context.update(null, false))
.hasMessage("internal context update failed, supplied model is null");
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2018 Ericsson. All rights reserved.
- * Modifications Copyright (C) 2019-2021, 2023 Nordix Foundation.
+ * Modifications Copyright (C) 2019-2021, 2023-2024 Nordix Foundation.
* Modifications Copyright (C) 2021 AT&T Intellectual Property. All rights reserved.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.awaitility.Awaitility.await;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import io.prometheus.client.CollectorRegistry;
import java.io.IOException;
import java.lang.reflect.Field;
import java.util.HashMap;
import java.util.concurrent.TimeUnit;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
import org.mockito.Mockito;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
import org.onap.policy.apex.context.parameters.ContextParameterConstants;
import org.onap.policy.apex.context.parameters.DistributorParameters;
import org.onap.policy.apex.context.parameters.LockManagerParameters;
/**
* Test the engine implementation.
*/
-@RunWith(MockitoJUnitRunner.class)
-public class ApexEngineImplTest {
+@ExtendWith(MockitoExtension.class)
+class ApexEngineImplTest {
private static final String ENGINE_ID = "Engine:0.0.1";
private AxPolicyModel policyModel;
/**
* Set up services.
*/
- @BeforeClass
- public static void setup() {
+ @BeforeAll
+ static void setup() {
ParameterService.register(new SchemaParameters());
ParameterService.register(new DistributorParameters());
ParameterService.register(new LockManagerParameters());
/**
* Set up mocking.
*/
- @Before
- public void initializeMocking() throws ApexException {
- Mockito.doThrow(new StateMachineException("mocked state machine exception",
- new IOException("nexted exception"))).when(smHandlerMock).execute(Mockito.any());
+ @BeforeEach
+ void initializeMocking() throws ApexException {
+ Mockito.lenient().doThrow(new StateMachineException("mocked state machine exception",
+ new IOException("nexted exception"))).when(smHandlerMock).execute(Mockito.any());
}
/**
* Create policy models.
*/
- @Before
- public void createPolicyModels() {
+ @BeforeEach
+ void createPolicyModels() {
AxArtifactKey modelKey = new AxArtifactKey("PolicyModel:0.0.1");
policyModel = new AxPolicyModel(modelKey);
/**
* Clear registrations.
*/
- @AfterClass
- public static void teardown() {
+ @AfterAll
+ static void teardown() {
ParameterService.deregister(ContextParameterConstants.SCHEMA_GROUP_NAME);
ParameterService.deregister(ContextParameterConstants.DISTRIBUTOR_GROUP_NAME);
ParameterService.deregister(ContextParameterConstants.LOCKING_GROUP_NAME);
}
@Test
- public void testSanity() throws ApexException {
+ void testSanity() throws ApexException {
AxArtifactKey engineKey = new AxArtifactKey(ENGINE_ID);
ApexEngineImpl engine = (ApexEngineImpl) new ApexEngineFactory().createApexEngine(engineKey);
assertNotNull(engine);
assertEquals(engineKey, engine.getKey());
assertThatThrownBy(engine::start).hasMessage("start()<-Engine:0.0.1,STOPPED, cannot start engine, "
- + "engine has not been initialized, its model is not loaded");
+ + "engine has not been initialized, its model is not loaded");
assertThatThrownBy(engine::stop)
.hasMessage("stop()<-Engine:0.0.1,STOPPED, cannot stop engine, " + "engine is already stopped");
}
@Test
- public void testListener() throws ApexException {
+ void testListener() throws ApexException {
AxArtifactKey engineKey = new AxArtifactKey(ENGINE_ID);
ApexEngineImpl engine = (ApexEngineImpl) new ApexEngineFactory().createApexEngine(engineKey);
}
@Test
- public void testEventKey() throws ApexException {
+ void testEventKey() throws ApexException {
AxArtifactKey engineKey = new AxArtifactKey(ENGINE_ID);
ApexEngineImpl engine = (ApexEngineImpl) new ApexEngineFactory().createApexEngine(engineKey);
engine.updateModel(policyModel, false);
}
@Test
- public void testState() throws InterruptedException, ApexException {
+ void testState() throws ApexException {
AxArtifactKey engineKey = new AxArtifactKey(ENGINE_ID);
ApexEngineImpl engine = (ApexEngineImpl) new ApexEngineFactory().createApexEngine(engineKey);
assertNotNull(engine);
assertEquals(AxEngineState.READY, engine.getState());
checkAxEngineStateMetric(AxEngineState.READY);
- assertEquals(AxEngineState.READY, engine.getState());
- checkAxEngineStateMetric(AxEngineState.READY);
-
AxArtifactKey eventKey = new AxArtifactKey("Event:0.0.1");
EnEvent event = engine.createEvent(eventKey);
assertEquals(eventKey, event.getKey());
- // 1 second is less than the 3 second wait on engine stopping
+ // 1 second is less than the 3 seconds wait on engine stopping
slowListener.setWaitTime(1000);
- (new Thread() {
- @Override
- public void run() {
- engine.handleEvent(event);
- }
- }).start();
+ (new Thread(() -> engine.handleEvent(event))).start();
await().atLeast(50, TimeUnit.MILLISECONDS).until(() -> engine.getState().equals(AxEngineState.EXECUTING));
assertEquals(AxEngineState.EXECUTING, engine.getState());
checkAxEngineStateMetric(AxEngineState.EXECUTING);
assertEquals(AxEngineState.READY, engine.getState());
checkAxEngineStateMetric(AxEngineState.READY);
- // 4 seconds is more than the 3 second wait on engine stopping
+ // 4 seconds is more than the 3 seconds wait on engine stopping
slowListener.setWaitTime(4000);
- (new Thread() {
- @Override
- public void run() {
- engine.handleEvent(event);
- }
- }).start();
+ (new Thread(() -> engine.handleEvent(event))).start();
await().atLeast(50, TimeUnit.MILLISECONDS).until(() -> engine.getState().equals(AxEngineState.EXECUTING));
assertEquals(AxEngineState.EXECUTING, engine.getState());
}
@Test
- public void testStateMachineError() throws InterruptedException, IllegalArgumentException, IllegalAccessException,
- NoSuchFieldException, SecurityException, ApexException {
+ void testStateMachineError() throws IllegalArgumentException, IllegalAccessException,
+ NoSuchFieldException, SecurityException, ApexException {
AxArtifactKey engineKey = new AxArtifactKey(ENGINE_ID);
ApexEngineImpl engine = (ApexEngineImpl) new ApexEngineFactory().createApexEngine(engineKey);
assertEquals(AxEngineState.READY, engine.getState());
checkAxEngineStateMetric(AxEngineState.READY);
- assertEquals(AxEngineState.READY, engine.getState());
- checkAxEngineStateMetric(AxEngineState.READY);
-
AxArtifactKey eventKey = new AxArtifactKey("Event:0.0.1");
EnEvent event = engine.createEvent(eventKey);
assertEquals(eventKey, event.getKey());
assertEquals(AxEngineState.STOPPED, engine.getState());
checkAxEngineStateMetric(AxEngineState.STOPPED);
Mockito.doThrow(new StateMachineException("mocked state machine exception",
- new IOException("nexted exception"))).when(smHandlerMock).start();
+ new IOException("nexted exception"))).when(smHandlerMock).start();
assertThatThrownBy(engine::start).hasMessage("updateModel()<-Engine:0.0.1, error starting the engine state "
- + "machines \"Engine:0.0.1\"");
+ + "machines \"Engine:0.0.1\"");
assertEquals(AxEngineState.STOPPED, engine.getState());
checkAxEngineStateMetric(AxEngineState.STOPPED);
}
@Test
- public void testStateMachineHandler() throws InterruptedException, IllegalArgumentException, IllegalAccessException,
- NoSuchFieldException, SecurityException, ApexException {
+ void testStateMachineHandler() throws IllegalArgumentException, IllegalAccessException,
+ NoSuchFieldException, SecurityException, ApexException {
AxArtifactKey engineKey = new AxArtifactKey(ENGINE_ID);
ApexEngineImpl engine = (ApexEngineImpl) new ApexEngineFactory().createApexEngine(engineKey);
assertNotNull(engine);
EnEvent event = engine.createEvent(eventKey);
assertEquals(eventKey, event.getKey());
+ assertEngineStopStartState(engine, event);
+
+ HashMap<AxEvent, StateMachineExecutor>
+ smExMap = getAxEventStateMachineExecutorHashMap(engine);
+
+ assertEquals(1, smExMap.size());
+ DummySmExecutor dummyExecutor = new DummySmExecutor(null, event.getKey());
+ smExMap.put(event.getAxEvent(), dummyExecutor);
+ ApexInternalContext internalContext = new ApexInternalContext(policyModelWithStates);
+ assertThatThrownBy(() -> dummyExecutor.setContext(null, null, internalContext))
+ .isInstanceOf(NullPointerException.class);
+
engine.stop();
assertEquals(AxEngineState.STOPPED, engine.getState());
checkAxEngineStateMetric(AxEngineState.STOPPED);
+ assertThatThrownBy(engine::start).hasMessageContaining("updateModel()<-Engine:0.0.1, error starting the "
+ + "engine state machines \"Engine:0.0.1\"");
assertEquals(AxEngineState.STOPPED, engine.getState());
checkAxEngineStateMetric(AxEngineState.STOPPED);
assertEquals(AxEngineState.READY, engine.getState());
checkAxEngineStateMetric(AxEngineState.READY);
+ // Works, Dummy executor fakes event execution
+ assertTrue(engine.handleEvent(event));
assertEquals(AxEngineState.READY, engine.getState());
checkAxEngineStateMetric(AxEngineState.READY);
- // Can't work, state is not fully defined
- assertFalse(engine.handleEvent(event));
- assertEquals(AxEngineState.READY, engine.getState());
- checkAxEngineStateMetric(AxEngineState.READY);
+ engine.stop();
+ assertEquals(AxEngineState.STOPPED, engine.getState());
+ checkAxEngineStateMetric(AxEngineState.STOPPED);
+
+ engine.clear();
+ assertEquals(AxEngineState.STOPPED, engine.getState());
+ checkAxEngineStateMetric(AxEngineState.STOPPED);
+ }
+ private static HashMap<AxEvent, StateMachineExecutor> getAxEventStateMachineExecutorHashMap(ApexEngineImpl engine)
+ throws NoSuchFieldException, IllegalAccessException {
final Field smHandlerField = engine.getClass().getDeclaredField("stateMachineHandler");
smHandlerField.setAccessible(true);
StateMachineHandler smHandler = (StateMachineHandler) smHandlerField.get(engine);
smExecutorMapField.setAccessible(true);
@SuppressWarnings("unchecked")
HashMap<AxEvent, StateMachineExecutor> smExMap = (HashMap<AxEvent, StateMachineExecutor>) smExecutorMapField
- .get(smHandler);
-
- assertEquals(1, smExMap.size());
- DummySmExecutor dummyExecutor = new DummySmExecutor(null, event.getKey());
- smExMap.put(event.getAxEvent(), dummyExecutor);
- ApexInternalContext internalContext = new ApexInternalContext(policyModelWithStates);
- assertThatThrownBy(() -> dummyExecutor.setContext(null, null, internalContext))
- .isInstanceOf(NullPointerException.class);
+ .get(smHandler);
+ return smExMap;
+ }
+ private void assertEngineStopStartState(ApexEngineImpl engine, EnEvent event) throws ApexException {
engine.stop();
assertEquals(AxEngineState.STOPPED, engine.getState());
checkAxEngineStateMetric(AxEngineState.STOPPED);
- assertThatThrownBy(engine::start).hasMessageContaining("updateModel()<-Engine:0.0.1, error starting the "
- + "engine state machines \"Engine:0.0.1\"");
- assertEquals(AxEngineState.STOPPED, engine.getState());
- checkAxEngineStateMetric(AxEngineState.STOPPED);
-
engine.start();
assertEquals(AxEngineState.READY, engine.getState());
checkAxEngineStateMetric(AxEngineState.READY);
- // Works, Dummy executor fakes event execution
- assertTrue(engine.handleEvent(event));
+ // Can't work, state is not fully defined
+ assertFalse(engine.handleEvent(event));
assertEquals(AxEngineState.READY, engine.getState());
checkAxEngineStateMetric(AxEngineState.READY);
-
- engine.stop();
- assertEquals(AxEngineState.STOPPED, engine.getState());
- checkAxEngineStateMetric(AxEngineState.STOPPED);
-
- engine.clear();
- assertEquals(AxEngineState.STOPPED, engine.getState());
- checkAxEngineStateMetric(AxEngineState.STOPPED);
}
private void checkAxEngineStateMetric(AxEngineState state) {
Double stateMetric = CollectorRegistry.defaultRegistry
- .getSampleValue("pdpa_engine_state", new String[]{"engine_instance_id"}, new String[]{ENGINE_ID});
+ .getSampleValue("pdpa_engine_state", new String[] {"engine_instance_id"}, new String[] {ENGINE_ID});
assertEquals(stateMetric.intValue(), state.getStateIdentifier());
}
}
\ No newline at end of file
* 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=========================================================
*/
/**
* Dummy engine event listener for unit test.
- *
*/
public class DummyEnEventListener implements EnEventListener {
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2018 Ericsson. All rights reserved.
+ * Modifications Copyright (C) 2024 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=========================================================
*/
/**
* Dummy engine event listener for unit test.
- *
*/
public class DummyListener implements EnEventListener {
* {@inheritDoc}.
*/
@Override
- public void onEnEvent(EnEvent enEvent) throws ApexException {
+ public void onEnEvent(EnEvent enEvent) {
// Do nothing
}
}
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2018 Ericsson. All rights reserved.
- * Modifications Copyright (C) 2019-2021 Nordix Foundation.
+ * Modifications Copyright (C) 2019-2021, 2024 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
package org.onap.policy.apex.core.engine.engine.impl;
+import lombok.Getter;
+import lombok.Setter;
import org.onap.policy.apex.core.engine.engine.EnEventListener;
import org.onap.policy.apex.core.engine.event.EnEvent;
-import org.onap.policy.apex.model.basicmodel.concepts.ApexException;
/**
* Dummy engine event listener for unit test.
* Thread.sleep is used to simulate a slow event listener.
- *
*/
+@Setter
+@Getter
public class DummySlowEnEventListener implements EnEventListener {
private long waitTime;
* {@inheritDoc}.
*/
@Override
- public void onEnEvent(EnEvent enEvent) throws ApexException {
+ public void onEnEvent(EnEvent enEvent) {
try {
Thread.sleep(waitTime);
} catch (InterruptedException ie) {
//Do nothing
}
}
-
- public long getWaitTime() {
- return waitTime;
- }
-
- public void setWaitTime(long waitTime) {
- this.waitTime = waitTime;
- }
}
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2018 Ericsson. All rights reserved.
- * Modifications Copyright (C) 2019 Nordix Foundation.
+ * Modifications Copyright (C) 2019, 2024 Nordix Foundation.
* Modifications Copyright (C) 2021 Bell Canada. All rights reserved.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* Constructor.
*
* @param executorFactory the factory for executors
- * @param owner the owner key
+ * @param owner the owner key
*/
public DummySmExecutor(ExecutorFactory executorFactory, AxArtifactKey owner) {
super(executorFactory, owner);
*/
@Override
public Collection<EnEvent> execute(final long executionId, final Properties executionProperties,
- final EnEvent incomingEvent) {
+ final EnEvent incomingEvent) {
return List.of(incomingEvent);
}
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2018 Ericsson. All rights reserved.
+ * Modifications Copyright (C) 2024 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.core.engine.event;
+import java.io.Serial;
import java.util.List;
import org.apache.commons.lang3.NotImplementedException;
import org.onap.policy.apex.model.basicmodel.concepts.AxConcept;
* Dummy Key Class.
*/
public class DummyAxKey extends AxKey {
+
+ @Serial
private static final long serialVersionUID = 964899169013353800L;
/**
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2018 Ericsson. All rights reserved.
- * Modifications Copyright (C) 2020-2021 Nordix Foundation
+ * Modifications Copyright (C) 2020-2021, 2024 Nordix Foundation
* Modifications Copyright (C) 2022 Bell Canada. All rights reserved.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
package org.onap.policy.apex.core.engine.event;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Map;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.onap.policy.apex.context.parameters.ContextParameterConstants;
import org.onap.policy.apex.context.parameters.SchemaParameters;
import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
/**
* Test the engine event class.
*/
-public class EnEventTest {
+class EnEventTest {
/**
* Set up the services.
*/
- @Before
- public void setupServices() {
+ @BeforeEach
+ void setupServices() {
ModelService.registerModel(AxContextSchemas.class, new AxContextSchemas());
ModelService.registerModel(AxEvents.class, new AxEvents());
ParameterService.register(new SchemaParameters());
/**
* Tear down the services.
*/
- @After
- public void teardownServices() {
+ @AfterEach
+ void teardownServices() {
ModelService.deregisterModel(AxContextSchema.class);
ModelService.deregisterModel(AxEvents.class);
ParameterService.deregister(ContextParameterConstants.SCHEMA_GROUP_NAME);
}
@Test
- public void testEnEvent() {
+ void testEnEvent() {
AxArtifactKey eventKey = new AxArtifactKey("Event:0.0.1");
assertThatThrownBy(() -> new EnEvent(eventKey))
.hasMessage("event definition is null or was not found in model service");
event.setExceptionMessage("Something happened");
assertEquals("Something happened", event.getExceptionMessage());
AxConcept[] usedArtifactStackArray =
- { eventKey };
+ {eventKey};
event.setUserArtifactStack(usedArtifactStackArray);
assertEquals(usedArtifactStackArray.length, event.getUserArtifactStack().length);
assertEquals("EnEvent [axEvent=AxEvent:(key=AxArtifactKey:(name=Event,version=0.0.1),nameSpace=a.name.space,"
- + "source=some source,target=some target,parameter={},toscaPolicyState=), "
- + "userArtifactStack=[AxArtifactKey:(name=Event,version=0.0.1)], map={}]", event.toString());
+ + "source=some source,target=some target,parameter={},toscaPolicyState=), "
+ + "userArtifactStack=[AxArtifactKey:(name=Event,version=0.0.1)], map={}]", event.toString());
assertThatThrownBy(() -> event.put(null, null))
.hasMessage("null keys are illegal on method parameter \"key\"");
assertThatThrownBy(() -> event.put("NonField", null))
}
@Test
- public void testAxEvent() {
+ void testAxEvent() {
AxArtifactKey eventKey = new AxArtifactKey("Event:0.0.1");
AxEvent axEvent = new AxEvent(eventKey, "a.name.space", "some source", "some target");
ModelService.getModel(AxEvents.class).getEventMap().put(eventKey, axEvent);
AxField axField = new AxField(fieldKey, fieldSchemaKey);
AxConcept[] usedArtifactStackArrayMultiple =
- { eventKey, fieldKey, new DummyAxKey() };
+ {eventKey, fieldKey, new DummyAxKey()};
event.setUserArtifactStack(usedArtifactStackArrayMultiple);
AxContextSchema schema = new AxContextSchema(fieldSchemaKey, "Java", "java.lang.Integer");
assertThatThrownBy(() -> event.put("MyField", "Hello"))
.hasMessage("Parent:0.0.1:MyParent:MyField: object \"Hello\" of class \"java.lang.String\" "
- + "not compatible with class \"java.lang.Integer\"");
+ + "not compatible with class \"java.lang.Integer\"");
event.put("MyField", 123);
assertEquals(123, event.get("MyField"));
- assertTrue(event.keySet().contains("MyField"));
- assertTrue(event.values().contains(123));
+ assertTrue(event.containsKey("MyField"));
+ assertTrue(event.containsValue(123));
assertEquals("MyField", event.entrySet().iterator().next().getKey());
event.putAll(event);
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2018 Ericsson. All rights reserved.
+ * Modifications Copyright (C) 2024 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.core.engine.event;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.IOException;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test the event exception class.
*/
-public class EnExceptionTest {
+class EnExceptionTest {
@Test
- public void testEnException() {
+ void testEnException() {
EnException ene = new EnException("Message");
assertEquals("Message", ene.getMessage());
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2018 Ericsson. All rights reserved.
- * Modifications Copyright (C) 2020 Nordix Foundation
+ * Modifications Copyright (C) 2020, 2024 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
package org.onap.policy.apex.core.engine.event;
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.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.onap.policy.apex.context.parameters.ContextParameterConstants;
import org.onap.policy.apex.context.parameters.SchemaParameters;
import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
/**
* Test the EnField class.
*/
-public class EnFieldTest {
+class EnFieldTest {
/**
* Set up the services.
*/
- @Before
- public void setupServices() {
+ @BeforeEach
+ void setupServices() {
AxContextSchemas schemas = new AxContextSchemas();
ModelService.registerModel(AxContextSchemas.class, schemas);
ParameterService.register(new SchemaParameters());
/**
* Tear down the services.
*/
- @After
- public void teardownServices() {
+ @AfterEach
+ void teardownServices() {
ModelService.deregisterModel(AxContextSchemas.class);
ParameterService.deregister(ContextParameterConstants.SCHEMA_GROUP_NAME);
}
@Test
- public void testEnField() {
+ void testEnField() {
AxReferenceKey fieldKey = new AxReferenceKey("Parent", "0.0.1", "MyParent", "MyField");
AxArtifactKey fieldSchemaKey = new AxArtifactKey("FieldSchema:0.0.1");
AxField axField = new AxField(fieldKey, fieldSchemaKey);
* 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=========================================================
*/
import java.util.Map;
import java.util.Properties;
import lombok.NoArgsConstructor;
+import lombok.Setter;
import org.onap.policy.apex.context.ContextException;
import org.onap.policy.apex.core.engine.executor.exception.StateMachineException;
public class DummyStateFinalizerExecutor extends StateFinalizerExecutor {
private boolean override;
+ @Setter
private boolean returnBad;
public DummyStateFinalizerExecutor(final boolean override) {
*/
@Override
public String execute(final long executionId, final Properties executionProperties,
- final Map<String, Object> newIncomingFields) throws StateMachineException, ContextException {
+ final Map<String, Object> newIncomingFields) throws StateMachineException, ContextException {
if (!override) {
super.execute(executionId, executionProperties, newIncomingFields);
}
}
- public void setReturnBad(boolean returnBad) {
- this.returnBad = returnBad;
- }
}
* {@inheritDoc}.
*/
@Override
- public Map<String, Map<String, Object>> execute(final long executionId, final Properties executionProperties,
- final Map<String, Object> newIncomingFields) throws StateMachineException, ContextException {
+ public Map<String, Map<String, Object>> execute(final long executionId, final Properties executionProperties,
+ final Map<String, Object> newIncomingFields)
+ throws StateMachineException, ContextException {
if (!override) {
super.execute(executionId, executionProperties, newIncomingFields);
}
*/
@Override
public AxArtifactKey execute(final long executionId, final Properties executionProperties,
- final EnEvent newIncomingEvent) throws StateMachineException, ContextException {
+ final EnEvent newIncomingEvent) throws StateMachineException, ContextException {
if (!override) {
return super.execute(executionId, executionProperties, newIncomingEvent);
}
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2018 Ericsson. All rights reserved.
- * Modifications Copyright (C) 2020, 2023 Nordix Foundation
+ * Modifications Copyright (C) 2020, 2023-2024 Nordix Foundation
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
package org.onap.policy.apex.core.engine.executor;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
import org.mockito.Mockito;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
import org.onap.policy.apex.core.engine.ExecutorParameters;
import org.onap.policy.apex.core.engine.context.ApexInternalContext;
import org.onap.policy.apex.core.engine.event.EnEvent;
/**
* Test task executor.
*/
-@RunWith(MockitoJUnitRunner.class)
-public class StateExecutorTest {
+@ExtendWith(MockitoExtension.class)
+class StateExecutorTest {
@Mock
private ApexInternalContext internalContextMock;
/**
* Set up mocking.
*/
- @Before
- public void startMocking() {
-
+ @BeforeEach
+ void startMocking() {
Mockito.doReturn(new AxReferenceKey("Policy:0.0.1:PolName:State0")).when(axStateMock).getKey();
}
@Test
- public void testStateExecutor() {
+ void testStateExecutor() {
StateExecutor executor = new StateExecutor(executorFactoryMock);
executor.setContext(null, axStateMock, internalContextMock);
assertEquals("Policy:0.0.1:PolName:State0", executor.getKey().getId());
- assertEquals(null, executor.getParent());
+ assertNull(executor.getParent());
assertEquals(internalContextMock, executor.getContext());
- assertEquals(null, executor.getNext());
- assertEquals(null, executor.getIncoming());
- assertEquals(null, executor.getOutgoing());
+ assertNull(executor.getNext());
+ assertNull(executor.getIncoming());
+ assertNull(executor.getOutgoing());
assertEquals(axStateMock, executor.getSubject());
executor.setParameters(new ExecutorParameters());
executor.setNext(nextExecutorMock);
assertEquals(nextExecutorMock, executor.getNext());
executor.setNext(null);
- assertEquals(null, executor.getNext());
+ assertNull(executor.getNext());
assertThatThrownBy(() -> executor.executePre(0, null, null))
.hasMessage("execution pre work not implemented on class");
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2018 Ericsson. All rights reserved.
- * Modifications Copyright (C) 2020, 2023 Nordix Foundation.
+ * Modifications Copyright (C) 2020, 2023-2024 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
package org.onap.policy.apex.core.engine.executor;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
import java.util.Map;
import java.util.Properties;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
import org.mockito.Mockito;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
import org.onap.policy.apex.context.ContextException;
import org.onap.policy.apex.core.engine.ExecutorParameters;
import org.onap.policy.apex.core.engine.context.ApexInternalContext;
/**
* Test task executor.
*/
-@RunWith(MockitoJUnitRunner.class)
-public class StateFinalizerExecutorTest {
+@ExtendWith(MockitoExtension.class)
+class StateFinalizerExecutorTest {
@Mock
private Executor<?, ?, ?, ?> parentMock;
/**
* Set up mocking.
*/
- @Before
- public void startMocking() {
+ @BeforeEach
+ void startMocking() {
AxState state = new AxState();
state.getStateOutputs().put("ValidOutput", null);
}
@Test
- public void testStateFinalizerExecutor() throws StateMachineException, ContextException {
+ void testStateFinalizerExecutor() throws StateMachineException, ContextException {
DummyStateFinalizerExecutor executor = new DummyStateFinalizerExecutor();
executor.setContext(parentMock, stateFinalizerLogicMock, internalContextMock);
assertEquals("State:0.0.1:StateName:StateSFL", executor.getKey().getId());
- assertEquals(null, executor.getExecutionContext());
+ assertNull(executor.getExecutionContext());
assertEquals(parentMock, executor.getParent());
assertEquals(internalContextMock, executor.getContext());
- assertEquals(null, executor.getNext());
- assertEquals(null, executor.getIncoming());
- assertEquals(null, executor.getOutgoing());
+ assertNull(executor.getNext());
+ assertNull(executor.getIncoming());
+ assertNull(executor.getOutgoing());
assertEquals(stateFinalizerLogicMock, executor.getSubject());
executor.setParameters(new ExecutorParameters());
executor.setNext(nextExecutorMock);
assertEquals(nextExecutorMock, executor.getNext());
executor.setNext(null);
- assertEquals(null, executor.getNext());
+ assertNull(executor.getNext());
assertThatThrownBy(executor::cleanUp)
.hasMessage("cleanUp() not implemented on class");
executor.getExecutionContext().setSelectedStateOutputName("ThisOutputDoesNotExist");
assertThatThrownBy(() -> executor.executePost(true))
.hasMessage("execute-post: state finalizer logic \"null\" selected output state "
- + "\"ThisOutputDoesNotExist\" that does not exsist on state \"NULL:0.0.0:NULL:NULL\"");
+ + "\"ThisOutputDoesNotExist\" that does not exsist on state \"NULL:0.0.0:NULL:NULL\"");
executor.executePre(0, new Properties(), incomingEvent);
executor.getExecutionContext().setSelectedStateOutputName("ValidOutput");
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2018 Ericsson. All rights reserved.
- * Modifications Copyright (C) 2020, 2023 Nordix Foundation.
+ * Modifications Copyright (C) 2020, 2023-2024 Nordix Foundation.
* Modifications Copyright (C) 2021 Bell Canada. All rights reserved.
* Modifications Copyright (C) 2021 AT&T Intellectual Property. All rights reserved.
* ================================================================================
package org.onap.policy.apex.core.engine.executor;
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.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.util.Collection;
import java.util.LinkedHashMap;
import java.util.Map;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
import org.mockito.Mockito;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
import org.onap.policy.apex.context.ContextException;
import org.onap.policy.apex.context.parameters.SchemaParameters;
import org.onap.policy.apex.core.engine.ExecutorParameters;
/**
* Test task executor.
*/
-@RunWith(MockitoJUnitRunner.class)
-public class StateMachineExecutorTest {
+@ExtendWith(MockitoExtension.class)
+class StateMachineExecutorTest {
@Mock
private ApexInternalContext internalContextMock;
@Mock
private EnEvent incomingEventMock;
- private AxPolicy axPolicy = new AxPolicy();
-
- private DummyTaskSelectExecutor dummyTsle;
+ private final AxPolicy axPolicy = new AxPolicy();
private DummyStateFinalizerExecutor dummySfle;
/**
* Set up mocking.
*/
- @Before
- public void startMocking() {
+ @BeforeEach
+ void startMocking() {
axPolicy.setKey(new AxArtifactKey("Policy:0.0.1"));
AxReferenceKey state0Key = new AxReferenceKey(axPolicy.getKey(), "state0");
event0.getParameterMap().put("Event1Field0", event1Field0Definition);
event0.getParameterMap().put("UnusedField", event1Field0Definition);
- Mockito.doReturn(event0Key).when(incomingEventMock).getKey();
- Mockito.doReturn(event0).when(incomingEventMock).getAxEvent();
+ Mockito.lenient().doReturn(event0Key).when(incomingEventMock).getKey();
+ Mockito.lenient().doReturn(event0).when(incomingEventMock).getAxEvent();
state0.setTrigger(event0Key);
state1.setTrigger(event1Key);
AxStateTaskReference str1 = new AxStateTaskReference(str1Key, AxStateTaskOutputType.LOGIC, sflKey);
state1.getTaskReferences().put(task1Key, str1);
- Mockito.doReturn(new DummyTaskExecutor(true)).when(executorFactoryMock).getTaskExecutor(Mockito.any(),
+ Mockito.lenient().doReturn(new DummyTaskExecutor(true)).when(executorFactoryMock).getTaskExecutor(Mockito.any(),
Mockito.any(), Mockito.any());
- dummyTsle = new DummyTaskSelectExecutor(true);
- Mockito.doReturn(dummyTsle).when(executorFactoryMock).getTaskSelectionExecutor(Mockito.any(),
+ DummyTaskSelectExecutor dummyTsle = new DummyTaskSelectExecutor(true);
+ Mockito.lenient().doReturn(dummyTsle).when(executorFactoryMock).getTaskSelectionExecutor(Mockito.any(),
Mockito.any(), Mockito.any());
dummySfle = new DummyStateFinalizerExecutor(true);
- Mockito.doReturn(dummySfle).when(executorFactoryMock).getStateFinalizerExecutor(Mockito.any(),
+ Mockito.lenient().doReturn(dummySfle).when(executorFactoryMock).getStateFinalizerExecutor(Mockito.any(),
Mockito.any(), Mockito.any());
}
- @After
- public void cleardown() {
+ @AfterEach
+ public void tearDown() {
ParameterService.clear();
ModelService.clear();
}
@Test
- public void testStateMachineExecutor() throws StateMachineException, ContextException {
+ void testStateMachineExecutor() throws StateMachineException, ContextException {
StateMachineExecutor executor =
new StateMachineExecutor(executorFactoryMock, new AxArtifactKey("OwnerKey:0.0.1"));
}
@Test
- public void testStateOutput() throws StateMachineException {
+ void testStateOutput() throws StateMachineException {
final StateOutput output =
new StateOutput(axPolicy.getStateMap().get("State0").getStateOutputs().get("stateOutput0"));
assertNotNull(output);
output.setEventFields(incomingFieldDefinitionMap, eventFieldMaps);
StateOutput outputCopy = new StateOutput(axPolicy.getStateMap().get("State0")
- .getStateOutputs().get("stateOutput0"));
+ .getStateOutputs().get("stateOutput0"));
EnEvent incomingEvent = new EnEvent(new AxArtifactKey("Event0:0.0.1"));
outputCopy.copyUnsetFields(incomingEvent);
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2018 Ericsson. All rights reserved.
- * Modifications Copyright (C) 2020, 2023 Nordix Foundation.
+ * Modifications Copyright (C) 2020, 2023-2024 Nordix Foundation.
* Modifications Copyright (C) 2021 Bell Canada. All rights reserved.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
package org.onap.policy.apex.core.engine.executor;
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.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
import java.util.TreeMap;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
import org.mockito.Mockito;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
import org.onap.policy.apex.context.ContextException;
import org.onap.policy.apex.core.engine.ExecutorParameters;
import org.onap.policy.apex.core.engine.TaskParameters;
import org.onap.policy.apex.model.policymodel.concepts.AxTaskParameter;
/**
- * Test task excutor.
+ * Test task executor.
*/
-@RunWith(MockitoJUnitRunner.class)
-public class TaskExecutorTest {
+@ExtendWith(MockitoExtension.class)
+class TaskExecutorTest {
@Mock
private AxTask axTaskMock;
@Mock
private AxTaskLogic taskLogicMock;
- private Map<String, AxField> inFieldMap;
private Map<String, AxField> outFieldMap;
private List<TaskParameters> taskParametersFromConfig;
- private Map<String, AxEvent> outEvents = new TreeMap<>();
+ private final Map<String, AxEvent> outEvents = new TreeMap<>();
/**
* Set up mocking.
*/
- @Before
- public void startMocking() {
+ @BeforeEach
+ void startMocking() {
AxArtifactKey task0Key = new AxArtifactKey("Task0:0.0.1");
- Mockito.doReturn(task0Key).when(axTaskMock).getKey();
- Mockito.doReturn(task0Key.getId()).when(axTaskMock).getId();
+ Mockito.lenient().doReturn(task0Key).when(axTaskMock).getKey();
+ Mockito.lenient().doReturn(task0Key.getId()).when(axTaskMock).getId();
- inFieldMap = Map.of("InField0", axInputFieldMock, "InField1", axOptionalInputFieldMock);
outFieldMap = new LinkedHashMap<>();
-
outFieldMap.put("OutField0", axOutputFieldMock);
outFieldMap.put("OutField1", axOptionalOutputFieldMock);
+ Map<String, AxField> inFieldMap = Map.of("InField0", axInputFieldMock, "InField1", axOptionalInputFieldMock);
AxEvent inEvent = new AxEvent();
inEvent.setParameterMap(inFieldMap);
AxEvent outEvent = new AxEvent(new AxArtifactKey("outputEvent:1.0.0"));
outEvents.put(outEvent.getKey().getName(), outEvent);
AxArtifactKey schemaKey = new AxArtifactKey("Schema:0.0.1");
- Mockito.doReturn(schemaKey).when(axInputFieldMock).getSchema();
- Mockito.doReturn(schemaKey).when(axOptionalInputFieldMock).getSchema();
- Mockito.doReturn(schemaKey).when(axMissingOutputFieldMock).getSchema();
+ Mockito.lenient().doReturn(schemaKey).when(axInputFieldMock).getSchema();
+ Mockito.lenient().doReturn(schemaKey).when(axOptionalInputFieldMock).getSchema();
+ Mockito.lenient().doReturn(schemaKey).when(axMissingOutputFieldMock).getSchema();
- Mockito.doReturn(true).when(axOptionalInputFieldMock).getOptional();
- Mockito.doReturn(false).when(axMissingOutputFieldMock).getOptional();
+ Mockito.lenient().doReturn(true).when(axOptionalInputFieldMock).getOptional();
+ Mockito.lenient().doReturn(false).when(axMissingOutputFieldMock).getOptional();
- Mockito.doReturn(taskLogicMock).when(axTaskMock).getTaskLogic();
+ Mockito.lenient().doReturn(taskLogicMock).when(axTaskMock).getTaskLogic();
- Mockito.doReturn(inEvent).when(axTaskMock).getInputEvent();
- Mockito.doReturn(outEvents).when(axTaskMock).getOutputEvents();
+ Mockito.lenient().doReturn(inEvent).when(axTaskMock).getInputEvent();
+ Mockito.lenient().doReturn(outEvents).when(axTaskMock).getOutputEvents();
- Mockito.doReturn(new AxArtifactKey("Context:0.0.1")).when(internalContextMock).getKey();
+ Mockito.lenient().doReturn(new AxArtifactKey("Context:0.0.1")).when(internalContextMock).getKey();
Map<String, AxTaskParameter> taskParameters = new HashMap<>();
taskParameters.put("parameterKey2", new AxTaskParameter(new AxReferenceKey(), "parameterOriginalValue2"));
}
@Test
- public void testTaskExecutor() throws StateMachineException, ContextException {
+ void testTaskExecutor() throws StateMachineException, ContextException {
final DummyTaskExecutor executor = new DummyTaskExecutor();
executor.setContext(null, axTaskMock, internalContextMock);
assertEquals("Task0:0.0.1", executor.getKey().getId());
- assertEquals(null, executor.getExecutionContext());
- assertEquals(null, executor.getParent());
+ assertNull(executor.getExecutionContext());
+ assertNull(executor.getParent());
assertEquals(internalContextMock, executor.getContext());
- assertEquals(null, executor.getNext());
- assertEquals(null, executor.getIncoming());
- assertEquals(null, executor.getOutgoing());
+ assertNull(executor.getNext());
+ assertNull(executor.getIncoming());
+ assertNull(executor.getOutgoing());
assertNotNull(executor.getSubject());
executor.setParameters(new ExecutorParameters());
executor.setNext(nextExecutorMock);
assertEquals(nextExecutorMock, executor.getNext());
executor.setNext(null);
- assertEquals(null, executor.getNext());
+ assertNull(executor.getNext());
- assertThatThrownBy(() -> executor.cleanUp()).hasMessageContaining("cleanUp() not implemented on class");
+ assertThatThrownBy(executor::cleanUp).hasMessageContaining("cleanUp() not implemented on class");
Mockito.doReturn(null).when(taskLogicMock).getLogic();
- assertThatThrownBy(() -> executor.prepare()).hasMessageContaining("task logic cannot be null.");
+ assertThatThrownBy(executor::prepare).hasMessageContaining("task logic cannot be null.");
Mockito.doReturn("some task logic").when(taskLogicMock).getLogic();
}
@Test
- public void testTaskExecutorForTaskParameters() {
- DummyTaskExecutor executorForParmeterTest = new DummyTaskExecutor(false);
+ void testTaskExecutorForTaskParameters() {
+ DummyTaskExecutor executorForParameterTest = new DummyTaskExecutor(false);
- executorForParmeterTest.setContext(null, axTaskMock, internalContextMock);
- executorForParmeterTest.updateTaskParameters(taskParametersFromConfig);
- assertNotNull(executorForParmeterTest.getSubject().getTaskParameters());
+ executorForParameterTest.setContext(null, axTaskMock, internalContextMock);
+ executorForParameterTest.updateTaskParameters(taskParametersFromConfig);
+ assertNotNull(executorForParameterTest.getSubject().getTaskParameters());
// taskId matched, parameter value updated with the new value
assertEquals("parameterNewValue0",
- executorForParmeterTest.getSubject().getTaskParameters().get("parameterKey0").getTaskParameterValue());
+ executorForParameterTest.getSubject().getTaskParameters().get("parameterKey0").getTaskParameterValue());
// taskId mismatch, so the parameter is not updated in the task
- assertNull(executorForParmeterTest.getSubject().getTaskParameters().get("parameterKey1"));
+ assertNull(executorForParameterTest.getSubject().getTaskParameters().get("parameterKey1"));
// taskId is not available, so parameter is updated in the task
assertEquals("parameterNewValue2",
- executorForParmeterTest.getSubject().getTaskParameters().get("parameterKey2").getTaskParameterValue());
+ executorForParameterTest.getSubject().getTaskParameters().get("parameterKey2").getTaskParameterValue());
}
}
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2018 Ericsson. All rights reserved.
- * Modifications Copyright (C) 2020, 2023 Nordix Foundation.
+ * Modifications Copyright (C) 2020, 2023-2024 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
package org.onap.policy.apex.core.engine.executor;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Properties;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
import org.mockito.Mockito;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
import org.onap.policy.apex.core.engine.ExecutorParameters;
import org.onap.policy.apex.core.engine.context.ApexInternalContext;
import org.onap.policy.apex.core.engine.event.EnEvent;
/**
* Test task executor.
*/
-@RunWith(MockitoJUnitRunner.class)
-public class TaskSelectExecutorTest {
+@ExtendWith(MockitoExtension.class)
+class TaskSelectExecutorTest {
@Mock
private AxState axStateMock;
/**
* Set up mocking.
*/
- @Before
- public void startMocking() {
+ @BeforeEach
+ void startMocking() {
AxReferenceKey state0Key = new AxReferenceKey("State0Parent:0.0.1:Parent:State0");
Mockito.doReturn(state0Key).when(axStateMock).getKey();
}
@Test
- public void testTaskSelectionExecutor() throws StateMachineException {
+ void testTaskSelectionExecutor() throws StateMachineException {
DummyTaskSelectExecutor executor = new DummyTaskSelectExecutor();
executor.setContext(null, axStateMock, internalContextMock);
assertEquals("State0Parent:0.0.1:Parent:State0", executor.getKey().getId());
- assertEquals(null, executor.getExecutionContext());
- assertEquals(null, executor.getParent());
+ assertNull(executor.getExecutionContext());
+ assertNull(executor.getParent());
assertEquals(internalContextMock, executor.getContext());
- assertEquals(null, executor.getNext());
- assertEquals(null, executor.getIncoming());
- assertEquals(null, executor.getOutgoing());
+ assertNull(executor.getNext());
+ assertNull(executor.getIncoming());
+ assertNull(executor.getOutgoing());
assertEquals(axStateMock, executor.getSubject());
executor.setParameters(new ExecutorParameters());
executor.setNext(nextExecutorMock);
assertEquals(nextExecutorMock, executor.getNext());
executor.setNext(null);
- assertEquals(null, executor.getNext());
+ assertNull(executor.getNext());
assertThatThrownBy(executor::cleanUp)
.hasMessage("cleanUp() not implemented on class");
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2018 Ericsson. All rights reserved.
- * Modifications Copyright (C) 2023 Nordix Foundation.
+ * Modifications Copyright (C) 2023-2024 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.core.engine.executor.context;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
import java.util.LinkedHashMap;
import java.util.Map;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
import org.mockito.Mockito;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
import org.onap.policy.apex.model.basicmodel.concepts.AxReferenceKey;
import org.onap.policy.apex.model.basicmodel.service.ModelService;
/**
* Test the state facade.
*/
-@RunWith(MockitoJUnitRunner.class)
-public class AxStateFacadeTest {
+@ExtendWith(MockitoExtension.class)
+class AxStateFacadeTest {
@Mock
private AxState axStateMock;
/**
* Set up mocking.
*/
- @Before
- public void startMocking() {
+ @BeforeEach
+ void startMocking() {
AxReferenceKey stateKey = new AxReferenceKey("StateParent:0.0.1:ParentName:StateName");
Mockito.doReturn(stateKey).when(axStateMock).getKey();
AxArtifactKey task0Key = new AxArtifactKey("Task0:0.0.1");
Mockito.doReturn(task0Key).when(axStateMock).getDefaultTask();
-
- Map<AxArtifactKey, Object> taskReferences = new LinkedHashMap<>();;
+
+ Map<AxArtifactKey, Object> taskReferences = new LinkedHashMap<>();
+ ;
taskReferences.put(task0Key, null);
Mockito.doReturn(taskReferences).when(axStateMock).getTaskReferences();
AxTasks tasks = new AxTasks();
tasks.getTaskMap().put(task0Key, axTaskMock);
-
+
ModelService.registerModel(AxTasks.class, tasks);
Mockito.doReturn(task0Key).when(axTaskMock).getKey();
}
@Test
- public void testAxStateFacade() {
+ void testAxStateFacade() {
AxStateFacade stateFacade = new AxStateFacade(axStateMock);
-
+
assertEquals("StateName", stateFacade.getStateName());
assertEquals("StateParent:0.0.1:ParentName:StateName", stateFacade.getId());
-
+
assertEquals("Task0", stateFacade.getDefaultTaskKey().getName());
assertNull(stateFacade.getTaskKey(null));
assertEquals("Task0", stateFacade.getTaskKey("Task0").getName());
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2018 Ericsson. All rights reserved.
- * Modifications Copyright (C) 2020, 2023 Nordix Foundation
+ * Modifications Copyright (C) 2020, 2023-2024 Nordix Foundation
* Modifications Copyright (C) 2021 Bell Canada. All rights reserved.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
package org.onap.policy.apex.core.engine.executor.context;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import java.util.Map;
import java.util.TreeMap;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
import org.mockito.Mockito;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
import org.onap.policy.apex.context.parameters.ContextParameterConstants;
import org.onap.policy.apex.context.parameters.SchemaParameters;
import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
/**
* Test the state facade.
*/
-@RunWith(MockitoJUnitRunner.class)
-public class AxTaskFacadeTest {
+@ExtendWith(MockitoExtension.class)
+class AxTaskFacadeTest {
@Mock
private AxTask axTaskMock;
/**
* Set up mocking.
*/
- @Before
- public void startMocking() {
+ @BeforeEach
+ void startMocking() {
AxContextSchemas schemas = new AxContextSchemas();
AxArtifactKey stringTypeKey = new AxArtifactKey("StringType:0.0.1");
ParameterService.register(new SchemaParameters());
}
- @After
- public void teardown() {
+ @AfterEach
+ void teardown() {
ParameterService.deregister(ContextParameterConstants.SCHEMA_GROUP_NAME);
ModelService.clear();
}
@Test
- public void testAxStateFacade() {
+ void testAxStateFacade() {
AxTaskFacade taskFacade = new AxTaskFacade(axTaskMock);
assertEquals("Task0", taskFacade.getTaskName());
assertThatThrownBy(() -> taskFacade.getInFieldSchemaHelper("InFieldDoesntExist"))
.hasMessage("no incoming field with name \"InFieldDoesntExist\" " + "defined on task "
- + "\"Task0:0.0.1\"");
+ + "\"Task0:0.0.1\"");
assertThatThrownBy(() -> taskFacade.getOutFieldSchemaHelper("OutFieldDoesntExist"))
.hasMessage("no outgoing field with name \"OutFieldDoesntExist\" " + "defined on task "
- + "\"Task0:0.0.1\"");
+ + "\"Task0:0.0.1\"");
assertNotNull(taskFacade.getInFieldSchemaHelper("InField0"));
assertNotNull(taskFacade.getOutFieldSchemaHelper("OutField0"));
assertThatThrownBy(() -> taskFacade.getInFieldSchemaHelper("InFieldBad"))
.hasMessage("schema helper cannot be created for task field \"InFieldBad\" "
- + "with key \"null\" with schema \"null\"");
+ + "with key \"null\" with schema \"null\"");
assertThatThrownBy(() -> taskFacade.getOutFieldSchemaHelper("OutFieldBad"))
.hasMessage("schema helper cannot be created for task field \"OutFieldBad\" "
- + "with key \"null\" with schema \"null\"");
+ + "with key \"null\" with schema \"null\"");
}
}
* ============LICENSE_START=======================================================
* Copyright (C) 2018 Ericsson. All rights reserved.
* Modifications Copyright (C) 2021 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2024 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
import lombok.AllArgsConstructor;
import org.apache.commons.lang3.NotImplementedException;
import org.onap.policy.apex.context.ContextAlbum;
-import org.onap.policy.apex.context.ContextException;
import org.onap.policy.apex.context.SchemaHelper;
import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
import org.onap.policy.apex.model.basicmodel.concepts.AxConcept;
* {@inheritDoc}.
*/
@Override
- public void lockForReading(String key) throws ContextException {
+ public void lockForReading(String key) {
throw new NotImplementedException("Not implemented on dummy class");
}
* {@inheritDoc}.
*/
@Override
- public void lockForWriting(String key) throws ContextException {
+ public void lockForWriting(String key) {
throw new NotImplementedException("Not implemented on dummy class");
}
* {@inheritDoc}.
*/
@Override
- public void unlockForReading(String key) throws ContextException {
+ public void unlockForReading(String key) {
throw new NotImplementedException("Not implemented on dummy class");
}
* {@inheritDoc}.
*/
@Override
- public void unlockForWriting(String key) throws ContextException {
+ public void unlockForWriting(String key) {
throw new NotImplementedException("Not implemented on dummy class");
}
* {@inheritDoc}.
*/
@Override
- public void flush() throws ContextException {
+ public void flush() {
throw new NotImplementedException("Not implemented on dummy class");
}
}
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2018 Ericsson. All rights reserved.
- * Modifications Copyright (C) 2020, 2023 Nordix Foundation
+ * Modifications Copyright (C) 2020, 2023-2024 Nordix Foundation
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
package org.onap.policy.apex.core.engine.executor.context;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.Map;
import java.util.Set;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
import org.mockito.Mockito;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
import org.onap.policy.apex.context.ContextAlbum;
import org.onap.policy.apex.core.engine.context.ApexInternalContext;
import org.onap.policy.apex.core.engine.executor.StateFinalizerExecutor;
/**
* Test Task Execution Context.
*/
-@RunWith(MockitoJUnitRunner.class)
-public class StateFinalizerExecutionContextTest {
+@ExtendWith(MockitoExtension.class)
+class StateFinalizerExecutionContextTest {
@Mock
private StateFinalizerExecutor stateFinalizerExecutorMock;
/**
* Set up mocking.
*/
- @Before
- public void startMocking() {
+ @BeforeEach
+ void startMocking() {
Set<AxArtifactKey> contextAlbumReferences = new LinkedHashSet<>();
contextAlbumReferences.add(new AxArtifactKey(("AlbumKey0:0.0.1")));
}
@Test
- public void test() {
+ void test() {
final Map<String, Object> fields = new LinkedHashMap<>();
final Set<String> stateOutputNames = new LinkedHashSet<>();
StateFinalizerExecutionContext sfec = new StateFinalizerExecutionContext(stateFinalizerExecutorMock, 0, null,
- axStateMock, fields, stateOutputNames, internalContextMock);
+ axStateMock, fields, stateOutputNames, internalContextMock);
assertNotNull(sfec);
sfec.setMessage("SFEC Message");
ContextAlbum contextAlbum = sfec.getContextAlbum("AlbumKey0");
assertEquals("AlbumKey0:0.0.1", contextAlbum.getKey().getId());
- assertThatThrownBy(() -> sfec.getContextAlbum("AlbumKeyNonExistant"))
- .hasMessage("cannot find definition of context album \"AlbumKeyNonExistant\" "
- + "on state \"Parent:0.0.1:ParentName:StateName\"");
+ assertThatThrownBy(() -> sfec.getContextAlbum("AlbumKeyNonExistent"))
+ .hasMessage("cannot find definition of context album \"AlbumKeyNonExistent\" "
+ + "on state \"Parent:0.0.1:ParentName:StateName\"");
}
}
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2018 Ericsson. All rights reserved.
- * Modifications Copyright (C) 2020, 2023 Nordix Foundation.
+ * Modifications Copyright (C) 2020, 2023-2024 Nordix Foundation.
* Modifications Copyright (C) 2021 Bell Canada. All rights reserved.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
package org.onap.policy.apex.core.engine.executor.context;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
import org.mockito.Mockito;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
import org.onap.policy.apex.context.ContextAlbum;
import org.onap.policy.apex.core.engine.context.ApexInternalContext;
import org.onap.policy.apex.core.engine.executor.TaskExecutor;
/**
* Test Task Execution Context.
*/
-@RunWith(MockitoJUnitRunner.class)
-public class TaskExecutionContextTest {
+@ExtendWith(MockitoExtension.class)
+class TaskExecutionContextTest {
@Mock
private TaskExecutor taskExecutorMock;
/**
* Set up mocking.
*/
- @Before
- public void startMocking() {
+ @BeforeEach
+ void startMocking() {
Set<AxArtifactKey> contextAlbumReferences = new LinkedHashSet<>();
contextAlbumReferences.add(new AxArtifactKey(("AlbumKey0:0.0.1")));
}
@Test
- public void test() {
+ void test() {
final Map<String, Object> inFields = new LinkedHashMap<>();
final List<Map<String, Object>> outFieldsList = new LinkedList<>();
assertEquals("parameterValue1", parameters.get("parameterKey1"));
assertEquals("parameterValue2", parameters.get("parameterKey2"));
- assertThatThrownBy(() -> tec.getContextAlbum("AlbumKeyNonExistant"))
- .hasMessageContaining("cannot find definition of context album \"AlbumKeyNonExistant\" on task \"null\"");
+ assertThatThrownBy(() -> tec.getContextAlbum("AlbumKeyNonExistent"))
+ .hasMessageContaining("cannot find definition of context album \"AlbumKeyNonExistent\" on task \"null\"");
}
}
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2018 Ericsson. All rights reserved.
- * Modifications Copyright (C) 2020, 2023 Nordix Foundation
+ * Modifications Copyright (C) 2020, 2023-2024 Nordix Foundation
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
package org.onap.policy.apex.core.engine.executor.context;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.Map;
import java.util.Set;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
import org.mockito.Mockito;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
import org.onap.policy.apex.context.ContextAlbum;
import org.onap.policy.apex.core.engine.context.ApexInternalContext;
import org.onap.policy.apex.core.engine.event.EnEvent;
/**
* Test Task Execution Context.
*/
-@RunWith(MockitoJUnitRunner.class)
-public class TaskSelectionExecutionContextTest {
+@ExtendWith(MockitoExtension.class)
+class TaskSelectionExecutionContextTest {
@Mock
private TaskSelectExecutor taskSelectExecutorMock;
/**
* Set up mocking.
*/
- @Before
- public void startMocking() {
+ @BeforeEach
+ void startMocking() {
Set<AxArtifactKey> contextAlbumReferences = new LinkedHashSet<>();
contextAlbumReferences.add(new AxArtifactKey(("AlbumKey0:0.0.1")));
}
@Test
- public void test() {
+ void test() {
final AxArtifactKey outgoingEventKey = new AxArtifactKey("OutEvent:0.0.1");
TaskSelectionExecutionContext tsec = new TaskSelectionExecutionContext(taskSelectExecutorMock, 0, axStateMock,
- incomingEventMock, outgoingEventKey, internalContextMock);
+ incomingEventMock, outgoingEventKey, internalContextMock);
assertNotNull(tsec);
tsec.setMessage("TSEC Message");
ContextAlbum contextAlbum = tsec.getContextAlbum("AlbumKey0");
assertEquals("AlbumKey0:0.0.1", contextAlbum.getKey().getId());
- assertThatThrownBy(() -> tsec.getContextAlbum("AlbumKeyNonExistant"))
- .hasMessage("cannot find definition of context album \"AlbumKeyNonExistant\" "
- + "on state \"Parent:0.0.1:ParentName:StateName\"");
+ assertThatThrownBy(() -> tsec.getContextAlbum("AlbumKeyNonExistent"))
+ .hasMessage("cannot find definition of context album \"AlbumKeyNonExistent\" "
+ + "on state \"Parent:0.0.1:ParentName:StateName\"");
}
}
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2018 Ericsson. All rights reserved.
+ * Modifications Copyright (C) 2024 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.core.engine.executor.exception;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.IOException;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test state machine runtime exception.
- *
*/
-public class StateMachineRuntimeExceptionTest {
+class StateMachineRuntimeExceptionTest {
@Test
- public void testException() {
+ void testException() {
StateMachineRuntimeException smre = new StateMachineRuntimeException("Exception Message");
assertEquals("Exception Message", smre.getMessage());
-
+
smre = new StateMachineRuntimeException("Exception Message", new IOException());
assertEquals("Exception Message", smre.getMessage());
}
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2018 Ericsson. All rights reserved.
- * Modifications Copyright (C) 2020, 2023 Nordix Foundation
+ * Modifications Copyright (C) 2020, 2023-2024 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
package org.onap.policy.apex.core.engine.executor.impl;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
import org.mockito.Mockito;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
import org.onap.policy.apex.core.engine.EngineParameters;
import org.onap.policy.apex.core.engine.ExecutorParameters;
import org.onap.policy.apex.core.engine.context.ApexInternalContext;
/**
* Test the executor factory implementation.
- *
*/
-@RunWith(MockitoJUnitRunner.class)
-public class ExceutorFactoryImplTest {
+@ExtendWith(MockitoExtension.class)
+class ExecutorFactoryImplTest {
@Mock
private ApexInternalContext internalContextMock;
/**
* Set up mocking.
*/
- @Before
- public void startMocking() {
+ @BeforeEach
+ void startMocking() {
- Mockito.doReturn(tslMock).when(stateMock).getTaskSelectionLogic();
- Mockito.doReturn("Dummy").when(tslMock).getLogicFlavour();
+ Mockito.lenient().doReturn(tslMock).when(stateMock).getTaskSelectionLogic();
+ Mockito.lenient().doReturn("Dummy").when(tslMock).getLogicFlavour();
- Mockito.doReturn(tlMock).when(taskMock).getTaskLogic();
- Mockito.doReturn("Dummy").when(tlMock).getLogicFlavour();
+ Mockito.lenient().doReturn(tlMock).when(taskMock).getTaskLogic();
+ Mockito.lenient().doReturn("Dummy").when(tlMock).getLogicFlavour();
- Mockito.doReturn("Dummy").when(sflMock).getLogicFlavour();
+ Mockito.lenient().doReturn("Dummy").when(sflMock).getLogicFlavour();
}
- @After
- public void clearPars() {
+ @AfterEach
+ void clearPars() {
ParameterService.clear();
}
@Test
- public void testExecutorFactoryImplGood() throws StateMachineException {
+ void testExecutorFactoryImplGood() throws StateMachineException {
setGoodPars();
- ExecutorFactoryImpl factory = null;
+ ExecutorFactoryImpl factory;
factory = new ExecutorFactoryImpl();
}
@Test
- public void testExecutorFactoryImplNonExistant() {
- setNonExistantPars();
+ void testExecutorFactoryImplNonExistent() {
+ setNonExistentPars();
- assertThatThrownBy(() -> new ExecutorFactoryImpl())
+ assertThatThrownBy(ExecutorFactoryImpl::new)
.hasMessage("Apex executor class not found for executor plugin "
- + "\"org.onap.policy.apex.core.engine.executor.BadTaskExecutor\"");
+ + "\"org.onap.policy.apex.core.engine.executor.BadTaskExecutor\"");
executorPars.setTaskExecutorPluginClass(null);
- assertThatThrownBy(() -> new ExecutorFactoryImpl())
+ assertThatThrownBy(ExecutorFactoryImpl::new)
.hasMessage("Apex executor class not found for executor plugin "
- + "\"org.onap.policy.apex.core.engine.executor.BadTaskSelectExecutor\"");
+ + "\"org.onap.policy.apex.core.engine.executor.BadTaskSelectExecutor\"");
executorPars.setTaskExecutorPluginClass("org.onap.policy.apex.core.engine.executor.DummyTaskExecutor");
- assertThatThrownBy(() -> new ExecutorFactoryImpl())
+ assertThatThrownBy(ExecutorFactoryImpl::new)
.hasMessage("Apex executor class not found for executor plugin "
- + "\"org.onap.policy.apex.core.engine.executor.BadTaskSelectExecutor\"");
+ + "\"org.onap.policy.apex.core.engine.executor.BadTaskSelectExecutor\"");
executorPars.setTaskSelectionExecutorPluginClass(
- "org.onap.policy.apex.core.engine.executor.DummyTaskSelectExecutor");
+ "org.onap.policy.apex.core.engine.executor.DummyTaskSelectExecutor");
- assertThatThrownBy(() -> new ExecutorFactoryImpl())
+ assertThatThrownBy(ExecutorFactoryImpl::new)
.hasMessage("Apex executor class not found for executor plugin "
- + "\"org.onap.policy.apex.core.engine.executor.BadStateFinalizerExecutor\"");
+ + "\"org.onap.policy.apex.core.engine.executor.BadStateFinalizerExecutor\"");
}
@Test
- public void testExecutorFactoryImplBad() {
+ void testExecutorFactoryImplBad() {
setBadPars();
- assertThatThrownBy(() -> new ExecutorFactoryImpl())
+ assertThatThrownBy(ExecutorFactoryImpl::new)
.hasMessage("Specified Apex executor plugin class \"java.lang.String\" "
- + "does not implment the Executor interface");
+ + "does not implement the Executor interface");
executorPars.setTaskExecutorPluginClass("org.onap.policy.apex.core.engine.executor.DummyTaskExecutor");
- assertThatThrownBy(() -> new ExecutorFactoryImpl())
+ assertThatThrownBy(ExecutorFactoryImpl::new)
.hasMessage("Specified Apex executor plugin class \"java.lang.String\" "
- + "does not implment the Executor interface");
+ + "does not implement the Executor interface");
executorPars.setTaskSelectionExecutorPluginClass(
- "org.onap.policy.apex.core.engine.executor.DummyTaskSelectExecutor");
+ "org.onap.policy.apex.core.engine.executor.DummyTaskSelectExecutor");
- assertThatThrownBy(() -> new ExecutorFactoryImpl())
+ assertThatThrownBy(ExecutorFactoryImpl::new)
.hasMessage("Specified Apex executor plugin class \"java.lang.String\" "
- + "does not implment the Executor interface");
+ + "does not implement the Executor interface");
}
@Test
- public void testExecutorFactoryCreateErrors() throws StateMachineException {
+ void testExecutorFactoryCreateErrors() throws StateMachineException {
setGoodPars();
executorPars.setTaskExecutorPluginClass(null);
assertThatThrownBy(() -> factory.getTaskExecutor(null, taskMock, internalContextMock))
.hasMessage("Executor plugin class not defined for \"Dummy\" executor of type "
- + "\"org.onap.policy.apex.core.engine.executor.TaskExecutor\"");
+ + "\"org.onap.policy.apex.core.engine.executor.TaskExecutor\"");
executorPars.setTaskExecutorPluginClass("org.onap.policy.apex.core.engine.executor.DummyFailingTaskExecutor");
ExecutorFactoryImpl factoryInitError = new ExecutorFactoryImpl();
assertThatThrownBy(() -> factoryInitError.getTaskExecutor(null, taskMock, internalContextMock))
.hasMessage("Instantiation error on \"Dummy\" executor of type "
- + "\"org.onap.policy.apex.core.engine.executor.DummyFailingTaskExecutor\"");
+ + "\"org.onap.policy.apex.core.engine.executor.DummyFailingTaskExecutor\"");
executorPars.setTaskExecutorPluginClass(
- "org.onap.policy.apex.core.engine.executor.DummyStateFinalizerExecutor");
+ "org.onap.policy.apex.core.engine.executor.DummyStateFinalizerExecutor");
ExecutorFactoryImpl factoryDummyError = new ExecutorFactoryImpl();
assertThatThrownBy(() -> factoryDummyError.getTaskExecutor(null, taskMock, internalContextMock))
.hasMessage("Executor on \"Dummy\" "
- + "of type \"class org.onap.policy.apex.core.engine.executor.DummyStateFinalizerExecutor\""
- + " is not an instance of \"org.onap.policy.apex.core.engine.executor.TaskExecutor\"");
+ + "of type \"class org.onap.policy.apex.core.engine.executor.DummyStateFinalizerExecutor\""
+ + " is not an instance of \"org.onap.policy.apex.core.engine.executor.TaskExecutor\"");
}
/**
executorPars = new ExecutorParameters();
executorPars.setTaskExecutorPluginClass("org.onap.policy.apex.core.engine.executor.DummyTaskExecutor");
executorPars.setTaskSelectionExecutorPluginClass(
- "org.onap.policy.apex.core.engine.executor.DummyTaskSelectExecutor");
+ "org.onap.policy.apex.core.engine.executor.DummyTaskSelectExecutor");
executorPars.setStateFinalizerExecutorPluginClass(
- "org.onap.policy.apex.core.engine.executor.DummyStateFinalizerExecutor");
+ "org.onap.policy.apex.core.engine.executor.DummyStateFinalizerExecutor");
EngineParameters enginePars = new EngineParameters();
enginePars.getExecutorParameterMap().put("Dummy", executorPars);
}
/**
- * Set up non existant parameters.
+ * Set up non existent parameters.
*/
- private void setNonExistantPars() {
+ private void setNonExistentPars() {
executorPars = new ExecutorParameters();
executorPars.setTaskExecutorPluginClass("org.onap.policy.apex.core.engine.executor.BadTaskExecutor");
executorPars.setTaskSelectionExecutorPluginClass(
- "org.onap.policy.apex.core.engine.executor.BadTaskSelectExecutor");
+ "org.onap.policy.apex.core.engine.executor.BadTaskSelectExecutor");
executorPars.setStateFinalizerExecutorPluginClass(
- "org.onap.policy.apex.core.engine.executor.BadStateFinalizerExecutor");
+ "org.onap.policy.apex.core.engine.executor.BadStateFinalizerExecutor");
EngineParameters enginePars = new EngineParameters();
enginePars.getExecutorParameterMap().put("Dummy", executorPars);
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * Modifications Copyright (C) 2020 Nordix Foundation.
+ * Modifications Copyright (C) 2020, 2024 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
package org.onap.policy.apex.core.infrastructure.threading;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.util.ArrayList;
import java.util.List;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.slf4j.ext.XLogger;
import org.slf4j.ext.XLoggerFactory;
*
* @author Liam Fallon (liam.fallon@ericsson.com)
*/
-public class ThreadingTest {
+class ThreadingTest {
private static final String LOCAL_NAME = "localName";
// Logger for this class
* Test thread factory initialization.
*/
@Test
- public void testThreadFactoryInitialization() {
+ void testThreadFactoryInitialization() {
final ApplicationThreadFactory objUnderTest = new ApplicationThreadFactory(LOCAL_NAME, 0);
- assertNotNull("Failed to create ApplicationThreadFactory threadFactory0", objUnderTest);
+ assertNotNull(objUnderTest, "Failed to create ApplicationThreadFactory threadFactory0");
logger.debug(objUnderTest.toString());
- assertTrue("Failed to name ApplicationThreadFactory threadFactory0",
- objUnderTest.getName().startsWith("Apex-" + LOCAL_NAME));
+ assertTrue(objUnderTest.getName().startsWith("Apex-" + LOCAL_NAME),
+ "Failed to name ApplicationThreadFactory threadFactory0");
final ApplicationThreadFactory objUnderTest1 = new ApplicationThreadFactory(LOCAL_NAME, 0);
- assertNotNull("Failed to create ApplicationThreadFactory threadFactory1", objUnderTest1);
+ assertNotNull(objUnderTest1, "Failed to create ApplicationThreadFactory threadFactory1");
logger.debug(objUnderTest1.toString());
- assertTrue("Failed to name ApplicationThreadFactory threadFactory1",
- objUnderTest1.getName().startsWith("Apex-" + LOCAL_NAME));
+ assertTrue(objUnderTest1.getName().startsWith("Apex-" + LOCAL_NAME),
+ "Failed to name ApplicationThreadFactory threadFactory1");
testThreadFactory(objUnderTest);
testThreadFactory(objUnderTest1);
Code Review / policy / apex-pdp.git / commitdiff