1 files changed, 42 insertions, 10 deletions

diff --git a/nova-model/src/test/java/com/woorea/openstack/nova/model/CertificateTest.java b/nova-model/src/test/java/com/woorea/openstack/nova/model/CertificateTest.java
index 46d8c2b..24ca40c 100644
--- a/nova-model/src/test/java/com/woorea/openstack/nova/model/CertificateTest.java
+++ b/nova-model/src/test/java/com/woorea/openstack/nova/model/CertificateTest.java
@@ -2,7 +2,7 @@
  * ============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.
@@ -17,24 +17,56 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
+
 package com.woorea.openstack.nova.model;
 
+import com.woorea.openstack.nova.model.Certificate;
+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 CertificateTest {
 
-    private Certificate certificate = new Certificate();
+    private static final String EOL = System.lineSeparator();
+
+    private static final String JSON_FULL = "{" + EOL
+        + "  \"certificate\" : {" + EOL
+        + "    \"data\" : \"data\"," + EOL
+        + "    \"private_key\" : \"privatekey\"" + EOL
+        + "  }" + EOL
+        + "}";
+
+    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 getData() {
-        certificate.getData();
+    public void testSerialization() throws Exception {
+        System.out.println("CLASS: " + Certificate.class.getName());
+        System.out.println("TEST JSON: " + JSON_FULL);
+        Certificate certificate = objectMapper.readValue(JSON_FULL, Certificate.class);
+        String json = objectMapper.writeValueAsString(certificate);
+        System.out.println("RE-SERIALIZED OBJECT: " + json);
+        JSONAssert.assertEquals(JSON_FULL, json, JSONCompareMode.LENIENT);
     }
 
     @Test
-    public void getPrivateKey() {
-        certificate.getPrivateKey();
+    public void testMethods() throws Exception {
+        Certificate certificate = objectMapper.readValue(JSON_FULL, Certificate.class);
+        certificate.toString();
+        
+        String privateKey = certificate.getPrivateKey();
+        Assert.assertNotNull(privateKey);
+        
+        String data = certificate.getData();
+        Assert.assertNotNull(data);
     }
-
-}
\ No newline at end of file
+}