1 files changed, 53 insertions, 18 deletions

diff --git a/keystone-model/src/test/java/com/woorea/openstack/keystone/model/TokenTest.java b/keystone-model/src/test/java/com/woorea/openstack/keystone/model/TokenTest.java
index a9c0d7c..65308b9 100644
--- a/keystone-model/src/test/java/com/woorea/openstack/keystone/model/TokenTest.java
+++ b/keystone-model/src/test/java/com/woorea/openstack/keystone/model/TokenTest.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,30 +20,64 @@
 
 package com.woorea.openstack.keystone.model;
 
+import com.woorea.openstack.keystone.model.Tenant;
+import com.woorea.openstack.keystone.model.Token;
+import java.util.Calendar;
+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 TokenTest {
 
-    Token token = new Token();
+    private static final String EOL = System.lineSeparator();
 
-    @Test
-    public void getId() throws Exception {
-        token.getId();
-    }
+    private static final String JSON_FULL = "{" + EOL
+        + "  \"id\" : \"id\"," + EOL
+        + "  \"issued_at\" : 1488024000000," + EOL
+        + "  \"expires\" : 1488628800000," + EOL
+        + "  \"tenant\" : {" + EOL
+        + "    \"id\" : \"id\"," + EOL
+        + "    \"name\" : \"name\"," + EOL
+        + "    \"description\" : \"description\"," + EOL
+        + "    \"enabled\" : false" + EOL
+        + "  }" + EOL
+        + "}";
 
-    @Test
-    public void getIssued_at() throws Exception {
-        token.getIssued_at();
-    }
+    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 getExpires() throws Exception {
-        token.getExpires();
+    public void testSerialization() throws Exception {
+        System.out.println("CLASS: " + Token.class.getName());
+        System.out.println("TEST JSON: " + JSON_FULL);
+        Token token = objectMapper.readValue(JSON_FULL, Token.class);
+        String json = objectMapper.writeValueAsString(token);
+        System.out.println("RE-SERIALIZED OBJECT: " + json);
+        JSONAssert.assertEquals(JSON_FULL, json, JSONCompareMode.LENIENT);
     }
 
     @Test
-    public void getTenant() throws Exception {
-        token.getTenant();
+    public void testMethods() throws Exception {
+        Token token = objectMapper.readValue(JSON_FULL, Token.class);
+        token.toString();
+        
+        Calendar expires = token.getExpires();
+        Assert.assertNotNull(expires);
+        
+        String id = token.getId();
+        Assert.assertNotNull(id);
+        
+        Calendar issued_at = token.getIssued_at();
+        Assert.assertNotNull(issued_at);
+        
+        Tenant tenant = token.getTenant();
+        Assert.assertNotNull(tenant);
     }
-
-}
\ No newline at end of file
+}