aboutsummaryrefslogtreecommitdiffstats
path: root/bpmn
diff options
context:
space:
mode:
authorSeshu Kumar M <seshu.kumar.m@huawei.com>2018-07-18 13:19:12 +0000
committerGerrit Code Review <gerrit@onap.org>2018-07-18 13:19:12 +0000
commitbd75023254fa55a6e30271b0b3b514dbbf5cc851 (patch)
treef2a8958abb33097a38958c338c0a231557abfd9f /bpmn
parent3c9b6be403e3937084b8de344199fc873236ca08 (diff)
parentde7fa7c3fe83332b495b6159af38f56010e8fdbe (diff)
Merge "Fix problem with singleton impact on TC execution"
Diffstat (limited to 'bpmn')
-rw-r--r--bpmn/MSOCoreBPMN/src/test/java/org/openecomp/mso/bpmn/core/TestBaseTask.java9
-rw-r--r--bpmn/pom.xml1
2 files changed, 9 insertions, 1 deletions
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>