Increase code coverage

Add tests to increase code coverage above 60 percent.

Issue-ID: AAI-1198

Change-Id: I4c2f964ce41d01521cc1313e32e34fb6460d49bf
Signed-off-by: Sotiropoulos, Ioannis (is948x) <Ioannis.Sotiropoulos@amdocs.com>

3 files changed, 274 insertions, 10 deletions

diff --git a/src/test/java/org/onap/schema/EdgeRulesLoaderTest.java b/src/test/java/org/onap/schema/EdgeRulesLoaderTest.java
index 073e1d3..05f998f 100644
--- a/src/test/java/org/onap/schema/EdgeRulesLoaderTest.java
+++ b/src/test/java/org/onap/schema/EdgeRulesLoaderTest.java
@@ -20,15 +20,13 @@
  */
 package org.onap.schema;
 
+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.Test;
 import org.onap.crud.exception.CrudException;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
-
-import static org.junit.Assert.*;
-
 public class EdgeRulesLoaderTest {
 
     @Test
diff --git a/src/test/java/org/onap/schema/RelationshipSchemaValidatorTest.java b/src/test/java/org/onap/schema/RelationshipSchemaValidatorTest.java
new file mode 100644
index 0000000..711152d
--- /dev/null
+++ b/src/test/java/org/onap/schema/RelationshipSchemaValidatorTest.java
@@ -0,0 +1,269 @@
+/**
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 Amdocs
+ * ================================================================================
+ * 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.
+ * ============LICENSE_END=========================================================
+ */
+package org.onap.schema;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThat;
+import org.junit.Before;
+import org.junit.Test;
+import org.onap.crud.entity.Edge;
+import org.onap.crud.exception.CrudException;
+import org.onap.crud.parser.EdgePayload;
+import org.onap.schema.validation.RelationshipSchemaValidator;
+
+public class RelationshipSchemaValidatorTest {
+    // @formatter:off
+	  private final String edgePayload = "{" +
+		      "\"type\": \"tosca.relationships.HostedOn\"," +
+		      "\"source\": \"services/inventory/v12/vserver/50bdab41-ad1c-4d00-952c-a0aa5d827811\"," +
+		      "\"target\": \"services/inventory/v12/pserver/1d326bc7-b985-492b-9604-0d5d1f06f908\"," +
+		      "\"properties\": {" +
+		      "\"prevent-delete\": \"NONE\" } }";
+	  
+	  private final String champEdge = "{" +
+		      "\"key\": \"test-uuid\"," +
+		      "\"type\": \"edgeType\"," +
+		      "\"properties\": {" +
+		      "\"prevent-delete\": \"NONE\" }," +
+		      "\"source\": {" +
+		      "\"key\": \"50bdab41-ad1c-4d00-952c-a0aa5d827811\", \"type\": \"vserver\"}," +
+		      "\"target\": {" +
+		      "\"key\": \"1d326bc7-b985-492b-9604-0d5d1f06f908\", \"type\": \"pserver\"}" +
+		      " }";
+	// @formatter:on
+
+    @Before
+    public void init() throws Exception {
+        System.setProperty("CONFIG_HOME", "src/test/resources");
+    }
+
+    @Test
+    public void testValidateIncomingUpdatePayloadMissingSource() throws CrudException {
+        String type = "tosca.relationships.HostedOn";
+        String version = "v11";
+        String jsonString;
+        EdgePayload payload;
+
+        String champJson = champEdge.replace("edgeType", type);
+        Edge edge = Edge.fromJson(champJson);
+
+        jsonString = edgePayload.replace("services/inventory/v12/vserver/50bdab41-ad1c-4d00-952c-a0aa5d827811", "");
+        payload = EdgePayload.fromJson(jsonString);
+
+        try {
+            RelationshipSchemaValidator.validateIncomingUpdatePayload(edge, version, payload);
+        } catch (CrudException e) {
+            assertEquals(400, e.getHttpStatus().getStatusCode());
+            assertThat(e.getMessage(), is("Invalid Source/Target Urls"));
+        }
+    }
+
+    @Test
+    public void testValidateIncomingUpdatePayloadInvalidSource() throws CrudException {
+        String type = "tosca.relationships.HostedOn";
+        String version = "v11";
+        String jsonString;
+        EdgePayload payload;
+
+        String champJson = champEdge.replace("edgeType", type);
+        Edge edge = Edge.fromJson(champJson);
+
+        jsonString = edgePayload.replace("1d326bc7-b985-492b-9604-0d5d1f06f908", "invalidId");
+        payload = EdgePayload.fromJson(jsonString);
+
+        try {
+            RelationshipSchemaValidator.validateIncomingUpdatePayload(edge, version, payload);
+        } catch (CrudException e) {
+            assertEquals(400, e.getHttpStatus().getStatusCode());
+            assertThat(e.getMessage(), is("Target can't be updated"));
+        }
+    }
+
+    @Test
+    public void testValidateIncomingUpdatePayloadMissingTarget() throws CrudException {
+        String type = "tosca.relationships.HostedOn";
+        String version = "v11";
+        String jsonString;
+        EdgePayload payload;
+
+        String champJson = champEdge.replace("edgeType", type);
+        Edge edge = Edge.fromJson(champJson);
+
+        jsonString = edgePayload.replace("services/inventory/v12/pserver/1d326bc7-b985-492b-9604-0d5d1f06f908", "");
+        payload = EdgePayload.fromJson(jsonString);
+
+        try {
+            RelationshipSchemaValidator.validateIncomingUpdatePayload(edge, version, payload);
+        } catch (CrudException e) {
+            assertEquals(400, e.getHttpStatus().getStatusCode());
+            assertThat(e.getMessage(), is("Invalid Source/Target Urls"));
+        }
+    }
+
+    @Test
+    public void testValidateIncomingUpdatePayloadInvalidTarget() throws CrudException {
+        String type = "tosca.relationships.HostedOn";
+        String version = "v11";
+        String jsonString;
+        EdgePayload payload;
+
+        String champJson = champEdge.replace("edgeType", type);
+        Edge edge = Edge.fromJson(champJson);
+
+        jsonString = edgePayload.replace("50bdab41-ad1c-4d00-952c-a0aa5d827811", "invalidId");
+        payload = EdgePayload.fromJson(jsonString);
+
+        try {
+            RelationshipSchemaValidator.validateIncomingUpdatePayload(edge, version, payload);
+        } catch (CrudException e) {
+            assertEquals(400, e.getHttpStatus().getStatusCode());
+            assertThat(e.getMessage(), is("Source can't be updated"));
+        }
+    }
+
+    @Test
+    public void testValidateIncomingAddPayloadExceptionHandling() throws CrudException {
+        String type = "tosca.relationships.HostedOn";
+        String version = "v11";
+        String jsonString;
+
+        EdgePayload payload;
+        jsonString = edgePayload.replace("services/inventory/v12/vserver/50bdab41-ad1c-4d00-952c-a0aa5d827811", "");
+        payload = EdgePayload.fromJson(jsonString);
+
+        try {
+            RelationshipSchemaValidator.validateIncomingAddPayload(version, type, payload);
+        } catch (CrudException e) {
+            assertEquals(400, e.getHttpStatus().getStatusCode());
+            assertThat(e.getMessage(), is("Invalid Source/Target Urls"));
+        }
+
+        jsonString = edgePayload;
+        payload = EdgePayload.fromJson(jsonString);
+        type = "tosca.relationships.invalidType";
+        try {
+            RelationshipSchemaValidator.validateIncomingAddPayload(version, type, payload);
+        } catch (CrudException e) {
+            assertEquals(400, e.getHttpStatus().getStatusCode());
+            assertThat(e.getMessage(), is("Invalid source/target/relationship type: vserver:pserver:" + type));
+        }
+    }
+
+    @Test
+    public void testValidateIncomingPatchPayloadMissingSource() throws CrudException {
+        String type = "tosca.relationships.HostedOn";
+        String version = "v11";
+        String jsonString;
+
+        String champJson = champEdge.replace("edgeType", type);
+        Edge edge = Edge.fromJson(champJson);
+
+        EdgePayload payload;
+
+        jsonString = edgePayload.replace("services/inventory/v12/vserver/50bdab41-ad1c-4d00-952c-a0aa5d827811", "");
+        payload = EdgePayload.fromJson(jsonString);
+
+        try {
+            RelationshipSchemaValidator.validateIncomingPatchPayload(edge, version, payload);
+        } catch (CrudException e) {
+            assertEquals(400, e.getHttpStatus().getStatusCode());
+            assertThat(e.getMessage(), is("Invalid Source/Target Urls"));
+        }
+    }
+
+    @Test
+    public void testValidateIncomingPatchPayloadInvalidSource() throws CrudException {
+        String type = "tosca.relationships.HostedOn";
+        String version = "v11";
+        String jsonString;
+
+        String champJson = champEdge.replace("edgeType", type);
+        Edge edge = Edge.fromJson(champJson);
+
+        EdgePayload payload;
+
+        jsonString = edgePayload.replace("50bdab41-ad1c-4d00-952c-a0aa5d827811", "invalidId");
+        payload = EdgePayload.fromJson(jsonString);
+        try {
+            RelationshipSchemaValidator.validateIncomingPatchPayload(edge, version, payload);
+        } catch (CrudException e) {
+            assertEquals(400, e.getHttpStatus().getStatusCode());
+            assertThat(e.getMessage(), is("Source can't be updated"));
+        }
+    }
+
+    @Test
+    public void testValidateIncomingPatchPayloadMissingTarget() throws CrudException {
+        String type = "tosca.relationships.HostedOn";
+        String version = "v11";
+        String jsonString;
+
+        String champJson = champEdge.replace("edgeType", type);
+        Edge edge = Edge.fromJson(champJson);
+
+        EdgePayload payload;
+
+        jsonString = edgePayload.replace("services/inventory/v12/pserver/1d326bc7-b985-492b-9604-0d5d1f06f908", "");
+        payload = EdgePayload.fromJson(jsonString);
+
+        try {
+            RelationshipSchemaValidator.validateIncomingPatchPayload(edge, version, payload);
+        } catch (CrudException e) {
+            assertEquals(400, e.getHttpStatus().getStatusCode());
+            assertThat(e.getMessage(), is("Invalid Source/Target Urls"));
+        }
+    }
+
+    @Test
+    public void testValidateIncomingPatchPayloadInvalidTarget() throws CrudException {
+        String type = "tosca.relationships.HostedOn";
+        String version = "v11";
+        String jsonString;
+
+        String champJson = champEdge.replace("edgeType", type);
+        Edge edge = Edge.fromJson(champJson);
+
+        EdgePayload payload;
+
+        jsonString = edgePayload.replace("1d326bc7-b985-492b-9604-0d5d1f06f908", "invalidId");
+        payload = EdgePayload.fromJson(jsonString);
+        try {
+            RelationshipSchemaValidator.validateIncomingPatchPayload(edge, version, payload);
+        } catch (CrudException e) {
+            assertEquals(400, e.getHttpStatus().getStatusCode());
+            assertThat(e.getMessage(), is("Target can't be updated"));
+        }
+    }
+
+    @Test
+    public void testValidateTypeExceptionHandling() {
+        String version = "v11";
+        String type = "tosca.relationships.invalidType";
+
+        try {
+            RelationshipSchemaValidator.validateType(version, type);
+        } catch (CrudException e) {
+            assertEquals(400, e.getHttpStatus().getStatusCode());
+            assertThat(e.getMessage(), is("Invalid " + RelationshipSchema.SCHEMA_RELATIONSHIP_TYPE + ": " + type));
+        }
+    }
+}
diff --git a/src/test/java/org/onap/schema/validation/MultiplicityValidatorTest.java b/src/test/java/org/onap/schema/validation/MultiplicityValidatorTest.java
index 409ce3c..b4d5a31 100644
--- a/src/test/java/org/onap/schema/validation/MultiplicityValidatorTest.java
+++ b/src/test/java/org/onap/schema/validation/MultiplicityValidatorTest.java
@@ -20,7 +20,6 @@
  */

 package org.onap.schema.validation;

 

-import java.io.File;

 import java.util.ArrayList;

 import java.util.HashMap;

 import java.util.List;

@@ -49,9 +48,7 @@ public class MultiplicityValidatorTest {
 

     @Before

     public void init() {

-        ClassLoader classLoader = getClass().getClassLoader();

-        File dir = new File(classLoader.getResource("rules").getFile());

-        System.setProperty("CONFIG_HOME", dir.getParent());

+        System.setProperty("CONFIG_HOME", "src/test/resources");

         EdgeRulesLoader.resetSchemaVersionContext();

     }