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 <liam.fallon@ericsson.com>

8 files changed, 12 insertions, 20 deletions

diff --git a/testsuites/integration/integration-common/src/main/resources/org/onap/policy/apex/testsuites/integration/common/model/javascript/DefaultTaskLogic.javascript b/testsuites/integration/integration-common/src/main/resources/org/onap/policy/apex/testsuites/integration/common/model/javascript/DefaultTaskLogic.javascript
index f98e16555..158e49eea 100644
--- a/testsuites/integration/integration-common/src/main/resources/org/onap/policy/apex/testsuites/integration/common/model/javascript/DefaultTaskLogic.javascript
+++ b/testsuites/integration/integration-common/src/main/resources/org/onap/policy/apex/testsuites/integration/common/model/javascript/DefaultTaskLogic.javascript
@@ -26,9 +26,7 @@ executor.logger.debug(executor.inFields);
 var caseSelectedType = Java.type("java.lang.Byte");
 executor.outFields.put("Test<STATE_NAME>CaseSelected", new caseSelectedType(<RANDOM_BYTE_VALUE>));
 
-var JavaDate = Java.type("java.util.Date");
-timeNow = new JavaDate();
-executor.outFields.put("Test<STATE_NAME>StateTime", timeNow.getTime());
+executor.outFields.put("Test<STATE_NAME>StateTime", java.lang.System.nanoTime());
 executor.logger.debug(executor.eo);
 
 var returnValue = executor.isTrue;
diff --git a/testsuites/integration/integration-common/src/main/resources/org/onap/policy/apex/testsuites/integration/common/model/javascript/EvalTaskLogic.javascript b/testsuites/integration/integration-common/src/main/resources/org/onap/policy/apex/testsuites/integration/common/model/javascript/EvalTaskLogic.javascript
index b0756504c..efbe5cb4d 100644
--- a/testsuites/integration/integration-common/src/main/resources/org/onap/policy/apex/testsuites/integration/common/model/javascript/EvalTaskLogic.javascript
+++ b/testsuites/integration/integration-common/src/main/resources/org/onap/policy/apex/testsuites/integration/common/model/javascript/EvalTaskLogic.javascript
@@ -21,9 +21,7 @@
 executor.logger.debug(executor.subject.id);
 executor.logger.debug(executor.inFields);
 
-var JavaDate = Java.type("java.util.Date");
-timeNow = new JavaDate();
-executor.outFields.put("State<STATE_NUMBER>Timestamp", timeNow.getTime());
+executor.outFields.put("State<STATE_NUMBER>Timestamp",  java.lang.System.nanoTime());
 executor.logger.debug(executor.outFields);
 
 var returnValue = executor.isTrue;
diff --git a/testsuites/integration/integration-common/src/main/resources/org/onap/policy/apex/testsuites/integration/common/model/jruby/DefaultTaskLogic.jruby b/testsuites/integration/integration-common/src/main/resources/org/onap/policy/apex/testsuites/integration/common/model/jruby/DefaultTaskLogic.jruby
index 4ad39f57e..5a88d4f07 100644
--- a/testsuites/integration/integration-common/src/main/resources/org/onap/policy/apex/testsuites/integration/common/model/jruby/DefaultTaskLogic.jruby
+++ b/testsuites/integration/integration-common/src/main/resources/org/onap/policy/apex/testsuites/integration/common/model/jruby/DefaultTaskLogic.jruby
@@ -26,8 +26,7 @@ executor.logger.debug("inFields: " + executor.inFields.toString())
 
 executor.outFields.put("Test<STATE_NAME>CaseSelected", <RANDOM_BYTE_VALUE>.to_java(:byte))
 
-timeNow = java.util.Date.new()
-executor.outFields.put("Test<STATE_NAME>StateTime", timeNow.getTime())
+executor.outFields.put("Test<STATE_NAME>StateTime",  java.lang.System.nanoTime())
 executor.logger.debug("outFields: " + executor.outFields.toString())
 
 return true
diff --git a/testsuites/integration/integration-common/src/main/resources/org/onap/policy/apex/testsuites/integration/common/model/jruby/EvalTaskLogic.jruby b/testsuites/integration/integration-common/src/main/resources/org/onap/policy/apex/testsuites/integration/common/model/jruby/EvalTaskLogic.jruby
index 72a4ee607..a5a86a132 100644
--- a/testsuites/integration/integration-common/src/main/resources/org/onap/policy/apex/testsuites/integration/common/model/jruby/EvalTaskLogic.jruby
+++ b/testsuites/integration/integration-common/src/main/resources/org/onap/policy/apex/testsuites/integration/common/model/jruby/EvalTaskLogic.jruby
@@ -25,8 +25,7 @@ executor.logger.debug("inFields: " + executor.inFields.toString());
 
 executor.outFields.putAll(executor.inFields);
 
-timeNow = java.util.Date.new();
-executor.outFields.put("State<STATE_NUMBER>Timestamp", timeNow.getTime());
+executor.outFields.put("State<STATE_NUMBER>Timestamp",  java.lang.System.nanoTime());
 executor.logger.debug("outFields: " + executor.outFields.toString());
 
 return true;
