From cad452cdb6d999f822fe11dc4fdd232cce30ff6a Mon Sep 17 00:00:00 2001 From: liamfallon Date: Tue, 6 Nov 2018 12:02:46 +0000 Subject: Refactor unit test data There were many copies of test policies and examples strewn through the Apex unit tests. This change cleans up the unit tests so that a single version of all example policies is used in all tests. Also added a new relative file root command line parameter to Apex to allow the root of relative paths in configuration files to be set. Apologies for the size of this review but unfortunately all of this must be done in one shot. Issue-ID: POLICY-1252 Change-Id: Ibbb18fbf18e3897a1c61301d0a65e62bc643a0e9 Signed-off-by: liamfallon (cherry picked from commit 53d8916cc60d97e2ce7ae345f8cc25f5602567da) --- .../prodcons/RESTServerJsonEventProducerStandalone.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'testsuites/integration/integration-uservice-test/src/test/resources/prodcons/RESTServerJsonEventProducerStandalone.json') diff --git a/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/RESTServerJsonEventProducerStandalone.json b/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/RESTServerJsonEventProducerStandalone.json index a2626dcf1..e74156b14 100644 --- a/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/RESTServerJsonEventProducerStandalone.json +++ b/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/RESTServerJsonEventProducerStandalone.json @@ -5,11 +5,11 @@ "id": 45, "instanceCount": 4, "deploymentPort": 12561, - "policyModelFileName": "src/test/resources/policymodels/SamplePolicyModelMVEL.json", + "policyModelFileName": "target/examples/models/SampleDomain/SamplePolicyModelJAVASCRIPT.json", "engineParameters": { "executorParameters": { - "MVEL": { - "parameterClassName": "org.onap.policy.apex.plugins.executor.mvel.MvelExecutorParameters" + "JAVASCRIPT": { + "parameterClassName": "org.onap.policy.apex.plugins.executor.javascript.JavascriptExecutorParameters" } } } @@ -30,7 +30,7 @@ }, "synchronousMode": true, "synchronousPeer": "FirstProducer", - "synchronousTimeout": 500 + "synchronousTimeout": 2000 } }, "eventOutputParameters": { @@ -47,7 +47,7 @@ }, "synchronousMode": true, "synchronousPeer": "FirstConsumer", - "synchronousTimeout": 500 + "synchronousTimeout": 2000 } } } -- cgit 1.2.3-korg