From be795a61f0ab9c421de2a75427e90db9378dcc22 Mon Sep 17 00:00:00 2001 From: Tomas Olvecky Date: Mon, 2 Dec 2013 13:11:17 +0100 Subject: [PATCH] Fix static state in PersisterAggregatorTest causing test failures depending on order in which tests are run. Change-Id: I4e8d027a7260bf8d21c351ccf4627050b8072c4e Signed-off-by: Tomas Olvecky --- .../configuration/current/controller.config.2.txt | 0 .../netconf/persist/impl/PersisterAggregatorTest.java | 10 ++++++---- .../src/test/resources/test1.properties | 2 +- .../src/test/resources/test2.properties | 6 +++--- .../src/test/resources/test3.properties | 4 ++-- 5 files changed, 12 insertions(+), 10 deletions(-) delete mode 100644 opendaylight/netconf/config-persister-impl/configuration/current/controller.config.2.txt diff --git a/opendaylight/netconf/config-persister-impl/configuration/current/controller.config.2.txt b/opendaylight/netconf/config-persister-impl/configuration/current/controller.config.2.txt deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/opendaylight/netconf/config-persister-impl/src/test/java/org/opendaylight/controller/netconf/persist/impl/PersisterAggregatorTest.java b/opendaylight/netconf/config-persister-impl/src/test/java/org/opendaylight/controller/netconf/persist/impl/PersisterAggregatorTest.java index 7141bc27d3..d9fa7ba4d8 100644 --- a/opendaylight/netconf/config-persister-impl/src/test/java/org/opendaylight/controller/netconf/persist/impl/PersisterAggregatorTest.java +++ b/opendaylight/netconf/config-persister-impl/src/test/java/org/opendaylight/controller/netconf/persist/impl/PersisterAggregatorTest.java @@ -36,19 +36,21 @@ public class PersisterAggregatorTest { static class TestingPropertiesProvider extends PropertiesProviderBaseImpl { - private static Properties prop = new Properties(); + private final Properties prop; - public TestingPropertiesProvider() { + public TestingPropertiesProvider(Properties prop) { super(null); + this.prop = prop; } public static TestingPropertiesProvider loadFile(String fileName) { + Properties prop = new Properties(); try { prop.load(TestingPropertiesProvider.class.getClassLoader().getResourceAsStream(fileName)); } catch (IOException e) { throw new RuntimeException(e); } - return new TestingPropertiesProvider(); + return new TestingPropertiesProvider(prop); } @Override @@ -73,7 +75,7 @@ public class PersisterAggregatorTest { List persisters = persisterAggregator.getPersisterWithConfigurations(); assertEquals(1, persisters.size()); PersisterWithConfiguration persister = persisters.get(0); - assertEquals(DummyAdapter.class.getName() ,persister.getStorage().getClass().getName()); + assertEquals(DummyAdapter.class.getName(), persister.getStorage().getClass().getName()); assertFalse(persister.isReadOnly()); persisterAggregator.persistConfig(null); diff --git a/opendaylight/netconf/config-persister-impl/src/test/resources/test1.properties b/opendaylight/netconf/config-persister-impl/src/test/resources/test1.properties index 93800401d7..851c5996d3 100644 --- a/opendaylight/netconf/config-persister-impl/src/test/resources/test1.properties +++ b/opendaylight/netconf/config-persister-impl/src/test/resources/test1.properties @@ -1,3 +1,3 @@ netconf.config.persister.active=1 netconf.config.persister.1.storageAdapterClass=org.opendaylight.controller.netconf.persist.impl.DummyAdapter -netconf.config.persister.1.properties.fileStorage=configuration/initial/ \ No newline at end of file +netconf.config.persister.1.properties.fileStorage=target/configuration/initial/ diff --git a/opendaylight/netconf/config-persister-impl/src/test/resources/test2.properties b/opendaylight/netconf/config-persister-impl/src/test/resources/test2.properties index bdf2caaf02..222e7cef47 100644 --- a/opendaylight/netconf/config-persister-impl/src/test/resources/test2.properties +++ b/opendaylight/netconf/config-persister-impl/src/test/resources/test2.properties @@ -1,9 +1,9 @@ netconf.config.persister.active=2 # read startup configuration netconf.config.persister.1.storageAdapterClass=org.opendaylight.controller.config.persist.storage.directory.DirectoryStorageAdapter -netconf.config.persister.1.properties.directoryStorage=configuration/initial/ +netconf.config.persister.1.properties.directoryStorage=target/configuration/initial/ netconf.config.persister.1.readonly=true netconf.config.persister.2.storageAdapterClass=org.opendaylight.controller.config.persist.storage.file.FileStorageAdapter -netconf.config.persister.2.properties.fileStorage=configuration/current/controller.config.2.txt -netconf.config.persister.2.properties.numberOfBackups=3 \ No newline at end of file +netconf.config.persister.2.properties.fileStorage=target/configuration/current/controller.config.2.txt +netconf.config.persister.2.properties.numberOfBackups=3 diff --git a/opendaylight/netconf/config-persister-impl/src/test/resources/test3.properties b/opendaylight/netconf/config-persister-impl/src/test/resources/test3.properties index c6716cea6a..a1645ad8c4 100644 --- a/opendaylight/netconf/config-persister-impl/src/test/resources/test3.properties +++ b/opendaylight/netconf/config-persister-impl/src/test/resources/test3.properties @@ -1,4 +1,4 @@ netconf.config.persister.active=3 netconf.config.persister.3.storageAdapterClass=org.opendaylight.controller.config.persist.storage.file.FileStorageAdapter -netconf.config.persister.3.properties.fileStorage=configuration/current/controller.config.2.txt -netconf.config.persister.3.properties.numberOfBackups=0 \ No newline at end of file +netconf.config.persister.3.properties.fileStorage=target/configuration/current/controller.config.2.txt +netconf.config.persister.3.properties.numberOfBackups=0 -- 2.36.6