http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/9bc56a38/code/core/src/test/java/org/apache/tamaya/core/internal/converters/BooleanConverterTest.java ---------------------------------------------------------------------- diff --git a/code/core/src/test/java/org/apache/tamaya/core/internal/converters/BooleanConverterTest.java b/code/core/src/test/java/org/apache/tamaya/core/internal/converters/BooleanConverterTest.java index 46c1e58..7b3d520 100644 --- a/code/core/src/test/java/org/apache/tamaya/core/internal/converters/BooleanConverterTest.java +++ b/code/core/src/test/java/org/apache/tamaya/core/internal/converters/BooleanConverterTest.java @@ -23,10 +23,13 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; -import org.apache.tamaya.Configuration; -import org.apache.tamaya.ConfigurationProvider; + + import org.junit.Test; +import javax.config.Config; +import javax.config.ConfigProvider; + /** * Tests the default converter for bytes. */ @@ -39,35 +42,35 @@ public class BooleanConverterTest { */ @Test public void testConvert_BooleanTrue() throws Exception { - Configuration config = ConfigurationProvider.getConfiguration(); - Boolean valueRead = config.get("tests.converter.boolean.y1", Boolean.class); + Config config = ConfigProvider.getConfig(); + Boolean valueRead = config.getValue("tests.converter.boolean.y1", Boolean.class); assertNotNull(valueRead); assertEquals(valueRead, Boolean.TRUE); - valueRead = config.get("tests.converter.boolean.y2", Boolean.class); + valueRead = config.getValue("tests.converter.boolean.y2", Boolean.class); assertNotNull(valueRead); assertEquals(valueRead, Boolean.TRUE); - valueRead = config.get("tests.converter.boolean.yes1", Boolean.class); + valueRead = config.getValue("tests.converter.boolean.yes1", Boolean.class); assertNotNull(valueRead); assertEquals(valueRead, Boolean.TRUE); - valueRead = config.get("tests.converter.boolean.yes2", Boolean.class); + valueRead = config.getValue("tests.converter.boolean.yes2", Boolean.class); assertNotNull(valueRead); assertEquals(valueRead, Boolean.TRUE); - valueRead = config.get("tests.converter.boolean.yes3", Boolean.class); + valueRead = config.getValue("tests.converter.boolean.yes3", Boolean.class); assertNotNull(valueRead); assertEquals(valueRead, Boolean.TRUE); - valueRead = config.get("tests.converter.boolean.true1", Boolean.class); + valueRead = config.getValue("tests.converter.boolean.true1", Boolean.class); assertNotNull(valueRead); assertEquals(valueRead, Boolean.TRUE); - valueRead = config.get("tests.converter.boolean.true2", Boolean.class); + valueRead = config.getValue("tests.converter.boolean.true2", Boolean.class); assertNotNull(valueRead); assertEquals(valueRead, Boolean.TRUE); - valueRead = config.get("tests.converter.boolean.true3", Boolean.class); + valueRead = config.getValue("tests.converter.boolean.true3", Boolean.class); assertNotNull(valueRead); assertEquals(valueRead, Boolean.TRUE); - valueRead = config.get("tests.converter.boolean.t1", Boolean.class); + valueRead = config.getValue("tests.converter.boolean.t1", Boolean.class); assertNotNull(valueRead); assertEquals(valueRead, Boolean.TRUE); - valueRead = config.get("tests.converter.boolean.t2", Boolean.class); + valueRead = config.getValue("tests.converter.boolean.t2", Boolean.class); assertNotNull(valueRead); assertEquals(valueRead, Boolean.TRUE); } @@ -79,40 +82,40 @@ public class BooleanConverterTest { */ @Test public void testConvert_BooleanFalse() throws Exception { - Configuration config = ConfigurationProvider.getConfiguration(); - Boolean valueRead = config.get("tests.converter.boolean.y1", Boolean.class); + Config config = ConfigProvider.getConfig(); + Boolean valueRead = config.getValue("tests.converter.boolean.y1", Boolean.class); assertNotNull(valueRead); - valueRead = config.get("tests.converter.boolean.n1", Boolean.class); + valueRead = config.getValue("tests.converter.boolean.n1", Boolean.class); assertNotNull(valueRead); assertFalse(valueRead); - valueRead = config.get("tests.converter.boolean.n2", Boolean.class); + valueRead = config.getValue("tests.converter.boolean.n2", Boolean.class); assertNotNull(valueRead); assertFalse(valueRead); - valueRead = config.get("tests.converter.boolean.no1", Boolean.class); + valueRead = config.getValue("tests.converter.boolean.no1", Boolean.class); assertFalse(valueRead); assertFalse(valueRead); - valueRead = config.get("tests.converter.boolean.no2", Boolean.class); + valueRead = config.getValue("tests.converter.boolean.no2", Boolean.class); assertNotNull(valueRead); assertFalse(valueRead); - valueRead = config.get("tests.converter.boolean.no3", Boolean.class); + valueRead = config.getValue("tests.converter.boolean.no3", Boolean.class); assertNotNull(valueRead); assertFalse(valueRead); - valueRead = config.get("tests.converter.boolean.false1", Boolean.class); + valueRead = config.getValue("tests.converter.boolean.false1", Boolean.class); assertNotNull(valueRead); assertFalse(valueRead); - valueRead = config.get("tests.converter.boolean.false2", Boolean.class); + valueRead = config.getValue("tests.converter.boolean.false2", Boolean.class); assertNotNull(valueRead); assertFalse(valueRead); - valueRead = config.get("tests.converter.boolean.false3", Boolean.class); + valueRead = config.getValue("tests.converter.boolean.false3", Boolean.class); assertNotNull(valueRead); assertFalse(valueRead); - valueRead = config.get("tests.converter.boolean.f1", Boolean.class); + valueRead = config.getValue("tests.converter.boolean.f1", Boolean.class); assertNotNull(valueRead); assertFalse(valueRead); - valueRead = config.get("tests.converter.boolean.f2", Boolean.class); + valueRead = config.getValue("tests.converter.boolean.f2", Boolean.class); assertNotNull(valueRead); assertFalse(valueRead); - valueRead = config.get("tests.converter.boolean.foo", Boolean.class); + valueRead = config.getValue("tests.converter.boolean.foo", Boolean.class); assertNull(valueRead); } }
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/9bc56a38/code/core/src/test/java/org/apache/tamaya/core/internal/converters/ByteConverterTest.java ---------------------------------------------------------------------- diff --git a/code/core/src/test/java/org/apache/tamaya/core/internal/converters/ByteConverterTest.java b/code/core/src/test/java/org/apache/tamaya/core/internal/converters/ByteConverterTest.java index 3eb48e3..d297b7b 100644 --- a/code/core/src/test/java/org/apache/tamaya/core/internal/converters/ByteConverterTest.java +++ b/code/core/src/test/java/org/apache/tamaya/core/internal/converters/ByteConverterTest.java @@ -18,10 +18,13 @@ */ package org.apache.tamaya.core.internal.converters; -import org.apache.tamaya.Configuration; -import org.apache.tamaya.ConfigurationProvider; + + import org.junit.Test; +import javax.config.Config; +import javax.config.ConfigProvider; + import static org.junit.Assert.*; import static org.assertj.core.api.Assertions.*; /** @@ -36,20 +39,20 @@ public class ByteConverterTest { */ @Test public void testConvert_Byte() throws Exception { - Configuration config = ConfigurationProvider.getConfiguration(); - Byte valueRead = config.get("tests.converter.byte.decimal", Byte.class); + Config config = ConfigProvider.getConfig(); + Byte valueRead = config.getValue("tests.converter.byte.decimal", Byte.class); assertNotNull(valueRead); assertEquals(valueRead.byteValue(), 101); - valueRead = config.get("tests.converter.byte.octal", Byte.class); + valueRead = config.getValue("tests.converter.byte.octal", Byte.class); assertNotNull(valueRead); assertEquals(valueRead.byteValue(), Byte.decode("02").byteValue()); - valueRead = config.get("tests.converter.byte.hex.lowerX", Byte.class); + valueRead = config.getValue("tests.converter.byte.hex.lowerX", Byte.class); assertNotNull(valueRead); assertEquals(valueRead.byteValue(), Byte.decode("0x2F").byteValue()); - valueRead = config.get("tests.converter.byte.hex.upperX", Byte.class); + valueRead = config.getValue("tests.converter.byte.hex.upperX", Byte.class); assertNotNull(valueRead); assertEquals(valueRead.byteValue(), Byte.decode("0X3F").byteValue()); - valueRead = config.get("tests.converter.byte.foo", Byte.class); + valueRead = config.getValue("tests.converter.byte.foo", Byte.class); assertNull(valueRead); } @@ -60,8 +63,8 @@ public class ByteConverterTest { */ @Test public void testConvert_Byte_MinValue() throws Exception { - Configuration config = ConfigurationProvider.getConfiguration(); - Byte valueRead = config.get("tests.converter.byte.min", Byte.class); + Config config = ConfigProvider.getConfig(); + Byte valueRead = config.getValue("tests.converter.byte.min", Byte.class); assertThat(valueRead).isNotNull(); assertEquals(Byte.MIN_VALUE, valueRead.byteValue()); } @@ -73,8 +76,8 @@ public class ByteConverterTest { */ @Test public void testConvert_Byte_MaxValue() throws Exception { - Configuration config = ConfigurationProvider.getConfiguration(); - Byte valueRead = config.get("tests.converter.byte.max", Byte.class); + Config config = ConfigProvider.getConfig(); + Byte valueRead = config.getValue("tests.converter.byte.max", Byte.class); assertThat(valueRead).isNotNull(); assertEquals(Byte.MAX_VALUE, valueRead.byteValue()); } http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/9bc56a38/code/core/src/test/java/org/apache/tamaya/core/internal/converters/CharConverterTest.java ---------------------------------------------------------------------- diff --git a/code/core/src/test/java/org/apache/tamaya/core/internal/converters/CharConverterTest.java b/code/core/src/test/java/org/apache/tamaya/core/internal/converters/CharConverterTest.java index c420fcd..2907e77 100644 --- a/code/core/src/test/java/org/apache/tamaya/core/internal/converters/CharConverterTest.java +++ b/code/core/src/test/java/org/apache/tamaya/core/internal/converters/CharConverterTest.java @@ -18,10 +18,14 @@ */ package org.apache.tamaya.core.internal.converters; -import org.apache.tamaya.Configuration; -import org.apache.tamaya.ConfigurationProvider; + + +import org.apache.tamaya.core.converters.CharConverter; import org.junit.Test; +import javax.config.Config; +import javax.config.ConfigProvider; + import static org.junit.Assert.*; import static org.assertj.core.api.Assertions.*; /** @@ -31,56 +35,56 @@ public class CharConverterTest { @Test public void testConvert_Character() throws Exception { - Configuration config = ConfigurationProvider.getConfiguration(); - Character valueRead = config.get("tests.converter.char.f", Character.class); + Config config = ConfigProvider.getConfig(); + Character valueRead = config.getValue("tests.converter.char.f", Character.class); assertThat(valueRead).isNotNull(); assertEquals(valueRead.charValue(), 'f'); } @Test public void testConvert_Character_Numeric() throws Exception { - Configuration config = ConfigurationProvider.getConfiguration(); - Character valueRead = config.get("tests.converter.char.f-numeric", Character.class); + Config config = ConfigProvider.getConfig(); + Character valueRead = config.getValue("tests.converter.char.f-numeric", Character.class); assertThat(valueRead).isNotNull(); assertEquals(valueRead.charValue(), (char)101); } @Test public void testConvert_Character_Quoted() throws Exception { - Configuration config = ConfigurationProvider.getConfiguration(); - Character valueRead = config.get("tests.converter.char.d", Character.class); + Config config = ConfigProvider.getConfig(); + Character valueRead = config.getValue("tests.converter.char.d", Character.class); assertThat(valueRead).isNotNull(); assertEquals(valueRead.charValue(), 'd'); } @Test public void testConvert_Character_WithWhitespace_Before() throws Exception { - Configuration config = ConfigurationProvider.getConfiguration(); - Character valueRead = config.get("tests.converter.char.f-before", Character.class); + Config config = ConfigProvider.getConfig(); + Character valueRead = config.getValue("tests.converter.char.f-before", Character.class); assertThat(valueRead).isNotNull(); assertEquals(valueRead.charValue(), 'f'); } @Test public void testConvert_Character_WithWhitespace_After() throws Exception { - Configuration config = ConfigurationProvider.getConfiguration(); - Character valueRead = config.get("tests.converter.char.f-after", Character.class); + Config config = ConfigProvider.getConfig(); + Character valueRead = config.getValue("tests.converter.char.f-after", Character.class); assertThat(valueRead).isNotNull(); assertEquals(valueRead.charValue(), 'f'); } @Test public void testConvert_Character_WithWhitespace_Around() throws Exception { - Configuration config = ConfigurationProvider.getConfiguration(); - Character valueRead = config.get("tests.converter.char.f-around", Character.class); + Config config = ConfigProvider.getConfig(); + Character valueRead = config.getValue("tests.converter.char.f-around", Character.class); assertThat(valueRead).isNotNull(); assertEquals(valueRead.charValue(), 'f'); } @Test public void testConvert_NotPresent() throws Exception { - Configuration config = ConfigurationProvider.getConfiguration(); - Character valueRead = config.get("tests.converter.char.foo", Character.class); + Config config = ConfigProvider.getConfig(); + Character valueRead = config.getValue("tests.converter.char.foo", Character.class); assertNull(valueRead); } } http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/9bc56a38/code/core/src/test/java/org/apache/tamaya/core/internal/converters/ClassConverterTest.java ---------------------------------------------------------------------- diff --git a/code/core/src/test/java/org/apache/tamaya/core/internal/converters/ClassConverterTest.java b/code/core/src/test/java/org/apache/tamaya/core/internal/converters/ClassConverterTest.java index 38e150e..933d6ce 100644 --- a/code/core/src/test/java/org/apache/tamaya/core/internal/converters/ClassConverterTest.java +++ b/code/core/src/test/java/org/apache/tamaya/core/internal/converters/ClassConverterTest.java @@ -19,7 +19,8 @@ package org.apache.tamaya.core.internal.converters; import org.apache.tamaya.TypeLiteral; -import org.apache.tamaya.spi.ConversionContext; +import org.apache.tamaya.core.converters.ClassConverter; +import org.apache.tamaya.base.convert.ConversionContext; import org.junit.Test; import java.math.BigDecimal; @@ -31,37 +32,37 @@ import static org.junit.Assert.*; */ public class ClassConverterTest { - ConversionContext context = new ConversionContext.Builder(TypeLiteral.of(Class.class)) + ConversionContext context = new ConversionContext.Builder("<nokey>", Class.class) .build(); @Test public void testConvert_Class() throws Exception { ClassConverter converter = new ClassConverter(); - assertEquals(BigDecimal.class, converter.convert("java.math.BigDecimal", context)); + assertEquals(BigDecimal.class, converter.convert("java.math.BigDecimal")); } @Test public void testConvert_Class_WithSpaces() throws Exception { ClassConverter converter = new ClassConverter(); - assertEquals(BigDecimal.class, converter.convert(" java.math.BigDecimal\t", context)); + assertEquals(BigDecimal.class, converter.convert(" java.math.BigDecimal\t")); } @Test public void testConvert_Class_WithSpacesBefore() throws Exception { ClassConverter converter = new ClassConverter(); - assertEquals(BigDecimal.class, converter.convert(" java.math.BigDecimal", context)); + assertEquals(BigDecimal.class, converter.convert(" java.math.BigDecimal")); } @Test public void testConvert_Class_WithSpacesAfter() throws Exception { ClassConverter converter = new ClassConverter(); - assertEquals(BigDecimal.class, converter.convert("java.math.BigDecimal ", context)); + assertEquals(BigDecimal.class, converter.convert("java.math.BigDecimal ")); } @Test public void testConvert_NotPresent() throws Exception { ClassConverter converter = new ClassConverter(); - assertNull(converter.convert("", context)); - assertNull(converter.convert(null, context)); + assertNull(converter.convert("")); + assertNull(converter.convert(null)); } } http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/9bc56a38/code/core/src/test/java/org/apache/tamaya/core/internal/converters/ConverterTestsPropertySource.java ---------------------------------------------------------------------- diff --git a/code/core/src/test/java/org/apache/tamaya/core/internal/converters/ConverterTestsPropertySource.java b/code/core/src/test/java/org/apache/tamaya/core/internal/converters/ConverterTestsPropertySource.java index d09ed8d..e40ea9f 100644 --- a/code/core/src/test/java/org/apache/tamaya/core/internal/converters/ConverterTestsPropertySource.java +++ b/code/core/src/test/java/org/apache/tamaya/core/internal/converters/ConverterTestsPropertySource.java @@ -18,16 +18,15 @@ */ package org.apache.tamaya.core.internal.converters; -import org.apache.tamaya.spi.PropertySource; -import org.apache.tamaya.spi.PropertyValue; - +import javax.config.spi.ConfigSource; import java.util.Collections; import java.util.Map; +import java.util.Set; /** * Test Property Source used by converter tests. */ -public class ConverterTestsPropertySource implements PropertySource{ +public class ConverterTestsPropertySource implements ConfigSource{ @Override public int getOrdinal() { @@ -40,215 +39,216 @@ public class ConverterTestsPropertySource implements PropertySource{ } @Override - public PropertyValue get(String key) { + public String getValue(String key) { switch(key){ // Bytes case "tests.converter.byte.decimal": - return PropertyValue.of(key, "101", getName()); + return "101"; case "tests.converter.byte.octal": - return PropertyValue.of(key, "02", getName()); + return "02"; case "tests.converter.byte.hex.lowerX": - return PropertyValue.of(key, "0x2F", getName()); + return "0x2F"; case "tests.converter.byte.hex.upperX": - return PropertyValue.of(key, "0X3F", getName()); + return "0X3F"; case "tests.converter.byte.min": - return PropertyValue.of(key, "min", getName()); + return "min"; case "tests.converter.byte.max": - return PropertyValue.of(key, "MAX_Value", getName()); + return "MAX_Value"; // Boolean case "tests.converter.boolean.y1": - return PropertyValue.of(key, "y", getName()); + return "y"; case "tests.converter.boolean.y2": - return PropertyValue.of(key, "Y", getName()); + return "Y"; case "tests.converter.boolean.yes1": - return PropertyValue.of(key, "yes", getName()); + return "yes"; case "tests.converter.boolean.yes2": - return PropertyValue.of(key, "Yes", getName()); + return "Yes"; case "tests.converter.boolean.yes3": - return PropertyValue.of(key, "yeS", getName()); + return "yeS"; case "tests.converter.boolean.true1": - return PropertyValue.of(key, "true", getName()); + return "true"; case "tests.converter.boolean.true2": - return PropertyValue.of(key, "True", getName()); + return "True"; case "tests.converter.boolean.true3": - return PropertyValue.of(key, "trUe", getName()); + return "trUe"; case "tests.converter.boolean.t1": - return PropertyValue.of(key, "t", getName()); + return "t"; case "tests.converter.boolean.t2": - return PropertyValue.of(key, "T", getName()); + return "T"; case "tests.converter.boolean.n1": - return PropertyValue.of(key, "n", getName()); + return "n"; case "tests.converter.boolean.n2": - return PropertyValue.of(key, "N", getName()); + return "N"; case "tests.converter.boolean.no1": - return PropertyValue.of(key, "no", getName()); + return "no"; case "tests.converter.boolean.no2": - return PropertyValue.of(key, "No", getName()); + return "No"; case "tests.converter.boolean.no3": - return PropertyValue.of(key, "nO", getName()); + return "nO"; case "tests.converter.boolean.false1": - return PropertyValue.of(key, "false", getName()); + return "false"; case "tests.converter.boolean.false2": - return PropertyValue.of(key, "False", getName()); + return "False"; case "tests.converter.boolean.false3": - return PropertyValue.of(key, "falSe", getName()); + return "falSe"; case "tests.converter.boolean.f1": - return PropertyValue.of(key, "f", getName()); + return "f"; case "tests.converter.boolean.f2": - return PropertyValue.of(key, "F", getName()); + return "F"; // Character case "tests.converter.char.f": - return PropertyValue.of(key, "f", getName()); + return "f"; case "tests.converter.char.d": - return PropertyValue.of(key, "'d'", getName()); + return "'d'"; case "tests.converter.char.f-before": - return PropertyValue.of(key, " f", getName()); + return " f"; case "tests.converter.char.f-after": - return PropertyValue.of(key, "f ", getName()); + return "f "; case "tests.converter.char.f-around": - return PropertyValue.of(key, " f ", getName()); + return " f "; case "tests.converter.char.f-numeric": - return PropertyValue.of(key, "101", getName()); + return "101"; // currency case "tests.converter.currency.code1": - return PropertyValue.of(key, "CHF", getName()); + return "CHF"; case "tests.converter.currency.code2": - return PropertyValue.of(key, "cHf", getName()); + return "cHf"; case "tests.converter.currency.code3": - return PropertyValue.of(key, " CHF", getName()); + return " CHF"; case "tests.converter.currency.code4": - return PropertyValue.of(key, "CHF ", getName()); + return "CHF "; case "tests.converter.currency.code5": - return PropertyValue.of(key, " CHF ", getName()); + return " CHF "; case "tests.converter.currency.code-numeric1": - return PropertyValue.of(key, "100", getName()); + return "100"; case "tests.converter.currency.code-numeric2": - return PropertyValue.of(key, " 100", getName()); + return " 100"; case "tests.converter.currency.code-numeric3": - return PropertyValue.of(key, "100 ", getName()); + return "100 "; case "tests.converter.currency.code-numeric4": - return PropertyValue.of(key, " 100 ", getName()); + return " 100 "; case "tests.converter.currency.code-locale1": - return PropertyValue.of(key, "DE", getName()); + return "DE"; case "tests.converter.currency.code-locale2": - return PropertyValue.of(key, " DE", getName()); + return " DE"; case "tests.converter.currency.code-locale3": - return PropertyValue.of(key, "DE ", getName()); + return "DE "; case "tests.converter.currency.code-locale4": - return PropertyValue.of(key, " DE ", getName()); + return " DE "; //double case "tests.converter.double.decimal": - return PropertyValue.of(key, "1.23456789", getName()); + return "1.23456789"; case "tests.converter.double.decimalNegative": - return PropertyValue.of(key, "-1.23456789", getName()); + return "-1.23456789"; case "tests.converter.double.integer": - return PropertyValue.of(key, " 100", getName()); + return " 100"; case "tests.converter.double.hex1": - return PropertyValue.of(key, " 0XFF", getName()); + return " 0XFF"; case "tests.converter.double.hex2": - return PropertyValue.of(key, "-0xFF ", getName()); + return "-0xFF "; case "tests.converter.double.hex3": - return PropertyValue.of(key, "#FF", getName()); + return "#FF"; case "tests.converter.double.octal": - return PropertyValue.of(key, "0013", getName()); + return "0013"; case "tests.converter.double.min": - return PropertyValue.of(key, "MIN_Value", getName()); + return "MIN_Value"; case "tests.converter.double.max": - return PropertyValue.of(key, "max", getName()); + return "max"; case "tests.converter.double.nan": - return PropertyValue.of(key, "NAN", getName()); + return "NAN"; case "tests.converter.double.pi": - return PropertyValue.of(key, "positive_infinity", getName()); + return "positive_infinity"; case "tests.converter.double.ni": - return PropertyValue.of(key, "Negative_Infinity", getName()); + return "Negative_Infinity"; //float case "tests.converter.float.decimal": - return PropertyValue.of(key, "1.23456789", getName()); + return "1.23456789"; case "tests.converter.float.decimalNegative": - return PropertyValue.of(key, "-1.23456789", getName()); + return "-1.23456789"; case "tests.converter.float.integer": - return PropertyValue.of(key, " 100", getName()); + return " 100"; case "tests.converter.float.hex1": - return PropertyValue.of(key, " 0XFF", getName()); + return " 0XFF"; case "tests.converter.float.hex2": - return PropertyValue.of(key, "-0xFF ", getName()); + return "-0xFF "; case "tests.converter.float.hex3": - return PropertyValue.of(key, "#FF", getName()); + return "#FF"; case "tests.converter.float.octal": - return PropertyValue.of(key, "0013", getName()); + return "0013"; case "tests.converter.float.min": - return PropertyValue.of(key, "MIN_Value", getName()); + return "MIN_Value"; case "tests.converter.float.max": - return PropertyValue.of(key, "max", getName()); + return "max"; case "tests.converter.float.nan": - return PropertyValue.of(key, "NAN", getName()); + return "NAN"; case "tests.converter.float.pi": - return PropertyValue.of(key, "positive_infinity", getName()); + return "positive_infinity"; case "tests.converter.float.ni": - return PropertyValue.of(key, "Negative_Infinity", getName()); + return "Negative_Infinity"; // Integer case "tests.converter.integer.decimal": - return PropertyValue.of(key, "101", getName()); + return "101"; case "tests.converter.integer.octal": - return PropertyValue.of(key, "02", getName()); + return "02"; case "tests.converter.integer.hex.lowerX": - return PropertyValue.of(key, "0x2F", getName()); + return "0x2F"; case "tests.converter.integer.hex.upperX": - return PropertyValue.of(key, "0X3F", getName()); + return "0X3F"; case "tests.converter.integer.min": - return PropertyValue.of(key, "min", getName()); + return "min"; case "tests.converter.integer.max": - return PropertyValue.of(key, "MAX_Value", getName()); + return "MAX_Value"; // Long case "tests.converter.long.decimal": - return PropertyValue.of(key, "101", getName()); + return "101"; case "tests.converter.long.octal": - return PropertyValue.of(key, "02", getName()); + return "02"; case "tests.converter.long.hex.lowerX": - return PropertyValue.of(key, "0x2F", getName()); + return "0x2F"; case "tests.converter.long.hex.upperX": - return PropertyValue.of(key, "0X3F", getName()); + return "0X3F"; case "tests.converter.long.min": - return PropertyValue.of(key, "min", getName()); + return "min"; case "tests.converter.long.max": - return PropertyValue.of(key, "MAX_Value", getName()); + return "MAX_Value"; // Short case "tests.converter.short.decimal": - return PropertyValue.of(key, "101", getName()); + return "101"; case "tests.converter.short.octal": - return PropertyValue.of(key, "02", getName()); + return "02"; case "tests.converter.short.hex.lowerX": - return PropertyValue.of(key, "0x2F", getName()); + return "0x2F"; case "tests.converter.short.hex.upperX": - return PropertyValue.of(key, "0X3F", getName()); + return "0X3F"; case "tests.converter.short.min": - return PropertyValue.of(key, "min", getName()); + return "min"; case "tests.converter.short.max": - return PropertyValue.of(key, "MAX_Value", getName()); + return "MAX_Value"; // BigDecimal case "tests.converter.bd.decimal": - return PropertyValue.of(key, "101", getName()); + return "101"; case "tests.converter.bd.float": - return PropertyValue.of(key, "101.36438746", getName()); + return "101.36438746"; case "tests.converter.bd.big": - return PropertyValue.of(key, "101666666666666662333337263723628763821638923628193612983618293628763", getName()); + return "101666666666666662333337263723628763821638923628193612983618293628763"; case "tests.converter.bd.bigFloat": - return PropertyValue.of(key, "1016666666666666623333372637236287638216389293628763.101666666666666662333337263723628763821638923628193612983618293628763", getName()); + return "1016666666666666623333372637236287638216389293628763.101666666666666662333337263723628763821638923628193612983618293628763"; case "tests.converter.bd.hex.lowerX": - return PropertyValue.of(key, "0x2F", getName()); + return "0x2F"; case "tests.converter.bd.hex.upperX": - return PropertyValue.of(key, "0X3F", getName()); + return "0X3F"; } return null; } @Override - public Map<String, PropertyValue> getProperties() { + public Map<String, String> getProperties() { return Collections.emptyMap(); } @Override - public boolean isScannable() { - return false; + public Set<String> getPropertyNames() { + return Collections.emptySet(); } + } http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/9bc56a38/code/core/src/test/java/org/apache/tamaya/core/internal/converters/CurrencyConverterTest.java ---------------------------------------------------------------------- diff --git a/code/core/src/test/java/org/apache/tamaya/core/internal/converters/CurrencyConverterTest.java b/code/core/src/test/java/org/apache/tamaya/core/internal/converters/CurrencyConverterTest.java index f17eadd..560925c 100644 --- a/code/core/src/test/java/org/apache/tamaya/core/internal/converters/CurrencyConverterTest.java +++ b/code/core/src/test/java/org/apache/tamaya/core/internal/converters/CurrencyConverterTest.java @@ -18,10 +18,12 @@ */ package org.apache.tamaya.core.internal.converters; -import org.apache.tamaya.Configuration; -import org.apache.tamaya.ConfigurationProvider; + + import org.junit.Test; +import javax.config.Config; +import javax.config.ConfigProvider; import java.util.Currency; import static org.assertj.core.api.Assertions.assertThat; @@ -43,8 +45,8 @@ public class CurrencyConverterTest { */ @Test public void testConvert_Currency_Code_CHF() throws Exception { - Configuration config = ConfigurationProvider.getConfiguration(); - Currency valueRead = config.get("tests.converter.currency.code1", Currency.class); + Config config = ConfigProvider.getConfig(); + Currency valueRead = config.getValue("tests.converter.currency.code1", Currency.class); assertThat(valueRead).isNotNull(); assertEquals(valueRead, Currency.getInstance(CHF)); } @@ -56,8 +58,8 @@ public class CurrencyConverterTest { */ @Test public void testConvert_Currency_Code_CHF1() throws Exception { - Configuration config = ConfigurationProvider.getConfiguration(); - Currency valueRead = config.get("tests.converter.currency.code2", Currency.class); + Config config = ConfigProvider.getConfig(); + Currency valueRead = config.getValue("tests.converter.currency.code2", Currency.class); assertThat(valueRead).isNotNull(); assertEquals(valueRead, Currency.getInstance(CHF)); } @@ -69,8 +71,8 @@ public class CurrencyConverterTest { */ @Test public void testConvert_Currency_Code_CHF_Whitespace_Before() throws Exception { - Configuration config = ConfigurationProvider.getConfiguration(); - Currency valueRead = config.get("tests.converter.currency.code3", Currency.class); + Config config = ConfigProvider.getConfig(); + Currency valueRead = config.getValue("tests.converter.currency.code3", Currency.class); assertThat(valueRead).isNotNull(); assertEquals(Currency.getInstance(CHF), valueRead); } @@ -82,8 +84,8 @@ public class CurrencyConverterTest { */ @Test public void testConvert_Currency_Code_CHF_Whitespace_After() throws Exception { - Configuration config = ConfigurationProvider.getConfiguration(); - Currency valueRead = config.get("tests.converter.currency.code4", Currency.class); + Config config = ConfigProvider.getConfig(); + Currency valueRead = config.getValue("tests.converter.currency.code4", Currency.class); assertThat(valueRead).isNotNull(); assertEquals(Currency.getInstance(CHF), valueRead); } @@ -95,8 +97,8 @@ public class CurrencyConverterTest { */ @Test public void testConvert_Currency_Code_CHF_Whitespace_Around() throws Exception { - Configuration config = ConfigurationProvider.getConfiguration(); - Currency valueRead = config.get("tests.converter.currency.code5", Currency.class); + Config config = ConfigProvider.getConfig(); + Currency valueRead = config.getValue("tests.converter.currency.code5", Currency.class); assertThat(valueRead).isNotNull(); assertEquals(Currency.getInstance(CHF), valueRead); } @@ -108,17 +110,17 @@ public class CurrencyConverterTest { */ @Test public void testConvert_Currency_Code_Numeric() throws Exception { - Configuration config = ConfigurationProvider.getConfiguration(); - Currency valueRead = config.get("tests.converter.currency.code-numeric1", Currency.class); + Config config = ConfigProvider.getConfig(); + Currency valueRead = config.getValue("tests.converter.currency.code-numeric1", Currency.class); assertThat(valueRead).isNotNull(); assertEquals(Currency.getInstance(BGL).getNumericCode(), valueRead.getNumericCode()); - valueRead = config.get("tests.converter.currency.code-numeric2", Currency.class); + valueRead = config.getValue("tests.converter.currency.code-numeric2", Currency.class); assertThat(valueRead).isNotNull(); assertEquals(Currency.getInstance(BGL).getNumericCode(), valueRead.getNumericCode()); - valueRead = config.get("tests.converter.currency.code-numeric3", Currency.class); + valueRead = config.getValue("tests.converter.currency.code-numeric3", Currency.class); assertThat(valueRead).isNotNull(); assertEquals(Currency.getInstance(BGL).getNumericCode(), valueRead.getNumericCode()); - valueRead = config.get("tests.converter.currency.code-numeric4", Currency.class); + valueRead = config.getValue("tests.converter.currency.code-numeric4", Currency.class); assertThat(valueRead).isNotNull(); assertEquals(Currency.getInstance(BGL).getNumericCode(), valueRead.getNumericCode()); } @@ -130,17 +132,17 @@ public class CurrencyConverterTest { */ @Test public void testConvert_Currency_Code_Locale() throws Exception { - Configuration config = ConfigurationProvider.getConfiguration(); - Currency valueRead = config.get("tests.converter.currency.code-locale1", Currency.class); + Config config = ConfigProvider.getConfig(); + Currency valueRead = config.getValue("tests.converter.currency.code-locale1", Currency.class); assertThat(valueRead).isNotNull(); assertEquals(EUR, valueRead.getCurrencyCode()); - valueRead = config.get("tests.converter.currency.code-locale2", Currency.class); + valueRead = config.getValue("tests.converter.currency.code-locale2", Currency.class); assertThat(valueRead).isNotNull(); assertEquals(EUR, valueRead.getCurrencyCode()); - valueRead = config.get("tests.converter.currency.code-locale3", Currency.class); + valueRead = config.getValue("tests.converter.currency.code-locale3", Currency.class); assertThat(valueRead).isNotNull(); assertEquals(EUR, valueRead.getCurrencyCode()); - valueRead = config.get("tests.converter.currency.code-locale4", Currency.class); + valueRead = config.getValue("tests.converter.currency.code-locale4", Currency.class); assertThat(valueRead).isNotNull(); assertEquals(EUR, valueRead.getCurrencyCode()); } @@ -152,8 +154,8 @@ public class CurrencyConverterTest { */ @Test public void testConvert_NotPresent() throws Exception { - Configuration config = ConfigurationProvider.getConfiguration(); - Byte valueRead = config.get("tests.converter.byte.foo", Byte.class); + Config config = ConfigProvider.getConfig(); + Byte valueRead = config.getValue("tests.converter.byte.foo", Byte.class); assertThat(valueRead).isNull(); } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/9bc56a38/code/core/src/test/java/org/apache/tamaya/core/internal/converters/DoubleConverterTest.java ---------------------------------------------------------------------- diff --git a/code/core/src/test/java/org/apache/tamaya/core/internal/converters/DoubleConverterTest.java b/code/core/src/test/java/org/apache/tamaya/core/internal/converters/DoubleConverterTest.java index ee2f33a..7432679 100644 --- a/code/core/src/test/java/org/apache/tamaya/core/internal/converters/DoubleConverterTest.java +++ b/code/core/src/test/java/org/apache/tamaya/core/internal/converters/DoubleConverterTest.java @@ -18,10 +18,13 @@ */ package org.apache.tamaya.core.internal.converters; -import org.apache.tamaya.Configuration; -import org.apache.tamaya.ConfigurationProvider; + + import org.junit.Test; +import javax.config.Config; +import javax.config.ConfigProvider; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -37,8 +40,8 @@ public class DoubleConverterTest { */ @Test public void testConvert_Double_Decimal() throws Exception { - Configuration config = ConfigurationProvider.getConfiguration(); - Double valueRead = config.get("tests.converter.double.decimal", Double.class); + Config config = ConfigProvider.getConfig(); + Double valueRead = config.getValue("tests.converter.double.decimal", Double.class); assertTrue(valueRead!=null); assertEquals(valueRead.doubleValue(), 1.23456789, 0.0d); } @@ -50,8 +53,8 @@ public class DoubleConverterTest { */ @Test public void testConvert_Double_DecimalNegative() throws Exception { - Configuration config = ConfigurationProvider.getConfiguration(); - Double valueRead = config.get("tests.converter.double.decimalNegative", Double.class); + Config config = ConfigProvider.getConfig(); + Double valueRead = config.getValue("tests.converter.double.decimalNegative", Double.class); assertTrue(valueRead!=null); assertEquals(valueRead.doubleValue(), -1.23456789, 0.0d); } @@ -63,8 +66,8 @@ public class DoubleConverterTest { */ @Test public void testConvert_Double_Integer() throws Exception { - Configuration config = ConfigurationProvider.getConfiguration(); - Double valueRead = config.get("tests.converter.double.integer", Double.class); + Config config = ConfigProvider.getConfig(); + Double valueRead = config.getValue("tests.converter.double.integer", Double.class); assertTrue(valueRead!=null); assertEquals(valueRead.doubleValue(),100d, 0.0d); } @@ -76,8 +79,8 @@ public class DoubleConverterTest { */ @Test public void testConvert_Double_Hex1() throws Exception { - Configuration config = ConfigurationProvider.getConfiguration(); - Double valueRead = config.get("tests.converter.double.hex1", Double.class); + Config config = ConfigProvider.getConfig(); + Double valueRead = config.getValue("tests.converter.double.hex1", Double.class); assertTrue(valueRead!=null); assertEquals(valueRead.doubleValue(),255d, 0.0d); } @@ -89,8 +92,8 @@ public class DoubleConverterTest { */ @Test public void testConvert_Double_Hex2() throws Exception { - Configuration config = ConfigurationProvider.getConfiguration(); - Double valueRead = config.get("tests.converter.double.hex2", Double.class); + Config config = ConfigProvider.getConfig(); + Double valueRead = config.getValue("tests.converter.double.hex2", Double.class); assertTrue(valueRead!=null); assertEquals(valueRead.doubleValue(),-255d, 0.0d); } @@ -102,8 +105,8 @@ public class DoubleConverterTest { */ @Test public void testConvert_Double_Hex3() throws Exception { - Configuration config = ConfigurationProvider.getConfiguration(); - Double valueRead = config.get("tests.converter.double.hex3", Double.class); + Config config = ConfigProvider.getConfig(); + Double valueRead = config.getValue("tests.converter.double.hex3", Double.class); assertTrue(valueRead!=null); } @@ -114,8 +117,8 @@ public class DoubleConverterTest { */ @Test public void testConvert_Double_MinValue() throws Exception { - Configuration config = ConfigurationProvider.getConfiguration(); - Double valueRead = config.get("tests.converter.double.min", Double.class); + Config config = ConfigProvider.getConfig(); + Double valueRead = config.getValue("tests.converter.double.min", Double.class); assertTrue(valueRead!=null); assertEquals(Double.MIN_VALUE, valueRead.doubleValue(),0.0d); } @@ -127,8 +130,8 @@ public class DoubleConverterTest { */ @Test public void testConvert_Double_MaxValue() throws Exception { - Configuration config = ConfigurationProvider.getConfiguration(); - Double valueRead = config.get("tests.converter.double.max", Double.class); + Config config = ConfigProvider.getConfig(); + Double valueRead = config.getValue("tests.converter.double.max", Double.class); assertTrue(valueRead!=null); assertEquals(Double.MAX_VALUE, valueRead.doubleValue(),0.0d); } @@ -140,8 +143,8 @@ public class DoubleConverterTest { */ @Test public void testConvert_Double_NaNValue() throws Exception { - Configuration config = ConfigurationProvider.getConfiguration(); - Double valueRead = config.get("tests.converter.double.nan", Double.class); + Config config = ConfigProvider.getConfig(); + Double valueRead = config.getValue("tests.converter.double.nan", Double.class); assertTrue(valueRead!=null); assertEquals(Double.NaN, valueRead.doubleValue(),0.0d); } @@ -153,8 +156,8 @@ public class DoubleConverterTest { */ @Test public void testConvert_Double_PositiveInfinityValue() throws Exception { - Configuration config = ConfigurationProvider.getConfiguration(); - Double valueRead = config.get("tests.converter.double.pi", Double.class); + Config config = ConfigProvider.getConfig(); + Double valueRead = config.getValue("tests.converter.double.pi", Double.class); assertTrue(valueRead!=null); assertEquals(Double.POSITIVE_INFINITY, valueRead.doubleValue(),0.0d); } @@ -166,8 +169,8 @@ public class DoubleConverterTest { */ @Test public void testConvert_Double_NegativeInfinityValue() throws Exception { - Configuration config = ConfigurationProvider.getConfiguration(); - Double valueRead = config.get("tests.converter.double.ni", Double.class); + Config config = ConfigProvider.getConfig(); + Double valueRead = config.getValue("tests.converter.double.ni", Double.class); assertTrue(valueRead!=null); assertEquals(Double.NEGATIVE_INFINITY, valueRead.doubleValue(),0.0d); } http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/9bc56a38/code/core/src/test/java/org/apache/tamaya/core/internal/converters/DurationConverterTest.java ---------------------------------------------------------------------- diff --git a/code/core/src/test/java/org/apache/tamaya/core/internal/converters/DurationConverterTest.java b/code/core/src/test/java/org/apache/tamaya/core/internal/converters/DurationConverterTest.java index 8a37c0f..87cd0cb 100644 --- a/code/core/src/test/java/org/apache/tamaya/core/internal/converters/DurationConverterTest.java +++ b/code/core/src/test/java/org/apache/tamaya/core/internal/converters/DurationConverterTest.java @@ -18,7 +18,8 @@ */ package org.apache.tamaya.core.internal.converters; -import org.apache.tamaya.spi.ConversionContext; +import org.apache.tamaya.core.converters.DurationConverter; +import org.apache.tamaya.base.convert.ConversionContext; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; @@ -54,17 +55,17 @@ public class DurationConverterTest { @Test public void convert() throws Exception { DurationConverter conv = new DurationConverter(); - Duration duration = conv.convert("PT20.345S", context); + Duration duration = conv.convert("PT20.345S"); assertEquals(Duration.parse("PT20.345S"), duration); - duration = conv.convert("PT15M", context); + duration = conv.convert("PT15M"); assertEquals(Duration.parse("PT15M"), duration); - duration = conv.convert("PT10H", context); + duration = conv.convert("PT10H"); assertEquals(Duration.parse("PT10H"), duration); - duration = conv.convert("P2D", context); + duration = conv.convert("P2D"); assertEquals(Duration.parse("P2D"), duration); - duration = conv.convert("P2DT3H4M", context); + duration = conv.convert("P2DT3H4M"); assertEquals(Duration.parse("P2DT3H4M"), duration); - duration = conv.convert("foo", context); + duration = conv.convert("foo"); assertNull(duration); } http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/9bc56a38/code/core/src/test/java/org/apache/tamaya/core/internal/converters/FloatConverterTest.java ---------------------------------------------------------------------- diff --git a/code/core/src/test/java/org/apache/tamaya/core/internal/converters/FloatConverterTest.java b/code/core/src/test/java/org/apache/tamaya/core/internal/converters/FloatConverterTest.java index 98ea720..389849a 100644 --- a/code/core/src/test/java/org/apache/tamaya/core/internal/converters/FloatConverterTest.java +++ b/code/core/src/test/java/org/apache/tamaya/core/internal/converters/FloatConverterTest.java @@ -18,10 +18,13 @@ */ package org.apache.tamaya.core.internal.converters; -import org.apache.tamaya.Configuration; -import org.apache.tamaya.ConfigurationProvider; + + import org.junit.Test; +import javax.config.Config; +import javax.config.ConfigProvider; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -37,8 +40,8 @@ public class FloatConverterTest { */ @Test public void testConvert_Float_Decimal() throws Exception { - Configuration config = ConfigurationProvider.getConfiguration(); - Float valueRead = config.get("tests.converter.float.decimal", Float.class); + Config config = ConfigProvider.getConfig(); + Float valueRead = config.getValue("tests.converter.float.decimal", Float.class); assertTrue(valueRead!=null); assertEquals(valueRead.floatValue(), 1.23456789f, 0.0f); } @@ -50,8 +53,8 @@ public class FloatConverterTest { */ @Test public void testConvert_Float_DecimalNegative() throws Exception { - Configuration config = ConfigurationProvider.getConfiguration(); - Float valueRead = config.get("tests.converter.float.decimalNegative", Float.class); + Config config = ConfigProvider.getConfig(); + Float valueRead = config.getValue("tests.converter.float.decimalNegative", Float.class); assertTrue(valueRead!=null); assertEquals(valueRead.floatValue(), -1.23456789f, 0.0f); } @@ -63,8 +66,8 @@ public class FloatConverterTest { */ @Test public void testConvert_Float_Integer() throws Exception { - Configuration config = ConfigurationProvider.getConfiguration(); - Float valueRead = config.get("tests.converter.float.integer", Float.class); + Config config = ConfigProvider.getConfig(); + Float valueRead = config.getValue("tests.converter.float.integer", Float.class); assertTrue(valueRead!=null); assertEquals(valueRead.floatValue(),100f, 0.0f); } @@ -76,8 +79,8 @@ public class FloatConverterTest { */ @Test public void testConvert_Float_Hex1() throws Exception { - Configuration config = ConfigurationProvider.getConfiguration(); - Float valueRead = config.get("tests.converter.float.hex1", Float.class); + Config config = ConfigProvider.getConfig(); + Float valueRead = config.getValue("tests.converter.float.hex1", Float.class); assertTrue(valueRead!=null); assertEquals(valueRead.floatValue(),255f, 0.0f); } @@ -89,8 +92,8 @@ public class FloatConverterTest { */ @Test public void testConvert_Float_Hex2() throws Exception { - Configuration config = ConfigurationProvider.getConfiguration(); - Float valueRead = config.get("tests.converter.float.hex2", Float.class); + Config config = ConfigProvider.getConfig(); + Float valueRead = config.getValue("tests.converter.float.hex2", Float.class); assertTrue(valueRead!=null); assertEquals(valueRead.floatValue(),-255f, 0.0f); } @@ -102,8 +105,8 @@ public class FloatConverterTest { */ @Test public void testConvert_Float_Hex3() throws Exception { - Configuration config = ConfigurationProvider.getConfiguration(); - Float valueRead = config.get("tests.converter.float.hex3", Float.class); + Config config = ConfigProvider.getConfig(); + Float valueRead = config.getValue("tests.converter.float.hex3", Float.class); assertTrue(valueRead!=null); assertEquals(valueRead.floatValue(),255f, 0.0f); } @@ -115,8 +118,8 @@ public class FloatConverterTest { */ @Test public void testConvert_Float_MinValue() throws Exception { - Configuration config = ConfigurationProvider.getConfiguration(); - Float valueRead = config.get("tests.converter.float.min", Float.class); + Config config = ConfigProvider.getConfig(); + Float valueRead = config.getValue("tests.converter.float.min", Float.class); assertTrue(valueRead!=null); assertEquals(Float.MIN_VALUE, valueRead.floatValue(),0.0f); } @@ -128,8 +131,8 @@ public class FloatConverterTest { */ @Test public void testConvert_Float_MaxValue() throws Exception { - Configuration config = ConfigurationProvider.getConfiguration(); - Float valueRead = config.get("tests.converter.float.max", Float.class); + Config config = ConfigProvider.getConfig(); + Float valueRead = config.getValue("tests.converter.float.max", Float.class); assertTrue(valueRead!=null); assertEquals(Float.MAX_VALUE, valueRead.floatValue(),0.0f); } @@ -141,8 +144,8 @@ public class FloatConverterTest { */ @Test public void testConvert_Float_NaNValue() throws Exception { - Configuration config = ConfigurationProvider.getConfiguration(); - Float valueRead = config.get("tests.converter.float.nan", Float.class); + Config config = ConfigProvider.getConfig(); + Float valueRead = config.getValue("tests.converter.float.nan", Float.class); assertTrue(valueRead!=null); assertEquals(Float.NaN, valueRead.floatValue(),0.0f); } @@ -154,8 +157,8 @@ public class FloatConverterTest { */ @Test public void testConvert_Float_PositiveInfinityValue() throws Exception { - Configuration config = ConfigurationProvider.getConfiguration(); - Float valueRead = config.get("tests.converter.float.pi", Float.class); + Config config = ConfigProvider.getConfig(); + Float valueRead = config.getValue("tests.converter.float.pi", Float.class); assertTrue(valueRead!=null); assertEquals(Float.POSITIVE_INFINITY, valueRead.floatValue(),0.0f); } @@ -167,8 +170,8 @@ public class FloatConverterTest { */ @Test public void testConvert_Float_NegativeInfinityValue() throws Exception { - Configuration config = ConfigurationProvider.getConfiguration(); - Float valueRead = config.get("tests.converter.float.ni", Float.class); + Config config = ConfigProvider.getConfig(); + Float valueRead = config.getValue("tests.converter.float.ni", Float.class); assertTrue(valueRead!=null); assertEquals(Float.NEGATIVE_INFINITY, valueRead.floatValue(),0.0f); } http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/9bc56a38/code/core/src/test/java/org/apache/tamaya/core/internal/converters/InstantConverterTest.java ---------------------------------------------------------------------- diff --git a/code/core/src/test/java/org/apache/tamaya/core/internal/converters/InstantConverterTest.java b/code/core/src/test/java/org/apache/tamaya/core/internal/converters/InstantConverterTest.java index 4a9a828..09495b1 100644 --- a/code/core/src/test/java/org/apache/tamaya/core/internal/converters/InstantConverterTest.java +++ b/code/core/src/test/java/org/apache/tamaya/core/internal/converters/InstantConverterTest.java @@ -18,7 +18,8 @@ */ package org.apache.tamaya.core.internal.converters; -import org.apache.tamaya.spi.ConversionContext; +import org.apache.tamaya.base.convert.ConversionContext; +import org.apache.tamaya.core.converters.InstantConverter; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; @@ -40,9 +41,9 @@ public class InstantConverterTest { @Test public void convert() throws Exception { InstantConverter conv = new InstantConverter(); - Instant value = conv.convert("2007-12-03T10:15:30.00Z", context); + Instant value = conv.convert("2007-12-03T10:15:30.00Z"); assertEquals(value, Instant.parse("2007-12-03T10:15:30.00Z")); - value = conv.convert("foo", context); + value = conv.convert("foo"); assertNull(value); } http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/9bc56a38/code/core/src/test/java/org/apache/tamaya/core/internal/converters/IntegerConverterTest.java ---------------------------------------------------------------------- diff --git a/code/core/src/test/java/org/apache/tamaya/core/internal/converters/IntegerConverterTest.java b/code/core/src/test/java/org/apache/tamaya/core/internal/converters/IntegerConverterTest.java index 03b0f12..aca84f3 100644 --- a/code/core/src/test/java/org/apache/tamaya/core/internal/converters/IntegerConverterTest.java +++ b/code/core/src/test/java/org/apache/tamaya/core/internal/converters/IntegerConverterTest.java @@ -18,10 +18,13 @@ */ package org.apache.tamaya.core.internal.converters; -import org.apache.tamaya.Configuration; -import org.apache.tamaya.ConfigurationProvider; + + import org.junit.Test; +import javax.config.Config; +import javax.config.ConfigProvider; + import static org.junit.Assert.*; /** @@ -36,8 +39,8 @@ public class IntegerConverterTest { */ @Test public void testConvert_Integer_Decimal() throws Exception { - Configuration config = ConfigurationProvider.getConfiguration(); - Integer valueRead = config.get("tests.converter.integer.decimal", Integer.class); + Config config = ConfigProvider.getConfig(); + Integer valueRead = config.getValue("tests.converter.integer.decimal", Integer.class); assertTrue(valueRead != null); assertEquals(valueRead.intValue(), 101); } @@ -49,8 +52,8 @@ public class IntegerConverterTest { */ @Test public void testConvert_Integer_Octal() throws Exception { - Configuration config = ConfigurationProvider.getConfiguration(); - Integer valueRead = config.get("tests.converter.integer.octal", Integer.class); + Config config = ConfigProvider.getConfig(); + Integer valueRead = config.getValue("tests.converter.integer.octal", Integer.class); assertTrue(valueRead != null); assertEquals(valueRead.intValue(), Integer.decode("02").intValue()); } @@ -62,11 +65,11 @@ public class IntegerConverterTest { */ @Test public void testConvert_Integer_Hex() throws Exception { - Configuration config = ConfigurationProvider.getConfiguration(); - Integer valueRead = config.get("tests.converter.integer.hex.lowerX", Integer.class); + Config config = ConfigProvider.getConfig(); + Integer valueRead = config.getValue("tests.converter.integer.hex.lowerX", Integer.class); assertTrue(valueRead != null); assertEquals(valueRead.intValue(), Integer.decode("0x2F").intValue()); - valueRead = config.get("tests.converter.integer.hex.upperX", Integer.class); + valueRead = config.getValue("tests.converter.integer.hex.upperX", Integer.class); assertTrue(valueRead != null); assertEquals(valueRead.intValue(), Integer.decode("0X3F").intValue()); } @@ -78,8 +81,8 @@ public class IntegerConverterTest { */ @Test public void testConvert_NotPresent() throws Exception { - Configuration config = ConfigurationProvider.getConfiguration(); - Integer valueRead = config.get("tests.converter.integer.foo", Integer.class); + Config config = ConfigProvider.getConfig(); + Integer valueRead = config.getValue("tests.converter.integer.foo", Integer.class); assertFalse(valueRead != null); } @@ -90,8 +93,8 @@ public class IntegerConverterTest { */ @Test public void testConvert_Integer_MinValue() throws Exception { - Configuration config = ConfigurationProvider.getConfiguration(); - Integer valueRead = config.get("tests.converter.integer.min", Integer.class); + Config config = ConfigProvider.getConfig(); + Integer valueRead = config.getValue("tests.converter.integer.min", Integer.class); assertTrue(valueRead != null); assertEquals(Integer.MIN_VALUE, valueRead.intValue()); } @@ -103,8 +106,8 @@ public class IntegerConverterTest { */ @Test public void testConvert_Integer_MaxValue() throws Exception { - Configuration config = ConfigurationProvider.getConfiguration(); - Integer valueRead = config.get("tests.converter.integer.max", Integer.class); + Config config = ConfigProvider.getConfig(); + Integer valueRead = config.getValue("tests.converter.integer.max", Integer.class); assertTrue(valueRead != null); assertEquals(Integer.MAX_VALUE, valueRead.intValue()); } http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/9bc56a38/code/core/src/test/java/org/apache/tamaya/core/internal/converters/LocalDateConverterTest.java ---------------------------------------------------------------------- diff --git a/code/core/src/test/java/org/apache/tamaya/core/internal/converters/LocalDateConverterTest.java b/code/core/src/test/java/org/apache/tamaya/core/internal/converters/LocalDateConverterTest.java index 752699d..4804f0a 100644 --- a/code/core/src/test/java/org/apache/tamaya/core/internal/converters/LocalDateConverterTest.java +++ b/code/core/src/test/java/org/apache/tamaya/core/internal/converters/LocalDateConverterTest.java @@ -18,7 +18,8 @@ */ package org.apache.tamaya.core.internal.converters; -import org.apache.tamaya.spi.ConversionContext; +import org.apache.tamaya.base.convert.ConversionContext; +import org.apache.tamaya.core.converters.LocalDateConverter; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; @@ -40,9 +41,9 @@ public class LocalDateConverterTest { @Test public void convert() throws Exception { LocalDateConverter conv = new LocalDateConverter(); - LocalDate value = conv.convert("2007-12-03", context); + LocalDate value = conv.convert("2007-12-03"); assertEquals(value, LocalDate.parse("2007-12-03")); - value = conv.convert("foo", context); + value = conv.convert("foo"); assertNull(value); } http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/9bc56a38/code/core/src/test/java/org/apache/tamaya/core/internal/converters/LocalDateTimeConverterTest.java ---------------------------------------------------------------------- diff --git a/code/core/src/test/java/org/apache/tamaya/core/internal/converters/LocalDateTimeConverterTest.java b/code/core/src/test/java/org/apache/tamaya/core/internal/converters/LocalDateTimeConverterTest.java index 945682a..afda697 100644 --- a/code/core/src/test/java/org/apache/tamaya/core/internal/converters/LocalDateTimeConverterTest.java +++ b/code/core/src/test/java/org/apache/tamaya/core/internal/converters/LocalDateTimeConverterTest.java @@ -18,7 +18,8 @@ */ package org.apache.tamaya.core.internal.converters; -import org.apache.tamaya.spi.ConversionContext; +import org.apache.tamaya.core.converters.LocalDateTimeConverter; +import org.apache.tamaya.base.convert.ConversionContext; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; @@ -40,9 +41,9 @@ public class LocalDateTimeConverterTest { @Test public void convert() throws Exception { LocalDateTimeConverter conv = new LocalDateTimeConverter(); - LocalDateTime value = conv.convert("2007-12-03T10:15:30", context); + LocalDateTime value = conv.convert("2007-12-03T10:15:30"); assertEquals(value, LocalDateTime.parse("2007-12-03T10:15:30")); - value = conv.convert("foo", context); + value = conv.convert("foo"); assertNull(value); } http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/9bc56a38/code/core/src/test/java/org/apache/tamaya/core/internal/converters/LocalTimeConverterTest.java ---------------------------------------------------------------------- diff --git a/code/core/src/test/java/org/apache/tamaya/core/internal/converters/LocalTimeConverterTest.java b/code/core/src/test/java/org/apache/tamaya/core/internal/converters/LocalTimeConverterTest.java index b75ed7b..ee48cb9 100644 --- a/code/core/src/test/java/org/apache/tamaya/core/internal/converters/LocalTimeConverterTest.java +++ b/code/core/src/test/java/org/apache/tamaya/core/internal/converters/LocalTimeConverterTest.java @@ -18,7 +18,8 @@ */ package org.apache.tamaya.core.internal.converters; -import org.apache.tamaya.spi.ConversionContext; +import org.apache.tamaya.core.converters.LocalTimeConverter; +import org.apache.tamaya.base.convert.ConversionContext; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; @@ -40,9 +41,9 @@ public class LocalTimeConverterTest { @Test public void convert() throws Exception { LocalTimeConverter conv = new LocalTimeConverter(); - LocalTime value = conv.convert("10:15:30", context); + LocalTime value = conv.convert("10:15:30"); assertEquals(value, LocalTime.parse("10:15:30")); - value = conv.convert("foo", context); + value = conv.convert("foo"); assertNull(value); } http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/9bc56a38/code/core/src/test/java/org/apache/tamaya/core/internal/converters/LongConverterTest.java ---------------------------------------------------------------------- diff --git a/code/core/src/test/java/org/apache/tamaya/core/internal/converters/LongConverterTest.java b/code/core/src/test/java/org/apache/tamaya/core/internal/converters/LongConverterTest.java index 0df6b09..ad3361c 100644 --- a/code/core/src/test/java/org/apache/tamaya/core/internal/converters/LongConverterTest.java +++ b/code/core/src/test/java/org/apache/tamaya/core/internal/converters/LongConverterTest.java @@ -18,10 +18,13 @@ */ package org.apache.tamaya.core.internal.converters; -import org.apache.tamaya.Configuration; -import org.apache.tamaya.ConfigurationProvider; + + import org.junit.Test; +import javax.config.Config; +import javax.config.ConfigProvider; + import static org.junit.Assert.*; /** @@ -36,8 +39,8 @@ public class LongConverterTest { */ @Test public void testConvert_Long_Decimal() throws Exception { - Configuration config = ConfigurationProvider.getConfiguration(); - Long valueRead = config.get("tests.converter.long.decimal", Long.class); + Config config = ConfigProvider.getConfig(); + Long valueRead = config.getValue("tests.converter.long.decimal", Long.class); assertTrue(valueRead != null); assertEquals(valueRead.intValue(), 101); } @@ -49,8 +52,8 @@ public class LongConverterTest { */ @Test public void testConvert_Long_Octal() throws Exception { - Configuration config = ConfigurationProvider.getConfiguration(); - Long valueRead = config.get("tests.converter.long.octal", Long.class); + Config config = ConfigProvider.getConfig(); + Long valueRead = config.getValue("tests.converter.long.octal", Long.class); assertTrue(valueRead != null); assertEquals(valueRead.intValue(), Long.decode("02").intValue()); } @@ -62,11 +65,11 @@ public class LongConverterTest { */ @Test public void testConvert_Long_Hex() throws Exception { - Configuration config = ConfigurationProvider.getConfiguration(); - Long valueRead = config.get("tests.converter.long.hex.lowerX", Long.class); + Config config = ConfigProvider.getConfig(); + Long valueRead = config.getValue("tests.converter.long.hex.lowerX", Long.class); assertTrue(valueRead != null); assertEquals(valueRead.intValue(), Long.decode("0x2F").intValue()); - valueRead = config.get("tests.converter.long.hex.upperX", Long.class); + valueRead = config.getValue("tests.converter.long.hex.upperX", Long.class); assertTrue(valueRead != null); assertEquals(valueRead.intValue(), Long.decode("0X3F").intValue()); } @@ -78,8 +81,8 @@ public class LongConverterTest { */ @Test public void testConvert_NotPresent() throws Exception { - Configuration config = ConfigurationProvider.getConfiguration(); - Long valueRead = config.get("tests.converter.long.foo", Long.class); + Config config = ConfigProvider.getConfig(); + Long valueRead = config.getValue("tests.converter.long.foo", Long.class); assertFalse(valueRead != null); } @@ -90,8 +93,8 @@ public class LongConverterTest { */ @Test public void testConvert_Long_MinValue() throws Exception { - Configuration config = ConfigurationProvider.getConfiguration(); - Long valueRead = config.get("tests.converter.long.min", Long.class); + Config config = ConfigProvider.getConfig(); + Long valueRead = config.getValue("tests.converter.long.min", Long.class); assertTrue(valueRead != null); assertEquals(Long.MIN_VALUE, valueRead.longValue()); } @@ -103,8 +106,8 @@ public class LongConverterTest { */ @Test public void testConvert_Long_MaxValue() throws Exception { - Configuration config = ConfigurationProvider.getConfiguration(); - Long valueRead = config.get("tests.converter.long.max", Long.class); + Config config = ConfigProvider.getConfig(); + Long valueRead = config.getValue("tests.converter.long.max", Long.class); assertTrue(valueRead != null); assertEquals(Long.MAX_VALUE, valueRead.longValue()); } http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/9bc56a38/code/core/src/test/java/org/apache/tamaya/core/internal/converters/NumberConverterTest.java ---------------------------------------------------------------------- diff --git a/code/core/src/test/java/org/apache/tamaya/core/internal/converters/NumberConverterTest.java b/code/core/src/test/java/org/apache/tamaya/core/internal/converters/NumberConverterTest.java index 3fa2e58..769e92e 100644 --- a/code/core/src/test/java/org/apache/tamaya/core/internal/converters/NumberConverterTest.java +++ b/code/core/src/test/java/org/apache/tamaya/core/internal/converters/NumberConverterTest.java @@ -18,10 +18,12 @@ */ package org.apache.tamaya.core.internal.converters; -import org.apache.tamaya.Configuration; -import org.apache.tamaya.ConfigurationProvider; + + import org.junit.Test; +import javax.config.Config; +import javax.config.ConfigProvider; import java.math.BigDecimal; import static org.junit.Assert.*; @@ -38,8 +40,8 @@ public class NumberConverterTest { */ @Test public void testConvert_Decimal() throws Exception { - Configuration config = ConfigurationProvider.getConfiguration(); - Number valueRead = config.get("tests.converter.bd.decimal", Number.class); + Config config = ConfigProvider.getConfig(); + Number valueRead = config.getValue("tests.converter.bd.decimal", Number.class); assertTrue(valueRead!=null); assertEquals(valueRead, 101L); } @@ -52,11 +54,11 @@ public class NumberConverterTest { */ @Test public void testConvert_Hex() throws Exception { - Configuration config = ConfigurationProvider.getConfiguration(); - Number valueRead = config.get("tests.converter.bd.hex.lowerX", Number.class); + Config config = ConfigProvider.getConfig(); + Number valueRead = config.getValue("tests.converter.bd.hex.lowerX", Number.class); assertTrue(valueRead!=null); assertEquals(valueRead, Long.valueOf("47")); - valueRead = config.get("tests.converter.bd.hex.upperX", Number.class); + valueRead = config.getValue("tests.converter.bd.hex.upperX", Number.class); assertTrue(valueRead!=null); assertEquals(valueRead, Long.valueOf("63")); } @@ -68,8 +70,8 @@ public class NumberConverterTest { */ @Test public void testConvert_NotPresent() throws Exception { - Configuration config = ConfigurationProvider.getConfiguration(); - Number valueRead = config.get("tests.converter.bd.foo", Number.class); + Config config = ConfigProvider.getConfig(); + Number valueRead = config.getValue("tests.converter.bd.foo", Number.class); assertFalse(valueRead!=null); } @@ -80,8 +82,8 @@ public class NumberConverterTest { */ @Test public void testConvert_BigValue() throws Exception { - Configuration config = ConfigurationProvider.getConfiguration(); - Number valueRead = config.get("tests.converter.bd.big", Number.class); + Config config = ConfigProvider.getConfig(); + Number valueRead = config.getValue("tests.converter.bd.big", Number.class); assertTrue(valueRead!=null); assertEquals(new BigDecimal("101666666666666662333337263723628763821638923628193612983618293628763"), valueRead); @@ -94,8 +96,8 @@ public class NumberConverterTest { */ @Test public void testConvert_BigFloatValue() throws Exception { - Configuration config = ConfigurationProvider.getConfiguration(); - Number valueRead = config.get("tests.converter.bd.bigFloat", Number.class); + Config config = ConfigProvider.getConfig(); + Number valueRead = config.getValue("tests.converter.bd.bigFloat", Number.class); assertTrue(valueRead!=null); assertEquals(new BigDecimal("1016666666666666623333372637236287638216389293628763.1016666666666666623333372" + "63723628763821638923628193612983618293628763"), valueRead); http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/9bc56a38/code/core/src/test/java/org/apache/tamaya/core/internal/converters/OffsetDateTimeConverterTest.java ---------------------------------------------------------------------- diff --git a/code/core/src/test/java/org/apache/tamaya/core/internal/converters/OffsetDateTimeConverterTest.java b/code/core/src/test/java/org/apache/tamaya/core/internal/converters/OffsetDateTimeConverterTest.java index 4ab65a2..8201a1d 100644 --- a/code/core/src/test/java/org/apache/tamaya/core/internal/converters/OffsetDateTimeConverterTest.java +++ b/code/core/src/test/java/org/apache/tamaya/core/internal/converters/OffsetDateTimeConverterTest.java @@ -18,7 +18,8 @@ */ package org.apache.tamaya.core.internal.converters; -import org.apache.tamaya.spi.ConversionContext; +import org.apache.tamaya.core.converters.OffsetDateTimeConverter; +import org.apache.tamaya.base.convert.ConversionContext; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; @@ -40,9 +41,9 @@ public class OffsetDateTimeConverterTest { @Test public void convert() throws Exception { OffsetDateTimeConverter conv = new OffsetDateTimeConverter(); - OffsetDateTime value = conv.convert("2007-12-03T10:15:30+01:00", context); + OffsetDateTime value = conv.convert("2007-12-03T10:15:30+01:00"); assertEquals(value, OffsetDateTime.parse("2007-12-03T10:15:30+01:00")); - value = conv.convert("foo", context); + value = conv.convert("foo"); assertNull(value); } http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/9bc56a38/code/core/src/test/java/org/apache/tamaya/core/internal/converters/OffsetTimeConverterTest.java ---------------------------------------------------------------------- diff --git a/code/core/src/test/java/org/apache/tamaya/core/internal/converters/OffsetTimeConverterTest.java b/code/core/src/test/java/org/apache/tamaya/core/internal/converters/OffsetTimeConverterTest.java index 3b28b2c..fde3714 100644 --- a/code/core/src/test/java/org/apache/tamaya/core/internal/converters/OffsetTimeConverterTest.java +++ b/code/core/src/test/java/org/apache/tamaya/core/internal/converters/OffsetTimeConverterTest.java @@ -18,7 +18,8 @@ */ package org.apache.tamaya.core.internal.converters; -import org.apache.tamaya.spi.ConversionContext; +import org.apache.tamaya.core.converters.OffsetTimeConverter; +import org.apache.tamaya.base.convert.ConversionContext; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; @@ -39,9 +40,9 @@ public class OffsetTimeConverterTest { @Test public void convert() throws Exception { OffsetTimeConverter conv = new OffsetTimeConverter(); - OffsetTime value = conv.convert("10:15:30+01:00", context); + OffsetTime value = conv.convert("10:15:30+01:00"); assertEquals(value, OffsetTime.parse("10:15:30+01:00")); - value = conv.convert("foo", context); + value = conv.convert("foo"); assertNull(value); } http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/9bc56a38/code/core/src/test/java/org/apache/tamaya/core/internal/converters/OptionalConverterTest.java ---------------------------------------------------------------------- diff --git a/code/core/src/test/java/org/apache/tamaya/core/internal/converters/OptionalConverterTest.java b/code/core/src/test/java/org/apache/tamaya/core/internal/converters/OptionalConverterTest.java index f35280b..aa6d51d 100644 --- a/code/core/src/test/java/org/apache/tamaya/core/internal/converters/OptionalConverterTest.java +++ b/code/core/src/test/java/org/apache/tamaya/core/internal/converters/OptionalConverterTest.java @@ -18,7 +18,8 @@ */ package org.apache.tamaya.core.internal.converters; -import org.apache.tamaya.ConfigException; +import org.apache.tamaya.base.convert.ConversionContext; +import org.apache.tamaya.core.converters.OptionalConverter; import org.junit.Test; import java.util.Optional; @@ -29,14 +30,16 @@ public class OptionalConverterTest { @Test public void nullConversionYieldsEmptyOptional() { - final Optional<?> result = new OptionalConverter().convert(null, null); + final Optional<?> result = new OptionalConverter().convert(null); assertThat(result).isNotNull(); assertThat(result.isPresent()).isFalse(); } - @Test(expected = ConfigException.class) - public void emulateExceptionWhenGivenContextIsNull() { - new OptionalConverter().convert("JustATestValueThatIsIgnored", null); + @Test(expected = IllegalStateException.class) + public void emulateExceptionWhenGivenConfigIsNull() { + ConversionContext ctx = new ConversionContext.Builder("someKey", String.class).build(); + ConversionContext.setContext(ctx); + new OptionalConverter().convert("JustATestValueThatIsIgnored"); } } http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/9bc56a38/code/core/src/test/java/org/apache/tamaya/core/internal/converters/PathConverterTest.java ---------------------------------------------------------------------- diff --git a/code/core/src/test/java/org/apache/tamaya/core/internal/converters/PathConverterTest.java b/code/core/src/test/java/org/apache/tamaya/core/internal/converters/PathConverterTest.java index a7f9eab..781c416 100644 --- a/code/core/src/test/java/org/apache/tamaya/core/internal/converters/PathConverterTest.java +++ b/code/core/src/test/java/org/apache/tamaya/core/internal/converters/PathConverterTest.java @@ -18,7 +18,8 @@ */ package org.apache.tamaya.core.internal.converters; -import org.apache.tamaya.spi.ConversionContext; +import org.apache.tamaya.core.converters.PathConverter; +import org.apache.tamaya.base.convert.ConversionContext; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; @@ -41,9 +42,9 @@ public class PathConverterTest { @Test public void convert() throws Exception { PathConverter conv = new PathConverter(); - Path value = conv.convert("testRoot", context); + Path value = conv.convert("testRoot"); assertEquals(value, Paths.get("testRoot")); - value = conv.convert("foo", context); + value = conv.convert("foo"); assertNotNull(value); } http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/9bc56a38/code/core/src/test/java/org/apache/tamaya/core/internal/converters/ShortConverterTest.java ---------------------------------------------------------------------- diff --git a/code/core/src/test/java/org/apache/tamaya/core/internal/converters/ShortConverterTest.java b/code/core/src/test/java/org/apache/tamaya/core/internal/converters/ShortConverterTest.java index ca9228d..303ee91 100644 --- a/code/core/src/test/java/org/apache/tamaya/core/internal/converters/ShortConverterTest.java +++ b/code/core/src/test/java/org/apache/tamaya/core/internal/converters/ShortConverterTest.java @@ -18,10 +18,11 @@ */ package org.apache.tamaya.core.internal.converters; -import org.apache.tamaya.Configuration; -import org.apache.tamaya.ConfigurationProvider; import org.junit.Test; +import javax.config.Config; +import javax.config.ConfigProvider; + import static org.junit.Assert.*; /** @@ -36,8 +37,8 @@ public class ShortConverterTest { */ @Test public void testConvert_Short_Decimal() throws Exception { - Configuration config = ConfigurationProvider.getConfiguration(); - Short valueRead = config.get("tests.converter.short.decimal", Short.class); + Config config = ConfigProvider.getConfig(); + Short valueRead = config.getValue("tests.converter.short.decimal", Short.class); assertTrue(valueRead != null); assertEquals(valueRead.intValue(), 101); } @@ -49,8 +50,8 @@ public class ShortConverterTest { */ @Test public void testConvert_Short_Octal() throws Exception { - Configuration config = ConfigurationProvider.getConfiguration(); - Short valueRead = config.get("tests.converter.short.octal", Short.class); + Config config = ConfigProvider.getConfig(); + Short valueRead = config.getValue("tests.converter.short.octal", Short.class); assertTrue(valueRead != null); assertEquals(valueRead.intValue(), Short.decode("02").intValue()); } @@ -62,11 +63,11 @@ public class ShortConverterTest { */ @Test public void testConvert_Short_Hex() throws Exception { - Configuration config = ConfigurationProvider.getConfiguration(); - Short valueRead = config.get("tests.converter.short.hex.lowerX", Short.class); + Config config = ConfigProvider.getConfig(); + Short valueRead = config.getValue("tests.converter.short.hex.lowerX", Short.class); assertTrue(valueRead != null); assertEquals(valueRead.intValue(), Short.decode("0x2F").intValue()); - valueRead = config.get("tests.converter.short.hex.upperX", Short.class); + valueRead = config.getValue("tests.converter.short.hex.upperX", Short.class); assertTrue(valueRead != null); assertEquals(valueRead.intValue(), Short.decode("0X3F").intValue()); } @@ -78,8 +79,8 @@ public class ShortConverterTest { */ @Test public void testConvert_NotPresent() throws Exception { - Configuration config = ConfigurationProvider.getConfiguration(); - Short valueRead = config.get("tests.converter.short.foo", Short.class); + Config config = ConfigProvider.getConfig(); + Short valueRead = config.getValue("tests.converter.short.foo", Short.class); assertFalse(valueRead != null); } @@ -90,8 +91,8 @@ public class ShortConverterTest { */ @Test public void testConvert_Short_MinValue() throws Exception { - Configuration config = ConfigurationProvider.getConfiguration(); - Short valueRead = config.get("tests.converter.short.min", Short.class); + Config config = ConfigProvider.getConfig(); + Short valueRead = config.getValue("tests.converter.short.min", Short.class); assertTrue(valueRead != null); assertEquals(Short.MIN_VALUE, valueRead.intValue()); } @@ -103,8 +104,8 @@ public class ShortConverterTest { */ @Test public void testConvert_Short_MaxValue() throws Exception { - Configuration config = ConfigurationProvider.getConfiguration(); - Short valueRead = config.get("tests.converter.short.max", Short.class); + Config config = ConfigProvider.getConfig(); + Short valueRead = config.getValue("tests.converter.short.max", Short.class); assertTrue(valueRead != null); assertEquals(Short.MAX_VALUE, valueRead.intValue()); }