diff --git a/testsuites/integration/integration-common/src/main/resources/org/onap/policy/apex/testsuites/integration/common/model/jython/DefaultTaskLogic.jython b/testsuites/integration/integration-common/src/main/resources/org/onap/policy/apex/testsuites/integration/common/model/jython/DefaultTaskLogic.jython
index f57ce3f0a..824c32bde 100644
--- a/testsuites/integration/integration-common/src/main/resources/org/onap/policy/apex/testsuites/integration/common/model/jython/DefaultTaskLogic.jython
+++ b/testsuites/integration/integration-common/src/main/resources/org/onap/policy/apex/testsuites/integration/common/model/jython/DefaultTaskLogic.jython
@@ -20,7 +20,7 @@
 
 from java.lang import Byte
 from java.lang import Long
-from java.util import Date
+from java.lang import System
 
 executor.logger.debug('id: ' + executor.subject.id)
 
@@ -29,7 +29,7 @@ executor.logger.debug('inFields: ' + executor.inFields.toString())
 
 executor.outFields["Test<STATE_NAME>CaseSelected"] = Byte("<RANDOM_BYTE_VALUE>")
 
-timeValue = Long(Date().getTime());
+timeValue = Long(System.nanoTime());
 executor.outFields["Test<STATE_NAME>StateTime"] = timeValue
 executor.logger.debug('outFields: ' + executor.outFields.toString())
 returnValue = executor.isTrue
diff --git a/testsuites/integration/integration-common/src/main/resources/org/onap/policy/apex/testsuites/integration/common/model/jython/EvalTaskLogic.jython b/testsuites/integration/integration-common/src/main/resources/org/onap/policy/apex/testsuites/integration/common/model/jython/EvalTaskLogic.jython
index aa6525673..15981aa2d 100644
--- a/testsuites/integration/integration-common/src/main/resources/org/onap/policy/apex/testsuites/integration/common/model/jython/EvalTaskLogic.jython
+++ b/testsuites/integration/integration-common/src/main/resources/org/onap/policy/apex/testsuites/integration/common/model/jython/EvalTaskLogic.jython
@@ -20,13 +20,14 @@
 
 from java.lang import Boolean
 from java.lang import Long
-from java.util import Date
+from java.lang import System
 
 executor.logger.debug('id: ' + executor.subject.id)
 
 executor.logger.debug('inFields: ' + executor.inFields.toString())
 executor.outFields.putAll(executor.inFields)
 
-executor.outFields["State<STATE_NUMBER>Timestamp"] = Long(Date().getTime())
+timeValue = Long(System.nanoTime());
+executor.outFields["State<STATE_NUMBER>Timestamp"] = timeValue
 executor.logger.debug('outFields: ' + executor.outFields.toString())
 returnValue = Boolean.TRUE
diff --git a/testsuites/integration/integration-common/src/main/resources/org/onap/policy/apex/testsuites/integration/common/model/mvel/DefaultTaskLogic.mvel b/testsuites/integration/integration-common/src/main/resources/org/onap/policy/apex/testsuites/integration/common/model/mvel/DefaultTaskLogic.mvel
index 9a1a4bad1..ffe3dd0e4 100644
--- a/testsuites/integration/integration-common/src/main/resources/org/onap/policy/apex/testsuites/integration/common/model/mvel/DefaultTaskLogic.mvel
+++ b/testsuites/integration/integration-common/src/main/resources/org/onap/policy/apex/testsuites/integration/common/model/mvel/DefaultTaskLogic.mvel
@@ -18,13 +18,11 @@
  * ============LICENSE_END=========================================================
  */
 
-import java.util.Date;
 logger.debug(subject.id);
 gc = getContextAlbum("GlobalContextAlbum");
 logger.debug(gc);
 logger.debug(inFields);
 outFields["Test<STATE_NAME>CaseSelected"] = (byte)<RANDOM_BYTE_VALUE>;
-timeNow = new Date();
-outFields["Test<STATE_NAME>StateTime"] = timeNow.getTime();
+outFields["Test<STATE_NAME>StateTime"] = java.lang.System.nanoTime();
 logger.debug(outFields);
 return true;
\ No newline at end of file
diff --git a/testsuites/integration/integration-common/src/main/resources/org/onap/policy/apex/testsuites/integration/common/model/mvel/EvalTaskLogic.mvel b/testsuites/integration/integration-common/src/main/resources/org/onap/policy/apex/testsuites/integration/common/model/mvel/EvalTaskLogic.mvel
index e15a4beec..869def02c 100644
--- a/testsuites/integration/integration-common/src/main/resources/org/onap/policy/apex/testsuites/integration/common/model/mvel/EvalTaskLogic.mvel
+++ b/testsuites/integration/integration-common/src/main/resources/org/onap/policy/apex/testsuites/integration/common/model/mvel/EvalTaskLogic.mvel
@@ -18,9 +18,8 @@
  * ============LICENSE_END=========================================================
  */
 
-import java.util.Date;
 logger.debug(subject.id);
 logger.debug(inFields);
-timeNow = new Date();
-outFields["State<STATE_NUMBER>Timestamp"] = timeNow.getTime();
+
+outFields["State<STATE_NUMBER>Timestamp"] = java.lang.System.nanoTime();
 return true;
\ No newline at end of file