aboutsummaryrefslogtreecommitdiffstats
path: root/bpmn
diff options
context:
space:
mode:
authorBogumil Zebek <bogumil.zebek@nokia.com>2018-05-24 10:57:54 +0200
committerBogumil Zebek <bogumil.zebek@nokia.com>2018-05-24 10:57:54 +0200
commit34d23bfd18a910f9060fa6f06fc73ebcc38df204 (patch)
tree3859626241a9d2673b2989ba4f6a385b1b1f705a /bpmn
parent3ad1f7e9fd56d2d0eb9f0bde46b5b48cea9ed97a (diff)
Fix problem with singleton and parallel unit tests
Change-Id: If4236506978795933564fc6507e780212edbfd5d Issue-ID: SO-641 Signed-off-by: Bogumil Zebek <bogumil.zebek@nokia.com>
Diffstat (limited to 'bpmn')
-rw-r--r--bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/PropertyConfiguration.java4
-rw-r--r--bpmn/MSOCoreBPMN/src/test/java/org/openecomp/mso/bpmn/core/PropertyConfigurationTest.java2
2 files changed, 6 insertions, 0 deletions
diff --git a/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/PropertyConfiguration.java b/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/PropertyConfiguration.java
index b6272057a5..f75722ecc5 100644
--- a/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/PropertyConfiguration.java
+++ b/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/PropertyConfiguration.java
@@ -115,6 +115,10 @@ public class PropertyConfiguration {
return PropertyConfigurationInstanceHolder.instance;
}
+ static void resetPropertyConfigurationSingletonInstance(){
+ PropertyConfigurationInstanceHolder.instance = new PropertyConfiguration();
+ }
+
/**
* Returns the list of supported files.
*/
diff --git a/bpmn/MSOCoreBPMN/src/test/java/org/openecomp/mso/bpmn/core/PropertyConfigurationTest.java b/bpmn/MSOCoreBPMN/src/test/java/org/openecomp/mso/bpmn/core/PropertyConfigurationTest.java
index 506dba2552..57a512891f 100644
--- a/bpmn/MSOCoreBPMN/src/test/java/org/openecomp/mso/bpmn/core/PropertyConfigurationTest.java
+++ b/bpmn/MSOCoreBPMN/src/test/java/org/openecomp/mso/bpmn/core/PropertyConfigurationTest.java
@@ -51,6 +51,8 @@ import org.junit.Test;
public class PropertyConfigurationTest {
@Before
public void beforeTest() throws IOException {
+ PropertyConfiguration.resetPropertyConfigurationSingletonInstance();
+
Map<String, String> defaultProperties = PropertyConfigurationSetup.createBpmnProperties();
defaultProperties.put("testValue", "testKey");
PropertyConfigurationSetup.init(defaultProperties);