1 files changed, 80 insertions, 86 deletions

diff --git a/nova-model/src/test/java/com/woorea/openstack/nova/model/FlavorForCreateTest.java b/nova-model/src/test/java/com/woorea/openstack/nova/model/FlavorForCreateTest.java
index ebd88b4..578f55a 100644
--- a/nova-model/src/test/java/com/woorea/openstack/nova/model/FlavorForCreateTest.java
+++ b/nova-model/src/test/java/com/woorea/openstack/nova/model/FlavorForCreateTest.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
@@ -20,91 +20,85 @@
 
 package com.woorea.openstack.nova.model;
 
+import com.woorea.openstack.nova.model.FlavorForCreate;
+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 static org.junit.Assert.*;
+import org.skyscreamer.jsonassert.JSONAssert;
+import org.skyscreamer.jsonassert.JSONCompareMode;
 
 public class FlavorForCreateTest {
 
-    private FlavorForCreate flavor = new FlavorForCreate();
-
-    @Test
-    public void getId() {
-        flavor.getId();
-    }
-
-    @Test
-    public void setId() {
-        flavor.setId("123");
-    }
-
-    @Test
-    public void getName() {
-        flavor.getName();
-    }
-
-    @Test
-    public void setName() {
-        flavor.setName("123");
-    }
-
-    @Test
-    public void getVcpus() {
-        flavor.getVcpus();
-    }
-
-    @Test
-    public void setVcpus() {
-        flavor.setVcpus("123");
-    }
-
-    @Test
-    public void getRam() {
-        flavor.getRam();
-    }
-
-    @Test
-    public void setRam() {
-        flavor.setRam(123);
-    }
-
-    @Test
-    public void getDisk() {
-        flavor.getDisk();
-    }
-
-    @Test
-    public void setDisk() {
-        flavor.setDisk("123");
-    }
-
-    @Test
-    public void getEphemeral() {
-        flavor.getEphemeral();
-    }
-
-    @Test
-    public void setEphemeral() {
-        flavor.setEphemeral(123);
-    }
-
-    @Test
-    public void getSwap() {
-        flavor.getSwap();
-    }
-
-    @Test
-    public void setSwap() {
-        flavor.setSwap("123");
-    }
-
-    @Test
-    public void getRxtxFactor() {
-        flavor.getRxtxFactor();
-    }
-
-    @Test
-    public void setRxtxFactor() {
-        flavor.setRxtxFactor(123.0f);
-    }
-}
\ No newline at end of file
+    private static final String EOL = System.lineSeparator();
+
+    private static final String JSON_FULL = "{" + EOL
+        + "  \"flavor\" : {" + EOL
+        + "    \"id\" : \"id\"," + EOL
+        + "    \"name\" : \"name\"," + EOL
+        + "    \"vcpus\" : \"vcpus\"," + EOL
+        + "    \"ram\" : 38," + EOL
+        + "    \"disk\" : \"disk\"," + EOL
+        + "    \"swap\" : \"swap\"," + EOL
+        + "    \"OS-FLV-EXT-DATA:ephemeral\" : 65," + EOL
+        + "    \"rxtx_factor\" : 11.0" + EOL
+        + "  }" + EOL
+        + "}";
+
+    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 testSerialization() throws Exception {
+        System.out.println("CLASS: " + FlavorForCreate.class.getName());
+        System.out.println("TEST JSON: " + JSON_FULL);
+        FlavorForCreate flavorforcreate = objectMapper.readValue(JSON_FULL, FlavorForCreate.class);
+        String json = objectMapper.writeValueAsString(flavorforcreate);
+        System.out.println("RE-SERIALIZED OBJECT: " + json);
+        JSONAssert.assertEquals(JSON_FULL, json, JSONCompareMode.LENIENT);
+    }
+
+    @Test
+    public void testMethods() throws Exception {
+        FlavorForCreate flavorforcreate = objectMapper.readValue(JSON_FULL, FlavorForCreate.class);
+        flavorforcreate.toString();
+        
+        String disk = flavorforcreate.getDisk();
+        Assert.assertNotNull(disk);
+        flavorforcreate.setDisk(disk);
+        
+        String swap = flavorforcreate.getSwap();
+        Assert.assertNotNull(swap);
+        flavorforcreate.setSwap(swap);
+        
+        String name = flavorforcreate.getName();
+        Assert.assertNotNull(name);
+        flavorforcreate.setName(name);
+        
+        Float rxtxFactor = flavorforcreate.getRxtxFactor();
+        Assert.assertNotNull(rxtxFactor);
+        flavorforcreate.setRxtxFactor(rxtxFactor);
+        
+        Integer ephemeral = flavorforcreate.getEphemeral();
+        Assert.assertNotNull(ephemeral);
+        flavorforcreate.setEphemeral(ephemeral);
+        
+        String id = flavorforcreate.getId();
+        Assert.assertNotNull(id);
+        flavorforcreate.setId(id);
+        
+        String vcpus = flavorforcreate.getVcpus();
+        Assert.assertNotNull(vcpus);
+        flavorforcreate.setVcpus(vcpus);
+        
+        Integer ram = flavorforcreate.getRam();
+        Assert.assertNotNull(ram);
+        flavorforcreate.setRam(ram);
+    }
+}