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-validator.git
The following commit(s) were added to refs/heads/master by this push:
new 850ae25b Use JUnit Pioneer instead of direct global variables access
850ae25b is described below
commit 850ae25bf6002cbe84380b23a1eaab1ec809f577
Author: Gary D. Gregory <[email protected]>
AuthorDate: Thu Dec 26 09:57:25 2024 -0500
Use JUnit Pioneer instead of direct global variables access
---
.../java/org/apache/commons/validator/RequiredNameTest.java | 2 +-
.../validator/routines/AbstractNumberValidatorTest.java | 12 ++----------
.../commons/validator/routines/BigDecimalValidatorTest.java | 3 ---
.../commons/validator/routines/BigIntegerValidatorTest.java | 3 ---
.../apache/commons/validator/routines/ByteValidatorTest.java | 3 ---
.../commons/validator/routines/CurrencyValidatorTest.java | 1 -
.../commons/validator/routines/DoubleValidatorTest.java | 3 ---
.../commons/validator/routines/FloatValidatorTest.java | 3 ---
.../commons/validator/routines/IntegerValidatorTest.java | 3 ---
.../apache/commons/validator/routines/LongValidatorTest.java | 3 ---
.../commons/validator/routines/ShortValidatorTest.java | 3 ---
11 files changed, 3 insertions(+), 36 deletions(-)
diff --git a/src/test/java/org/apache/commons/validator/RequiredNameTest.java
b/src/test/java/org/apache/commons/validator/RequiredNameTest.java
index 05689158..41e075d5 100644
--- a/src/test/java/org/apache/commons/validator/RequiredNameTest.java
+++ b/src/test/java/org/apache/commons/validator/RequiredNameTest.java
@@ -16,8 +16,8 @@
*/
package org.apache.commons.validator;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.IOException;
diff --git
a/src/test/java/org/apache/commons/validator/routines/AbstractNumberValidatorTest.java
b/src/test/java/org/apache/commons/validator/routines/AbstractNumberValidatorTest.java
index 6c5ff617..00ebd11d 100644
---
a/src/test/java/org/apache/commons/validator/routines/AbstractNumberValidatorTest.java
+++
b/src/test/java/org/apache/commons/validator/routines/AbstractNumberValidatorTest.java
@@ -32,12 +32,13 @@ import java.text.DecimalFormat;
import java.util.Locale;
import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import org.junitpioneer.jupiter.DefaultLocale;
/**
* Base Number Test Case.
*/
+@DefaultLocale(country = "US", language = "en")
public abstract class AbstractNumberValidatorTest {
protected AbstractNumberValidator validator;
@@ -66,20 +67,11 @@ public abstract class AbstractNumberValidatorTest {
protected Locale testLocale;
protected Number localeExpected;
- private Locale originalLocale;
-
- @BeforeEach
- protected void setUp() {
- originalLocale = Locale.getDefault();
- Locale.setDefault(Locale.US);
- }
-
/**
* Tear down
*/
@AfterEach
protected void tearDown() {
- Locale.setDefault(originalLocale);
validator = null;
strictValidator = null;
}
diff --git
a/src/test/java/org/apache/commons/validator/routines/BigDecimalValidatorTest.java
b/src/test/java/org/apache/commons/validator/routines/BigDecimalValidatorTest.java
index 2d4a61cb..082dc26c 100644
---
a/src/test/java/org/apache/commons/validator/routines/BigDecimalValidatorTest.java
+++
b/src/test/java/org/apache/commons/validator/routines/BigDecimalValidatorTest.java
@@ -32,11 +32,8 @@ import org.junit.jupiter.api.Test;
*/
public class BigDecimalValidatorTest extends AbstractNumberValidatorTest {
- @Override
@BeforeEach
protected void setUp() {
- super.setUp();
-
validator = new BigDecimalValidator(false);
strictValidator = new BigDecimalValidator();
diff --git
a/src/test/java/org/apache/commons/validator/routines/BigIntegerValidatorTest.java
b/src/test/java/org/apache/commons/validator/routines/BigIntegerValidatorTest.java
index 99cdf589..fa61bdff 100644
---
a/src/test/java/org/apache/commons/validator/routines/BigIntegerValidatorTest.java
+++
b/src/test/java/org/apache/commons/validator/routines/BigIntegerValidatorTest.java
@@ -32,11 +32,8 @@ import org.junit.jupiter.api.Test;
*/
public class BigIntegerValidatorTest extends AbstractNumberValidatorTest {
- @Override
@BeforeEach
protected void setUp() {
- super.setUp();
-
validator = new BigIntegerValidator(false, 0);
strictValidator = new BigIntegerValidator();
diff --git
a/src/test/java/org/apache/commons/validator/routines/ByteValidatorTest.java
b/src/test/java/org/apache/commons/validator/routines/ByteValidatorTest.java
index d3641f03..f8117386 100644
--- a/src/test/java/org/apache/commons/validator/routines/ByteValidatorTest.java
+++ b/src/test/java/org/apache/commons/validator/routines/ByteValidatorTest.java
@@ -40,11 +40,8 @@ public class ByteValidatorTest extends
AbstractNumberValidatorTest {
private static final String BYTE_MIN_0 = "-128.99999999999999999999999";
// force double rounding";
private static final String BYTE_MIN_1 = "-129";
- @Override
@BeforeEach
protected void setUp() {
- super.setUp();
-
validator = new ByteValidator(false, 0);
strictValidator = new ByteValidator();
diff --git
a/src/test/java/org/apache/commons/validator/routines/CurrencyValidatorTest.java
b/src/test/java/org/apache/commons/validator/routines/CurrencyValidatorTest.java
index 20d491fe..e549bf8e 100644
---
a/src/test/java/org/apache/commons/validator/routines/CurrencyValidatorTest.java
+++
b/src/test/java/org/apache/commons/validator/routines/CurrencyValidatorTest.java
@@ -18,7 +18,6 @@ package org.apache.commons.validator.routines;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.assertNull;
import java.math.BigDecimal;
diff --git
a/src/test/java/org/apache/commons/validator/routines/DoubleValidatorTest.java
b/src/test/java/org/apache/commons/validator/routines/DoubleValidatorTest.java
index 26119eca..c07d2683 100644
---
a/src/test/java/org/apache/commons/validator/routines/DoubleValidatorTest.java
+++
b/src/test/java/org/apache/commons/validator/routines/DoubleValidatorTest.java
@@ -31,11 +31,8 @@ import org.junit.jupiter.api.Test;
*/
public class DoubleValidatorTest extends AbstractNumberValidatorTest {
- @Override
@BeforeEach
protected void setUp() {
- super.setUp();
-
validator = new DoubleValidator(false, 0);
strictValidator = new DoubleValidator();
diff --git
a/src/test/java/org/apache/commons/validator/routines/FloatValidatorTest.java
b/src/test/java/org/apache/commons/validator/routines/FloatValidatorTest.java
index 3b179ec7..ed48e060 100644
---
a/src/test/java/org/apache/commons/validator/routines/FloatValidatorTest.java
+++
b/src/test/java/org/apache/commons/validator/routines/FloatValidatorTest.java
@@ -32,11 +32,8 @@ import org.junit.jupiter.api.Test;
*/
public class FloatValidatorTest extends AbstractNumberValidatorTest {
- @Override
@BeforeEach
protected void setUp() {
- super.setUp();
-
validator = new FloatValidator(false, 0);
strictValidator = new FloatValidator();
diff --git
a/src/test/java/org/apache/commons/validator/routines/IntegerValidatorTest.java
b/src/test/java/org/apache/commons/validator/routines/IntegerValidatorTest.java
index afd172a7..a21441ec 100644
---
a/src/test/java/org/apache/commons/validator/routines/IntegerValidatorTest.java
+++
b/src/test/java/org/apache/commons/validator/routines/IntegerValidatorTest.java
@@ -40,11 +40,8 @@ public class IntegerValidatorTest extends
AbstractNumberValidatorTest {
private static final String INT_MIN_0 =
"-2147483648.99999999999999999999999"; // force double rounding";
private static final String INT_MIN_1 = "-2147483649";
- @Override
@BeforeEach
protected void setUp() {
- super.setUp();
-
validator = new IntegerValidator(false, 0);
strictValidator = new IntegerValidator();
diff --git
a/src/test/java/org/apache/commons/validator/routines/LongValidatorTest.java
b/src/test/java/org/apache/commons/validator/routines/LongValidatorTest.java
index 7a32250f..18163238 100644
--- a/src/test/java/org/apache/commons/validator/routines/LongValidatorTest.java
+++ b/src/test/java/org/apache/commons/validator/routines/LongValidatorTest.java
@@ -42,11 +42,8 @@ public class LongValidatorTest extends
AbstractNumberValidatorTest {
private static final String NINES =
"9999999999999999999999999999999999999";
- @Override
@BeforeEach
protected void setUp() {
- super.setUp();
-
validator = new LongValidator(false, 0);
strictValidator = new LongValidator();
diff --git
a/src/test/java/org/apache/commons/validator/routines/ShortValidatorTest.java
b/src/test/java/org/apache/commons/validator/routines/ShortValidatorTest.java
index 5658bbb0..e83898b1 100644
---
a/src/test/java/org/apache/commons/validator/routines/ShortValidatorTest.java
+++
b/src/test/java/org/apache/commons/validator/routines/ShortValidatorTest.java
@@ -31,11 +31,8 @@ import org.junit.jupiter.api.Test;
*/
public class ShortValidatorTest extends AbstractNumberValidatorTest {
- @Override
@BeforeEach
protected void setUp() {
- super.setUp();
-
validator = new ShortValidator(false, 0);
strictValidator = new ShortValidator();
