Fixing trustStore issues in AAI Client

[ccsdk/sli/adaptors.git] / aai-service / provider / src / test / java / org / onap / ccsdk / sli / adaptors / aai / data / SubInterfaceTest.java

diff --git a/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/data/SubInterfaceTest.java b/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/data/SubInterfaceTest.java
index 6671710..21fc86d 100644 (file)
--- a/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/data/SubInterfaceTest.java
+++ b/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/data/SubInterfaceTest.java
@@ -1,95 +1,94 @@
-package org.onap.ccsdk.sli.adaptors.aai.data;\r
-\r
-import static org.junit.Assert.*;\r
-import static org.mockito.Mockito.mock;\r
-\r
-import java.util.ArrayList;\r
-import java.util.Arrays;\r
-import java.util.HashMap;\r
-import java.util.Map;\r
-\r
-import org.junit.After;\r
-import org.junit.Before;\r
-import org.junit.Test;\r
-import org.openecomp.aai.inventory.v11.RelationshipList;\r
-import org.openecomp.aai.inventory.v11.Vlans;\r
-\r
-public class SubInterfaceTest {\r
-       \r
-       SubInterface _siInstance;\r
-       protected String _interfaceName;\r
-       protected String _interfaceRole;\r
-       protected String _resourceVersion;\r
-       protected Vlans _vlans;\r
-       protected RelationshipList _relationshipList;\r
-       protected Map<String, Object> _additionalProperties;\r
-       \r
-       @Before\r
-       public void setUp() throws Exception {\r
-               _siInstance = new SubInterface();\r
-               _interfaceName = "interfaceName";\r
-               _interfaceRole = "interfaceRole";\r
-               _resourceVersion = "resourceVersion";\r
-               _vlans = mock(Vlans.class);\r
-               _relationshipList = mock(RelationshipList.class);\r
-       \r
-               _additionalProperties = new HashMap<String, Object>() {{\r
-                       put("prop1", "propvalue1");\r
-                       put("prop2", "propvalue2");\r
-               }};\r
-               \r
-       }\r
-       \r
-       @After\r
-       public void tearDown() throws Exception {\r
-               _siInstance = null;\r
-               _interfaceName = null;\r
-               _interfaceRole = null;\r
-               _resourceVersion = null;\r
-               _vlans = null;\r
-               _relationshipList = null;\r
-               _additionalProperties = null;\r
-       }\r
-\r
-       @Test\r
-       public void testSetInterfaceName() {\r
-               _siInstance.setInterfaceName(_interfaceName);\r
-               assertTrue(_siInstance.getInterfaceName().equals(_interfaceName));\r
-       }\r
-\r
-\r
-       @Test\r
-       public void testSetInterfaceRole() {\r
-               _siInstance.setInterfaceRole(_interfaceRole);\r
-               assertTrue(_siInstance.getInterfaceRole().equals(_interfaceRole));\r
-       }\r
-\r
-\r
-       @Test\r
-       public void testSetResourceVersion() {\r
-               _siInstance.setResourceVersion(_resourceVersion);\r
-               assertTrue(_siInstance.getResourceVersion().equals(_resourceVersion));\r
-       }\r
-\r
-\r
-       @Test\r
-       public void testSetVlans() {\r
-               _siInstance.setVlans(_vlans);\r
-               assertTrue(_siInstance.getVlans().equals(_vlans));\r
-       }\r
-\r
-\r
-       @Test\r
-       public void testSetRelationshipList() {\r
-               _siInstance.setRelationshipList(_relationshipList);\r
-               assertTrue(_siInstance.getRelationshipList().equals(_relationshipList));\r
-       }\r
-\r
-       @Test\r
-       public void testSetAdditionalProperties() {\r
-               _siInstance.setAdditionalProperty("prop1", "propvalue1");\r
-               _siInstance.setAdditionalProperty("prop2", "propvalue2");\r
-               assertEquals(_siInstance.getAdditionalProperties(), _additionalProperties);\r
-       }\r
-\r
-}\r
+package org.onap.ccsdk.sli.adaptors.aai.data;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.openecomp.aai.inventory.v13.RelationshipList;
+import org.openecomp.aai.inventory.v13.Vlans;
+
+public class SubInterfaceTest {
+
+    SubInterface _siInstance;
+    protected String _interfaceName;
+    protected String _interfaceRole;
+    protected String _resourceVersion;
+    protected Vlans _vlans;
+    protected RelationshipList _relationshipList;
+    protected Map<String, Object> _additionalProperties;
+
+    @Before
+    public void setUp() throws Exception {
+        _siInstance = new SubInterface();
+        _interfaceName = "interfaceName";
+        _interfaceRole = "interfaceRole";
+        _resourceVersion = "resourceVersion";
+        _vlans = mock(Vlans.class);
+        _relationshipList = mock(RelationshipList.class);
+
+        _additionalProperties = new HashMap<String, Object>() {{
+            put("prop1", "propvalue1");
+            put("prop2", "propvalue2");
+        }};
+
+    }
+
+    @After
+    public void tearDown() throws Exception {
+        _siInstance = null;
+        _interfaceName = null;
+        _interfaceRole = null;
+        _resourceVersion = null;
+        _vlans = null;
+        _relationshipList = null;
+        _additionalProperties = null;
+    }
+
+    @Test
+    public void testSetInterfaceName() {
+        _siInstance.setInterfaceName(_interfaceName);
+        assertTrue(_siInstance.getInterfaceName().equals(_interfaceName));
+    }
+
+
+    @Test
+    public void testSetInterfaceRole() {
+        _siInstance.setInterfaceRole(_interfaceRole);
+        assertTrue(_siInstance.getInterfaceRole().equals(_interfaceRole));
+    }
+
+
+    @Test
+    public void testSetResourceVersion() {
+        _siInstance.setResourceVersion(_resourceVersion);
+        assertTrue(_siInstance.getResourceVersion().equals(_resourceVersion));
+    }
+
+
+    @Test
+    public void testSetVlans() {
+        _siInstance.setVlans(_vlans);
+        assertTrue(_siInstance.getVlans().equals(_vlans));
+    }
+
+
+    @Test
+    public void testSetRelationshipList() {
+        _siInstance.setRelationshipList(_relationshipList);
+        assertTrue(_siInstance.getRelationshipList().equals(_relationshipList));
+    }
+
+    @Test
+    public void testSetAdditionalProperties() {
+        _siInstance.setAdditionalProperty("prop1", "propvalue1");
+        _siInstance.setAdditionalProperty("prop2", "propvalue2");
+        assertEquals(_siInstance.getAdditionalProperties(), _additionalProperties);
+    }
+
+}