diff options
Diffstat (limited to 'appc-config/appc-flow-controller/provider/src/test/java/org/onap')
-rw-r--r-- | appc-config/appc-flow-controller/provider/src/test/java/org/onap/appc/flow/controller/node/TransactionHandlerTest.java | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/appc-config/appc-flow-controller/provider/src/test/java/org/onap/appc/flow/controller/node/TransactionHandlerTest.java b/appc-config/appc-flow-controller/provider/src/test/java/org/onap/appc/flow/controller/node/TransactionHandlerTest.java index 158e0c93b..a57a8c043 100644 --- a/appc-config/appc-flow-controller/provider/src/test/java/org/onap/appc/flow/controller/node/TransactionHandlerTest.java +++ b/appc-config/appc-flow-controller/provider/src/test/java/org/onap/appc/flow/controller/node/TransactionHandlerTest.java @@ -23,6 +23,8 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import static org.onap.appc.flow.controller.utils.FlowControllerConstants.INPUT_REQUEST_ACTION; import static org.onap.appc.flow.controller.utils.FlowControllerConstants.INPUT_REQUEST_ACTION_TYPE; +import static org.onap.appc.flow.controller.utils.FlowControllerConstants.REST_PROTOCOL; +import static org.onap.appc.flow.controller.utils.FlowControllerConstants.VNF_TYPE; import java.util.Properties; import org.junit.Assert; @@ -57,7 +59,7 @@ public class TransactionHandlerTest { when(ctx.getAttribute(INPUT_REQUEST_ACTION_TYPE)).thenReturn(""); expectedException.expect(Exception.class); - expectedException.expectMessage("Don't know REST operation for Action"); + expectedException.expectMessage("Don't know vnf type to send REST request for request-action - null"); transactionHandler = new TransactionHandler(); transactionHandler.buildTransaction(ctx, prop, RESOURCE_URI); } @@ -68,7 +70,7 @@ public class TransactionHandlerTest { when(ctx.getAttribute(INPUT_REQUEST_ACTION_TYPE)).thenReturn("foo"); expectedException.expect(Exception.class); - expectedException.expectMessage("Don't know request-action request-action"); + expectedException.expectMessage("Don't know vnf type to send REST request for request-action - null"); transactionHandler.buildTransaction(ctx, prop, "some uri"); } @@ -77,10 +79,16 @@ public class TransactionHandlerTest { when(ctx.getAttribute(INPUT_REQUEST_ACTION_TYPE)).thenReturn("input-ra-type"); when(ctx.getAttribute(INPUT_REQUEST_ACTION)).thenReturn("input-ra"); - - when(prop.getProperty(ctx.getAttribute(INPUT_REQUEST_ACTION).concat(".default-rest-user"))) + when(ctx.getAttribute(VNF_TYPE)).thenReturn("vnf"); + + String userKey = ctx.getAttribute(VNF_TYPE) + "." + REST_PROTOCOL + "." + ctx.getAttribute(INPUT_REQUEST_ACTION) + + ".user"; + String passwordKey = ctx.getAttribute(VNF_TYPE) + "." + REST_PROTOCOL + "." + ctx.getAttribute(INPUT_REQUEST_ACTION) + + ".password"; + + when(prop.getProperty(userKey)) .thenReturn("rest-user"); - when(prop.getProperty(ctx.getAttribute(INPUT_REQUEST_ACTION).concat(".default-rest-pass"))) + when(prop.getProperty(passwordKey)) .thenReturn("rest-pass"); Transaction transaction = transactionHandler.buildTransaction(ctx, prop, "some uri"); |