Update vCPE example for JSON Stringify

The JSON.stringify() call in the Rhino Javascript interpreter is not
working correctly. A previous patch introduced a method into the Apex
execution context to provide an alternative method for stringifying
JSON.

This patch updates the vCPE example in apex to use that new method.

Issue-ID: POLICY-2463
Change-Id: I85cc33dc4633b1b6f4c4db3d5ad8579c66d7c18c
Signed-off-by: liamfallon <liam.fallon@est.tech>

2 files changed, 15 insertions, 0 deletions

diff --git a/examples/examples-onap-vcpe/src/test/java/org/onap/policy/apex/domains/onap/vcpe/OnapVcpeRunner.java b/examples/examples-onap-vcpe/src/test/java/org/onap/policy/apex/domains/onap/vcpe/OnapVcpeRunner.java
index 768f372de..2c2cf5204 100644
--- a/examples/examples-onap-vcpe/src/test/java/org/onap/policy/apex/domains/onap/vcpe/OnapVcpeRunner.java
+++ b/examples/examples-onap-vcpe/src/test/java/org/onap/policy/apex/domains/onap/vcpe/OnapVcpeRunner.java
@@ -2,6 +2,7 @@
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2018 Ericsson. All rights reserved.
  *  Modifications Copyright (C) 2020 Bell Canada. All rights reserved.
+ *  Modifications Copyright (C) 2020 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,6 +22,9 @@
 
 package org.onap.policy.apex.domains.onap.vcpe;
 
+import static org.awaitility.Awaitility.await;
+
+import java.util.concurrent.TimeUnit;
 import org.onap.policy.apex.auth.clieditor.tosca.ApexCliToscaEditorMain;
 import org.onap.policy.apex.core.infrastructure.threading.ThreadUtilities;
 import org.onap.policy.apex.model.basicmodel.concepts.ApexException;
@@ -61,6 +65,10 @@ public class OnapVcpeRunner {
 
         final ApexMain apexMain = new ApexMain(apexArgs);
 
+        await().atMost(5000, TimeUnit.MILLISECONDS).until(() -> apexMain.isAlive());
+
+        // This test should be amended to start and shutdown the simulator as part of the test and not separately as
+        // is done in the gRPC test.
         ThreadUtilities.sleep(1000000);
         apexMain.shutdown();
     }
diff --git a/examples/examples-onap-vcpe/src/test/java/org/onap/policy/apex/domains/onap/vcpe/OnapVcpeStandaloneRunner.java b/examples/examples-onap-vcpe/src/test/java/org/onap/policy/apex/domains/onap/vcpe/OnapVcpeStandaloneRunner.java
index 310c0c08b..61c2df700 100644
--- a/examples/examples-onap-vcpe/src/test/java/org/onap/policy/apex/domains/onap/vcpe/OnapVcpeStandaloneRunner.java
+++ b/examples/examples-onap-vcpe/src/test/java/org/onap/policy/apex/domains/onap/vcpe/OnapVcpeStandaloneRunner.java
@@ -20,6 +20,9 @@
 
 package org.onap.policy.apex.domains.onap.vcpe;
 
+import static org.awaitility.Awaitility.await;
+
+import java.util.concurrent.TimeUnit;
 import org.onap.policy.apex.auth.clieditor.tosca.ApexCliToscaEditorMain;
 import org.onap.policy.apex.core.infrastructure.threading.ThreadUtilities;
 import org.onap.policy.apex.model.basicmodel.concepts.ApexException;
@@ -55,6 +58,10 @@ public class OnapVcpeStandaloneRunner {
         // @formatter:on
         final ApexMain apexMain = new ApexMain(apexArgs);
 
+        await().atMost(5000, TimeUnit.MILLISECONDS).until(() -> apexMain.isAlive());
+
+        // This test should be amended to start and shutdown the simulator as part of the test and not separately as
+        // is done in the gRPC test.
         ThreadUtilities.sleep(1000000);
         apexMain.shutdown();
     }