Merge "Fix problem with singleton and parallel unit tests"

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);