This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-beanutils.git
The following commit(s) were added to refs/heads/master by this push:
new f70f1c95 Migrate BaseLocaleConverterTestCase to JUnit 5 (#284)
f70f1c95 is described below
commit f70f1c95d07b683a09ede4253b5a2de1d08eed7c
Author: Steve Bosman <stevebos...@gmail.com>
AuthorDate: Mon Sep 2 20:09:24 2024 +0100
Migrate BaseLocaleConverterTestCase to JUnit 5 (#284)
---
.../converters/BaseLocaleConverterTestCase.java | 72 ++++++----------------
.../BigDecimalLocaleConverterTestCase.java | 20 +++---
.../BigIntegerLocaleConverterTestCase.java | 20 +++---
.../converters/ByteLocaleConverterTestCase.java | 20 +++---
.../converters/DateLocaleConverterTestCase.java | 44 ++++++++-----
.../converters/DoubleLocaleConverterTestCase.java | 20 +++---
.../converters/FloatLocaleConverterTestCase.java | 37 +++++++----
.../converters/IntegerLocaleConverterTestCase.java | 30 +++++----
.../converters/LongLocaleConverterTestCase.java | 20 +++---
.../converters/ShortLocaleConverterTestCase.java | 21 ++++---
10 files changed, 162 insertions(+), 142 deletions(-)
diff --git
a/src/test/java/org/apache/commons/beanutils2/converters/BaseLocaleConverterTestCase.java
b/src/test/java/org/apache/commons/beanutils2/converters/BaseLocaleConverterTestCase.java
index 6fb91c7e..b64db079 100644
---
a/src/test/java/org/apache/commons/beanutils2/converters/BaseLocaleConverterTestCase.java
+++
b/src/test/java/org/apache/commons/beanutils2/converters/BaseLocaleConverterTestCase.java
@@ -17,11 +17,16 @@
package org.apache.commons.beanutils2.converters;
-import java.util.Locale;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.fail;
-import junit.framework.TestCase;
+import java.util.Locale;
import org.apache.commons.beanutils2.locale.BaseLocaleConverter;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
/**
* Base Test Case for the DecimalLocaleConverter classes. This class doesn't
define any real tests; it just provides useful methods for the real test case
@@ -29,7 +34,7 @@ import
org.apache.commons.beanutils2.locale.BaseLocaleConverter;
*
* @param <T> The converter type.
*/
-public class BaseLocaleConverterTestCase<T> extends TestCase {
+public abstract class BaseLocaleConverterTestCase<T> {
// Original Default Locale
protected Locale origLocale;
@@ -82,7 +87,7 @@ public class BaseLocaleConverterTestCase<T> extends TestCase {
}
if (expectedValue != null) {
- assertEquals("Check invalid conversion is default " + msgId,
expectedValue, result);
+ assertEquals(expectedValue, result, () -> "Check invalid
conversion is default " + msgId);
}
}
@@ -98,16 +103,12 @@ public class BaseLocaleConverterTestCase<T> extends
TestCase {
*/
protected void convertNull(final BaseLocaleConverter<T> converter, final
String msgId, final Object expectedValue) {
// Convert value with no pattern
- try {
- result = converter.convert(null);
- } catch (final Exception e) {
- fail("Null conversion " + msgId + " threw " + e);
- }
+ result = assertDoesNotThrow(() -> converter.convert(null), () -> "Null
conversion threw '" + msgId + "'");
if (expectedValue == null) {
- assertNull("Check null conversion is null '" + msgId + "' result="
+ result, result);
+ assertNull(result, () -> "Check null conversion is null '" + msgId
+ "' result=" + result);
} else {
- assertEquals("Check null conversion is default " + msgId,
expectedValue, result);
+ assertEquals(expectedValue, result, () -> "Check null conversion
is default " + msgId);
}
}
@@ -123,35 +124,9 @@ public class BaseLocaleConverterTestCase<T> extends
TestCase {
*/
protected void convertValueNoPattern(final BaseLocaleConverter<T>
converter, final String msgId, final Object value, final Object expectedValue) {
// Convert value with no pattern
- try {
- result = converter.convert(value);
- } catch (final Exception e) {
- fail("No Pattern conversion threw '" + msgId + "' threw " + e);
- }
- assertEquals("Check conversion value without pattern " + msgId,
expectedValue, result);
-
- }
-
- /**
- * Test Converting Value To a specified Type
- */
- protected void convertValueToType(final BaseLocaleConverter<T> converter,
final Class<T> clazz, final Object value, final String pattern,
- final Object expectedValue) {
- convertValueToType(converter, "", clazz, value, pattern,
expectedValue);
- }
+ result = assertDoesNotThrow(() -> converter.convert(value), () -> "No
Pattern conversion threw '" + msgId + "'");
+ assertEquals(expectedValue, result, () -> "Check conversion value
without pattern " + msgId);
- /**
- * Test Converting Value To a specified Type
- */
- protected void convertValueToType(final BaseLocaleConverter<T> converter,
final String msgId, final Class<T> clazz, final Object value,
- final String pattern, final Object expectedValue) {
- // Convert value with no pattern
- try {
- result = converter.convert(clazz, value, pattern);
- } catch (final Exception e) {
- fail("Type conversion threw '" + msgId + "' threw " + e);
- }
- assertEquals("Check conversion value to type " + msgId, expectedValue,
result);
}
/**
@@ -167,18 +142,14 @@ public class BaseLocaleConverterTestCase<T> extends
TestCase {
protected void convertValueWithPattern(final BaseLocaleConverter<T>
converter, final String msgId, final Object value, final String pattern,
final Object expectedValue) {
// Convert value with no pattern
- try {
- result = converter.convert(value, pattern);
- } catch (final Exception e) {
- fail("Pattern conversion threw '" + msgId + "' threw " + e);
- }
- assertEquals("Check conversion value with pattern " + msgId,
expectedValue, result);
+ result = assertDoesNotThrow(() -> converter.convert(value, pattern),
() -> "Pattern conversion threw '" + msgId + "'");
+ assertEquals(expectedValue, result, () -> "Check conversion value with
pattern " + msgId);
}
/**
* Sets up instance variables required by this test case.
*/
- @Override
+ @BeforeEach
public void setUp() throws Exception {
// Default Locale (Use US)
@@ -219,7 +190,7 @@ public class BaseLocaleConverterTestCase<T> extends
TestCase {
/**
* Tear down instance variables required by this test case.
*/
- @Override
+ @AfterEach
public void tearDown() {
converter = null;
result = null;
@@ -232,11 +203,4 @@ public class BaseLocaleConverterTestCase<T> extends
TestCase {
Locale.setDefault(origLocale);
}
}
-
- /**
- * This class isn't intended to perform any real tests; it just provides
methods for the real test cases to inherit. However JUnit complains if a class
- * named ..TestCase contains no test methods, so here we define a dummy
one to keep it happy.
- */
- public void testNothing() {
- }
}
diff --git
a/src/test/java/org/apache/commons/beanutils2/converters/BigDecimalLocaleConverterTestCase.java
b/src/test/java/org/apache/commons/beanutils2/converters/BigDecimalLocaleConverterTestCase.java
index 0185392a..b55e0b46 100644
---
a/src/test/java/org/apache/commons/beanutils2/converters/BigDecimalLocaleConverterTestCase.java
+++
b/src/test/java/org/apache/commons/beanutils2/converters/BigDecimalLocaleConverterTestCase.java
@@ -20,6 +20,8 @@ package org.apache.commons.beanutils2.converters;
import java.math.BigDecimal;
import
org.apache.commons.beanutils2.locale.converters.BigDecimalLocaleConverter;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Tests {@link BigDecimalLocaleConverter}.
@@ -30,25 +32,19 @@ public class BigDecimalLocaleConverterTestCase extends
BaseLocaleConverterTestCa
* Sets up instance variables required by this test case.
*/
@Override
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
defaultValue = new BigDecimal("9.99");
expectedValue = new BigDecimal(expectedDecimalValue);
}
- /**
- * Tear down instance variables required by this test case.
- */
- @Override
- public void tearDown() {
- super.tearDown();
- }
-
/**
* Test Converter() constructor
*
* Uses the default locale, no default value
*/
+ @Test
public void testConstructor_2() {
// Construct using default locale
@@ -67,6 +63,7 @@ public class BigDecimalLocaleConverterTestCase extends
BaseLocaleConverterTestCa
*
* Uses the default locale, no default value
*/
+ @Test
public void testConstructor_3() {
// Construct using localized pattern (default locale)
@@ -83,6 +80,7 @@ public class BigDecimalLocaleConverterTestCase extends
BaseLocaleConverterTestCa
/**
* Test Converter(Locale) constructor
*/
+ @Test
public void testConstructor_4() {
// Construct using specified Locale
@@ -99,6 +97,7 @@ public class BigDecimalLocaleConverterTestCase extends
BaseLocaleConverterTestCa
/**
* Test Converter(Locale, locPattern) constructor
*/
+ @Test
public void testConstructor_5() {
// Construct using specified Locale
@@ -115,6 +114,7 @@ public class BigDecimalLocaleConverterTestCase extends
BaseLocaleConverterTestCa
/**
* Test Converter(Locale, pattern) constructor
*/
+ @Test
public void testConstructor_6() {
// Construct using specified Locale
@@ -131,6 +131,7 @@ public class BigDecimalLocaleConverterTestCase extends
BaseLocaleConverterTestCa
/**
* Test Converter(Locale, pattern, locPattern) constructor
*/
+ @Test
public void testConstructor_7() {
// Construct using specified Locale
@@ -147,6 +148,7 @@ public class BigDecimalLocaleConverterTestCase extends
BaseLocaleConverterTestCa
/**
* Test Converter(defaultValue) constructor
*/
+ @Test
public void testConstructor_8() {
// Construct using specified Locale
@@ -163,6 +165,7 @@ public class BigDecimalLocaleConverterTestCase extends
BaseLocaleConverterTestCa
/**
* Test Converter(defaultValue, locPattern) constructor
*/
+ @Test
public void testConstructor_9() {
// Construct using specified Locale
@@ -179,6 +182,7 @@ public class BigDecimalLocaleConverterTestCase extends
BaseLocaleConverterTestCa
/**
* Test Converter(defaultValue, locale, pattern, localizedPattern)
constructor
*/
+ @Test
public void testConstructorMain() {
// Construct with localized pattern
diff --git
a/src/test/java/org/apache/commons/beanutils2/converters/BigIntegerLocaleConverterTestCase.java
b/src/test/java/org/apache/commons/beanutils2/converters/BigIntegerLocaleConverterTestCase.java
index 66d7040a..f781528a 100644
---
a/src/test/java/org/apache/commons/beanutils2/converters/BigIntegerLocaleConverterTestCase.java
+++
b/src/test/java/org/apache/commons/beanutils2/converters/BigIntegerLocaleConverterTestCase.java
@@ -20,6 +20,8 @@ package org.apache.commons.beanutils2.converters;
import java.math.BigInteger;
import
org.apache.commons.beanutils2.locale.converters.BigIntegerLocaleConverter;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Test Case for the BigIntegerLocaleConverter class.
@@ -30,25 +32,19 @@ public class BigIntegerLocaleConverterTestCase extends
BaseLocaleConverterTestCa
* Sets up instance variables required by this test case.
*/
@Override
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
defaultValue = new BigInteger("999");
expectedValue = new BigInteger(expectedIntegerValue);
}
- /**
- * Tear down instance variables required by this test case.
- */
- @Override
- public void tearDown() {
- super.tearDown();
- }
-
/**
* Test Converter() constructor
*
* Uses the default locale, no default value
*/
+ @Test
public void testConstructor_2() {
// Construct using default locale
@@ -67,6 +63,7 @@ public class BigIntegerLocaleConverterTestCase extends
BaseLocaleConverterTestCa
*
* Uses the default locale, no default value
*/
+ @Test
public void testConstructor_3() {
// Construct using localized pattern (default locale)
@@ -83,6 +80,7 @@ public class BigIntegerLocaleConverterTestCase extends
BaseLocaleConverterTestCa
/**
* Test Converter(Locale) constructor
*/
+ @Test
public void testConstructor_4() {
// Construct using specified Locale
@@ -99,6 +97,7 @@ public class BigIntegerLocaleConverterTestCase extends
BaseLocaleConverterTestCa
/**
* Test Converter(Locale, locPattern) constructor
*/
+ @Test
public void testConstructor_5() {
// Construct using specified Locale
@@ -115,6 +114,7 @@ public class BigIntegerLocaleConverterTestCase extends
BaseLocaleConverterTestCa
/**
* Test Converter(Locale, pattern) constructor
*/
+ @Test
public void testConstructor_6() {
// Construct using specified Locale
@@ -131,6 +131,7 @@ public class BigIntegerLocaleConverterTestCase extends
BaseLocaleConverterTestCa
/**
* Test Converter(Locale, pattern, locPattern) constructor
*/
+ @Test
public void testConstructor_7() {
// Construct using specified Locale
@@ -147,6 +148,7 @@ public class BigIntegerLocaleConverterTestCase extends
BaseLocaleConverterTestCa
/**
* Test Converter(defaultValue) constructor
*/
+ @Test
public void testConstructor_8() {
// Construct using specified Locale
@@ -163,6 +165,7 @@ public class BigIntegerLocaleConverterTestCase extends
BaseLocaleConverterTestCa
/**
* Test Converter(defaultValue, locPattern) constructor
*/
+ @Test
public void testConstructor_9() {
// Construct using specified Locale
@@ -179,6 +182,7 @@ public class BigIntegerLocaleConverterTestCase extends
BaseLocaleConverterTestCa
/**
* Test Converter(defaultValue, locale, pattern, localizedPattern)
constructor
*/
+ @Test
public void testConstructorMain() {
// Construct with localized pattern
diff --git
a/src/test/java/org/apache/commons/beanutils2/converters/ByteLocaleConverterTestCase.java
b/src/test/java/org/apache/commons/beanutils2/converters/ByteLocaleConverterTestCase.java
index 527abe69..a7ff774d 100644
---
a/src/test/java/org/apache/commons/beanutils2/converters/ByteLocaleConverterTestCase.java
+++
b/src/test/java/org/apache/commons/beanutils2/converters/ByteLocaleConverterTestCase.java
@@ -18,6 +18,8 @@
package org.apache.commons.beanutils2.converters;
import org.apache.commons.beanutils2.locale.converters.ByteLocaleConverter;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Test Case for the ByteLocaleConverter class.
@@ -28,6 +30,7 @@ public class ByteLocaleConverterTestCase extends
BaseLocaleConverterTestCase<Byt
* Sets up instance variables required by this test case.
*/
@Override
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
@@ -47,19 +50,12 @@ public class ByteLocaleConverterTestCase extends
BaseLocaleConverterTestCase<Byt
}
- /**
- * Tear down instance variables required by this test case.
- */
- @Override
- public void tearDown() {
- super.tearDown();
- }
-
/**
* Test Converter() constructor
*
* Uses the default locale, no default value
*/
+ @Test
public void testConstructor_2() {
// Construct using default locale
@@ -78,6 +74,7 @@ public class ByteLocaleConverterTestCase extends
BaseLocaleConverterTestCase<Byt
*
* Uses the default locale, no default value
*/
+ @Test
public void testConstructor_3() {
// Construct using localized pattern (default locale)
@@ -94,6 +91,7 @@ public class ByteLocaleConverterTestCase extends
BaseLocaleConverterTestCase<Byt
/**
* Test Converter(Locale) constructor
*/
+ @Test
public void testConstructor_4() {
// Construct using specified Locale
@@ -110,6 +108,7 @@ public class ByteLocaleConverterTestCase extends
BaseLocaleConverterTestCase<Byt
/**
* Test Converter(Locale, locPattern) constructor
*/
+ @Test
public void testConstructor_5() {
// Construct using specified Locale
@@ -126,6 +125,7 @@ public class ByteLocaleConverterTestCase extends
BaseLocaleConverterTestCase<Byt
/**
* Test Converter(Locale, pattern) constructor
*/
+ @Test
public void testConstructor_6() {
// Construct using specified Locale
@@ -142,6 +142,7 @@ public class ByteLocaleConverterTestCase extends
BaseLocaleConverterTestCase<Byt
/**
* Test Converter(Locale, pattern, locPattern) constructor
*/
+ @Test
public void testConstructor_7() {
// Construct using specified Locale
@@ -158,6 +159,7 @@ public class ByteLocaleConverterTestCase extends
BaseLocaleConverterTestCase<Byt
/**
* Test Converter(defaultValue) constructor
*/
+ @Test
public void testConstructor_8() {
// Construct using specified Locale
@@ -174,6 +176,7 @@ public class ByteLocaleConverterTestCase extends
BaseLocaleConverterTestCase<Byt
/**
* Test Converter(defaultValue, locPattern) constructor
*/
+ @Test
public void testConstructor_9() {
// Construct using specified Locale
@@ -190,6 +193,7 @@ public class ByteLocaleConverterTestCase extends
BaseLocaleConverterTestCase<Byt
/**
* Test Converter(defaultValue, locale, pattern, localizedPattern)
constructor
*/
+ @Test
public void testConstructorMain() {
// Construct with localized pattern
diff --git
a/src/test/java/org/apache/commons/beanutils2/converters/DateLocaleConverterTestCase.java
b/src/test/java/org/apache/commons/beanutils2/converters/DateLocaleConverterTestCase.java
index 40a67287..767e79ff 100644
---
a/src/test/java/org/apache/commons/beanutils2/converters/DateLocaleConverterTestCase.java
+++
b/src/test/java/org/apache/commons/beanutils2/converters/DateLocaleConverterTestCase.java
@@ -17,6 +17,9 @@
package org.apache.commons.beanutils2.converters;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
+
import java.text.DateFormatSymbols;
import java.text.ParseException;
import java.text.SimpleDateFormat;
@@ -29,11 +32,13 @@ import
org.apache.commons.beanutils2.locale.converters.DateLocaleConverter.Build
import org.apache.commons.lang3.SystemProperties;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Test Case for the DateLocaleConverter class.
*/
-public class DateLocaleConverterTestCase extends
BaseLocaleConverterTestCase<Date> {
+class DateLocaleConverterTestCase extends BaseLocaleConverterTestCase<Date> {
/** All logging goes through this logger */
private static final Log LOG =
LogFactory.getLog(DateLocaleConverterTestCase.class);
@@ -50,6 +55,7 @@ public class DateLocaleConverterTestCase extends
BaseLocaleConverterTestCase<Dat
* Sets up instance variables required by this test case.
*/
@Override
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
@@ -93,22 +99,15 @@ public class DateLocaleConverterTestCase extends
BaseLocaleConverterTestCase<Dat
}
- /**
- * Tear down instance variables required by this test case.
- */
- @Override
- public void tearDown() {
- super.tearDown();
- }
-
/**
* Test Calendar
*/
+ @Test
public void testCalendarObject() {
converter =
DateLocaleConverter.builder().setLocale(defaultLocale).get();
final java.util.Calendar calendar = java.util.Calendar.getInstance();
calendar.setTime((java.util.Date) expectedValue);
- assertEquals("java.util.Calendar", expectedValue,
converter.convert(calendar));
+ assertEquals(expectedValue, converter.convert(calendar),
"java.util.Calendar");
}
/**
@@ -116,6 +115,7 @@ public class DateLocaleConverterTestCase extends
BaseLocaleConverterTestCase<Dat
*
* Uses the default locale, no default value
*/
+ @Test
public void testConstructor_2() {
// Construct using default pattern & default locale
@@ -142,6 +142,7 @@ public class DateLocaleConverterTestCase extends
BaseLocaleConverterTestCase<Dat
*
* Uses the default locale, no default value
*/
+ @Test
public void testConstructor_3() {
// Construct using default pattern & default locale
@@ -158,6 +159,7 @@ public class DateLocaleConverterTestCase extends
BaseLocaleConverterTestCase<Dat
/**
* Test Converter(Locale) constructor
*/
+ @Test
public void testConstructor_4() {
// Construct using specified Locale
@@ -174,6 +176,7 @@ public class DateLocaleConverterTestCase extends
BaseLocaleConverterTestCase<Dat
/**
* Test Converter(Locale, locPattern) constructor
*/
+ @Test
public void testConstructor_5() {
// Skip this test if no valid symbols for the locale
@@ -196,6 +199,7 @@ public class DateLocaleConverterTestCase extends
BaseLocaleConverterTestCase<Dat
/**
* Test Converter(Locale, pattern) constructor
*/
+ @Test
public void testConstructor_6() {
// Construct using specified Locale
@@ -212,6 +216,7 @@ public class DateLocaleConverterTestCase extends
BaseLocaleConverterTestCase<Dat
/**
* Test Converter(Locale, pattern, locPattern) constructor
*/
+ @Test
public void testConstructor_7() {
// Skip this test if no valid symbols for the locale
@@ -240,6 +245,7 @@ public class DateLocaleConverterTestCase extends
BaseLocaleConverterTestCase<Dat
/**
* Test Converter(defaultValue) constructor
*/
+ @Test
public void testConstructor_8() {
// Construct using specified Locale
@@ -256,6 +262,7 @@ public class DateLocaleConverterTestCase extends
BaseLocaleConverterTestCase<Dat
/**
* Test Converter(defaultValue, locPattern) constructor
*/
+ @Test
public void testConstructor_9() {
// Construct using specified Locale
@@ -280,6 +287,7 @@ public class DateLocaleConverterTestCase extends
BaseLocaleConverterTestCase<Dat
/**
* Test Converter(defaultValue, locale, pattern, localizedPattern)
constructor
*/
+ @Test
public void testConstructorMain() {
// Skip this test if no valid symbols for the locale
@@ -338,14 +346,16 @@ public class DateLocaleConverterTestCase extends
BaseLocaleConverterTestCase<Dat
/**
* Test java.util.Date
*/
+ @Test
public void testDateObject() {
converter =
DateLocaleConverter.builder().setLocale(defaultLocale).get();
- assertEquals("java.util.Date", expectedValue,
converter.convert(expectedValue));
+ assertEquals(expectedValue, converter.convert(expectedValue),
"java.util.Date");
}
/**
* Test invalid date
*/
+ @Test
public void testInvalidDate() {
converter =
DateLocaleConverter.builder().setLocale(defaultLocale).get();
@@ -353,17 +363,19 @@ public class DateLocaleConverterTestCase extends
BaseLocaleConverterTestCase<Dat
try {
converter.convert("01/10/2004", "dd-MM-yyyy");
} catch (final ConversionException e) {
- assertEquals("Parse Error", "Error parsing date '01/10/2004' at
position = 2", e.getMessage());
+ assertEquals("Error parsing date '01/10/2004' at position = 2",
e.getMessage(), "Parse Error");
}
try {
converter.convert("01-10-2004X", "dd-MM-yyyy");
} catch (final ConversionException e) {
- assertEquals("Parse Length", "Date '01-10-2004X' contains unparsed
characters from position = 10", e.getMessage());
+ assertEquals("Date '01-10-2004X' contains unparsed characters from
position = 10",
+ e.getMessage(), "Parse Length");
}
}
+ @Test
public void testSetLenient() {
// make sure that date format works as expected
final SimpleDateFormat dateFormat = new SimpleDateFormat("MMM dd,
yyyy", Locale.UK);
@@ -412,7 +424,7 @@ public class DateLocaleConverterTestCase extends
BaseLocaleConverterTestCase<Dat
final Builder<?, Date> builder =
DateLocaleConverter.builder().setLocale(Locale.UK).setLenient(false).setPattern("MMM
dd, yyyy");
DateLocaleConverter<Date> converter = builder.get();
- assertEquals("Set lenient failed", converter.isLenient(), false);
+ assertEquals(converter.isLenient(), false, "Set lenient failed");
try {
@@ -425,7 +437,7 @@ public class DateLocaleConverterTestCase extends
BaseLocaleConverterTestCase<Dat
try {
converter.convert("Feb 31, 2001");
- assertEquals("Set lenient failed", converter.isLenient(), false);
+ assertEquals(converter.isLenient(), false, "Set lenient failed");
fail("Parsed illegal date (2)");
} catch (final ConversionException e) {
@@ -434,7 +446,7 @@ public class DateLocaleConverterTestCase extends
BaseLocaleConverterTestCase<Dat
// test with leniency
converter = builder.setLenient(true).get();
- assertEquals("Set lenient failed", converter.isLenient(), true);
+ assertEquals(converter.isLenient(), true, "Set lenient failed");
try {
diff --git
a/src/test/java/org/apache/commons/beanutils2/converters/DoubleLocaleConverterTestCase.java
b/src/test/java/org/apache/commons/beanutils2/converters/DoubleLocaleConverterTestCase.java
index 432c8916..aa676ea0 100644
---
a/src/test/java/org/apache/commons/beanutils2/converters/DoubleLocaleConverterTestCase.java
+++
b/src/test/java/org/apache/commons/beanutils2/converters/DoubleLocaleConverterTestCase.java
@@ -18,6 +18,8 @@
package org.apache.commons.beanutils2.converters;
import org.apache.commons.beanutils2.locale.converters.DoubleLocaleConverter;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Test Case for the DoubleLocaleConverter class.
@@ -28,6 +30,7 @@ public class DoubleLocaleConverterTestCase extends
BaseLocaleConverterTestCase<D
* Sets up instance variables required by this test case.
*/
@Override
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
@@ -37,19 +40,12 @@ public class DoubleLocaleConverterTestCase extends
BaseLocaleConverterTestCase<D
}
- /**
- * Tear down instance variables required by this test case.
- */
- @Override
- public void tearDown() {
- super.tearDown();
- }
-
/**
* Test Converter() constructor
*
* Uses the default locale, no default value
*/
+ @Test
public void testConstructor_2() {
// Construct using default locale
@@ -68,6 +64,7 @@ public class DoubleLocaleConverterTestCase extends
BaseLocaleConverterTestCase<D
*
* Uses the default locale, no default value
*/
+ @Test
public void testConstructor_3() {
// Construct using localized pattern (default locale)
@@ -84,6 +81,7 @@ public class DoubleLocaleConverterTestCase extends
BaseLocaleConverterTestCase<D
/**
* Test Converter(Locale) constructor
*/
+ @Test
public void testConstructor_4() {
// Construct using specified Locale
@@ -100,6 +98,7 @@ public class DoubleLocaleConverterTestCase extends
BaseLocaleConverterTestCase<D
/**
* Test Converter(Locale, locPattern) constructor
*/
+ @Test
public void testConstructor_5() {
// Construct using specified Locale
@@ -116,6 +115,7 @@ public class DoubleLocaleConverterTestCase extends
BaseLocaleConverterTestCase<D
/**
* Test Converter(Locale, pattern) constructor
*/
+ @Test
public void testConstructor_6() {
// Construct using specified Locale
@@ -132,6 +132,7 @@ public class DoubleLocaleConverterTestCase extends
BaseLocaleConverterTestCase<D
/**
* Test Converter(Locale, pattern, locPattern) constructor
*/
+ @Test
public void testConstructor_7() {
// Construct using specified Locale
@@ -148,6 +149,7 @@ public class DoubleLocaleConverterTestCase extends
BaseLocaleConverterTestCase<D
/**
* Test Converter(defaultValue) constructor
*/
+ @Test
public void testConstructor_8() {
// Construct using specified Locale
@@ -164,6 +166,7 @@ public class DoubleLocaleConverterTestCase extends
BaseLocaleConverterTestCase<D
/**
* Test Converter(defaultValue, locPattern) constructor
*/
+ @Test
public void testConstructor_9() {
// Construct using specified Locale
@@ -180,6 +183,7 @@ public class DoubleLocaleConverterTestCase extends
BaseLocaleConverterTestCase<D
/**
* Test Converter(defaultValue, locale, pattern, localizedPattern)
constructor
*/
+ @Test
public void testConstructorMain() {
// Construct with localized pattern
diff --git
a/src/test/java/org/apache/commons/beanutils2/converters/FloatLocaleConverterTestCase.java
b/src/test/java/org/apache/commons/beanutils2/converters/FloatLocaleConverterTestCase.java
index bb364154..e02d7113 100644
---
a/src/test/java/org/apache/commons/beanutils2/converters/FloatLocaleConverterTestCase.java
+++
b/src/test/java/org/apache/commons/beanutils2/converters/FloatLocaleConverterTestCase.java
@@ -17,12 +17,17 @@
package org.apache.commons.beanutils2.converters;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
+
import java.text.DecimalFormat;
import java.util.Locale;
import org.apache.commons.beanutils2.ConversionException;
import org.apache.commons.beanutils2.locale.LocaleConvertUtils;
import org.apache.commons.beanutils2.locale.converters.FloatLocaleConverter;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Test Case for the FloatLocaleConverter class.
@@ -33,6 +38,7 @@ public class FloatLocaleConverterTestCase extends
BaseLocaleConverterTestCase<Fl
* Sets up instance variables required by this test case.
*/
@Override
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
@@ -42,19 +48,12 @@ public class FloatLocaleConverterTestCase extends
BaseLocaleConverterTestCase<Fl
}
- /**
- * Tear down instance variables required by this test case.
- */
- @Override
- public void tearDown() {
- super.tearDown();
- }
-
/**
* Test Converter() constructor
*
* Uses the default locale, no default value
*/
+ @Test
public void testConstructor_2() {
// Construct using default locale
@@ -73,6 +72,7 @@ public class FloatLocaleConverterTestCase extends
BaseLocaleConverterTestCase<Fl
*
* Uses the default locale, no default value
*/
+ @Test
public void testConstructor_3() {
// Construct using localized pattern (default locale)
@@ -89,6 +89,7 @@ public class FloatLocaleConverterTestCase extends
BaseLocaleConverterTestCase<Fl
/**
* Test Converter(Locale) constructor
*/
+ @Test
public void testConstructor_4() {
// Construct using specified Locale
@@ -105,6 +106,7 @@ public class FloatLocaleConverterTestCase extends
BaseLocaleConverterTestCase<Fl
/**
* Test Converter(Locale, locPattern) constructor
*/
+ @Test
public void testConstructor_5() {
// Construct using specified Locale
@@ -121,6 +123,7 @@ public class FloatLocaleConverterTestCase extends
BaseLocaleConverterTestCase<Fl
/**
* Test Converter(Locale, pattern) constructor
*/
+ @Test
public void testConstructor_6() {
// Construct using specified Locale
@@ -137,6 +140,7 @@ public class FloatLocaleConverterTestCase extends
BaseLocaleConverterTestCase<Fl
/**
* Test Converter(Locale, pattern, locPattern) constructor
*/
+ @Test
public void testConstructor_7() {
// Construct using specified Locale
@@ -153,6 +157,7 @@ public class FloatLocaleConverterTestCase extends
BaseLocaleConverterTestCase<Fl
/**
* Test Converter(defaultValue) constructor
*/
+ @Test
public void testConstructor_8() {
// Construct using specified Locale
@@ -169,6 +174,7 @@ public class FloatLocaleConverterTestCase extends
BaseLocaleConverterTestCase<Fl
/**
* Test Converter(defaultValue, locPattern) constructor
*/
+ @Test
public void testConstructor_9() {
// Construct using specified Locale
@@ -185,6 +191,7 @@ public class FloatLocaleConverterTestCase extends
BaseLocaleConverterTestCase<Fl
/**
* Test Converter(defaultValue, locale, pattern, localizedPattern)
constructor
*/
+ @Test
public void testConstructorMain() {
// Construct with localized pattern
@@ -236,17 +243,22 @@ public class FloatLocaleConverterTestCase extends
BaseLocaleConverterTestCase<Fl
/**
* Test Float limits
*/
+ @Test
public void testFloatLimits() {
converter =
FloatLocaleConverter.builder().setLocale(defaultLocale).setPattern(defaultDecimalPattern).get();
final DecimalFormat fmt = new
DecimalFormat("#.#############################################################");
assertEquals(Float.valueOf((float) -0.12), converter.convert("-0.12"));
- assertEquals("Positive Float.MAX_VALUE",
Float.valueOf(Float.MAX_VALUE), converter.convert(fmt.format(Float.MAX_VALUE)));
- assertEquals("Positive Float.MIN_VALUE",
Float.valueOf(Float.MIN_VALUE), converter.convert(fmt.format(Float.MIN_VALUE)));
+ assertEquals(Float.valueOf(Float.MAX_VALUE),
converter.convert(fmt.format(Float.MAX_VALUE)),
+ "Positive Float.MAX_VALUE");
+ assertEquals(Float.valueOf(Float.MIN_VALUE),
converter.convert(fmt.format(Float.MIN_VALUE)),
+ "Positive Float.MIN_VALUE");
- assertEquals("Negative Float.MAX_VALUE", Float.valueOf(Float.MAX_VALUE
* -1), converter.convert(fmt.format(Float.MAX_VALUE * -1)));
- assertEquals("Negative Float.MIN_VALUE", Float.valueOf(Float.MIN_VALUE
* -1), converter.convert(fmt.format(Float.MIN_VALUE * -1)));
+ assertEquals(Float.valueOf(Float.MAX_VALUE * -1),
+ converter.convert(fmt.format(Float.MAX_VALUE *
-1)), "Negative Float.MAX_VALUE");
+ assertEquals(Float.valueOf(Float.MIN_VALUE * -1),
+ converter.convert(fmt.format(Float.MIN_VALUE *
-1)), "Negative Float.MIN_VALUE");
try {
converter.convert(fmt.format((double) Float.MAX_VALUE * (double)
10));
@@ -278,6 +290,7 @@ public class FloatLocaleConverterTestCase extends
BaseLocaleConverterTestCase<Fl
/**
* Test parsing zero - see BEANUTILS-351
*/
+ @Test
public void testParseZero() {
try {
final Object result = LocaleConvertUtils.convert("0", Float.class,
Locale.US, null);
diff --git
a/src/test/java/org/apache/commons/beanutils2/converters/IntegerLocaleConverterTestCase.java
b/src/test/java/org/apache/commons/beanutils2/converters/IntegerLocaleConverterTestCase.java
index 659e0bf8..5fa4b29e 100644
---
a/src/test/java/org/apache/commons/beanutils2/converters/IntegerLocaleConverterTestCase.java
+++
b/src/test/java/org/apache/commons/beanutils2/converters/IntegerLocaleConverterTestCase.java
@@ -17,7 +17,11 @@
package org.apache.commons.beanutils2.converters;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import org.apache.commons.beanutils2.locale.converters.IntegerLocaleConverter;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Test Case for the IntegerLocaleConverter class.
@@ -28,25 +32,19 @@ public class IntegerLocaleConverterTestCase extends
BaseLocaleConverterTestCase<
* Sets up instance variables required by this test case.
*/
@Override
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
defaultValue = Integer.valueOf("999");
expectedValue = Integer.valueOf(expectedIntegerValue);
}
- /**
- * Tear down instance variables required by this test case.
- */
- @Override
- public void tearDown() {
- super.tearDown();
- }
-
/**
* Test Converter() constructor
*
* Uses the default locale, no default value
*/
+ @Test
public void testConstructor_2() {
// Construct using default locale
converter = IntegerLocaleConverter.builder().get();
@@ -63,6 +61,7 @@ public class IntegerLocaleConverterTestCase extends
BaseLocaleConverterTestCase<
*
* Uses the default locale, no default value
*/
+ @Test
public void testConstructor_3() {
// Construct using localized pattern (default locale)
converter =
IntegerLocaleConverter.builder().setLocalizedPattern(true).get();
@@ -77,6 +76,7 @@ public class IntegerLocaleConverterTestCase extends
BaseLocaleConverterTestCase<
/**
* Test Converter(Locale) constructor
*/
+ @Test
public void testConstructor_4() {
// Construct using specified Locale
converter =
IntegerLocaleConverter.builder().setLocale(localizedLocale).get();
@@ -91,6 +91,7 @@ public class IntegerLocaleConverterTestCase extends
BaseLocaleConverterTestCase<
/**
* Test Converter(Locale, locPattern) constructor
*/
+ @Test
public void testConstructor_5() {
// Construct using specified Locale
converter =
IntegerLocaleConverter.builder().setLocale(localizedLocale).setLocalizedPattern(true).get();
@@ -105,6 +106,7 @@ public class IntegerLocaleConverterTestCase extends
BaseLocaleConverterTestCase<
/**
* Test Converter(Locale, pattern) constructor
*/
+ @Test
public void testConstructor_6() {
// Construct using specified Locale
converter =
IntegerLocaleConverter.builder().setLocale(localizedLocale).setPattern(defaultIntegerPattern).get();
@@ -119,6 +121,7 @@ public class IntegerLocaleConverterTestCase extends
BaseLocaleConverterTestCase<
/**
* Test Converter(Locale, pattern, locPattern) constructor
*/
+ @Test
public void testConstructor_7() {
// Construct using specified Locale
converter =
IntegerLocaleConverter.builder().setLocale(localizedLocale).setPattern(localizedIntegerPattern).setLocalizedPattern(true).get();
@@ -133,6 +136,7 @@ public class IntegerLocaleConverterTestCase extends
BaseLocaleConverterTestCase<
/**
* Test Converter(defaultValue) constructor
*/
+ @Test
public void testConstructor_8() {
// Construct using specified Locale
converter =
IntegerLocaleConverter.builder().setDefault(defaultValue).get();
@@ -147,6 +151,7 @@ public class IntegerLocaleConverterTestCase extends
BaseLocaleConverterTestCase<
/**
* Test Converter(defaultValue, locPattern) constructor
*/
+ @Test
public void testConstructor_9() {
// Construct using specified Locale
converter =
IntegerLocaleConverter.builder().setDefault(defaultValue).setLocalizedPattern(true).get();
@@ -161,6 +166,7 @@ public class IntegerLocaleConverterTestCase extends
BaseLocaleConverterTestCase<
/**
* Test Converter(defaultValue, locale, pattern, localizedPattern)
constructor
*/
+ @Test
public void testConstructorMain() {
// Construct with localized pattern
@@ -210,23 +216,25 @@ public class IntegerLocaleConverterTestCase extends
BaseLocaleConverterTestCase<
/**
* Test Converting a number
*/
+ @Test
public void testNumber() {
// Construct using specified Locale
converter =
IntegerLocaleConverter.builder().setLocale(localizedLocale).get();
final Integer value = Integer.valueOf(1234);
- assertEquals("Convert Integer", value, converter.convert(value));
- assertEquals("Convert Long", value,
converter.convert(Long.valueOf(value.intValue())));
+ assertEquals(value, converter.convert(value), "Convert Integer");
+ assertEquals(value, converter.convert(Long.valueOf(value.intValue())),
"Convert Long");
}
/**
* Tests whether a conversion to a primitive type can be performed.
*/
+ @Test
public void testToPrimitiveType() {
converter = IntegerLocaleConverter.builder().get();
final Integer value = 20131028;
final Class<Integer> target = Integer.TYPE;
final int result = converter.convert(target, (Object)
value.toString());
- assertEquals("Wrong result", value.intValue(), result);
+ assertEquals(value.intValue(), result, "Wrong result");
}
}
diff --git
a/src/test/java/org/apache/commons/beanutils2/converters/LongLocaleConverterTestCase.java
b/src/test/java/org/apache/commons/beanutils2/converters/LongLocaleConverterTestCase.java
index 3167ae08..62bb9f36 100644
---
a/src/test/java/org/apache/commons/beanutils2/converters/LongLocaleConverterTestCase.java
+++
b/src/test/java/org/apache/commons/beanutils2/converters/LongLocaleConverterTestCase.java
@@ -18,6 +18,8 @@
package org.apache.commons.beanutils2.converters;
import org.apache.commons.beanutils2.locale.converters.LongLocaleConverter;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Test Case for the LongLocaleConverter class.
@@ -28,6 +30,7 @@ public class LongLocaleConverterTestCase extends
BaseLocaleConverterTestCase<Lon
* Sets up instance variables required by this test case.
*/
@Override
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
@@ -37,19 +40,12 @@ public class LongLocaleConverterTestCase extends
BaseLocaleConverterTestCase<Lon
}
- /**
- * Tear down instance variables required by this test case.
- */
- @Override
- public void tearDown() {
- super.tearDown();
- }
-
/**
* Test Converter() constructor
*
* Uses the default locale, no default value
*/
+ @Test
public void testConstructor_2() {
// Construct using default locale
@@ -68,6 +64,7 @@ public class LongLocaleConverterTestCase extends
BaseLocaleConverterTestCase<Lon
*
* Uses the default locale, no default value
*/
+ @Test
public void testConstructor_3() {
// Construct using localized pattern (default locale)
@@ -84,6 +81,7 @@ public class LongLocaleConverterTestCase extends
BaseLocaleConverterTestCase<Lon
/**
* Test Converter(Locale) constructor
*/
+ @Test
public void testConstructor_4() {
// Construct using specified Locale
@@ -100,6 +98,7 @@ public class LongLocaleConverterTestCase extends
BaseLocaleConverterTestCase<Lon
/**
* Test Converter(Locale, locPattern) constructor
*/
+ @Test
public void testConstructor_5() {
// Construct using specified Locale
@@ -116,6 +115,7 @@ public class LongLocaleConverterTestCase extends
BaseLocaleConverterTestCase<Lon
/**
* Test Converter(Locale, pattern) constructor
*/
+ @Test
public void testConstructor_6() {
// Construct using specified Locale
@@ -132,6 +132,7 @@ public class LongLocaleConverterTestCase extends
BaseLocaleConverterTestCase<Lon
/**
* Test Converter(Locale, pattern, locPattern) constructor
*/
+ @Test
public void testConstructor_7() {
// Construct using specified Locale
@@ -148,6 +149,7 @@ public class LongLocaleConverterTestCase extends
BaseLocaleConverterTestCase<Lon
/**
* Test Converter(defaultValue) constructor
*/
+ @Test
public void testConstructor_8() {
// Construct using specified Locale
@@ -164,6 +166,7 @@ public class LongLocaleConverterTestCase extends
BaseLocaleConverterTestCase<Lon
/**
* Test Converter(defaultValue, locPattern) constructor
*/
+ @Test
public void testConstructor_9() {
// Construct using specified Locale
@@ -180,6 +183,7 @@ public class LongLocaleConverterTestCase extends
BaseLocaleConverterTestCase<Lon
/**
* Test Converter(defaultValue, locale, pattern, localizedPattern)
constructor
*/
+ @Test
public void testConstructorMain() {
// Construct with localized pattern
diff --git
a/src/test/java/org/apache/commons/beanutils2/converters/ShortLocaleConverterTestCase.java
b/src/test/java/org/apache/commons/beanutils2/converters/ShortLocaleConverterTestCase.java
index b0638a7b..33100bc5 100644
---
a/src/test/java/org/apache/commons/beanutils2/converters/ShortLocaleConverterTestCase.java
+++
b/src/test/java/org/apache/commons/beanutils2/converters/ShortLocaleConverterTestCase.java
@@ -18,17 +18,19 @@
package org.apache.commons.beanutils2.converters;
import org.apache.commons.beanutils2.locale.converters.ShortLocaleConverter;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Test Case for the ShortLocaleConverter class.
*/
-
public class ShortLocaleConverterTestCase extends
BaseLocaleConverterTestCase<Short> {
/**
* Sets up instance variables required by this test case.
*/
@Override
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
@@ -38,19 +40,12 @@ public class ShortLocaleConverterTestCase extends
BaseLocaleConverterTestCase<Sh
}
- /**
- * Tear down instance variables required by this test case.
- */
- @Override
- public void tearDown() {
- super.tearDown();
- }
-
/**
* Test Converter() constructor
*
* Uses the default locale, no default value
*/
+ @Test
public void testConstructor_2() {
// Construct using default locale
@@ -69,6 +64,7 @@ public class ShortLocaleConverterTestCase extends
BaseLocaleConverterTestCase<Sh
*
* Uses the default locale, no default value
*/
+ @Test
public void testConstructor_3() {
// Construct using localized pattern (default locale)
@@ -85,6 +81,7 @@ public class ShortLocaleConverterTestCase extends
BaseLocaleConverterTestCase<Sh
/**
* Test Converter(Locale) constructor
*/
+ @Test
public void testConstructor_4() {
// Construct using specified Locale
@@ -101,6 +98,7 @@ public class ShortLocaleConverterTestCase extends
BaseLocaleConverterTestCase<Sh
/**
* Test Converter(Locale, locPattern) constructor
*/
+ @Test
public void testConstructor_5() {
// Construct using specified Locale
@@ -117,6 +115,7 @@ public class ShortLocaleConverterTestCase extends
BaseLocaleConverterTestCase<Sh
/**
* Test Converter(Locale, pattern) constructor
*/
+ @Test
public void testConstructor_6() {
// Construct using specified Locale
@@ -133,6 +132,7 @@ public class ShortLocaleConverterTestCase extends
BaseLocaleConverterTestCase<Sh
/**
* Test Converter(Locale, pattern, locPattern) constructor
*/
+ @Test
public void testConstructor_7() {
// Construct using specified Locale
@@ -149,6 +149,7 @@ public class ShortLocaleConverterTestCase extends
BaseLocaleConverterTestCase<Sh
/**
* Test Converter(defaultValue) constructor
*/
+ @Test
public void testConstructor_8() {
// Construct using specified Locale
@@ -165,6 +166,7 @@ public class ShortLocaleConverterTestCase extends
BaseLocaleConverterTestCase<Sh
/**
* Test Converter(defaultValue, locPattern) constructor
*/
+ @Test
public void testConstructor_9() {
// Construct using specified Locale
@@ -181,6 +183,7 @@ public class ShortLocaleConverterTestCase extends
BaseLocaleConverterTestCase<Sh
/**
* Test Converter(defaultValue, locale, pattern, localizedPattern)
constructor
*/
+ @Test
public void testConstructorMain() {
// Construct with localized pattern
