summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--core/core-deployment/src/main/java/org/onap/policy/apex/core/deployment/BatchDeployer.java48
-rw-r--r--core/core-deployment/src/main/java/org/onap/policy/apex/core/deployment/EngineServiceFacade.java164
-rw-r--r--core/core-deployment/src/test/java/org/onap/policy/apex/core/deployment/BatchDeployerTest.java94
-rw-r--r--core/core-deployment/src/test/java/org/onap/policy/apex/core/deployment/DummyDeploymentClient.java21
-rw-r--r--core/core-deployment/src/test/java/org/onap/policy/apex/core/deployment/EngineServiceFacadeTest.java77
-rw-r--r--core/core-deployment/src/test/java/org/onap/policy/apex/core/deployment/PeriodicEventManagerTest.java108
-rw-r--r--core/core-engine/src/test/java/org/onap/policy/apex/core/engine/executor/TaskSelectExecutorTest.java6
-rw-r--r--model/engine-model/src/test/java/org/onap/policy/apex/model/enginemodel/concepts/EngineModelTest.java55
-rw-r--r--model/engine-model/src/test/java/org/onap/policy/apex/model/enginemodel/concepts/EngineStatsTest.java39
-rw-r--r--model/engine-model/src/test/java/org/onap/policy/apex/model/enginemodel/handling/ApexEngineModelTest.java9
-rw-r--r--model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/concepts/EventModelTest.java30
-rw-r--r--model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/concepts/EventsTest.java39
-rw-r--r--model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/concepts/FieldTest.java24
-rw-r--r--model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/handling/ApexEventModelTest.java13
-rw-r--r--model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiContextAlbumTest.java104
-rw-r--r--model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiContextSchemaTest.java82
-rw-r--r--model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiEventTest.java126
-rw-r--r--model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiKeyInfoTest.java64
-rw-r--r--model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiPolicyTest.java803
-rw-r--r--model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiTaskTest.java372
-rw-r--r--model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexModelApiTest.java56
-rw-r--r--model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/LogicTest.java30
-rw-r--r--model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/PoliciesTest.java38
-rw-r--r--model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/PolicyModelTest.java54
-rw-r--r--model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/StateOutputTest.java20
-rw-r--r--model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/StateTaskReferenceTest.java25
-rw-r--r--model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/StateTest.java50
-rw-r--r--model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/TaskParameterTest.java20
-rw-r--r--model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/TasksTest.java10
29 files changed, 1267 insertions, 1314 deletions
diff --git a/core/core-deployment/src/main/java/org/onap/policy/apex/core/deployment/BatchDeployer.java b/core/core-deployment/src/main/java/org/onap/policy/apex/core/deployment/BatchDeployer.java
index 6ec19fcfa..517deeb57 100644
--- a/core/core-deployment/src/main/java/org/onap/policy/apex/core/deployment/BatchDeployer.java
+++ b/core/core-deployment/src/main/java/org/onap/policy/apex/core/deployment/BatchDeployer.java
@@ -1,6 +1,7 @@
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2016-2018 Ericsson. All rights reserved.
+ * Modifications Copyright (C) 2020 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -28,11 +29,13 @@ import org.slf4j.ext.XLogger;
import org.slf4j.ext.XLoggerFactory;
/**
- * The Class {@link BatchDeployer} deploys an Apex model held as an XML or Json file onto an Apex engine. It uses the
- * EngDep protocol to communicate with the engine, with the EngDep protocol being carried on Java web sockets.
+ * The Class {@link BatchDeployer} deploys an Apex model held as an XML or Json
+ * file onto an Apex engine. It uses the EngDep protocol to communicate with the
+ * engine, with the EngDep protocol being carried on Java web sockets.
*
- * <p>This deployer is a simple command line deployer that reads the communication parameters and the location of the
- * Apex model file as arguments.
+ * <p>This deployer is a simple command line deployer that reads the
+ * communication parameters and the location of the Apex model file as
+ * arguments.
*
* @author Liam Fallon (liam.fallon@ericsson.com)
*/
@@ -51,8 +54,8 @@ public class BatchDeployer {
/**
* Instantiates a new deployer.
*
- * @param hostName the apex host name
- * @param port the apex EngDep port
+ * @param hostName the apex host name
+ * @param port the apex EngDep port
* @param outputStream the output stream
*/
public BatchDeployer(final String hostName, final int port, final PrintStream outputStream) {
@@ -63,7 +66,8 @@ public class BatchDeployer {
}
/**
- * Initializes the deployer, opens an EngDep communication session with the Apex engine.
+ * Initializes the deployer, opens an EngDep communication session with the Apex
+ * engine.
*
* @throws ApexDeploymentException thrown on deployment and communication errors
*/
@@ -72,8 +76,7 @@ public class BatchDeployer {
engineServiceFacade.init();
} catch (final ApexException e) {
final String errorMessage = "model deployment failed on parameters " + hostName + " " + port;
- LOGGER.error(errorMessage, e);
- throw new ApexDeploymentException(errorMessage);
+ throw new ApexDeploymentException(errorMessage, e);
}
}
@@ -89,9 +92,12 @@ public class BatchDeployer {
/**
* Deploy an Apex model on the Apex server.
*
- * @param modelFileName the name of the model file containing the model to deploy
- * @param ignoreConflicts true if conflicts between context in polices is to be ignored
- * @param force true if the model is to be applied even if it is incompatible with the existing model
+ * @param modelFileName the name of the model file containing the model to
+ * deploy
+ * @param ignoreConflicts true if conflicts between context in polices is to be
+ * ignored
+ * @param force true if the model is to be applied even if it is
+ * incompatible with the existing model
* @throws ApexException on Apex errors
*/
public void deployModel(final String modelFileName, final boolean ignoreConflicts, final boolean force)
@@ -102,9 +108,11 @@ public class BatchDeployer {
/**
* Deploy an Apex model on the Apex server.
*
- * @param policyModel the model to deploy
- * @param ignoreConflicts true if conflicts between context in polices is to be ignored
- * @param force true if the model is to be applied even if it is incompatible with the existing model
+ * @param policyModel the model to deploy
+ * @param ignoreConflicts true if conflicts between context in polices is to be
+ * ignored
+ * @param force true if the model is to be applied even if it is
+ * incompatible with the existing model
* @throws ApexException on Apex errors
*/
public void deployModel(final AxPolicyModel policyModel, final boolean ignoreConflicts, final boolean force)
@@ -113,7 +121,8 @@ public class BatchDeployer {
}
/**
- * Get the engine service facade of the event manager. This method is used for testing only.
+ * Get the engine service facade of the event manager. This method is used for
+ * testing only.
*
* @return the engine service facade
*/
@@ -122,10 +131,11 @@ public class BatchDeployer {
}
/**
- * The main method, reads the Apex server host address, port and location of the Apex model file from the command
- * line arguments.
+ * The main method, reads the Apex server host address, port and location of the
+ * Apex model file from the command line arguments.
*
- * @param args the arguments that specify the Apex engine and the Apex model file
+ * @param args the arguments that specify the Apex engine and the Apex model
+ * file
* @throws ApexException on deployment errors
*/
public static void main(final String[] args) throws ApexException {
diff --git a/core/core-deployment/src/main/java/org/onap/policy/apex/core/deployment/EngineServiceFacade.java b/core/core-deployment/src/main/java/org/onap/policy/apex/core/deployment/EngineServiceFacade.java
index 9dfcf4d1a..1a09ffe56 100644
--- a/core/core-deployment/src/main/java/org/onap/policy/apex/core/deployment/EngineServiceFacade.java
+++ b/core/core-deployment/src/main/java/org/onap/policy/apex/core/deployment/EngineServiceFacade.java
@@ -1,6 +1,7 @@
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2016-2018 Ericsson. All rights reserved.
+ * Modifications Copyright (C) 2020 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -48,11 +49,12 @@ import org.slf4j.ext.XLogger;
import org.slf4j.ext.XLoggerFactory;
/**
- * The Class Deployer deploys an Apex model held as an XML file onto an Apex engine. It uses the EngDep protocol to
- * communicate with the engine, with the EngDep protocol being carried on Java web sockets.
+ * The Class Deployer deploys an Apex model held as an XML file onto an Apex
+ * engine. It uses the EngDep protocol to communicate with the engine, with the
+ * EngDep protocol being carried on Java web sockets.
*
- * <p>This deployer is a simple command line deployer that reads the communication parameters and the location of
- * the XML model file as arguments.
+ * <p>This deployer is a simple command line deployer that reads the
+ * communication parameters and the location of the XML model file as arguments.
*
* @author Liam Fallon (liam.fallon@ericsson.com)
*/
@@ -64,7 +66,8 @@ public class EngineServiceFacade {
private static final String RECEIVED_FROM_SERVER = " received from server";
private static final String FAILED_RESPONSE = "failed response ";
- // The default message timeout and timeout increment (the amount of time between polls) in
+ // The default message timeout and timeout increment (the amount of time between
+ // polls) in
// milliseconds
private static final int CLIENT_START_WAIT_INTERVAL = 100;
private static final int REPLY_MESSAGE_TIMEOUT_DEFAULT = 10000;
@@ -74,7 +77,8 @@ public class EngineServiceFacade {
private final String hostName;
private final int port;
- // The deployment client handles the EngDep communication session towards the Apex server
+ // The deployment client handles the EngDep communication session towards the
+ // Apex server
private DeploymentClient client = null;
private Thread clientThread = null;
@@ -87,27 +91,36 @@ public class EngineServiceFacade {
* Instantiates a new deployer.
*
* @param hostName the host name of the host running the Apex Engine
- * @param port the port to use for EngDep communication with the Apex engine
+ * @param port the port to use for EngDep communication with the Apex engine
*/
public EngineServiceFacade(final String hostName, final int port) {
this.hostName = hostName;
this.port = port;
- // Use the deployment client to handle the EngDep communication towards the Apex server.
+ // Use the deployment client to handle the EngDep communication towards the Apex
+ // server.
client = new DeploymentClient(hostName, port);
}
/**
- * Initializes the facade, opens an EngDep communication session with the Apex engine.
+ * Initializes the facade, opens an EngDep communication session with the Apex
+ * engine.
*
* @throws ApexDeploymentException thrown on deployment and communication errors
*/
public void init() throws ApexDeploymentException {
+
+ if (client.isStarted()) {
+ throw new ApexDeploymentException("connection already active to " + hostName + ":" + port);
+ }
+
try {
LOGGER.debug("handshaking with server {}:{} . . .", hostName, port);
- // Use the deployment client to handle the EngDep communication towards the Apex server.
- // The deployment client runs a thread to monitor the session and to send messages
+ // Use the deployment client to handle the EngDep communication towards the Apex
+ // server.
+ // The deployment client runs a thread to monitor the session and to send
+ // messages
clientThread = new Thread(client);
clientThread.start();
@@ -116,8 +129,7 @@ public class EngineServiceFacade {
if (clientThread.isAlive()) {
ThreadUtilities.sleep(CLIENT_START_WAIT_INTERVAL);
} else {
- LOGGER.error("cound not handshake with server {}:{}", hostName, port);
- throw new ApexDeploymentException("cound not handshake with server " + hostName + ":" + port);
+ throw new ApexDeploymentException("could not handshake with server " + hostName + ":" + port);
}
}
@@ -126,21 +138,24 @@ public class EngineServiceFacade {
// Get engine service information to see what engines we're dealing with
final GetEngineServiceInfo engineServiceInfo = new GetEngineServiceInfo(null);
LOGGER.debug("sending get engine service info message {} to server {}:{} . . .", engineServiceInfo,
- hostName, port);
+ hostName, port);
client.sendMessage(engineServiceInfo);
LOGGER.debug("sent get engine service info message to server {}:{} . . .", hostName, port);
- final EngineServiceInfoResponse engineServiceInfoResponse =
- (EngineServiceInfoResponse) getResponse(engineServiceInfo);
+ final EngineServiceInfoResponse engineServiceInfoResponse = (EngineServiceInfoResponse) getResponse(
+ engineServiceInfo);
if (engineServiceInfoResponse.isSuccessful()) {
engineServiceKey = engineServiceInfoResponse.getEngineServiceKey();
engineKeyArray = engineServiceInfoResponse.getEngineKeyArray();
apexModelKey = engineServiceInfoResponse.getApexModelKey();
+ } else {
+ throw new ApexDeploymentException(
+ "could not get engine service information from server " + hostName + ":" + port);
}
+
} catch (final Exception e) {
- LOGGER.error("cound not handshake with server {}:{}", hostName, port, e);
client.stopClient();
- throw new ApexDeploymentException("cound not handshake with server " + hostName + ":" + port, e);
+ throw new ApexDeploymentException("could not handshake with server " + hostName + ":" + port, e);
}
}
@@ -178,7 +193,9 @@ public class EngineServiceFacade {
public void close() {
LOGGER.debug("closing connection to server {}:{} . . .", hostName, port);
- client.stopClient();
+ if (client.isStarted()) {
+ client.stopClient();
+ }
LOGGER.debug("closed connection to server {}:{} . . .", hostName, port);
}
@@ -186,16 +203,18 @@ public class EngineServiceFacade {
/**
* Deploy an Apex model on the Apex engine service.
*
- * @param modelFileName the name of the model file containing the model to deploy
- * @param ignoreConflicts true if conflicts between context in polices is to be ignored
- * @param force true if the model is to be applied even if it is incompatible with the existing model
+ * @param modelFileName the name of the model file containing the model to
+ * deploy
+ * @param ignoreConflicts true if conflicts between context in polices is to be
+ * ignored
+ * @param force true if the model is to be applied even if it is
+ * incompatible with the existing model
* @throws ApexException on Apex errors
*/
public void deployModel(final String modelFileName, final boolean ignoreConflicts, final boolean force)
- throws ApexException {
+ throws ApexException {
if (engineServiceKey == null || engineKeyArray == null || engineKeyArray.length == 0) {
- LOGGER.error("cound not deploy apex model, deployer is not initialized");
- throw new ApexDeploymentException("cound not deploy apex model, deployer is not initialized");
+ throw new ApexDeploymentException("could not deploy apex model, deployer is not initialized");
}
// Get the model file as a string
@@ -203,9 +222,8 @@ public class EngineServiceFacade {
if (apexModelUrl == null) {
apexModelUrl = ResourceUtils.getUrlResource(modelFileName);
if (apexModelUrl == null) {
- LOGGER.error("cound not create apex model, could not read from file {}", modelFileName);
throw new ApexDeploymentException(
- "cound not create apex model, could not read from file " + modelFileName);
+ "could not create apex model, could not read from file " + modelFileName);
}
}
@@ -213,7 +231,6 @@ public class EngineServiceFacade {
deployModel(modelFileName, apexModelUrl.openStream(), ignoreConflicts, force);
} catch (final Exception deployException) {
final String errorMessage = "could not deploy apex model from " + modelFileName;
- LOGGER.error(errorMessage, deployException);
throw new ApexDeploymentException(errorMessage, deployException);
}
}
@@ -221,14 +238,17 @@ public class EngineServiceFacade {
/**
* Deploy an Apex model on the Apex engine service.
*
- * @param modelFileName the name of the model file containing the model to deploy
+ * @param modelFileName the name of the model file containing the model to
+ * deploy
* @param modelInputStream the stream that holds the Apex model
- * @param ignoreConflicts true if conflicts between context in polices is to be ignored
- * @param force true if the model is to be applied even if it is incompatible with the existing model
+ * @param ignoreConflicts true if conflicts between context in polices is to be
+ * ignored
+ * @param force true if the model is to be applied even if it is
+ * incompatible with the existing model
* @throws ApexException on model deployment errors
*/
public void deployModel(final String modelFileName, final InputStream modelInputStream,
- final boolean ignoreConflicts, final boolean force) throws ApexException {
+ final boolean ignoreConflicts, final boolean force) throws ApexException {
// Read the policy model from the stream
final ApexModelReader<AxPolicyModel> modelReader = new ApexModelReader<>(AxPolicyModel.class);
modelReader.setValidateFlag(!ignoreConflicts);
@@ -242,20 +262,22 @@ public class EngineServiceFacade {
* Deploy an Apex model on the Apex engine service.
*
* @param apexPolicyModel the name of the model to deploy
- * @param ignoreConflicts true if conflicts between context in polices is to be ignored
- * @param force true if the model is to be applied even if it is incompatible with the existing model
+ * @param ignoreConflicts true if conflicts between context in polices is to be
+ * ignored
+ * @param force true if the model is to be applied even if it is
+ * incompatible with the existing model
* @throws ApexException on model deployment errors
*/
public void deployModel(final AxPolicyModel apexPolicyModel, final boolean ignoreConflicts, final boolean force)
- throws ApexException {
+ throws ApexException {
// Write the model into a byte array
final ByteArrayOutputStream baOutputStream = new ByteArrayOutputStream();
final ApexModelWriter<AxPolicyModel> modelWriter = new ApexModelWriter<>(AxPolicyModel.class);
modelWriter.write(apexPolicyModel, baOutputStream);
// Create and send Update message
- final UpdateModel umMessage =
- new UpdateModel(engineServiceKey, baOutputStream.toString(), ignoreConflicts, force);
+ final UpdateModel umMessage = new UpdateModel(engineServiceKey, baOutputStream.toString(), ignoreConflicts,
+ force);
LOGGER.debug("sending update message {} to server {}:{} . . .", umMessage, hostName, port);
client.sendMessage(umMessage);
@@ -264,9 +286,8 @@ public class EngineServiceFacade {
// Check if we got a response
final Response response = getResponse(umMessage);
if (!response.isSuccessful()) {
- LOGGER.warn(FAILED_RESPONSE + "{} received from server {}:{}", response.getMessageData(), hostName, port);
throw new ApexException(
- FAILED_RESPONSE + response.getMessageData() + RECEIVED_FROM_SERVER + hostName + ':' + port);
+ FAILED_RESPONSE + response.getMessageData() + RECEIVED_FROM_SERVER + hostName + ':' + port);
}
}
@@ -285,9 +306,8 @@ public class EngineServiceFacade {
// Check if we got a response
final Response response = getResponse(startEngineMessage);
if (!response.isSuccessful()) {
- final String message =
- FAILED_RESPONSE + response.getMessageData() + RECEIVED_FROM_SERVER + hostName + ':' + port;
- LOGGER.warn(message);
+ final String message = FAILED_RESPONSE + response.getMessageData() + RECEIVED_FROM_SERVER + hostName + ':'
+ + port;
throw new ApexDeploymentException(message);
}
}
@@ -307,9 +327,8 @@ public class EngineServiceFacade {
// Check if we got a response
final Response response = getResponse(stopEngineMessage);
if (!response.isSuccessful()) {
- final String message =
- FAILED_RESPONSE + response.getMessageData() + RECEIVED_FROM_SERVER + hostName + ':' + port;
- LOGGER.warn(message);
+ final String message = FAILED_RESPONSE + response.getMessageData() + RECEIVED_FROM_SERVER + hostName + ':'
+ + port;
throw new ApexDeploymentException(message);
}
}
@@ -318,23 +337,22 @@ public class EngineServiceFacade {
* Start periodic events on an Apex engine on the engine service.
*
* @param engineKey the key of the engine to start periodic events on
- * @param period the period in milliseconds between periodic events
+ * @param period the period in milliseconds between periodic events
* @throws ApexDeploymentException on messaging errors
*/
public void startPerioidicEvents(final AxArtifactKey engineKey, final long period) throws ApexDeploymentException {
final StartPeriodicEvents startPerioidicEventsMessage = new StartPeriodicEvents(engineKey);
startPerioidicEventsMessage.setMessageData(Long.toString(period));
LOGGER.debug("sending start perioidic events {} to server {}:{} . . .", startPerioidicEventsMessage, hostName,
- port);
+ port);
client.sendMessage(startPerioidicEventsMessage);
LOGGER.debug("sent start perioidic events message to server {}:{} . . .", hostName, port);
// Check if we got a response
final Response response = getResponse(startPerioidicEventsMessage);
if (!response.isSuccessful()) {
- final String message =
- FAILED_RESPONSE + response.getMessageData() + RECEIVED_FROM_SERVER + hostName + ':' + port;
- LOGGER.warn(message);
+ final String message = FAILED_RESPONSE + response.getMessageData() + RECEIVED_FROM_SERVER + hostName + ':'
+ + port;
throw new ApexDeploymentException(message);
}
}
@@ -348,16 +366,15 @@ public class EngineServiceFacade {
public void stopPerioidicEvents(final AxArtifactKey engineKey) throws ApexDeploymentException {
final StopPeriodicEvents stopPerioidicEventsMessage = new StopPeriodicEvents(engineKey);
LOGGER.debug("sending stop perioidic events {} to server {}:{} . . .", stopPerioidicEventsMessage, hostName,
- port);
+ port);
client.sendMessage(stopPerioidicEventsMessage);
LOGGER.debug("sent stop perioidic events message to server {}:{} . . .", hostName, port);
// Check if we got a response
final Response response = getResponse(stopPerioidicEventsMessage);
if (!response.isSuccessful()) {
- final String message =
- FAILED_RESPONSE + response.getMessageData() + RECEIVED_FROM_SERVER + hostName + ':' + port;
- LOGGER.warn(message);
+ final String message = FAILED_RESPONSE + response.getMessageData() + RECEIVED_FROM_SERVER + hostName + ':'
+ + port;
throw new ApexDeploymentException(message);
}
}
@@ -378,9 +395,8 @@ public class EngineServiceFacade {
// Check if we got a response
final Response response = getResponse(engineStatusMessage);
if (!response.isSuccessful()) {
- final String message =
- FAILED_RESPONSE + response.getMessageData() + RECEIVED_FROM_SERVER + hostName + ':' + port;
- LOGGER.warn(message);
+ final String message = FAILED_RESPONSE + response.getMessageData() + RECEIVED_FROM_SERVER + hostName + ':'
+ + port;
throw new ApexException(message);
}
@@ -394,22 +410,22 @@ public class EngineServiceFacade {
* Get the runtime information of an Apex engine.
*
* @param engineKey the key of the engine to get information for
- * @return an engine model containing information on the engine for the given key
+ * @return an engine model containing information on the engine for the given
+ * key
* @throws ApexException the apex exception
*/
public String getEngineInfo(final AxArtifactKey engineKey) throws ApexException {
final GetEngineInfo engineInfoMessage = new GetEngineInfo(engineKey);
LOGGER.debug("sending get engine information message {} to server {}:{} . . .", engineInfoMessage, hostName,
- port);
+ port);
client.sendMessage(engineInfoMessage);
LOGGER.debug("sent get engine information message to server {}:{} . . .", hostName, port);
// Check if we got a response
final Response response = getResponse(engineInfoMessage);
if (!response.isSuccessful()) {
- final String message =
- FAILED_RESPONSE + response.getMessageData() + RECEIVED_FROM_SERVER + hostName + ':' + port;
- LOGGER.warn(message);
+ final String message = FAILED_RESPONSE + response.getMessageData() + RECEIVED_FROM_SERVER + hostName + ':'
+ + port;
throw new ApexException(message);
}
@@ -430,33 +446,30 @@ public class EngineServiceFacade {
timeoutTime = REPLY_MESSAGE_TIMEOUT_DEFAULT;
}
- // Wait for the required amount of milliseconds for the response from the Apex server
+ // Wait for the required amount of milliseconds for the response from the Apex
+ // server
Message receivedMessage = null;
- for (int timeWaitedSoFar = 0; receivedMessage == null && timeWaitedSoFar < timeoutTime; timeWaitedSoFar +=
- REPLY_MESSAGE_TIMEOUT_INCREMENT) {
+ for (int timeWaitedSoFar = 0; receivedMessage == null
+ && timeWaitedSoFar < timeoutTime; timeWaitedSoFar += REPLY_MESSAGE_TIMEOUT_INCREMENT) {
try {
receivedMessage = client.getReceiveQueue().poll(REPLY_MESSAGE_TIMEOUT_INCREMENT, TimeUnit.MILLISECONDS);
} catch (final InterruptedException e) {
// restore the interrupt status
Thread.currentThread().interrupt();
- LOGGER.warn("reception of response from server interrupted {}:{}", hostName, port, e);
throw new ApexDeploymentException(
- "reception of response from server interrupted " + hostName + ':' + port, e);
+ "reception of response from server interrupted " + hostName + ':' + port, e);
}
}
// Check if response to sent message
if (receivedMessage == null) {
- LOGGER.warn("no response received to sent message " + sentMessage.getAction());
throw new ApexDeploymentException("no response received to sent message " + sentMessage.getAction());
}
// Check instance is a response message
if (!(receivedMessage instanceof Response)) {
- LOGGER.warn("response received from server is of incorrect type {}, should be of type {}",
- receivedMessage.getClass().getName(), Response.class.getName());
throw new ApexDeploymentException("response received from server is of incorrect type "
- + receivedMessage.getClass().getName() + ", should be of type " + Response.class.getName());
+ + receivedMessage.getClass().getName() + ", should be of type " + Response.class.getName());
}
// Cast the response message
@@ -464,18 +477,17 @@ public class EngineServiceFacade {
// Check if response to sent message
if (!responseMessage.getResponseTo().equals(sentMessage)) {
- LOGGER.warn("response received is not response to sent message " + sentMessage.getAction());
throw new ApexDeploymentException(
- "response received is not correct response to sent message " + sentMessage.getAction());
+ "response received is not correct response to sent message " + sentMessage.getAction());
}
// Check if successful
if (responseMessage.isSuccessful()) {
LOGGER.debug("response received: {} message was succssful: {}", sentMessage.getAction(),
- responseMessage.getMessageData());
+ responseMessage.getMessageData());
} else {
LOGGER.debug("response received: {} message failed: {}", sentMessage.getAction(),
- responseMessage.getMessageData());
+ responseMessage.getMessageData());
}
return responseMessage;
@@ -483,7 +495,7 @@ public class EngineServiceFacade {
/**
* Set a deployment client for this facade. This method is for testing.
- *
+ *
* @param deploymentClient the deployment client to set
*/
protected void setDeploymentClient(final DeploymentClient deploymentClient) {
diff --git a/core/core-deployment/src/test/java/org/onap/policy/apex/core/deployment/BatchDeployerTest.java b/core/core-deployment/src/test/java/org/onap/policy/apex/core/deployment/BatchDeployerTest.java
index 5871204b5..000acab75 100644
--- a/core/core-deployment/src/test/java/org/onap/policy/apex/core/deployment/BatchDeployerTest.java
+++ b/core/core-deployment/src/test/java/org/onap/policy/apex/core/deployment/BatchDeployerTest.java
@@ -1,19 +1,20 @@
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2018 Ericsson. All rights reserved.
+ * Modifications Copyright (C) 2020 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- *
+ *
* SPDX-License-Identifier: Apache-2.0
* ============LICENSE_END=========================================================
*/
@@ -28,6 +29,8 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.PrintStream;
+import java.time.Duration;
+import org.awaitility.Awaitility;
import org.junit.Test;
import org.onap.policy.apex.model.basicmodel.concepts.ApexException;
import org.onap.policy.apex.model.basicmodel.handling.ApexModelException;
@@ -41,8 +44,7 @@ public class BatchDeployerTest {
@Test
public void testBatchDeployerBad() {
try {
- final String[] eventArgs =
- { "-h" };
+ final String[] eventArgs = { "-h" };
BatchDeployer.main(eventArgs);
fail("test should throw an exception");
@@ -54,8 +56,7 @@ public class BatchDeployerTest {
@Test
public void testBatchDeployerBadPort() {
try {
- final String[] eventArgs =
- { "localhost", "aport", "afile" };
+ final String[] eventArgs = { "localhost", "aport", "afile" };
BatchDeployer.main(eventArgs);
fail("test should throw an exception");
@@ -67,88 +68,91 @@ public class BatchDeployerTest {
@Test
public void testBatchDeployerOk() {
try {
- final String[] eventArgs =
- { "Host", "43443", "src/test/resources/models/SamplePolicyModelJAVASCRIPT.json" };
+ final String[] eventArgs = { "Host", "43443",
+ "src/test/resources/models/SamplePolicyModelJAVASCRIPT.json" };
BatchDeployer.main(eventArgs);
+ fail("test should throw an exception");
} catch (Exception exc) {
assertEquals("model deployment failed on parameters Host 43443", exc.getMessage());
}
}
-
+
@Test
- public void testBatchDeployerDeployString() {
+ public void testBatchDeployerDeployString() throws ApexException {
final ByteArrayOutputStream baosOut = new ByteArrayOutputStream();
BatchDeployer deployer = new BatchDeployer("localhost", 12345, new PrintStream(baosOut, true));
- deployer.getEngineServiceFacade().setDeploymentClient(new DummyDeploymentClient("aHost", 54553));
+ final DummyDeploymentClient dummyDeploymentClient = new DummyDeploymentClient("aHost", 54553);
+ deployer.getEngineServiceFacade().setDeploymentClient(dummyDeploymentClient);
+ // We are testing towards a dummy client, make it return a failed initiation
+ dummyDeploymentClient.setInitSuccessful(false);
try {
deployer.init();
+ fail("test should throw an exception");
} catch (ApexDeploymentException ade) {
- assertEquals("model deployment failed on parameters localhost 12345 true", ade.getMessage());
+ assertEquals("model deployment failed on parameters localhost 12345", ade.getMessage());
}
- try {
- deployer.init();
- } catch (ApexDeploymentException ade) {
- ade.printStackTrace();
- fail("test should not throw an exception");
- }
+ // Wait until the connection to the server closes following the bad connection
+ // attempt
+ Awaitility.await().atLeast(Duration.ofMillis(100));
+
+ // We are testing towards a dummy client, make it return a successful initiation
+ dummyDeploymentClient.setInitSuccessful(true);
+ deployer.init();
try {
deployer.deployModel("src/test/resources/models/SmallModel.json", false, false);
+ fail("test should throw an exception");
} catch (ApexException ade) {
assertEquals("could not deploy apex model from src/test/resources/models/SmallModel.json",
- ade.getMessage());
+ ade.getMessage());
}
- try {
- deployer.deployModel("src/test/resources/models/SmallModel.json", false, false);
- } catch (ApexException ade) {
- fail("test should not throw an exception");
- }
+ deployer.deployModel("src/test/resources/models/SmallModel.json", false, false);
deployer.close();
}
@Test
- public void testBatchDeployerStream() throws ApexModelException, FileNotFoundException {
+ public void testBatchDeployerStream() throws FileNotFoundException, ApexException {
final ByteArrayOutputStream baosOut = new ByteArrayOutputStream();
BatchDeployer deployer = new BatchDeployer("localhost", 12345, new PrintStream(baosOut, true));
- deployer.getEngineServiceFacade().setDeploymentClient(new DummyDeploymentClient("aHost", 54553));
+ final DummyDeploymentClient dummyDeploymentClient = new DummyDeploymentClient("aHost", 54553);
+ deployer.getEngineServiceFacade().setDeploymentClient(dummyDeploymentClient);
+ dummyDeploymentClient.setInitSuccessful(false);
try {
deployer.init();
+ fail("test should throw an exception");
} catch (ApexDeploymentException ade) {
- assertEquals("model deployment failed on parameters localhost 12345 true", ade.getMessage());
+ assertEquals("model deployment failed on parameters localhost 12345", ade.getMessage());
}
- try {
- deployer.init();
- } catch (ApexDeploymentException ade) {
- ade.printStackTrace();
- fail("test should not throw an exception");
- }
+ // Wait until the connection to the server closes following the bad connection
+ // attempt
+ Awaitility.await().atLeast(Duration.ofMillis(100));
+
+ dummyDeploymentClient.setInitSuccessful(true);
+ deployer.init();
final ApexModelReader<AxPolicyModel> modelReader = new ApexModelReader<>(AxPolicyModel.class);
modelReader.setValidateFlag(false);
- final AxPolicyModel apexPolicyModel = modelReader.read(
- new FileInputStream(new File("src/test/resources/models/SmallModel.json")));
+ final AxPolicyModel apexPolicyModel = modelReader
+ .read(new FileInputStream(new File("src/test/resources/models/SmallModel.json")));
try {
deployer.deployModel(apexPolicyModel, false, false);
+ fail("test should throw an exception");
} catch (ApexException ade) {
assertEquals("failed response Operation failed received from serverlocalhost:12345", ade.getMessage());
}
- try {
- deployer.deployModel(apexPolicyModel, false, false);
- } catch (ApexException ade) {
- fail("test should not throw an exception");
- }
+ deployer.deployModel(apexPolicyModel, false, false);
deployer.close();
}
@@ -164,14 +168,14 @@ public class BatchDeployerTest {
deployer.deployModel("src/test/resources/models/SamplePolicyModelJAVASCRIPT.json", false, false);
fail("test should throw an exception");
} catch (ApexException ade) {
- assertEquals("cound not deploy apex model, deployer is not initialized", ade.getMessage());
+ assertEquals("could not deploy apex model, deployer is not initialized", ade.getMessage());
}
try {
deployer.deployModel("src/test/resources/models/SamplePolicyModelJAVASCRIPT.json", false, false);
fail("test should throw an exception");
} catch (ApexException ade) {
- assertEquals("cound not deploy apex model, deployer is not initialized", ade.getMessage());
+ assertEquals("could not deploy apex model, deployer is not initialized", ade.getMessage());
}
deployer.close();
@@ -186,8 +190,8 @@ public class BatchDeployerTest {
final ApexModelReader<AxPolicyModel> modelReader = new ApexModelReader<>(AxPolicyModel.class);
modelReader.setValidateFlag(false);
- final AxPolicyModel apexPolicyModel = modelReader.read(
- new FileInputStream(new File("src/test/resources/models/SmallModel.json")));
+ final AxPolicyModel apexPolicyModel = modelReader
+ .read(new FileInputStream(new File("src/test/resources/models/SmallModel.json")));
try {
deployer.deployModel(apexPolicyModel, false, false);
diff --git a/core/core-deployment/src/test/java/org/onap/policy/apex/core/deployment/DummyDeploymentClient.java b/core/core-deployment/src/test/java/org/onap/policy/apex/core/deployment/DummyDeploymentClient.java
index 4432a38a6..ffb3d2c63 100644
--- a/core/core-deployment/src/test/java/org/onap/policy/apex/core/deployment/DummyDeploymentClient.java
+++ b/core/core-deployment/src/test/java/org/onap/policy/apex/core/deployment/DummyDeploymentClient.java
@@ -29,6 +29,8 @@ import java.util.List;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.TimeUnit;
+import lombok.Getter;
+import lombok.Setter;
import org.onap.policy.apex.core.protocols.Message;
import org.onap.policy.apex.core.protocols.engdep.messages.EngineServiceInfoResponse;
import org.onap.policy.apex.core.protocols.engdep.messages.GetEngineInfo;
@@ -46,6 +48,8 @@ import org.onap.policy.common.utils.resources.TextFileUtils;
/**
* Dummy deployment client.
*/
+@Getter
+@Setter
public class DummyDeploymentClient extends DeploymentClient implements Runnable {
private static final AxArtifactKey MODEL_KEY = new AxArtifactKey("Model", "0.0.1");
private static final AxArtifactKey ENGINE_KEY = new AxArtifactKey("Engine", "0.0.1");
@@ -130,14 +134,12 @@ public class DummyDeploymentClient extends DeploymentClient implements Runnable
infoResponse.setEngineServiceKey(ENGINE_SERVICE_KEY);
receiveQueue.add(infoResponse);
-
- initSuccessful = !initSuccessful;
}
/**
* Handle and return the response to the engine status message.
*
- * @param message the incoming status message
+ * @param message the incoming status message
* @param successFlag true if the result should be successful
* @return engine status success or not
*/
@@ -203,17 +205,8 @@ public class DummyDeploymentClient extends DeploymentClient implements Runnable
}
/**
- * Checks if the client thread is started.
- *
- * @return true, if the client thread is started
- */
- @Override
- public boolean isStarted() {
- return started;
- }
-
- /**
- * Allows users of this class to get a reference to the receive queue to receove messages.
+ * Allows users of this class to get a reference to the receive queue to receove
+ * messages.
*
* @return the receive queue
*/
diff --git a/core/core-deployment/src/test/java/org/onap/policy/apex/core/deployment/EngineServiceFacadeTest.java b/core/core-deployment/src/test/java/org/onap/policy/apex/core/deployment/EngineServiceFacadeTest.java
index 6d2015562..fb2ef4459 100644
--- a/core/core-deployment/src/test/java/org/onap/policy/apex/core/deployment/EngineServiceFacadeTest.java
+++ b/core/core-deployment/src/test/java/org/onap/policy/apex/core/deployment/EngineServiceFacadeTest.java
@@ -1,19 +1,20 @@
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2018 Ericsson. All rights reserved.
+ * Modifications Copyright (C) 2020 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- *
+ *
* SPDX-License-Identifier: Apache-2.0
* ============LICENSE_END=========================================================
*/
@@ -37,10 +38,17 @@ public class EngineServiceFacadeTest {
public void testEngineServiceFacade() throws Exception {
EngineServiceFacade facade = new EngineServiceFacade("localhost", 51273);
- facade.setDeploymentClient(new DummyDeploymentClient("localhost", 51273));
+ final DummyDeploymentClient dummyDeploymentClient = new DummyDeploymentClient("aHost", 54553);
+ facade.setDeploymentClient(dummyDeploymentClient);
- // First init should fail
- facade.init();
+ // First init should fail due to our dummy client
+ dummyDeploymentClient.setInitSuccessful(false);
+ try {
+ facade.init();
+ fail("could not handshake with server localhost:51273");
+ } catch (final Exception ade) {
+ assertEquals("could not handshake with server localhost:51273", ade.getMessage());
+ }
assertNull(facade.getKey());
assertNull(facade.getApexModelKey());
@@ -50,10 +58,11 @@ public class EngineServiceFacadeTest {
facade.deployModel("src/test/resources/models/SamplePolicyModelJAVASCRIPT.json", false, false);
fail("test should throw an exception here");
} catch (final Exception ade) {
- assertEquals("cound not deploy apex model, deployer is not initialized", ade.getMessage());
+ assertEquals("could not deploy apex model, deployer is not initialized", ade.getMessage());
}
// Second init should work
+ dummyDeploymentClient.setInitSuccessful(true);
facade.init();
assertEquals("EngineService:0.0.1", facade.getKey().getId());
@@ -64,8 +73,8 @@ public class EngineServiceFacadeTest {
facade.deployModel("src/test/resources/models/NonExistantModel.json", false, false);
fail("test should throw an exception here");
} catch (final Exception ade) {
- assertEquals("cound not create apex model, could not read from file "
- + "src/test/resources/models/NonExistantModel.json", ade.getMessage());
+ assertEquals("could not create apex model, could not read from file "
+ + "src/test/resources/models/NonExistantModel.json", ade.getMessage());
}
try {
@@ -97,14 +106,10 @@ public class EngineServiceFacadeTest {
fail("test should throw an exception here");
} catch (final Exception ade) {
assertEquals("could not deploy apex model from src/test/resources/models/SmallModel.json",
- ade.getMessage());
+ ade.getMessage());
}
- try {
- facade.deployModel("src/test/resources/models/SmallModel.json", false, false);
- } catch (final Exception ade) {
- fail("test should not throw an exception here");
- }
+ facade.deployModel("src/test/resources/models/SmallModel.json", false, false);
try {
facade.startEngine(facade.getEngineKeyArray()[0]);
@@ -113,11 +118,7 @@ public class EngineServiceFacadeTest {
assertEquals("failed response Operation failed received from serverlocalhost:51273", ade.getMessage());
}
- try {
- facade.startEngine(facade.getEngineKeyArray()[0]);
- } catch (final Exception ade) {
- fail("test should not throw an exception here");
- }
+ facade.startEngine(facade.getEngineKeyArray()[0]);
try {
facade.stopEngine(facade.getEngineKeyArray()[0]);
@@ -126,11 +127,7 @@ public class EngineServiceFacadeTest {
assertEquals("failed response Operation failed received from serverlocalhost:51273", ade.getMessage());
}
- try {
- facade.stopEngine(facade.getEngineKeyArray()[0]);
- } catch (final Exception ade) {
- fail("test should not throw an exception here");
- }
+ facade.stopEngine(facade.getEngineKeyArray()[0]);
try {
facade.startPerioidicEvents(facade.getEngineKeyArray()[0], 1000);
@@ -139,11 +136,7 @@ public class EngineServiceFacadeTest {
assertEquals("failed response Operation failed received from serverlocalhost:51273", ade.getMessage());
}
- try {
- facade.startPerioidicEvents(facade.getEngineKeyArray()[0], 1000);
- } catch (final Exception ade) {
- fail("test should not throw an exception here");
- }
+ facade.startPerioidicEvents(facade.getEngineKeyArray()[0], 1000);
try {
facade.stopPerioidicEvents(facade.getEngineKeyArray()[0]);
@@ -152,11 +145,7 @@ public class EngineServiceFacadeTest {
assertEquals("failed response Operation failed received from serverlocalhost:51273", ade.getMessage());
}
- try {
- facade.stopPerioidicEvents(facade.getEngineKeyArray()[0]);
- } catch (final Exception ade) {
- fail("test should not throw an exception here");
- }
+ facade.stopPerioidicEvents(facade.getEngineKeyArray()[0]);
try {
facade.getEngineStatus(facade.getEngineKeyArray()[0]);
@@ -165,11 +154,7 @@ public class EngineServiceFacadeTest {
assertEquals("failed response Operation failed received from serverlocalhost:51273", ade.getMessage());
}
- try {
- facade.getEngineStatus(facade.getEngineKeyArray()[0]);
- } catch (final Exception ade) {
- fail("test should not throw an exception here");
- }
+ facade.getEngineStatus(facade.getEngineKeyArray()[0]);
try {
facade.getEngineInfo(facade.getEngineKeyArray()[0]);
@@ -178,19 +163,15 @@ public class EngineServiceFacadeTest {
assertEquals("failed response Operation failed received from serverlocalhost:51273", ade.getMessage());
}
- try {
- facade.getEngineInfo(facade.getEngineKeyArray()[0]);
- } catch (final Exception ade) {
- fail("test should not throw an exception here");
- }
+ facade.getEngineInfo(facade.getEngineKeyArray()[0]);
try {
facade.getEngineStatus(new AxArtifactKey("ReturnBadMessage", "0.0.1"));
fail("test should throw an exception here");
} catch (final Exception ade) {
assertEquals("response received from server is of incorrect type "
- + "org.onap.policy.apex.core.protocols.engdep.messages.GetEngineStatus, should be of type "
- + "org.onap.policy.apex.core.protocols.engdep.messages.Response", ade.getMessage());
+ + "org.onap.policy.apex.core.protocols.engdep.messages.GetEngineStatus, should be of type "
+ + "org.onap.policy.apex.core.protocols.engdep.messages.Response", ade.getMessage());
}
try {
@@ -198,7 +179,7 @@ public class EngineServiceFacadeTest {
fail("test should throw an exception here");
} catch (final Exception ade) {
assertEquals("response received is not correct response to sent message GET_ENGINE_STATUS",
- ade.getMessage());
+ ade.getMessage());
}
try {
diff --git a/core/core-deployment/src/test/java/org/onap/policy/apex/core/deployment/PeriodicEventManagerTest.java b/core/core-deployment/src/test/java/org/onap/policy/apex/core/deployment/PeriodicEventManagerTest.java
index 22344cfc4..3444eb7fd 100644
--- a/core/core-deployment/src/test/java/org/onap/policy/apex/core/deployment/PeriodicEventManagerTest.java
+++ b/core/core-deployment/src/test/java/org/onap/policy/apex/core/deployment/PeriodicEventManagerTest.java
@@ -1,7 +1,7 @@
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2018 Ericsson. All rights reserved.
- * Modifications Copyright (C) 2019 Nordix Foundation.
+ * Modifications Copyright (C) 2019-2020 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -38,8 +38,7 @@ public class PeriodicEventManagerTest {
@Test
public void testPeroidicEventManagerBad() {
try {
- final String[] eventArgs =
- { "-h" };
+ final String[] eventArgs = { "-h" };
PeriodicEventManager.main(eventArgs);
fail("test should throw an exception");
@@ -51,8 +50,7 @@ public class PeriodicEventManagerTest {
@Test
public void testPeroidicEventManagerOk() {
try {
- final String[] eventArgs =
- { "Host", "43443", "start", "1000" };
+ final String[] eventArgs = { "Host", "43443", "start", "1000" };
PeriodicEventManager.main(eventArgs);
fail("test should throw an exception");
@@ -63,30 +61,27 @@ public class PeriodicEventManagerTest {
@Test
public void testPeroidicEventManagerNoOptions() {
- final String[] eventArgs = new String[]
- {};
+ final String[] eventArgs = new String[] {};
final String outputString = testPeriodicEventManagerConstructor(eventArgs);
- assertTrue(outputString.contains(
- "usage: PeriodicEventManager <server address> <port address> <start/stop> <periods in ms>"));
+ assertTrue(outputString
+ .contains("usage: PeriodicEventManager <server address> <port address> <start/stop> <periods in ms>"));
}
@Test
public void testPeroidicEventManagerBadOptions() {
- final String[] eventArgs =
- { "-zabbu" };
+ final String[] eventArgs = { "-zabbu" };
final String outputString = testPeriodicEventManagerConstructor(eventArgs);
- assertTrue(outputString.contains(
- "usage: PeriodicEventManager <server address> <port address> <start/stop> <periods in ms>"));
+ assertTrue(outputString
+ .contains("usage: PeriodicEventManager <server address> <port address> <start/stop> <periods in ms>"));
}
@Test
public void testPeroidicEventManagerNonNumeric3() {
- final String[] eventArgs =
- { "aaa", "bbb", "ccc", "ddd" };
+ final String[] eventArgs = { "aaa", "bbb", "ccc", "ddd" };
final String outputString = testPeriodicEventManagerConstructor(eventArgs);
@@ -95,8 +90,7 @@ public class PeriodicEventManagerTest {
@Test
public void testPeroidicEventManagerNonNumeric2() {
- final String[] eventArgs =
- { "aaa", "12345", "start", "stop" };
+ final String[] eventArgs = { "aaa", "12345", "start", "stop" };
final String outputString = testPeriodicEventManagerConstructor(eventArgs);
@@ -105,8 +99,7 @@ public class PeriodicEventManagerTest {
@Test
public void testPeroidicEventManagerNotStartStop() {
- final String[] eventArgs =
- { "aaa", "12345", "1000", "1000" };
+ final String[] eventArgs = { "aaa", "12345", "1000", "1000" };
final String outputString = testPeriodicEventManagerConstructor(eventArgs);
@@ -115,25 +108,28 @@ public class PeriodicEventManagerTest {
@Test
public void testPeroidicEventManagerStart() {
- final String[] eventArgs =
- { "localhost", "12345", "start", "1000" };
+ final String[] eventArgs = { "localhost", "12345", "start", "1000" };
final ByteArrayOutputStream baosOut = new ByteArrayOutputStream();
PeriodicEventManager peManager = null;
+ final DummyDeploymentClient dummyDeploymentClient = new DummyDeploymentClient("aHost", 54553);
try {
peManager = new PeriodicEventManager(eventArgs, new PrintStream(baosOut, true));
- peManager.getEngineServiceFacade().setDeploymentClient(new DummyDeploymentClient("aHost", 54553));
+ peManager.getEngineServiceFacade().setDeploymentClient(dummyDeploymentClient);
} catch (ApexDeploymentException ade) {
fail("test should not throw an exception");
}
+ dummyDeploymentClient.setInitSuccessful(false);
try {
peManager.init();
+ fail("test should throw an exception");
} catch (ApexDeploymentException ade) {
- assertEquals("model deployment failed on parameters localhost 12345 true", ade.getMessage());
+ assertEquals("periodic event setting failed on parameters localhost 12345 true", ade.getMessage());
}
+ dummyDeploymentClient.setInitSuccessful(true);
try {
peManager.init();
} catch (ApexDeploymentException ade) {
@@ -143,6 +139,7 @@ public class PeriodicEventManagerTest {
try {
peManager.runCommand();
+ fail("test should throw an exception");
} catch (ApexDeploymentException ade) {
assertEquals("failed response Operation failed received from serverlocalhost:12345", ade.getMessage());
}
@@ -157,63 +154,51 @@ public class PeriodicEventManagerTest {
}
@Test
- public void testPeroidicEventManagerStop() {
- final String[] eventArgs =
- { "localhost", "12345", "stop", "1000" };
+ public void testPeroidicEventManagerStop() throws ApexDeploymentException {
+ final String[] eventArgs = { "localhost", "12345", "stop", "1000" };
final ByteArrayOutputStream baosOut = new ByteArrayOutputStream();
PeriodicEventManager peManager = null;
- try {
- peManager = new PeriodicEventManager(eventArgs, new PrintStream(baosOut, true));
- peManager.getEngineServiceFacade().setDeploymentClient(new DummyDeploymentClient("aHost", 54553));
- } catch (ApexDeploymentException ade) {
- fail("test should not throw an exception");
- }
+ final DummyDeploymentClient dummyDeploymentClient = new DummyDeploymentClient("aHost", 54553);
+ peManager = new PeriodicEventManager(eventArgs, new PrintStream(baosOut, true));
+ peManager.getEngineServiceFacade().setDeploymentClient(dummyDeploymentClient);
+ dummyDeploymentClient.setInitSuccessful(false);
try {
peManager.init();
+ fail("test should throw an exception");
} catch (ApexDeploymentException ade) {
- assertEquals("model deployment failed on parameters localhost 12345 true", ade.getMessage());
+ assertEquals("periodic event setting failed on parameters localhost 12345 false", ade.getMessage());
}
- try {
- peManager.init();
- } catch (ApexDeploymentException ade) {
- ade.printStackTrace();
- fail("test should not throw an exception");
- }
+ dummyDeploymentClient.setInitSuccessful(true);
+ peManager.init();
try {
peManager.runCommand();
+ fail("test should throw an exception");
} catch (ApexDeploymentException ade) {
assertEquals("failed response Operation failed received from serverlocalhost:12345", ade.getMessage());
}
- try {
- peManager.runCommand();
- } catch (ApexDeploymentException ade) {
- fail("test should not throw an exception");
- }
+ peManager.runCommand();
peManager.close();
}
@Test
- public void testPeroidicEventManagerStartUninitialized() {
- final String[] eventArgs =
- { "localhost", "12345", "start", "1000" };
+ public void testPeroidicEventManagerStartUninitialized() throws ApexDeploymentException {
+ final String[] eventArgs = { "localhost", "12345", "start", "1000" };
final ByteArrayOutputStream baosOut = new ByteArrayOutputStream();
PeriodicEventManager peManager = null;
- try {
- peManager = new PeriodicEventManager(eventArgs, new PrintStream(baosOut, true));
- peManager.getEngineServiceFacade().setDeploymentClient(new DummyDeploymentClient("aHost", 54553));
- } catch (ApexDeploymentException ade) {
- fail("test should not throw an exception");
- }
+ final DummyDeploymentClient dummyDeploymentClient = new DummyDeploymentClient("aHost", 54553);
+ peManager = new PeriodicEventManager(eventArgs, new PrintStream(baosOut, true));
+ peManager.getEngineServiceFacade().setDeploymentClient(dummyDeploymentClient);
+ dummyDeploymentClient.setInitSuccessful(false);
try {
peManager.runCommand();
fail("test should throw an exception");
@@ -221,31 +206,26 @@ public class PeriodicEventManagerTest {
assertEquals("connection to apex is not initialized", ade.getMessage());
}
+ dummyDeploymentClient.setInitSuccessful(true);
try {
peManager.runCommand();
fail("test should throw an exception");
} catch (ApexDeploymentException ade) {
assertEquals("connection to apex is not initialized", ade.getMessage());
- ade.printStackTrace();
}
peManager.close();
}
@Test
- public void testPeroidicEventManagerStopUninitialized() {
- final String[] eventArgs =
- { "localhost", "12345", "stop", "1000" };
+ public void testPeroidicEventManagerStopUninitialized() throws ApexDeploymentException {
+ final String[] eventArgs = { "localhost", "12345", "stop", "1000" };
final ByteArrayOutputStream baosOut = new ByteArrayOutputStream();
PeriodicEventManager peManager = null;
- try {
- peManager = new PeriodicEventManager(eventArgs, new PrintStream(baosOut, true));
- peManager.getEngineServiceFacade().setDeploymentClient(new DummyDeploymentClient("aHost", 54553));
- } catch (ApexDeploymentException ade) {
- fail("test should not throw an exception");
- }
+ peManager = new PeriodicEventManager(eventArgs, new PrintStream(baosOut, true));
+ peManager.getEngineServiceFacade().setDeploymentClient(new DummyDeploymentClient("aHost", 54553));
try {
peManager.runCommand();
@@ -282,6 +262,6 @@ public class PeriodicEventManagerTest {
String errString = baosErr.toString();
return "*** StdOut ***\n" + outString + "\n*** StdErr ***\n" + errString + "\n*** exception ***\n"
- + exceptionString;
+ + exceptionString;
}
}
diff --git a/core/core-engine/src/test/java/org/onap/policy/apex/core/engine/executor/TaskSelectExecutorTest.java b/core/core-engine/src/test/java/org/onap/policy/apex/core/engine/executor/TaskSelectExecutorTest.java
index 182ce3597..edfbcf20f 100644
--- a/core/core-engine/src/test/java/org/onap/policy/apex/core/engine/executor/TaskSelectExecutorTest.java
+++ b/core/core-engine/src/test/java/org/onap/policy/apex/core/engine/executor/TaskSelectExecutorTest.java
@@ -130,12 +130,6 @@ public class TaskSelectExecutorTest {
try {
executor.executePre(0, new Properties(), incomingEvent);
- } catch (Exception ex) {
- assertEquals("task input fields \"[InField0]\" are missing for task \"Task0:0.0.1\"", ex.getMessage());
- }
-
- try {
- executor.executePre(0, new Properties(), incomingEvent);
} catch (Exception e) {
fail("test should not throw an exception");
}
diff --git a/model/engine-model/src/test/java/org/onap/policy/apex/model/enginemodel/concepts/EngineModelTest.java b/model/engine-model/src/test/java/org/onap/policy/apex/model/enginemodel/concepts/EngineModelTest.java
index d0694ec30..6e4fbbf05 100644
--- a/model/engine-model/src/test/java/org/onap/policy/apex/model/enginemodel/concepts/EngineModelTest.java
+++ b/model/engine-model/src/test/java/org/onap/policy/apex/model/enginemodel/concepts/EngineModelTest.java
@@ -1,20 +1,20 @@
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * Modifications Copyright (C) 2019 Nordix Foundation.
+ * Modifications Copyright (C) 2019-2020 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- *
+ *
* SPDX-License-Identifier: Apache-2.0
* ============LICENSE_END=========================================================
*/
@@ -22,7 +22,6 @@
package org.onap.policy.apex.model.enginemodel.concepts;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
@@ -112,36 +111,36 @@ public class EngineModelTest {
final AxEngineModel clonedModel = new AxEngineModel(model);
- assertFalse(model.hashCode() == 0);
-
- assertTrue(model.equals(model));
- assertTrue(model.equals(clonedModel));
- assertFalse(model.equals((Object) "Hello"));
- assertFalse(model.equals(new AxEngineModel(new AxArtifactKey())));
- assertFalse(model.equals(new AxEngineModel(new AxArtifactKey(), new AxContextSchemas(schemasKey),
- new AxKeyInformation(keyInfoKey), new AxContextAlbums(albumKey), AxEngineState.READY, stats)));
- assertFalse(model.equals(new AxEngineModel(modelKey, new AxContextSchemas(), new AxKeyInformation(keyInfoKey),
- new AxContextAlbums(albumKey), AxEngineState.READY, stats)));
- assertFalse(model.equals(new AxEngineModel(modelKey, new AxContextSchemas(schemasKey), new AxKeyInformation(),
- new AxContextAlbums(albumKey), AxEngineState.READY, stats)));
- assertFalse(model.equals(new AxEngineModel(modelKey, new AxContextSchemas(schemasKey),
- new AxKeyInformation(keyInfoKey), new AxContextAlbums(), AxEngineState.READY, stats)));
- assertFalse(model.equals(new AxEngineModel(modelKey, new AxContextSchemas(schemasKey),
- new AxKeyInformation(keyInfoKey), new AxContextAlbums(albumKey), AxEngineState.STOPPED, stats)));
- assertFalse(model.equals(new AxEngineModel(modelKey, new AxContextSchemas(schemasKey),
- new AxKeyInformation(keyInfoKey), new AxContextAlbums(albumKey), AxEngineState.READY, otherStats)));
+ assertNotEquals(0, model.hashCode());
+
+ assertEquals(model, model);
+ assertEquals(model, clonedModel);
+ assertNotEquals(model, (Object) "Hello");
+ assertNotEquals(model, new AxEngineModel(new AxArtifactKey()));
+ assertNotEquals(model, new AxEngineModel(new AxArtifactKey(), new AxContextSchemas(schemasKey),
+ new AxKeyInformation(keyInfoKey), new AxContextAlbums(albumKey), AxEngineState.READY, stats));
+ assertNotEquals(model, new AxEngineModel(modelKey, new AxContextSchemas(), new AxKeyInformation(keyInfoKey),
+ new AxContextAlbums(albumKey), AxEngineState.READY, stats));
+ assertNotEquals(model, new AxEngineModel(modelKey, new AxContextSchemas(schemasKey), new AxKeyInformation(),
+ new AxContextAlbums(albumKey), AxEngineState.READY, stats));
+ assertNotEquals(model, new AxEngineModel(modelKey, new AxContextSchemas(schemasKey),
+ new AxKeyInformation(keyInfoKey), new AxContextAlbums(), AxEngineState.READY, stats));
+ assertNotEquals(model, new AxEngineModel(modelKey, new AxContextSchemas(schemasKey),
+ new AxKeyInformation(keyInfoKey), new AxContextAlbums(albumKey), AxEngineState.STOPPED, stats));
+ assertNotEquals(model, new AxEngineModel(modelKey, new AxContextSchemas(schemasKey),
+ new AxKeyInformation(keyInfoKey), new AxContextAlbums(albumKey), AxEngineState.READY, otherStats));
model.setTimestamp(timestamp);
- assertFalse(model.equals(new AxEngineModel(modelKey, new AxContextSchemas(schemasKey),
- new AxKeyInformation(keyInfoKey), new AxContextAlbums(albumKey), AxEngineState.READY, stats)));
+ assertNotEquals(model, new AxEngineModel(modelKey, new AxContextSchemas(schemasKey),
+ new AxKeyInformation(keyInfoKey), new AxContextAlbums(albumKey), AxEngineState.READY, stats));
model.setTimestamp(0);
- assertTrue(model.equals(new AxEngineModel(modelKey, new AxContextSchemas(schemasKey),
- new AxKeyInformation(keyInfoKey), new AxContextAlbums(albumKey), AxEngineState.READY, stats)));
+ assertEquals(model, new AxEngineModel(modelKey, new AxContextSchemas(schemasKey),
+ new AxKeyInformation(keyInfoKey), new AxContextAlbums(albumKey), AxEngineState.READY, stats));
model.setTimestamp(-1);
assertEquals(0, model.compareTo(model));
assertEquals(0, model.compareTo(clonedModel));
assertNotEquals(0, model.compareTo(new AxArtifactKey()));
- assertFalse(model.equals(new AxEngineModel(new AxArtifactKey())));
+ assertNotEquals(model, new AxEngineModel(new AxArtifactKey()));
assertNotEquals(0, model.compareTo(new AxEngineModel(new AxArtifactKey(), new AxContextSchemas(schemasKey),
new AxKeyInformation(keyInfoKey), new AxContextAlbums(albumKey), AxEngineState.READY, stats)));
assertNotEquals(0, model.compareTo(new AxEngineModel(modelKey, new AxContextSchemas(),
diff --git a/model/engine-model/src/test/java/org/onap/policy/apex/model/enginemodel/concepts/EngineStatsTest.java b/model/engine-model/src/test/java/org/onap/policy/apex/model/enginemodel/concepts/EngineStatsTest.java
index 9e603f491..9f48d1da5 100644
--- a/model/engine-model/src/test/java/org/onap/policy/apex/model/enginemodel/concepts/EngineStatsTest.java
+++ b/model/engine-model/src/test/java/org/onap/policy/apex/model/enginemodel/concepts/EngineStatsTest.java
@@ -22,7 +22,6 @@
package org.onap.policy.apex.model.enginemodel.concepts;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
@@ -137,15 +136,15 @@ public class EngineStatsTest {
assertNotNull(stats.getKeys());
- assertFalse(stats.hashCode() == 0);
+ assertNotEquals(0, stats.hashCode());
- assertTrue(stats.equals(stats));
- assertTrue(stats.equals(clonedStats));
- assertFalse(stats.equals(null));
+ assertEquals(stats, stats);
+ assertEquals(stats, clonedStats);
+ assertNotNull(stats);
Object helloObject = "Hello";
- assertFalse(stats.equals(helloObject));
- assertFalse(stats.equals(new AxEngineStats(new AxReferenceKey())));
+ assertNotEquals(stats, helloObject);
+ assertNotEquals(stats, new AxEngineStats(new AxReferenceKey()));
assertEquals(0, stats.compareTo(stats));
assertEquals(0, stats.compareTo(clonedStats));
@@ -154,51 +153,51 @@ public class EngineStatsTest {
assertNotEquals(0, stats.compareTo(new AxEngineStats(new AxReferenceKey())));
stats.setTimeStamp(1);
- assertFalse(stats.equals(new AxEngineStats(statsKey)));
+ assertNotEquals(stats, new AxEngineStats(statsKey));
assertNotEquals(0, stats.compareTo(new AxEngineStats(statsKey)));
stats.setTimeStamp(0);
- assertTrue(stats.equals(new AxEngineStats(statsKey)));
+ assertEquals(stats, new AxEngineStats(statsKey));
assertEquals(0, stats.compareTo(new AxEngineStats(statsKey)));
stats.setEventCount(1);
- assertFalse(stats.equals(new AxEngineStats(statsKey)));
+ assertNotEquals(stats, new AxEngineStats(statsKey));
assertNotEquals(0, stats.compareTo(new AxEngineStats(statsKey)));
stats.setEventCount(0);
- assertTrue(stats.equals(new AxEngineStats(statsKey)));
+ assertEquals(stats, new AxEngineStats(statsKey));
assertEquals(0, stats.compareTo(new AxEngineStats(statsKey)));
stats.setLastExecutionTime(1);
- assertFalse(stats.equals(new AxEngineStats(statsKey)));
+ assertNotEquals(stats, new AxEngineStats(statsKey));
assertNotEquals(0, stats.compareTo(new AxEngineStats(statsKey)));
stats.setLastExecutionTime(0);
- assertTrue(stats.equals(new AxEngineStats(statsKey)));
+ assertEquals(stats, new AxEngineStats(statsKey));
assertEquals(0, stats.compareTo(new AxEngineStats(statsKey)));
stats.setAverageExecutionTime(1);
- assertFalse(stats.equals(new AxEngineStats(statsKey)));
+ assertNotEquals(stats, new AxEngineStats(statsKey));
assertNotEquals(0, stats.compareTo(new AxEngineStats(statsKey)));
stats.setAverageExecutionTime(0);
- assertTrue(stats.equals(new AxEngineStats(statsKey)));
+ assertEquals(stats, new AxEngineStats(statsKey));
assertEquals(0, stats.compareTo(new AxEngineStats(statsKey)));
stats.setUpTime(1);
- assertFalse(stats.equals(new AxEngineStats(statsKey)));
+ assertNotEquals(stats, new AxEngineStats(statsKey));
assertNotEquals(0, stats.compareTo(new AxEngineStats(statsKey)));
stats.setUpTime(0);
- assertTrue(stats.equals(new AxEngineStats(statsKey)));
+ assertEquals(stats, new AxEngineStats(statsKey));
assertEquals(0, stats.compareTo(new AxEngineStats(statsKey)));
assertEquals(-1, stats.compareTo(new AxEngineStats(statsKey, 0, 0, 0, 0.0, 0, 1)));
stats.engineStart();
- assertFalse(stats.equals(new AxEngineStats(statsKey)));
+ assertNotEquals(stats, new AxEngineStats(statsKey));
final AxEngineStats newStats = new AxEngineStats(statsKey);
newStats.setTimeStamp(stats.getTimeStamp());
- assertFalse(stats.equals(newStats));
+ assertNotEquals(stats, newStats);
assertNotEquals(0, stats.compareTo(newStats));
stats.engineStop();
stats.reset();
- assertTrue(stats.equals(new AxEngineStats(statsKey)));
+ assertEquals(stats, new AxEngineStats(statsKey));
assertEquals(0, stats.compareTo(new AxEngineStats(statsKey)));
}
diff --git a/model/engine-model/src/test/java/org/onap/policy/apex/model/enginemodel/handling/ApexEngineModelTest.java b/model/engine-model/src/test/java/org/onap/policy/apex/model/enginemodel/handling/ApexEngineModelTest.java
index 770c29a93..063424b3d 100644
--- a/model/engine-model/src/test/java/org/onap/policy/apex/model/enginemodel/handling/ApexEngineModelTest.java
+++ b/model/engine-model/src/test/java/org/onap/policy/apex/model/enginemodel/handling/ApexEngineModelTest.java
@@ -1,6 +1,7 @@
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2016-2018 Ericsson. All rights reserved.
+ * Modifications Copyright (C) 2020 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -20,7 +21,7 @@
package org.onap.policy.apex.model.enginemodel.handling;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertEquals;
import org.junit.Before;
import org.junit.Test;
@@ -45,19 +46,19 @@ public class ApexEngineModelTest {
@Test
public void testModelValid() throws Exception {
final AxValidationResult result = testApexModel.testApexModelValid();
- assertTrue(result.toString().equals(VALID_MODEL_STRING));
+ assertEquals(VALID_MODEL_STRING, result.toString());
}
@Test
public void testModelVaidateInvalidModel() throws Exception {
final AxValidationResult result = testApexModel.testApexModelVaidateInvalidModel();
- assertTrue(result.toString().equals(INVALID_MODEL_STRING));
+ assertEquals(INVALID_MODEL_STRING, result.toString());
}
@Test
public void testModelVaidateMalstructured() throws Exception {
final AxValidationResult result = testApexModel.testApexModelVaidateMalstructured();
- assertTrue(result.toString().equals(INVALID_MODEL_MALSTRUCTURED_STRING));
+ assertEquals(INVALID_MODEL_MALSTRUCTURED_STRING, result.toString());
}
@Test
diff --git a/model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/concepts/EventModelTest.java b/model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/concepts/EventModelTest.java
index 3ae5ac267..c86ba12e7 100644
--- a/model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/concepts/EventModelTest.java
+++ b/model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/concepts/EventModelTest.java
@@ -1,7 +1,7 @@
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * Modifications Copyright (C) 2019 Nordix Foundation.
+ * Modifications Copyright (C) 2019-2020 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -22,10 +22,8 @@
package org.onap.policy.apex.model.eventmodel.concepts;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
import org.junit.Test;
import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
@@ -59,20 +57,20 @@ public class EventModelTest {
final AxEventModel clonedModel = new AxEventModel(model);
- assertFalse(model.hashCode() == 0);
+ assertNotEquals(0, model.hashCode());
- assertTrue(model.equals(model));
- assertTrue(model.equals(clonedModel));
- assertFalse(model.equals((Object) "Hello"));
- assertFalse(model.equals(new AxEventModel(new AxArtifactKey())));
- assertFalse(model.equals(new AxEventModel(modelKey, new AxContextSchemas(), new AxKeyInformation(keyInfoKey),
- new AxEvents(eventsKey))));
- assertFalse(model.equals(new AxEventModel(modelKey, new AxContextSchemas(schemasKey), new AxKeyInformation(),
- new AxEvents(eventsKey))));
- assertFalse(model.equals(new AxEventModel(modelKey, new AxContextSchemas(schemasKey),
- new AxKeyInformation(keyInfoKey), new AxEvents())));
- assertTrue(model.equals(new AxEventModel(modelKey, new AxContextSchemas(schemasKey),
- new AxKeyInformation(keyInfoKey), new AxEvents(eventsKey))));
+ assertEquals(model, model);
+ assertEquals(model, clonedModel);
+ assertNotEquals(model, (Object) "Hello");
+ assertNotEquals(model, new AxEventModel(new AxArtifactKey()));
+ assertNotEquals(model, new AxEventModel(modelKey, new AxContextSchemas(), new AxKeyInformation(keyInfoKey),
+ new AxEvents(eventsKey)));
+ assertNotEquals(model, new AxEventModel(modelKey, new AxContextSchemas(schemasKey), new AxKeyInformation(),
+ new AxEvents(eventsKey)));
+ assertNotEquals(model, new AxEventModel(modelKey, new AxContextSchemas(schemasKey),
+ new AxKeyInformation(keyInfoKey), new AxEvents()));
+ assertEquals(model, new AxEventModel(modelKey, new AxContextSchemas(schemasKey),
+ new AxKeyInformation(keyInfoKey), new AxEvents(eventsKey)));
assertEquals(0, model.compareTo(model));
assertEquals(0, model.compareTo(clonedModel));
diff --git a/model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/concepts/EventsTest.java b/model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/concepts/EventsTest.java
index a82be12be..629df1a5f 100644
--- a/model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/concepts/EventsTest.java
+++ b/model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/concepts/EventsTest.java
@@ -1,7 +1,7 @@
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * Modifications Copyright (C) 2019 Nordix Foundation.
+ * Modifications Copyright (C) 2019-2020 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -22,7 +22,6 @@
package org.onap.policy.apex.model.eventmodel.concepts;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
@@ -186,19 +185,19 @@ public class EventsTest {
assertEquals("AxEvent:(key=AxArtifactKey:(name=EventName,version=0.0.1),nameSpace=namespace",
clonedEvent.toString().substring(0, 77));
- assertFalse(event.hashCode() == 0);
+ assertNotEquals(0, event.hashCode());
- assertTrue(event.equals(event));
- assertTrue(event.equals(clonedEvent));
- assertFalse(event.equals(null));
- assertFalse(event.equals((Object) "Hello"));
- assertFalse(
- event.equals(new AxEvent(AxArtifactKey.getNullKey(), "namespace", "source", "target", parameterMap)));
- assertFalse(event.equals(new AxEvent(eventKey, "namespace1", "source", "target", parameterMap)));
- assertFalse(event.equals(new AxEvent(eventKey, "namespace", "source2", "target", parameterMap)));
- assertFalse(event.equals(new AxEvent(eventKey, "namespace", "source", "target3", parameterMap)));
- assertFalse(event.equals(new AxEvent(eventKey, "namespace", "source", "target", parameterMapEmpty)));
- assertTrue(event.equals(new AxEvent(eventKey, "namespace", "source", "target", parameterMap)));
+ assertEquals(event, event);
+ assertEquals(event, clonedEvent);
+ assertNotNull(event);
+ assertNotEquals(event, (Object) "Hello");
+ assertNotEquals(
+ event, new AxEvent(AxArtifactKey.getNullKey(), "namespace", "source", "target", parameterMap));
+ assertNotEquals(event, new AxEvent(eventKey, "namespace1", "source", "target", parameterMap));
+ assertNotEquals(event, new AxEvent(eventKey, "namespace", "source2", "target", parameterMap));
+ assertNotEquals(event, new AxEvent(eventKey, "namespace", "source", "target3", parameterMap));
+ assertNotEquals(event, new AxEvent(eventKey, "namespace", "source", "target", parameterMapEmpty));
+ assertEquals(event, new AxEvent(eventKey, "namespace", "source", "target", parameterMap));
assertEquals(0, event.compareTo(event));
assertEquals(0, event.compareTo(clonedEvent));
@@ -269,13 +268,13 @@ public class EventsTest {
assertEquals("AxEvents:(key=AxArtifactKey:(name=EventsKey,version=0.0.1),e",
clonedEvents.toString().substring(0, 60));
- assertFalse(events.hashCode() == 0);
+ assertNotEquals(0, events.hashCode());
- assertTrue(events.equals(events));
- assertTrue(events.equals(clonedEvents));
- assertFalse(events.equals(null));
- assertFalse(events.equals((Object) "Hello"));
- assertFalse(events.equals(new AxEvents(new AxArtifactKey())));
+ assertEquals(events, events);
+ assertEquals(events, clonedEvents);
+ assertNotNull(events);
+ assertNotEquals(events, (Object) "Hello");
+ assertNotEquals(events, new AxEvents(new AxArtifactKey()));
assertEquals(0, events.compareTo(events));
assertEquals(0, events.compareTo(clonedEvents));
diff --git a/model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/concepts/FieldTest.java b/model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/concepts/FieldTest.java
index a2587b503..e5a01ed6f 100644
--- a/model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/concepts/FieldTest.java
+++ b/model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/concepts/FieldTest.java
@@ -1,7 +1,7 @@
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * Modifications Copyright (C) 2019 Nordix Foundation.
+ * Modifications Copyright (C) 2019-2020 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -22,10 +22,8 @@
package org.onap.policy.apex.model.eventmodel.concepts;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
import org.junit.Test;
import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
@@ -35,7 +33,7 @@ import org.onap.policy.apex.model.basicmodel.concepts.AxValidationResult.Validat
/**
* Test fields.
- *
+ *
* @author Liam Fallon (liam.fallon@ericsson.com)
*/
public class FieldTest {
@@ -110,16 +108,16 @@ public class FieldTest {
+ "parentLocalName=PLN,localName=LN),fieldSchemaKey="
+ "AxArtifactKey:(name=SchemaName,version=0.0.1),optional=true)", clonedField.toString());
- assertFalse(field.hashCode() == 0);
+ assertNotEquals(0, field.hashCode());
- assertTrue(field.equals(field));
- assertTrue(field.equals(clonedField));
- assertFalse(field.equals(null));
- assertFalse(field.equals((Object) "Hello"));
- assertFalse(field.equals(new AxField(AxReferenceKey.getNullKey(), AxArtifactKey.getNullKey(), false)));
- assertFalse(field.equals(new AxField(fieldKey, AxArtifactKey.getNullKey(), false)));
- assertFalse(field.equals(new AxField(fieldKey, schemaKey, false)));
- assertTrue(field.equals(new AxField(fieldKey, schemaKey, true)));
+ assertEquals(field, field);
+ assertEquals(field, clonedField);
+ assertNotNull(field);
+ assertNotEquals(field, (Object) "Hello");
+ assertNotEquals(field, new AxField(AxReferenceKey.getNullKey(), AxArtifactKey.getNullKey(), false));
+ assertNotEquals(field, new AxField(fieldKey, AxArtifactKey.getNullKey(), false));
+ assertNotEquals(field, new AxField(fieldKey, schemaKey, false));
+ assertEquals(field, new AxField(fieldKey, schemaKey, true));
assertEquals(0, field.compareTo(field));
assertEquals(0, field.compareTo(clonedField));
diff --git a/model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/handling/ApexEventModelTest.java b/model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/handling/ApexEventModelTest.java
index db752a61b..c31597413 100644
--- a/model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/handling/ApexEventModelTest.java
+++ b/model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/handling/ApexEventModelTest.java
@@ -1,6 +1,7 @@
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2016-2018 Ericsson. All rights reserved.
+ * Modifications Copyright (C) 2020 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -20,7 +21,7 @@
package org.onap.policy.apex.model.eventmodel.handling;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertEquals;
import org.junit.Before;
import org.junit.Test;
@@ -45,31 +46,31 @@ public class ApexEventModelTest {
@Test
public void testModelValid() throws Exception {
final AxValidationResult result = testApexModel.testApexModelValid();
- assertTrue(result.toString().equals(VALID_MODEL_STRING));
+ assertEquals(VALID_MODEL_STRING, result.toString());
}
@Test
public void testApexModelVaidateObservation() throws Exception {
final AxValidationResult result = testApexModel.testApexModelVaidateObservation();
- assertTrue(result.toString().equals(OBSERVATION_MODEL_STRING));
+ assertEquals(OBSERVATION_MODEL_STRING, result.toString());
}
@Test
public void testApexModelVaidateWarning() throws Exception {
final AxValidationResult result = testApexModel.testApexModelVaidateWarning();
- assertTrue(result.toString().equals(WARNING_MODEL_STRING));
+ assertEquals(WARNING_MODEL_STRING, result.toString());
}
@Test
public void testModelVaidateInvalidModel() throws Exception {
final AxValidationResult result = testApexModel.testApexModelVaidateInvalidModel();
- assertTrue(result.toString().equals(INVALID_MODEL_STRING));
+ assertEquals(INVALID_MODEL_STRING, result.toString());
}
@Test
public void testModelVaidateMalstructured() throws Exception {
final AxValidationResult result = testApexModel.testApexModelVaidateMalstructured();
- assertTrue(result.toString().equals(INVALID_MODEL_MALSTRUCTURED_STRING));
+ assertEquals(INVALID_MODEL_MALSTRUCTURED_STRING, result.toString());
}
@Test
diff --git a/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiContextAlbumTest.java b/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiContextAlbumTest.java
index 0d442e95f..e6ed351ae 100644
--- a/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiContextAlbumTest.java
+++ b/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiContextAlbumTest.java
@@ -1,19 +1,20 @@
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2016-2018 Ericsson. All rights reserved.
+ * Modifications Copyright (C) 2020 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- *
+ *
* SPDX-License-Identifier: Apache-2.0
* ============LICENSE_END=========================================================
*/
@@ -21,7 +22,6 @@
package org.onap.policy.apex.model.modelapi;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
import org.junit.Test;
@@ -41,49 +41,49 @@ public class ApexEditorApiContextAlbumTest {
assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.loadFromFile("src/test/resources/models/PolicyModel.json");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.createContextAlbum("MyMap002", "0.0.2", "APPLICATION", "true", "MapType", "0.0.1",
"1fa2e430-f2b2-11e6-bc64-92361f002700", "A description of 002");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.createContextAlbum("MyMap012", "0.1.2", "ZOOBY", "false", "MapType", "0.0.1",
"1fa2e430-f2b2-11e6-bc64-92361f002700", "A description of 012");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.createContextAlbum("MyMap012", "0.1.4", "UNDEFINED", null, "MapType", "0.0.1",
"1fa2e430-f2b2-11e6-bc64-92361f002700", "A description of 014");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.createContextAlbum("MyMap012", null, null, null, null, null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.createContextAlbum("MyMap012", null, "EPHEMERAL", null, null, null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.createContextAlbum("MyMap012", null, "EPHEMERAL", "false", null, null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.createContextAlbum("MyMap012", null, "EPHEMERAL", "false", "", null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.createContextAlbum("MyMap012", null, "EPHEMERAL", "false", "+++", null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.createContextAlbum("MyMap012", null, "EPHEMERAL", "false", "MapZooby", null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.createContextAlbum("MyMap012", null, "EPHEMERAL", "false", "MapType", "--++", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.createContextAlbum("MyMap012", null, "EPHEMERAL", "false", "MapType", "0.0.2", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.createContextAlbum("MyMap012", null, "EPHEMERAL", "false", "MapType", "0.0.1", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.createContextAlbum("MyMap012", null, "EPHEMERAL", "false", "MapType", null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_EXISTS));
+ assertEquals(ApexApiResult.Result.CONCEPT_EXISTS, result.getResult());
result = apexModel.createContextAlbum("MyMap002", "0.0.2", "APPLICATION", "true", "MapType", null,
"1fa2e430-f2b2-11e6-bc64-92361f002700", "A description of 002");
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_EXISTS));
+ assertEquals(ApexApiResult.Result.CONCEPT_EXISTS, result.getResult());
result = apexModel.createContextAlbum("MyMap011", "0.1.2", "APPLICATION", "true", "MapType", "0.0.1",
"1fa2e430-f2b2-11e6-bc64-92361f002700", "A description of 002");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.deleteContextAlbum("MyMap012", "0.1.2");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.createContextAlbum("MyMap012", "0.1.2", "ZOOBY", "false", "MapType", "0.0.1",
"1fa2e430-f2b2-11e6-bc64-92361f002700", "A description of 012");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.validateContextAlbum(null, null);
assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
@@ -91,84 +91,84 @@ public class ApexEditorApiContextAlbumTest {
result = apexModel.updateContextAlbum(null, null, null, null, null, null, null, null);
assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.updateContextAlbum("MyMap002", "0.0.2", null, null, null, null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.updateContextAlbum("MyMap002", "0.0.2", "ZOOBY", "true", null, null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.updateContextAlbum("MyMap002", "0.0.2", null, null, null, null,
"1fa2e430-f2b2-11e6-bc64-92361f002700", "A description of 002");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.updateContextAlbum("MyMap012", null, null, null, null, null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.updateContextAlbum("MyMap012", null, null, "true", null, null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.updateContextAlbum("MyMap012", null, "APPLICATION", null, null, null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.updateContextAlbum("MyMap015", null, null, null, null, null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.updateContextAlbum("MyMap014", "0.1.5", null, null, null, null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.updateContextAlbum("MyMap012", null, "APPLICATION", "false", null, null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.updateContextAlbum("MyMap012", null, "APPLICATION", "false", "StringType", null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.updateContextAlbum("MyMap012", null, "APPLICATION", "false", "String", null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.updateContextAlbum("MyMap012", null, "APPLICATION", "false", "StringType", "0.0.2", null,
null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.updateContextAlbum("MyMap012", null, "APPLICATION", "false", "StringType", "0.0.1", null,
null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.updateContextAlbum("MyMap012", null, "APPLICATION", "Hello", "StringType", "0.0.1", null,
null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.listContextAlbum("@£%%$", null);
assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.listContextAlbum(null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.listContextAlbum("MyMap012", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.listContextAlbum("MyMap012", "0.0.2");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.listContextAlbum("MyMap012", "0.2.5");
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.listContextAlbum("MyMap014", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.deleteContextAlbum("@£%%$", null);
assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.deleteContextAlbum("MyMap012", "0.1.1");
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.deleteContextAlbum("MyMap012oooo", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.listContextAlbum("MyMap012", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
- assertTrue(result.getMessages().size() == 3);
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
+ assertEquals(3, result.getMessages().size());
result = apexModel.deleteContextAlbum("MyMap012", "0.1.2");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.listContextAlbum("MyMap012", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
- assertTrue(result.getMessages().size() == 2);
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
+ assertEquals(2, result.getMessages().size());
result = apexModel.deleteContextAlbum("MyMap012", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.listContextAlbum("MyMap012", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.deleteContextAlbum(null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
assertEquals(4, result.getMessages().size());
result = apexModel.listContextAlbum(null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
assertEquals(0, result.getMessages().size());
}
}
diff --git a/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiContextSchemaTest.java b/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiContextSchemaTest.java
index 9f297203b..04605f4a1 100644
--- a/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiContextSchemaTest.java
+++ b/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiContextSchemaTest.java
@@ -1,19 +1,20 @@
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2016-2018 Ericsson. All rights reserved.
+ * Modifications Copyright (C) 2020 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- *
+ *
* SPDX-License-Identifier: Apache-2.0
* ============LICENSE_END=========================================================
*/
@@ -21,7 +22,6 @@
package org.onap.policy.apex.model.modelapi;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
import org.junit.Test;
@@ -41,45 +41,45 @@ public class ApexEditorApiContextSchemaTest {
assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.loadFromFile("src/test/resources/models/PolicyModel.json");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.listContextSchemas(null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.createContextSchema("Hello", "0.0.2", "Java", "java.lang.String",
"1fa2e430-f2b2-11e6-bc64-92361f002671", "A description of hello");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.createContextSchema("Hello", "0.1.2", "Java", "java.lang.String",
"1fa2e430-f2b2-11e6-bc64-92361f002672", "A description of hola");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.createContextSchema("Hello", "0.1.4", "Java", "java.lang.String",
"1fa2e430-f2b2-11e6-bc64-92361f002672", "A description of connichi wa");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.createContextSchema("Hello", null, "Java", "java.lang.String", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.createContextSchema("Hello", null, "Java", "java.lang.String", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_EXISTS));
+ assertEquals(ApexApiResult.Result.CONCEPT_EXISTS, result.getResult());
result = apexModel.deleteContextSchema("Hello", "0.1.4");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.createContextSchema("Hello", "0.1.4", "Java", "java.lang.String",
"1fa2e430-f2b2-11e6-bc64-92361f002672", "A description of connichi wa");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.createContextSchema("Hello2", null, null, "java.lang.String", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.createContextSchema("Hello2", null, null, null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.createContextSchema("Hello2", null, "Java", "java.lang.String", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.createContextSchema("Hello", "0.1.2", "Java", "java.lang.Float",
"1fa2e430-f2b2-11e6-bc64-92361f002672", "A description of hola");
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_EXISTS));
+ assertEquals(ApexApiResult.Result.CONCEPT_EXISTS, result.getResult());
result = apexModel.deleteContextSchema("Hello", "0.1.4");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.createContextSchema("Hello", "0.1.4", "Java", "java.lang.String",
"1fa2e430-f2b2-11e6-bc64-92361f002672", "A description of connichi wa");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.validateContextSchemas(null, null);
assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
@@ -88,66 +88,66 @@ public class ApexEditorApiContextSchemaTest {
assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.updateContextSchema("Hello", "0.0.2", null, null, null, "An updated description of hello");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.updateContextSchema("Hello", "0.0.2", null, null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.updateContextSchema("Hello", "0.1.2", "Java", "java.lang.Integer",
"1fa2e430-f2b2-11e6-bc64-92361f002673", "A further updated description of hola");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.updateContextSchema("Hello2", "0.0.2", null, null, null, "An updated description of hello");
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.listContextSchemas("@£%%$", null);
assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.listContextSchemas("Hello", "0.1.2");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
- assertTrue(result.getMessages().size() == 2);
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
+ assertEquals(2, result.getMessages().size());
result = apexModel.listContextSchemas("Hello", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
- assertTrue(result.getMessages().size() == 4);
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
+ assertEquals(4, result.getMessages().size());
result = apexModel.listContextSchemas(null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
- assertTrue(result.getMessages().size() == 9);
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
+ assertEquals(9, result.getMessages().size());
result = apexModel.deleteContextSchema("@£%%$", null);
assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.deleteContextSchema("Hello", "0.1.1");
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.deleteContextSchema("Hellooooo", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.listContextSchemas("Hello", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
- assertTrue(result.getMessages().size() == 4);
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
+ assertEquals(4, result.getMessages().size());
result = apexModel.deleteContextSchema("Hello", "0.1.2");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.listContextSchemas("Hello", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
- assertTrue(result.getMessages().size() == 3);
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
+ assertEquals(3, result.getMessages().size());
result = apexModel.deleteContextSchema("Hello", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.listContextSchemas("Hello", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.listContextSchemas(null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.deleteContextSchema(null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
assertEquals(5, result.getMessages().size());
result = apexModel.listContextSchemas(null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
assertEquals(0, result.getMessages().size());
}
}
diff --git a/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiEventTest.java b/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiEventTest.java
index 6bb85a634..bc46ee3d3 100644
--- a/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiEventTest.java
+++ b/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiEventTest.java
@@ -1,19 +1,20 @@
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2016-2018 Ericsson. All rights reserved.
+ * Modifications Copyright (C) 2020 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- *
+ *
* SPDX-License-Identifier: Apache-2.0
* ============LICENSE_END=========================================================
*/
@@ -21,7 +22,6 @@
package org.onap.policy.apex.model.modelapi;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
import org.junit.Test;
@@ -41,33 +41,33 @@ public class ApexEditorApiEventTest {
assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.loadFromFile("src/test/resources/models/PolicyModel.json");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.createEvent("MyEvent002", "0.0.2", "My Namespace", "My Source", "my target",
"1fa2e430-f2b2-11e6-bc64-92361f002700", "A description of 002");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.createEvent("MyEvent012", "0.1.2", "My Namespace", "My Source", "my target",
"1fa2e430-f2b2-11e6-bc64-92361f002700", "A description of 012");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.createEvent("MyEvent012", "0.1.4", "My Namespace", "My Source", "my target",
"1fa2e430-f2b2-11e6-bc64-92361f002700", "A description of 014");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.createEvent("MyEvent012", null, null, null, null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.createEvent("MyEvent012", null, null, null, null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_EXISTS));
+ assertEquals(ApexApiResult.Result.CONCEPT_EXISTS, result.getResult());
result = apexModel.createEvent("MyEvent002", "0.0.2", "My Namespace", "My Source", "my target",
"1fa2e430-f2b2-11e6-bc64-92361f002700", "A description of 002");
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_EXISTS));
+ assertEquals(ApexApiResult.Result.CONCEPT_EXISTS, result.getResult());
result = apexModel.createEvent("@£$%^", "0.2.5", "My Namespace", "My Source", "my target",
"1fa2e430-f2b2-11e6-bc64-92361f002700", "A description of 002");
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.deleteEvent("MyEvent012", "0.1.4");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.createEvent("MyEvent012", "0.1.4", "My Namespace", "My Source", "my target",
"1fa2e430-f2b2-11e6-bc64-92361f002700", "A description of 014");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.validateEvent(null, null);
assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
@@ -75,123 +75,123 @@ public class ApexEditorApiEventTest {
result = apexModel.updateContextSchema(null, null, null, null, null, null);
assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.updateEvent("MyEvent012", "0.1.2", "Another Namespace", null, "Another target", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.updateEvent("MyEvent002", "0.0.2", "My Namespace", "My Source", "my target",
"1fa2e430-f2b2-11e6-bc64-92361f002700", "A description of 002");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.updateEvent("MyEvent012", null, null, null, null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.updateEvent("MyEvent015", null, null, null, null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.updateEvent("MyEvent014", "0.1.5", null, null, null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.updateEvent("@£$%^^", "0.6.9", null, null, null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.listEvent("@£$%", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.listEvent(null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.listEvent("MyEvent012", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.listEvent("MyEvent012", "0.0.2");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.listEvent("MyEvent012", "0.2.5");
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.listEvent("MyEvent123", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.deleteEvent("@£$%^", "0.1.1");
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.deleteEvent("MyEvent012", "0.1.1");
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.deleteEvent("MyEvent012oooo", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.listEvent("MyEvent012", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
- assertTrue(result.getMessages().size() == 3);
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
+ assertEquals(3, result.getMessages().size());
result = apexModel.deleteEvent("MyEvent012", "0.1.2");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.listEvent("MyEvent012", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
- assertTrue(result.getMessages().size() == 2);
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
+ assertEquals(2, result.getMessages().size());
result = apexModel.deleteEvent("MyEvent012", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.listEvent("MyEvent012", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.createEventPar("MyEvent123", null, "NewPar00", null, null, false);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.createEventPar("MyEvent002", "4.5.6", "NewPar00", null, null, true);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.createEventPar("MyEvent002", "0.1.4", "NewPar00", null, null, false);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.createEventPar("MyEvent002", "0.0.2", "NewPar00", null, null, true);
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.createEventPar("MyEvent002", "0.0.2", "NewPar00", "eventContextItem0", null, false);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.createEventPar("MyEvent002", "0.0.2", "NewPar00", "eventContextItem0", null, true);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_EXISTS));
+ assertEquals(ApexApiResult.Result.CONCEPT_EXISTS, result.getResult());
result = apexModel.createEventPar("MyEvent002", "0.0.2", "NewPar01", "eventContextItem0", "0.0.1", false);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.createEventPar("MyEvent002", "0.0.2", "NewPar02", "eventContextItem0", "0.0.2", true);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.createEventPar("MyEvent002", null, "NewPar02", "eventContextItem0", null, false);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.createEventPar("MyEvent002", null, "NewPar03", "eventContextItem0", null, true);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.listEventPar("@£%%$", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.listEventPar("MyEvent002", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.listEventPar("MyEvent002", "0.0.1", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.listEventPar("MyEvent002", "0.0.2", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.listEventPar("MyEvent002", "0.0.2", "NewPar01");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.listEventPar("MyEvent002", "0.0.2", "NewPar02");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.listEventPar("MyEvent002", "0.0.2", "NewPar04");
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.deleteEventPar("@££%%%", "0.0.2", "NewPar04");
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.deleteEventPar("NonExistantEvent", "0.0.2", "NewPar04");
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
assertEquals(4, apexModel.listEventPar("MyEvent002", null, null).getMessages().size());
result = apexModel.deleteEventPar("MyEvent002", "0.0.2", "NewPar04");
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
assertEquals(4, apexModel.listEventPar("MyEvent002", null, null).getMessages().size());
result = apexModel.deleteEventPar("MyEvent002", null, "NewPar02");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
assertEquals(3, apexModel.listEventPar("MyEvent002", null, null).getMessages().size());
result = apexModel.deleteEventPar("MyEvent002", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.listEventPar("MyEvent002", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.deleteEventPar("MyEvent002", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.listEventPar("MyEvent002", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.deleteEvent(null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
assertEquals(4, result.getMessages().size());
result = apexModel.listEvent(null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
assertEquals(0, result.getMessages().size());
}
}
diff --git a/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiKeyInfoTest.java b/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiKeyInfoTest.java
index 3635abbe0..caa25e4a4 100644
--- a/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiKeyInfoTest.java
+++ b/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiKeyInfoTest.java
@@ -1,19 +1,20 @@
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2016-2018 Ericsson. All rights reserved.
+ * Modifications Copyright (C) 2020 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- *
+ *
* SPDX-License-Identifier: Apache-2.0
* ============LICENSE_END=========================================================
*/
@@ -21,7 +22,6 @@
package org.onap.policy.apex.model.modelapi;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
import org.junit.Test;
@@ -42,28 +42,28 @@ public class ApexEditorApiKeyInfoTest {
assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.loadFromFile("src/test/resources/models/PolicyModel.json");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.createKeyInformation(null, null, null, null);
assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.createKeyInformation("Hello", "0.0.2", "1fa2e430-f2b2-11e6-bc64-92361f002671",
"A description of hello");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.createKeyInformation("Hello", "0.1.2", "1fa2e430-f2b2-11e6-bc64-92361f002672",
"A description of hola");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.createKeyInformation("Hello", "0.1.4", "1fa2e430-f2b2-11e6-bc64-92361f002672",
"A description of connichi wa");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.createKeyInformation("Hello", null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.createKeyInformation("Hello", null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_EXISTS));
+ assertEquals(ApexApiResult.Result.CONCEPT_EXISTS, result.getResult());
result = apexModel.createKeyInformation("Hello", "0.1.2", "1fa2e430-f2b2-11e6-bc64-92361f002672",
"A description of hola");
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_EXISTS));
+ assertEquals(ApexApiResult.Result.CONCEPT_EXISTS, result.getResult());
result = apexModel.validateKeyInformation(null, null);
assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
@@ -72,15 +72,15 @@ public class ApexEditorApiKeyInfoTest {
assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.updateKeyInformation("Hello", "0.0.2", null, "An updated description of hello");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.updateKeyInformation("Hello", "0.0.2", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.updateKeyInformation("Hello", "0.1.2", "1fa2e430-f2b2-11e6-bc64-92361f002673",
"A further updated description of hola");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.updateKeyInformation("Hello2", "0.0.2", null, "An updated description of hello");
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.listKeyInformation(null, null);
assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
@@ -89,49 +89,49 @@ public class ApexEditorApiKeyInfoTest {
assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.listKeyInformation("Hello", "0.1.2");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
- assertTrue(result.getMessages().size() == 2);
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
+ assertEquals(2, result.getMessages().size());
result = apexModel.listKeyInformation("Hello", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
- assertTrue(result.getMessages().size() == 4);
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
+ assertEquals(4, result.getMessages().size());
result = apexModel.deleteKeyInformation("Hello", "0.1.1");
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.deleteKeyInformation("Hellooooo", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.listKeyInformation("Hello", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
- assertTrue(result.getMessages().size() == 4);
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
+ assertEquals(4, result.getMessages().size());
result = apexModel.listKeyInformation(null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
- assertTrue(result.getMessages().size() == 22);
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
+ assertEquals(22, result.getMessages().size());
result = apexModel.deleteKeyInformation("%%%$$", null);
assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.deleteKeyInformation("Hello", "0.1.2");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.listKeyInformation("Hello", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
- assertTrue(result.getMessages().size() == 3);
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
+ assertEquals(3, result.getMessages().size());
result = apexModel.deleteKeyInformation("Hello", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.listKeyInformation("Hello", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.deleteKeyInformation(null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
assertEquals(18, result.getMessages().size());
result = apexModel.listKeyInformation(null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
assertEquals(0, result.getMessages().size());
}
}
diff --git a/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiPolicyTest.java b/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiPolicyTest.java
index 515ff8038..3e78921e9 100644
--- a/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiPolicyTest.java
+++ b/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiPolicyTest.java
@@ -22,7 +22,6 @@
package org.onap.policy.apex.model.modelapi;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
import org.junit.Test;
@@ -43,983 +42,983 @@ public class ApexEditorApiPolicyTest {
assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.loadFromFile("src/test/resources/models/PolicyModel.json");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.createPolicy("MyPolicy002", "0.0.2", "SomeTemplate", "AState",
"1fa2e430-f2b2-11e6-bc64-92361f002700", "A description of 002");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.createPolicy("MyPolicy002", "0.0.2", "SomeTemplate", "AState",
"1fa2e430-f2b2-11e6-bc64-92361f002700", "A description of 002");
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_EXISTS));
+ assertEquals(ApexApiResult.Result.CONCEPT_EXISTS, result.getResult());
result = apexModel.createPolicy("MyPolicy012", null, null, null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.createPolicy("MyPolicy012", null, "SomeTemplate", null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.createPolicy("MyPolicy013", null, null, "AState", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.createPolicy("MyPolicy012", null, "SomeTemplate", "AState", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.createPolicy("MyPolicy002", "0.0.2", "SomeTemplate", "AState",
"1fa2e430-f2b2-11e6-bc64-92361f002700", "A description of 002");
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_EXISTS));
+ assertEquals(ApexApiResult.Result.CONCEPT_EXISTS, result.getResult());
result = apexModel.createPolicy("MyPolicy012", "0.1.2", "SomeTemplate", "AState",
"1fa2e430-f2b2-11e6-bc64-92361f002700", "A description of 002");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.createPolicy("MyTestPolicy", "0.0.1", "SomeTemplate", "TestState",
"1fa2e430-f2b2-11e6-bc64-92361f002700", "A description of 002");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.deletePolicy("MyPolicy002", "0.0.2");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.createPolicy("MyPolicy002", "0.0.2", "SomeTemplate", "AState",
"1fa2e430-f2b2-11e6-bc64-92361f002700", "A description of 002");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.validatePolicy(null, null);
assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.updatePolicy("@£$$", "0.0.2", null, null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.updatePolicy("MyPolicy002", "0.0.2", null, null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.updatePolicy("MyPolicy002", "0.0.1", null, null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.updatePolicy("MyPolicy002", "0.0.2", "SomeOtherTemplate", "BState",
"1fa2e430-f2b2-11e6-bc64-92361f002700", "A description of 002");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.updatePolicy("MyPolicy012", null, "SomeOtherTemplate", null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.updatePolicy("MyPolicy012", null, null, "CState", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.updatePolicy("MyPolicy012", null, "SomeOtherTemplate", "BState", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.updatePolicy("MyPolicy015", null, "SomeOtherTemplate", "DState", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.updatePolicy("MyPolicy014", "0.1.5", "SomeOtherTemplate", "EState", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.listPolicy("@£$%%", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.listPolicy(null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
assertEquals(6, result.getMessages().size());
result = apexModel.listPolicy("MyPolicy012", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
assertEquals(2, result.getMessages().size());
result = apexModel.listPolicy("MyPolicy012", "0.0.2");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
assertEquals(1, result.getMessages().size());
result = apexModel.listPolicy("MyPolicy012", "0.2.5");
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.listPolicy("MyPolicy014", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.deletePolicy("@£$%", "0.1.1");
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.deletePolicy("MyPolicy012", "0.1.1");
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.deletePolicy("MyPolicy012oooo", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.listPolicy("MyPolicy012", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
- assertTrue(result.getMessages().size() == 2);
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
+ assertEquals(2, result.getMessages().size());
result = apexModel.deletePolicy("MyPolicy002", "0.0.2");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
- assertTrue(result.getMessages().size() == 1);
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
+ assertEquals(1, result.getMessages().size());
result = apexModel.listPolicy("MyPolicy012", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
- assertTrue(result.getMessages().size() == 2);
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
+ assertEquals(2, result.getMessages().size());
result = apexModel.deletePolicy("MyPolicy012", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
- assertTrue(result.getMessages().size() == 2);
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
+ assertEquals(2, result.getMessages().size());
result = apexModel.createPolicyState(null, null, null, null, null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.createPolicyState("MyPolicy123", null, null, null, null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.createPolicyState("MyPolicy123", null, "AState", null, null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.createPolicyState("MyTestPolicy", "0.0.2", "AState", null, null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.createPolicyState("MyTestPolicy", null, "AState", null, null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.createPolicyState("MyTestPolicy", null, "AState", "ATrigger", null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.createPolicyState("MyTestPolicy", null, "AState", "inEvent", "0.0.2", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.createPolicyState("MyTestPolicy", null, "AState", "inEvent", null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.createPolicyState("MyTestPolicy", null, "AState", "inEvent", "0.0.1", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.createPolicyState("MyTestPolicy", null, "AState", "inEvent", null, "ATask", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.createPolicyState("MyTestPolicy", null, "AState", "inEvent", null, "task", "0.0.2");
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.createPolicyState("MyTestPolicy", null, "AState", "inEvent", null, "task", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.createPolicyState("MyTestPolicy", null, "AState", "inEvent", null, "task", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_EXISTS));
+ assertEquals(ApexApiResult.Result.CONCEPT_EXISTS, result.getResult());
result = apexModel.createPolicyState("MyTestPolicy", "0.0.1", "AState", "inEvent", "0.0.1", "task", "0.0.1");
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_EXISTS));
+ assertEquals(ApexApiResult.Result.CONCEPT_EXISTS, result.getResult());
result = apexModel.createPolicyState("MyTestPolicy", "0.0.1", "BState", "inEvent", "0.0.1", "task", "0.0.1");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.createPolicyState("MyTestPolicy", "0.0.1", "CState", "inEvent", "0.0.1", "task", "0.0.1");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.createPolicyState("MyTestPolicy", "0.0.1", "DState", "inEvent", "0.0.1", "task", "0.0.1");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.updatePolicyState(null, null, null, null, null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.updatePolicyState("MyPolicy123", null, null, null, null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.updatePolicyState("MyPolicy123", null, "AState", null, null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.updatePolicyState("MyTestPolicy", "0.0.2", "AState", null, null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.updatePolicyState("MyTestPolicy", null, "AState", null, null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.updatePolicyState("MyTestPolicy", null, "ZState", null, null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.updatePolicyState("MyTestPolicy", null, "AState", "ATrigger", null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.updatePolicyState("MyTestPolicy", null, "AState", "inEvent", "0.0.2", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.updatePolicyState("MyTestPolicy", null, "AState", "inEvent", null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.updatePolicyState("MyTestPolicy", null, "AState", "inEvent", "0.0.2", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.updatePolicyState("MyTestPolicy", null, "AState", "inEvent", null, "ATask", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.updatePolicyState("MyTestPolicy", null, "AState", "inEvent", null, "task", "0.0.2");
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.updatePolicyState("MyTestPolicy", null, "AState", "inEvent", null, "task", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.updatePolicyState("MyTestPolicy", null, "AState", "inEvent", null, "task", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.updatePolicyState("MyTestPolicy", "0.0.1", "AState", "inEvent", "0.0.1", "task", "0.0.1");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.updatePolicyState("MyTestPolicy", "0.0.1", "BState", "inEvent", "0.0.1", "task", "0.0.1");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.updatePolicyState("MyTestPolicy", "0.0.1", "CState", "inEvent", "0.0.1", "task", "0.0.1");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.updatePolicyState("MyTestPolicy", "0.0.1", "DState", "inEvent", "0.0.1", "task", "0.0.1");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.listPolicyState("MyTestPolicy", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
assertEquals(4, result.getMessages().size());
result = apexModel.listPolicyState(null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.listPolicyState("SomeOtherPolicy", "0.0.1", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.listPolicyState("SomeOtherPolicy", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.listPolicyState("MyTestPolicy", "0.0.2", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.listPolicyState("MyTestPolicy", "0.0.1", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
assertEquals(4, result.getMessages().size());
result = apexModel.listPolicyState("MyTestPolicy", "0.0.1", "CState");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
assertEquals(1, result.getMessages().size());
result = apexModel.listPolicyState("MyTestPolicy", null, "CState");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
assertEquals(1, result.getMessages().size());
result = apexModel.listPolicyState("MyTestPolicy", "0.0.1", "AState");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
assertEquals(1, result.getMessages().size());
result = apexModel.listPolicyState("MyTestPolicy", "0.0.1", "EState");
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.deletePolicyState("@£$$", "0.0.2", "Trigger04");
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
assertEquals(4, apexModel.listPolicyState("MyTestPolicy", null, null).getMessages().size());
result = apexModel.deletePolicyState("MyTestPolicy", "0.0.2", "Trigger04");
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
assertEquals(4, apexModel.listPolicyState("MyTestPolicy", null, null).getMessages().size());
result = apexModel.deletePolicyState("MyTestPolicy", null, "CState");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.deletePolicyState("MyTestPolicy", null, "ZState");
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
assertEquals(3, apexModel.listPolicyState("MyTestPolicy", null, null).getMessages().size());
result = apexModel.deletePolicyState("MyTestPolicy", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.listPolicyState("MyTestPolicy", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.deletePolicyState("MyTestPolicy", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.createPolicyState("MyTestPolicy", "0.0.1", "TestState1", "inEvent", "0.0.1", "task",
"0.0.1");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.createPolicyState("MyTestPolicy", "0.0.1", "TestState2", "outEvent0", "0.0.1", "task",
"0.0.1");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.createPolicyState("MyTestPolicy", "0.0.1", "TestState3", "outEvent1", "0.0.1", "task",
"0.0.1");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.createPolicyStateTaskSelectionLogic(null, null, null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.createPolicyStateTaskSelectionLogic("MyTestPolicy", null, null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.createPolicyStateTaskSelectionLogic("MyTestPolicy", null, "SomeState", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.createPolicyStateTaskSelectionLogic("MyTestPolicy", "1.2.3", "TestState1", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.createPolicyStateTaskSelectionLogic("MyTestPolicy", "0.0.1", "TestState1", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.createPolicyStateTaskSelectionLogic("MyTestPolicy", "0.0.1", "TestState1", "NewTSL00", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.createPolicyStateTaskSelectionLogic("MyTestPolicy", "0.0.1", "TestState1", "UNDEFINED",
"Some Policy Logic");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.createPolicyStateTaskSelectionLogic("MyTestPolicy", "0.0.1", "TestState1", "MVEL",
"Some Policy Logic");
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_EXISTS));
+ assertEquals(ApexApiResult.Result.CONCEPT_EXISTS, result.getResult());
result = apexModel.deletePolicyStateTaskSelectionLogic("MyTestPolicy", "0.0.1", "TestState1");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.createPolicyStateTaskSelectionLogic("MyTestPolicy", "0.0.1", "TestState1", "JAVA",
"Some Policy Logic");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.createPolicyStateTaskSelectionLogic("MyTestPolicy", "0.0.1", "TestState1", "JYTHON",
"Some Policy Logic");
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_EXISTS));
+ assertEquals(ApexApiResult.Result.CONCEPT_EXISTS, result.getResult());
result = apexModel.deletePolicyStateTaskSelectionLogic("MyTestPolicy", "0.0.1", "TestState1");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.createPolicyStateTaskSelectionLogic("MyTestPolicy", null, "TestState1", "JAVASCRIPT",
"Some Policy Logic");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.deletePolicyStateTaskSelectionLogic("MyTestPolicy", "0.0.1", "TestState1");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.createPolicyStateTaskSelectionLogic("MyTestPolicy", null, "TestState1", "JRUBY",
"Some Policy Logic");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.updatePolicyStateTaskSelectionLogic(null, null, null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.updatePolicyStateTaskSelectionLogic("MyTestPolicy", null, null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.updatePolicyStateTaskSelectionLogic("MyTestPolicy", null, "TestState1", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.updatePolicyStateTaskSelectionLogic("MyTestPolicy", null, "TestState99", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.updatePolicyStateTaskSelectionLogic("MyTestPolicy2", null, "TestState1", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.updatePolicyStateTaskSelectionLogic("MyTestPolicy1", "0.0.2", "TestState1", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.updatePolicyStateTaskSelectionLogic("MyTestPolicy", "0.0.1", "TestState1", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.updatePolicyStateTaskSelectionLogic("MyTestPolicy", "0.0.1", "NonExistantState", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.updatePolicyStateTaskSelectionLogic("MyTestPolicy", "0.0.1", "TestState1", "",
"Some Other Policy Logic");
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.updatePolicyStateTaskSelectionLogic("MyTestPolicy", "0.0.1", "TestState1", "MVEL",
"Some Other Policy Logic");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.updatePolicyStateTaskSelectionLogic("MyPolicy012", null, "TestState1", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.updatePolicyStateTaskSelectionLogic("MyTestPolicy", null, "TestState1", null,
"Some Other Policy Logic");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.updatePolicyStateTaskSelectionLogic("MyTestPolicy", null, "TestState1", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.updatePolicyStateTaskSelectionLogic("MyPolicy015", null, "TestState1", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.updatePolicyStateTaskSelectionLogic("MyPolicy014", "0.1.5", "TestState1", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.listPolicyStateTaskSelectionLogic(null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.listPolicyStateTaskSelectionLogic("zooby", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.listPolicyStateTaskSelectionLogic("zooby", null, "looby");
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.listPolicyStateTaskSelectionLogic("zooby", null, "TestState1");
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.listPolicyStateTaskSelectionLogic("MyTestPolicy", null, "looby");
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.listPolicyStateTaskSelectionLogic("MyTestPolicy", "0.0.2", "TestState1");
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.listPolicyStateTaskSelectionLogic("MyTestPolicy", null, "TestState1");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
assertEquals(1, result.getMessages().size());
result = apexModel.deletePolicyStateTaskSelectionLogic(null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.deletePolicyStateTaskSelectionLogic("zooby", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.deletePolicyStateTaskSelectionLogic("zooby", null, "looby");
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.deletePolicyStateTaskSelectionLogic("zooby", null, "TestState1");
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.deletePolicyStateTaskSelectionLogic("MyTestPolicy", null, "looby");
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.deletePolicyStateTaskSelectionLogic("MyTestPolicy", "0.0.2", "TestState1");
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.deletePolicyStateTaskSelectionLogic("MyTestPolicy", "0.0.1", "TestState1");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.listPolicyStateTaskSelectionLogic("MyTestPolicy", null, "TestState1");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.deletePolicyStateTaskSelectionLogic("MyTestPolicy", "0.0.1", "TestState1");
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.updatePolicyStateTaskSelectionLogic("MyTestPolicy", null, "TestState1", null,
"Some Other Policy Logic");
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.listPolicyStateTaskSelectionLogic("MyTestPolicy", null, "TestState1");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
assertEquals(1, result.getMessages().size());
result = apexModel.createPolicyStateTaskSelectionLogic("MyTestPolicy", null, "TestState1", "JRUBY",
"Some Policy Logic");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.listPolicyStateTaskSelectionLogic("MyTestPolicy", null, "TestState1");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.deletePolicyStateTaskSelectionLogic("MyTestPolicy", "0.0.1", "TestState1");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.deletePolicyStateTaskSelectionLogic("MyTestPolicy", "0.0.1", "TestState1");
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.createPolicyStateOutput(null, null, null, null, null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.createPolicyStateOutput("MyTestPolicy", null, null, null, null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.createPolicyStateOutput("MyTestPolicy", null, "SomeState", null, null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.createPolicyStateOutput("MyTestPolicy", null, "SomeState", "SomeOutput", null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.createPolicyStateOutput("MyTestPolicy", "1.2.3", "TestState1", "SomeOutput", null, null,
null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.createPolicyStateOutput("MyTestPolicy", "0.0.1", "TestState1", "SomeOutput", null, null,
null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.createPolicyStateOutput("MyTestPolicy", "0.0.1", "TestState1", "SomeOutput",
"SomeDummyEvent", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.createPolicyStateOutput("MyTestPolicy", "0.0.1", "TestState1", "SomeOutput", "inEvent",
"1.2.3", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.createPolicyStateOutput("MyTestPolicy", "0.0.1", "TestState1", "SomeOutput", "inEvent",
"0.0.1", "SomeDummyNextState");
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.createPolicyStateOutput("MyTestPolicy", "0.0.1", "TestState1", "SomeOutput", "inEvent",
"0.0.1", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.createPolicyStateOutput("MyTestPolicy", "0.0.1", "TestState1", "SomeOtherOutput", "inEvent",
"0.0.1", "TestState1");
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.createPolicyStateOutput("MyTestPolicy", "0.0.1", "TestState1", "SomeOtherOutput", "inEvent",
"0.0.1", "TestState2");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.createPolicyStateOutput("MyTestPolicy", "0.0.1", "TestState1", "SomeOtherOutput", "inEvent",
"0.0.1", "TestState2");
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_EXISTS));
+ assertEquals(ApexApiResult.Result.CONCEPT_EXISTS, result.getResult());
result = apexModel.createPolicyStateOutput("MyTestPolicy", "0.0.1", "TestState2", "AnotherOtherOutput",
"outEvent0", "0.0.1", "TestState3");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.createPolicyStateOutput("MyTestPolicy", "0.0.1", "TestState2", "YetAnotherOtherOutput",
"outEvent0", "0.0.1", "TestState3");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.listPolicyStateOutput(null, null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.listPolicyStateOutput("MyTestPolicy", null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.listPolicyStateOutput("MyTestPolicy", "0.0.1", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.listPolicyStateOutput("MyTestPolicy", "0.0.2", "TestState1", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.listPolicyStateOutput("MyTestPolicy", null, "SomeState", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.listPolicyStateOutput("MyTestPolicy", "0.0.1", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.listPolicyStateOutput("MyTestPolicy", "0.0.1", "TestState1", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
assertEquals(2, result.getMessages().size());
result = apexModel.listPolicyStateOutput("MyTestPolicy", "0.0.1", "TestState2", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
assertEquals(2, result.getMessages().size());
result = apexModel.listPolicyStateOutput("MyTestPolicy", "0.0.1", "TestState1", "YetAnotherOtherOutput");
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.listPolicyStateOutput("MyTestPolicy", "0.0.1", "TestState2", "YetAnotherOtherOutput");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
assertEquals(1, result.getMessages().size());
result = apexModel.listPolicyStateOutput("MyTestPolicy", "0.0.1", "TestState3", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.deletePolicyStateOutput(null, null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.deletePolicyStateOutput("MyTestPolicy", null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.deletePolicyStateOutput("MyTestPolicy", "0.0.1", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.deletePolicyStateOutput("MyTestPolicy", "0.0.2", "TestState1", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.deletePolicyStateOutput("MyTestPolicy", null, "SomeState", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.deletePolicyStateOutput("MyTestPolicy", "0.0.1", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.deletePolicyStateOutput("MyTestPolicy", "0.0.1", "TestState3", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.deletePolicyStateOutput("MyTestPolicy", "0.0.1", "TestState3", "DummyOutput");
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.listPolicyStateOutput("MyTestPolicy", null, "TestState1", null);
assertEquals(2, result.getMessages().size());
result = apexModel.deletePolicyStateOutput("MyTestPolicy", null, "TestState1", "SomeOutput");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
assertEquals(1, result.getMessages().size());
result = apexModel.listPolicyStateOutput("MyTestPolicy", null, "TestState1", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
assertEquals(1, result.getMessages().size());
result = apexModel.deletePolicyStateOutput("MyTestPolicy", null, "TestState1", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
assertEquals(1, result.getMessages().size());
result = apexModel.listPolicyStateOutput("MyTestPolicy", null, "TestState1", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.listPolicyStateOutput("MyTestPolicy", null, "TestState2", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
assertEquals(2, result.getMessages().size());
result = apexModel.deletePolicyStateOutput("MyTestPolicy", null, "TestState2", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
assertEquals(2, result.getMessages().size());
result = apexModel.listPolicyStateOutput("MyTestPolicy", null, "TestState2", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.createPolicyStateOutput("MyTestPolicy", "0.0.1", "TestState1", "SomeOutput", "inEvent",
"0.0.1", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.createPolicyStateOutput("MyTestPolicy", "0.0.1", "TestState1", "SomeOtherOutput", "inEvent",
"0.0.1", "TestState1");
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.createPolicyStateOutput("MyTestPolicy", "0.0.1", "TestState1", "SomeOtherOutput", "inEvent",
"0.0.1", "TestState2");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.createPolicyStateOutput("MyTestPolicy", "0.0.1", "TestState2", "AnotherOtherOutput",
"outEvent0", "0.0.1", "TestState3");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.createPolicyStateOutput("MyTestPolicy", "0.0.1", "TestState2", "YetAnotherOtherOutput",
"outEvent0", "0.0.1", "TestState3");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.createPolicyStateFinalizerLogic(null, null, null, null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.createPolicyStateFinalizerLogic("MyTestPolicy", null, null, null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.createPolicyStateFinalizerLogic("MyTestPolicy", null, "SomeState", null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.createPolicyStateFinalizerLogic("MyTestPolicy", null, "SomeState", "SFLName01", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.createPolicyStateFinalizerLogic("MyTestPolicy", "1.2.3", "TestState1", "SFLName01", null,
null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.createPolicyStateFinalizerLogic("MyTestPolicy", "0.0.1", "TestState1", "SFLName01", null,
null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.createPolicyStateFinalizerLogic("MyTestPolicy", "0.0.1", "TestState1", "SFLName01",
"NewTSL00", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.createPolicyStateFinalizerLogic("MyTestPolicy", "0.0.1", "TestState1", "SFLName02",
"UNDEFINED", "Some Policy Logic");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.createPolicyStateFinalizerLogic("MyTestPolicy", "0.0.1", "TestState1", "SFLName03", "MVEL",
"Some Policy Logic");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.createPolicyStateFinalizerLogic("MyTestPolicy", "0.0.1", "TestState1", "SFLName03", "MVEL",
"Some Policy Logic");
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_EXISTS));
+ assertEquals(ApexApiResult.Result.CONCEPT_EXISTS, result.getResult());
result = apexModel.createPolicyStateFinalizerLogic("MyTestPolicy", "0.0.1", "TestState1", "SFLName04", "JAVA",
"Some Policy Logic");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.createPolicyStateFinalizerLogic("MyTestPolicy", "0.0.1", "TestState1", "SFLName05", "JYTHON",
"Some Policy Logic");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.createPolicyStateFinalizerLogic("MyTestPolicy", null, "TestState1", "SFLName06",
"JAVASCRIPT", "Some Policy Logic");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.createPolicyStateFinalizerLogic("MyTestPolicy", null, "TestState1", "SFLName07", "JRUBY",
"Some Policy Logic");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.updatePolicyStateFinalizerLogic(null, null, null, null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.updatePolicyStateFinalizerLogic("MyTestPolicy", null, null, null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.updatePolicyStateFinalizerLogic("MyTestPolicy", null, "TestState1", null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.updatePolicyStateFinalizerLogic("MyTestPolicy", null, "TestState99", "SomeSFLName", null,
null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.updatePolicyStateFinalizerLogic("MyTestPolicy2", null, "TestState1", "SomeSFLName", null,
null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.updatePolicyStateFinalizerLogic("MyTestPolicy1", "0.0.2", "TestState1", "SomeSFLName", null,
null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.updatePolicyStateFinalizerLogic("MyTestPolicy", "0.0.1", "TestState1", "NonEistantSFL", null,
null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.updatePolicyStateFinalizerLogic("MyTestPolicy", "0.0.1", "TestState1", "SFLName06", null,
null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.updatePolicyStateFinalizerLogic("MyTestPolicy", "0.0.1", "TestState1", "SFLName06", "",
"Some Other Policy Logic");
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.updatePolicyStateFinalizerLogic("MyTestPolicy", "0.0.1", "TestState1", "SFLName06", "MVEL",
"Some Other Policy Logic");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.updatePolicyStateFinalizerLogic("MyPolicy012", null, "TestState1", "SFLName06", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.updatePolicyStateFinalizerLogic("MyTestPolicy", null, "TestState1", "SFLName06", null,
"Some Other Policy Logic");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.updatePolicyStateFinalizerLogic("MyTestPolicy", null, "TestState1", "SFLName06", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.updatePolicyStateFinalizerLogic("MyPolicy015", null, "TestState1", "SFLName06", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.updatePolicyStateFinalizerLogic("MyPolicy014", "0.1.5", "TestState1", "SFLName06", null,
null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.listPolicyStateFinalizerLogic(null, null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.listPolicyStateFinalizerLogic("MyTestPolicy", null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.listPolicyStateFinalizerLogic("MyTestPolicy", "0.0.1", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.listPolicyStateFinalizerLogic("MyTestPolicy", "0.0.2", "TestState1", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.listPolicyStateFinalizerLogic("MyTestPolicy", null, "SomeState", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.listPolicyStateFinalizerLogic("MyTestPolicy", "0.0.1", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.listPolicyStateFinalizerLogic("zooby", null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.listPolicyStateFinalizerLogic("zooby", null, "looby", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.listPolicyStateFinalizerLogic("zooby", null, "TestState1", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.listPolicyStateFinalizerLogic("MyTestPolicy", null, "looby", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.listPolicyStateFinalizerLogic("MyTestPolicy", "0.0.2", "TestState1", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.listPolicyStateFinalizerLogic("MyTestPolicy", null, "TestState1", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
assertEquals(6, result.getMessages().size());
result = apexModel.listPolicyStateFinalizerLogic("MyTestPolicy", null, "TestState1", "SFLName06");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
assertEquals(1, result.getMessages().size());
result = apexModel.deletePolicyStateFinalizerLogic(null, null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.deletePolicyStateFinalizerLogic("MyTestPolicy", null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.deletePolicyStateFinalizerLogic("MyTestPolicy", "0.0.1", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.deletePolicyStateFinalizerLogic("MyTestPolicy", "0.0.2", "TestState1", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.deletePolicyStateFinalizerLogic("MyTestPolicy", null, "SomeState", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.deletePolicyStateFinalizerLogic("MyTestPolicy", "0.0.1", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.deletePolicyStateFinalizerLogic("zooby", null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.deletePolicyStateFinalizerLogic("zooby", null, "looby", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.deletePolicyStateFinalizerLogic("zooby", null, "TestState1", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.deletePolicyStateFinalizerLogic("MyTestPolicy", null, "looby", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.deletePolicyStateFinalizerLogic("MyTestPolicy", "0.0.2", "TestState1", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.deletePolicyStateFinalizerLogic("MyTestPolicy", "0.0.1", "TestState1", "SFLName06");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.deletePolicyStateFinalizerLogic("MyTestPolicy", "0.0.1", "TestState1", "SFLName06");
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
assertEquals(1, result.getMessages().size());
result = apexModel.listPolicyStateFinalizerLogic("MyTestPolicy", null, "TestState1", "SFLName06");
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.listPolicyStateFinalizerLogic("MyTestPolicy", null, "TestState1", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
assertEquals(5, result.getMessages().size());
result = apexModel.deletePolicyStateFinalizerLogic("MyTestPolicy", "0.0.1", "TestState1", "SFLName02");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.deletePolicyStateFinalizerLogic("MyTestPolicy", "0.0.1", "TestState1", "SFLName02");
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
assertEquals(1, result.getMessages().size());
result = apexModel.listPolicyStateFinalizerLogic("MyTestPolicy", null, "TestState1", "SFLName02");
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.listPolicyStateFinalizerLogic("MyTestPolicy", null, "TestState1", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
assertEquals(4, result.getMessages().size());
result = apexModel.deletePolicyStateFinalizerLogic("MyTestPolicy", "0.0.1", "TestState1", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
assertEquals(4, result.getMessages().size());
result = apexModel.deletePolicyStateFinalizerLogic("MyTestPolicy", "0.0.1", "TestState1", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.listPolicyStateFinalizerLogic("MyTestPolicy", null, "TestState1", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.createPolicyStateFinalizerLogic("MyTestPolicy", "0.0.1", "TestState1", "SFLName02",
"UNDEFINED", "Some Policy Logic");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.createPolicyStateFinalizerLogic("MyTestPolicy", "0.0.1", "TestState1", "SFLName03", "MVEL",
"Some Policy Logic");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.createPolicyStateFinalizerLogic("MyTestPolicy", "0.0.1", "TestState1", "SFLName04", "JAVA",
"Some Policy Logic");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.createPolicyStateFinalizerLogic("MyTestPolicy", "0.0.1", "TestState1", "SFLName05", "JYTHON",
"Some Policy Logic");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.createPolicyStateFinalizerLogic("MyTestPolicy", null, "TestState1", "SFLName06",
"JAVASCRIPT", "Some Policy Logic");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.createPolicyStateFinalizerLogic("MyTestPolicy", null, "TestState1", "SFLName07", "JRUBY",
"Some Policy Logic");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.createTask("TestTask0", null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.createTask("TestTask1", null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.createTask("TestTask2", null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.createTask("TestTask3", null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.createTask("TestTask4", null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.createPolicyStateTaskRef(null, null, null, null, null, null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.createPolicyStateTaskRef("MyTestPolicy", null, null, null, null, null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.createPolicyStateTaskRef("MyTestPolicy", null, "SomeState", null, null, null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.createPolicyStateTaskRef("MyTestPolicy", null, "SomeState", null, null, null, null,
"DummyOutput");
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.createPolicyStateTaskRef("MyTestPolicy", "1.2.3", "SomeState", null, null, null, null,
"DummyOutput");
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.createPolicyStateTaskRef("AnyOldPolicy", "1.2.3", "SomeState", null, null, null, null,
"DummyOutput");
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.createPolicyStateTaskRef("MyTestPolicy", "0.0.1", "TestState1", "SomeTaskLocalName", null,
null, null, "DummyOutput");
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.createPolicyStateTaskRef("MyTestPolicy", "0.0.1", "TestState1", "SomeTaskLocalName",
"SomeTask", "Zooby|", null, "DummyOutput");
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.createPolicyStateTaskRef("MyTestPolicy", "0.0.1", "TestState1", "SomeTaskLocalName",
"SomeTask", "0.0.1", null, "DummyOutput");
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.createPolicyStateTaskRef("MyTestPolicy", "0.0.1", "TestState1", "SomeTaskLocalName", "task",
"0.0.1", null, "DummyOutput");
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.createPolicyStateTaskRef("MyTestPolicy", "0.0.1", "TestState1", "SomeTaskLocalName", "task",
"0.0.1", "Some Policy Logic", "DummyOutput");
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.createPolicyStateTaskRef("MyTestPolicy", "0.0.1", "TestState1", "SomeTaskLocalName", "task",
"0.0.1", "DIRECT", "DummyOutput");
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.createPolicyStateTaskRef("MyTestPolicy", "0.0.1", "TestState1", "SomeTaskLocalName", "task",
"0.0.1", "LOGIC", "DummyOutput");
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.createPolicyStateTaskRef("MyTestPolicy", null, "TestState1", "SomeTaskLocalName", "task",
"0.0.1", "DIRECT", "SFLName07");
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.createPolicyStateTaskRef("MyTestPolicy", null, "TestState1", "SomeTaskLocalName", "task",
"0.0.1", "LOGIC", "SomeOutput");
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.createPolicyStateTaskRef("MyTestPolicy", null, "TestState1", "SomeTaskLocalName", "task",
"0.0.1", "DIRECT", "SomeOutput");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.createPolicyStateTaskRef("MyTestPolicy", null, "TestState1", "SomeTaskLocalName",
"NonExistantTask", "0.0.1", "DIRECT", "SomeOutput");
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.createPolicyStateTaskRef("MyTestPolicy", null, "TestState1", "SomeTaskLocalName", "task",
"0.0.1", "LOGIC", "SFLName07");
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_EXISTS));
+ assertEquals(ApexApiResult.Result.CONCEPT_EXISTS, result.getResult());
result = apexModel.createPolicyStateTaskRef("MyTestPolicy", null, "TestState1", "SomeTaskLocalName",
"TestTask0", "0.0.1", "LOGIC", "SFLName07");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.createPolicyStateTaskRef("MyTestPolicy", null, "TestState1", "SomeTaskLocalName",
"TestTask1", "0.0.1", "DIRECT", "SomeOtherOutput");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.createPolicyStateTaskRef("MyTestPolicy", null, "TestState1", "SomeTaskLocalName",
"TestTask2", "0.0.1", "LOGIC", "SFLName07");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.createPolicyStateTaskRef("MyTestPolicy", null, "TestState1", "SomeTaskLocalName",
"TestTask3", "0.0.1", "DIRECT", "SomeOtherOutput");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.createPolicyStateTaskRef("MyTestPolicy", null, "TestState1", null, "TestTask4", "0.0.1",
"LOGIC", "SFLName07");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.createPolicyStateTaskRef("MyTestPolicy", null, "TestState1", null, "TestTask4", "0.0.1",
"LOGIC", "SFLName07");
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_EXISTS));
+ assertEquals(ApexApiResult.Result.CONCEPT_EXISTS, result.getResult());
result = apexModel.deletePolicyStateTaskRef("MyTestPolicy", null, "TestState1", "TestTask4", "0.0.1");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.createPolicyStateTaskRef("MyTestPolicy", null, "TestState1", "SomeTaskLocalName",
"TestTask4", "0.0.1", "FUNKY", "SFLName07");
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.createPolicyStateTaskRef("MyTestPolicy", null, "TestState1", "SomeTaskLocalName",
"TestTask4", "0.0.1", "UNDEFINED", "SFLName07");
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.createPolicyStateTaskRef("MyTestPolicy", null, "TestState1", "SomeTaskLocalName",
"TestTask4", "0.0.1", "LOGIC", "SFLName07");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.createPolicyStateTaskRef("MyTestPolicy", null, "TestState1", null, "TestTask0", "0.0.1",
"LOGIC", "SFLName07");
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_EXISTS));
+ assertEquals(ApexApiResult.Result.CONCEPT_EXISTS, result.getResult());
result = apexModel.listPolicyStateTaskRef(null, null, null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.listPolicyStateTaskRef("MyTestPolicy", null, null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.listPolicyStateTaskRef("MyTestPolicy", "0.0.1", null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.listPolicyStateTaskRef("MyTestPolicy", "0.0.2", "TestState1", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.listPolicyStateTaskRef("MyTestPolicy", null, "SomeState", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.listPolicyStateTaskRef("MyTestPolicy", "0.0.1", null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.listPolicyStateTaskRef("zooby", null, null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.listPolicyStateTaskRef("zooby", null, "looby", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.listPolicyStateTaskRef("zooby", null, "TestState1", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.listPolicyStateTaskRef("MyTestPolicy", null, "looby", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.listPolicyStateTaskRef("MyTestPolicy", "0.0.2", "TestState1", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.listPolicyStateTaskRef("MyTestPolicy", null, "TestState1", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
assertEquals(12, result.getMessages().size());
result = apexModel.listPolicyStateTaskRef("MyTestPolicy", null, "TestState1", "SomeOldTask", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.listPolicyStateTaskRef("MyTestPolicy", null, "TestState1", "task", "1.0.1");
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
assertEquals(1, result.getMessages().size());
result = apexModel.listPolicyStateTaskRef("MyTestPolicy", null, "TestState1", "task", "0.0.1");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
assertEquals(2, result.getMessages().size());
result = apexModel.listPolicyStateTaskRef("MyTestPolicy", null, "TestState1", "task", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
assertEquals(2, result.getMessages().size());
result = apexModel.deletePolicyStateTaskRef(null, null, null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.deletePolicyStateTaskRef("MyTestPolicy", null, null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.deletePolicyStateTaskRef("MyTestPolicy", "0.0.1", null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.deletePolicyStateTaskRef("MyTestPolicy", "0.0.2", "TestState1", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.deletePolicyStateTaskRef("MyTestPolicy", null, "SomeState", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.deletePolicyStateTaskRef("MyTestPolicy", "0.0.1", null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.deletePolicyStateTaskRef("zooby", null, null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.deletePolicyStateTaskRef("zooby", null, "looby", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.deletePolicyStateTaskRef("zooby", null, "TestState1", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.deletePolicyStateTaskRef("MyTestPolicy", null, "looby", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.deletePolicyStateTaskRef("MyTestPolicy", "0.0.2", "TestState1", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.deletePolicyStateTaskRef("MyTestPolicy", "0.0.2", "TestState1", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.deletePolicyStateTaskRef("MyTestPolicy", "0.0.1", "TestState1", "ADummyTask", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.deletePolicyStateTaskRef("MyTestPolicy", "0.0.1", "TestState1", "task", "0.0.2");
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.listPolicyStateTaskRef("MyTestPolicy", null, "TestState1", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
assertEquals(12, result.getMessages().size());
result = apexModel.deletePolicyStateTaskRef("MyTestPolicy", null, "TestState1", "TestTask0", "0.0.1");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
assertEquals(1, result.getMessages().size());
result = apexModel.listPolicyStateTaskRef("MyTestPolicy", null, "TestState1", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
assertEquals(10, result.getMessages().size());
result = apexModel.deletePolicyStateTaskRef("MyTestPolicy", null, "TestState1", "TestTask2", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
assertEquals(1, result.getMessages().size());
result = apexModel.listPolicyStateTaskRef("MyTestPolicy", null, "TestState1", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
assertEquals(8, result.getMessages().size());
result = apexModel.deletePolicyStateTaskRef("MyTestPolicy", null, "TestState1", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
assertEquals(4, result.getMessages().size());
result = apexModel.listPolicyStateTaskRef("MyTestPolicy", null, "TestState1", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.createPolicyStateContextRef(null, null, null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.createPolicyStateContextRef("MyTestPolicy", null, null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.createPolicyStateContextRef("MyTestPolicy", null, "SomeState", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.createPolicyStateContextRef("MyTestPolicy", null, "SomeState", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.createPolicyStateContextRef("MyTestPolicy", "1.2.3", "SomeState", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.createPolicyStateContextRef("AnyOldPolicy", "1.2.3", "SomeState", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.createPolicyStateContextRef("MyTestPolicy", "0.0.1", "TestState1", "SomeTask", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.createPolicyStateContextRef("MyTestPolicy", "0.0.1", "TestState1", "SomeTask", "Zooby|");
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.createPolicyStateContextRef("MyTestPolicy", "0.0.1", "TestState1", "SomeTask", "0.0.1");
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.createPolicyStateContextRef("MyTestPolicy", "0.0.1", "TestState1", "task", "0.0.1");
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.createPolicyStateContextRef("MyPolicy123", null, null, "AContextMap00", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.createPolicyStateContextRef("MyPolicy123", null, "TestState1", "AContextMap00", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.createPolicyStateContextRef("MyTestPolicy", "4.5.6", "TestState1", "AContextMap00", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.createPolicyStateContextRef("MyTestPolicy", "0.1.4", "TestState1", "AContextMap00", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.createPolicyStateContextRef("MyTestPolicy", "0.0.1", "TestState1", "AContextMap00", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.createPolicyStateContextRef("MyTestPolicy", "0.0.1", "TestState1", "contextAlbum0", "");
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.createPolicyStateContextRef("MyTestPolicy", "0.0.1", "TestState1", "contextAlbum0", "0.0.2");
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.createPolicyStateContextRef("MyTestPolicy", "0.0.1", "TestState1", "contextAlbum0", "0.0.1");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.createPolicyStateContextRef("MyTestPolicy", "0.0.1", "TestState1", "contextAlbum0", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_EXISTS));
+ assertEquals(ApexApiResult.Result.CONCEPT_EXISTS, result.getResult());
result = apexModel.createPolicyStateContextRef("MyTestPolicy", "0.0.1", "TestState1", "contextAlbum0", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_EXISTS));
+ assertEquals(ApexApiResult.Result.CONCEPT_EXISTS, result.getResult());
result = apexModel.createPolicyStateContextRef("MyTestPolicy", "0.0.1", "TestState1", "contextAlbum1", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.createPolicyStateContextRef("MyTestPolicy", "0.0.1", "TestState1", "contextAlbum0", "0.0.1");
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_EXISTS));
+ assertEquals(ApexApiResult.Result.CONCEPT_EXISTS, result.getResult());
result = apexModel.createPolicyStateContextRef("MyTestPolicy", null, "TestState1", "contextAlbum0", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_EXISTS));
+ assertEquals(ApexApiResult.Result.CONCEPT_EXISTS, result.getResult());
result = apexModel.listPolicyStateContextRef(null, null, null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.listPolicyStateContextRef("MyTestPolicy", null, null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.listPolicyStateContextRef("MyTestPolicy", "0.0.1", null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.listPolicyStateContextRef("MyTestPolicy", "0.0.2", "TestState1", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.listPolicyStateContextRef("MyTestPolicy", null, "SomeState", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.listPolicyStateContextRef("MyTestPolicy", "0.0.1", null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.listPolicyStateContextRef("zooby", null, null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.listPolicyStateContextRef("zooby", null, "looby", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.listPolicyStateContextRef("zooby", null, "TestState1", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.listPolicyStateContextRef("MyTestPolicy", null, "looby", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.listPolicyStateContextRef("MyTestPolicy", "0.0.2", "TestState1", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.listPolicyStateContextRef("MyTestPolicy", null, null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.listPolicyStateContextRef("MyTestPolicy", null, "TestState1", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
assertEquals(2, result.getMessages().size());
result = apexModel.listPolicyStateContextRef("MyTestPolicy", "0.0.2", "TestState1", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.listPolicyStateContextRef("MyTestPolicy", "0.0.1", "TestState1", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
assertEquals(2, result.getMessages().size());
result = apexModel.listPolicyStateContextRef("MyTestPolicy", "0.0.1", "TestState1", "contextAlbum0", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
assertEquals(1, result.getMessages().size());
result = apexModel.listPolicyStateContextRef("MyTestPolicy", "0.0.1", "TestState1", "contextAlbum0", "0.0.1");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
assertEquals(1, result.getMessages().size());
result = apexModel.listPolicyStateContextRef("MyTestPolicy", "0.0.1", "TestState1", "contextAlbum0", "0.0.2");
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.listPolicyStateContextRef("MyTestPolicy", "0.0.1", "TestState1", "AContextMap04", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.listPolicyStateContextRef("MyTestPolicy", "0.0.1", "TestState1", "contextAlbum0", "0.0.1");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
assertEquals(1, result.getMessages().size());
result = apexModel.listPolicyStateContextRef("MyTestPolicy", "0.0.1", "TestState1", "contextAlbum0", "1.0.1");
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.deletePolicyStateContextRef(null, null, null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.deletePolicyStateContextRef("MyTestPolicy", null, null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.deletePolicyStateContextRef("MyTestPolicy", "0.0.1", null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.deletePolicyStateContextRef("MyTestPolicy", "0.0.2", "TestState1", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.deletePolicyStateContextRef("MyTestPolicy", null, "SomeState", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.deletePolicyStateContextRef("MyTestPolicy", "0.0.1", null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.deletePolicyStateContextRef("zooby", null, null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.deletePolicyStateContextRef("zooby", null, "looby", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.deletePolicyStateContextRef("zooby", null, "TestState1", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.deletePolicyStateContextRef("MyTestPolicy", null, "looby", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.deletePolicyStateContextRef("MyTestPolicy", "0.0.2", "TestState1", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.deletePolicyStateContextRef("MyTestPolicy", "0.0.2", "TestState1", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.deletePolicyStateContextRef("MyTestPolicy", "0.0.1", "TestState1", "ADummyContextMap", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.deletePolicyStateContextRef("MyTestPolicy", "0.0.1", "TestState1", "contextAlbum0", "0.0.2");
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.listPolicyStateContextRef("MyTestPolicy", null, null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.deletePolicyStateContextRef("MyTestPolicy", "0.0.1", "TestState1", "AContextMap04", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.deletePolicyStateContextRef("MyTestPolicy", null, "TestState1", "contextAlbum0", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.deletePolicyStateContextRef("MyTestPolicy", null, "TestState1", "contextAlbum0", "0.1.5");
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.deletePolicyStateContextRef("MyTestPolicy", null, "TestState1", "contextAlbum1", "0.0.1");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
assertEquals(1, result.getMessages().size());
result = apexModel.createPolicyStateContextRef("MyTestPolicy", "0.0.1", "TestState1", "contextAlbum0", "0.0.1");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.deletePolicyStateContextRef("MyTestPolicy", null, "TestState1", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.deletePolicyStateContextRef("MyTestPolicy", null, "TestState1", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
assertEquals(1, result.getMessages().size());
result = apexModel.listPolicyStateContextRef("MyTestPolicy", null, "TestState1", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.deletePolicy(null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
assertEquals(3, result.getMessages().size());
result = apexModel.listPolicy(null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
assertEquals(0, result.getMessages().size());
}
}
diff --git a/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiTaskTest.java b/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiTaskTest.java
index 050025537..f2c41318c 100644
--- a/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiTaskTest.java
+++ b/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiTaskTest.java
@@ -1,19 +1,20 @@
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2016-2018 Ericsson. All rights reserved.
+ * Modifications Copyright (C) 2020 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- *
+ *
* SPDX-License-Identifier: Apache-2.0
* ============LICENSE_END=========================================================
*/
@@ -21,7 +22,6 @@
package org.onap.policy.apex.model.modelapi;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
import org.junit.Test;
@@ -41,445 +41,445 @@ public class ApexEditorApiTaskTest {
assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.loadFromFile("src/test/resources/models/PolicyModel.json");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.createTask("@^^$^^$", "0.0.2", "1fa2e430-f2b2-11e6-bc64-92361f002700",
"A description of 002");
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.createTask("MyTask002", "0.0.2", "1fa2e430-f2b2-11e6-bc64-92361f002700",
"A description of 002");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.createTask("MyTask002", "0.0.2", "1fa2e430-f2b2-11e6-bc64-92361f002700",
"A description of 002");
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_EXISTS));
+ assertEquals(ApexApiResult.Result.CONCEPT_EXISTS, result.getResult());
result = apexModel.createTask("MyTask012", null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.createTask("MyTask012", null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_EXISTS));
+ assertEquals(ApexApiResult.Result.CONCEPT_EXISTS, result.getResult());
result = apexModel.listTask(null, null);
result = apexModel.createTask("MyTask002", "0.0.2", "1fa2e430-f2b2-11e6-bc64-92361f002700",
"A description of 002");
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_EXISTS));
+ assertEquals(ApexApiResult.Result.CONCEPT_EXISTS, result.getResult());
result = apexModel.createTask("MyTask012", "0.1.2", "1fa2e430-f2b2-11e6-bc64-92361f002700",
"A description of 002");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.deleteTask("MyTask002", "0.0.2");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.createTask("MyTask002", "0.0.2", "1fa2e430-f2b2-11e6-bc64-92361f002700",
"A description of 002");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.validateTask(null, null);
assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.updateTask("@$$$£", "0.0.2", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.updateTask("MyTask002", "0.0.2", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.updateTask("MyTask002", "0.0.1", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.updateTask("MyTask002", "0.0.2", "1fa2e430-f2b2-11e6-bc64-92361f002700",
"A description of 002");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.updateTask("MyTask012", null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.updateTask("MyTask012", null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.updateTask("MyTask012", null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.updateTask("MyTask015", null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.updateTask("MyTask014", "0.1.5", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.listTask("£@£@@£@£", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.listTask(null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.listTask("MyTask012", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.listTask("MyTask012", "0.0.2");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.listTask("MyTask012", "0.2.5");
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.listTask("MyTask014", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.deleteTask("@£££@", "0.1.1");
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.deleteTask("MyTask012", "0.1.1");
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.deleteTask("MyTask012oooo", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.listTask("MyTask012", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
- assertTrue(result.getMessages().size() == 2);
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
+ assertEquals(2, result.getMessages().size());
result = apexModel.deleteTask("MyTask012", "0.1.2");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.listTask("MyTask012", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
- assertTrue(result.getMessages().size() == 1);
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
+ assertEquals(1, result.getMessages().size());
result = apexModel.deleteTask("MyTask012", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.listTask("MyTask012", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.updateTaskLogic("MyTask002", null, "NewLogic00", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.createTaskLogic("MyTask123", null, "NewLogic00", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.createTaskLogic("MyTask002", "4.5.6", "NewLogic00", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.createTaskLogic("MyTask002", "0.1.4", "NewLogic00", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.createTaskLogic("MyTask002", "0.0.2", "NewLogic00", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.createTaskLogic("MyTask002", "0.0.2", "UNDEFINED", "Some Task Logic");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.createTaskLogic("MyTask002", "0.0.2", "MVEL", "Some Task Logic");
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_EXISTS));
+ assertEquals(ApexApiResult.Result.CONCEPT_EXISTS, result.getResult());
result = apexModel.deleteTaskLogic("MyTask002", "0.0.2");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.createTaskLogic("MyTask002", "0.0.2", "JAVA", "Some Task Logic");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.createTaskLogic("MyTask002", "0.0.2", "JYTHON", "Some Task Logic");
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_EXISTS));
+ assertEquals(ApexApiResult.Result.CONCEPT_EXISTS, result.getResult());
result = apexModel.deleteTaskLogic("MyTask002", "0.0.2");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.createTaskLogic("MyTask002", null, "JAVASCRIPT", "Some Task Logic");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.deleteTaskLogic("MyTask002", "0.0.2");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.createTaskLogic("MyTask002", null, "JRUBY", "Some Task Logic");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.updateTaskLogic("MyTask002", "0.0.2", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.updateTaskLogic("MyTask002", "0.0.1", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.updateTaskLogic("MyTask002", "0.0.2", "", "Some Other Task Logic");
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.updateTaskLogic("MyTask002", "0.0.2", "MVEL", "Some Other Task Logic");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.updateTaskLogic("MyTask012", null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.updateTaskLogic("MyTask002", null, null, "Some Other Task Logic");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.updateTaskLogic("MyTask002", null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.updateTaskLogic("MyTask015", null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.updateTaskLogic("MyTask014", "0.1.5", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.listTaskLogic("MyTask002", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.listTaskLogic("MyTask002", "0.0.1");
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.listTaskLogic("MyTask002", "0.0.2");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.listTaskLogic("MyTask002", "0.0.2");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.listTaskLogic("MyTask002", "0.0.2");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.listTaskLogic(null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.deleteTaskLogic("@£@£@£", "0.0.2");
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.deleteTaskLogic("NonExistantTask", "0.0.2");
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
assertEquals(1, apexModel.listTaskLogic("MyTask002", null).getMessages().size());
result = apexModel.deleteTaskLogic("MyTask002", "0.0.2");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.listTaskLogic("MyTask002", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.deleteTaskLogic("MyTask002", "0.0.2");
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
assertEquals(1, apexModel.listTaskLogic("MyTask002", null).getMessages().size());
result = apexModel.createTaskLogic("MyTask002", null, "JRUBY", "Some Task Logic");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.listTaskLogic("MyTask002", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.deleteTaskLogic("MyTask002", "0.0.2");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.deleteTaskLogic("MyTask002", "0.0.2");
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.createTaskInputField("MyTask123", null, "NewField00", null, null, false);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.createTaskInputField("MyTask002", "4.5.6", "NewField00", null, null, true);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.createTaskInputField("MyTask002", "0.1.4", "NewField00", null, null, false);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.createTaskInputField("MyTask002", "0.0.2", "NewField00", null, null, true);
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.createTaskInputField("MyTask002", "0.0.2", "NewField00", "eventContextItem0", null, false);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.createTaskInputField("MyTask002", "0.0.2", "NewField00", "eventContextItem0", null, true);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_EXISTS));
+ assertEquals(ApexApiResult.Result.CONCEPT_EXISTS, result.getResult());
result = apexModel.createTaskInputField("MyTask002", "0.0.2", "NewField01", "eventContextItem0", "0.0.1",
false);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.createTaskInputField("MyTask002", "0.0.2", "NewField02", "eventContextItem0", "0.0.2", true);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.createTaskInputField("MyTask002", null, "NewField02", "eventContextItem0", null, false);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.createTaskInputField("MyTask002", null, "NewField03", "eventContextItem0", null, true);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.listTaskInputField("@£$%", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.listTaskInputField("MyTask002", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.listTaskInputField("MyTask002", "0.0.1", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.listTaskInputField("MyTask002", "0.0.2", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.listTaskInputField("MyTask002", "0.0.2", "NewField01");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.listTaskInputField("MyTask002", "0.0.2", "NewField02");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.listTaskInputField("MyTask002", "0.0.2", "NewField04");
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.deleteTaskInputField("@£$%", "0.0.2", "NewField04");
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.deleteTaskInputField("NonExistantTask", "0.0.2", "NewField04");
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
assertEquals(4, apexModel.listTaskInputField("MyTask002", null, null).getMessages().size());
result = apexModel.deleteTaskInputField("MyTask002", "0.0.2", "NewField04");
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
assertEquals(4, apexModel.listTaskInputField("MyTask002", null, null).getMessages().size());
result = apexModel.deleteTaskInputField("MyTask002", null, "NewField02");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
assertEquals(3, apexModel.listTaskInputField("MyTask002", null, null).getMessages().size());
result = apexModel.deleteTaskInputField("MyTask002", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.listTaskInputField("MyTask002", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.deleteTaskInputField("MyTask002", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.createTaskOutputField("MyTask123", null, "NewField00", null, null, false);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.createTaskOutputField("MyTask002", "4.5.6", "NewField00", null, null, false);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.createTaskOutputField("MyTask002", "0.1.4", "NewField00", null, null, false);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.createTaskOutputField("MyTask002", "0.0.2", "NewField00", null, null, false);
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.createTaskOutputField("MyTask002", "0.0.2", "NewField00", "eventContextItem0", null, false);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.createTaskOutputField("MyTask002", "0.0.2", "NewField00", "eventContextItem0", null, false);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_EXISTS));
+ assertEquals(ApexApiResult.Result.CONCEPT_EXISTS, result.getResult());
result = apexModel.createTaskOutputField("MyTask002", "0.0.2", "NewField01", "eventContextItem0", "0.0.1",
false);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.createTaskOutputField("MyTask002", "0.0.2", "NewField02", "eventContextItem0", "0.0.2",
false);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.createTaskOutputField("MyTask002", null, "NewField02", "eventContextItem0", null, false);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.createTaskOutputField("MyTask002", null, "NewField03", "eventContextItem0", null, false);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.listTaskOutputField("@£$%", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.listTaskOutputField("MyTask002", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.listTaskOutputField("MyTask002", "0.0.1", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.listTaskOutputField("MyTask002", "0.0.2", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.listTaskOutputField("MyTask002", "0.0.2", "NewField01");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.listTaskOutputField("MyTask002", "0.0.2", "NewField02");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.listTaskOutputField("MyTask002", "0.0.2", "NewField04");
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.deleteTaskOutputField("@£$%", "0.0.2", "NewField04");
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.deleteTaskOutputField("NonExistantTask", "0.0.2", "NewField04");
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
assertEquals(4, apexModel.listTaskOutputField("MyTask002", null, null).getMessages().size());
result = apexModel.deleteTaskOutputField("MyTask002", "0.0.2", "NewField04");
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
assertEquals(4, apexModel.listTaskOutputField("MyTask002", null, null).getMessages().size());
result = apexModel.deleteTaskOutputField("MyTask002", null, "NewField02");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
assertEquals(3, apexModel.listTaskOutputField("MyTask002", null, null).getMessages().size());
result = apexModel.deleteTaskOutputField("MyTask002", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.listTaskOutputField("MyTask002", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.deleteTaskOutputField("MyTask002", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.createTaskParameter("MyTask123", null, "NewPar00", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.createTaskParameter("MyTask002", "4.5.6", "NewPar00", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.createTaskParameter("MyTask002", "0.1.4", "NewPar00", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.createTaskParameter("MyTask002", "0.0.2", "NewPar00", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.createTaskParameter("MyTask002", "0.0.2", "NewPar00", "eventContextItem0");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.createTaskParameter("MyTask002", "0.0.2", "NewPar00", "eventContextItem0");
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_EXISTS));
+ assertEquals(ApexApiResult.Result.CONCEPT_EXISTS, result.getResult());
result = apexModel.createTaskParameter("MyTask002", "0.0.2", "NewPar01", "eventContextItem0");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.createTaskParameter("MyTask002", "0.0.2", "NewPar02", "eventContextItem0");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.createTaskParameter("MyTask002", "0.0.2", "NewPar02", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_EXISTS));
+ assertEquals(ApexApiResult.Result.CONCEPT_EXISTS, result.getResult());
result = apexModel.createTaskParameter("MyTask002", "0.0.2", "NewPar03", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.createTaskParameter("MyTask002", null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.createTaskParameter("MyTask002", null, null, "Default value");
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.listTaskParameter("@£$%", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.listTaskParameter("MyTask002", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.listTaskParameter("MyTask002", "0.0.3", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.listTaskParameter("MyTask002", "0.0.2", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.listTaskParameter("MyTask002", "0.0.2", "NewPar01");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.listTaskParameter("MyTask002", "0.0.2", "NewPar02");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.listTaskParameter("MyTask002", "0.0.2", "NewPar04");
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.deleteTaskParameter("@£$%", "0.0.2", "NewPar04");
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.deleteTaskParameter("NonExistantTask", "0.0.2", "NewPar04");
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
assertEquals(3, apexModel.listTaskParameter("MyTask002", null, null).getMessages().size());
result = apexModel.deleteTaskParameter("MyTask002", "0.0.2", "NewPar04");
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
assertEquals(3, apexModel.listTaskParameter("MyTask002", null, null).getMessages().size());
result = apexModel.deleteTaskParameter("MyTask002", null, "NewPar02");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
assertEquals(2, apexModel.listTaskParameter("MyTask002", null, null).getMessages().size());
result = apexModel.deleteTaskParameter("MyTask002", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.listTaskParameter("MyTask002", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.deleteTaskParameter("MyTask002", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.createTaskContextRef("@£$$", null, "AContextMap00", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.createTaskContextRef("MyTask123", null, "AContextMap00", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.createTaskContextRef("MyTask123", null, "AContextMap00", "0.0.1");
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.createTaskContextRef("MyTask123", null, "AContextMap00", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.createTaskContextRef("MyTask002", "4.5.6", "AContextMap00", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.createTaskContextRef("MyTask002", "0.1.4", "AContextMap00", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.createTaskContextRef("MyTask002", "0.0.2", "AContextMap00", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.createTaskContextRef("MyTask002", "0.0.2", "contextAlbum2", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.createTaskContextRef("MyTask002", "0.0.2", "contextAlbum0", "0.0.2");
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.createTaskContextRef("MyTask002", "0.0.2", "contextAlbum0", "0.0.1");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.createTaskContextRef("MyTask002", "0.0.2", "contextAlbum0", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_EXISTS));
+ assertEquals(ApexApiResult.Result.CONCEPT_EXISTS, result.getResult());
result = apexModel.createTaskContextRef("MyTask002", "0.0.2", "contextAlbum1", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.createTaskContextRef("MyTask002", "0.0.2", "contextAlbum0", "0.0.1");
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_EXISTS));
+ assertEquals(ApexApiResult.Result.CONCEPT_EXISTS, result.getResult());
result = apexModel.createTaskContextRef("MyTask002", null, "contextAlbum0", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_EXISTS));
+ assertEquals(ApexApiResult.Result.CONCEPT_EXISTS, result.getResult());
result = apexModel.listTaskContextRef("@£$%", null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.listTaskContextRef("MyTask002", null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
assertEquals(2, result.getMessages().size());
result = apexModel.listTaskContextRef("MyTask002", "0.0.1", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.listTaskContextRef("MyTask002", "0.0.2", null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
assertEquals(2, result.getMessages().size());
result = apexModel.listTaskContextRef("MyTask002", "0.0.2", "contextAlbum0", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
assertEquals(1, result.getMessages().size());
result = apexModel.listTaskContextRef("MyTask002", "0.0.2", "contextAlbum0", "0.0.1");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
assertEquals(1, result.getMessages().size());
result = apexModel.listTaskContextRef("MyTask002", "0.0.2", "contextAlbum0", "0.0.2");
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.listTaskContextRef("MyTask002", "0.0.2", "AContextMap04", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.listTaskContextRef("MyTask002", "0.0.2", "contextAlbum0", "0.0.1");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
assertEquals(1, result.getMessages().size());
result = apexModel.listTaskContextRef("MyTask002", "0.0.2", "contextAlbum1", "0.0.1");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
assertEquals(1, result.getMessages().size());
result = apexModel.listTaskContextRef("MyTask002", "0.0.2", "contextAlbum1", "0.0.2");
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.deleteTaskContextRef("@£$%", "0.0.2", "AContextMap04", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.deleteTaskContextRef("NonExistantTask", "0.0.2", "AContextMap04", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
assertEquals(2, apexModel.listTaskContextRef("MyTask002", null, null, null).getMessages().size());
result = apexModel.deleteTaskContextRef("MyTask002", "0.0.2", "AContextMap04", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.deleteTaskContextRef("MyTask002", null, "contextAlbum0", "0.0.3");
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.deleteTaskContextRef("MyTask002", null, "contextAlbum0", "0.1.5");
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.deleteTaskContextRef("MyTask002", null, "contextAlbum0", null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
assertEquals(1, result.getMessages().size());
result = apexModel.deleteTaskContextRef("MyTask002", null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
assertEquals(1, result.getMessages().size());
result = apexModel.listTaskContextRef("MyTask002", null, null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST));
+ assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
result = apexModel.deleteTask(null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
assertEquals(2, result.getMessages().size());
result = apexModel.listTask(null, null);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
assertEquals(0, result.getMessages().size());
}
}
diff --git a/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexModelApiTest.java b/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexModelApiTest.java
index f8d7fd696..e7330ee47 100644
--- a/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexModelApiTest.java
+++ b/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexModelApiTest.java
@@ -64,23 +64,23 @@ public class ApexModelApiTest {
final ApexModel apexModel = new ApexModelFactory().createApexModel(null, false);
ApexApiResult result = apexModel.loadFromFile("src/main/resources/models/PolicyModel.json");
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.loadFromFile("src/test/resources/models/PolicyModel.json");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.deleteModel();
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.loadFromFile("src/test/resources/models/PolicyModel.xml");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.deleteModel();
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.loadFromFile("src/test/resources/models/PolicyModel.junk");
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
- assertTrue(result.getMessages().get(0).equals("format of input for Apex concept is neither JSON nor XML"));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
+ assertEquals("format of input for Apex concept is neither JSON nor XML", result.getMessages().get(0));
}
@Test
@@ -88,24 +88,24 @@ public class ApexModelApiTest {
final ApexModel apexModel = new ApexModelFactory().createApexModel(null, false);
ApexApiResult result = apexModel.loadFromFile("src/test/resources/models/PolicyModel.json");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
final File tempJsonModelFile = File.createTempFile("ApexModelTest", ".json");
result = apexModel.saveToFile(tempJsonModelFile.getCanonicalPath(), false);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
final ApexModel jsonApexModel = new ApexModelFactory().createApexModel(null, false);
result = jsonApexModel.loadFromFile(tempJsonModelFile.getCanonicalPath());
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
tempJsonModelFile.delete();
final File tempXmlModelFile = File.createTempFile("ApexModelTest", ".xml");
result = apexModel.saveToFile(tempXmlModelFile.getCanonicalPath(), true);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
final ApexModel xmlApexModel = new ApexModelFactory().createApexModel(null, false);
result = xmlApexModel.loadFromFile(tempXmlModelFile.getCanonicalPath());
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
tempXmlModelFile.delete();
}
@@ -114,32 +114,32 @@ public class ApexModelApiTest {
final ApexModel apexModel = new ApexModelFactory().createApexModel(null, false);
ApexApiResult result = apexModel.loadFromFile("src/test/resources/models/PolicyModel.json");
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
final DaoParameters DaoParameters = new DaoParameters();
DaoParameters.setPluginClass("org.onap.policy.apex.model.basicmodel.dao.impl.DefaultApexDao");
DaoParameters.setPersistenceUnit("DAOTest");
result = apexModel.saveToDatabase(DaoParameters);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.deleteModel();
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.loadFromDatabase("PolicyModel", "0.0.1", DaoParameters);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.deleteModel();
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.loadFromDatabase("PolicyModel", null, DaoParameters);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.deleteModel();
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.loadFromDatabase("VPNPolicyModel", "0.0.1", DaoParameters);
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
}
@Test
@@ -163,30 +163,30 @@ public class ApexModelApiTest {
}
result = apexModel.readFromUrl("zooby/looby");
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.writeToUrl("zooby/looby", true);
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.readFromUrl("zooby://zooby/looby");
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
result = apexModel.writeToUrl("zooby://zooby/looby", false);
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
apexModel = new ApexModelFactory().createApexModel(null, false);
final File tempJsonModelFile = File.createTempFile("ApexModelTest", ".json");
result = apexModel.saveToFile(tempJsonModelFile.getCanonicalPath(), false);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
final String tempFileUrlString = tempJsonModelFile.toURI().toString();
result = apexModel.readFromUrl(tempFileUrlString);
- assertTrue(result.getResult().equals(ApexApiResult.Result.SUCCESS));
+ assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
result = apexModel.writeToUrl(tempFileUrlString, false);
- assertTrue(result.getResult().equals(ApexApiResult.Result.FAILED));
- assertTrue(result.getMessages().get(0).equals("protocol doesn't support output"));
+ assertEquals(ApexApiResult.Result.FAILED, result.getResult());
+ assertEquals("protocol doesn't support output", result.getMessages().get(0));
tempJsonModelFile.delete();
}
diff --git a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/LogicTest.java b/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/LogicTest.java
index d3d533400..655df059a 100644
--- a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/LogicTest.java
+++ b/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/LogicTest.java
@@ -1,20 +1,20 @@
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * Modifications Copyright (C) 2019 Nordix Foundation.
+ * Modifications Copyright (C) 2019-2020 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- *
+ *
* SPDX-License-Identifier: Apache-2.0
* ============LICENSE_END=========================================================
*/
@@ -22,10 +22,8 @@
package org.onap.policy.apex.model.policymodel.concepts;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import org.junit.Test;
@@ -36,7 +34,7 @@ import org.onap.policy.apex.model.basicmodel.concepts.AxValidationResult.Validat
/**
* Test apex logic.
- *
+ *
* @author Liam Fallon (liam.fallon@ericsson.com)
*/
public class LogicTest {
@@ -154,16 +152,16 @@ public class LogicTest {
+ "parentLocalName=PLN,localName=LN),logicFlavour=LogicFlavour,logic=Logic)",
clonedLogic.toString());
- assertFalse(logic.hashCode() == 0);
+ assertNotEquals(0, logic.hashCode());
- assertTrue(logic.equals(logic));
- assertTrue(logic.equals(clonedLogic));
- assertFalse(logic.equals(null));
- assertFalse(logic.equals((Object) "Hello"));
- assertFalse(logic.equals(new AxLogic(AxReferenceKey.getNullKey(), "LogicFlavour", "Logic")));
- assertFalse(logic.equals(new AxLogic(logicKey, "AnotherLogicFlavour", "Logic")));
- assertFalse(logic.equals(new AxLogic(logicKey, "LogicFlavour", "AnotherLogic")));
- assertTrue(logic.equals(new AxLogic(logicKey, "LogicFlavour", "Logic")));
+ assertEquals(logic, logic);
+ assertEquals(logic, clonedLogic);
+ assertNotNull(logic);
+ assertNotEquals(logic, (Object) "Hello");
+ assertNotEquals(logic, new AxLogic(AxReferenceKey.getNullKey(), "LogicFlavour", "Logic"));
+ assertNotEquals(logic, new AxLogic(logicKey, "AnotherLogicFlavour", "Logic"));
+ assertNotEquals(logic, new AxLogic(logicKey, "LogicFlavour", "AnotherLogic"));
+ assertEquals(logic, new AxLogic(logicKey, "LogicFlavour", "Logic"));
assertEquals(0, logic.compareTo(logic));
assertEquals(0, logic.compareTo(clonedLogic));
diff --git a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/PoliciesTest.java b/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/PoliciesTest.java
index 084623f6f..662b8bd02 100644
--- a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/PoliciesTest.java
+++ b/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/PoliciesTest.java
@@ -23,10 +23,8 @@ package org.onap.policy.apex.model.policymodel.concepts;
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.assertNotEquals;
import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
import java.util.Map;
import java.util.TreeMap;
@@ -40,7 +38,7 @@ import org.onap.policy.apex.model.policymodel.handling.SupportApexPolicyModelCre
/**
* Test apex policies.
- *
+ *
* @author Liam Fallon (liam.fallon@ericsson.com)
*/
public class PoliciesTest {
@@ -210,18 +208,18 @@ public class PoliciesTest {
assertEquals("AxPolicy:(key=AxArtifactKey:(name=policy,version=0.0.1),template=FREEFORM,sta",
clonedPolicy.toString().substring(0, 77));
- assertFalse(policyPN.hashCode() == 0);
+ assertNotEquals(0, policyPN.hashCode());
- assertTrue(policyPN.equals(policyPN));
- assertTrue(policyPN.equals(clonedPolicy));
- assertFalse(policyPN.equals(null));
- assertFalse(policyPN.equals((Object) "Hello"));
- assertFalse(policyPN.equals(
- new AxPolicy(AxArtifactKey.getNullKey(), savedTemplate, savedStateMap, savedFirstState)));
- assertFalse(policyPN.equals(new AxPolicy(savedPolicyKey, "SomeTemplate", savedStateMap, savedFirstState)));
- assertFalse(policyPN.equals(new AxPolicy(savedPolicyKey, savedTemplate, stateMapEmpty, savedFirstState)));
- assertFalse(policyPN.equals(new AxPolicy(savedPolicyKey, savedTemplate, savedStateMap, "SomeFirstState")));
- assertTrue(policyPN.equals(new AxPolicy(savedPolicyKey, savedTemplate, savedStateMap, savedFirstState)));
+ assertEquals(policyPN, policyPN);
+ assertEquals(policyPN, clonedPolicy);
+ assertNotNull(policyPN);
+ assertNotEquals(policyPN, (Object) "Hello");
+ assertNotEquals(policyPN,
+ new AxPolicy(AxArtifactKey.getNullKey(), savedTemplate, savedStateMap, savedFirstState));
+ assertNotEquals(policyPN, new AxPolicy(savedPolicyKey, "SomeTemplate", savedStateMap, savedFirstState));
+ assertNotEquals(policyPN, new AxPolicy(savedPolicyKey, savedTemplate, stateMapEmpty, savedFirstState));
+ assertNotEquals(policyPN, new AxPolicy(savedPolicyKey, savedTemplate, savedStateMap, "SomeFirstState"));
+ assertEquals(policyPN, new AxPolicy(savedPolicyKey, savedTemplate, savedStateMap, savedFirstState));
assertEquals(0, policyPN.compareTo(policyPN));
assertEquals(0, policyPN.compareTo(clonedPolicy));
@@ -295,13 +293,13 @@ public class PoliciesTest {
assertEquals("AxPolicies:(key=AxArtifactKey:(name=PoliciesKey,version=0.0.",
clonedPolicies.toString().substring(0, 60));
- assertFalse(policies.hashCode() == 0);
+ assertNotEquals(0, policies.hashCode());
- assertTrue(policies.equals(policies));
- assertTrue(policies.equals(clonedPolicies));
- assertFalse(policies.equals(null));
- assertFalse(policies.equals((Object) "Hello"));
- assertFalse(policies.equals(new AxPolicies(new AxArtifactKey())));
+ assertEquals(policies, policies);
+ assertEquals(policies, clonedPolicies);
+ assertNotNull(policies);
+ assertNotEquals(policies, (Object) "Hello");
+ assertNotEquals(policies, new AxPolicies(new AxArtifactKey()));
assertEquals(0, policies.compareTo(policies));
assertEquals(0, policies.compareTo(clonedPolicies));
diff --git a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/PolicyModelTest.java b/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/PolicyModelTest.java
index 820f2d1e6..829f93342 100644
--- a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/PolicyModelTest.java
+++ b/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/PolicyModelTest.java
@@ -1,20 +1,20 @@
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * Modifications Copyright (C) 2019 Nordix Foundation.
+ * Modifications Copyright (C) 2019-2020 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- *
+ *
* SPDX-License-Identifier: Apache-2.0
* ============LICENSE_END=========================================================
*/
@@ -22,10 +22,8 @@
package org.onap.policy.apex.model.policymodel.concepts;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
import org.junit.Test;
import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
@@ -44,7 +42,7 @@ import org.onap.policy.apex.model.policymodel.handling.SupportApexPolicyModelCre
/**
* Test policy models.
- *
+ *
* @author Liam Fallon (liam.fallon@ericsson.com)
*/
public class PolicyModelTest {
@@ -79,36 +77,36 @@ public class PolicyModelTest {
final AxPolicyModel clonedModel = new AxPolicyModel(model);
- assertFalse(model.hashCode() == 0);
+ assertNotEquals(0, model.hashCode());
- assertTrue(model.equals(model));
- assertTrue(model.equals(clonedModel));
- assertFalse(model.equals((Object) "Hello"));
- assertFalse(model.equals(new AxPolicyModel(new AxArtifactKey())));
- assertFalse(model.equals(new AxPolicyModel(AxArtifactKey.getNullKey(), new AxContextSchemas(schemasKey),
+ assertEquals(model, model);
+ assertEquals(model, clonedModel);
+ assertNotEquals(model, (Object) "Hello");
+ assertNotEquals(model, new AxPolicyModel(new AxArtifactKey()));
+ assertNotEquals(model, new AxPolicyModel(AxArtifactKey.getNullKey(), new AxContextSchemas(schemasKey),
new AxKeyInformation(keyInfoKey), new AxEvents(eventsKey), new AxContextAlbums(albumsKey),
- new AxTasks(tasksKey), new AxPolicies(policiesKey))));
- assertFalse(model.equals(new AxPolicyModel(modelKey, new AxContextSchemas(), new AxKeyInformation(keyInfoKey),
+ new AxTasks(tasksKey), new AxPolicies(policiesKey)));
+ assertNotEquals(model, new AxPolicyModel(modelKey, new AxContextSchemas(), new AxKeyInformation(keyInfoKey),
new AxEvents(eventsKey), new AxContextAlbums(albumsKey), new AxTasks(tasksKey),
- new AxPolicies(policiesKey))));
- assertFalse(model.equals(new AxPolicyModel(modelKey, new AxContextSchemas(schemasKey), new AxKeyInformation(),
+ new AxPolicies(policiesKey)));
+ assertNotEquals(model, new AxPolicyModel(modelKey, new AxContextSchemas(schemasKey), new AxKeyInformation(),
new AxEvents(eventsKey), new AxContextAlbums(albumsKey), new AxTasks(tasksKey),
- new AxPolicies(policiesKey))));
- assertFalse(model.equals(new AxPolicyModel(modelKey, new AxContextSchemas(schemasKey),
+ new AxPolicies(policiesKey)));
+ assertNotEquals(model, new AxPolicyModel(modelKey, new AxContextSchemas(schemasKey),
new AxKeyInformation(keyInfoKey), new AxEvents(), new AxContextAlbums(albumsKey),
- new AxTasks(tasksKey), new AxPolicies(policiesKey))));
- assertFalse(model.equals(new AxPolicyModel(modelKey, new AxContextSchemas(schemasKey),
+ new AxTasks(tasksKey), new AxPolicies(policiesKey)));
+ assertNotEquals(model, new AxPolicyModel(modelKey, new AxContextSchemas(schemasKey),
new AxKeyInformation(keyInfoKey), new AxEvents(eventsKey), new AxContextAlbums(),
- new AxTasks(tasksKey), new AxPolicies(policiesKey))));
- assertFalse(model.equals(new AxPolicyModel(modelKey, new AxContextSchemas(schemasKey),
+ new AxTasks(tasksKey), new AxPolicies(policiesKey)));
+ assertNotEquals(model, new AxPolicyModel(modelKey, new AxContextSchemas(schemasKey),
new AxKeyInformation(keyInfoKey), new AxEvents(eventsKey), new AxContextAlbums(albumsKey),
- new AxTasks(), new AxPolicies(policiesKey))));
- assertFalse(model.equals(new AxPolicyModel(modelKey, new AxContextSchemas(schemasKey),
+ new AxTasks(), new AxPolicies(policiesKey)));
+ assertNotEquals(model, new AxPolicyModel(modelKey, new AxContextSchemas(schemasKey),
new AxKeyInformation(keyInfoKey), new AxEvents(eventsKey), new AxContextAlbums(albumsKey),
- new AxTasks(tasksKey), new AxPolicies())));
- assertTrue(model.equals(new AxPolicyModel(modelKey, new AxContextSchemas(schemasKey),
+ new AxTasks(tasksKey), new AxPolicies()));
+ assertEquals(model, new AxPolicyModel(modelKey, new AxContextSchemas(schemasKey),
new AxKeyInformation(keyInfoKey), new AxEvents(eventsKey), new AxContextAlbums(albumsKey),
- new AxTasks(tasksKey), new AxPolicies(policiesKey))));
+ new AxTasks(tasksKey), new AxPolicies(policiesKey)));
assertEquals(0, model.compareTo(model));
assertEquals(0, model.compareTo(clonedModel));
diff --git a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/StateOutputTest.java b/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/StateOutputTest.java
index 77ce93d4c..ff3267c8c 100644
--- a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/StateOutputTest.java
+++ b/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/StateOutputTest.java
@@ -23,10 +23,8 @@ package org.onap.policy.apex.model.policymodel.concepts;
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.assertNotEquals;
import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
import org.junit.Test;
import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
@@ -99,16 +97,16 @@ public class StateOutputTest {
final AxStateOutput clonedPar = new AxStateOutput(so);
assertEquals("AxStateOutput:(stateKey=AxReferenceKey:(parentKeyN", clonedPar.toString().substring(0, 50));
- assertFalse(so.hashCode() == 0);
+ assertNotEquals(0, so.hashCode());
- assertTrue(so.equals(so));
- assertTrue(so.equals(clonedPar));
- assertFalse(so.equals(null));
- assertFalse(so.equals((Object) "Hello"));
- assertFalse(so.equals(new AxStateOutput(AxReferenceKey.getNullKey(), eKey, nsKey)));
- assertFalse(so.equals(new AxStateOutput(soKey, new AxArtifactKey(), nsKey)));
- assertFalse(so.equals(new AxStateOutput(soKey, eKey, new AxReferenceKey())));
- assertTrue(so.equals(new AxStateOutput(soKey, eKey, nsKey)));
+ assertEquals(so, so);
+ assertEquals(so, clonedPar);
+ assertNotNull(so);
+ assertNotEquals(so, (Object) "Hello");
+ assertNotEquals(so, new AxStateOutput(AxReferenceKey.getNullKey(), eKey, nsKey));
+ assertNotEquals(so, new AxStateOutput(soKey, new AxArtifactKey(), nsKey));
+ assertNotEquals(so, new AxStateOutput(soKey, eKey, new AxReferenceKey()));
+ assertEquals(so, new AxStateOutput(soKey, eKey, nsKey));
assertEquals(0, so.compareTo(so));
assertEquals(0, so.compareTo(clonedPar));
diff --git a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/StateTaskReferenceTest.java b/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/StateTaskReferenceTest.java
index aa5dd6109..31012c68c 100644
--- a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/StateTaskReferenceTest.java
+++ b/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/StateTaskReferenceTest.java
@@ -23,10 +23,8 @@ package org.onap.policy.apex.model.policymodel.concepts;
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.assertNotEquals;
import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
import org.junit.Test;
import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
@@ -114,18 +112,17 @@ public class StateTaskReferenceTest {
AxStateTaskReference clonedStRef = new AxStateTaskReference(stRef);
assertEquals("AxStateTaskReference:(stateKey=AxReferenceKey:(par", clonedStRef.toString().substring(0, 50));
- assertFalse(stRef.hashCode() == 0);
-
- assertTrue(stRef.equals(stRef));
- assertTrue(stRef.equals(clonedStRef));
- assertFalse(stRef.equals(null));
- assertFalse(stRef.equals((Object) "Hello"));
- assertFalse(stRef.equals(
- new AxStateTaskReference(AxReferenceKey.getNullKey(), AxStateTaskOutputType.LOGIC, soKey)));
- assertFalse(stRef.equals(new AxStateTaskReference(stRefKey, AxStateTaskOutputType.DIRECT, soKey)));
- assertFalse(stRef
- .equals(new AxStateTaskReference(stRefKey, AxStateTaskOutputType.LOGIC, new AxReferenceKey())));
- assertTrue(stRef.equals(new AxStateTaskReference(stRefKey, AxStateTaskOutputType.LOGIC, soKey)));
+ assertNotEquals(0, stRef.hashCode());
+
+ assertEquals(stRef, stRef);
+ assertEquals(stRef, clonedStRef);
+ assertNotNull(stRef);
+ assertNotEquals(stRef, (Object) "Hello");
+ assertNotEquals(stRef, new AxStateTaskReference(AxReferenceKey.getNullKey(), AxStateTaskOutputType.LOGIC,
+ soKey));
+ assertNotEquals(stRef, new AxStateTaskReference(stRefKey, AxStateTaskOutputType.DIRECT, soKey));
+ assertNotEquals(stRef, new AxStateTaskReference(stRefKey, AxStateTaskOutputType.LOGIC, new AxReferenceKey()));
+ assertEquals(stRef, new AxStateTaskReference(stRefKey, AxStateTaskOutputType.LOGIC, soKey));
assertNotNull(new AxStateTaskReference(new AxReferenceKey(), new AxArtifactKey(),
AxStateTaskOutputType.UNDEFINED, new AxReferenceKey()));
diff --git a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/StateTest.java b/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/StateTest.java
index ef015e798..4c5ad4ad3 100644
--- a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/StateTest.java
+++ b/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/StateTest.java
@@ -23,10 +23,8 @@ package org.onap.policy.apex.model.policymodel.concepts;
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.assertNotEquals;
import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
import java.util.Set;
import java.util.TreeMap;
@@ -384,40 +382,40 @@ public class StateTest {
final AxState clonedState = new AxState(state);
assertEquals("AxState:(stateKey=AxReferenceKey:(parent", clonedState.toString().substring(0, 40));
- assertFalse(state.hashCode() == 0);
+ assertNotEquals(0, state.hashCode());
- assertTrue(state.equals(state));
- assertTrue(state.equals(clonedState));
- assertFalse(state.equals(null));
- assertFalse(state.equals((Object) "Hello"));
- assertFalse(state.equals(new AxState(new AxStateParamsBuilder().key(new AxReferenceKey()).trigger(triggerKey)
+ assertEquals(state, state);
+ assertEquals(state, clonedState);
+ assertNotNull(state);
+ assertNotEquals(state, (Object) "Hello");
+ assertNotEquals(state, new AxState(new AxStateParamsBuilder().key(new AxReferenceKey()).trigger(triggerKey)
.stateOutputs(soMap).contextAlbumReferenceSet(ctxtSet).taskSelectionLogic(tsl)
- .stateFinalizerLogicMap(sflMap).defaultTask(defTaskKey).taskReferenceMap(trMap))));
- assertFalse(state.equals(new AxState(new AxStateParamsBuilder().key(stateKey).trigger(new AxArtifactKey())
+ .stateFinalizerLogicMap(sflMap).defaultTask(defTaskKey).taskReferenceMap(trMap)));
+ assertNotEquals(state, new AxState(new AxStateParamsBuilder().key(stateKey).trigger(new AxArtifactKey())
.stateOutputs(soMap).contextAlbumReferenceSet(ctxtSet).taskSelectionLogic(tsl)
- .stateFinalizerLogicMap(sflMap).defaultTask(defTaskKey).taskReferenceMap(trMap))));
- assertFalse(state.equals(new AxState(new AxStateParamsBuilder().key(stateKey).trigger(triggerKey)
+ .stateFinalizerLogicMap(sflMap).defaultTask(defTaskKey).taskReferenceMap(trMap)));
+ assertNotEquals(state, new AxState(new AxStateParamsBuilder().key(stateKey).trigger(triggerKey)
.stateOutputs(soEmptyMap).contextAlbumReferenceSet(ctxtSet).taskSelectionLogic(tsl)
- .stateFinalizerLogicMap(sflMap).defaultTask(defTaskKey).taskReferenceMap(trMap))));
- assertFalse(state.equals(new AxState(new AxStateParamsBuilder().key(stateKey).trigger(triggerKey)
+ .stateFinalizerLogicMap(sflMap).defaultTask(defTaskKey).taskReferenceMap(trMap)));
+ assertNotEquals(state, new AxState(new AxStateParamsBuilder().key(stateKey).trigger(triggerKey)
.stateOutputs(soMap).contextAlbumReferenceSet(ctxtEmptySet).taskSelectionLogic(tsl)
- .stateFinalizerLogicMap(sflMap).defaultTask(defTaskKey).taskReferenceMap(trMap))));
- assertFalse(state.equals(new AxState(new AxStateParamsBuilder().key(stateKey).trigger(triggerKey)
+ .stateFinalizerLogicMap(sflMap).defaultTask(defTaskKey).taskReferenceMap(trMap)));
+ assertNotEquals(state, new AxState(new AxStateParamsBuilder().key(stateKey).trigger(triggerKey)
.stateOutputs(soMap).contextAlbumReferenceSet(ctxtSet)
.taskSelectionLogic(new AxTaskSelectionLogic()).stateFinalizerLogicMap(sflMap)
- .defaultTask(defTaskKey).taskReferenceMap(trMap))));
- assertFalse(state.equals(new AxState(new AxStateParamsBuilder().key(stateKey).trigger(triggerKey)
+ .defaultTask(defTaskKey).taskReferenceMap(trMap)));
+ assertNotEquals(state, new AxState(new AxStateParamsBuilder().key(stateKey).trigger(triggerKey)
.stateOutputs(soMap).contextAlbumReferenceSet(ctxtSet).taskSelectionLogic(tsl)
- .stateFinalizerLogicMap(sflEmptyMap).defaultTask(defTaskKey).taskReferenceMap(trMap))));
- assertFalse(state.equals(new AxState(new AxStateParamsBuilder().key(stateKey).trigger(triggerKey)
+ .stateFinalizerLogicMap(sflEmptyMap).defaultTask(defTaskKey).taskReferenceMap(trMap)));
+ assertNotEquals(state, new AxState(new AxStateParamsBuilder().key(stateKey).trigger(triggerKey)
.stateOutputs(soMap).contextAlbumReferenceSet(ctxtSet).taskSelectionLogic(tsl)
- .stateFinalizerLogicMap(sflMap).defaultTask(new AxArtifactKey()).taskReferenceMap(trMap))));
- assertFalse(state.equals(new AxState(new AxStateParamsBuilder().key(stateKey).trigger(triggerKey)
- .stateOutputs(soMap).contextAlbumReferenceSet(ctxtSet).taskSelectionLogic(tsl)
- .stateFinalizerLogicMap(sflMap).defaultTask(defTaskKey).taskReferenceMap(trEmptyMap))));
- assertTrue(state.equals(new AxState(new AxStateParamsBuilder().key(stateKey).trigger(triggerKey)
+ .stateFinalizerLogicMap(sflMap).defaultTask(new AxArtifactKey()).taskReferenceMap(trMap)));
+ assertNotEquals(state, new AxState(new AxStateParamsBuilder().key(stateKey).trigger(triggerKey)
.stateOutputs(soMap).contextAlbumReferenceSet(ctxtSet).taskSelectionLogic(tsl)
- .stateFinalizerLogicMap(sflMap).defaultTask(defTaskKey).taskReferenceMap(trMap))));
+ .stateFinalizerLogicMap(sflMap).defaultTask(defTaskKey).taskReferenceMap(trEmptyMap)));
+ assertEquals(state, new AxState(new AxStateParamsBuilder().key(stateKey).trigger(triggerKey)
+ .stateOutputs(soMap).contextAlbumReferenceSet(ctxtSet).taskSelectionLogic(tsl)
+ .stateFinalizerLogicMap(sflMap).defaultTask(defTaskKey).taskReferenceMap(trMap)));
assertEquals(0, state.compareTo(state));
assertEquals(0, state.compareTo(clonedState));
diff --git a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/TaskParameterTest.java b/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/TaskParameterTest.java
index 3dcc5e8d7..e14dec059 100644
--- a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/TaskParameterTest.java
+++ b/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/TaskParameterTest.java
@@ -23,10 +23,8 @@ package org.onap.policy.apex.model.policymodel.concepts;
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.assertNotEquals;
import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import org.junit.Test;
@@ -37,7 +35,7 @@ import org.onap.policy.apex.model.basicmodel.concepts.AxValidationResult.Validat
/**
* Test task parameters.
- *
+ *
* @author Liam Fallon (liam.fallon@ericsson.com)
*/
public class TaskParameterTest {
@@ -90,15 +88,15 @@ public class TaskParameterTest {
assertEquals("AxTaskParameter:(key=AxReferenceKey:(parentKeyName=ParParentName,parentKeyVersion=0.0.1,"
+ "parentLocalName=PLN,localName=LN),defaultValue=DefaultValue)", clonedPar.toString());
- assertFalse(par.hashCode() == 0);
+ assertNotEquals(0, par.hashCode());
- assertTrue(par.equals(par));
- assertTrue(par.equals(clonedPar));
- assertFalse(par.equals(null));
- assertFalse(par.equals((Object) "Hello"));
- assertFalse(par.equals(new AxTaskParameter(AxReferenceKey.getNullKey(), "DefaultValue")));
- assertFalse(par.equals(new AxTaskParameter(parKey, "OtherDefaultValue")));
- assertTrue(par.equals(new AxTaskParameter(parKey, "DefaultValue")));
+ assertEquals(par, par);
+ assertEquals(par, clonedPar);
+ assertNotNull(par);
+ assertNotEquals(par, (Object) "Hello");
+ assertNotEquals(par, new AxTaskParameter(AxReferenceKey.getNullKey(), "DefaultValue"));
+ assertNotEquals(par, new AxTaskParameter(parKey, "OtherDefaultValue"));
+ assertEquals(par, new AxTaskParameter(parKey, "DefaultValue"));
assertEquals(0, par.compareTo(par));
assertEquals(0, par.compareTo(clonedPar));
diff --git a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/TasksTest.java b/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/TasksTest.java
index 9089e1837..17601c878 100644
--- a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/TasksTest.java
+++ b/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/TasksTest.java
@@ -1,20 +1,20 @@
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * Modifications Copyright (C) 2019 Nordix Foundation.
+ * Modifications Copyright (C) 2019-2020 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- *
+ *
* SPDX-License-Identifier: Apache-2.0
* ============LICENSE_END=========================================================
*/
@@ -40,7 +40,7 @@ import org.onap.policy.apex.model.eventmodel.concepts.AxOutputField;
/**
* Test policy tasks.
- *
+ *
* @author Liam Fallon (liam.fallon@ericsson.com)
*/
public class TasksTest {