1 files changed, 54 insertions, 37 deletions

diff --git a/keystone-model/src/test/java/com/woorea/openstack/keystone/model/TenantTest.java b/keystone-model/src/test/java/com/woorea/openstack/keystone/model/TenantTest.java
index 9c5b02e..6ce4a11 100644
--- a/keystone-model/src/test/java/com/woorea/openstack/keystone/model/TenantTest.java
+++ b/keystone-model/src/test/java/com/woorea/openstack/keystone/model/TenantTest.java
@@ -1,8 +1,9 @@
 /*-
- * ONAP-SO
  * ============LICENSE_START=======================================================
- * Copyright 2018 Huawei Intellectual Property. All rights reserved.
- * ===================================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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
@@ -19,49 +20,65 @@
 
 package com.woorea.openstack.keystone.model;
 
+import com.woorea.openstack.keystone.model.Tenant;
+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 TenantTest {
 
-    Tenant tenant = new Tenant();
+    private static final String EOL = System.lineSeparator();
 
-    @Test
-    public void getId() throws Exception {
-        tenant.getId();
-    }
-
-    @Test
-    public void setId() throws Exception {
-        tenant.setId("tenantid");
-    }
-
-    @Test
-    public void getName() throws Exception {
-        tenant.getName();
-    }
+    private static final String JSON_FULL = "{" + EOL
+        + "  \"tenant\" : {" + EOL
+        + "    \"id\" : \"id\"," + EOL
+        + "    \"name\" : \"name\"," + EOL
+        + "    \"description\" : \"description\"," + EOL
+        + "    \"enabled\" : false" + EOL
+        + "  }" + EOL
+        + "}";
 
-    @Test
-    public void setName() throws Exception {
-        tenant.setName("test");
-    }
-
-    @Test
-    public void getDescription() throws Exception {
-        tenant.getDescription();
-    }
-
-    @Test
-    public void setDescription() throws Exception {
-        tenant.setDescription("desc");
-    }
+    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 getEnabled() throws Exception {
-        tenant.getEnabled();
+    public void testSerialization() throws Exception {
+        System.out.println("CLASS: " + Tenant.class.getName());
+        System.out.println("TEST JSON: " + JSON_FULL);
+        Tenant tenant = objectMapper.readValue(JSON_FULL, Tenant.class);
+        String json = objectMapper.writeValueAsString(tenant);
+        System.out.println("RE-SERIALIZED OBJECT: " + json);
+        JSONAssert.assertEquals(JSON_FULL, json, JSONCompareMode.LENIENT);
     }
 
     @Test
-    public void setEnabled() throws Exception {
-        tenant.setEnabled(true);
+    public void testMethods() throws Exception {
+        Tenant tenant = objectMapper.readValue(JSON_FULL, Tenant.class);
+        tenant.toString();
+        
+        String name = tenant.getName();
+        Assert.assertNotNull(name);
+        tenant.setName(name);
+        
+        String description = tenant.getDescription();
+        Assert.assertNotNull(description);
+        tenant.setDescription(description);
+        
+        String id = tenant.getId();
+        Assert.assertNotNull(id);
+        tenant.setId(id);
+        
+        Boolean enabled = tenant.getEnabled();
+        Assert.assertNotNull(enabled);
+        tenant.setEnabled(enabled);
     }
-}
\ No newline at end of file
+}