1 files changed, 53 insertions, 37 deletions

diff --git a/nova-model/src/test/java/com/woorea/openstack/nova/model/SnapshotForCreateTest.java b/nova-model/src/test/java/com/woorea/openstack/nova/model/SnapshotForCreateTest.java
index 39abc2c..edcca0f 100644
--- a/nova-model/src/test/java/com/woorea/openstack/nova/model/SnapshotForCreateTest.java
+++ b/nova-model/src/test/java/com/woorea/openstack/nova/model/SnapshotForCreateTest.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,52 +17,68 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
+
 package com.woorea.openstack.nova.model;
 
+import com.woorea.openstack.nova.model.SnapshotForCreate;
+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 SnapshotForCreateTest {
 
-    SnapshotForCreate snapshotForCreate = new SnapshotForCreate();
-
-    @Test
-    public void getVolumeId() throws Exception {
-        snapshotForCreate.getVolumeId();
-    }
+    private static final String EOL = System.lineSeparator();
 
-    @Test
-    public void setVolumeId() throws Exception {
-        snapshotForCreate.setVolumeId("Test");
-    }
+    private static final String JSON_FULL = "{" + EOL
+        + "  \"snapshot\" : {" + EOL
+        + "    \"force\" : false," + EOL
+        + "    \"volume_id\" : \"volumeid\"," + EOL
+        + "    \"display_name\" : \"name\"," + EOL
+        + "    \"display_description\" : \"description\"" + EOL
+        + "  }" + EOL
+        + "}";
 
-    @Test
-    public void getForce() throws Exception {
-        snapshotForCreate.getForce();
-    }
+    private ObjectMapper objectMapper = new ObjectMapper()
+        .setSerializationInclusion(Inclusion.NON_NULL)
+        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
+        .enable(SerializationConfig.Feature.WRAP_ROOT_VALUE)
+        .enable(DeserializationConfig.Feature.UNWRAP_ROOT_VALUE)
+        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
-    public void setForce() throws Exception {
-        snapshotForCreate.setForce(true);
+    public void testSerialization() throws Exception {
+        System.out.println("CLASS: " + SnapshotForCreate.class.getName());
+        System.out.println("TEST JSON: " + JSON_FULL);
+        SnapshotForCreate snapshotforcreate = objectMapper.readValue(JSON_FULL, SnapshotForCreate.class);
+        String json = objectMapper.writeValueAsString(snapshotforcreate);
+        System.out.println("RE-SERIALIZED OBJECT: " + json);
+        JSONAssert.assertEquals(JSON_FULL, json, JSONCompareMode.LENIENT);
     }
 
     @Test
-    public void getName() throws Exception {
-        snapshotForCreate.getName();
+    public void testMethods() throws Exception {
+        SnapshotForCreate snapshotforcreate = objectMapper.readValue(JSON_FULL, SnapshotForCreate.class);
+        snapshotforcreate.toString();
+        
+        String name = snapshotforcreate.getName();
+        Assert.assertNotNull(name);
+        snapshotforcreate.setName(name);
+        
+        String volumeId = snapshotforcreate.getVolumeId();
+        Assert.assertNotNull(volumeId);
+        snapshotforcreate.setVolumeId(volumeId);
+        
+        String description = snapshotforcreate.getDescription();
+        Assert.assertNotNull(description);
+        snapshotforcreate.setDescription(description);
+        
+        Boolean force = snapshotforcreate.getForce();
+        Assert.assertNotNull(force);
+        snapshotforcreate.setForce(force);
     }
-
-    @Test
-    public void setName() throws Exception {
-        snapshotForCreate.setName("Test");
-    }
-
-    @Test
-    public void getDescription() throws Exception {
-        snapshotForCreate.getDescription();
-    }
-
-    @Test
-    public void setDescription() throws Exception {
-        snapshotForCreate.setDescription("test");
-    }
-
-}
\ No newline at end of file
+}