From 9e0219abc61b28b94d88fefbf8cc4a13d1683a67 Mon Sep 17 00:00:00 2001 From: Rob Daugherty Date: Mon, 10 Sep 2018 17:45:52 -0400 Subject: Functional so/libs unit tests Unit tests to prepare for migration from the codehaus to the fasterxml implementation of jackson. Iincreases the code coverage metric from 51% to 70%. Change-Id: I6338214f3de9df95956b46d4e313d00052eb8692 Issue-ID: SO-1011 Signed-off-by: Rob Daugherty --- .../woorea/openstack/nova/model/SnapshotsTest.java | 71 +++++++++++++++++++--- 1 file changed, 61 insertions(+), 10 deletions(-) (limited to 'nova-model/src/test/java/com/woorea/openstack/nova/model/SnapshotsTest.java') diff --git a/nova-model/src/test/java/com/woorea/openstack/nova/model/SnapshotsTest.java b/nova-model/src/test/java/com/woorea/openstack/nova/model/SnapshotsTest.java index 3c7ec60..9bf525b 100644 --- a/nova-model/src/test/java/com/woorea/openstack/nova/model/SnapshotsTest.java +++ b/nova-model/src/test/java/com/woorea/openstack/nova/model/SnapshotsTest.java @@ -2,8 +2,8 @@ * ============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. * You may obtain a copy of the License at @@ -17,22 +17,73 @@ * limitations under the License. * ============LICENSE_END========================================================= */ + package com.woorea.openstack.nova.model; +import com.woorea.openstack.nova.model.Snapshot; +import com.woorea.openstack.nova.model.Snapshots; +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 SnapshotsTest { - Snapshots snapshots = new Snapshots(); + private static final String EOL = System.lineSeparator(); + + private static final String JSON_FULL = "{" + EOL + + " \"snapshots\" : [ {" + EOL + + " \"id\" : \"id\"," + EOL + + " \"status\" : \"status\"," + EOL + + " \"volumeId\" : \"volumeid\"," + EOL + + " \"size\" : 61," + EOL + + " \"createdAt\" : \"createdat\"," + EOL + + " \"displayName\" : \"name\"," + EOL + + " \"displayDescription\" : \"description\"" + EOL + + " }, {" + EOL + + " \"id\" : \"id\"," + EOL + + " \"status\" : \"status\"," + EOL + + " \"volumeId\" : \"volumeid\"," + EOL + + " \"size\" : 61," + EOL + + " \"createdAt\" : \"createdat\"," + EOL + + " \"displayName\" : \"name\"," + EOL + + " \"displayDescription\" : \"description\"" + 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 { - snapshots.getList(); + public void testSerialization() throws Exception { + System.out.println("CLASS: " + Snapshots.class.getName()); + System.out.println("TEST JSON: " + JSON_FULL); + Snapshots snapshots = objectMapper.readValue(JSON_FULL, Snapshots.class); + String json = objectMapper.writeValueAsString(snapshots); + System.out.println("RE-SERIALIZED OBJECT: " + json); + JSONAssert.assertEquals(JSON_FULL, json, JSONCompareMode.LENIENT); } - @Test(expected = NullPointerException.class) - public void iterator() throws Exception { - snapshots.iterator(); + @Test + public void testMethods() throws Exception { + Snapshots snapshots = objectMapper.readValue(JSON_FULL, Snapshots.class); + snapshots.toString(); + + List list = snapshots.getList(); + Assert.assertNotNull(list); + Assert.assertEquals(2, list.size()); + + int cnt = 0; + for (@SuppressWarnings("unused") Snapshot x : snapshots) { + ++cnt; + } + Assert.assertEquals(2, cnt); } - -} \ No newline at end of file +} -- cgit 1.2.3-korg