1 files changed, 57 insertions, 11 deletions

diff --git a/keystone-model/src/test/java/com/woorea/openstack/keystone/v3/model/RolesTest.java b/keystone-model/src/test/java/com/woorea/openstack/keystone/v3/model/RolesTest.java
index a18efb3..6ee1b2c 100644
--- a/keystone-model/src/test/java/com/woorea/openstack/keystone/v3/model/RolesTest.java
+++ b/keystone-model/src/test/java/com/woorea/openstack/keystone/v3/model/RolesTest.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
@@ -16,22 +17,67 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
+
 package com.woorea.openstack.keystone.v3.model;
 
+import com.woorea.openstack.keystone.v3.model.Role;
+import com.woorea.openstack.keystone.v3.model.Roles;
+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 RolesTest {
 
-    Roles roles = new Roles();
+    private static final String EOL = System.lineSeparator();
+
+    private static final String JSON_FULL = "{" + EOL
+        + "  \"roles\" : [ {" + EOL
+        + "    \"id\" : \"id\"," + EOL
+        + "    \"name\" : \"name\"," + EOL
+        + "    \"description\" : \"description\"," + EOL
+        + "    \"enabled\" : \"enabled\"" + EOL
+        + "  }, {" + EOL
+        + "    \"id\" : \"id\"," + EOL
+        + "    \"name\" : \"name\"," + EOL
+        + "    \"description\" : \"description\"," + EOL
+        + "    \"enabled\" : \"enabled\"" + 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 getList() throws Exception {
-        roles.getList();
+    public void testSerialization() throws Exception {
+        System.out.println("CLASS: " + Roles.class.getName());
+        System.out.println("TEST JSON: " + JSON_FULL);
+        Roles roles = objectMapper.readValue(JSON_FULL, Roles.class);
+        String json = objectMapper.writeValueAsString(roles);
+        System.out.println("RE-SERIALIZED OBJECT: " + json);
+        JSONAssert.assertEquals(JSON_FULL, json, JSONCompareMode.LENIENT);
     }
 
-    @Test(expected = NullPointerException.class)
-    public void iterator() throws Exception {
-        roles.iterator();
+    @Test
+    public void testMethods() throws Exception {
+        Roles roles = objectMapper.readValue(JSON_FULL, Roles.class);
+        roles.toString();
+        
+        List<Role> list = roles.getList();
+        Assert.assertNotNull(list);
+        Assert.assertEquals(2, list.size());
+        
+        int cnt = 0;
+        for (@SuppressWarnings("unused") Role x : roles) {
+            ++cnt;
+        }
+        Assert.assertEquals(2, cnt);
     }
-
-}
\ No newline at end of file
+}