Add unit test for cloud bean.

Change-Id: I95776dff986dfe3d3e69284edec651e0dd0bf054
Issue-ID: AAI-341
Signed-off-by: lizi00164331 <li.zi30@zte.com.cn>

diff --git a/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/VimManagerWrapper.java b/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/VimManagerWrapper.java
index 3ba83b0..ec52317 100644 (file)
--- a/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/VimManagerWrapper.java
+++ b/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/VimManagerWrapper.java
@@ -172,7 +172,7 @@ public class VimManagerWrapper {
     originalCloudRegionDetail = getOriginalCloudRegion(cloudOwner, cloudRegionId);
     String resourceVersion = originalCloudRegionDetail.getResourceVersion();
     cloudRegionDetail = VimManagerUtil.vimRegisterInfo2CloudRegion(vimRegisterInfo);
-    if(originalCloudRegionDetail != null && resourceVersion != null) {
+    if(resourceVersion != null) {
       cloudRegionDetail.setResourceVersion(resourceVersion);
       originalSystemInfo = originalCloudRegionDetail.getEsrSystemInfoList().getEsrSystemInfo().get(0);
       cloudRegionDetail.getEsrSystemInfoList().getEsrSystemInfo().get(0).setEsrSystemInfoId(originalSystemInfo.getEsrSystemInfoId());

diff --git a/esr-mgr/src/test/java/org/onap/aai/esr/db/resource/VimResourceTest.java b/esr-mgr/src/test/java/org/onap/aai/esr/db/resource/VimResourceTest.java
deleted file mode 100644 (file)
index 6265c21..0000000
--- a/esr-mgr/src/test/java/org/onap/aai/esr/db/resource/VimResourceTest.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * Copyright 2017 ZTE Corporation.
- *
- * 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.
- */
-package org.onap.aai.esr.db.resource;
-
-public class VimResourceTest {
-
-}

diff --git a/esr-mgr/src/test/java/org/onap/aai/esr/entity/aai/CloudRegionDetailTest.java b/esr-mgr/src/test/java/org/onap/aai/esr/entity/aai/CloudRegionDetailTest.java
new file mode 100644 (file)
index 0000000..a567901
--- /dev/null
+++ b/esr-mgr/src/test/java/org/onap/aai/esr/entity/aai/CloudRegionDetailTest.java
@@ -0,0 +1,102 @@
+/**
+ * Copyright 2017 ZTE Corporation.
+ *
+ * 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.
+ */
+package org.onap.aai.esr.entity.aai;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.ArrayList;
+
+import org.junit.Test;
+
+public class CloudRegionDetailTest {
+  @Test
+  public void getterAndSetter4CloudOwner(){
+      final String cloudOwner = "cloud-owner-test";
+      CloudRegionDetail cloudRegion = new CloudRegionDetail();
+      cloudRegion.setCloudOwner(cloudOwner);
+      assertEquals(cloudRegion.getCloudOwner(), cloudOwner);
+  }
+  
+  
+  @Test
+  public void getterAndSetter4CloudRegionId(){
+      final String cloudRegionId = "cloud-region-id-test";
+      CloudRegionDetail cloudRegion = new CloudRegionDetail();
+      cloudRegion.setCloudRegionId(cloudRegionId);
+      assertEquals(cloudRegion.getCloudRegionId(), cloudRegionId);
+  }
+  
+  @Test
+  public void getterAndSetter4CloudType(){
+      final String cloudType = "cloud-type-test";
+      CloudRegionDetail cloudRegion = new CloudRegionDetail();
+      cloudRegion.setCloudType(cloudType);
+      assertEquals(cloudRegion.getCloudType(), cloudType);
+  }
+  
+  @Test
+  public void getterAndSetter4cloudRegionVersion(){
+      final String cloudRegionVersion = "cloud-region-version-test";
+      CloudRegionDetail cloudRegion = new CloudRegionDetail();
+      cloudRegion.setCloudRegionVersion(cloudRegionVersion);
+      assertEquals(cloudRegion.getCloudRegionVersion(), cloudRegionVersion);
+  }
+  
+  @Test
+  public void getterAndSetter4ownerDefinedType(){
+      final String ownerDefinedType = "owner-defined-type-test";
+      CloudRegionDetail cloudRegion = new CloudRegionDetail();
+      cloudRegion.setOwnerDefinedType(ownerDefinedType);
+      assertEquals(cloudRegion.getOwnerDefinedType(), ownerDefinedType);
+  }
+  
+  @Test
+  public void getterAndSetter4cloudZone(){
+      final String cloudZone = "cloudZone-test";
+      CloudRegionDetail cloudRegion = new CloudRegionDetail();
+      cloudRegion.setCloudZone(cloudZone);
+      assertEquals(cloudRegion.getCloudZone(), cloudZone);
+  }
+  
+  @Test
+  public void getterAndSetter4complexName(){
+      final String complexName = "complexName-test";
+      CloudRegionDetail cloudRegion = new CloudRegionDetail();
+      cloudRegion.setComplexName(complexName);
+      assertEquals(cloudRegion.getComplexName(), complexName);
+  }
+  
+  @Test
+  public void getterAndSetter4cloudExtraInfo(){
+      final String cloudExtraInfo = "cloudExtraInfo-test";
+      CloudRegionDetail cloudRegion = new CloudRegionDetail();
+      cloudRegion.setCloudExtraInfo(cloudExtraInfo);
+      assertEquals(cloudRegion.getCloudExtraInfo(), cloudExtraInfo);
+  }
+  
+  @Test
+  public void getterAndSetter4esrSystemInfoList(){
+      final EsrSystemInfoList esrSystemInfoList = new EsrSystemInfoList();
+      ArrayList<EsrSystemInfo> esrSystemInfo = new ArrayList<EsrSystemInfo>();
+      EsrSystemInfo esrSystemInfoObj = new EsrSystemInfo();
+      esrSystemInfoObj.setEsrSystemInfoId("123");
+      esrSystemInfo.add(esrSystemInfoObj );
+      esrSystemInfoList.setEsrSystemInfo(esrSystemInfo);
+      CloudRegionDetail cloudRegion = new CloudRegionDetail();
+      cloudRegion.setEsrSystemInfoList(esrSystemInfoList);
+      assertEquals(cloudRegion.getEsrSystemInfoList(), esrSystemInfoList);
+  }
+}

diff --git a/esr-mgr/src/test/java/org/onap/aai/esr/entity/aai/CloudRegionListTest.java b/esr-mgr/src/test/java/org/onap/aai/esr/entity/aai/CloudRegionListTest.java
new file mode 100644 (file)
index 0000000..4786fc1
--- /dev/null
+++ b/esr-mgr/src/test/java/org/onap/aai/esr/entity/aai/CloudRegionListTest.java
@@ -0,0 +1,37 @@
+/**
+ * Copyright 2017 ZTE Corporation.
+ *
+ * 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.
+ */
+package org.onap.aai.esr.entity.aai;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.ArrayList;
+
+import org.junit.Test;
+
+public class CloudRegionListTest {
+  
+  @Test
+  public void getterAndSetter4cloudRegion() {
+    CloudRegionList cloudRegionList = new CloudRegionList();
+    ArrayList<CloudRegion> cloudRegions = new ArrayList<CloudRegion>();
+    CloudRegion cloudRegion = new CloudRegion();
+    cloudRegion.setCloudOwner("owner");
+    cloudRegion.setCloudRegionId("regionId");
+    cloudRegions.add(cloudRegion);
+    cloudRegionList.setCloudRegion(cloudRegions);
+    assertEquals(cloudRegionList.getCloudRegion(), cloudRegions);
+  }
+}

diff --git a/esr-mgr/src/test/java/org/onap/aai/esr/entity/aai/CloudRegionTest.java b/esr-mgr/src/test/java/org/onap/aai/esr/entity/aai/CloudRegionTest.java
new file mode 100644 (file)
index 0000000..90af6bc
--- /dev/null
+++ b/esr-mgr/src/test/java/org/onap/aai/esr/entity/aai/CloudRegionTest.java
@@ -0,0 +1,87 @@
+/**
+ * Copyright 2017 ZTE Corporation.
+ *
+ * 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.
+ */
+package org.onap.aai.esr.entity.aai;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+public class CloudRegionTest {
+
+  @Test
+  public void getterAndSetter4CloudOwner(){
+      final String cloudOwner = "cloud-owner-test";
+      CloudRegion cloudRegion = new CloudRegion();
+      cloudRegion.setCloudOwner(cloudOwner);
+      assertEquals(cloudRegion.getCloudOwner(), cloudOwner);
+  }
+  
+  @Test
+  public void getterAndSetter4CloudRegionId(){
+      final String cloudRegionId = "cloud-region-id-test";
+      CloudRegion cloudRegion = new CloudRegion();
+      cloudRegion.setCloudRegionId(cloudRegionId);
+      assertEquals(cloudRegion.getCloudRegionId(), cloudRegionId);
+  }
+  
+  @Test
+  public void getterAndSetter4CloudType(){
+      final String cloudType = "cloud-type-test";
+      CloudRegion cloudRegion = new CloudRegion();
+      cloudRegion.setCloudType(cloudType);
+      assertEquals(cloudRegion.getCloudType(), cloudType);
+  }
+  
+  @Test
+  public void getterAndSetter4cloudRegionVersion(){
+      final String cloudRegionVersion = "cloud-region-version-test";
+      CloudRegion cloudRegion = new CloudRegion();
+      cloudRegion.setCloudRegionVersion(cloudRegionVersion);
+      assertEquals(cloudRegion.getCloudRegionVersion(), cloudRegionVersion);
+  }
+  
+  @Test
+  public void getterAndSetter4ownerDefinedType(){
+      final String ownerDefinedType = "owner-defined-type-test";
+      CloudRegion cloudRegion = new CloudRegion();
+      cloudRegion.setOwnerDefinedType(ownerDefinedType);
+      assertEquals(cloudRegion.getOwnerDefinedType(), ownerDefinedType);
+  }
+  
+  @Test
+  public void getterAndSetter4cloudZone(){
+      final String cloudZone = "cloudZone-test";
+      CloudRegion cloudRegion = new CloudRegion();
+      cloudRegion.setCloudZone(cloudZone);
+      assertEquals(cloudRegion.getCloudZone(), cloudZone);
+  }
+  
+  @Test
+  public void getterAndSetter4complexName(){
+      final String complexName = "complexName-test";
+      CloudRegion cloudRegion = new CloudRegion();
+      cloudRegion.setComplexName(complexName);
+      assertEquals(cloudRegion.getComplexName(), complexName);
+  }
+  
+  @Test
+  public void getterAndSetter4cloudExtraInfo(){
+      final String cloudExtraInfo = "cloudExtraInfo-test";
+      CloudRegion cloudRegion = new CloudRegion();
+      cloudRegion.setCloudExtraInfo(cloudExtraInfo);
+      assertEquals(cloudRegion.getCloudExtraInfo(), cloudExtraInfo);
+  }
+}