Fix build fails

Apex end to end tests often fail because the tests are not tuned correctly
for Jenkins.

The JRuby test needs a delay to allow the first test to completely clear dowm
The volume of events sent in the Kafka tests is reduced from 100 to 10

The dom4j version is also changed back to 1.6.1 because 1.6 has the same security
issues.

Issue-ID: POLICY-954
Change-Id: Id38bf9fe526942870181bfd9c0762f0a471c0c02
Signed-off-by: liamfallon <liam.fallon@ericsson.com>

diff --git a/plugins/plugins-persistence/plugins-persistence-jpa/plugins-persistence-jpa-hibernate/pom.xml b/plugins/plugins-persistence/plugins-persistence-jpa/plugins-persistence-jpa-hibernate/pom.xml
index 1c675dc..990bc8d 100644 (file)
--- a/plugins/plugins-persistence/plugins-persistence-jpa/plugins-persistence-jpa-hibernate/pom.xml
+++ b/plugins/plugins-persistence/plugins-persistence-jpa/plugins-persistence-jpa-hibernate/pom.xml
@@ -45,7 +45,7 @@
                 <dependency>
                     <groupId>dom4j</groupId>
                     <artifactId>dom4j</artifactId>
-                    <version>1.6</version>
+                    <version>1.6.1</version>
                 </dependency>
         <dependency>
             <groupId>org.hibernate</groupId>

diff --git a/testsuites/integration/integration-executor-test/src/test/java/org/onap/policy/apex/plugins/executor/test/script/engine/TestApexEngineJRuby.java b/testsuites/integration/integration-executor-test/src/test/java/org/onap/policy/apex/plugins/executor/test/script/engine/TestApexEngineJRuby.java
index 3c0e9f9..916795d 100644 (file)
--- a/testsuites/integration/integration-executor-test/src/test/java/org/onap/policy/apex/plugins/executor/test/script/engine/TestApexEngineJRuby.java
+++ b/testsuites/integration/integration-executor-test/src/test/java/org/onap/policy/apex/plugins/executor/test/script/engine/TestApexEngineJRuby.java
@@ -30,6 +30,7 @@ import org.onap.policy.apex.context.parameters.ContextParameterConstants;
 import org.onap.policy.apex.context.parameters.ContextParameters;
 import org.onap.policy.apex.context.parameters.SchemaParameters;
 import org.onap.policy.apex.core.engine.EngineParameters;
+import org.onap.policy.apex.core.infrastructure.threading.ThreadUtilities;
 import org.onap.policy.apex.model.basicmodel.concepts.ApexException;
 import org.onap.policy.apex.plugins.executor.jruby.JrubyExecutorParameters;
 import org.onap.policy.common.parameters.ParameterService;
@@ -87,6 +88,7 @@ public class TestApexEngineJRuby {
     @Test
     public void testApexEngineJRuby() throws ApexException, InterruptedException, IOException {
         new TestApexEngine("JRUBY", engineParameters);
+        ThreadUtilities.sleep(5000);
         new TestApexEngine("JRUBY", engineParameters);
     }
 }

diff --git a/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/apps/uservice/test/adapt/kafka/TestKafka2Kafka.java b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/apps/uservice/test/adapt/kafka/TestKafka2Kafka.java
index 9aa9ac9..b174575 100644 (file)
--- a/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/apps/uservice/test/adapt/kafka/TestKafka2Kafka.java
+++ b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/apps/uservice/test/adapt/kafka/TestKafka2Kafka.java
@@ -55,7 +55,7 @@ public class TestKafka2Kafka {
 
     private static final long MAX_TEST_LENGTH = 20000;
 
-    private static final int EVENT_COUNT = 100;
+    private static final int EVENT_COUNT = 10;
     private static final int EVENT_INTERVAL = 20;
 
     private static final String ZKHOST = "127.0.0.1";