Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
BUG-650: Split out CommitCoordinationTask
[controller.git]
/
opendaylight
/
config
/
config-persister-file-xml-adapter
/
src
/
test
/
java
/
org
/
opendaylight
/
controller
/
config
/
persist
/
storage
/
file
/
xml
/
FileStorageAdapterTest.java
diff --git
a/opendaylight/config/config-persister-file-xml-adapter/src/test/java/org/opendaylight/controller/config/persist/storage/file/xml/FileStorageAdapterTest.java
b/opendaylight/config/config-persister-file-xml-adapter/src/test/java/org/opendaylight/controller/config/persist/storage/file/xml/FileStorageAdapterTest.java
index 5322f6357a01b0a3e01e1d58a8d943113b942562..942ba4c4b3683f2590705b838c6fdf689fc26a76 100644
(file)
--- a/
opendaylight/config/config-persister-file-xml-adapter/src/test/java/org/opendaylight/controller/config/persist/storage/file/xml/FileStorageAdapterTest.java
+++ b/
opendaylight/config/config-persister-file-xml-adapter/src/test/java/org/opendaylight/controller/config/persist/storage/file/xml/FileStorageAdapterTest.java
@@
-8,6
+8,11
@@
package org.opendaylight.controller.config.persist.storage.file.xml;
package org.opendaylight.controller.config.persist.storage.file.xml;
+import static org.junit.Assert.assertFalse;
+import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThat;
import com.google.common.base.Charsets;
import java.io.File;
import java.io.FileNotFoundException;
import com.google.common.base.Charsets;
import java.io.File;
import java.io.FileNotFoundException;
@@
-16,16
+21,11
@@
import java.nio.file.Files;
import java.util.List;
import java.util.SortedSet;
import java.util.TreeSet;
import java.util.List;
import java.util.SortedSet;
import java.util.TreeSet;
-import junit.framework.Assert;
import org.junit.Before;
import org.junit.Test;
import org.mockito.Mockito;
import org.opendaylight.controller.config.persist.api.ConfigSnapshotHolder;
import org.opendaylight.controller.config.persist.test.PropertiesProviderTest;
import org.junit.Before;
import org.junit.Test;
import org.mockito.Mockito;
import org.opendaylight.controller.config.persist.api.ConfigSnapshotHolder;
import org.opendaylight.controller.config.persist.test.PropertiesProviderTest;
-import static junit.framework.Assert.assertFalse;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
public class FileStorageAdapterTest {
public class FileStorageAdapterTest {
@@
-37,8
+37,9
@@
public class FileStorageAdapterTest {
@Before
public void setUp() throws Exception {
file = Files.createTempFile("testFilePersist", ".txt").toFile();
@Before
public void setUp() throws Exception {
file = Files.createTempFile("testFilePersist", ".txt").toFile();
- if (!file.exists())
+ if (!file.exists())
{
return;
return;
+ }
com.google.common.io.Files.write("", file, Charsets.UTF_8);
i = 1;
}
com.google.common.io.Files.write("", file, Charsets.UTF_8);
i = 1;
}
@@
-66,7
+67,7
@@
public class FileStorageAdapterTest {
storage.persistConfig(holder);
storage.persistConfig(holder);
-
Assert.
assertEquals(storage.toString().replace("\\","/"),"XmlFileStorageAdapter [storage="+NON_EXISTENT_DIRECTORY+NON_EXISTENT_FILE+"]");
+ assertEquals(storage.toString().replace("\\","/"),"XmlFileStorageAdapter [storage="+NON_EXISTENT_DIRECTORY+NON_EXISTENT_FILE+"]");
delete(new File(NON_EXISTENT_DIRECTORY));
}
@Test
delete(new File(NON_EXISTENT_DIRECTORY));
}
@Test
@@
-96,8
+97,7
@@
public class FileStorageAdapterTest {
List<ConfigSnapshotHolder> lastConf = storage.loadLastConfigs();
assertEquals(1, lastConf.size());
ConfigSnapshotHolder configSnapshotHolder = lastConf.get(0);
List<ConfigSnapshotHolder> lastConf = storage.loadLastConfigs();
assertEquals(1, lastConf.size());
ConfigSnapshotHolder configSnapshotHolder = lastConf.get(0);
- assertEquals("<config>2</config>",
- configSnapshotHolder.getConfigSnapshot().replaceAll("\\s", ""));
+ assertXMLEqual("<config>2</config>", configSnapshotHolder.getConfigSnapshot());
assertEquals(createCaps(), configSnapshotHolder.getCapabilities());
storage = new XmlFileStorageAdapter();
assertEquals(createCaps(), configSnapshotHolder.getCapabilities());
storage = new XmlFileStorageAdapter();
@@
-105,7
+105,7
@@
public class FileStorageAdapterTest {
storage.setNumberOfBackups(Integer.MAX_VALUE);
List<ConfigSnapshotHolder> last = storage.loadLastConfigs();
storage.setNumberOfBackups(Integer.MAX_VALUE);
List<ConfigSnapshotHolder> last = storage.loadLastConfigs();
-
Assert.
assertEquals(createCaps(), last.get(0).getCapabilities());
+ assertEquals(createCaps(), last.get(0).getCapabilities());
}
private SortedSet<String> createCaps() {
}
private SortedSet<String> createCaps() {
@@
-147,8
+147,7
@@
public class FileStorageAdapterTest {
List<ConfigSnapshotHolder> lastConf = storage.loadLastConfigs();
assertEquals(1, lastConf.size());
ConfigSnapshotHolder configSnapshotHolder = lastConf.get(0);
List<ConfigSnapshotHolder> lastConf = storage.loadLastConfigs();
assertEquals(1, lastConf.size());
ConfigSnapshotHolder configSnapshotHolder = lastConf.get(0);
- assertEquals("<config>2</config>",
- configSnapshotHolder.getConfigSnapshot().replaceAll("\\s", ""));
+ assertXMLEqual("<config>2</config>", configSnapshotHolder.getConfigSnapshot());
}
@Test
}
@Test
@@
-178,16
+177,16
@@
public class FileStorageAdapterTest {
List<ConfigSnapshotHolder> lastConf = storage.loadLastConfigs();
assertEquals(1, lastConf.size());
ConfigSnapshotHolder configSnapshotHolder = lastConf.get(0);
List<ConfigSnapshotHolder> lastConf = storage.loadLastConfigs();
assertEquals(1, lastConf.size());
ConfigSnapshotHolder configSnapshotHolder = lastConf.get(0);
- assertEquals("<config>3</config>",
- configSnapshotHolder.getConfigSnapshot().replaceAll("\\s", ""));
+ assertXMLEqual("<config>3</config>", configSnapshotHolder.getConfigSnapshot());
assertFalse(readLines.contains(holder.getConfigSnapshot()));
}
@Test
public void testNoLastConfig() throws Exception {
File file = Files.createTempFile("testFilePersist", ".txt").toFile();
assertFalse(readLines.contains(holder.getConfigSnapshot()));
}
@Test
public void testNoLastConfig() throws Exception {
File file = Files.createTempFile("testFilePersist", ".txt").toFile();
- if (!file.exists())
+ if (!file.exists())
{
return;
return;
+ }
XmlFileStorageAdapter storage = new XmlFileStorageAdapter();
storage.setFileStorage(file);
XmlFileStorageAdapter storage = new XmlFileStorageAdapter();
storage.setFileStorage(file);
@@
-221,12
+220,14
@@
public class FileStorageAdapterTest {
return "<config>" + i++ + "</config>";
}
return "<config>" + i++ + "</config>";
}
- private void delete(File f) throws IOException {
+ private void delete(
final
File f) throws IOException {
if (f.isDirectory()) {
if (f.isDirectory()) {
- for (File c : f.listFiles())
+ for (File c : f.listFiles())
{
delete(c);
delete(c);
+ }
}
}
- if (!f.delete())
+ if (!f.delete())
{
throw new FileNotFoundException("Failed to delete file: " + f);
throw new FileNotFoundException("Failed to delete file: " + f);
+ }
}
}
}
}