Fix unit tests for PrecheckOption

Increased line coverage to 100%
Increased branch coverage to clear Sonar major warning
Removed console logging and cleaned up assertions

Issue-ID: APPC-1499
Change-Id: Ifc7163d2e112914749514099779bd5d75ba729c9
Signed-off-by: Joss Armstrong <joss.armstrong@ericsson.com>

diff --git a/appc-config/appc-flow-controller/provider/src/test/java/org/onap/appc/flow/controller/data/PrecheckOptionTest.java b/appc-config/appc-flow-controller/provider/src/test/java/org/onap/appc/flow/controller/data/PrecheckOptionTest.java
index 6fc51e4..e2f8339 100644 (file)
--- a/appc-config/appc-flow-controller/provider/src/test/java/org/onap/appc/flow/controller/data/PrecheckOptionTest.java
+++ b/appc-config/appc-flow-controller/provider/src/test/java/org/onap/appc/flow/controller/data/PrecheckOptionTest.java
@@ -3,6 +3,8 @@
  * ONAP : APPC\r
  * ================================================================================\r
  * Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.\r
+ * ================================================================================\r
+ * Modifications Copyright (C) 2019 Ericsson\r
  * =============================================================================\r
  * Licensed under the Apache License, Version 2.0 (the "License");\r
  * you may not use this file except in compliance with the License.\r
@@ -47,21 +49,21 @@ public class PrecheckOptionTest {
     public void testSetpTransactionID() {\r
         precheckoption.setpTransactionID(1);\r
         assertNotNull(precheckoption.getpTransactionID());\r
-        assertEquals(precheckoption.getpTransactionID(),1);\r
+        assertEquals(1, precheckoption.getpTransactionID());\r
     }\r
 \r
     @Test\r
     public void testSetParamName() {\r
         precheckoption.setParamName("abc");\r
         assertNotNull(precheckoption.getParamName());\r
-        assertEquals(precheckoption.getParamName(),"abc");\r
+        assertEquals("abc", precheckoption.getParamName());\r
     }\r
 \r
     @Test\r
     public void testSetParamValue() {\r
         precheckoption.setParamValue("def");\r
         assertNotNull(precheckoption.getParamValue());\r
-        assertEquals(precheckoption.getParamValue(),"def");\r
+        assertEquals("def", precheckoption.getParamValue());\r
     }\r
 \r
     @Test\r
@@ -70,15 +72,14 @@ public class PrecheckOptionTest {
         precheckoption.setParamValue("ghi");\r
         precheckoption.setpTransactionID(1);\r
         precheckoption.setRule("jkl");\r
-        String ret = precheckoption.toString();\r
-        assertFalse("toString is not empty", ret.isEmpty());\r
+        assertFalse("toString is not empty", precheckoption.toString().isEmpty());\r
     }\r
 \r
     @Test\r
     public void testSetRule() {\r
         precheckoption.setRule("abc");\r
         assertNotNull(precheckoption.getRule());\r
-        assertEquals(precheckoption.getRule(),"abc");\r
+        assertEquals("abc", precheckoption.getRule());\r
     }\r
 \r
     @Test\r
@@ -87,13 +88,29 @@ public class PrecheckOptionTest {
         precheckoption.setParamName("abc");\r
         precheckoption.setParamValue("def");\r
         precheckoption.setRule("jkl");\r
-        System.out.println("precheckoption hashcode is " + precheckoption.hashCode());\r
+        assertNotNull(precheckoption.hashCode());\r
     }\r
 \r
     @Test\r
     public void testEqualsObject() {\r
-        assertTrue(precheckoption1.equals(precheckoption2) && precheckoption2.equals(precheckoption1));\r
+        assertTrue(precheckoption1.equals(precheckoption2));\r
         assertTrue(precheckoption1.equals(precheckoption1));\r
         assertFalse(precheckoption1.equals(null));\r
+        assertFalse(precheckoption1.equals(""));\r
+        precheckoption1.setpTransactionID(1);\r
+        assertFalse(precheckoption1.equals(precheckoption2));\r
+        precheckoption2.setpTransactionID(1);\r
+        precheckoption2.setParamName("other_param_name");\r
+        assertFalse(precheckoption1.equals(precheckoption2));\r
+        precheckoption1.setParamName("param_name");\r
+        assertFalse(precheckoption1.equals(precheckoption2));\r
+        precheckoption2.setParamName("param_name");\r
+        precheckoption2.setParamValue("other_param_value");\r
+        assertFalse(precheckoption1.equals(precheckoption2));\r
+        precheckoption1.setParamValue("param_value");\r
+        assertFalse(precheckoption1.equals(precheckoption2));\r
+        precheckoption2.setParamValue("param_value");\r
+        precheckoption1.setRule("other_rule");\r
+        assertFalse(precheckoption1.equals(precheckoption2));\r
     }\r
 }\r