diff options
Diffstat (limited to 'catalog-model')
2 files changed, 79 insertions, 8 deletions
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/tosca/converters/ToscaValueBaseConverter.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/tosca/converters/ToscaValueBaseConverter.java index fd987e8c9c..366acd3e77 100644 --- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/tosca/converters/ToscaValueBaseConverter.java +++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/tosca/converters/ToscaValueBaseConverter.java @@ -151,14 +151,12 @@ public class ToscaValueBaseConverter { * @param convertedValue * @return */ - static public boolean isEmptyObjectValue(Object convertedValue) { - if (convertedValue == null) { - return true; - } else if (convertedValue instanceof String && ((String) convertedValue).isEmpty()) { - return true; - } else if (convertedValue instanceof Map && ((Map) convertedValue).isEmpty()) { - return true; - } else if (convertedValue instanceof List && ((List) convertedValue).isEmpty()) { + public static boolean isEmptyObjectValue(Object convertedValue) { + if ((convertedValue == null) + || (convertedValue instanceof String && ((String) convertedValue).isEmpty()) + || (convertedValue instanceof Map && ((Map) convertedValue).isEmpty()) + || (convertedValue instanceof List && ((List) convertedValue).isEmpty())) + { return true; } return false; diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/ToscaValueBaseConverterTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/ToscaValueBaseConverterTest.java new file mode 100644 index 0000000000..0923f8e49f --- /dev/null +++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/ToscaValueBaseConverterTest.java @@ -0,0 +1,73 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2021 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 org.openecomp.sdc.be.model.tosca.converters; + +import com.google.gson.JsonPrimitive; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; +import org.junit.jupiter.api.Test; + + +import java.util.HashMap; +import java.util.LinkedList; + + +public class ToscaValueBaseConverterTest { + + private ToscaValueBaseConverter converter = new ToscaValueBaseConverter(); + + @Test + public void testJson2JavaPrimitive() throws Exception { + JsonPrimitive prim1 = new JsonPrimitive(Boolean.FALSE); + Object res1 = converter.json2JavaPrimitive(prim1); + assertFalse((Boolean)res1); + + JsonPrimitive prim2 = new JsonPrimitive("Test"); + Object res2 = converter.json2JavaPrimitive(prim2); + assertTrue(res2.equals("Test")); + + JsonPrimitive prim3 = new JsonPrimitive(3); + Object res3 = converter.json2JavaPrimitive(prim3); + assertTrue((Integer)res3 == 3); + + JsonPrimitive prim4 = new JsonPrimitive(3.6); + Object res4 = converter.json2JavaPrimitive(prim4); + assertTrue((Double)res4 == 3.6); + } + + @Test + public void testIsEmptyObjectValue() throws Exception { + boolean res1 = ToscaValueBaseConverter.isEmptyObjectValue(null); + assertTrue(res1); + + boolean res2 = ToscaValueBaseConverter.isEmptyObjectValue(""); + assertTrue(res2); + + boolean res3 = ToscaValueBaseConverter.isEmptyObjectValue(new HashMap<>()); + assertTrue(res3); + + boolean res4 = ToscaValueBaseConverter.isEmptyObjectValue(new LinkedList<>()); + assertTrue(res4); + + boolean res5 = ToscaValueBaseConverter.isEmptyObjectValue("test"); + assertFalse(res5); + } +} |