X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fconfig%2Fconfig-persister-directory-xml-adapter%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fconfig%2Fpersist%2Fstorage%2Fdirectory%2Fxml%2FDirectoryStorageAdapterTest.java;h=1142e060aaa0ae19e736098750b1615dcfc37cbf;hp=11c7e1253a18226a374b5c079130adcc23db92c6;hb=451ac09a6c84ea1e438ee1221470e629725379fc;hpb=5448d6812e386bd56aec7209c4852c586a6163b3

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 11c7e1253a..1142e060aa 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
@@ -12,12 +12,15 @@ import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
+
 import com.google.common.base.Optional;
+
 import java.io.File;
 import java.io.IOException;
 import java.util.Collections;
 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;
@@ -30,10 +33,10 @@ public class DirectoryStorageAdapterTest {
     private static final Logger LOG = LoggerFactory.getLogger(DirectoryStorageAdapterTest.class);
     Persister tested;
 
-    private Persister instantiatePersisterFromAdapter(final File file, final Optional<String> extensions){
+    private Persister instantiatePersisterFromAdapter(final File file, final Optional<String> extensions) {
         PropertiesProviderTest pp = new PropertiesProviderTest();
-        pp.addProperty(XmlDirectoryStorageAdapter.DIRECTORY_STORAGE_PROP,file.getPath());
-        if(extensions.isPresent()) {
+        pp.addProperty(XmlDirectoryStorageAdapter.DIRECTORY_STORAGE_PROP, file.getPath());
+        if (extensions.isPresent()) {
             pp.addProperty(XmlDirectoryStorageAdapter.INCLUDE_EXT_PROP, extensions.get());
         }
 
@@ -41,7 +44,7 @@ public class DirectoryStorageAdapterTest {
         return dsa.instantiate(pp);
     }
 
-    private Persister instantiatePersisterFromAdapter(final File file){
+    private Persister instantiatePersisterFromAdapter(final File file) {
         return instantiatePersisterFromAdapter(file, Optional.<String>absent());
     }
 
@@ -66,14 +69,13 @@ public class DirectoryStorageAdapterTest {
                 }
             });
             fail();
-        } catch (UnsupportedOperationException e) {
-
+        } catch (final UnsupportedOperationException e) {
+            // TODO: empty catch block
         }
     }
 
     private File getFolder(final String folderName) {
-        File result = new File(("src/test/resources/" +
-                folderName).replace("/", File.separator));
+        File result = new File(("src/test/resources/" + folderName).replace("/", File.separator));
         assertTrue(result + " is not a directory", result.isDirectory());
         return result;
     }
@@ -97,11 +99,13 @@ public class DirectoryStorageAdapterTest {
         LOG.info("Testing : {}", tested);
     }
 
-    private void assertResult(final ConfigSnapshotHolder result, final String s, final String... caps) throws SAXException, IOException {
-        assertXMLEqual(s, result.getConfigSnapshot());
-        int i = 0;
+    private void assertResult(final ConfigSnapshotHolder result,
+                              final String string,
+                              final String... caps) throws SAXException, IOException {
+        assertXMLEqual(string, result.getConfigSnapshot());
+        int index = 0;
         for (String capFromSnapshot : result.getCapabilities()) {
-            assertEquals(capFromSnapshot, caps[i++]);
+            assertEquals(capFromSnapshot, caps[index++]);
         }
     }