From 53b9324d6ec14ef75dc1f943c19b3ea1a46bc8ab Mon Sep 17 00:00:00 2001 From: JvD_Ericsson Date: Fri, 17 Jul 2020 14:08:52 +0100 Subject: Fix assertTrue in apex-pdp/model apex-pdp/plugins, apex-pdp/services and apex-pdp/testsuites Replace assertTrue with assertEquals and assertFalse with assertNotEquals in apex-pdp/model, apex-pdp/plugins, apex-pdp/services and apex-pdp/testsuites Issue-ID: POLICY-2690 Change-Id: If088371cf012d5648e04ade2aa4d49b38945f6d2 Signed-off-by: JvD_Ericsson --- .../org/onap/policy/apex/service/engine/main/ApexMainTest.java | 2 +- .../org/onap/policy/apex/services/onappf/TestApexStarterMain.java | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'services') diff --git a/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/main/ApexMainTest.java b/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/main/ApexMainTest.java index 0a34b1164..731baf5ef 100644 --- a/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/main/ApexMainTest.java +++ b/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/main/ApexMainTest.java @@ -166,7 +166,7 @@ public class ApexMainTest { apexMain.shutdown(); final String outString = outContent.toString(); assertTrue(outString.contains("I/O Parameters for id2:v2 has duplicates. So this policy is not executed")); - assertTrue(apexMain.getApexParametersMap().size() == 1); // only id1:v1 is kept in the map, id2:v2 failed + assertEquals(1, apexMain.getApexParametersMap().size()); // only id1:v1 is kept in the map, id2:v2 failed } @Test diff --git a/services/services-onappf/src/test/java/org/onap/policy/apex/services/onappf/TestApexStarterMain.java b/services/services-onappf/src/test/java/org/onap/policy/apex/services/onappf/TestApexStarterMain.java index 43d36f84d..927c1c3f3 100644 --- a/services/services-onappf/src/test/java/org/onap/policy/apex/services/onappf/TestApexStarterMain.java +++ b/services/services-onappf/src/test/java/org/onap/policy/apex/services/onappf/TestApexStarterMain.java @@ -22,6 +22,7 @@ package org.onap.policy.apex.services.onappf; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import org.junit.After; @@ -81,14 +82,14 @@ public class TestApexStarterMain { public void testApexStarter_NoArguments() { final String[] apexStarterConfigParameters = {}; apexStarter = new ApexStarterMain(apexStarterConfigParameters); - assertTrue(apexStarter.getParameters() == null); + assertNull(apexStarter.getParameters()); } @Test public void testApexStarter_InvalidArguments() { final String[] apexStarterConfigParameters = { "src/test/resources/ApexStarterConfigParameters.json" }; apexStarter = new ApexStarterMain(apexStarterConfigParameters); - assertTrue(apexStarter.getParameters() == null); + assertNull(apexStarter.getParameters()); } @Test @@ -102,6 +103,6 @@ public class TestApexStarterMain { final String[] apexStarterConfigParameters = { "-c", "src/test/resources/ApexStarterConfigParameters_InvalidName.json" }; apexStarter = new ApexStarterMain(apexStarterConfigParameters); - assertTrue(apexStarter.getParameters() == null); + assertNull(apexStarter.getParameters()); } } -- cgit 1.2.3-korg