diff options
Diffstat (limited to 'sdc-tosca/src/test/java/org/onap/sdc/tosca/parser/elements')
3 files changed, 30 insertions, 27 deletions
diff --git a/sdc-tosca/src/test/java/org/onap/sdc/tosca/parser/elements/EntityDetailsFactoryTest.java b/sdc-tosca/src/test/java/org/onap/sdc/tosca/parser/elements/EntityDetailsFactoryTest.java index f33e1a7..0d0119f 100644 --- a/sdc-tosca/src/test/java/org/onap/sdc/tosca/parser/elements/EntityDetailsFactoryTest.java +++ b/sdc-tosca/src/test/java/org/onap/sdc/tosca/parser/elements/EntityDetailsFactoryTest.java @@ -20,20 +20,21 @@ package org.onap.sdc.tosca.parser.elements; -import org.junit.Test; -import org.junit.runner.RunWith; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.Mockito.when; + +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import org.onap.sdc.tosca.parser.enums.EntityTemplateType; import org.onap.sdc.toscaparser.api.Group; import org.onap.sdc.toscaparser.api.NodeTemplate; import org.onap.sdc.toscaparser.api.Policy; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.mockito.Mockito.when; - -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class EntityDetailsFactoryTest { @Mock @@ -112,9 +113,11 @@ public class EntityDetailsFactoryTest { assertEquals(null, EntityDetailsFactory.createEntityDetails(EntityTemplateType.POLICY, null)); } - @Test(expected = ClassCastException.class) + @Test public void createWrongEntityDetails() { - EntityDetailsFactory.createEntityDetails(EntityTemplateType.POLICY, group); + assertThrows(ClassCastException.class, () -> { + EntityDetailsFactory.createEntityDetails(EntityTemplateType.POLICY, group); + }); } diff --git a/sdc-tosca/src/test/java/org/onap/sdc/tosca/parser/elements/queries/EntityQueryTest.java b/sdc-tosca/src/test/java/org/onap/sdc/tosca/parser/elements/queries/EntityQueryTest.java index df8be5b..afa1c64 100644 --- a/sdc-tosca/src/test/java/org/onap/sdc/tosca/parser/elements/queries/EntityQueryTest.java +++ b/sdc-tosca/src/test/java/org/onap/sdc/tosca/parser/elements/queries/EntityQueryTest.java @@ -20,20 +20,20 @@ package org.onap.sdc.tosca.parser.elements.queries; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; +import org.junit.jupiter.api.extension.ExtendWith; import org.onap.sdc.tosca.parser.enums.EntityTemplateType; import org.onap.sdc.tosca.parser.impl.SdcPropertyNames; import org.onap.sdc.toscaparser.api.elements.Metadata; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; -import static org.mockito.Matchers.eq; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class EntityQueryTest { @Mock private Metadata metadata; diff --git a/sdc-tosca/src/test/java/org/onap/sdc/tosca/parser/elements/queries/TopologyTemplateQueryTest.java b/sdc-tosca/src/test/java/org/onap/sdc/tosca/parser/elements/queries/TopologyTemplateQueryTest.java index 5a30255..018675a 100644 --- a/sdc-tosca/src/test/java/org/onap/sdc/tosca/parser/elements/queries/TopologyTemplateQueryTest.java +++ b/sdc-tosca/src/test/java/org/onap/sdc/tosca/parser/elements/queries/TopologyTemplateQueryTest.java @@ -20,20 +20,21 @@ package org.onap.sdc.tosca.parser.elements.queries; -import static org.junit.Assert.assertTrue; import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.Mockito.when; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import org.onap.sdc.tosca.parser.enums.SdcTypes; import org.onap.sdc.tosca.parser.impl.SdcPropertyNames; import org.onap.sdc.toscaparser.api.NodeTemplate; import org.onap.sdc.toscaparser.api.elements.Metadata; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class TopologyTemplateQueryTest { @Mock @@ -42,10 +43,11 @@ public class TopologyTemplateQueryTest { @Mock private NodeTemplate nodeTemplate; - @Test(expected = IllegalArgumentException.class) + @Test public void objectIsNotTopologyTemplate() { - TopologyTemplateQuery.newBuilder(SdcTypes.CP) - .build(); + assertThrows(IllegalArgumentException.class, () -> { + TopologyTemplateQuery.newBuilder(SdcTypes.CP).build(); + }); } @Test @@ -53,7 +55,6 @@ public class TopologyTemplateQueryTest { TopologyTemplateQuery topologyTemplateQuery = TopologyTemplateQuery.newBuilder(SdcTypes.SERVICE) .build(); when(nodeTemplate.getMetaData()).thenReturn(metadata); - when(metadata.getValue(SdcPropertyNames.PROPERTY_NAME_CUSTOMIZATIONUUID)).thenReturn("345"); when(metadata.getValue(SdcPropertyNames.PROPERTY_NAME_TYPE)).thenReturn(SdcTypes.SERVICE.getValue()); assertTrue(topologyTemplateQuery.isMatchingSearchCriteria(nodeTemplate)); } @@ -134,7 +135,6 @@ public class TopologyTemplateQueryTest { .build(); when(nodeTemplate.getMetaData()).thenReturn(metadata); when(metadata.getValue(SdcPropertyNames.PROPERTY_NAME_TYPE)).thenReturn(SdcTypes.CVFC.getValue()); - when(metadata.getValue(SdcPropertyNames.PROPERTY_NAME_CUSTOMIZATIONUUID)).thenReturn("345"); assertFalse(topologyTemplateQuery.isMatchingSearchCriteria(nodeTemplate)); } |