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=825eb946c8ec8be817caf0c73470528531e15650;hp=0a36db9e2ed76fead08be6ae57fde038430624ae;hb=4a1ea7b3cd735982883a984338355a368f8f888a;hpb=58fa0dd65634800eccaa1bbe85769835a0e6e071 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 0a36db9e2e..825eb946c8 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 @@ -14,15 +14,15 @@ 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 org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; public class DirectoryStorageAdapterTest { - - Persister tested; + XmlDirectoryPersister tested; + Logger logger = LoggerFactory.getLogger(DirectoryStorageAdapterTest.class.toString()); @Test public void testEmptyDirectory() throws Exception { @@ -59,12 +59,8 @@ public class DirectoryStorageAdapterTest { @Test public void testOneFile() throws Exception { File folder = getFolder("oneFile"); - - PropertiesProviderTest pp = new PropertiesProviderTest(); - pp.addProperty("directoryStorage",folder.getPath()); - XmlDirectoryStorageAdapter xmlDsa = new XmlDirectoryStorageAdapter(); - tested = xmlDsa.instantiate(pp); - + tested = new XmlDirectoryPersister(folder); + logger.info("Testing : "+tested.toString()); List results = tested.loadLastConfigs(); assertEquals(1, results.size()); ConfigSnapshotHolder result = results.get(0); @@ -82,12 +78,8 @@ public class DirectoryStorageAdapterTest { @Test public void testTwoFiles() throws Exception { File folder = getFolder("twoFiles"); - - PropertiesProviderTest pp = new PropertiesProviderTest(); - pp.addProperty("directoryStorage",folder.getPath()); - XmlDirectoryStorageAdapter xmlDsa = new XmlDirectoryStorageAdapter(); - tested = xmlDsa.instantiate(pp); - + tested = new XmlDirectoryPersister((folder)); + logger.info("Testing : "+tested.toString()); List results = tested.loadLastConfigs(); assertEquals(2, results.size());