X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=common%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Fso%2Fclient%2Fgraphinventory%2FGraphInventoryPatchConverterTest.java;h=1f047b3b36eb129a34e962d7db3001eb799e1e69;hb=f47919f1fe367b612fa9c96d34c59f01a541e882;hp=d24b3ff1473b552d1c92cd718c563ff6a7800781;hpb=54452b80a1cf4d22ef750bc1377f8c1b05431d57;p=so.git

diff --git a/common/src/test/java/org/onap/so/client/graphinventory/GraphInventoryPatchConverterTest.java b/common/src/test/java/org/onap/so/client/graphinventory/GraphInventoryPatchConverterTest.java
index d24b3ff147..1f047b3b36 100644
--- a/common/src/test/java/org/onap/so/client/graphinventory/GraphInventoryPatchConverterTest.java
+++ b/common/src/test/java/org/onap/so/client/graphinventory/GraphInventoryPatchConverterTest.java
@@ -24,12 +24,10 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
-
 import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.HashMap;
-
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
@@ -37,7 +35,6 @@ import org.mockito.junit.MockitoJUnitRunner;
 import org.onap.aai.domain.yang.GenericVnf;
 import org.onap.so.client.aai.AAICommonObjectMapperProvider;
 import org.onap.so.client.graphinventory.GraphInventoryPatchConverter;
