Author: davidb Date: Wed Jun 29 14:00:00 2016 New Revision: 1750643 URL: http://svn.apache.org/viewvc?rev=1750643&view=rev Log: Felix Configurator: uncomment tests that utilize converter.
The issue with the converter has been fixed. Modified: felix/sandbox/cziegeler/configurator/src/test/java/org/apache/felix/configurator/impl/TypeConverterTest.java Modified: felix/sandbox/cziegeler/configurator/src/test/java/org/apache/felix/configurator/impl/TypeConverterTest.java URL: http://svn.apache.org/viewvc/felix/sandbox/cziegeler/configurator/src/test/java/org/apache/felix/configurator/impl/TypeConverterTest.java?rev=1750643&r1=1750642&r2=1750643&view=diff ============================================================================== --- felix/sandbox/cziegeler/configurator/src/test/java/org/apache/felix/configurator/impl/TypeConverterTest.java (original) +++ felix/sandbox/cziegeler/configurator/src/test/java/org/apache/felix/configurator/impl/TypeConverterTest.java Wed Jun 29 14:00:00 2016 @@ -18,10 +18,6 @@ */ package org.apache.felix.configurator.impl; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; - import java.io.IOException; import java.lang.reflect.Array; import java.util.Collection; @@ -31,6 +27,10 @@ import org.apache.felix.configurator.imp import org.apache.felix.configurator.impl.yaml.YAMLUtilTest; import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + public class TypeConverterTest { @Test public void testStringConversionNoTypeInfo() throws IOException { @@ -233,27 +233,22 @@ public class TypeConverterTest { assertTrue(((Collection<Integer>)converter.convert(properties.get("number.array"), null, "Collection<Integer>")).iterator().next() instanceof Integer); assertTrue(converter.convert(properties.get("number.array"), null, "Collection<Long>") instanceof Collection<?>); - // TODO the following check is currently failing due to a bug in the converter -// assertTrue(((Collection<Long>)converter.convert(properties.get("number.array"), null, "Collection<Long>")).iterator().next() instanceof Long); + assertTrue(((Collection<Long>)converter.convert(properties.get("number.array"), null, "Collection<Long>")).iterator().next() instanceof Long); assertTrue(converter.convert(properties.get("float.array"), null, "Collection<Float>") instanceof Collection<?>); - // TODO the following check is currently failing due to a bug in the converter -// assertTrue(((Collection<Float>)converter.convert(properties.get("float.array"), null, "Collection<Float>")).iterator().next() instanceof Float); + assertTrue(((Collection<Float>)converter.convert(properties.get("float.array"), null, "Collection<Float>")).iterator().next() instanceof Float); assertTrue(converter.convert(properties.get("float.array"), null, "Collection<Double>") instanceof Collection<?>); assertTrue(((Collection<Double>)converter.convert(properties.get("float.array"), null, "Collection<Double>")).iterator().next() instanceof Double); assertTrue(converter.convert(properties.get("number.array"), null, "Collection<Short>") instanceof Collection<?>); - // TODO the following check is currently failing due to a bug in the converter -// assertTrue(((Collection<Short>)converter.convert(properties.get("number.array"), null, "Collection<Short>")).iterator().next() instanceof Short); + assertTrue(((Collection<Short>)converter.convert(properties.get("number.array"), null, "Collection<Short>")).iterator().next() instanceof Short); assertTrue(converter.convert(properties.get("number.array"), null, "Collection<Byte>") instanceof Collection<?>); - // TODO the following check is currently failing due to a bug in the converter -// assertTrue(((Collection<Byte>)converter.convert(properties.get("number.array"), null, "Collection<Byte>")).iterator().next() instanceof Byte); + assertTrue(((Collection<Byte>)converter.convert(properties.get("number.array"), null, "Collection<Byte>")).iterator().next() instanceof Byte); assertTrue(converter.convert(properties.get("string.array"), null, "Collection<Character>") instanceof Collection<?>); - // TODO the following check is currently failing due to a bug in the converter -// assertTrue(((Collection<Character>)converter.convert(properties.get("string.array"), null, "Collection<Character>")).iterator().next() instanceof Character); + assertTrue(((Collection<Character>)converter.convert(properties.get("string.array"), null, "Collection<Character>")).iterator().next() instanceof Character); assertTrue(converter.convert(properties.get("boolean.array"), null, "Collection<Boolean>") instanceof Collection<?>); assertTrue(((Collection<Boolean>)converter.convert(properties.get("boolean.array"), null, "Collection<Boolean>")).iterator().next() instanceof Boolean);