1 files changed, 69 insertions, 15 deletions

diff --git a/keystone-model/src/test/java/com/woorea/openstack/keystone/model/TenantsTest.java b/keystone-model/src/test/java/com/woorea/openstack/keystone/model/TenantsTest.java
index eb4c2ee..f3d10e3 100644
--- a/keystone-model/src/test/java/com/woorea/openstack/keystone/model/TenantsTest.java
+++ b/keystone-model/src/test/java/com/woorea/openstack/keystone/model/TenantsTest.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,25 +20,78 @@
 
 package com.woorea.openstack.keystone.model;
 
+import com.woorea.openstack.keystone.model.Link;
+import com.woorea.openstack.keystone.model.Tenant;
+import com.woorea.openstack.keystone.model.Tenants;
+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 org.skyscreamer.jsonassert.JSONAssert;
+import org.skyscreamer.jsonassert.JSONCompareMode;
 
 public class TenantsTest {
 
-    Tenants tenants= new Tenants();
+    private static final String EOL = System.lineSeparator();
 
-    @Test
-    public void getList() throws Exception {
-        tenants.getList();
-    }
+    private static final String JSON_FULL = "{" + EOL
+        + "  \"tenants\" : [ {" + EOL
+        + "    \"id\" : \"id\"," + EOL
+        + "    \"name\" : \"name\"," + EOL
+        + "    \"description\" : \"description\"," + EOL
+        + "    \"enabled\" : false" + EOL
+        + "  }, {" + EOL
+        + "    \"id\" : \"id\"," + EOL
+        + "    \"name\" : \"name\"," + EOL
+        + "    \"description\" : \"description\"," + EOL
+        + "    \"enabled\" : false" + EOL
+        + "  } ]," + EOL
+        + "  \"tenants_links\" : [ {" + EOL
+        + "    \"rel\" : \"rel\"," + EOL
+        + "    \"href\" : \"href\"," + EOL
+        + "    \"type\" : \"type\"" + EOL
+        + "  }, {" + EOL
+        + "    \"rel\" : \"rel\"," + EOL
+        + "    \"href\" : \"href\"," + EOL
+        + "    \"type\" : \"type\"" + EOL
+        + "  } ]" + EOL
+        + "}";
+
+    private ObjectMapper objectMapper = new ObjectMapper()
+        .setSerializationInclusion(Inclusion.NON_NULL)
+        .enable(SerializationConfig.Feature.INDENT_OUTPUT)
+        .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
-    public void getLinks() throws Exception {
-        tenants.getLinks();
+    public void testSerialization() throws Exception {
+        System.out.println("CLASS: " + Tenants.class.getName());
+        System.out.println("TEST JSON: " + JSON_FULL);
+        Tenants tenants = objectMapper.readValue(JSON_FULL, Tenants.class);
+        String json = objectMapper.writeValueAsString(tenants);
+        System.out.println("RE-SERIALIZED OBJECT: " + json);
+        JSONAssert.assertEquals(JSON_FULL, json, JSONCompareMode.LENIENT);
     }
 
-    @Test(expected = NullPointerException.class)
-    public void iterator() throws Exception {
-        tenants.iterator();
+    @Test
+    public void testMethods() throws Exception {
+        Tenants tenants = objectMapper.readValue(JSON_FULL, Tenants.class);
+        tenants.toString();
+        
+        List<Link> links = tenants.getLinks();
+        Assert.assertNotNull(links);
+        Assert.assertEquals(2, links.size());
+        
+        List<Tenant> list = tenants.getList();
+        Assert.assertNotNull(list);
+        Assert.assertEquals(2, list.size());
+        
+        int cnt = 0;
+        for (@SuppressWarnings("unused") Tenant x : tenants) {
+            ++cnt;
+        }
+        Assert.assertEquals(2, cnt);
     }
-
-}
\ No newline at end of file
+}