From 27c2121a170480c1be080c9f9487d067033e1eb3 Mon Sep 17 00:00:00 2001 From: Michal Polkorab Date: Fri, 7 Mar 2014 11:13:00 +0100 Subject: [PATCH] Fixed whitespace dependent tests in config-persister-directory-adapter Change-Id: I487011b2628d1b229d72fce19a37425c6a109a64 Signed-off-by: Michal Polkorab --- .../storage/directory/DirectoryStorageAdapterTest.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/opendaylight/config/config-persister-directory-adapter/src/test/java/org/opendaylight/controller/config/persist/storage/directory/DirectoryStorageAdapterTest.java b/opendaylight/config/config-persister-directory-adapter/src/test/java/org/opendaylight/controller/config/persist/storage/directory/DirectoryStorageAdapterTest.java index 3ae29062ed..278d0d2456 100644 --- a/opendaylight/config/config-persister-directory-adapter/src/test/java/org/opendaylight/controller/config/persist/storage/directory/DirectoryStorageAdapterTest.java +++ b/opendaylight/config/config-persister-directory-adapter/src/test/java/org/opendaylight/controller/config/persist/storage/directory/DirectoryStorageAdapterTest.java @@ -91,8 +91,11 @@ public class DirectoryStorageAdapterTest { private void assertSnapshot(ConfigSnapshotHolder result, String directory) throws Exception { SortedSet 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); } } -- 2.36.6