aboutsummaryrefslogtreecommitdiffstats
path: root/asdctool/src
diff options
context:
space:
mode:
authorBaumel, Dvir (db384r) <dvir.baumel@intl.att.com>2020-03-23 16:21:05 +0200
committerOfir Sonsino <ofir.sonsino@intl.att.com>2020-04-16 08:50:35 +0000
commit3e8793276f623132892331cf65c85bb91c1ab154 (patch)
treea9366ecaf3999751d025d7052ad79c4d073bca63 /asdctool/src
parentecdbf0720d0e8085e53650a10eb594cbe74eb7ef (diff)
Upgrade Junit to version 5.6
Issue-ID: SDC-2844 Change-Id: I4716bf7920f9bb79c450ebfd48e9d4fba54fdfdd Signed-off-by: Baumel, Dvir (db384r) <dvir.baumel@intl.att.com>
Diffstat (limited to 'asdctool/src')
-rw-r--r--asdctool/src/test/java/org/openecomp/sdc/asdctool/impl/validator/executers/TopologyTemplateValidatorExecuterTest.java9
-rw-r--r--asdctool/src/test/java/org/openecomp/sdc/asdctool/impl/validator/executers/VFToscaArtifactValidatorExecutorTest.java9
2 files changed, 10 insertions, 8 deletions
diff --git a/asdctool/src/test/java/org/openecomp/sdc/asdctool/impl/validator/executers/TopologyTemplateValidatorExecuterTest.java b/asdctool/src/test/java/org/openecomp/sdc/asdctool/impl/validator/executers/TopologyTemplateValidatorExecuterTest.java
index 6e3c15d58d..d74aaa49a2 100644
--- a/asdctool/src/test/java/org/openecomp/sdc/asdctool/impl/validator/executers/TopologyTemplateValidatorExecuterTest.java
+++ b/asdctool/src/test/java/org/openecomp/sdc/asdctool/impl/validator/executers/TopologyTemplateValidatorExecuterTest.java
@@ -20,7 +20,8 @@
package org.openecomp.sdc.asdctool.impl.validator.executers;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
import org.openecomp.sdc.be.dao.jsongraph.JanusGraphDao;
import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
@@ -53,12 +54,12 @@ public class TopologyTemplateValidatorExecuterTest {
result = testSubject.getName();
}
- @Test(expected=NullPointerException.class)
- public void testGetVerticesToValidate() throws Exception {
+ @Test
+ public void testGetVerticesToValidate() {
TopologyTemplateValidatorExecuter testSubject;
// default test
testSubject = createTestSubject();
- testSubject.getVerticesToValidate(ComponentTypeEnum.PRODUCT);
+ Assertions.assertThrows(NullPointerException.class, () -> testSubject.getVerticesToValidate(ComponentTypeEnum.PRODUCT));
}
}
diff --git a/asdctool/src/test/java/org/openecomp/sdc/asdctool/impl/validator/executers/VFToscaArtifactValidatorExecutorTest.java b/asdctool/src/test/java/org/openecomp/sdc/asdctool/impl/validator/executers/VFToscaArtifactValidatorExecutorTest.java
index bf9436336d..c8edb7d05a 100644
--- a/asdctool/src/test/java/org/openecomp/sdc/asdctool/impl/validator/executers/VFToscaArtifactValidatorExecutorTest.java
+++ b/asdctool/src/test/java/org/openecomp/sdc/asdctool/impl/validator/executers/VFToscaArtifactValidatorExecutorTest.java
@@ -20,7 +20,8 @@
package org.openecomp.sdc.asdctool.impl.validator.executers;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
import org.openecomp.sdc.be.dao.jsongraph.JanusGraphDao;
import org.openecomp.sdc.be.model.jsonjanusgraph.operations.ToscaOperationFacade;
@@ -35,14 +36,14 @@ public class VFToscaArtifactValidatorExecutorTest {
return new VFToscaArtifactValidatorExecutor(janusGraphDaoMock, toscaOperationFacade);
}
- @Test(expected=NullPointerException.class)
- public void testExecuteValidations() throws Exception {
+ @Test
+ public void testExecuteValidations() {
VFToscaArtifactValidatorExecutor testSubject;
boolean result;
// default test
testSubject = createTestSubject();
- result = testSubject.executeValidations();
+ Assertions.assertThrows(NullPointerException.class, () -> testSubject.executeValidations());
}
@Test