X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fconfig%2Fconfig-persister-directory-xml-adapter%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fconfig%2Fpersist%2Fstorage%2Fdirectory%2Fxml%2FDirectoryStorageAdapterTest.java;h=0a36db9e2ed76fead08be6ae57fde038430624ae;hp=73061f81de0d79ceae90b99852b9e8989faa0d45;hb=3d9e053b988b764c2d340f2c6cff2bad38191dd0;hpb=1ff9939abc7a4072b07df6b79516fe344b1b42e3 diff --git a/opendaylight/config/config-persister-directory-xml-adapter/src/test/java/org/opendaylight/controller/config/persist/storage/directory/xml/DirectoryStorageAdapterTest.java b/opendaylight/config/config-persister-directory-xml-adapter/src/test/java/org/opendaylight/controller/config/persist/storage/directory/xml/DirectoryStorageAdapterTest.java index 73061f81de..0a36db9e2e 100644 --- a/opendaylight/config/config-persister-directory-xml-adapter/src/test/java/org/opendaylight/controller/config/persist/storage/directory/xml/DirectoryStorageAdapterTest.java +++ b/opendaylight/config/config-persister-directory-xml-adapter/src/test/java/org/opendaylight/controller/config/persist/storage/directory/xml/DirectoryStorageAdapterTest.java @@ -8,20 +8,21 @@ package org.opendaylight.controller.config.persist.storage.directory.xml; -import org.junit.Test; -import org.opendaylight.controller.config.persist.api.ConfigSnapshotHolder; - import java.io.File; import java.util.Collections; import java.util.List; import java.util.SortedSet; - +import org.junit.Test; +import org.opendaylight.controller.config.persist.api.ConfigSnapshotHolder; +import org.opendaylight.controller.config.persist.api.Persister; +import org.opendaylight.controller.config.persist.test.PropertiesProviderTest; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; public class DirectoryStorageAdapterTest { - XmlDirectoryPersister tested; + + Persister tested; @Test public void testEmptyDirectory() throws Exception { @@ -58,7 +59,12 @@ public class DirectoryStorageAdapterTest { @Test public void testOneFile() throws Exception { File folder = getFolder("oneFile"); - tested = new XmlDirectoryPersister((folder)); + + PropertiesProviderTest pp = new PropertiesProviderTest(); + pp.addProperty("directoryStorage",folder.getPath()); + XmlDirectoryStorageAdapter xmlDsa = new XmlDirectoryStorageAdapter(); + tested = xmlDsa.instantiate(pp); + List results = tested.loadLastConfigs(); assertEquals(1, results.size()); ConfigSnapshotHolder result = results.get(0); @@ -76,7 +82,12 @@ public class DirectoryStorageAdapterTest { @Test public void testTwoFiles() throws Exception { File folder = getFolder("twoFiles"); - tested = new XmlDirectoryPersister((folder)); + + PropertiesProviderTest pp = new PropertiesProviderTest(); + pp.addProperty("directoryStorage",folder.getPath()); + XmlDirectoryStorageAdapter xmlDsa = new XmlDirectoryStorageAdapter(); + tested = xmlDsa.instantiate(pp); + List results = tested.loadLastConfigs(); assertEquals(2, results.size());