From cb56eaf2e22e8246f769dde0fa52cadaca5158bc Mon Sep 17 00:00:00 2001
From: Harish Venkata Kajur <vk250x@att.com>
Date: Tue, 11 Feb 2020 10:04:30 -0500
Subject: Add an unit test for the bug with children

Issue-ID: AAI-2790
Change-Id: I976384de5fe4300b7793850ef416cef9d2e013c7
Signed-off-by: Harish Venkata Kajur <vk250x@att.com>
Signed-off-by: Jimmy Forsyth <jf2512@att.com>
---
 aai-resources/pom.xml                              |  2 +-
 .../java/org/onap/aai/rest/CloudRegionTest.java    | 56 ++++++++++++++++++++++
 .../resources/payloads/resource/cloud-region.json  | 12 +++++
 pom.xml                                            |  4 +-
 version.properties                                 |  2 +-
 5 files changed, 72 insertions(+), 4 deletions(-)
 create mode 100644 aai-resources/src/test/java/org/onap/aai/rest/CloudRegionTest.java
 create mode 100644 aai-resources/src/test/resources/payloads/resource/cloud-region.json

diff --git a/aai-resources/pom.xml b/aai-resources/pom.xml
index e89983c..8b2d23e 100644
--- a/aai-resources/pom.xml
+++ b/aai-resources/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.onap.aai.resources</groupId>
         <artifactId>resources</artifactId>
-        <version>1.6.3-SNAPSHOT</version>
+        <version>1.6.4-SNAPSHOT</version>
     </parent>
     <properties>
         <java.version>1.8</java.version>
diff --git a/aai-resources/src/test/java/org/onap/aai/rest/CloudRegionTest.java b/aai-resources/src/test/java/org/onap/aai/rest/CloudRegionTest.java
new file mode 100644
index 0000000..a4f9629
--- /dev/null
+++ b/aai-resources/src/test/java/org/onap/aai/rest/CloudRegionTest.java
@@ -0,0 +1,56 @@
+/**
+ * ============LICENSE_START==================================================
+ * org.onap.aai
+ * ===========================================================================
+ * Copyright © 2017-2020 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.aai.rest;
+
+import org.junit.Test;
+import org.onap.aai.PayloadUtil;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+
+import java.io.IOException;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.StringContains.containsString;
+import static org.junit.Assert.assertEquals;
+
+public class CloudRegionTest extends AbstractSpringRestTest {
+
+    @Test
+    public void testCloudRegionWithChildAndDoGetAndExpectChildProperties() throws IOException {
+
+        String endpoint = "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/testOwner/testRegionOne";
+
+        ResponseEntity responseEntity = null;
+
+        responseEntity = restTemplate.exchange(baseUrl + endpoint, HttpMethod.GET, httpEntity, String.class);
+        assertEquals(HttpStatus.NOT_FOUND, responseEntity.getStatusCode());
+
+        String payload = PayloadUtil.getResourcePayload("cloud-region.json");
+        httpEntity = new HttpEntity(payload, headers);
+        responseEntity = restTemplate.exchange(baseUrl + endpoint, HttpMethod.PUT, httpEntity, String.class);
+        assertEquals(HttpStatus.CREATED, responseEntity.getStatusCode());
+
+        responseEntity = restTemplate.exchange(baseUrl + endpoint + "/tenants", HttpMethod.GET, httpEntity, String.class);
+        assertEquals(HttpStatus.OK, responseEntity.getStatusCode());
+        assertThat(responseEntity.getBody().toString(), containsString("tenant-id"));
+    }
+}
diff --git a/aai-resources/src/test/resources/payloads/resource/cloud-region.json b/aai-resources/src/test/resources/payloads/resource/cloud-region.json
new file mode 100644
index 0000000..0c4855d
--- /dev/null
+++ b/aai-resources/src/test/resources/payloads/resource/cloud-region.json
@@ -0,0 +1,12 @@
+{
+  "cloud-owner": "testOwner",
+  "cloud-region-id": "testRegionOne",
+  "tenants": {
+    "tenant": [
+      {
+        "tenant-id": "test-tenant-id",
+        "tenant-name": "tenant-name"
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 9f7bc2c..db289d3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,11 +26,11 @@
     <parent>
         <groupId>org.onap.aai.aai-common</groupId>
         <artifactId>aai-parent</artifactId>
-        <version>1.6.3</version>
+        <version>1.6.4</version>
     </parent>
     <groupId>org.onap.aai.resources</groupId>
     <artifactId>resources</artifactId>
-    <version>1.6.3-SNAPSHOT</version>
+    <version>1.6.4-SNAPSHOT</version>
     <name>aai-resources</name>
     <packaging>pom</packaging>
     <modules>
diff --git a/version.properties b/version.properties
index fd02907..fc0709c 100644
--- a/version.properties
+++ b/version.properties
@@ -5,7 +5,7 @@
 
 major_version=1
 minor_version=6
-patch_version=3
+patch_version=4
 
 base_version=${major_version}.${minor_version}.${patch_version}
 
-- 
cgit 1.2.3-korg