From 0a2c6d311412a23647a9e5a591e5ce02e940bcc8 Mon Sep 17 00:00:00 2001 From: Martin Bobak Date: Thu, 16 Jan 2014 09:27:48 +0100 Subject: [PATCH] increased test coverage Change-Id: Ie7e465ad4843aa504e7e4c9455ed4b82b73f56b9 Signed-off-by: Martin Bobak --- .../DirectoryStorageAdapterTest.java | 22 +++++++++---------- .../pom.xml | 6 +++++ .../AutodetectDirectoryPersisterTest.java | 16 +++++++++----- .../xml/DirectoryStorageAdapterTest.java | 19 ++++++++++++---- 4 files changed, 41 insertions(+), 22 deletions(-) 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 72bd208ff3..3ae29062ed 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 @@ -25,15 +25,18 @@ import static org.junit.Assert.fail; 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.emptyList(), tested.loadLastConfigs()); try { @@ -64,10 +67,8 @@ public class DirectoryStorageAdapterTest { @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 results = tested.loadLastConfigs(); assertEquals(1, results.size()); @@ -79,10 +80,7 @@ public class DirectoryStorageAdapterTest { @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 results = tested.loadLastConfigs(); assertEquals(2, results.size()); diff --git a/opendaylight/config/config-persister-directory-autodetect-adapter/pom.xml b/opendaylight/config/config-persister-directory-autodetect-adapter/pom.xml index 0ec7726e3a..a54482726d 100644 --- a/opendaylight/config/config-persister-directory-autodetect-adapter/pom.xml +++ b/opendaylight/config/config-persister-directory-autodetect-adapter/pom.xml @@ -53,6 +53,12 @@ mockito-configuration test + + ${project.groupId} + config-persister-api + test-jar + test + diff --git a/opendaylight/config/config-persister-directory-autodetect-adapter/src/test/java/org/opendaylight/controller/config/persist/storage/directory/autodetect/AutodetectDirectoryPersisterTest.java b/opendaylight/config/config-persister-directory-autodetect-adapter/src/test/java/org/opendaylight/controller/config/persist/storage/directory/autodetect/AutodetectDirectoryPersisterTest.java index 7e423914c2..f833460766 100644 --- a/opendaylight/config/config-persister-directory-autodetect-adapter/src/test/java/org/opendaylight/controller/config/persist/storage/directory/autodetect/AutodetectDirectoryPersisterTest.java +++ b/opendaylight/config/config-persister-directory-autodetect-adapter/src/test/java/org/opendaylight/controller/config/persist/storage/directory/autodetect/AutodetectDirectoryPersisterTest.java @@ -7,21 +7,26 @@ */ package org.opendaylight.controller.config.persist.storage.directory.autodetect; +import java.io.File; +import java.util.List; import junit.framework.Assert; import org.junit.Test; import org.junit.matchers.JUnitMatchers; import org.opendaylight.controller.config.persist.api.ConfigSnapshotHolder; - -import java.io.File; -import java.util.List; +import org.opendaylight.controller.config.persist.test.PropertiesProviderTest; public class AutodetectDirectoryPersisterTest { @Test public void testCombined() throws Exception { File resourcePath = FileTypeTest.getResourceAsFile("/combined/1controller.txt.config"); + File parentFile = resourcePath.getParentFile(); + + AutodetectDirectoryStorageAdapter adapter = new AutodetectDirectoryStorageAdapter(); - AutodetectDirectoryPersister persister = new AutodetectDirectoryPersister(resourcePath.getParentFile()); + PropertiesProviderTest pp = new PropertiesProviderTest(); + pp.addProperty("directoryStorage",parentFile.getPath()); + AutodetectDirectoryPersister persister = (AutodetectDirectoryPersister) adapter.instantiate(pp); List configs = persister.loadLastConfigs(); Assert.assertEquals(2, configs.size()); @@ -32,6 +37,5 @@ public class AutodetectDirectoryPersisterTest { String snapFromXml = configs.get(1).getConfigSnapshot(); org.junit.Assert.assertThat(snapFromXml, JUnitMatchers.containsString("xml")); - Assert.assertEquals(configs.get(0).getCapabilities(), configs.get(1).getCapabilities()); - } + Assert.assertEquals(configs.get(0).getCapabilities(), configs.get(1).getCapabilities()); } } diff --git a/opendaylight/config/config-persister-directory-xml-adapter/src/test/java/org/opendaylight/controller/config/persist/storage/directory/xml/DirectoryStorageAdapterTest.java b/opendaylight/config/config-persister-directory-xml-adapter/src/test/java/org/opendaylight/controller/config/persist/storage/directory/xml/DirectoryStorageAdapterTest.java index 825eb946c8..8e34bc7990 100644 --- a/opendaylight/config/config-persister-directory-xml-adapter/src/test/java/org/opendaylight/controller/config/persist/storage/directory/xml/DirectoryStorageAdapterTest.java +++ b/opendaylight/config/config-persister-directory-xml-adapter/src/test/java/org/opendaylight/controller/config/persist/storage/directory/xml/DirectoryStorageAdapterTest.java @@ -14,6 +14,8 @@ import java.util.List; import java.util.SortedSet; import org.junit.Test; import org.opendaylight.controller.config.persist.api.ConfigSnapshotHolder; +import org.opendaylight.controller.config.persist.api.Persister; +import org.opendaylight.controller.config.persist.test.PropertiesProviderTest; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import static org.junit.Assert.assertEquals; @@ -21,14 +23,22 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; public class DirectoryStorageAdapterTest { - XmlDirectoryPersister tested; + Persister tested; Logger logger = LoggerFactory.getLogger(DirectoryStorageAdapterTest.class.toString()); + private Persister instantiatePersisterFromAdapter(File file){ + PropertiesProviderTest pp = new PropertiesProviderTest(); + pp.addProperty("directoryStorage",file.getPath()); + XmlDirectoryStorageAdapter dsa = new XmlDirectoryStorageAdapter(); + return dsa.instantiate(pp); + } + @Test public void testEmptyDirectory() throws Exception { File folder = new File("target/emptyFolder"); folder.mkdir(); - tested = new XmlDirectoryPersister((folder)); + + tested = instantiatePersisterFromAdapter(folder); assertEquals(Collections.emptyList(), tested.loadLastConfigs()); try { @@ -59,7 +69,8 @@ public class DirectoryStorageAdapterTest { @Test public void testOneFile() throws Exception { File folder = getFolder("oneFile"); - tested = new XmlDirectoryPersister(folder); + tested = instantiatePersisterFromAdapter(folder); + logger.info("Testing : "+tested.toString()); List results = tested.loadLastConfigs(); assertEquals(1, results.size()); @@ -78,7 +89,7 @@ public class DirectoryStorageAdapterTest { @Test public void testTwoFiles() throws Exception { File folder = getFolder("twoFiles"); - tested = new XmlDirectoryPersister((folder)); + tested = instantiatePersisterFromAdapter(folder); logger.info("Testing : "+tested.toString()); List results = tested.loadLastConfigs(); assertEquals(2, results.size()); -- 2.36.6