diff options
Diffstat (limited to 'model/model-api/src')
7 files changed, 803 insertions, 804 deletions
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(); } |