Increase test coverage for vid/aii - third part

Change-Id: Ib4da72c1da212cf009f70694ffcb0be4049cb67e
Issue-ID: VID-385
Signed-off-by: michal.banka <michal.banka@nokia.com>

2 files changed, 177 insertions, 0 deletions

diff --git a/vid-app-common/src/test/java/org/onap/vid/aai/model/ServicePropertiesTest.java b/vid-app-common/src/test/java/org/onap/vid/aai/model/ServicePropertiesTest.java
new file mode 100644
index 000000000..3eccba9b6
--- /dev/null
+++ b/vid-app-common/src/test/java/org/onap/vid/aai/model/ServicePropertiesTest.java
@@ -0,0 +1,93 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2017 - 2019 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * 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.vid.aai.model;
+
+import java.io.IOException;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.testng.annotations.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class ServicePropertiesTest {
+
+    private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
+    private static final String SERVICE_PROPERTIES_JSON = "{\n" +
+            "\"service-instance-id\": \"instanceId\",\n" +
+            "\"service-instance-name\": \"instanceName\",\n" +
+            "\"model-invariant-id\": \"invariantId\",\n" +
+            "\"model-version-id\": \"versionId\",\n" +
+            "\"resource-version\": \"version\",\n" +
+            "\"orchestration-status\": \"status\",\n" +
+            "\"global-customer-id\": \"customerId\",\n" +
+            "\"subscriber-name\": \"subscriberName\",\n" +
+            "\"subscriber-type\": \"subscriberType\",\n" +
+            "\"vnf-id\": \"vnfId\",\n" +
+            "\"vnf-name\": \"vnfName\",\n" +
+            "\"vnf-type\": \"vnfType\",\n" +
+            "\"service-id\": \"serviceId\",\n" +
+            "\"prov-status\": \"provStatus\",\n" +
+            "\"in-maint\": false,\n" +
+            "\"is-closed-loop-disabled\": false,\n" +
+            "\"model-customization-id\": \"customizationId\",\n" +
+            "\"nf-type\": \"nfType\",\n" +
+            "\"nf-function\": \"nfFunction\",\n" +
+            "\"nf-role\": \"nfRole\",\n" +
+            "\"nf-naming-code\": \"namingCode\",\n" +
+            "\"not-listed-property\":\"value\"}"+
+            "}";
+
+
+    @Test
+    public void shouldProperlyConvertJsonToServiceProperties() throws IOException {
+        ServiceProperties serviceProperties = OBJECT_MAPPER.readValue(SERVICE_PROPERTIES_JSON, ServiceProperties.class);
+
+
+        assertThat(serviceProperties.isClosedLoopDisabled).isFalse();
+        assertThat(serviceProperties.globalCustomerId).isEqualTo("customerId");
+        assertThat(serviceProperties.inMaint).isFalse();
+        assertThat(serviceProperties.modelCustomizationId).isEqualTo("customizationId");
+        assertThat(serviceProperties.modelInvariantId).isEqualTo("invariantId");
+        assertThat(serviceProperties.modelVersionId).isEqualTo("versionId");
+        assertThat(serviceProperties.nfRole).isEqualTo("nfRole");
+        assertThat(serviceProperties.nfFunction).isEqualTo("nfFunction");
+        assertThat(serviceProperties.nfType).isEqualTo("nfType");
+        assertThat(serviceProperties.nfNamingCode).isEqualTo("namingCode");
+        assertThat(serviceProperties.serviceId).isEqualTo("serviceId");
+        assertThat(serviceProperties.serviceInstanceName).isEqualTo("instanceName");
+        assertThat(serviceProperties.serviceInstanceId).isEqualTo("instanceId");
+        assertThat(serviceProperties.provStatus).isEqualTo("provStatus");
+        assertThat(serviceProperties.vnfId).isEqualTo("vnfId");
+        assertThat(serviceProperties.vnfName).isEqualTo("vnfName");
+        assertThat(serviceProperties.vnfType).isEqualTo("vnfType");
+    }
+
+    @Test
+    public void shouldAddAdditionalProperty() throws IOException {
+        ServiceProperties serviceProperties = OBJECT_MAPPER.readValue(SERVICE_PROPERTIES_JSON, ServiceProperties.class);
+
+        serviceProperties.setAdditionalProperty("additional", "property");
+
+        assertThat(serviceProperties.getAdditionalProperties())
+                .containsOnlyKeys("not-listed-property","additional")
+                .containsValues("value","property");
+    }
+}
diff --git a/vid-app-common/src/test/java/org/onap/vid/aai/model/VnfResultTest.java b/vid-app-common/src/test/java/org/onap/vid/aai/model/VnfResultTest.java
new file mode 100644
index 000000000..075d29f28
--- /dev/null
+++ b/vid-app-common/src/test/java/org/onap/vid/aai/model/VnfResultTest.java
@@ -0,0 +1,84 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2017 - 2019 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * 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.vid.aai.model;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.junit.Assert;
+import org.testng.annotations.Test;
+
+import java.io.IOException;
+
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanEquals;
+import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
+import static org.assertj.core.api.Assertions.assertThat;
+
+
+public class VnfResultTest {
+
+    private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
+
+    private static final String VNF_RESULT_JSON = "{\n" +
+            "\"id\": \"sample\",\n" +
+            "\"node-type\": \"sampleNodeType\",\n" +
+            "\"url\": \"sample\",\n" +
+            "\"properties\": {\n" +
+            "\"service-instance-id\": \"sample\",\n" +
+            "\"service-instance-name\": \"sample\",\n" +
+            "\"model-invariant-id\": \"sample\",\n" +
+            "\"model-version-id\": \"sample\",\n" +
+            "\"resource-version\": \"sample\",\n" +
+            "\"orchestration-status\": \"sample\",\n" +
+            "\"global-customer-id\": \"sample\",\n" +
+            "\"subscriber-name\": \"sample\",\n" +
+            "\"subscriber-type\": \"sample\",\n" +
+            "\"vnf-id\": \"sample\",\n" +
+            "\"vnf-name\": \"sample\",\n" +
+            "\"vnf-type\": \"sample\",\n" +
+            "\"service-id\": \"sample\",\n" +
+            "\"prov-status\": \"sample\",\n" +
+            "\"in-maint\": false,\n" +
+            "\"is-closed-loop-disabled\": false,\n" +
+            "\"model-customization-id\": \"sample\",\n" +
+            "\"nf-type\": \"sample\",\n" +
+            "\"nf-function\": \"sample\",\n" +
+            "\"nf-role\": \"sample\",\n" +
+            "\"nf-naming-code\": \"sample\"\n" +
+            "},\n" +
+            "\"related-to\": [{\n" +
+            "\"id\": \"sample\",\n" +
+            "\"relationship-label\": \"sample\",\n" +
+            "\"node-type\": \"sample\",\n" +
+            "\"url\": \"sample\"\n" +
+            "\t}]\n" +
+            "}";
+
+    @Test
+    public void shouldProperlyConvertJsonToVnfResult() throws IOException {
+        VnfResult vnfResult = OBJECT_MAPPER.readValue(VNF_RESULT_JSON, VnfResult.class);
+
+        assertThat(vnfResult.nodeType).isEqualTo("sampleNodeType");
+        assertThat(vnfResult.id).isEqualTo("sample");
+        assertThat(vnfResult.url).isEqualTo("sample");
+        assertThat(vnfResult.relatedTo).hasSize(1);
+        assertThat(vnfResult.properties.globalCustomerId).isEqualTo("sample");
+        assertThat(vnfResult.getAdditionalProperties()).isEmpty();
+    }
+}