-
 import com.fasterxml.jackson.core.JsonParseException;
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -46,69 +43,76 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 @RunWith(MockitoJUnitRunner.class)
 public class GraphInventoryPatchConverterTest {
 
-	private ObjectMapper mapper = new AAICommonObjectMapperProvider().getMapper();
+    private ObjectMapper mapper = new AAICommonObjectMapperProvider().getMapper();
+
+    @Test
+    public void convertObjectToPatchFormatTest()
+            throws URISyntaxException, JsonParseException, JsonMappingException, IOException {
+        GraphInventoryPatchConverter validator = new GraphInventoryPatchConverter();
+        GenericVnf vnf = new GenericVnf();
+        vnf.setIpv4Loopback0Address("");
+        String result = validator.marshallObjectToPatchFormat(vnf);
+        GenericVnf resultObj = mapper.readValue(result.toString(), GenericVnf.class);
+        assertTrue("expect object to become a String to prevent double marshalling", result instanceof String);
+        assertNull("expect null because of custom mapper", resultObj.getIpv4Loopback0Address());
+
+    }
+
+    @Test
+    public void convertStringToPatchFormatTest()
+            throws URISyntaxException, JsonParseException, JsonMappingException, IOException {
+        GraphInventoryPatchConverter validator = new GraphInventoryPatchConverter();
+        String payload = "{\"ipv4-loopback0-address\":\"\"}";
+        String result = validator.marshallObjectToPatchFormat(payload);
+
+        assertEquals("expect no change", payload, result);
+    }
+
+    @Test
+    public void convertStringToPatchFormatNull_Test()
+            throws URISyntaxException, JsonParseException, JsonMappingException, IOException {
+        GraphInventoryPatchConverter validator = new GraphInventoryPatchConverter();
+        String payload = "{\"ipv4-loopback0-address\": null}";
+        String result = validator.marshallObjectToPatchFormat(payload);
+        System.out.println(result);
+        assertEquals("expect no change", payload, result);
+    }
+
+    @Test
+    public void convertMapToPatchFormatTest()
+            throws URISyntaxException, JsonParseException, JsonMappingException, IOException {
+        GraphInventoryPatchConverter validator = new GraphInventoryPatchConverter();
+        HashMap<String, String> map = new HashMap<>();
+        map.put("ipv4-loopback0-address", "");
+        map.put("ipv4-loopback1-address", "192.168.1.1");
+        String result = validator.marshallObjectToPatchFormat(map);
+
+        assertEquals("expect string", "{\"ipv4-loopback1-address\":\"192.168.1.1\"}", result);
+    }
+
+    @Test
+    public void hasComplexObjectTest() {
+        GraphInventoryPatchConverter validator = new GraphInventoryPatchConverter();
+        String hasNesting = "{ \"hello\" : \"world\", \"nested\" : { \"key\" : \"value\" } }";
+        String noNesting = "{ \"hello\" : \"world\" }";
+        String arrayCase =
+                "{ \"hello\" : \"world\", \"nestedSimple\" : [\"value1\" , \"value2\"], \"nestedComplex\" : [{\"key\" : \"value\"}]}";
+        String empty = "{}";
+        String arrayCaseSimpleOnly = "{ \"hello\" : \"world\", \"nestedSimple\" : [\"value1\" , \"value2\"]}";
+        String relationshipListCaseNesting =
+                "{ \"hello\" : \"world\", \"nestedSimple\" : [\"value1\" , \"value2\"], \"relationship-list\" : [{\"key\" : \"value\"}], \"nested\" : { \"key\" : \"value\" }}";
+        String relationshipListCase =
+                "{ \"hello\" : \"world\", \"nestedSimple\" : [\"value1\" , \"value2\"], \"relationship-list\" : [{\"key\" : \"value\"}]}";
+        String nothing = "";
+
+        assertTrue("expect has nesting", validator.hasComplexObject(hasNesting));
+        assertFalse("expect no nesting", validator.hasComplexObject(noNesting));
+        assertTrue("expect has nesting", validator.hasComplexObject(arrayCase));
+        assertFalse("expect no nesting", validator.hasComplexObject(empty));
+        assertFalse("expect no nesting", validator.hasComplexObject(arrayCaseSimpleOnly));
+        assertFalse("expect no nesting", validator.hasComplexObject(relationshipListCase));
+        assertTrue("expect has nesting", validator.hasComplexObject(relationshipListCaseNesting));
+        assertFalse("expect no nesting", validator.hasComplexObject(nothing));
+    }
 
-	@Test
-	public void convertObjectToPatchFormatTest() throws URISyntaxException, JsonParseException, JsonMappingException, IOException {
-		GraphInventoryPatchConverter validator = new GraphInventoryPatchConverter();
-		GenericVnf vnf = new GenericVnf();
-		vnf.setIpv4Loopback0Address("");
-		String result = validator.marshallObjectToPatchFormat(vnf);
-		GenericVnf resultObj = mapper.readValue(result.toString(), GenericVnf.class);
-		assertTrue("expect object to become a String to prevent double marshalling", result instanceof String);
-		assertNull("expect null because of custom mapper", resultObj.getIpv4Loopback0Address());
-		
-	}
-	
-	@Test
-	public void convertStringToPatchFormatTest() throws URISyntaxException, JsonParseException, JsonMappingException, IOException {
-		GraphInventoryPatchConverter validator = new GraphInventoryPatchConverter();
-		String payload = "{\"ipv4-loopback0-address\":\"\"}";
-		String result = validator.marshallObjectToPatchFormat(payload);
-		
-		assertEquals("expect no change", payload, result);
-	}
-	
-	@Test
-	public void convertStringToPatchFormatNull_Test() throws URISyntaxException, JsonParseException, JsonMappingException, IOException {
-		GraphInventoryPatchConverter validator = new GraphInventoryPatchConverter();
-		String payload = "{\"ipv4-loopback0-address\": null}";
-		String result = validator.marshallObjectToPatchFormat(payload);
-		System.out.println(result);
-		assertEquals("expect no change", payload, result);
-	}
-	
-	@Test
-	public void convertMapToPatchFormatTest() throws URISyntaxException, JsonParseException, JsonMappingException, IOException {
-		GraphInventoryPatchConverter validator = new GraphInventoryPatchConverter();
-		HashMap<String, String> map = new HashMap<>();
-		map.put("ipv4-loopback0-address", "");
-		map.put("ipv4-loopback1-address", "192.168.1.1");
-		String result = validator.marshallObjectToPatchFormat(map);
-		
-		assertEquals("expect string", "{\"ipv4-loopback1-address\":\"192.168.1.1\"}", result);
-	}
-	
-	@Test
-	public void hasComplexObjectTest() {
-		GraphInventoryPatchConverter validator = new GraphInventoryPatchConverter();
-		String hasNesting = "{ \"hello\" : \"world\", \"nested\" : { \"key\" : \"value\" } }";
-		String noNesting = "{ \"hello\" : \"world\" }";
-		String arrayCase = "{ \"hello\" : \"world\", \"nestedSimple\" : [\"value1\" , \"value2\"], \"nestedComplex\" : [{\"key\" : \"value\"}]}";
-		String empty = "{}";
-		String arrayCaseSimpleOnly = "{ \"hello\" : \"world\", \"nestedSimple\" : [\"value1\" , \"value2\"]}";
-		String relationshipListCaseNesting = "{ \"hello\" : \"world\", \"nestedSimple\" : [\"value1\" , \"value2\"], \"relationship-list\" : [{\"key\" : \"value\"}], \"nested\" : { \"key\" : \"value\" }}";
-		String relationshipListCase = "{ \"hello\" : \"world\", \"nestedSimple\" : [\"value1\" , \"value2\"], \"relationship-list\" : [{\"key\" : \"value\"}]}";
-		String nothing = "";
-		
-		assertTrue("expect has nesting", validator.hasComplexObject(hasNesting));
-		assertFalse("expect no nesting", validator.hasComplexObject(noNesting));
-		assertTrue("expect has nesting", validator.hasComplexObject(arrayCase));
-		assertFalse("expect no nesting", validator.hasComplexObject(empty));
-		assertFalse("expect no nesting", validator.hasComplexObject(arrayCaseSimpleOnly));
-		assertFalse("expect no nesting", validator.hasComplexObject(relationshipListCase));
-		assertTrue("expect has nesting", validator.hasComplexObject(relationshipListCaseNesting));
-		assertFalse("expect no nesting", validator.hasComplexObject(nothing));
-	}
-	
 }