http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/119c4982/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 8eea92d..9c2562b 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 @@ -25,7 +25,7 @@ import org.apache.tamaya.TypeLiteral; import org.apache.tamaya.spi.ConversionContext; import org.junit.Test; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.assertj.core.api.Assertions.*; /** * Tests the default converter for bytes. @@ -41,19 +41,19 @@ public class ByteConverterTest { public void testConvert_Byte() throws Exception { Configuration config = ConfigurationProvider.getConfiguration(); Byte valueRead = config.get("tests.converter.byte.decimal", Byte.class); - assertNotNull(valueRead); - assertEquals(valueRead.byteValue(), 101); + assertThat(valueRead).isNotNull(); + assertThat(101).isEqualTo(valueRead.byteValue()); valueRead = config.get("tests.converter.byte.octal", Byte.class); - assertNotNull(valueRead); - assertEquals(valueRead.byteValue(), Byte.decode("02").byteValue()); + assertThat(valueRead).isNotNull(); + assertThat(Byte.decode("02").byteValue()).isEqualTo(valueRead.byteValue()); valueRead = config.get("tests.converter.byte.hex.lowerX", Byte.class); - assertNotNull(valueRead); - assertEquals(valueRead.byteValue(), Byte.decode("0x2F").byteValue()); + assertThat(valueRead).isNotNull(); + assertThat(Byte.decode("0x2F").byteValue()).isEqualTo(valueRead.byteValue()); valueRead = config.get("tests.converter.byte.hex.upperX", Byte.class); - assertNotNull(valueRead); - assertEquals(valueRead.byteValue(), Byte.decode("0X3F").byteValue()); + assertThat(valueRead).isNotNull(); + assertThat(Byte.decode("0X3F").byteValue()).isEqualTo(valueRead.byteValue()); valueRead = config.get("tests.converter.byte.foo", Byte.class); - assertNull(valueRead); + assertThat(valueRead).isNull(); } /** @@ -66,7 +66,7 @@ public class ByteConverterTest { Configuration config = ConfigurationProvider.getConfiguration(); Byte valueRead = config.get("tests.converter.byte.min", Byte.class); assertThat(valueRead).isNotNull(); - assertEquals(Byte.MIN_VALUE, valueRead.byteValue()); + assertThat(valueRead.byteValue()).isEqualTo(Byte.MIN_VALUE); } /** @@ -79,7 +79,7 @@ public class ByteConverterTest { Configuration config = ConfigurationProvider.getConfiguration(); Byte valueRead = config.get("tests.converter.byte.max", Byte.class); assertThat(valueRead).isNotNull(); - assertEquals(Byte.MAX_VALUE, valueRead.byteValue()); + assertThat(valueRead.byteValue()).isEqualTo(Byte.MAX_VALUE); } /** * Test conversion. The value are provided by @@ -91,7 +91,7 @@ public class ByteConverterTest { public void testConvert_ByteInvalid() throws ConfigException { Configuration config = ConfigurationProvider.getConfiguration(); Byte valueRead = config.get("tests.converter.byte.invalid", Byte.class); - assertNull(valueRead); + assertThat(valueRead).isNull(); } @Test @@ -100,14 +100,14 @@ public class ByteConverterTest { ByteConverter converter = new ByteConverter(); converter.convert("", context); - assertTrue(context.getSupportedFormats().contains("<byte> (ByteConverter)")); - assertTrue(context.getSupportedFormats().contains("MIN_VALUE (ByteConverter)")); - assertTrue(context.getSupportedFormats().contains("MAX_VALUE (ByteConverter)")); + assertThat(context.getSupportedFormats().contains("<byte> (ByteConverter)")).isTrue(); + assertThat(context.getSupportedFormats().contains("MIN_VALUE (ByteConverter)")).isTrue(); + assertThat(context.getSupportedFormats().contains("MAX_VALUE (ByteConverter)")).isTrue(); } @Test public void testHashCode() { ByteConverter instance = new ByteConverter(); - assertEquals(ByteConverter.class.hashCode(), instance.hashCode()); + assertThat(instance.hashCode()).isEqualTo(ByteConverter.class.hashCode()); } }
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/119c4982/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 9f27582..067ef4f 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 @@ -25,7 +25,7 @@ import org.apache.tamaya.TypeLiteral; import org.apache.tamaya.spi.ConversionContext; import org.junit.Test; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.assertj.core.api.Assertions.*; /** @@ -38,7 +38,7 @@ public class CharConverterTest { Configuration config = ConfigurationProvider.getConfiguration(); Character valueRead = config.get("tests.converter.char.f", Character.class); assertThat(valueRead).isNotNull(); - assertEquals(valueRead.charValue(), 'f'); + assertThat('f').isEqualTo(valueRead.charValue()); } @Test @@ -46,7 +46,7 @@ public class CharConverterTest { Configuration config = ConfigurationProvider.getConfiguration(); Character valueRead = config.get("tests.converter.char.f-numeric", Character.class); assertThat(valueRead).isNotNull(); - assertEquals(valueRead.charValue(), (char) 101); + assertThat((char) 101).isEqualTo(valueRead.charValue()); } @Test @@ -54,7 +54,7 @@ public class CharConverterTest { Configuration config = ConfigurationProvider.getConfiguration(); Character valueRead = config.get("tests.converter.char.d", Character.class); assertThat(valueRead).isNotNull(); - assertEquals(valueRead.charValue(), 'd'); + assertThat('d').isEqualTo(valueRead.charValue()); } @@ -63,7 +63,7 @@ public class CharConverterTest { Configuration config = ConfigurationProvider.getConfiguration(); Character valueRead = config.get("tests.converter.char.single-quote", Character.class); assertThat(valueRead).isNotNull(); - assertEquals(valueRead.charValue(), '\''); + assertThat('\'').isEqualTo(valueRead.charValue()); } @Test(expected = ConfigException.class) @@ -77,7 +77,7 @@ public class CharConverterTest { Configuration config = ConfigurationProvider.getConfiguration(); Character valueRead = config.get("tests.converter.char.three-single-quotes", Character.class); assertThat(valueRead).isNotNull(); - assertEquals(valueRead.charValue(), '\''); + assertThat('\'').isEqualTo(valueRead.charValue()); } @Test @@ -85,7 +85,7 @@ public class CharConverterTest { Configuration config = ConfigurationProvider.getConfiguration(); Character valueRead = config.get("tests.converter.char.f-before", Character.class); assertThat(valueRead).isNotNull(); - assertEquals(valueRead.charValue(), 'f'); + assertThat('f').isEqualTo(valueRead.charValue()); } @Test @@ -93,7 +93,7 @@ public class CharConverterTest { Configuration config = ConfigurationProvider.getConfiguration(); Character valueRead = config.get("tests.converter.char.f-after", Character.class); assertThat(valueRead).isNotNull(); - assertEquals(valueRead.charValue(), 'f'); + assertThat('f').isEqualTo(valueRead.charValue()); } @Test @@ -101,14 +101,14 @@ public class CharConverterTest { Configuration config = ConfigurationProvider.getConfiguration(); Character valueRead = config.get("tests.converter.char.f-around", Character.class); assertThat(valueRead).isNotNull(); - assertEquals(valueRead.charValue(), 'f'); + assertThat('f').isEqualTo(valueRead.charValue()); } @Test public void testConvert_NotPresent() throws Exception { Configuration config = ConfigurationProvider.getConfiguration(); Character valueRead = config.get("tests.converter.char.foo", Character.class); - assertNull(valueRead); + assertThat(valueRead).isNull(); } /** @@ -122,7 +122,7 @@ public class CharConverterTest { Configuration config = ConfigurationProvider.getConfiguration(); Character valueRead = config.get("tests.converter.char.invalid", Character.class); assertThat(valueRead).isNotNull(); - assertEquals(valueRead.charValue(), 'i'); //Strings return the first character + assertThat('i').isEqualTo(valueRead.charValue()); //Strings return the first character } @Test @@ -130,7 +130,7 @@ public class CharConverterTest { Configuration config = ConfigurationProvider.getConfiguration(); Character valueRead = config.get("tests.converter.char.quoted-invalid", Character.class); assertThat(valueRead).isNotNull(); - assertEquals(valueRead.charValue(), 'i'); //Strings return the first character + assertThat('i').isEqualTo(valueRead.charValue()); //Strings return the first character } @Test @@ -138,7 +138,7 @@ public class CharConverterTest { Configuration config = ConfigurationProvider.getConfiguration(); Character valueRead = config.get("tests.converter.char.ã", Character.class); assertThat(valueRead).isNotNull(); - assertEquals(valueRead.charValue(), 'ã'); + assertThat('ã').isEqualTo(valueRead.charValue()); } @Test @@ -146,7 +146,7 @@ public class CharConverterTest { Configuration config = ConfigurationProvider.getConfiguration(); Character valueRead = config.get("tests.converter.char.à¸à¸à¸à¸à¸ à¸à¸à¸à¸à¸", Character.class); assertThat(valueRead).isNotNull(); - assertEquals(valueRead.charValue(), 'à¸'); //Strings return the first character + assertThat('à¸').isEqualTo(valueRead.charValue()); //Strings return the first character } @Test @@ -155,13 +155,13 @@ public class CharConverterTest { CharConverter converter = new CharConverter(); converter.convert("", context); - assertTrue(context.getSupportedFormats().contains("<char> (CharConverter)")); - assertTrue(context.getSupportedFormats().contains("\\'<char>\\' (CharConverter)")); + assertThat(context.getSupportedFormats().contains("<char> (CharConverter)")).isTrue(); + assertThat(context.getSupportedFormats().contains("\\'<char>\\' (CharConverter)")).isTrue(); } @Test public void testHashCode() { CharConverter instance = new CharConverter(); - assertEquals(CharConverter.class.hashCode(), instance.hashCode()); + assertThat(instance.hashCode()).isEqualTo(CharConverter.class.hashCode()); } } http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/119c4982/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 4877d9a..78d9675 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 @@ -24,7 +24,7 @@ import org.junit.Test; import java.math.BigDecimal; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; /** * Tests conversion of the {@link ClassConverter}. @@ -37,32 +37,32 @@ public class ClassConverterTest { @Test public void testConvert_Class() throws Exception { ClassConverter converter = new ClassConverter(); - assertEquals(BigDecimal.class, converter.convert("java.math.BigDecimal", context)); + assertThat(BigDecimal.class).isEqualTo(converter.convert("java.math.BigDecimal", context)); } @Test public void testConvert_Class_WithSpaces() throws Exception { ClassConverter converter = new ClassConverter(); - assertEquals(BigDecimal.class, converter.convert(" java.math.BigDecimal\t", context)); + assertThat(BigDecimal.class).isEqualTo(converter.convert(" java.math.BigDecimal\t", context)); } @Test public void testConvert_Class_WithSpacesBefore() throws Exception { ClassConverter converter = new ClassConverter(); - assertEquals(BigDecimal.class, converter.convert(" java.math.BigDecimal", context)); + assertThat(BigDecimal.class).isEqualTo(converter.convert(" java.math.BigDecimal", context)); } @Test public void testConvert_Class_WithSpacesAfter() throws Exception { ClassConverter converter = new ClassConverter(); - assertEquals(BigDecimal.class, converter.convert("java.math.BigDecimal ", context)); + assertThat(BigDecimal.class).isEqualTo(converter.convert("java.math.BigDecimal ", context)); } @Test public void testConvert_NotPresent() throws Exception { ClassConverter converter = new ClassConverter(); - assertNull(converter.convert("", context)); - assertNull(converter.convert(null, context)); + assertThat(converter.convert("", context)).isNull(); + assertThat(converter.convert(null, context)).isNull(); } @Test @@ -71,12 +71,12 @@ public class ClassConverterTest { ClassConverter converter = new ClassConverter(); converter.convert("", localcontext); - assertTrue(localcontext.getSupportedFormats().contains("<fullyQualifiedClassName> (ClassConverter)")); + assertThat(localcontext.getSupportedFormats().contains("<fullyQualifiedClassName> (ClassConverter)")).isTrue(); } @Test public void testHashCode() { ClassConverter instance = new ClassConverter(); - assertEquals(ClassConverter.class.hashCode(), instance.hashCode()); + assertThat(instance.hashCode()).isEqualTo(ClassConverter.class.hashCode()); } } http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/119c4982/code/core/src/test/java/org/apache/tamaya/core/internal/converters/ConvertQueryTest.java ---------------------------------------------------------------------- diff --git a/code/core/src/test/java/org/apache/tamaya/core/internal/converters/ConvertQueryTest.java b/code/core/src/test/java/org/apache/tamaya/core/internal/converters/ConvertQueryTest.java index 26998e3..93687e3 100644 --- a/code/core/src/test/java/org/apache/tamaya/core/internal/converters/ConvertQueryTest.java +++ b/code/core/src/test/java/org/apache/tamaya/core/internal/converters/ConvertQueryTest.java @@ -22,7 +22,7 @@ import org.apache.tamaya.Configuration; import org.apache.tamaya.ConfigurationProvider; import org.apache.tamaya.TypeLiteral; import org.junit.Test; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; /** * @@ -38,7 +38,7 @@ public class ConvertQueryTest { Configuration config = ConfigurationProvider.getConfiguration(); ConvertQuery<Integer> converter = new ConvertQuery<>("101", TypeLiteral.of(Integer.class)); Integer result = converter.query(config); - assertEquals(101, result.longValue()); + assertThat(result.longValue()).isEqualTo(101); } /** @@ -49,7 +49,7 @@ public class ConvertQueryTest { Configuration config = ConfigurationProvider.getConfiguration(); ConvertQuery<Integer> converter = new ConvertQuery<>("101", TypeLiteral.of(Integer.class)); Integer result = config.query(converter); - assertEquals(101, result.longValue()); + assertThat(result.longValue()).isEqualTo(101); } /** @@ -60,10 +60,10 @@ public class ConvertQueryTest { Configuration config = ConfigurationProvider.getConfiguration(); Integer intResult = (Integer) new ConvertQuery("101", TypeLiteral.of(Integer.class)).query(config); - assertEquals(101, intResult.longValue()); + assertThat(intResult.longValue()).isEqualTo(101); Boolean booleanResult = (Boolean) new ConvertQuery("true", TypeLiteral.of(Boolean.class)).query(config); - assertEquals(Boolean.TRUE, booleanResult); + assertThat(booleanResult).isEqualTo(Boolean.TRUE); } /** @@ -74,7 +74,7 @@ public class ConvertQueryTest { Configuration config = ConfigurationProvider.getConfiguration(); Integer intResult = (Integer) new ConvertQuery("invalid", TypeLiteral.of(Integer.class)).query(config); - assertNull(intResult); + assertThat(intResult).isNull(); } } http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/119c4982/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 2541f66..13b3060 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 @@ -28,7 +28,7 @@ import org.apache.tamaya.TypeLiteral; import org.apache.tamaya.spi.ConversionContext; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; /** * Tests the default converter for currencies. @@ -51,7 +51,7 @@ public class CurrencyConverterTest { Configuration config = ConfigurationProvider.getConfiguration(); Currency valueRead = config.get("tests.converter.currency.code1", Currency.class); assertThat(valueRead).isNotNull(); - assertEquals(valueRead, Currency.getInstance(CHF)); + assertThat(Currency.getInstance(CHF)).isEqualTo(valueRead); } /** @@ -65,7 +65,7 @@ public class CurrencyConverterTest { Configuration config = ConfigurationProvider.getConfiguration(); Currency valueRead = config.get("tests.converter.currency.code2", Currency.class); assertThat(valueRead).isNotNull(); - assertEquals(valueRead, Currency.getInstance(CHF)); + assertThat(Currency.getInstance(CHF)).isEqualTo(valueRead); } /** @@ -79,7 +79,7 @@ public class CurrencyConverterTest { Configuration config = ConfigurationProvider.getConfiguration(); Currency valueRead = config.get("tests.converter.currency.code3", Currency.class); assertThat(valueRead).isNotNull(); - assertEquals(Currency.getInstance(CHF), valueRead); + assertThat(valueRead).isEqualTo(Currency.getInstance(CHF)); } /** @@ -93,7 +93,7 @@ public class CurrencyConverterTest { Configuration config = ConfigurationProvider.getConfiguration(); Currency valueRead = config.get("tests.converter.currency.code4", Currency.class); assertThat(valueRead).isNotNull(); - assertEquals(Currency.getInstance(CHF), valueRead); + assertThat(valueRead).isEqualTo(Currency.getInstance(CHF)); } /** @@ -107,7 +107,7 @@ public class CurrencyConverterTest { Configuration config = ConfigurationProvider.getConfiguration(); Currency valueRead = config.get("tests.converter.currency.code5", Currency.class); assertThat(valueRead).isNotNull(); - assertEquals(Currency.getInstance(CHF), valueRead); + assertThat(valueRead).isEqualTo(Currency.getInstance(CHF)); } /** @@ -121,16 +121,16 @@ public class CurrencyConverterTest { Configuration config = ConfigurationProvider.getConfiguration(); Currency valueRead = config.get("tests.converter.currency.code-numeric1", Currency.class); assertThat(valueRead).isNotNull(); - assertEquals(Currency.getInstance(BGL).getNumericCode(), valueRead.getNumericCode()); + assertThat(valueRead.getNumericCode()).isEqualTo(Currency.getInstance(BGL).getNumericCode()); valueRead = config.get("tests.converter.currency.code-numeric2", Currency.class); assertThat(valueRead).isNotNull(); - assertEquals(Currency.getInstance(BGL).getNumericCode(), valueRead.getNumericCode()); + assertThat(valueRead.getNumericCode()).isEqualTo(Currency.getInstance(BGL).getNumericCode()); valueRead = config.get("tests.converter.currency.code-numeric3", Currency.class); assertThat(valueRead).isNotNull(); - assertEquals(Currency.getInstance(BGL).getNumericCode(), valueRead.getNumericCode()); + assertThat(valueRead.getNumericCode()).isEqualTo(Currency.getInstance(BGL).getNumericCode()); valueRead = config.get("tests.converter.currency.code-numeric4", Currency.class); assertThat(valueRead).isNotNull(); - assertEquals(Currency.getInstance(BGL).getNumericCode(), valueRead.getNumericCode()); + assertThat(valueRead.getNumericCode()).isEqualTo(Currency.getInstance(BGL).getNumericCode()); } /** @@ -144,16 +144,16 @@ public class CurrencyConverterTest { Configuration config = ConfigurationProvider.getConfiguration(); Currency valueRead = config.get("tests.converter.currency.code-locale1", Currency.class); assertThat(valueRead).isNotNull(); - assertEquals(EUR, valueRead.getCurrencyCode()); + assertThat(valueRead.getCurrencyCode()).isEqualTo(EUR); valueRead = config.get("tests.converter.currency.code-locale2", Currency.class); assertThat(valueRead).isNotNull(); - assertEquals(EUR, valueRead.getCurrencyCode()); + assertThat(valueRead.getCurrencyCode()).isEqualTo(EUR); valueRead = config.get("tests.converter.currency.code-locale3", Currency.class); assertThat(valueRead).isNotNull(); - assertEquals(EUR, valueRead.getCurrencyCode()); + assertThat(valueRead.getCurrencyCode()).isEqualTo(EUR); valueRead = config.get("tests.converter.currency.code-locale4", Currency.class); assertThat(valueRead).isNotNull(); - assertEquals(EUR, valueRead.getCurrencyCode()); + assertThat(valueRead.getCurrencyCode()).isEqualTo(EUR); } /** @@ -167,17 +167,17 @@ public class CurrencyConverterTest { Configuration config = ConfigurationProvider.getConfiguration(); Currency valueRead = config.get("tests.converter.currency.code-locale-twopart", Currency.class); assertThat(valueRead).isNotNull(); - assertEquals(JPY, valueRead.getCurrencyCode()); + assertThat(valueRead.getCurrencyCode()).isEqualTo(JPY); valueRead = config.get("tests.converter.currency.code-locale-threepart", Currency.class); assertThat(valueRead).isNotNull(); - assertEquals(JPY, valueRead.getCurrencyCode()); + assertThat(valueRead.getCurrencyCode()).isEqualTo(JPY); } @Test(expected = ConfigException.class) public void testConvert_Currency_Code_Fourpart_Locale_Invalid() throws Exception { Configuration config = ConfigurationProvider.getConfiguration(); Currency valueRead = config.get("tests.converter.currency.code-locale-fourpart", Currency.class); - assertNull(valueRead); + assertThat(valueRead).isNull(); } @Test(expected = ConfigException.class) @@ -192,14 +192,14 @@ public class CurrencyConverterTest { CurrencyConverter converter = new CurrencyConverter(); converter.convert("", context); - assertTrue(context.getSupportedFormats().contains("<numericValue> (CurrencyConverter)")); - assertTrue(context.getSupportedFormats().contains("<locale> (CurrencyConverter)")); - assertTrue(context.getSupportedFormats().contains("<currencyCode>, using Locale.ENGLISH (CurrencyConverter)")); + assertThat(context.getSupportedFormats().contains("<numericValue> (CurrencyConverter)")).isTrue(); + assertThat(context.getSupportedFormats().contains("<locale> (CurrencyConverter)")).isTrue(); + assertThat(context.getSupportedFormats().contains("<currencyCode>, using Locale.ENGLISH (CurrencyConverter)")).isTrue(); } @Test public void testHashCode() { CurrencyConverter instance = new CurrencyConverter(); - assertEquals(CurrencyConverter.class.hashCode(), instance.hashCode()); + assertThat(instance.hashCode()).isEqualTo(CurrencyConverter.class.hashCode()); } } http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/119c4982/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 1f5070d..f7da834 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 @@ -23,10 +23,9 @@ import org.apache.tamaya.Configuration; import org.apache.tamaya.ConfigurationProvider; import org.apache.tamaya.TypeLiteral; import org.apache.tamaya.spi.ConversionContext; -import static org.junit.Assert.assertEquals; +import static org.assertj.core.api.Assertions.*; import org.junit.Test; -import static org.junit.Assert.assertTrue; /** * Tests the default converter for doubles. @@ -42,8 +41,8 @@ public class DoubleConverterTest { public void testConvert_Double_Decimal() throws Exception { Configuration config = ConfigurationProvider.getConfiguration(); Double valueRead = config.get("tests.converter.double.decimal", Double.class); - assertTrue(valueRead!=null); - assertEquals(valueRead, 1.23456789, 0.0d); + assertThat(valueRead!=null).isTrue(); + assertThat(1.23456789).isCloseTo(valueRead, within(0.0d)); } /** @@ -55,8 +54,8 @@ public class DoubleConverterTest { public void testConvert_Double_DecimalNegative() throws Exception { Configuration config = ConfigurationProvider.getConfiguration(); Double valueRead = config.get("tests.converter.double.decimalNegative", Double.class); - assertTrue(valueRead!=null); - assertEquals(valueRead, -1.23456789, 0.0d); + assertThat(valueRead!=null).isTrue(); + assertThat(-1.23456789).isCloseTo(valueRead, within(0.0d)); } /** @@ -68,8 +67,8 @@ public class DoubleConverterTest { public void testConvert_Double_Integer() throws Exception { Configuration config = ConfigurationProvider.getConfiguration(); Double valueRead = config.get("tests.converter.double.integer", Double.class); - assertTrue(valueRead!=null); - assertEquals(valueRead,100d, 0.0d); + assertThat(valueRead!=null).isTrue(); + assertThat(100d).isCloseTo(valueRead, within(0.0d)); } /** @@ -81,8 +80,8 @@ public class DoubleConverterTest { public void testConvert_Double_Hex1() throws Exception { Configuration config = ConfigurationProvider.getConfiguration(); Double valueRead = config.get("tests.converter.double.hex1", Double.class); - assertTrue(valueRead!=null); - assertEquals(valueRead,255d, 0.0d); + assertThat(valueRead!=null).isTrue(); + assertThat(255d).isCloseTo(valueRead, within(0.0d)); } /** @@ -94,8 +93,8 @@ public class DoubleConverterTest { public void testConvert_Double_Hex2() throws Exception { Configuration config = ConfigurationProvider.getConfiguration(); Double valueRead = config.get("tests.converter.double.hex2", Double.class); - assertTrue(valueRead!=null); - assertEquals(valueRead,-255d, 0.0d); + assertThat(valueRead!=null).isTrue(); + assertThat(-255d).isCloseTo(valueRead, within(0.0d)); } /** @@ -107,7 +106,7 @@ public class DoubleConverterTest { public void testConvert_Double_Hex3() throws Exception { Configuration config = ConfigurationProvider.getConfiguration(); Double valueRead = config.get("tests.converter.double.hex3", Double.class); - assertTrue(valueRead!=null); + assertThat(valueRead!=null).isTrue(); } /** @@ -119,8 +118,8 @@ public class DoubleConverterTest { public void testConvert_Double_MinValue() throws Exception { Configuration config = ConfigurationProvider.getConfiguration(); Double valueRead = config.get("tests.converter.double.min", Double.class); - assertTrue(valueRead!=null); - assertEquals(Double.MIN_VALUE, valueRead,0.0d); + assertThat(valueRead!=null).isTrue(); + assertThat(valueRead).isCloseTo(Double.MIN_VALUE, within(0.0d)); } /** @@ -132,8 +131,8 @@ public class DoubleConverterTest { public void testConvert_Double_MaxValue() throws Exception { Configuration config = ConfigurationProvider.getConfiguration(); Double valueRead = config.get("tests.converter.double.max", Double.class); - assertTrue(valueRead!=null); - assertEquals(Double.MAX_VALUE, valueRead,0.0d); + assertThat(valueRead!=null).isTrue(); + assertThat(valueRead).isCloseTo(Double.MAX_VALUE, within(0.0d)); } /** @@ -145,8 +144,8 @@ public class DoubleConverterTest { public void testConvert_Double_NaNValue() throws Exception { Configuration config = ConfigurationProvider.getConfiguration(); Double valueRead = config.get("tests.converter.double.nan", Double.class); - assertTrue(valueRead!=null); - assertEquals(Double.NaN, valueRead,0.0d); + assertThat(valueRead!=null).isTrue(); + assertThat(valueRead).isCloseTo(Double.NaN, within(0.0d)); } /** @@ -158,8 +157,8 @@ public class DoubleConverterTest { public void testConvert_Double_PositiveInfinityValue() throws Exception { Configuration config = ConfigurationProvider.getConfiguration(); Double valueRead = config.get("tests.converter.double.pi", Double.class); - assertTrue(valueRead!=null); - assertEquals(Double.POSITIVE_INFINITY, valueRead,0.0d); + assertThat(valueRead!=null).isTrue(); + assertThat(valueRead).isCloseTo(Double.POSITIVE_INFINITY, within(0.0d)); } /** @@ -171,8 +170,8 @@ public class DoubleConverterTest { public void testConvert_Double_NegativeInfinityValue() throws Exception { Configuration config = ConfigurationProvider.getConfiguration(); Double valueRead = config.get("tests.converter.double.ni", Double.class); - assertTrue(valueRead!=null); - assertEquals(Double.NEGATIVE_INFINITY, valueRead,0.0d); + assertThat(valueRead!=null).isTrue(); + assertThat(valueRead).isCloseTo(Double.NEGATIVE_INFINITY, within(0.0d)); } @@ -188,15 +187,15 @@ public class DoubleConverterTest { DoubleConverter converter = new DoubleConverter(); converter.convert("", context); - assertTrue(context.getSupportedFormats().contains("<double> (DoubleConverter)")); - assertTrue(context.getSupportedFormats().contains("MIN_VALUE (DoubleConverter)")); - assertTrue(context.getSupportedFormats().contains("MAX_VALUE (DoubleConverter)")); + assertThat(context.getSupportedFormats().contains("<double> (DoubleConverter)")).isTrue(); + assertThat(context.getSupportedFormats().contains("MIN_VALUE (DoubleConverter)")).isTrue(); + assertThat(context.getSupportedFormats().contains("MAX_VALUE (DoubleConverter)")).isTrue(); } @Test public void testHashCode() { DoubleConverter instance = new DoubleConverter(); - assertEquals(DoubleConverter.class.hashCode(), instance.hashCode()); + assertThat(instance.hashCode()).isEqualTo(DoubleConverter.class.hashCode()); } } http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/119c4982/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 a799135..e78c940 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 @@ -27,7 +27,7 @@ import org.mockito.runners.MockitoJUnitRunner; import java.time.Duration; import org.apache.tamaya.TypeLiteral; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; /** * Created by atsti on 02.10.2017. @@ -56,25 +56,25 @@ public class DurationConverterTest { public void convert() throws Exception { DurationConverter conv = new DurationConverter(); Duration duration = conv.convert("PT20.345S", context); - assertEquals(Duration.parse("PT20.345S"), duration); + assertThat(duration).isEqualTo(Duration.parse("PT20.345S")); duration = conv.convert("PT15M", context); - assertEquals(Duration.parse("PT15M"), duration); + assertThat(duration).isEqualTo(Duration.parse("PT15M")); duration = conv.convert("PT10H", context); - assertEquals(Duration.parse("PT10H"), duration); + assertThat(duration).isEqualTo(Duration.parse("PT10H")); duration = conv.convert("P2D", context); - assertEquals(Duration.parse("P2D"), duration); + assertThat(duration).isEqualTo(Duration.parse("P2D")); duration = conv.convert("P2DT3H4M", context); - assertEquals(Duration.parse("P2DT3H4M"), duration); + assertThat(duration).isEqualTo(Duration.parse("P2DT3H4M")); duration = conv.convert("foo", context); - assertNull(duration); + assertThat(duration).isNull(); } @Test public void equalsAndHashcode() throws Exception { DurationConverter conv1 = new DurationConverter(); DurationConverter conv2 = new DurationConverter(); - assertEquals(conv1, conv2); - assertEquals(conv1.hashCode(), conv2.hashCode()); + assertThat(conv2).isEqualTo(conv1); + assertThat(conv2.hashCode()).isEqualTo(conv1.hashCode()); } @Test @@ -83,13 +83,13 @@ public class DurationConverterTest { DurationConverter converter = new DurationConverter(); converter.convert("", localcontext); - assertTrue(localcontext.getSupportedFormats().contains("PT20M34S (DurationConverter)")); + assertThat(localcontext.getSupportedFormats().contains("PT20M34S (DurationConverter)")).isTrue(); } @Test public void testHashCode() { DurationConverter instance = new DurationConverter(); - assertEquals(DurationConverter.class.hashCode(), instance.hashCode()); + assertThat(instance.hashCode()).isEqualTo(DurationConverter.class.hashCode()); } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/119c4982/code/core/src/test/java/org/apache/tamaya/core/internal/converters/FileConverterTest.java ---------------------------------------------------------------------- diff --git a/code/core/src/test/java/org/apache/tamaya/core/internal/converters/FileConverterTest.java b/code/core/src/test/java/org/apache/tamaya/core/internal/converters/FileConverterTest.java index 41e372d..3342bb9 100644 --- a/code/core/src/test/java/org/apache/tamaya/core/internal/converters/FileConverterTest.java +++ b/code/core/src/test/java/org/apache/tamaya/core/internal/converters/FileConverterTest.java @@ -23,7 +23,7 @@ import java.net.URL; import org.apache.tamaya.TypeLiteral; import org.apache.tamaya.spi.ConversionContext; import org.junit.Test; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; /** * @@ -41,18 +41,18 @@ public class FileConverterTest { FileConverter instance = new FileConverter(); File result; - assertNull(instance.convert(null, context)); + assertThat(instance.convert(null, context)).isNull(); URL testfileUrl = getClass().getResource("/testfile.properties"); System.out.println(testfileUrl.toString()); result = instance.convert(testfileUrl.toString(), context); - assertNotNull(result); - assertTrue(context.getSupportedFormats().contains("<File> (FileConverter)")); + assertThat(result).isNotNull(); + assertThat(context.getSupportedFormats().contains("<File> (FileConverter)")).isTrue(); } @Test public void testHashCode(){ FileConverter instance = new FileConverter(); - assertEquals(FileConverter.class.hashCode(), instance.hashCode()); + assertThat(instance.hashCode()).isEqualTo(FileConverter.class.hashCode()); } } http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/119c4982/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 59e3c55..e9b3b7c 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 @@ -23,11 +23,10 @@ import org.apache.tamaya.Configuration; import org.apache.tamaya.ConfigurationProvider; import org.apache.tamaya.TypeLiteral; import org.apache.tamaya.spi.ConversionContext; -import static org.junit.Assert.assertEquals; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.within; import org.junit.Test; -import static org.junit.Assert.assertTrue; - /** * Tests the default converter for bytes. */ @@ -42,8 +41,8 @@ public class FloatConverterTest { public void testConvert_Float_Decimal() throws Exception { Configuration config = ConfigurationProvider.getConfiguration(); Float valueRead = config.get("tests.converter.float.decimal", Float.class); - assertTrue(valueRead!=null); - assertEquals(valueRead, 1.23456789f, 0.0f); + assertThat(valueRead!=null).isTrue(); + assertThat(1.23456789f).isCloseTo(valueRead, within(0.0f)); } /** @@ -55,8 +54,8 @@ public class FloatConverterTest { public void testConvert_Float_DecimalNegative() throws Exception { Configuration config = ConfigurationProvider.getConfiguration(); Float valueRead = config.get("tests.converter.float.decimalNegative", Float.class); - assertTrue(valueRead!=null); - assertEquals(valueRead, -1.23456789f, 0.0f); + assertThat(valueRead!=null).isTrue(); + assertThat(-1.23456789f).isCloseTo(valueRead, within(0.0f)); } /** @@ -68,8 +67,8 @@ public class FloatConverterTest { public void testConvert_Float_Integer() throws Exception { Configuration config = ConfigurationProvider.getConfiguration(); Float valueRead = config.get("tests.converter.float.integer", Float.class); - assertTrue(valueRead!=null); - assertEquals(valueRead,100f, 0.0f); + assertThat(valueRead!=null).isTrue(); + assertThat(100f).isCloseTo(valueRead, within(0.0f)); } /** @@ -81,8 +80,8 @@ public class FloatConverterTest { public void testConvert_Float_Hex1() throws Exception { Configuration config = ConfigurationProvider.getConfiguration(); Float valueRead = config.get("tests.converter.float.hex1", Float.class); - assertTrue(valueRead!=null); - assertEquals(valueRead,255f, 0.0f); + assertThat(valueRead!=null).isTrue(); + assertThat(255f).isCloseTo(valueRead, within(0.0f)); } /** @@ -94,8 +93,8 @@ public class FloatConverterTest { public void testConvert_Float_Hex2() throws Exception { Configuration config = ConfigurationProvider.getConfiguration(); Float valueRead = config.get("tests.converter.float.hex2", Float.class); - assertTrue(valueRead!=null); - assertEquals(valueRead,-255f, 0.0f); + assertThat(valueRead!=null).isTrue(); + assertThat(-255f).isCloseTo(valueRead, within(0.0f)); } /** @@ -107,8 +106,8 @@ public class FloatConverterTest { public void testConvert_Float_Hex3() throws Exception { Configuration config = ConfigurationProvider.getConfiguration(); Float valueRead = config.get("tests.converter.float.hex3", Float.class); - assertTrue(valueRead!=null); - assertEquals(valueRead,255f, 0.0f); + assertThat(valueRead!=null).isTrue(); + assertThat(255f).isCloseTo(valueRead, within(0.0f)); } /** @@ -120,8 +119,8 @@ public class FloatConverterTest { public void testConvert_Float_MinValue() throws Exception { Configuration config = ConfigurationProvider.getConfiguration(); Float valueRead = config.get("tests.converter.float.min", Float.class); - assertTrue(valueRead!=null); - assertEquals(Float.MIN_VALUE, valueRead,0.0f); + assertThat(valueRead!=null).isTrue(); + assertThat(valueRead).isCloseTo(Float.MIN_VALUE, within(0.0f)); } /** @@ -133,8 +132,8 @@ public class FloatConverterTest { public void testConvert_Float_MaxValue() throws Exception { Configuration config = ConfigurationProvider.getConfiguration(); Float valueRead = config.get("tests.converter.float.max", Float.class); - assertTrue(valueRead!=null); - assertEquals(Float.MAX_VALUE, valueRead,0.0f); + assertThat(valueRead!=null).isTrue(); + assertThat(valueRead).isCloseTo(Float.MAX_VALUE, within(0.0f)); } /** @@ -146,8 +145,8 @@ public class FloatConverterTest { public void testConvert_Float_NaNValue() throws Exception { Configuration config = ConfigurationProvider.getConfiguration(); Float valueRead = config.get("tests.converter.float.nan", Float.class); - assertTrue(valueRead!=null); - assertEquals(Float.NaN, valueRead,0.0f); + assertThat(valueRead!=null).isTrue(); + assertThat(valueRead).isCloseTo(Float.NaN, within(0.0f)); } /** @@ -159,8 +158,8 @@ public class FloatConverterTest { public void testConvert_Float_PositiveInfinityValue() throws Exception { Configuration config = ConfigurationProvider.getConfiguration(); Float valueRead = config.get("tests.converter.float.pi", Float.class); - assertTrue(valueRead!=null); - assertEquals(Float.POSITIVE_INFINITY, valueRead,0.0f); + assertThat(valueRead!=null).isTrue(); + assertThat(valueRead).isCloseTo(Float.POSITIVE_INFINITY, within(0.0f)); } /** @@ -172,8 +171,8 @@ public class FloatConverterTest { public void testConvert_Float_NegativeInfinityValue() throws Exception { Configuration config = ConfigurationProvider.getConfiguration(); Float valueRead = config.get("tests.converter.float.ni", Float.class); - assertTrue(valueRead!=null); - assertEquals(Float.NEGATIVE_INFINITY, valueRead,0.0f); + assertThat(valueRead!=null).isTrue(); + assertThat(valueRead).isCloseTo(Float.NEGATIVE_INFINITY, within(0.0f)); } @Test(expected = ConfigException.class) @@ -188,15 +187,15 @@ public class FloatConverterTest { FloatConverter converter = new FloatConverter(); converter.convert("", context); - assertTrue(context.getSupportedFormats().contains("<float> (FloatConverter)")); - assertTrue(context.getSupportedFormats().contains("MIN_VALUE (FloatConverter)")); - assertTrue(context.getSupportedFormats().contains("MAX_VALUE (FloatConverter)")); + assertThat(context.getSupportedFormats().contains("<float> (FloatConverter)")).isTrue(); + assertThat(context.getSupportedFormats().contains("MIN_VALUE (FloatConverter)")).isTrue(); + assertThat(context.getSupportedFormats().contains("MAX_VALUE (FloatConverter)")).isTrue(); } @Test public void testHashCode() { FloatConverter instance = new FloatConverter(); - assertEquals(FloatConverter.class.hashCode(), instance.hashCode()); + assertThat(instance.hashCode()).isEqualTo(FloatConverter.class.hashCode()); } http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/119c4982/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 e3b543d..c812dfd 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 @@ -27,7 +27,7 @@ import org.mockito.runners.MockitoJUnitRunner; import java.time.Instant; import org.apache.tamaya.TypeLiteral; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; /** * Created by atsti on 02.10.2017. @@ -42,17 +42,17 @@ public class InstantConverterTest { public void convert() throws Exception { InstantConverter conv = new InstantConverter(); Instant value = conv.convert("2007-12-03T10:15:30.00Z", context); - assertEquals(value, Instant.parse("2007-12-03T10:15:30.00Z")); + assertThat(Instant.parse("2007-12-03T10:15:30.00Z")).isEqualTo(value); value = conv.convert("foo", context); - assertNull(value); + assertThat(value).isNull(); } @Test public void equalsAndHashcode() throws Exception { InstantConverter conv1 = new InstantConverter(); InstantConverter conv2 = new InstantConverter(); - assertEquals(conv1, conv2); - assertEquals(conv1.hashCode(), conv2.hashCode()); + assertThat(conv2).isEqualTo(conv1); + assertThat(conv2.hashCode()).isEqualTo(conv1.hashCode()); } @Test @@ -61,13 +61,13 @@ public class InstantConverterTest { InstantConverter converter = new InstantConverter(); converter.convert("", localcontext); - assertTrue(localcontext.getSupportedFormats().toString().contains(" (InstantConverter)")); + assertThat(localcontext.getSupportedFormats().toString().contains(" (InstantConverter)")).isTrue(); } @Test public void testHashCode() { InstantConverter instance = new InstantConverter(); - assertEquals(InstantConverter.class.hashCode(), instance.hashCode()); + assertThat(instance.hashCode()).isEqualTo(InstantConverter.class.hashCode()); } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/119c4982/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 9e8e0af..72b4eee 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 @@ -25,7 +25,7 @@ import org.apache.tamaya.TypeLiteral; import org.apache.tamaya.spi.ConversionContext; import org.junit.Test; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; /** * Tests the default converter for Integers. @@ -41,8 +41,8 @@ public class IntegerConverterTest { public void testConvert_Integer_Decimal() throws Exception { Configuration config = ConfigurationProvider.getConfiguration(); Integer valueRead = config.get("tests.converter.integer.decimal", Integer.class); - assertTrue(valueRead != null); - assertEquals(valueRead.intValue(), 101); + assertThat(valueRead != null).isTrue(); + assertThat(101).isEqualTo(valueRead.intValue()); } /** @@ -54,8 +54,8 @@ public class IntegerConverterTest { public void testConvert_Integer_Octal() throws Exception { Configuration config = ConfigurationProvider.getConfiguration(); Integer valueRead = config.get("tests.converter.integer.octal", Integer.class); - assertTrue(valueRead != null); - assertEquals(valueRead.intValue(), Integer.decode("02").intValue()); + assertThat(valueRead != null).isTrue(); + assertThat(Integer.decode("02").intValue()).isEqualTo(valueRead.intValue()); } /** @@ -67,11 +67,11 @@ public class IntegerConverterTest { public void testConvert_Integer_Hex() throws Exception { Configuration config = ConfigurationProvider.getConfiguration(); Integer valueRead = config.get("tests.converter.integer.hex.lowerX", Integer.class); - assertTrue(valueRead != null); - assertEquals(valueRead.intValue(), Integer.decode("0x2F").intValue()); + assertThat(valueRead != null).isTrue(); + assertThat(Integer.decode("0x2F").intValue()).isEqualTo(valueRead.intValue()); valueRead = config.get("tests.converter.integer.hex.upperX", Integer.class); - assertTrue(valueRead != null); - assertEquals(valueRead.intValue(), Integer.decode("0X3F").intValue()); + assertThat(valueRead != null).isTrue(); + assertThat(Integer.decode("0X3F").intValue()).isEqualTo(valueRead.intValue()); } /** @@ -83,7 +83,7 @@ public class IntegerConverterTest { public void testConvert_NotPresent() throws Exception { Configuration config = ConfigurationProvider.getConfiguration(); Integer valueRead = config.get("tests.converter.integer.foo", Integer.class); - assertFalse(valueRead != null); + assertThat(valueRead != null).isFalse(); } /** @@ -95,8 +95,8 @@ public class IntegerConverterTest { public void testConvert_Integer_MinValue() throws Exception { Configuration config = ConfigurationProvider.getConfiguration(); Integer valueRead = config.get("tests.converter.integer.min", Integer.class); - assertTrue(valueRead != null); - assertEquals(Integer.MIN_VALUE, valueRead.intValue()); + assertThat(valueRead != null).isTrue(); + assertThat(valueRead.intValue()).isEqualTo(Integer.MIN_VALUE); } /** @@ -108,8 +108,8 @@ public class IntegerConverterTest { public void testConvert_Integer_MaxValue() throws Exception { Configuration config = ConfigurationProvider.getConfiguration(); Integer valueRead = config.get("tests.converter.integer.max", Integer.class); - assertTrue(valueRead != null); - assertEquals(Integer.MAX_VALUE, valueRead.intValue()); + assertThat(valueRead != null).isTrue(); + assertThat(valueRead.intValue()).isEqualTo(Integer.MAX_VALUE); } @Test(expected = ConfigException.class) @@ -124,14 +124,14 @@ public class IntegerConverterTest { IntegerConverter converter = new IntegerConverter(); converter.convert("", context); - assertTrue(context.getSupportedFormats().contains("<int> (IntegerConverter)")); - assertTrue(context.getSupportedFormats().contains("MIN_VALUE (IntegerConverter)")); - assertTrue(context.getSupportedFormats().contains("MAX_VALUE (IntegerConverter)")); + assertThat(context.getSupportedFormats().contains("<int> (IntegerConverter)")).isTrue(); + assertThat(context.getSupportedFormats().contains("MIN_VALUE (IntegerConverter)")).isTrue(); + assertThat(context.getSupportedFormats().contains("MAX_VALUE (IntegerConverter)")).isTrue(); } @Test public void testHashCode() { IntegerConverter instance = new IntegerConverter(); - assertEquals(IntegerConverter.class.hashCode(), instance.hashCode()); + assertThat(instance.hashCode()).isEqualTo(IntegerConverter.class.hashCode()); } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/119c4982/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 8d7cc0b..e082de2 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 @@ -27,7 +27,7 @@ import org.mockito.runners.MockitoJUnitRunner; import java.time.LocalDate; import org.apache.tamaya.TypeLiteral; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; /** * Created by atsti on 02.10.2017. @@ -42,17 +42,17 @@ public class LocalDateConverterTest { public void convert() throws Exception { LocalDateConverter conv = new LocalDateConverter(); LocalDate value = conv.convert("2007-12-03", context); - assertEquals(value, LocalDate.parse("2007-12-03")); + assertThat(LocalDate.parse("2007-12-03")).isEqualTo(value); value = conv.convert("foo", context); - assertNull(value); + assertThat(value).isNull(); } @Test public void equalsAndHashcode() throws Exception { LocalDateConverter conv1 = new LocalDateConverter(); LocalDateConverter conv2 = new LocalDateConverter(); - assertEquals(conv1, conv2); - assertEquals(conv1.hashCode(), conv2.hashCode()); + assertThat(conv2).isEqualTo(conv1); + assertThat(conv2.hashCode()).isEqualTo(conv1.hashCode()); } @Test @@ -61,12 +61,12 @@ public class LocalDateConverterTest { LocalDateConverter converter = new LocalDateConverter(); converter.convert("", localcontext); - assertTrue(localcontext.getSupportedFormats().toString().contains(" (LocalDateConverter)")); + assertThat(localcontext.getSupportedFormats().toString().contains(" (LocalDateConverter)")).isTrue(); } @Test public void testHashCode() { LocalDateConverter instance = new LocalDateConverter(); - assertEquals(LocalDateConverter.class.hashCode(), instance.hashCode()); + assertThat(instance.hashCode()).isEqualTo(LocalDateConverter.class.hashCode()); } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/119c4982/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 c3355bb..09d82da 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 @@ -27,7 +27,7 @@ import org.mockito.runners.MockitoJUnitRunner; import java.time.LocalDateTime; import org.apache.tamaya.TypeLiteral; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; /** * Created by atsti on 02.10.2017. @@ -42,17 +42,17 @@ public class LocalDateTimeConverterTest { public void convert() throws Exception { LocalDateTimeConverter conv = new LocalDateTimeConverter(); LocalDateTime value = conv.convert("2007-12-03T10:15:30", context); - assertEquals(value, LocalDateTime.parse("2007-12-03T10:15:30")); + assertThat(LocalDateTime.parse("2007-12-03T10:15:30")).isEqualTo(value); value = conv.convert("foo", context); - assertNull(value); + assertThat(value).isNull(); } @Test public void equalsAndHashcode() throws Exception { LocalDateTimeConverter conv1 = new LocalDateTimeConverter(); LocalDateTimeConverter conv2 = new LocalDateTimeConverter(); - assertEquals(conv1, conv2); - assertEquals(conv1.hashCode(), conv2.hashCode()); + assertThat(conv2).isEqualTo(conv1); + assertThat(conv2.hashCode()).isEqualTo(conv1.hashCode()); } @Test @@ -61,12 +61,12 @@ public class LocalDateTimeConverterTest { LocalDateTimeConverter converter = new LocalDateTimeConverter(); converter.convert("", localcontext); - assertTrue(localcontext.getSupportedFormats().toString().contains(" (LocalDateTimeConverter)")); + assertThat(localcontext.getSupportedFormats().toString().contains(" (LocalDateTimeConverter)")).isTrue(); } @Test public void testHashCode() { LocalDateTimeConverter instance = new LocalDateTimeConverter(); - assertEquals(LocalDateTimeConverter.class.hashCode(), instance.hashCode()); + assertThat(instance.hashCode()).isEqualTo(LocalDateTimeConverter.class.hashCode()); } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/119c4982/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 b8d2b84..4045ad5 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 @@ -27,7 +27,7 @@ import org.mockito.runners.MockitoJUnitRunner; import java.time.LocalTime; import org.apache.tamaya.TypeLiteral; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; /** * Created by atsti on 02.10.2017. @@ -42,17 +42,17 @@ public class LocalTimeConverterTest { public void convert() throws Exception { LocalTimeConverter conv = new LocalTimeConverter(); LocalTime value = conv.convert("10:15:30", context); - assertEquals(value, LocalTime.parse("10:15:30")); + assertThat(LocalTime.parse("10:15:30")).isEqualTo(value); value = conv.convert("foo", context); - assertNull(value); + assertThat(value).isNull(); } @Test public void equalsAndHashcode() throws Exception { LocalTimeConverter conv1 = new LocalTimeConverter(); LocalTimeConverter conv2 = new LocalTimeConverter(); - assertEquals(conv1, conv2); - assertEquals(conv1.hashCode(), conv2.hashCode()); + assertThat(conv2).isEqualTo(conv1); + assertThat(conv2.hashCode()).isEqualTo(conv1.hashCode()); } @Test @@ -61,12 +61,12 @@ public class LocalTimeConverterTest { LocalTimeConverter converter = new LocalTimeConverter(); converter.convert("", localcontext); - assertTrue(localcontext.getSupportedFormats().toString().contains(" (LocalTimeConverter)")); + assertThat(localcontext.getSupportedFormats().toString().contains(" (LocalTimeConverter)")).isTrue(); } @Test public void testHashCode() { LocalTimeConverter instance = new LocalTimeConverter(); - assertEquals(LocalTimeConverter.class.hashCode(), instance.hashCode()); + assertThat(instance.hashCode()).isEqualTo(LocalTimeConverter.class.hashCode()); } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/119c4982/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 bb228e6..401d2e5 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 @@ -25,7 +25,7 @@ import org.apache.tamaya.TypeLiteral; import org.apache.tamaya.spi.ConversionContext; import org.junit.Test; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; /** * Tests the default converter for Longs. @@ -41,8 +41,8 @@ public class LongConverterTest { public void testConvert_Long_Decimal() throws Exception { Configuration config = ConfigurationProvider.getConfiguration(); Long valueRead = config.get("tests.converter.long.decimal", Long.class); - assertTrue(valueRead != null); - assertEquals(valueRead.intValue(), 101); + assertThat(valueRead != null).isTrue(); + assertThat(101).isEqualTo(valueRead.intValue()); } /** @@ -54,8 +54,8 @@ public class LongConverterTest { public void testConvert_Long_Octal() throws Exception { Configuration config = ConfigurationProvider.getConfiguration(); Long valueRead = config.get("tests.converter.long.octal", Long.class); - assertTrue(valueRead != null); - assertEquals(valueRead.intValue(), Long.decode("02").intValue()); + assertThat(valueRead != null).isTrue(); + assertThat(Long.decode("02").intValue()).isEqualTo(valueRead.intValue()); } /** @@ -67,11 +67,11 @@ public class LongConverterTest { public void testConvert_Long_Hex() throws Exception { Configuration config = ConfigurationProvider.getConfiguration(); Long valueRead = config.get("tests.converter.long.hex.lowerX", Long.class); - assertTrue(valueRead != null); - assertEquals(valueRead.intValue(), Long.decode("0x2F").intValue()); + assertThat(valueRead != null).isTrue(); + assertThat(Long.decode("0x2F").intValue()).isEqualTo(valueRead.intValue()); valueRead = config.get("tests.converter.long.hex.upperX", Long.class); - assertTrue(valueRead != null); - assertEquals(valueRead.intValue(), Long.decode("0X3F").intValue()); + assertThat(valueRead != null).isTrue(); + assertThat(Long.decode("0X3F").intValue()).isEqualTo(valueRead.intValue()); } /** @@ -83,7 +83,7 @@ public class LongConverterTest { public void testConvert_NotPresent() throws Exception { Configuration config = ConfigurationProvider.getConfiguration(); Long valueRead = config.get("tests.converter.long.foo", Long.class); - assertFalse(valueRead != null); + assertThat(valueRead != null).isFalse(); } /** @@ -95,8 +95,8 @@ public class LongConverterTest { public void testConvert_Long_MinValue() throws Exception { Configuration config = ConfigurationProvider.getConfiguration(); Long valueRead = config.get("tests.converter.long.min", Long.class); - assertTrue(valueRead != null); - assertEquals(Long.MIN_VALUE, valueRead.longValue()); + assertThat(valueRead != null).isTrue(); + assertThat(valueRead.longValue()).isEqualTo(Long.MIN_VALUE); } /** @@ -108,8 +108,8 @@ public class LongConverterTest { public void testConvert_Long_MaxValue() throws Exception { Configuration config = ConfigurationProvider.getConfiguration(); Long valueRead = config.get("tests.converter.long.max", Long.class); - assertTrue(valueRead != null); - assertEquals(Long.MAX_VALUE, valueRead.longValue()); + assertThat(valueRead != null).isTrue(); + assertThat(valueRead.longValue()).isEqualTo(Long.MAX_VALUE); } @Test(expected = ConfigException.class) @@ -124,14 +124,14 @@ public class LongConverterTest { LongConverter converter = new LongConverter(); converter.convert("", context); - assertTrue(context.getSupportedFormats().contains("<long> (LongConverter)")); - assertTrue(context.getSupportedFormats().contains("MIN_VALUE (LongConverter)")); - assertTrue(context.getSupportedFormats().contains("MAX_VALUE (LongConverter)")); + assertThat(context.getSupportedFormats().contains("<long> (LongConverter)")).isTrue(); + assertThat(context.getSupportedFormats().contains("MIN_VALUE (LongConverter)")).isTrue(); + assertThat(context.getSupportedFormats().contains("MAX_VALUE (LongConverter)")).isTrue(); } @Test public void testHashCode() { LongConverter instance = new LongConverter(); - assertEquals(LongConverter.class.hashCode(), instance.hashCode()); + assertThat(instance.hashCode()).isEqualTo(LongConverter.class.hashCode()); } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/119c4982/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 6131157..2376bb3 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 @@ -27,7 +27,7 @@ import org.apache.tamaya.ConfigException; import org.apache.tamaya.TypeLiteral; import org.apache.tamaya.spi.ConversionContext; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; /** * Tests the default converter for Number. @@ -43,8 +43,8 @@ public class NumberConverterTest { public void testConvert_Decimal() throws Exception { Configuration config = ConfigurationProvider.getConfiguration(); Number valueRead = config.get("tests.converter.bd.decimal", Number.class); - assertNotNull(valueRead); - assertEquals(valueRead, 101L); + assertThat(valueRead).isNotNull(); + assertThat(101L).isEqualTo(valueRead); } @@ -57,11 +57,11 @@ public class NumberConverterTest { public void testConvert_Hex() throws Exception { Configuration config = ConfigurationProvider.getConfiguration(); Number valueRead = config.get("tests.converter.bd.hex.lowerX", Number.class); - assertNotNull(valueRead); - assertEquals(valueRead, Long.valueOf("47")); + assertThat(valueRead).isNotNull(); + assertThat(Long.valueOf("47")).isEqualTo(valueRead); valueRead = config.get("tests.converter.bd.hex.upperX", Number.class); - assertNotNull(valueRead); - assertEquals(valueRead, Long.valueOf("63")); + assertThat(valueRead).isNotNull(); + assertThat(Long.valueOf("63")).isEqualTo(valueRead); } /** @@ -73,7 +73,7 @@ public class NumberConverterTest { public void testConvert_NotPresent() throws Exception { Configuration config = ConfigurationProvider.getConfiguration(); Number valueRead = config.get("tests.converter.bd.foo", Number.class); - assertNull(valueRead); + assertThat(valueRead).isNull(); } /** @@ -85,9 +85,9 @@ public class NumberConverterTest { public void testConvert_BigValue() throws Exception { Configuration config = ConfigurationProvider.getConfiguration(); Number valueRead = config.get("tests.converter.bd.big", Number.class); - assertNotNull(valueRead); - assertEquals(new BigDecimal("101666666666666662333337263723628763821638923628193612983618293628763"), - valueRead); + assertThat(valueRead).isNotNull(); + assertThat(new BigDecimal("101666666666666662333337263723628763821638923628193612983618293628763")) + .isEqualTo(valueRead); } /** @@ -99,9 +99,10 @@ public class NumberConverterTest { public void testConvert_BigFloatValue() throws Exception { Configuration config = ConfigurationProvider.getConfiguration(); Number valueRead = config.get("tests.converter.bd.bigFloat", Number.class); - assertNotNull(valueRead); - assertEquals(new BigDecimal("1016666666666666623333372637236287638216389293628763.1016666666666666623333372" + - "63723628763821638923628193612983618293628763"), valueRead); + assertThat(valueRead).isNotNull(); + assertThat(new BigDecimal("1016666666666666623333372637236287638216389293628763.1016666666666666623333372" + + "63723628763821638923628193612983618293628763")) + .isEqualTo(valueRead); } /** @@ -113,8 +114,8 @@ public class NumberConverterTest { public void testConvert_PositiveInfinityValue() throws Exception { Configuration config = ConfigurationProvider.getConfiguration(); Number valueRead = config.get("tests.converter.double.pi", Number.class); - assertNotNull(valueRead); - assertEquals(Double.POSITIVE_INFINITY, valueRead.doubleValue(),0.0d); + assertThat(valueRead).isNotNull(); + assertThat(valueRead.doubleValue()).isCloseTo(Double.POSITIVE_INFINITY, within(0.0d)); } /** @@ -126,8 +127,8 @@ public class NumberConverterTest { public void testConvert_NegativeInfinityValue() throws Exception { Configuration config = ConfigurationProvider.getConfiguration(); Number valueRead = config.get("tests.converter.double.ni", Number.class); - assertNotNull(valueRead); - assertEquals(Double.NEGATIVE_INFINITY, valueRead.doubleValue(),0.0d); + assertThat(valueRead).isNotNull(); + assertThat(valueRead.doubleValue()).isCloseTo(Double.NEGATIVE_INFINITY, within(0.0d)); } /** @@ -139,8 +140,8 @@ public class NumberConverterTest { public void testConvert_NaNValue() throws Exception { Configuration config = ConfigurationProvider.getConfiguration(); Number valueRead = config.get("tests.converter.double.nan", Number.class); - assertNotNull(valueRead); - assertEquals(Double.NaN, valueRead.doubleValue(),0.0d); + assertThat(valueRead).isNotNull(); + assertThat(valueRead.doubleValue()).isCloseTo(Double.NaN, within(0.0d)); } @Test(expected = ConfigException.class) @@ -155,15 +156,15 @@ public class NumberConverterTest { NumberConverter converter = new NumberConverter(); converter.convert("", context); - assertTrue(context.getSupportedFormats().contains("<double>, <long> (NumberConverter)")); - assertTrue(context.getSupportedFormats().contains("POSITIVE_INFINITY (NumberConverter)")); - assertTrue(context.getSupportedFormats().contains("NEGATIVE_INFINITY (NumberConverter)")); - assertTrue(context.getSupportedFormats().contains("NAN (NumberConverter)")); + assertThat(context.getSupportedFormats().contains("<double>, <long> (NumberConverter)")).isTrue(); + assertThat(context.getSupportedFormats().contains("POSITIVE_INFINITY (NumberConverter)")).isTrue(); + assertThat(context.getSupportedFormats().contains("NEGATIVE_INFINITY (NumberConverter)")).isTrue(); + assertThat(context.getSupportedFormats().contains("NAN (NumberConverter)")).isTrue(); } @Test public void testHashCode() { NumberConverter instance = new NumberConverter(); - assertEquals(NumberConverter.class.hashCode(), instance.hashCode()); + assertThat(instance.hashCode()).isEqualTo(NumberConverter.class.hashCode()); } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/119c4982/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 fa747be..f702070 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 @@ -28,7 +28,7 @@ import org.mockito.runners.MockitoJUnitRunner; import java.time.OffsetDateTime; import org.apache.tamaya.TypeLiteral; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; /** * Created by atsti on 02.10.2017. @@ -43,17 +43,17 @@ public class OffsetDateTimeConverterTest { public void convert() throws Exception { OffsetDateTimeConverter conv = new OffsetDateTimeConverter(); OffsetDateTime value = conv.convert("2007-12-03T10:15:30+01:00", context); - assertEquals(value, OffsetDateTime.parse("2007-12-03T10:15:30+01:00")); + assertThat(OffsetDateTime.parse("2007-12-03T10:15:30+01:00")).isEqualTo(value); value = conv.convert("foo", context); - assertNull(value); + assertThat(value).isNull(); } @Test public void equalsAndHashcode() throws Exception { OffsetDateTimeConverter conv1 = new OffsetDateTimeConverter(); OffsetDateTimeConverter conv2 = new OffsetDateTimeConverter(); - assertEquals(conv1, conv2); - assertEquals(conv1.hashCode(), conv2.hashCode()); + assertThat(conv2).isEqualTo(conv1); + assertThat(conv2.hashCode()).isEqualTo(conv1.hashCode()); } @Test @@ -62,12 +62,12 @@ public class OffsetDateTimeConverterTest { OffsetDateTimeConverter converter = new OffsetDateTimeConverter(); converter.convert("", localcontext); - assertTrue(localcontext.getSupportedFormats().toString().contains(" (OffsetDateTimeConverter)")); + assertThat(localcontext.getSupportedFormats().toString().contains(" (OffsetDateTimeConverter)")).isTrue(); } @Test public void testHashCode() { OffsetDateTimeConverter instance = new OffsetDateTimeConverter(); - assertEquals(OffsetDateTimeConverter.class.hashCode(), instance.hashCode()); + assertThat(instance.hashCode()).isEqualTo(OffsetDateTimeConverter.class.hashCode()); } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/119c4982/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 2bf85c9..49edb07 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 @@ -27,7 +27,7 @@ import org.mockito.runners.MockitoJUnitRunner; import java.time.OffsetTime; import org.apache.tamaya.TypeLiteral; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; /** * Created by atsti on 02.10.2017. @@ -42,17 +42,17 @@ public class OffsetTimeConverterTest { public void convert() throws Exception { OffsetTimeConverter conv = new OffsetTimeConverter(); OffsetTime value = conv.convert("10:15:30+01:00", context); - assertEquals(value, OffsetTime.parse("10:15:30+01:00")); + assertThat(OffsetTime.parse("10:15:30+01:00")).isEqualTo(value); value = conv.convert("foo", context); - assertNull(value); + assertThat(value).isNull(); } @Test public void equalsAndHashcode() throws Exception { OffsetTimeConverter conv1 = new OffsetTimeConverter(); OffsetTimeConverter conv2 = new OffsetTimeConverter(); - assertEquals(conv1, conv2); - assertEquals(conv1.hashCode(), conv2.hashCode()); + assertThat(conv2).isEqualTo(conv1); + assertThat(conv2.hashCode()).isEqualTo(conv1.hashCode()); } @Test @@ -61,12 +61,12 @@ public class OffsetTimeConverterTest { OffsetTimeConverter converter = new OffsetTimeConverter(); converter.convert("", localcontext); - assertTrue(localcontext.getSupportedFormats().toString().contains(" (OffsetTimeConverter)")); + assertThat(localcontext.getSupportedFormats().toString().contains(" (OffsetTimeConverter)")).isTrue(); } @Test public void testHashCode() { OffsetTimeConverter instance = new OffsetTimeConverter(); - assertEquals(OffsetTimeConverter.class.hashCode(), instance.hashCode()); + assertThat(instance.hashCode()).isEqualTo(OffsetTimeConverter.class.hashCode()); } } http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/119c4982/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 3bcb7b1..584e9d2 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 @@ -26,15 +26,15 @@ import java.util.Optional; import org.apache.tamaya.ConfigurationProvider; import org.apache.tamaya.TypeLiteral; import org.apache.tamaya.spi.ConversionContext; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; public class OptionalConverterTest { @Test public void nullConversionYieldsEmptyOptional() { final Optional<?> result = new OptionalConverter().convert(null, null); - assertNotNull(result); - assertFalse(result.isPresent()); + assertThat(result).isNotNull(); + assertThat(result.isPresent()).isFalse(); } @Test(expected = ConfigException.class) @@ -49,9 +49,9 @@ public class OptionalConverterTest { ConversionContext ctx = new ConversionContext.Builder("testOptionalString", listOfStringTypeLiteral).build(); final Optional<String> result = new OptionalConverter().convert("astring", ctx); - assertNotNull(result); - assertTrue(result.isPresent()); - assertEquals("astring", result.get()); + assertThat(result).isNotNull(); + assertThat(result.isPresent()).isTrue(); + assertThat(result.get()).isEqualTo("astring"); } @Test @@ -63,15 +63,15 @@ public class OptionalConverterTest { .build(); final Optional<Integer> result = new OptionalConverter().convert("11", ctx); - assertNotNull(result); - assertTrue(result.isPresent()); - assertEquals(11, result.get().intValue()); + assertThat(result).isNotNull(); + assertThat(result.isPresent()).isTrue(); + assertThat(result.get().intValue()).isEqualTo(11); } @Test public void testHashCode() { OptionalConverter instance = new OptionalConverter(); - assertEquals(OptionalConverter.class.hashCode(), instance.hashCode()); + assertThat(instance.hashCode()).isEqualTo(OptionalConverter.class.hashCode()); } } http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/119c4982/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 534a643..97b24b9 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 @@ -28,7 +28,7 @@ import java.nio.file.Path; import java.nio.file.Paths; import org.apache.tamaya.TypeLiteral; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; /** * Created by atsti on 02.10.2017. @@ -43,33 +43,33 @@ public class PathConverterTest { public void convert() throws Exception { PathConverter conv = new PathConverter(); Path value = conv.convert("testRoot", context); - assertEquals(value, Paths.get("testRoot")); + assertThat(Paths.get("testRoot")).isEqualTo(value); value = conv.convert("foo", context); - assertNotNull(value); + assertThat(value).isNotNull(); } @Test public void convertNull() throws Exception { PathConverter conv = new PathConverter(); Path value = conv.convert(null, context); - assertNull(value); + assertThat(value).isNull(); value = conv.convert("", context); - assertNull(value); + assertThat(value).isNull(); } @Test public void convertInvalidPath() throws Exception { PathConverter conv = new PathConverter(); Path value = conv.convert("/invalid:/\u0000", context); - assertNull(value); + assertThat(value).isNull(); } @Test public void equalsAndHashcode() throws Exception { PathConverter conv1 = new PathConverter(); PathConverter conv2 = new PathConverter(); - assertEquals(conv1, conv2); - assertEquals(conv1.hashCode(), conv2.hashCode()); + assertThat(conv2).isEqualTo(conv1); + assertThat(conv2.hashCode()).isEqualTo(conv1.hashCode()); } @Test @@ -77,13 +77,13 @@ public class PathConverterTest { ConversionContext localcontext = new ConversionContext.Builder(TypeLiteral.of(Path.class)).build(); PathConverter converter = new PathConverter(); converter.convert("notempty", localcontext); - assertTrue(localcontext.getSupportedFormats().contains("<File> (PathConverter)")); + assertThat(localcontext.getSupportedFormats().contains("<File> (PathConverter)")).isTrue(); } @Test public void testHashCode() { PathConverter instance = new PathConverter(); - assertEquals(PathConverter.class.hashCode(), instance.hashCode()); + assertThat(instance.hashCode()).isEqualTo(PathConverter.class.hashCode()); } }
