From 44bfec9b3c0e4ed526eef73190f7bf36c58836b0 Mon Sep 17 00:00:00 2001 From: xuegao Date: Thu, 11 Mar 2021 20:25:30 +0100 Subject: [PATCH] Adding unit tests Adding unit tests to improve test coverage. Issue-ID: SDC-3428 Signed-off-by: xuegao Change-Id: I1d9ea0a4a8a1855414a611c57930a4e0decb3b89 --- .../be/datatypes/enums/InstantiationTypesTest.java | 35 +++++++++++++ .../sdc/heat/datatypes/HeatBooleanTest.java | 58 ++++++++++++++++++++++ .../candidateheat/AnalyzedZipHeatFilesTest.java | 55 ++++++++++++++++++++ 3 files changed, 148 insertions(+) create mode 100644 common-be/src/test/java/org/openecomp/sdc/be/datatypes/enums/InstantiationTypesTest.java create mode 100644 openecomp-be/lib/openecomp-heat-lib/src/test/java/org/openecomp/sdc/heat/datatypes/HeatBooleanTest.java create mode 100644 openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/types/candidateheat/AnalyzedZipHeatFilesTest.java diff --git a/common-be/src/test/java/org/openecomp/sdc/be/datatypes/enums/InstantiationTypesTest.java b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/enums/InstantiationTypesTest.java new file mode 100644 index 0000000000..b86219ec33 --- /dev/null +++ b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/enums/InstantiationTypesTest.java @@ -0,0 +1,35 @@ +/*- + * ============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.datatypes.enums; + +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import org.junit.jupiter.api.Test; + +public class InstantiationTypesTest { + + @Test + public void testContainsName() { + assertTrue(InstantiationTypes.containsName("A-la-carte")); + assertTrue(InstantiationTypes.containsName("Macro")); + assertFalse(InstantiationTypes.containsName("test")); + } +} diff --git a/openecomp-be/lib/openecomp-heat-lib/src/test/java/org/openecomp/sdc/heat/datatypes/HeatBooleanTest.java b/openecomp-be/lib/openecomp-heat-lib/src/test/java/org/openecomp/sdc/heat/datatypes/HeatBooleanTest.java new file mode 100644 index 0000000000..abbc6bdf85 --- /dev/null +++ b/openecomp-be/lib/openecomp-heat-lib/src/test/java/org/openecomp/sdc/heat/datatypes/HeatBooleanTest.java @@ -0,0 +1,58 @@ +/*- + * ============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.heat.datatypes; + +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import org.junit.jupiter.api.Test; + +public class HeatBooleanTest { + + @Test + public void testEval() { + assertTrue(HeatBoolean.eval("true")); + assertTrue(HeatBoolean.eval("t")); + assertTrue(HeatBoolean.eval("on")); + assertTrue(HeatBoolean.eval("y")); + assertTrue(HeatBoolean.eval("yes")); + assertTrue(HeatBoolean.eval(1)); + assertTrue(HeatBoolean.eval(true)); + + assertFalse(HeatBoolean.eval("false")); + assertFalse(HeatBoolean.eval("f")); + assertFalse(HeatBoolean.eval("off")); + assertFalse(HeatBoolean.eval("n")); + assertFalse(HeatBoolean.eval("no")); + assertFalse(HeatBoolean.eval(0)); + assertFalse(HeatBoolean.eval(false)); + } + + @Test + public void testIsValueBoolean() { + assertTrue(HeatBoolean.isValueBoolean("y")); + assertTrue(HeatBoolean.isValueBoolean("off")); + assertTrue(HeatBoolean.isValueBoolean(false)); + assertTrue(HeatBoolean.isValueBoolean(1)); + assertTrue(HeatBoolean.isValueBoolean(true)); + + assertFalse(HeatBoolean.isValueBoolean("test")); + assertFalse(HeatBoolean.isValueBoolean(2)); + } +} diff --git a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/types/candidateheat/AnalyzedZipHeatFilesTest.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/types/candidateheat/AnalyzedZipHeatFilesTest.java new file mode 100644 index 0000000000..6d76ee3067 --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/types/candidateheat/AnalyzedZipHeatFilesTest.java @@ -0,0 +1,55 @@ +/*- + * ============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.vendorsoftwareproduct.types.candidateheat; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import org.junit.jupiter.api.Test; + +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; + +public class AnalyzedZipHeatFilesTest { + + private AnalyzedZipHeatFiles testSubject = new AnalyzedZipHeatFiles(); + + @Test + public void testGetFilesNotEligbleForModules() { + testSubject.addNestedFile("testfile1"); + testSubject.addModuleFile("testfile2"); + HashSet fileNames = new HashSet<>(); + fileNames.addAll(Arrays.asList("testfile2", "testfile3")); + testSubject.addNestedFiles(fileNames); + + testSubject.addOtherNonModuleFile("testfile4"); + testSubject.addModuleFile("testfile5"); + testSubject.addModuleFile("testfile7"); + HashSet fileNames2 = new HashSet<>(); + fileNames2.addAll(Arrays.asList("testfile5", "testfile6")); + testSubject.addOtherNonModuleFiles(fileNames2); + + HashSet moduelFiles = (HashSet) testSubject.getModuleFiles(); + assertEquals(1, moduelFiles.size()); + assertEquals("testfile7", moduelFiles.iterator().next()); + + List res = (List) testSubject.getFilesNotEligbleForModules(); + assertEquals(6, res.size()); + } +} -- 2.16.6