Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "increased test coverage of config-persister"
[controller.git]
/
opendaylight
/
config
/
config-persister-directory-xml-adapter
/
src
/
test
/
java
/
org
/
opendaylight
/
controller
/
config
/
persist
/
storage
/
directory
/
xml
/
DirectoryStorageAdapterTest.java
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 73061f81de0d79ceae90b99852b9e8989faa0d45..0a36db9e2ed76fead08be6ae57fde038430624ae 100644
(file)
--- 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;
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 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 {
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 {
@Test
public void testEmptyDirectory() throws Exception {
@@
-58,7
+59,12
@@
public class DirectoryStorageAdapterTest {
@Test
public void testOneFile() throws Exception {
File folder = getFolder("oneFile");
@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<ConfigSnapshotHolder> results = tested.loadLastConfigs();
assertEquals(1, results.size());
ConfigSnapshotHolder result = results.get(0);
List<ConfigSnapshotHolder> 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");
@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<ConfigSnapshotHolder> results = tested.loadLastConfigs();
assertEquals(2, results.size());
List<ConfigSnapshotHolder> results = tested.loadLastConfigs();
assertEquals(2, results.size());