BUG-2976: Resolve clash between current and feature cfg pusher

[controller.git] / opendaylight / netconf / config-persister-impl / src / test / java / org / opendaylight / controller / netconf / persist / impl / PersisterAggregatorTest.java

diff --git a/opendaylight/netconf/config-persister-impl/src/test/java/org/opendaylight/controller/netconf/persist/impl/PersisterAggregatorTest.java b/opendaylight/netconf/config-persister-impl/src/test/java/org/opendaylight/controller/netconf/persist/impl/PersisterAggregatorTest.java
index e6464f8403b57859ce6ce2798a4c20a97cbe85f5..c962a46bb176f3e3ffc54424f9bcc9564a7ac36a 100644 (file)
--- a/opendaylight/netconf/config-persister-impl/src/test/java/org/opendaylight/controller/netconf/persist/impl/PersisterAggregatorTest.java
+++ b/opendaylight/netconf/config-persister-impl/src/test/java/org/opendaylight/controller/netconf/persist/impl/PersisterAggregatorTest.java
@@ -23,6 +23,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Properties;
+import org.junit.Before;
 import org.junit.Test;
 import org.opendaylight.controller.config.persist.api.ConfigSnapshotHolder;
 import org.opendaylight.controller.config.persist.api.Persister;
@@ -67,6 +68,13 @@ public class PersisterAggregatorTest {
         }
     }
 
+    @Before
+    public void setUp() throws Exception {
+        if(XmlFileStorageAdapter.getInstance().isPresent()) {
+            XmlFileStorageAdapter.getInstance().get().reset();
+        }
+    }
+
     @Test
     public void testDummyAdapter() throws Exception {
         PersisterAggregator persisterAggregator = PersisterAggregator.createFromProperties(TestingPropertiesProvider.loadFile("test1.properties"));