1 files changed, 87 insertions, 10 deletions

diff --git a/nova-model/src/test/java/com/woorea/openstack/nova/model/VolumesTest.java b/nova-model/src/test/java/com/woorea/openstack/nova/model/VolumesTest.java
index fae5f1b..4c2d5b1 100644
--- a/nova-model/src/test/java/com/woorea/openstack/nova/model/VolumesTest.java
+++ b/nova-model/src/test/java/com/woorea/openstack/nova/model/VolumesTest.java
@@ -2,8 +2,8 @@
  * ============LICENSE_START=======================================================
  * ONAP - SO
  * ================================================================================
- * Copyright (C) 2018 Huawei Intellectual Property. All rights reserved.
- * ================================================================================ 
+ * Copyright (C) 2018 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
@@ -17,22 +17,99 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
+
 package com.woorea.openstack.nova.model;
 
+import com.woorea.openstack.nova.model.Volume;
+import com.woorea.openstack.nova.model.Volumes;
+import java.util.List;
+import org.codehaus.jackson.map.DeserializationConfig;
+import org.codehaus.jackson.map.ObjectMapper;
+import org.codehaus.jackson.map.SerializationConfig;
+import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+import org.junit.Assert;
 import org.junit.Test;
+import org.skyscreamer.jsonassert.JSONAssert;
+import org.skyscreamer.jsonassert.JSONCompareMode;
 
 public class VolumesTest {
 
-    Volumes volumes = new Volumes();
+    private static final String EOL = System.lineSeparator();
+
+    private static final String JSON_FULL = "{" + EOL
+        + "  \"volumes\" : [ {" + EOL
+        + "    \"id\" : \"id\"," + EOL
+        + "    \"status\" : \"status\"," + EOL
+        + "    \"availabilityZone\" : \"availabilityzone\"," + EOL
+        + "    \"volumeType\" : \"volumetype\"," + EOL
+        + "    \"snapshotId\" : \"snapshotid\"," + EOL
+        + "    \"attachments\" : [ {" + EOL
+        + "      \"attachments-v1-k1\" : \"attachments-v1-v1\"," + EOL
+        + "      \"attachments-v1-k2\" : \"attachments-v1-v2\"" + EOL
+        + "    }, {" + EOL
+        + "      \"attachments-v2-k1\" : \"attachments-v2-v1\"," + EOL
+        + "      \"attachments-v2-k2\" : \"attachments-v2-v2\"" + EOL
+        + "    } ]," + EOL
+        + "    \"metadata\" : {" + EOL
+        + "      \"metadata-k1\" : \"metadata-v1\"," + EOL
+        + "      \"metadata-k2\" : \"metadata-v2\"" + EOL
+        + "    }," + EOL
+        + "    \"createdAt\" : \"createdat\"," + EOL
+        + "    \"size\" : 61," + EOL
+        + "    \"displayName\" : \"name\"," + EOL
+        + "    \"displayDescription\" : \"description\"" + EOL
+        + "  }, {" + EOL
+        + "    \"id\" : \"id\"," + EOL
+        + "    \"status\" : \"status\"," + EOL
+        + "    \"availabilityZone\" : \"availabilityzone\"," + EOL
+        + "    \"volumeType\" : \"volumetype\"," + EOL
+        + "    \"snapshotId\" : \"snapshotid\"," + EOL
+        + "    \"attachments\" : [ {" + EOL
+        + "      \"attachments-v1-k1\" : \"attachments-v1-v1\"," + EOL
+        + "      \"attachments-v1-k2\" : \"attachments-v1-v2\"" + EOL
+        + "    }, {" + EOL
+        + "      \"attachments-v2-k1\" : \"attachments-v2-v1\"," + EOL
+        + "      \"attachments-v2-k2\" : \"attachments-v2-v2\"" + EOL
+        + "    } ]," + EOL
+        + "    \"metadata\" : {" + EOL
+        + "      \"metadata-k1\" : \"metadata-v1\"," + EOL
+        + "      \"metadata-k2\" : \"metadata-v2\"" + EOL
+        + "    }," + EOL
+        + "    \"createdAt\" : \"createdat\"," + EOL
+        + "    \"size\" : 61," + EOL
+        + "    \"displayName\" : \"name\"," + EOL
+        + "    \"displayDescription\" : \"description\"" + EOL
+        + "  } ]" + EOL
+        + "}";
+
+    private ObjectMapper objectMapper = new ObjectMapper()
+        .setSerializationInclusion(Inclusion.NON_NULL)
+        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
+        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
-    public void getList() throws Exception {
-        volumes.getList();
+    public void testSerialization() throws Exception {
+        System.out.println("CLASS: " + Volumes.class.getName());
+        System.out.println("TEST JSON: " + JSON_FULL);
+        Volumes volumes = objectMapper.readValue(JSON_FULL, Volumes.class);
+        String json = objectMapper.writeValueAsString(volumes);
+        System.out.println("RE-SERIALIZED OBJECT: " + json);
+        JSONAssert.assertEquals(JSON_FULL, json, JSONCompareMode.LENIENT);
     }
 
-    @Test(expected = NullPointerException.class)
-    public void iterator() throws Exception {
-        volumes.iterator();
+    @Test
+    public void testMethods() throws Exception {
+        Volumes volumes = objectMapper.readValue(JSON_FULL, Volumes.class);
+        volumes.toString();
+        
+        List<Volume> list = volumes.getList();
+        Assert.assertNotNull(list);
+        Assert.assertEquals(2, list.size());
+        
+        int cnt = 0;
+        for (@SuppressWarnings("unused") Volume x : volumes) {
+            ++cnt;
+        }
+        Assert.assertEquals(2, cnt);
     }
-
-}
\ No newline at end of file
+}