From da727fa247fd97a9dc5cbf010210a6dbc307bba9 Mon Sep 17 00:00:00 2001 From: liamfallon Date: Thu, 15 Nov 2018 22:07:45 +0000 Subject: Fix timing and move tests The timings on the REST test are too short and time out on ONAP Jenkins The tests of the Apex service and Apex model upgrade are not benchmark tests so are moved to Integration. Issue-ID: POLICY-1251 Change-Id: I2672d01042b33fe0cce5223005295e3b1aa26e7a Signed-off-by: liamfallon --- .../org/onap/policy/apex/service/engine/main/ApexActivator.java | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'services') diff --git a/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/main/ApexActivator.java b/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/main/ApexActivator.java index aa82e1c95..c39be64fc 100644 --- a/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/main/ApexActivator.java +++ b/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/main/ApexActivator.java @@ -25,6 +25,7 @@ import java.util.Map; import java.util.Map.Entry; import org.onap.policy.apex.model.basicmodel.concepts.ApexException; +import org.onap.policy.apex.model.basicmodel.service.ModelService; import org.onap.policy.apex.model.utilities.TextFileUtils; import org.onap.policy.apex.service.engine.engdep.EngDepMessagingService; import org.onap.policy.apex.service.engine.runtime.EngineService; @@ -32,6 +33,7 @@ import org.onap.policy.apex.service.engine.runtime.impl.EngineServiceImpl; import org.onap.policy.apex.service.parameters.ApexParameters; import org.onap.policy.apex.service.parameters.eventhandler.EventHandlerParameters; import org.onap.policy.apex.service.parameters.eventhandler.EventHandlerPeeredMode; +import org.onap.policy.common.parameters.ParameterService; import org.slf4j.ext.XLogger; import org.slf4j.ext.XLoggerFactory; @@ -179,6 +181,10 @@ public class ApexActivator { engineServiceHandler.terminate(); engineServiceHandler = null; } + + // Clear the services + ModelService.clear(); + ParameterService.clear(); } /** -- cgit 1.2.3-korg