public class DirectoryStorageAdapterTest {
Persister tested;
+ private Persister instantiatePersisterFromAdapter(File file){
+ PropertiesProviderTest pp = new PropertiesProviderTest();
+ pp.addProperty("directoryStorage",file.getPath());
+ DirectoryStorageAdapter dsa = new DirectoryStorageAdapter();
+ return dsa.instantiate(pp);
+ }
@Test
public void testEmptyDirectory() throws Exception {
File folder = new File("target/emptyFolder");
folder.mkdir();
- PropertiesProviderTest pp = new PropertiesProviderTest();
- pp.addProperty("directoryStorage",folder.getPath());
- DirectoryStorageAdapter dsa = new DirectoryStorageAdapter();
- tested = dsa.instantiate(pp);
+ tested = instantiatePersisterFromAdapter(folder);
assertEquals(Collections.<ConfigSnapshotHolder>emptyList(), tested.loadLastConfigs());
try {
@Test
public void testOneFile() throws Exception {
File folder = getFolder("oneFile");
- PropertiesProviderTest pp = new PropertiesProviderTest();
- pp.addProperty("directoryStorage",folder.getPath());
- DirectoryStorageAdapter dsa = new DirectoryStorageAdapter();
- tested = dsa.instantiate(pp);
+
+ tested = instantiatePersisterFromAdapter(folder);
List<ConfigSnapshotHolder> results = tested.loadLastConfigs();
assertEquals(1, results.size());
@Test
public void testTwoFiles() throws Exception {
File folder = getFolder("twoFiles");
- PropertiesProviderTest pp = new PropertiesProviderTest();
- pp.addProperty("directoryStorage",folder.getPath());
- DirectoryStorageAdapter dsa = new DirectoryStorageAdapter();
- tested = dsa.instantiate(pp);
+ tested = instantiatePersisterFromAdapter(folder);
List<ConfigSnapshotHolder> results = tested.loadLastConfigs();
assertEquals(2, results.size());
private void assertSnapshot(ConfigSnapshotHolder result, String directory) throws Exception {
SortedSet<String> expectedCapabilities = new TreeSet<>(IOUtils.readLines(getClass().getResourceAsStream("/" + directory + "/expectedCapabilities.txt")));
String expectedSnapshot = IOUtils.toString(getClass().getResourceAsStream("/" + directory + "/expectedSnapshot.xml"));
+ expectedSnapshot = expectedSnapshot.replaceAll("\r","");
+ String _snapshot = result.getConfigSnapshot();
+ _snapshot = _snapshot.replaceAll("\r","");
assertEquals(expectedCapabilities, result.getCapabilities());
- assertEquals(expectedSnapshot, result.getConfigSnapshot());
+ assertEquals(expectedSnapshot, _snapshot);
}
}