From de7fa7c3fe83332b495b6159af38f56010e8fdbe Mon Sep 17 00:00:00 2001
From: Bogumil Zebek <bogumil.zebek@nokia.com>
Date: Thu, 24 May 2018 12:40:08 +0200
Subject: Fix problem with singleton impact on TC execution

Change-Id: I154c150d8c6c6620344f3f584d3ec7e7201a46ff
Issue-ID: SO-643
Signed-off-by: Bogumil Zebek <bogumil.zebek@nokia.com>
---
 .../src/test/java/org/openecomp/mso/bpmn/core/TestBaseTask.java  | 9 ++++++++-
 bpmn/pom.xml                                                     | 1 +
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/bpmn/MSOCoreBPMN/src/test/java/org/openecomp/mso/bpmn/core/TestBaseTask.java b/bpmn/MSOCoreBPMN/src/test/java/org/openecomp/mso/bpmn/core/TestBaseTask.java
index d434ac702d..1346fde674 100644
--- a/bpmn/MSOCoreBPMN/src/test/java/org/openecomp/mso/bpmn/core/TestBaseTask.java
+++ b/bpmn/MSOCoreBPMN/src/test/java/org/openecomp/mso/bpmn/core/TestBaseTask.java
@@ -32,6 +32,7 @@ import org.camunda.bpm.engine.test.Deployment;
 import org.camunda.bpm.engine.test.ProcessEngineRule;
 import org.junit.Assert;
 import org.junit.Before;
+import org.junit.BeforeClass;
 import org.junit.Rule;
 import org.junit.Test;
 
@@ -45,7 +46,13 @@ public class TestBaseTask {
 
 	@Rule
 	public ProcessEngineRule processEngineRule = new ProcessEngineRule();
-	
+
+	@BeforeClass
+	public static void setUpClass() {
+		System.setProperty("mso.config.path", "src/test/resources");
+		PropertyConfiguration.resetPropertyConfigurationSingletonInstance();
+	}
+
 	@Before
 	public void beforeTest() throws Exception {
 		CamundaDBSetup.configure();
diff --git a/bpmn/pom.xml b/bpmn/pom.xml
index 2989a1892c..d7e26f9d85 100644
--- a/bpmn/pom.xml
+++ b/bpmn/pom.xml
@@ -105,6 +105,7 @@
         <artifactId>maven-surefire-plugin</artifactId>
         <version>2.19.1</version>
         <configuration>
+          <redirectTestOutputToFile>true</redirectTestOutputToFile>
           <testFailureIgnore>false</testFailureIgnore>
           <argLine>${surefireArgLine} -Xss1m</argLine>
           <forkCount>1</forkCount>
-- 
cgit