Repository: incubator-tamaya-extensions Updated Branches: refs/heads/master b9299af45 -> a35fb2a0b
TAMAYA-207: Fixed endless loop in readConfigurationData. Added tests. Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/commit/a35fb2a0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/a35fb2a0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/a35fb2a0 Branch: refs/heads/master Commit: a35fb2a0b5b0eea67340bfcfc5850fbbe8ca7df3 Parents: b9299af Author: anatole <anat...@apache.org> Authored: Tue Dec 20 00:24:48 2016 +0100 Committer: anatole <anat...@apache.org> Committed: Tue Dec 20 00:24:48 2016 +0100 ---------------------------------------------------------------------- .../tamaya/format/ConfigurationFormats.java | 2 +- .../tamaya/format/ConfigurationFormatsTest.java | 75 ++++++++++++++++++-- 2 files changed, 71 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/a35fb2a0/modules/formats/base/src/main/java/org/apache/tamaya/format/ConfigurationFormats.java ---------------------------------------------------------------------- diff --git a/modules/formats/base/src/main/java/org/apache/tamaya/format/ConfigurationFormats.java b/modules/formats/base/src/main/java/org/apache/tamaya/format/ConfigurationFormats.java index 4624538..5b2d819 100644 --- a/modules/formats/base/src/main/java/org/apache/tamaya/format/ConfigurationFormats.java +++ b/modules/formats/base/src/main/java/org/apache/tamaya/format/ConfigurationFormats.java @@ -146,7 +146,7 @@ public final class ConfigurationFormats { * given formats. */ public static Collection<ConfigurationData> readConfigurationData(Collection<URL> urls, ConfigurationFormat... formats) { - return readConfigurationData(urls, formats); + return readConfigurationData(urls, Arrays.asList(formats)); } /** http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/a35fb2a0/modules/formats/base/src/test/java/org/apache/tamaya/format/ConfigurationFormatsTest.java ---------------------------------------------------------------------- diff --git a/modules/formats/base/src/test/java/org/apache/tamaya/format/ConfigurationFormatsTest.java b/modules/formats/base/src/test/java/org/apache/tamaya/format/ConfigurationFormatsTest.java index 0839714..7d42dfb 100644 --- a/modules/formats/base/src/test/java/org/apache/tamaya/format/ConfigurationFormatsTest.java +++ b/modules/formats/base/src/test/java/org/apache/tamaya/format/ConfigurationFormatsTest.java @@ -18,10 +18,14 @@ */ package org.apache.tamaya.format; +import java.net.URL; +import java.util.ArrayList; +import java.util.Collection; import java.util.List; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; /** * Tests for {@link org.apache.tamaya.format.ConfigurationFormats}. @@ -43,24 +47,85 @@ public class ConfigurationFormatsTest { formats = ConfigurationFormats.getFormats(getClass().getResource("/Test.properties")); assertNotNull(formats); assertEquals(formats.size(), 1); -// formats = ConfigurationFormats.getFormats(getClass().getResource("/Test.xml")); -// assertNotNull(formats); -// assertEquals(formats.size(), 1); } @org.junit.Test public void testReadConfigurationData_URL() throws Exception { - ConfigurationData data = ConfigurationFormats.readConfigurationData(getClass().getResource("/Test.ini")); + ConfigurationData data = ConfigurationFormats.readConfigurationData( + getClass().getResource("/Test.ini")); assertNotNull(data); data = ConfigurationFormats.readConfigurationData(getClass().getResource("/Test.properties")); assertNotNull(data); } @org.junit.Test + public void testReadConfigurationData_URL_ConfiguratonFormat() throws Exception { + ConfigurationData data = ConfigurationFormats.readConfigurationData( + getClass().getResource("/Test.ini"), + ConfigurationFormats.getFormats("ini")); + assertNotNull(data); + } + + @org.junit.Test + public void testReadConfigurationData_URL_CollectionOfConfiguratonFormat() throws Exception { + List<ConfigurationFormat> formats = new ArrayList<>(); + formats.add(ConfigurationFormats.getFormats("ini").get(0)); + ConfigurationData data = ConfigurationFormats.readConfigurationData( + getClass().getResource("/Test.ini"), + formats); + assertNotNull(data); + } + + @org.junit.Test + public void testReadConfigurationData_CollectionOfURL_CollectionOfConfiguratonFormat() throws Exception { + List<URL> urls = new ArrayList<>(); + urls.add(getClass().getResource("/Test.ini")); + List<ConfigurationFormat> formats = new ArrayList<>(); + formats.add(ConfigurationFormats.getFormats("ini").get(0)); + Collection<ConfigurationData> data = ConfigurationFormats.readConfigurationData( + urls, + formats); + assertNotNull(data); + assertTrue(data.size()==1); + } + + @org.junit.Test + public void testReadConfigurationData_CollectionOfURL_ConfiguratonFormat() throws Exception { + List<URL> urls = new ArrayList<>(); + urls.add(getClass().getResource("/Test.ini")); + Collection<ConfigurationData> data = ConfigurationFormats.readConfigurationData( + urls, + ConfigurationFormats.getFormats("ini").get(0)); + assertNotNull(data); + assertTrue(data.size()==1); + } + + @org.junit.Test + public void testReadConfigurationData_String_InputStream_ConfiguratonFormat() throws Exception { + ConfigurationData data = ConfigurationFormats.readConfigurationData( + "Test.ini", + getClass().getResource("/Test.ini").openStream(), + ConfigurationFormats.getFormats("ini")); + assertNotNull(data); + } + + @org.junit.Test + public void testReadConfigurationData_String_InputStream_CollectionOfConfiguratonFormat() throws Exception { + List<ConfigurationFormat> formats = new ArrayList<>(); + formats.add(ConfigurationFormats.getFormats("ini").get(0)); + ConfigurationData data = ConfigurationFormats.readConfigurationData( + "Test.ini", + getClass().getResource("/Test.ini").openStream(), + formats); + assertNotNull(data); + } + + @org.junit.Test public void testReadConfigurationData2() throws Exception { List<ConfigurationFormat> formats = ConfigurationFormats.getFormats(); - ConfigurationData data = ConfigurationFormats.readConfigurationData(getClass().getResource("/Test.ini"), + ConfigurationData data = ConfigurationFormats.readConfigurationData( + getClass().getResource("/Test.ini"), formats.toArray(new ConfigurationFormat[formats.size()])); assertNotNull(data); System.out.println(data);
