From be89d1f7289055ed78416c884ae6be7314c41635 Mon Sep 17 00:00:00 2001 From: vasraz Date: Mon, 16 Mar 2020 16:05:30 +0000 Subject: Increase test coverage catalog-model/src/main/java/org/openecomp/sdc/be/model/CatalogUpdateTimestamp.java Change-Id: I7c4218d09472196c0ddd7590dc6e5a4ba71f842a Signed-off-by: Vasyl Razinkov Issue-ID: SDC-2833 --- .../sdc/be/model/CatalogUpdateTimestamp.java | 84 ++++------------------ .../sdc/be/model/CatalogUpdateTimestampTest.java | 45 ++++++++++++ 2 files changed, 59 insertions(+), 70 deletions(-) create mode 100644 catalog-model/src/test/java/org/openecomp/sdc/be/model/CatalogUpdateTimestampTest.java (limited to 'catalog-model') diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/CatalogUpdateTimestamp.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/CatalogUpdateTimestamp.java index 5e353099c3..5b9c5cbe7a 100644 --- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/CatalogUpdateTimestamp.java +++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/CatalogUpdateTimestamp.java @@ -20,83 +20,27 @@ package org.openecomp.sdc.be.model; -import java.io.IOException; - import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.SerializationFeature; - - -public class CatalogUpdateTimestamp { - - +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; + +@Getter +@Setter +@ToString +@AllArgsConstructor +@EqualsAndHashCode +public class CatalogUpdateTimestamp { @JsonProperty("previousUpdateTime") private long previousUpdateTime; @JsonProperty("currentUpdateTime") private long currentUpdateTime; - public CatalogUpdateTimestamp() { - } - public CatalogUpdateTimestamp(long previousUpdateTime, long currentUpdateTime) { - this.previousUpdateTime = previousUpdateTime; - this.currentUpdateTime = currentUpdateTime; - } - - public CatalogUpdateTimestamp(CatalogUpdateTimestamp catalogUpdateTimestamp) { - this.previousUpdateTime = catalogUpdateTimestamp.getPreviousUpdateTime(); - this.currentUpdateTime = catalogUpdateTimestamp.getCurrentUpdateTime(); - } - - @Override - public boolean equals(Object obj) { - if (obj instanceof CatalogUpdateTimestamp){ - return (this.getCurrentUpdateTime() == ((CatalogUpdateTimestamp) obj).getCurrentUpdateTime() - && this.getPreviousUpdateTime() == ((CatalogUpdateTimestamp) obj).getPreviousUpdateTime()) - || super.equals(obj); - } - return false; - } - - - public long getCurrentUpdateTime() { - return currentUpdateTime; - } - - - public long getPreviousUpdateTime() { - return previousUpdateTime; - } - - - public void setPreviousUpdateTime(long previousUpdateTime) { - this.previousUpdateTime = previousUpdateTime; - } - - public void setCurrentUpdateTime(long currentUpdateTime) { - this.currentUpdateTime = currentUpdateTime; - } - - @Override - public int hashCode() { - return super.hashCode(); - } - - @Override - public String toString() { - return "CatalogUpdateTimestamp [currentUpdateTime = " + currentUpdateTime + ", previousUpdateTime = " + previousUpdateTime + "]"; - } - - public static CatalogUpdateTimestamp buildFromHttpResponse(String responseBody) throws IOException { - ObjectMapper objectMapper = new ObjectMapper(); - objectMapper.enable(SerializationFeature.INDENT_OUTPUT); - TypeReference typeRef = new TypeReference() {}; - return objectMapper.readValue(responseBody, typeRef); + public static CatalogUpdateTimestamp buildDummyCatalogUpdateTimestamp() { + return new CatalogUpdateTimestamp(0L, System.currentTimeMillis()); } - public static CatalogUpdateTimestamp buildDummyCatalogUpdateTimestamp() { - long currentTimeMillis = System.currentTimeMillis(); - return new CatalogUpdateTimestamp(0L, currentTimeMillis); - } } diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/CatalogUpdateTimestampTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/CatalogUpdateTimestampTest.java new file mode 100644 index 0000000000..fbf1c761f1 --- /dev/null +++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/CatalogUpdateTimestampTest.java @@ -0,0 +1,45 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2020, Nordix Foundation. 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 org.openecomp.sdc.be.model; + +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; + +import org.junit.Test; + +public class CatalogUpdateTimestampTest { + + private CatalogUpdateTimestamp createTestSubject() { + return new CatalogUpdateTimestamp(0L, System.currentTimeMillis()); + } + + @Test + public void testBuildDummyCatalogUpdateTimestamp() { + CatalogUpdateTimestamp testSubject; + CatalogUpdateTimestamp result; + + // default test + testSubject = createTestSubject(); + result = testSubject.buildDummyCatalogUpdateTimestamp(); + assertNotNull(result); + } + +} -- cgit 1.2.3-korg