Merge "RequestsBean, Jira issue use correc type of Assert"

diff --git a/adapters/mso-adapter-utils/src/test/java/org/onap/so/openstack/utils/MsoCommonUtilsTest.java b/adapters/mso-adapter-utils/src/test/java/org/onap/so/openstack/utils/MsoCommonUtilsTest.java
index dfb5ac6..160201f 100644 (file)
--- a/adapters/mso-adapter-utils/src/test/java/org/onap/so/openstack/utils/MsoCommonUtilsTest.java
+++ b/adapters/mso-adapter-utils/src/test/java/org/onap/so/openstack/utils/MsoCommonUtilsTest.java
@@ -113,7 +113,7 @@ public class MsoCommonUtilsTest extends BaseTest {
         OpenStackResponse openStackResponse = Mockito.mock(OpenStackResponse.class);
         Error error = mapper.readValue(new File(RESOURCE_PATH + "Error.json"), Error.class);
 
-        doReturn(error).when(openStackResponse).getErrorEntity(eq(Error.class));
+        doReturn(error).when(openStackResponse).getErrorEntity(Error.class);
 
         openStackResponseException = new OpenStackResponseException("response", 501, openStackResponse);
 
@@ -144,7 +144,7 @@ public class MsoCommonUtilsTest extends BaseTest {
         OpenStackResponse openStackResponse = Mockito.mock(OpenStackResponse.class);
         Explanation explanation = mapper.readValue(new File(RESOURCE_PATH + "Explanation.json"), Explanation.class);
 
-        doReturn(explanation).when(openStackResponse).getErrorEntity(eq(Explanation.class));
+        doReturn(explanation).when(openStackResponse).getErrorEntity(Explanation.class);
 
         openStackResponseException = new OpenStackResponseException("response", 501, openStackResponse);
 
@@ -175,7 +175,7 @@ public class MsoCommonUtilsTest extends BaseTest {
         OpenStackResponse openStackResponse = Mockito.mock(OpenStackResponse.class);
         NeutronError explanation = mapper.readValue(new File(RESOURCE_PATH + "NeutronError.json"), NeutronError.class);
 
-        doReturn(explanation).when(openStackResponse).getErrorEntity(eq(NeutronError.class));
+        doReturn(explanation).when(openStackResponse).getErrorEntity(NeutronError.class);
 
         openStackResponseException = new OpenStackResponseException("response", 501, openStackResponse);
 

diff --git a/adapters/mso-adapter-utils/src/test/java/org/onap/so/openstack/utils/MsoHeatUtilsTest.java b/adapters/mso-adapter-utils/src/test/java/org/onap/so/openstack/utils/MsoHeatUtilsTest.java
index 5ee4987..85219c3 100644 (file)
--- a/adapters/mso-adapter-utils/src/test/java/org/onap/so/openstack/utils/MsoHeatUtilsTest.java
+++ b/adapters/mso-adapter-utils/src/test/java/org/onap/so/openstack/utils/MsoHeatUtilsTest.java
@@ -447,7 +447,7 @@ public class MsoHeatUtilsTest extends MsoHeatUtils {
 
         heatUtils.createStack(createStackParam, cloudSiteId, tenantId);
         Mockito.verify(stackResource, times(1)).create(createStackParam);
-        Mockito.verify(heatUtils, times(1)).saveStackRequest(eq(createStackParam), eq(requestId), eq("stackName"));
+        Mockito.verify(heatUtils, times(1)).saveStackRequest(createStackParam, requestId, "stackName");
         Mockito.verify(heatClient, times(1)).getStacks();
         Mockito.verify(stackResource, times(1)).create(createStackParam);
     }