From 2da911f8ba408fbbf3d7639796208078fac28e32 Mon Sep 17 00:00:00 2001 From: vempo Date: Thu, 1 Nov 2018 20:27:39 +0200 Subject: Sorted out unit-test libraries in onboarding Fixed scope, removed junit+tesng combinations, deleted commented-out tests, did minor cleanups. Change-Id: I71d0adf5c1c95435987dbb8b4077cc43bdf09df8 Issue-ID: SDC-1886 Signed-off-by: vempo --- .../core/utilities/CommonMethodsTest.java | 84 +++++++++++----------- .../utilities/file/FileContentHandlerTest.java | 31 +++++--- .../core/utilities/file/FileUtilsTest.java | 17 +++-- .../json/JsonSchemaDataGeneratorTest.java | 8 +-- .../core/utilities/json/JsonUtilTest.java | 11 ++- 5 files changed, 81 insertions(+), 70 deletions(-) (limited to 'openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/src/test/java/org') diff --git a/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/src/test/java/org/openecomp/core/utilities/CommonMethodsTest.java b/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/src/test/java/org/openecomp/core/utilities/CommonMethodsTest.java index c6d87def2b..5da9675536 100644 --- a/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/src/test/java/org/openecomp/core/utilities/CommonMethodsTest.java +++ b/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/src/test/java/org/openecomp/core/utilities/CommonMethodsTest.java @@ -16,10 +16,10 @@ package org.openecomp.core.utilities; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertNotNull; -import static org.testng.Assert.assertNull; -import static org.testng.Assert.assertTrue; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; import java.util.AbstractMap; import java.util.ArrayList; @@ -31,10 +31,8 @@ import java.util.Map; import java.util.Set; import java.util.stream.Collectors; import java.util.stream.Stream; - import org.apache.commons.lang3.ArrayUtils; -import org.testng.Assert; -import org.testng.annotations.Test; +import org.junit.Test; public class CommonMethodsTest { @@ -71,7 +69,7 @@ public class CommonMethodsTest { assertEquals(CommonMethods.arrayToCommaSeparatedString(new String[] {"", ""}), ","); } - @Test(expectedExceptions = NullPointerException.class) + @Test(expected = NullPointerException.class) public void testArrayToCommaSeparatedStringNull() { CommonMethods.arrayToCommaSeparatedString(null); } @@ -96,7 +94,7 @@ public class CommonMethodsTest { assertEquals(CommonMethods.arrayToSeparatedString(new String[] {"", ""}, '/'), "/"); } - @Test(expectedExceptions = NullPointerException.class) + @Test(expected = NullPointerException.class) public void testArrayToSeparatedStringNull() { CommonMethods.arrayToSeparatedString(null, '/'); } @@ -121,7 +119,7 @@ public class CommonMethodsTest { assertEquals(CommonMethods.collectionToCommaSeparatedString(Collections.emptySet()), ""); } - @Test(expectedExceptions = NullPointerException.class) + @Test(expected = NullPointerException.class) public void testCollectionToCommaSeparatedStringNull() { assertNull(CommonMethods.collectionToCommaSeparatedString(null)); } @@ -138,8 +136,8 @@ public class CommonMethodsTest { String []resultArray = CommonMethods.concat(firstArray, secondArray); - Assert.assertEquals(resultArray.length, 4); - Assert.assertTrue(ArrayUtils.contains(resultArray, secondArray[0]) + assertEquals(resultArray.length, 4); + assertTrue(ArrayUtils.contains(resultArray, secondArray[0]) && ArrayUtils.contains(resultArray, firstArray[0])); } @@ -149,8 +147,8 @@ public class CommonMethodsTest { String []resultArray = CommonMethods.concat(firstArray, null); - Assert.assertEquals(resultArray.length, 2); - Assert.assertTrue(Arrays.asList(resultArray).containsAll(Arrays.asList(firstArray))); + assertEquals(resultArray.length, 2); + assertTrue(Arrays.asList(resultArray).containsAll(Arrays.asList(firstArray))); } @Test @@ -159,45 +157,45 @@ public class CommonMethodsTest { String []resultArray = CommonMethods.concat(null, secondArray); - Assert.assertEquals(resultArray.length, 2); - Assert.assertTrue(Arrays.asList(resultArray).containsAll(Arrays.asList(secondArray))); + assertEquals(resultArray.length, 2); + assertTrue(Arrays.asList(resultArray).containsAll(Arrays.asList(secondArray))); } @Test public void testConcatBothValueNull() { - Assert.assertNull(CommonMethods.concat(null, null)); + assertNull(CommonMethods.concat(null, null)); } @Test public void testNewInstance() { Object obj = CommonMethods.newInstance(JAVA_LANG_STRING); - Assert.assertNotNull(obj); - Assert.assertTrue(obj instanceof String); + assertNotNull(obj); + assertTrue(obj instanceof String); } - @Test(expectedExceptions = IllegalArgumentException.class) + @Test(expected = IllegalArgumentException.class) public void testNewInstanceIncorrectClassProvided() { - Assert.assertNull(CommonMethods.newInstance("java.lang.Stringss")); + assertNull(CommonMethods.newInstance("java.lang.Stringss")); } - @Test(expectedExceptions = IllegalArgumentException.class) + @Test(expected = IllegalArgumentException.class) public void testNewInstanceClassNotProvided() { - Assert.assertNull(CommonMethods.newInstance(null, Object.class)); + assertNull(CommonMethods.newInstance(null, Object.class)); } - @Test(expectedExceptions = IllegalArgumentException.class) + @Test(expected = IllegalArgumentException.class) public void testNewInstanceObjectNotProvided() { - Assert.assertNull(CommonMethods.newInstance(JAVA_LANG_STRING, null)); + assertNull(CommonMethods.newInstance(JAVA_LANG_STRING, null)); } - @Test(expectedExceptions = ClassCastException.class) + @Test(expected = ClassCastException.class) public void testNewInstanceClassCastException() { - Assert.assertNull(CommonMethods.newInstance(JAVA_LANG_STRING, ArrayList.class)); + assertNull(CommonMethods.newInstance(JAVA_LANG_STRING, ArrayList.class)); } - @Test(expectedExceptions = RuntimeException.class) + @Test(expected = RuntimeException.class) public void testNewInstanceInvalidClassProvided() { - Assert.assertNull(CommonMethods.newInstance(List.class)); + assertNull(CommonMethods.newInstance(List.class)); } @Test @@ -206,26 +204,26 @@ public class CommonMethodsTest { String result = CommonMethods.listToSeparatedString( Stream.of("Concat", "String").collect(Collectors.toList()), ','); - Assert.assertNotNull(result); - Assert.assertEquals(str, result); + assertNotNull(result); + assertEquals(str, result); } @Test public void testDuplicateStringWithDelimiter() { String duplicateStr = CommonMethods.duplicateStringWithDelimiter("Duplicate", '#', 4); - Assert.assertNotNull(duplicateStr); + assertNotNull(duplicateStr); String[] duplicateStrArray = duplicateStr.split("#"); - Assert.assertTrue(duplicateStr.contains("Duplicate")); - Assert.assertEquals(duplicateStrArray.length, 4); + assertTrue(duplicateStr.contains("Duplicate")); + assertEquals(duplicateStrArray.length, 4); } @Test public void testRoSingleElement() { Set stringSet = CommonMethods.toSingleElementSet("Set Element"); - Assert.assertNotNull(stringSet); - Assert.assertTrue(stringSet.contains("Set Element")); + assertNotNull(stringSet); + assertTrue(stringSet.contains("Set Element")); } @Test @@ -253,7 +251,7 @@ public class CommonMethodsTest { List> resultList = CommonMethods.mergeListsOfMap(list1, list2); - Assert.assertEquals(resultList.size(), 6); + assertEquals(resultList.size(), 6); //Verify for duplicate key int count = 0; @@ -262,7 +260,7 @@ public class CommonMethodsTest { count++; } - Assert.assertEquals(1, count); + assertEquals(1, count); } @Test @@ -272,9 +270,9 @@ public class CommonMethodsTest { List resultList = CommonMethods.mergeLists(list1, list2); - Assert.assertEquals(resultList.size(), 4); - Assert.assertTrue(resultList.containsAll(list1)); - Assert.assertTrue(resultList.containsAll(list2)); + assertEquals(resultList.size(), 4); + assertTrue(resultList.containsAll(list1)); + assertTrue(resultList.containsAll(list2)); } @Test @@ -294,7 +292,7 @@ public class CommonMethodsTest { Map resultMap = CommonMethods.mergeMaps(map1, map2); - Assert.assertEquals(resultMap.size(), 4); - Assert.assertEquals(resultMap.get("Port"), "VMI"); + assertEquals(resultMap.size(), 4); + assertEquals(resultMap.get("Port"), "VMI"); } } diff --git a/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/src/test/java/org/openecomp/core/utilities/file/FileContentHandlerTest.java b/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/src/test/java/org/openecomp/core/utilities/file/FileContentHandlerTest.java index 1b06f37a16..8fe9d40536 100644 --- a/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/src/test/java/org/openecomp/core/utilities/file/FileContentHandlerTest.java +++ b/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/src/test/java/org/openecomp/core/utilities/file/FileContentHandlerTest.java @@ -1,8 +1,24 @@ +/* + * Copyright © 2016-2018 European Support Limited + * + * 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. + */ + package org.openecomp.core.utilities.file; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertFalse; -import static org.testng.Assert.assertTrue; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -12,9 +28,8 @@ import java.util.Map; import java.util.Optional; import java.util.stream.Collectors; import java.util.stream.Stream; - -import org.testng.Assert; -import org.testng.annotations.Test; +import org.junit.Assert; +import org.junit.Test; /** * @author EVITALIY @@ -82,9 +97,9 @@ public class FileContentHandlerTest { Assert.assertEquals(contentHandler.getFiles().size(), 2); Assert.assertEquals(contentHandler.getFileList().size(), 2); - Assert.assertFalse(contentHandler.isEmpty()); + assertFalse(contentHandler.isEmpty()); contentHandler.remove("file1"); - Assert.assertFalse(contentHandler.containsFile("file1")); + assertFalse(contentHandler.containsFile("file1")); } @Test diff --git a/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/src/test/java/org/openecomp/core/utilities/file/FileUtilsTest.java b/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/src/test/java/org/openecomp/core/utilities/file/FileUtilsTest.java index 74c1b1424d..187f6c35a8 100644 --- a/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/src/test/java/org/openecomp/core/utilities/file/FileUtilsTest.java +++ b/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/src/test/java/org/openecomp/core/utilities/file/FileUtilsTest.java @@ -16,9 +16,9 @@ package org.openecomp.core.utilities.file; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertFalse; -import static org.testng.Assert.assertTrue; +import static junit.framework.TestCase.assertTrue; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; import java.io.File; import java.io.IOException; @@ -31,10 +31,9 @@ import java.util.Map; import java.util.function.Function; import java.util.stream.Collectors; import java.util.stream.Stream; - import org.apache.commons.io.IOUtils; -import org.testng.Assert; -import org.testng.annotations.Test; +import org.junit.Assert; +import org.junit.Test; /** * @author EVITALIY @@ -64,12 +63,12 @@ public class FileUtilsTest { assertTrue(FileUtils.readViaInputStream(TEST_RESOURCE, TEST_FUNCTION) > 0); } - @Test(expectedExceptions = NullPointerException.class) + @Test(expected = NullPointerException.class) public void testReadViaInputStreamNull() { FileUtils.readViaInputStream((String) null, TEST_FUNCTION); } - @Test(expectedExceptions = IllegalArgumentException.class) + @Test(expected = IllegalArgumentException.class) public void testReadViaInputStreamNotFound() { FileUtils.readViaInputStream("notfound.txt", TEST_FUNCTION); } @@ -176,7 +175,7 @@ public class FileUtilsTest { Assert.assertNotNull(inputStream); } - @Test(expectedExceptions = RuntimeException.class) + @Test(expected = RuntimeException.class) public void testLoadFileToInputStreamIncorrectFilePath() { FileUtils.loadFileToInputStream("invalidfilepath"); } diff --git a/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/src/test/java/org/openecomp/core/utilities/json/JsonSchemaDataGeneratorTest.java b/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/src/test/java/org/openecomp/core/utilities/json/JsonSchemaDataGeneratorTest.java index e57cdc2a80..918d7beea7 100644 --- a/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/src/test/java/org/openecomp/core/utilities/json/JsonSchemaDataGeneratorTest.java +++ b/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/src/test/java/org/openecomp/core/utilities/json/JsonSchemaDataGeneratorTest.java @@ -22,9 +22,9 @@ package org.openecomp.core.utilities.json; import org.json.JSONException; import org.json.JSONObject; +import org.junit.Assert; +import org.junit.Test; import org.openecomp.core.utilities.file.FileUtils; -import org.testng.Assert; -import org.testng.annotations.Test; public class JsonSchemaDataGeneratorTest { @@ -53,7 +53,7 @@ public class JsonSchemaDataGeneratorTest { + "\"phoneNumber\":[{\"code\":1,\"location\":\"Home\"},{\"code\":2,\"location\":\"Office\"}]}")); } - @Test(expectedExceptions = JSONException.class) + @Test(expected = JSONException.class) public void testSchemaWithInvalidDefault() { testGenerate(SCHEMA_WITH_INVALID_DEFAULT, null); } @@ -64,7 +64,7 @@ public class JsonSchemaDataGeneratorTest { new JSONObject("{\"ipConfiguration\":{\"ipv4Required\":true,\"ipv6Required\":false}}")); } - @Test(expectedExceptions = IllegalArgumentException.class) + @Test(expected = IllegalArgumentException.class) public void testConstructorException() { Assert.assertNull(new JsonSchemaDataGenerator(null)); } diff --git a/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/src/test/java/org/openecomp/core/utilities/json/JsonUtilTest.java b/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/src/test/java/org/openecomp/core/utilities/json/JsonUtilTest.java index 02bc568c39..17e48ca69c 100644 --- a/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/src/test/java/org/openecomp/core/utilities/json/JsonUtilTest.java +++ b/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/src/test/java/org/openecomp/core/utilities/json/JsonUtilTest.java @@ -26,10 +26,9 @@ import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; import java.util.stream.Stream; - +import org.junit.Assert; +import org.junit.Test; import org.openecomp.core.utilities.file.FileUtils; -import org.testng.Assert; -import org.testng.annotations.Test; public class JsonUtilTest { @@ -70,7 +69,7 @@ public class JsonUtilTest { + "It does not match pattern (0?[1-9]|[12][0-9]|3[01])/(0?[1-9]|1[012])/((19|20)\\d\\d)"); } - @Test(expectedExceptions = IllegalArgumentException.class) + @Test(expected = IllegalArgumentException.class) public void testInValidJsonValidateNullJson() { JsonUtil.validate(null, null); } @@ -102,7 +101,7 @@ public class JsonUtilTest { Assert.assertEquals(list.size(), 3); } - @Test(expectedExceptions = RuntimeException.class) + @Test(expected = RuntimeException.class) public void testJson2ObjectIncorrectJson() { String inputStr = "{[Json, Util, Test]}"; List list = JsonUtil.json2Object(inputStr, ArrayList.class); @@ -117,7 +116,7 @@ public class JsonUtilTest { Assert.assertEquals(list.size(), 3); } - @Test(expectedExceptions = RuntimeException.class) + @Test(expected = RuntimeException.class) public void testJson2ObjectIncorrectJsonInputStream() { String inputStr = "{[Json, Util, Test]}"; List list = JsonUtil.json2Object(new ByteArrayInputStream(inputStr.getBytes()), ArrayList.class); -- cgit 1.2.3-korg