Merge 'origin/casablanca' into master

[so.git] / bpmn / MSOCommonBPMN / src / test / java / org / onap / so / bpmn / common / resource / ResourceRequestBuilderTest.java

diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/common/resource/ResourceRequestBuilderTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/common/resource/ResourceRequestBuilderTest.java
index 115ed91..e5e1326 100644 (file)
--- a/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/common/resource/ResourceRequestBuilderTest.java
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/common/resource/ResourceRequestBuilderTest.java
@@ -19,42 +19,34 @@
  */
 package org.onap.so.bpmn.common.resource;
 
-import com.github.tomakehurst.wiremock.client.WireMock;
-import com.github.tomakehurst.wiremock.junit.WireMockRule;
-import org.junit.Rule;
-import org.junit.Test;
-import org.mockito.Mock;
-import org.onap.so.bpmn.core.UrnPropertiesReader;
-import org.springframework.core.env.Environment;
+import static org.junit.Assert.assertEquals;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import static org.junit.Assert.assertEquals;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import org.junit.Rule;
+import org.junit.Test;
+import org.mockito.Mock;
+import org.onap.so.BaseTest;
+import org.onap.so.bpmn.core.UrnPropertiesReader;
+import org.springframework.core.env.Environment;
 
-public class ResourceRequestBuilderTest {
+import static com.github.tomakehurst.wiremock.client.WireMock.*;
 
-    @Rule
-    public WireMockRule wireMockRule = new WireMockRule();
 
-    @Mock
-    UrnPropertiesReader urnPropertiesReader;
+public class ResourceRequestBuilderTest extends BaseTest {
 
     @Test
     public void getResourceInputTest() throws Exception {
 
-        UrnPropertiesReader reader = new UrnPropertiesReader();
-        Environment env = mock(Environment.class);
 
-        when(env.getProperty(eq("mso.catalog.db.endpoint"))).thenReturn("http://localhost:8080/ecomp/mso/catalog");
-        reader.setEnvironment(env);
 
-        WireMock.stubFor(WireMock.get(WireMock.urlEqualTo("/ecomp/mso/catalog/v2/serviceResources?serviceModelUuid=c3954379-4efe-431c-8258-f84905b158e5"))
-                .willReturn(WireMock.ok("{ \"serviceResources\"    : {\n" +
+        stubFor(get(urlEqualTo("/ecomp/mso/catalog/v2/serviceResources?serviceModelUuid=c3954379-4efe-431c-8258-f84905b158e5"))
+                .willReturn(ok("{ \"serviceResources\"    : {\n" +
                         "\t\"modelInfo\"       : {\n" +
                         "\t\t\"modelName\"          : \"demoVFWCL\",\n" +
                         "\t\t\"modelUuid\"          : \"c3954379-4efe-431c-8258-f84905b158e5\",\n" +
@@ -145,14 +137,8 @@ public class ResourceRequestBuilderTest {
     @Test
     public void getResourceInputDefaultValueTest() throws Exception {
 
-        UrnPropertiesReader reader = new UrnPropertiesReader();
-        Environment env = mock(Environment.class);
-
-        when(env.getProperty(eq("mso.catalog.db.endpoint"))).thenReturn("http://localhost:8080/ecomp/mso/catalog");
-        reader.setEnvironment(env);
-
-        WireMock.stubFor(WireMock.get(WireMock.urlEqualTo("/ecomp/mso/catalog/v2/serviceResources?serviceModelUuid=c3954379-4efe-431c-8258-f84905b158e5"))
-                .willReturn(WireMock.ok("{ \"serviceResources\"    : {\n" +
+        stubFor(get(urlEqualTo("/ecomp/mso/catalog/v2/serviceResources?serviceModelUuid=c3954379-4efe-431c-8258-f84905b158e5"))
+                .willReturn(ok("{ \"serviceResources\"    : {\n" +
                         "\t\"modelInfo\"       : {\n" +
                         "\t\t\"modelName\"          : \"demoVFWCL\",\n" +
                         "\t\t\"modelUuid\"          : \"c3954379-4efe-431c-8258-f84905b158e5\",\n" +
@@ -242,14 +228,8 @@ public class ResourceRequestBuilderTest {
     @Test
     public void getResourceInputValueNoDefaultTest() throws Exception {
 
-        UrnPropertiesReader reader = new UrnPropertiesReader();
-        Environment env = mock(Environment.class);
-
-        when(env.getProperty(eq("mso.catalog.db.endpoint"))).thenReturn("http://localhost:8080/ecomp/mso/catalog");
-        reader.setEnvironment(env);
-
-        WireMock.stubFor(WireMock.get(WireMock.urlEqualTo("/ecomp/mso/catalog/v2/serviceResources?serviceModelUuid=c3954379-4efe-431c-8258-f84905b158e5"))
-                .willReturn(WireMock.ok("{ \"serviceResources\"    : {\n" +
+        stubFor(get(urlEqualTo("/ecomp/mso/catalog/v2/serviceResources?serviceModelUuid=c3954379-4efe-431c-8258-f84905b158e5"))
+                .willReturn(ok("{ \"serviceResources\"    : {\n" +
                         "\t\"modelInfo\"       : {\n" +
                         "\t\t\"modelName\"          : \"demoVFWCL\",\n" +
                         "\t\t\"modelUuid\"          : \"c3954379-4efe-431c-8258-f84905b158e5\",\n" +
@@ -339,14 +319,8 @@ public class ResourceRequestBuilderTest {
     @Test
     public void getResourceSequenceTest() throws Exception {
 
-        UrnPropertiesReader reader = new UrnPropertiesReader();
-        Environment env = mock(Environment.class);
-
-        when(env.getProperty(eq("mso.catalog.db.endpoint"))).thenReturn("http://localhost:8080/ecomp/mso/catalog");
-        reader.setEnvironment(env);
-
-        WireMock.stubFor(WireMock.get(WireMock.urlEqualTo("/ecomp/mso/catalog/v2/serviceResources?serviceModelUuid=c3954379-4efe-431c-8258-f84905b158e5"))
-                .willReturn(WireMock.ok("{ \"serviceResources\"    : {\n" +
+        stubFor(get(urlEqualTo("/ecomp/mso/catalog/v2/serviceResources?serviceModelUuid=c3954379-4efe-431c-8258-f84905b158e5"))
+                .willReturn(ok("{ \"serviceResources\"    : {\n" +
                         "\t\"modelInfo\"       : {\n" +
                         "\t\t\"modelName\"          : \"demoVFWCL\",\n" +
                         "\t\t\"modelUuid\"          : \"c3954379-4efe-431c-8258-f84905b158e5\",\n" +