You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tamaya.apache.org by po...@apache.org on 2017/10/26 22:01:41 UTC
incubator-tamaya git commit: Rework tests
Repository: incubator-tamaya
Updated Branches:
refs/heads/master 1bcf441da -> 3133174f9
Rework tests
Fix mixture of expected and actual value
Fix warnings and typos.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/3133174f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/3133174f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/3133174f
Branch: refs/heads/master
Commit: 3133174f94c6236e602e8bb8a43412fcd9802099
Parents: 1bcf441
Author: Phil Ottlinger <po...@apache.org>
Authored: Fri Oct 27 00:01:19 2017 +0200
Committer: Phil Ottlinger <po...@apache.org>
Committed: Fri Oct 27 00:01:19 2017 +0200
----------------------------------------------------------------------
.../converters/BigDecimalConverterTest.java | 189 ++++++++++---------
.../converters/BooleanConverterTest.java | 16 +-
.../internal/converters/ByteConverterTest.java | 6 +-
.../internal/converters/CharConverterTest.java | 20 +-
.../internal/converters/ClassConverterTest.java | 2 -
.../converters/CurrencyConverterTest.java | 81 ++++----
6 files changed, 164 insertions(+), 150 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/3133174f/code/core/src/test/java/org/apache/tamaya/core/internal/converters/BigDecimalConverterTest.java
----------------------------------------------------------------------
diff --git a/code/core/src/test/java/org/apache/tamaya/core/internal/converters/BigDecimalConverterTest.java b/code/core/src/test/java/org/apache/tamaya/core/internal/converters/BigDecimalConverterTest.java
index 5e424e9..91d3bb8 100644
--- a/code/core/src/test/java/org/apache/tamaya/core/internal/converters/BigDecimalConverterTest.java
+++ b/code/core/src/test/java/org/apache/tamaya/core/internal/converters/BigDecimalConverterTest.java
@@ -22,14 +22,12 @@ import org.apache.tamaya.Configuration;
import org.apache.tamaya.ConfigurationProvider;
import org.apache.tamaya.spi.ConversionContext;
import org.junit.Test;
-import org.mockito.Mockito;
import java.math.BigDecimal;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertNull;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
@@ -38,95 +36,98 @@ import static org.mockito.Mockito.verify;
*/
public class BigDecimalConverterTest {
- /**
- * Test conversion. The value are provided by
- * {@link org.apache.tamaya.core.internal.converters.ConverterTestsPropertySource}.
- * @throws Exception
- */
- @Test
- public void testConvert_BigDecimal_Decimal() throws Exception {
- Configuration config = ConfigurationProvider.getConfiguration();
- BigDecimal valueRead = config.get("tests.converter.bd.decimal", BigDecimal.class);
- assertTrue(valueRead != null);
- assertEquals(valueRead, new BigDecimal(101));
- }
-
-
-
- /**
- * Test conversion. The value are provided by
- * {@link org.apache.tamaya.core.internal.converters.ConverterTestsPropertySource}.
- * @throws Exception
- */
- @Test
- public void testConvert_BigDecimal_Hex() throws Exception {
- Configuration config = ConfigurationProvider.getConfiguration();
- BigDecimal valueRead = config.get("tests.converter.bd.hex.lowerX", BigDecimal.class);
- assertTrue(valueRead != null);
- assertEquals(valueRead, new BigDecimal("47"));
- valueRead = config.get("tests.converter.bd.hex.upperX", BigDecimal.class);
- assertTrue(valueRead != null);
- assertEquals(valueRead, new BigDecimal("63"));
- }
-
- /**
- * Test conversion. The value are provided by
- * {@link org.apache.tamaya.core.internal.converters.ConverterTestsPropertySource}.
- * @throws Exception
- */
- @Test
- public void testConvert_NotPresent() throws Exception {
- Configuration config = ConfigurationProvider.getConfiguration();
- BigDecimal valueRead = config.get("tests.converter.bd.foo", BigDecimal.class);
- assertFalse(valueRead != null);
- }
-
- /**
- * Test conversion. The value are provided by
- * {@link ConverterTestsPropertySource}.
- * @throws Exception
- */
- @Test
- public void testConvert_BigDecimal_BigValue() throws Exception {
- Configuration config = ConfigurationProvider.getConfiguration();
- BigDecimal valueRead = config.get("tests.converter.bd.big", BigDecimal.class);
- assertTrue(valueRead != null);
- assertEquals(new BigDecimal("101666666666666662333337263723628763821638923628193612983618293628763"),
- valueRead);
- }
-
- /**
- * Test conversion. The value are provided by
- * {@link ConverterTestsPropertySource}.
- * @throws Exception
- */
- @Test
- public void testConvert_BigDecimal_BigFloatValue() throws Exception {
- Configuration config = ConfigurationProvider.getConfiguration();
- BigDecimal valueRead = config.get("tests.converter.bd.bigFloat", BigDecimal.class);
- assertTrue(valueRead != null);
- assertEquals(new BigDecimal("1016666666666666623333372637236287638216389293628763.1016666666666666623333372" +
- "63723628763821638923628193612983618293628763"), valueRead);
- }
-
- @Test
- public void converterHandlesNullValueCorrectly() throws Exception {
- ConversionContext context = mock(ConversionContext.class);
-
- BigDecimalConverter converter = new BigDecimalConverter();
- BigDecimal value = converter.convert("", context);
-
- assertThat(value).isNull();
- }
-
- @Test
- public void callToConvertAddsMoreSupportedFormatsToTheContext() throws Exception {
- ConversionContext context = mock(ConversionContext.class);
-
- BigDecimalConverter converter = new BigDecimalConverter();
- BigDecimal value = converter.convert("", context);
-
- assertThat(value).isNull();
- verify(context).addSupportedFormats(BigDecimalConverter.class, "<bigDecimal> -> new BigDecimal(String)");
- }
+ /**
+ * Test conversion. The value are provided by
+ * {@link org.apache.tamaya.core.internal.converters.ConverterTestsPropertySource}.
+ *
+ * @throws Exception
+ */
+ @Test
+ public void testConvert_BigDecimal_Decimal() throws Exception {
+ Configuration config = ConfigurationProvider.getConfiguration();
+ BigDecimal valueRead = config.get("tests.converter.bd.decimal", BigDecimal.class);
+ assertThat(valueRead).isNotNull();
+ assertEquals(new BigDecimal(101), valueRead);
+ }
+
+ /**
+ * Test conversion. The value are provided by
+ * {@link org.apache.tamaya.core.internal.converters.ConverterTestsPropertySource}.
+ *
+ * @throws Exception
+ */
+ @Test
+ public void testConvert_BigDecimal_Hex() throws Exception {
+ Configuration config = ConfigurationProvider.getConfiguration();
+ BigDecimal valueRead = config.get("tests.converter.bd.hex.lowerX", BigDecimal.class);
+ assertThat(valueRead).isNotNull();
+ assertEquals(new BigDecimal("47"), valueRead);
+ valueRead = config.get("tests.converter.bd.hex.upperX", BigDecimal.class);
+ assertThat(valueRead).isNotNull();
+ assertEquals(new BigDecimal("63"), valueRead);
+ }
+
+ /**
+ * Test conversion. The value are provided by
+ * {@link org.apache.tamaya.core.internal.converters.ConverterTestsPropertySource}.
+ *
+ * @throws Exception
+ */
+ @Test
+ public void testConvert_NotPresent() throws Exception {
+ Configuration config = ConfigurationProvider.getConfiguration();
+ BigDecimal valueRead = config.get("tests.converter.bd.foo", BigDecimal.class);
+ assertNull(valueRead);
+ }
+
+ /**
+ * Test conversion. The value are provided by
+ * {@link ConverterTestsPropertySource}.
+ *
+ * @throws Exception
+ */
+ @Test
+ public void testConvert_BigDecimal_BigValue() throws Exception {
+ Configuration config = ConfigurationProvider.getConfiguration();
+ BigDecimal valueRead = config.get("tests.converter.bd.big", BigDecimal.class);
+ assertThat(valueRead).isNotNull();
+ assertEquals(new BigDecimal("101666666666666662333337263723628763821638923628193612983618293628763"),
+ valueRead);
+ }
+
+ /**
+ * Test conversion. The value are provided by
+ * {@link ConverterTestsPropertySource}.
+ *
+ * @throws Exception
+ */
+ @Test
+ public void testConvert_BigDecimal_BigFloatValue() throws Exception {
+ Configuration config = ConfigurationProvider.getConfiguration();
+ BigDecimal valueRead = config.get("tests.converter.bd.bigFloat", BigDecimal.class);
+ assertThat(valueRead).isNotNull();
+ assertEquals(new BigDecimal("1016666666666666623333372637236287638216389293628763.1016666666666666623333372"
+ + "63723628763821638923628193612983618293628763"), valueRead);
+ }
+
+ @Test
+ public void converterHandlesNullValueCorrectly() throws Exception {
+ ConversionContext context = mock(ConversionContext.class);
+
+ BigDecimalConverter converter = new BigDecimalConverter();
+ BigDecimal value = converter.convert("", context);
+
+ assertThat(value).isNull();
+ }
+
+ @Test
+ public void callToConvertAddsMoreSupportedFormatsToTheContext() throws Exception {
+ ConversionContext context = mock(ConversionContext.class);
+
+ BigDecimalConverter converter = new BigDecimalConverter();
+ BigDecimal value = converter.convert("", context);
+
+ assertThat(value).isNull();
+ verify(context).addSupportedFormats(BigDecimalConverter.class, "<bigDecimal> -> new BigDecimal(String)");
+ }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/3133174f/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 ac75c34..46c1e58 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
@@ -38,9 +38,8 @@ public class BooleanConverterTest {
* @throws Exception
*/
@Test
- public void testConvert_Byte() throws Exception {
+ public void testConvert_BooleanTrue() throws Exception {
Configuration config = ConfigurationProvider.getConfiguration();
- // trues
Boolean valueRead = config.get("tests.converter.boolean.y1", Boolean.class);
assertNotNull(valueRead);
assertEquals(valueRead, Boolean.TRUE);
@@ -71,7 +70,18 @@ public class BooleanConverterTest {
valueRead = config.get("tests.converter.boolean.t2", Boolean.class);
assertNotNull(valueRead);
assertEquals(valueRead, Boolean.TRUE);
- // falses
+ }
+
+ /**
+ * Test conversion. The value are provided by
+ * {@link ConverterTestsPropertySource}.
+ * @throws Exception
+ */
+ @Test
+ public void testConvert_BooleanFalse() throws Exception {
+ Configuration config = ConfigurationProvider.getConfiguration();
+ Boolean valueRead = config.get("tests.converter.boolean.y1", Boolean.class);
+ assertNotNull(valueRead);
valueRead = config.get("tests.converter.boolean.n1", Boolean.class);
assertNotNull(valueRead);
assertFalse(valueRead);
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/3133174f/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 132674d..3eb48e3 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
@@ -23,7 +23,7 @@ import org.apache.tamaya.ConfigurationProvider;
import org.junit.Test;
import static org.junit.Assert.*;
-
+import static org.assertj.core.api.Assertions.*;
/**
* Tests the default converter for bytes.
*/
@@ -62,7 +62,7 @@ public class ByteConverterTest {
public void testConvert_Byte_MinValue() throws Exception {
Configuration config = ConfigurationProvider.getConfiguration();
Byte valueRead = config.get("tests.converter.byte.min", Byte.class);
- assertTrue(valueRead!=null);
+ assertThat(valueRead).isNotNull();
assertEquals(Byte.MIN_VALUE, valueRead.byteValue());
}
@@ -75,7 +75,7 @@ public class ByteConverterTest {
public void testConvert_Byte_MaxValue() throws Exception {
Configuration config = ConfigurationProvider.getConfiguration();
Byte valueRead = config.get("tests.converter.byte.max", Byte.class);
- assertTrue(valueRead!=null);
+ assertThat(valueRead).isNotNull();
assertEquals(Byte.MAX_VALUE, valueRead.byteValue());
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/3133174f/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 f27a465..c420fcd 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
@@ -23,7 +23,7 @@ import org.apache.tamaya.ConfigurationProvider;
import org.junit.Test;
import static org.junit.Assert.*;
-
+import static org.assertj.core.api.Assertions.*;
/**
* Tests conversion of the {@link CharConverter}.
*/
@@ -33,7 +33,7 @@ public class CharConverterTest {
public void testConvert_Character() throws Exception {
Configuration config = ConfigurationProvider.getConfiguration();
Character valueRead = config.get("tests.converter.char.f", Character.class);
- assertTrue(valueRead!=null);
+ assertThat(valueRead).isNotNull();
assertEquals(valueRead.charValue(), 'f');
}
@@ -41,7 +41,7 @@ public class CharConverterTest {
public void testConvert_Character_Numeric() throws Exception {
Configuration config = ConfigurationProvider.getConfiguration();
Character valueRead = config.get("tests.converter.char.f-numeric", Character.class);
- assertTrue(valueRead!=null);
+ assertThat(valueRead).isNotNull();
assertEquals(valueRead.charValue(), (char)101);
}
@@ -49,31 +49,31 @@ public class CharConverterTest {
public void testConvert_Character_Quoted() throws Exception {
Configuration config = ConfigurationProvider.getConfiguration();
Character valueRead = config.get("tests.converter.char.d", Character.class);
- assertTrue(valueRead!=null);
+ assertThat(valueRead).isNotNull();
assertEquals(valueRead.charValue(), 'd');
}
@Test
- public void testConvert_Character_WithWhitspace_Before() throws Exception {
+ public void testConvert_Character_WithWhitespace_Before() throws Exception {
Configuration config = ConfigurationProvider.getConfiguration();
Character valueRead = config.get("tests.converter.char.f-before", Character.class);
- assertTrue(valueRead!=null);
+ assertThat(valueRead).isNotNull();
assertEquals(valueRead.charValue(), 'f');
}
@Test
- public void testConvert_Character_WithWhitspace_After() throws Exception {
+ public void testConvert_Character_WithWhitespace_After() throws Exception {
Configuration config = ConfigurationProvider.getConfiguration();
Character valueRead = config.get("tests.converter.char.f-after", Character.class);
- assertTrue(valueRead!=null);
+ assertThat(valueRead).isNotNull();
assertEquals(valueRead.charValue(), 'f');
}
@Test
- public void testConvert_Character_WithWhitspace_Around() throws Exception {
+ public void testConvert_Character_WithWhitespace_Around() throws Exception {
Configuration config = ConfigurationProvider.getConfiguration();
Character valueRead = config.get("tests.converter.char.f-around", Character.class);
- assertTrue(valueRead!=null);
+ assertThat(valueRead).isNotNull();
assertEquals(valueRead.charValue(), 'f');
}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/3133174f/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 c344ac6..38e150e 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
@@ -18,8 +18,6 @@
*/
package org.apache.tamaya.core.internal.converters;
-import org.apache.tamaya.Configuration;
-import org.apache.tamaya.ConfigurationProvider;
import org.apache.tamaya.TypeLiteral;
import org.apache.tamaya.spi.ConversionContext;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/3133174f/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 9113ca2..f17eadd 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
@@ -24,15 +24,20 @@ import org.junit.Test;
import java.util.Currency;
+import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.*;
/**
- * Tests the default converter for bytes.
+ * Tests the default converter for currencies.
*/
public class CurrencyConverterTest {
- /**
- * Test conversion. The value are provided by
+ private static final String BGL = "BGL";
+ private static final String CHF = "CHF";
+ private static final String EUR = "EUR";
+
+ /**
+ * Test conversion. The values are provided by
* {@link org.apache.tamaya.core.internal.converters.ConverterTestsPropertySource}.
* @throws Exception
*/
@@ -40,25 +45,25 @@ public class CurrencyConverterTest {
public void testConvert_Currency_Code_CHF() throws Exception {
Configuration config = ConfigurationProvider.getConfiguration();
Currency valueRead = config.get("tests.converter.currency.code1", Currency.class);
- assertTrue(valueRead != null);
- assertEquals(valueRead, Currency.getInstance("CHF"));
+ assertThat(valueRead).isNotNull();
+ assertEquals(valueRead, Currency.getInstance(CHF));
}
/**
- * Test conversion. The value are provided by
+ * Test conversion. The values are provided by
* {@link org.apache.tamaya.core.internal.converters.ConverterTestsPropertySource}.
* @throws Exception
*/
@Test
- public void testConvert_Currency_Code_cHf() throws Exception {
+ public void testConvert_Currency_Code_CHF1() throws Exception {
Configuration config = ConfigurationProvider.getConfiguration();
Currency valueRead = config.get("tests.converter.currency.code2", Currency.class);
- assertTrue(valueRead != null);
- assertEquals(valueRead, Currency.getInstance("CHF"));
+ assertThat(valueRead).isNotNull();
+ assertEquals(valueRead, Currency.getInstance(CHF));
}
/**
- * Test conversion. The value are provided by
+ * Test conversion. The values are provided by
* {@link org.apache.tamaya.core.internal.converters.ConverterTestsPropertySource}.
* @throws Exception
*/
@@ -66,12 +71,12 @@ public class CurrencyConverterTest {
public void testConvert_Currency_Code_CHF_Whitespace_Before() throws Exception {
Configuration config = ConfigurationProvider.getConfiguration();
Currency valueRead = config.get("tests.converter.currency.code3", Currency.class);
- assertTrue(valueRead != null);
- assertEquals(valueRead, Currency.getInstance("CHF"));
+ assertThat(valueRead).isNotNull();
+ assertEquals(Currency.getInstance(CHF), valueRead);
}
/**
- * Test conversion. The value are provided by
+ * Test conversion. The values are provided by
* {@link org.apache.tamaya.core.internal.converters.ConverterTestsPropertySource}.
* @throws Exception
*/
@@ -79,12 +84,12 @@ public class CurrencyConverterTest {
public void testConvert_Currency_Code_CHF_Whitespace_After() throws Exception {
Configuration config = ConfigurationProvider.getConfiguration();
Currency valueRead = config.get("tests.converter.currency.code4", Currency.class);
- assertTrue(valueRead != null);
- assertEquals(valueRead, Currency.getInstance("CHF"));
+ assertThat(valueRead).isNotNull();
+ assertEquals(Currency.getInstance(CHF), valueRead);
}
/**
- * Test conversion. The value are provided by
+ * Test conversion. The values are provided by
* {@link org.apache.tamaya.core.internal.converters.ConverterTestsPropertySource}.
* @throws Exception
*/
@@ -92,12 +97,12 @@ public class CurrencyConverterTest {
public void testConvert_Currency_Code_CHF_Whitespace_Around() throws Exception {
Configuration config = ConfigurationProvider.getConfiguration();
Currency valueRead = config.get("tests.converter.currency.code5", Currency.class);
- assertTrue(valueRead != null);
- assertEquals(valueRead, Currency.getInstance("CHF"));
+ assertThat(valueRead).isNotNull();
+ assertEquals(Currency.getInstance(CHF), valueRead);
}
/**
- * Test conversion. The value are provided by
+ * Test conversion. The values are provided by
* {@link org.apache.tamaya.core.internal.converters.ConverterTestsPropertySource}.
* @throws Exception
*/
@@ -105,21 +110,21 @@ public class CurrencyConverterTest {
public void testConvert_Currency_Code_Numeric() throws Exception {
Configuration config = ConfigurationProvider.getConfiguration();
Currency valueRead = config.get("tests.converter.currency.code-numeric1", Currency.class);
- assertTrue(valueRead != null);
- assertEquals(valueRead.getNumericCode(), Currency.getInstance("BGL").getNumericCode());
+ assertThat(valueRead).isNotNull();
+ assertEquals(Currency.getInstance(BGL).getNumericCode(), valueRead.getNumericCode());
valueRead = config.get("tests.converter.currency.code-numeric2", Currency.class);
- assertTrue(valueRead != null);
- assertEquals(valueRead.getNumericCode(), Currency.getInstance("BGL").getNumericCode());
+ assertThat(valueRead).isNotNull();
+ assertEquals(Currency.getInstance(BGL).getNumericCode(), valueRead.getNumericCode());
valueRead = config.get("tests.converter.currency.code-numeric3", Currency.class);
- assertTrue(valueRead != null);
- assertEquals(valueRead.getNumericCode(), Currency.getInstance("BGL").getNumericCode());
+ assertThat(valueRead).isNotNull();
+ assertEquals(Currency.getInstance(BGL).getNumericCode(), valueRead.getNumericCode());
valueRead = config.get("tests.converter.currency.code-numeric4", Currency.class);
- assertTrue(valueRead != null);
- assertEquals(valueRead.getNumericCode(), Currency.getInstance("BGL").getNumericCode());
+ assertThat(valueRead).isNotNull();
+ assertEquals(Currency.getInstance(BGL).getNumericCode(), valueRead.getNumericCode());
}
/**
- * Test conversion. The value are provided by
+ * Test conversion. The values are provided by
* {@link org.apache.tamaya.core.internal.converters.ConverterTestsPropertySource}.
* @throws Exception
*/
@@ -127,21 +132,21 @@ public class CurrencyConverterTest {
public void testConvert_Currency_Code_Locale() throws Exception {
Configuration config = ConfigurationProvider.getConfiguration();
Currency valueRead = config.get("tests.converter.currency.code-locale1", Currency.class);
- assertTrue(valueRead != null);
- assertEquals(valueRead.getCurrencyCode(), "EUR");
+ assertThat(valueRead).isNotNull();
+ assertEquals(EUR, valueRead.getCurrencyCode());
valueRead = config.get("tests.converter.currency.code-locale2", Currency.class);
- assertTrue(valueRead != null);
- assertEquals(valueRead.getCurrencyCode(), "EUR");
+ assertThat(valueRead).isNotNull();
+ assertEquals(EUR, valueRead.getCurrencyCode());
valueRead = config.get("tests.converter.currency.code-locale3", Currency.class);
- assertTrue(valueRead != null);
- assertEquals(valueRead.getCurrencyCode(), "EUR");
+ assertThat(valueRead).isNotNull();
+ assertEquals(EUR, valueRead.getCurrencyCode());
valueRead = config.get("tests.converter.currency.code-locale4", Currency.class);
- assertTrue(valueRead != null);
- assertEquals(valueRead.getCurrencyCode(), "EUR");
+ assertThat(valueRead).isNotNull();
+ assertEquals(EUR, valueRead.getCurrencyCode());
}
/**
- * Test conversion. The value are provided by
+ * Test conversion. The values are provided by
* {@link org.apache.tamaya.core.internal.converters.ConverterTestsPropertySource}.
* @throws Exception
*/
@@ -149,6 +154,6 @@ public class CurrencyConverterTest {
public void testConvert_NotPresent() throws Exception {
Configuration config = ConfigurationProvider.getConfiguration();
Byte valueRead = config.get("tests.converter.byte.foo", Byte.class);
- assertFalse(valueRead!=null);
+ assertThat(valueRead).isNull();
}
}
\ No newline at end of file