1 files changed, 48 insertions, 18 deletions

diff --git a/nova-model/src/test/java/com/woorea/openstack/nova/model/FloatingIpDomainTest.java b/nova-model/src/test/java/com/woorea/openstack/nova/model/FloatingIpDomainTest.java
index 0107cef..02fd66c 100644
--- a/nova-model/src/test/java/com/woorea/openstack/nova/model/FloatingIpDomainTest.java
+++ b/nova-model/src/test/java/com/woorea/openstack/nova/model/FloatingIpDomainTest.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,31 +20,61 @@
 
 package com.woorea.openstack.nova.model;
 
+import com.woorea.openstack.nova.model.FloatingIpDomain;
+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 FloatingIpDomainTest {
 
-    private FloatingIpDomain domain = new FloatingIpDomain();;
+    private static final String EOL = System.lineSeparator();
 
-    @Test
-    public void getDomain() {
-        domain.getDomain();
-    }
+    private static final String JSON_FULL = "{" + EOL
+        + "  \"floating-ip-pool\" : {" + EOL
+        + "    \"domain\" : \"domain\"," + EOL
+        + "    \"scope\" : \"scope\"," + EOL
+        + "    \"project\" : \"project\"," + EOL
+        + "    \"availabilityZone\" : \"availabilityzone\"" + EOL
+        + "  }" + EOL
+        + "}";
 
-    @Test
-    public void getScope() {
-        domain.getScope();
-    }
+    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 getProject() {
-        domain.getProject();
+    public void testSerialization() throws Exception {
+        System.out.println("CLASS: " + FloatingIpDomain.class.getName());
+        System.out.println("TEST JSON: " + JSON_FULL);
+        FloatingIpDomain floatingipdomain = objectMapper.readValue(JSON_FULL, FloatingIpDomain.class);
+        String json = objectMapper.writeValueAsString(floatingipdomain);
+        System.out.println("RE-SERIALIZED OBJECT: " + json);
+        JSONAssert.assertEquals(JSON_FULL, json, JSONCompareMode.LENIENT);
     }
 
     @Test
-    public void getAvailabilityZone() {
-        domain.getAvailabilityZone();
+    public void testMethods() throws Exception {
+        FloatingIpDomain floatingipdomain = objectMapper.readValue(JSON_FULL, FloatingIpDomain.class);
+        floatingipdomain.toString();
+        
+        String domain = floatingipdomain.getDomain();
+        Assert.assertNotNull(domain);
+        
+        String scope = floatingipdomain.getScope();
+        Assert.assertNotNull(scope);
+        
+        String project = floatingipdomain.getProject();
+        Assert.assertNotNull(project);
+        
+        String availabilityZone = floatingipdomain.getAvailabilityZone();
+        Assert.assertNotNull(availabilityZone);
     }
-}
\ No newline at end of file
+}