Fix problem with singleton impact on TC execution
Change-Id: I154c150d8c6c6620344f3f584d3ec7e7201a46ff
Issue-ID: SO-643
Signed-off-by: Bogumil Zebek <bogumil.zebek@nokia.com>
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 d434ac7..1346fde 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.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 @@
@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 2989a18..d7e26f9 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>