diff options
Diffstat (limited to 'testsuites/integration/integration-uservice-test/src/test/java')
2 files changed, 2 insertions, 42 deletions
diff --git a/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/restclient/TestExecutionPropertyRest.java b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/restclient/TestExecutionPropertyRest.java index 0cf7dc652..b3f27c52e 100644 --- a/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/restclient/TestExecutionPropertyRest.java +++ b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/restclient/TestExecutionPropertyRest.java @@ -239,46 +239,6 @@ public class TestExecutionPropertyRest { } /** - * Test Http code filter set and tag Url are transformed correctly. - */ - @Test - public void testReplaceUrlTag() throws Exception { - final Client client = ClientBuilder.newClient(); - // @formatter:off - final String[] cliArgs = new String[] { - "-c", - "src/test/resources/policies/executionproperties/policy/ExecutionPropertiesRestTestPolicyModel.apex", - "-o", - "target/ExecutionPropertiesRestTestPolicyModel.json", - "-ac", - "src/test/resources/testdata/executionproperties/RESTHttpCodeFilterSetToTagUrlOK.json", - "-t", - "src/test/resources/tosca/ToscaTemplate.json", - "-ot", - "target/classes/APEXPolicy.json" - }; - // @formatter:on - - new ApexCliToscaEditorMain(cliArgs); - - // @formatter:off - final String[] args = { - "-p", - "target/classes/APEXPolicy.json" - }; - // @formatter:on - apexMain = new ApexMain(args); - - await().atMost(5, TimeUnit.SECONDS).until(() -> { - Response response = client.target("http://localhost:32801/TestExecutionRest/apex/event/GetProperUrl") - .request("application/json").get(); - return response.readEntity(String.class).contains("\"PostProperUrl\": 1"); - }); - assertTrue(apexMain.isAlive()); - LOGGER.info("testReplaceUrlTag-OUTSTRING=\n" + outContent.toString() + "\nEnd-TagUrl"); - } - - /** * Test Http code filter set and multi-tag Url are transformed correctly. */ @Test diff --git a/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/executionproperties/DummyApexEventConsumer.java b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/executionproperties/DummyApexEventConsumer.java index c4b93b002..1dc6f13a2 100644 --- a/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/executionproperties/DummyApexEventConsumer.java +++ b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/executionproperties/DummyApexEventConsumer.java @@ -1,7 +1,7 @@ /*- * ============LICENSE_START======================================================= * Copyright (C) 2019 Nordix Foundation. - * Modifications Copyright (C) 2019 Nordix Foundation. + * Modifications Copyright (C) 2021 Bell Canada. All rights reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -125,7 +125,7 @@ public class DummyApexEventConsumer implements ApexEventConsumer { RunTestEvent event = new RunTestEvent(); event.setTestToRun(dummyConsumerProperties.getTestToRun()); try { - eventReceiver.receiveEvent(executionProperties, event.toJson()); + eventReceiver.receiveEvent(1, executionProperties, event.toJson()); } catch (Exception e) { String message = "event processing for executor properties testing failed: " + e.getMessage(); LOGGER.warn(message, e); |