package org.opendaylight.controller.config.persist.storage.file.xml;
+import static junit.framework.Assert.assertTrue;
import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertThat;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
-import com.google.common.base.Charsets;
+import com.google.common.collect.Sets;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.nio.file.Files;
+import java.nio.charset.StandardCharsets;
import java.util.List;
import java.util.SortedSet;
import java.util.TreeSet;
+import org.junit.After;
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;
private File file;
private static final String NON_EXISTENT_DIRECTORY = "./nonExistentDir/";
private static final String NON_EXISTENT_FILE = "nonExistent.txt";
+ private XmlFileStorageAdapter storage;
@Before
public void setUp() throws Exception {
file = Files.createTempFile("testFilePersist", ".txt").toFile();
+ file.deleteOnExit();
if (!file.exists()) {
return;
}
- com.google.common.io.Files.write("", file, Charsets.UTF_8);
+ com.google.common.io.Files.write("", file, StandardCharsets.UTF_8);
i = 1;
+ storage = new XmlFileStorageAdapter();
+ }
+
+ @After
+ public void tearDown() throws Exception {
+ storage.reset();
}
@Test
public void testNewFile() throws Exception {
- XmlFileStorageAdapter storage = new XmlFileStorageAdapter();
PropertiesProviderTest pp = new PropertiesProviderTest();
pp.addProperty("fileStorage",NON_EXISTENT_DIRECTORY+NON_EXISTENT_FILE);
pp.addProperty("numberOfBackups",Integer.toString(Integer.MAX_VALUE));
assertEquals(storage.toString().replace("\\","/"),"XmlFileStorageAdapter [storage="+NON_EXISTENT_DIRECTORY+NON_EXISTENT_FILE+"]");
delete(new File(NON_EXISTENT_DIRECTORY));
}
+
@Test
public void testFileAdapter() throws Exception {
- XmlFileStorageAdapter storage = new XmlFileStorageAdapter();
PropertiesProviderTest pp = new PropertiesProviderTest();
pp.addProperty("fileStorage",file.getPath());
pp.addProperty("numberOfBackups",Integer.toString(Integer.MAX_VALUE));
storage.persistConfig(holder);
- assertEquals(27, com.google.common.io.Files.readLines(file, Charsets.UTF_8).size());
+ assertEquals(29, com.google.common.io.Files.readLines(file, StandardCharsets.UTF_8).size());
List<ConfigSnapshotHolder> lastConf = storage.loadLastConfigs();
assertEquals(1, lastConf.size());
ConfigSnapshotHolder configSnapshotHolder = lastConf.get(0);
@Test
public void testFileAdapterOneBackup() throws Exception {
- XmlFileStorageAdapter storage = new XmlFileStorageAdapter();
-
PropertiesProviderTest pp = new PropertiesProviderTest();
pp.addProperty("fileStorage",file.getPath());
pp.addProperty("numberOfBackups",Integer.toString(Integer.MAX_VALUE));
storage.persistConfig(holder);
- assertEquals(27, com.google.common.io.Files.readLines(file, Charsets.UTF_8).size());
+ assertEquals(29, com.google.common.io.Files.readLines(file, StandardCharsets.UTF_8).size());
List<ConfigSnapshotHolder> lastConf = storage.loadLastConfigs();
assertEquals(1, lastConf.size());
assertXMLEqual("<config>2</config>", configSnapshotHolder.getConfigSnapshot());
}
+ @Test
+ public void testWithFeatures() throws Exception {
+ PropertiesProviderTest pp = new PropertiesProviderTest();
+ pp.addProperty("fileStorage",file.getPath());
+ pp.addProperty("numberOfBackups",Integer.toString(Integer.MAX_VALUE));
+ storage.instantiate(pp);
+
+ final ConfigSnapshotHolder holder = new ConfigSnapshotHolder() {
+ @Override
+ public String getConfigSnapshot() {
+ return createConfig();
+ }
+
+ @Override
+ public SortedSet<String> getCapabilities() {
+ return createCaps();
+ }
+ };
+ final FeatureListProvider mock = mock(FeatureListProvider.class);
+
+ doReturn(Sets.newHashSet("f1-11", "f2-22")).when(mock).listFeatures();
+ storage.setFeaturesService(mock);
+ storage.persistConfig(holder);
+
+ assertEquals(20, com.google.common.io.Files.readLines(file, StandardCharsets.UTF_8).size());
+
+ List<ConfigSnapshotHolder> lastConf = storage.loadLastConfigs();
+ assertEquals(1, lastConf.size());
+ ConfigSnapshotHolder configSnapshotHolder = lastConf.get(0);
+ assertXMLEqual("<config>1</config>", configSnapshotHolder.getConfigSnapshot());
+ assertEquals(Sets.newHashSet("f1-11", "f2-22"), storage.getPersistedFeatures());
+ }
+
+ @Test
+ public void testNoFeaturesStored() throws Exception {
+ PropertiesProviderTest pp = new PropertiesProviderTest();
+ pp.addProperty("fileStorage",file.getPath());
+ pp.addProperty("numberOfBackups",Integer.toString(Integer.MAX_VALUE));
+ storage.instantiate(pp);
+
+ com.google.common.io.Files.write("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
+ "<persisted-snapshots>\n" +
+ " <snapshots>\n" +
+ " <snapshot>\n" +
+ " <required-capabilities>\n" +
+ " <capability>cap12</capability>\n" +
+ " </required-capabilities>\n" +
+ " <configuration>\n" +
+ " <config>1</config>\n" +
+ " </configuration>\n" +
+ " </snapshot>\n" +
+ " </snapshots>\n" +
+ "</persisted-snapshots>", file, StandardCharsets.UTF_8);
+
+ List<ConfigSnapshotHolder> lastConf = storage.loadLastConfigs();
+ assertEquals(1, lastConf.size());
+ ConfigSnapshotHolder configSnapshotHolder = lastConf.get(0);
+ assertXMLEqual("<config>1</config>", configSnapshotHolder.getConfigSnapshot());
+ assertTrue(storage.getPersistedFeatures().isEmpty());
+ }
+
@Test
public void testFileAdapterOnlyTwoBackups() throws Exception {
- XmlFileStorageAdapter storage = new XmlFileStorageAdapter();
storage.setFileStorage(file);
storage.setNumberOfBackups(2);
final ConfigSnapshotHolder holder = new ConfigSnapshotHolder() {
storage.persistConfig(holder);
storage.persistConfig(holder);
- List<String> readLines = com.google.common.io.Files.readLines(file, Charsets.UTF_8);
- assertEquals(27, readLines.size());
+ List<String> readLines = com.google.common.io.Files.readLines(file, StandardCharsets.UTF_8);
+ assertEquals(29, readLines.size());
List<ConfigSnapshotHolder> lastConf = storage.loadLastConfigs();
assertEquals(1, lastConf.size());
ConfigSnapshotHolder configSnapshotHolder = lastConf.get(0);
assertXMLEqual("<config>3</config>", configSnapshotHolder.getConfigSnapshot());
assertFalse(readLines.contains(holder.getConfigSnapshot()));
+ assertTrue(storage.getPersistedFeatures().isEmpty());
}
@Test
public void testNoLastConfig() throws Exception {
File file = Files.createTempFile("testFilePersist", ".txt").toFile();
+ file.deleteOnExit();
if (!file.exists()) {
return;
}
- XmlFileStorageAdapter storage = new XmlFileStorageAdapter();
- storage.setFileStorage(file);
+ try (XmlFileStorageAdapter storage = new XmlFileStorageAdapter()) {
+ storage.setFileStorage(file);
- List<ConfigSnapshotHolder> elementOptional = storage.loadLastConfigs();
- assertThat(elementOptional.size(), is(0));
+ List<ConfigSnapshotHolder> elementOptional = storage.loadLastConfigs();
+ assertThat(elementOptional.size(), is(0));
+ }
}
@Test(expected = NullPointerException.class)
public void testNoProperties() throws Exception {
- XmlFileStorageAdapter storage = new XmlFileStorageAdapter();
- storage.loadLastConfigs();
+ try (XmlFileStorageAdapter storage = new XmlFileStorageAdapter()) {
+ storage.loadLastConfigs();
+ }
}
@Test(expected = NullPointerException.class)
public void testNoProperties2() throws Exception {
- XmlFileStorageAdapter storage = new XmlFileStorageAdapter();
- storage.persistConfig(new ConfigSnapshotHolder() {
- @Override
- public String getConfigSnapshot() {
- return Mockito.mock(String.class);
- }
-
- @Override
- public SortedSet<String> getCapabilities() {
- return new TreeSet<>();
- }
- } );
+ try (XmlFileStorageAdapter storage = new XmlFileStorageAdapter()) {
+ storage.persistConfig(new ConfigSnapshotHolder() {
+ @Override
+ public String getConfigSnapshot() {
+ return mock(String.class);
+ }
+
+ @Override
+ public SortedSet<String> getCapabilities() {
+ return new TreeSet<>();
+ }
+ });
+ }
}
static String createConfig() {
Code Review / controller.git / blobdiff