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 --- swift-model/pom.xml | 12 +++ .../openstack/swift/model/ContainerTest.java | 75 ++++++++++++++++++ .../woorea/openstack/swift/model/ObjectTest.java | 90 ++++++++++++++++++++++ 3 files changed, 177 insertions(+) create mode 100644 swift-model/src/test/java/com/woorea/openstack/swift/model/ContainerTest.java create mode 100644 swift-model/src/test/java/com/woorea/openstack/swift/model/ObjectTest.java (limited to 'swift-model') diff --git a/swift-model/pom.xml b/swift-model/pom.xml index dda692e..18464df 100644 --- a/swift-model/pom.xml +++ b/swift-model/pom.xml @@ -9,4 +9,16 @@ swift-model OpenStack Swift Model OpenStack Swift Model + + + junit + junit + test + + + org.skyscreamer + jsonassert + test + + diff --git a/swift-model/src/test/java/com/woorea/openstack/swift/model/ContainerTest.java b/swift-model/src/test/java/com/woorea/openstack/swift/model/ContainerTest.java new file mode 100644 index 0000000..2500ebf --- /dev/null +++ b/swift-model/src/test/java/com/woorea/openstack/swift/model/ContainerTest.java @@ -0,0 +1,75 @@ +/*- + * ============LICENSE_START======================================================= + * 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 + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package com.woorea.openstack.swift.model; + +import com.woorea.openstack.swift.model.Container; +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 ContainerTest { + + private static final String EOL = System.lineSeparator(); + + private static final String JSON_FULL = "{" + EOL + + " \"name\" : \"name\"," + EOL + + " \"count\" : 2," + EOL + + " \"bytes\" : 84" + 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 testSerialization() throws Exception { + System.out.println("CLASS: " + Container.class.getName()); + System.out.println("TEST JSON: " + JSON_FULL); + Container container = objectMapper.readValue(JSON_FULL, Container.class); + String json = objectMapper.writeValueAsString(container); + System.out.println("RE-SERIALIZED OBJECT: " + json); + JSONAssert.assertEquals(JSON_FULL, json, JSONCompareMode.LENIENT); + } + + @Test + public void testMethods() throws Exception { + Container container = objectMapper.readValue(JSON_FULL, Container.class); + container.toString(); + + Long bytesUsed = container.getBytesUsed(); + Assert.assertNotNull(bytesUsed); + container.setBytesUsed(bytesUsed); + + Integer objectCount = container.getObjectCount(); + Assert.assertNotNull(objectCount); + container.setObjectCount(objectCount); + + String name = container.getName(); + Assert.assertNotNull(name); + container.setName(name); + } +} diff --git a/swift-model/src/test/java/com/woorea/openstack/swift/model/ObjectTest.java b/swift-model/src/test/java/com/woorea/openstack/swift/model/ObjectTest.java new file mode 100644 index 0000000..4cefadb --- /dev/null +++ b/swift-model/src/test/java/com/woorea/openstack/swift/model/ObjectTest.java @@ -0,0 +1,90 @@ +/*- + * ============LICENSE_START======================================================= + * 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 + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package com.woorea.openstack.swift.model; + +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 ObjectTest { + + private static final String EOL = System.lineSeparator(); + + private static final String JSON_FULL = "{" + EOL + + " \"subdir\" : \"subdir\"," + EOL + + " \"name\" : \"name\"," + EOL + + " \"hash\" : \"hash\"," + EOL + + " \"bytes\" : 82," + EOL + + " \"content_type\" : \"contenttype\"," + EOL + + " \"last_modified\" : 1488715200000" + 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 testSerialization() throws Exception { + System.out.println("CLASS: " + Object.class.getName()); + System.out.println("TEST JSON: " + JSON_FULL); + Object object = objectMapper.readValue(JSON_FULL, Object.class); + String json = objectMapper.writeValueAsString(object); + System.out.println("RE-SERIALIZED OBJECT: " + json); + JSONAssert.assertEquals(JSON_FULL, json, JSONCompareMode.LENIENT); + } + + @Test + public void testMethods() throws Exception { + com.woorea.openstack.swift.model.Object object = objectMapper.readValue(JSON_FULL, com.woorea.openstack.swift.model.Object.class); + object.toString(); + + String subdir = object.getSubdir(); + Assert.assertNotNull(subdir); + object.setSubdir(subdir); + + Calendar lastModified = object.getLastModified(); + Assert.assertNotNull(lastModified); + object.setLastModified(lastModified); + + int bytes = object.getBytes(); + Assert.assertNotNull(bytes); + object.setBytes(bytes); + + String name = object.getName(); + Assert.assertNotNull(name); + object.setName(name); + + String hash = object.getHash(); + Assert.assertNotNull(hash); + object.setHash(hash); + + String contentType = object.getContentType(); + Assert.assertNotNull(contentType); + object.setContentType(contentType); + } +} -- cgit 1.2.3-korg