1 files changed, 67 insertions, 27 deletions

diff --git a/nova-model/src/test/java/com/woorea/openstack/nova/model/ExtensionTest.java b/nova-model/src/test/java/com/woorea/openstack/nova/model/ExtensionTest.java
index ab27d8c..2047d22 100644
--- a/nova-model/src/test/java/com/woorea/openstack/nova/model/ExtensionTest.java
+++ b/nova-model/src/test/java/com/woorea/openstack/nova/model/ExtensionTest.java
@@ -2,7 +2,7 @@
  * ============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.
@@ -20,41 +20,81 @@
 
 package com.woorea.openstack.nova.model;
 
+import com.woorea.openstack.nova.model.Extension;
+import com.woorea.openstack.nova.model.Link;
+import java.util.Calendar;
+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 static org.junit.Assert.*;
+import org.skyscreamer.jsonassert.JSONAssert;
+import org.skyscreamer.jsonassert.JSONCompareMode;
 
 public class ExtensionTest {
 
-    private Extension extension = new Extension();
-
-    @Test
-    public void getAlias() {
-        extension.getAlias();
-    }
+    private static final String EOL = System.lineSeparator();
 
-    @Test
-    public void getDescription() {
-        extension.getDescription();
-    }
+    private static final String JSON_FULL = "{" + EOL
+        + "  \"extension\" : {" + EOL
+        + "    \"alias\" : \"alias\"," + EOL
+        + "    \"description\" : \"description\"," + EOL
+        + "    \"name\" : \"name\"," + EOL
+        + "    \"namespace\" : \"namespace\"," + EOL
+        + "    \"updated\" : 1486468800000," + EOL
+        + "    \"links\" : [ {" + EOL
+        + "      \"rel\" : \"rel\"," + EOL
+        + "      \"href\" : \"href\"," + EOL
+        + "      \"type\" : \"type\"" + EOL
+        + "    }, {" + EOL
+        + "      \"rel\" : \"rel\"," + EOL
+        + "      \"href\" : \"href\"," + EOL
+        + "      \"type\" : \"type\"" + EOL
+        + "    } ]" + EOL
+        + "  }" + EOL
+        + "}";
 
-    @Test
-    public void getName() {
-        extension.getName();
-    }
-
-    @Test
-    public void getNamespace() {
-        extension.getNamespace();
-    }
+    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 getUpdated() {
-        extension.getUpdated();
+    public void testSerialization() throws Exception {
+        System.out.println("CLASS: " + Extension.class.getName());
+        System.out.println("TEST JSON: " + JSON_FULL);
+        Extension extension = objectMapper.readValue(JSON_FULL, Extension.class);
+        String json = objectMapper.writeValueAsString(extension);
+        System.out.println("RE-SERIALIZED OBJECT: " + json);
+        JSONAssert.assertEquals(JSON_FULL, json, JSONCompareMode.LENIENT);
     }
 
     @Test
-    public void getLinks() {
-        extension.getLinks();
+    public void testMethods() throws Exception {
+        Extension extension = objectMapper.readValue(JSON_FULL, Extension.class);
+        extension.toString();
+        
+        String name = extension.getName();
+        Assert.assertNotNull(name);
+        
+        String namespace = extension.getNamespace();
+        Assert.assertNotNull(namespace);
+        
+        String alias = extension.getAlias();
+        Assert.assertNotNull(alias);
+        
+        String description = extension.getDescription();
+        Assert.assertNotNull(description);
+        
+        List<Link> links = extension.getLinks();
+        Assert.assertNotNull(links);
+        Assert.assertEquals(2, links.size());
+        
+        Calendar updated = extension.getUpdated();
+        Assert.assertNotNull(updated);
     }
-}
\ No newline at end of file
+}