diff options
Diffstat (limited to 'openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/src/test/java/org/openecomp/core/utilities/json')
2 files changed, 9 insertions, 10 deletions
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); |