This is an automated email from the ASF dual-hosted git repository.
jamesbognar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git
The following commit(s) were added to refs/heads/master by this push:
new 761b08ffd Test modernization
761b08ffd is described below
commit 761b08ffd5dfa5a96634c68dbbf42c3841f03c99
Author: James Bognar <james.bog...@salesforce.com>
AuthorDate: Thu Sep 4 11:00:57 2025 -0400
Test modernization
---
.../org/apache/juneau/transforms/FunctionalSwapTest.java | 8 ++++----
.../InputStreamBase64_OneWayStringSwapTest.java | 8 ++++----
.../juneau/transforms/LocaleSwap_StringSwapTest.java | 8 ++++----
.../juneau/transforms/OneWayStringSwapTest_Base.java | 2 +-
...tringSwapTester.java => OneWayStringSwap_Tester.java} | 16 +++++++++-------
.../org/apache/juneau/transforms/ReaderSwap_Test.java | 8 ++++----
.../juneau/transforms/RoundTripObjectSwapTest_Base.java | 4 ++--
...ctSwapTester.java => RoundTripObjectSwap_Tester.java} | 16 +++++++++-------
.../apache/juneau/transforms/StringSwapTest_Base.java | 4 ++--
.../{StringSwapTester.java => StringSwap_Tester.java} | 8 ++++----
.../transforms/TemporalCalendarSwap_StringSwapTest.java | 8 ++++----
.../transforms/TemporalDateSwap_StringSwapTest.java | 8 ++++----
.../juneau/transforms/TemporalSwap_StringSwapTest.java | 8 ++++----
13 files changed, 55 insertions(+), 51 deletions(-)
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/transforms/FunctionalSwapTest.java
b/juneau-utest/src/test/java/org/apache/juneau/transforms/FunctionalSwapTest.java
index fe59b56fb..b7d98a2c2 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/transforms/FunctionalSwapTest.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/transforms/FunctionalSwapTest.java
@@ -28,21 +28,21 @@ class FunctionalSwapTest extends
RoundTripObjectSwapTest_Base {
private static final LocaleSwap localeSwap = new LocaleSwap();
private static FunctionalSwap<Locale,String> SWAP = new
FunctionalSwap<>(Locale.class, String.class, x->localeSwap.swap(BS, x),
x->localeSwap.unswap(BS, x, null));
- private static <T,S> RoundTripObjectSwapTester<T,S> tester(int index,
String label, T object, ObjectSwap<T,S> swap, S expected, BeanSession bs) {
- return RoundTripObjectSwapTester.create(index, label, object,
swap, expected, bs).build();
+ private static <T,S> RoundTripObjectSwap_Tester<T,S> tester(int index,
String label, T object, ObjectSwap<T,S> swap, S expected, BeanSession bs) {
+ return RoundTripObjectSwap_Tester.create(index, label, object,
swap, expected, bs).build();
}
//------------------------------------------------------------------------------------------------------------------
// Parameters
//------------------------------------------------------------------------------------------------------------------
- private static final RoundTripObjectSwapTester<?,?>[] TESTERS = {
+ private static final RoundTripObjectSwap_Tester<?,?>[] TESTERS = {
tester(1, "Language only", Locale.ENGLISH, SWAP, "en", BS),
tester(2, "Language and country", Locale.JAPAN, SWAP, "ja-JP",
BS),
tester(3, "null", null, SWAP, null, BS)
};
- static RoundTripObjectSwapTester<?,?>[] testers() {
+ static RoundTripObjectSwap_Tester<?,?>[] testers() {
return TESTERS;
}
}
\ No newline at end of file
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/transforms/InputStreamBase64_OneWayStringSwapTest.java
b/juneau-utest/src/test/java/org/apache/juneau/transforms/InputStreamBase64_OneWayStringSwapTest.java
index 12951d61b..924585824 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/transforms/InputStreamBase64_OneWayStringSwapTest.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/transforms/InputStreamBase64_OneWayStringSwapTest.java
@@ -27,21 +27,21 @@ class InputStreamBase64_OneWayStringSwapTest extends
OneWayStringSwapTest_Base {
private static BeanSession BS = BeanContext.DEFAULT_SESSION;
private static InputStreamSwap SWAP = new InputStreamSwap.Base64();
- private static <T> OneWayStringSwapTester<T> tester(int index, String
label, T object, StringSwap<T> swap, String expected, BeanSession bs) {
- return OneWayStringSwapTester.create(index, label, object,
swap, expected, bs).build();
+ private static <T> OneWayStringSwap_Tester<T> tester(int index, String
label, T object, StringSwap<T> swap, String expected, BeanSession bs) {
+ return OneWayStringSwap_Tester.create(index, label, object,
swap, expected, bs).build();
}
//------------------------------------------------------------------------------------------------------------------
// Parameters
//------------------------------------------------------------------------------------------------------------------
- private static final OneWayStringSwapTester<?>[] TESTERS = {
+ private static final OneWayStringSwap_Tester<?>[] TESTERS = {
tester(1, "Basic string", inputStream("foo"), SWAP, "Zm9v", BS),
tester(2, "Blank string", inputStream(""), SWAP, "", BS),
tester(3, "null", null, SWAP, "", BS)
};
- static OneWayStringSwapTester<?>[] testers() {
+ static OneWayStringSwap_Tester<?>[] testers() {
return TESTERS;
}
}
\ No newline at end of file
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/transforms/LocaleSwap_StringSwapTest.java
b/juneau-utest/src/test/java/org/apache/juneau/transforms/LocaleSwap_StringSwapTest.java
index d504a541b..50ef92c8f 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/transforms/LocaleSwap_StringSwapTest.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/transforms/LocaleSwap_StringSwapTest.java
@@ -22,17 +22,17 @@ class LocaleSwap_StringSwapTest extends StringSwapTest_Base
{
private static LocaleSwap SWAP = new LocaleSwap();
- private static <T> StringSwapTester<T> tester(int index, String label,
T object, StringSwap<T> swap, String expected) {
- return StringSwapTester.create(index, label, object, swap,
expected, BeanContext.DEFAULT_SESSION).build();
+ private static <T> StringSwap_Tester<T> tester(int index, String label,
T object, StringSwap<T> swap, String expected) {
+ return StringSwap_Tester.create(index, label, object, swap,
expected, BeanContext.DEFAULT_SESSION).build();
}
- private static final StringSwapTester<?>[] TESTERS = {
+ private static final StringSwap_Tester<?>[] TESTERS = {
tester(1, "Language only", Locale.ENGLISH, SWAP, "en"),
tester(2, "Language and country", Locale.JAPAN, SWAP, "ja-JP"),
tester(3, "null", null, SWAP, null)
};
- static StringSwapTester<?>[] testers() {
+ static StringSwap_Tester<?>[] testers() {
return TESTERS;
}
}
\ No newline at end of file
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/transforms/OneWayStringSwapTest_Base.java
b/juneau-utest/src/test/java/org/apache/juneau/transforms/OneWayStringSwapTest_Base.java
index 2855f6324..940197d96 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/transforms/OneWayStringSwapTest_Base.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/transforms/OneWayStringSwapTest_Base.java
@@ -23,7 +23,7 @@ public abstract class OneWayStringSwapTest_Base extends
SimpleTestBase {
@ParameterizedTest
@MethodSource("testers")
- void testSwap(OneWayStringSwapTester<?> tester) throws Exception {
+ void testSwap(OneWayStringSwap_Tester<?> tester) throws Exception {
tester.testSwap();
}
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/transforms/OneWayStringSwapTester.java
b/juneau-utest/src/test/java/org/apache/juneau/transforms/OneWayStringSwap_Tester.java
similarity index 89%
rename from
juneau-utest/src/test/java/org/apache/juneau/transforms/OneWayStringSwapTester.java
rename to
juneau-utest/src/test/java/org/apache/juneau/transforms/OneWayStringSwap_Tester.java
index 827cb4f92..2cb65fd5c 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/transforms/OneWayStringSwapTester.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/transforms/OneWayStringSwap_Tester.java
@@ -25,13 +25,14 @@ import org.apache.juneau.swap.*;
* Tester class for one-way string swap testing designed for JUnit 5
parameterized tests.
* Only performs swap operation (no unswap).
*/
-public class OneWayStringSwapTester<T> {
+public class OneWayStringSwap_Tester<T> {
public static <T> Builder<T> create(int index, String label, T object,
StringSwap<T> swap, String expected, BeanSession beanSession) {
- return new Builder<>("["+index+"] " + label, ()->object, swap,
expected, beanSession);
+ return new Builder<>(index, label, ()->object, swap, expected,
beanSession);
}
public static class Builder<T> {
+ private int index;
private String label;
private Supplier<T> objectSupplier;
private StringSwap<T> swap;
@@ -39,7 +40,8 @@ public class OneWayStringSwapTester<T> {
private BeanSession beanSession;
private String exceptionMsg;
- public Builder(String label, Supplier<T> objectSupplier,
StringSwap<T> swap, String expected, BeanSession beanSession) {
+ public Builder(int index, String label, Supplier<T>
objectSupplier, StringSwap<T> swap, String expected, BeanSession beanSession) {
+ this.index = index;
this.label = label;
this.objectSupplier = objectSupplier;
this.swap = swap;
@@ -52,8 +54,8 @@ public class OneWayStringSwapTester<T> {
return this;
}
- public OneWayStringSwapTester<T> build() {
- return new OneWayStringSwapTester<>(this);
+ public OneWayStringSwap_Tester<T> build() {
+ return new OneWayStringSwap_Tester<>(this);
}
}
@@ -64,8 +66,8 @@ public class OneWayStringSwapTester<T> {
private final BeanSession beanSession;
private final String exceptionMsg;
- private OneWayStringSwapTester(Builder<T> b) {
- label = b.label;
+ private OneWayStringSwap_Tester(Builder<T> b) {
+ label = "[" + b.index + "] " + b.label;
objectSupplier = b.objectSupplier;
swap = b.swap;
expected = b.expected;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/transforms/ReaderSwap_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/transforms/ReaderSwap_Test.java
index 23e504bbd..7f32a2d69 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/transforms/ReaderSwap_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/transforms/ReaderSwap_Test.java
@@ -27,21 +27,21 @@ class ReaderSwap_Test extends OneWayStringSwapTest_Base {
private static BeanSession BS = BeanContext.DEFAULT_SESSION;
private static ReaderSwap SWAP = new ReaderSwap();
- private static <T> OneWayStringSwapTester<T> tester(int index, String
label, T object, StringSwap<T> swap, String expected, BeanSession bs) {
- return OneWayStringSwapTester.create(index, label, object,
swap, expected, bs).build();
+ private static <T> OneWayStringSwap_Tester<T> tester(int index, String
label, T object, StringSwap<T> swap, String expected, BeanSession bs) {
+ return OneWayStringSwap_Tester.create(index, label, object,
swap, expected, bs).build();
}
//------------------------------------------------------------------------------------------------------------------
// Parameters
//------------------------------------------------------------------------------------------------------------------
- private static final OneWayStringSwapTester<?>[] TESTERS = {
+ private static final OneWayStringSwap_Tester<?>[] TESTERS = {
tester(1, "Basic string", reader("foo"), SWAP, "foo", BS),
tester(2, "Blank string", reader(""), SWAP, "", BS),
tester(3, "null", null, SWAP, null, BS)
};
- static OneWayStringSwapTester<?>[] testers() {
+ static OneWayStringSwap_Tester<?>[] testers() {
return TESTERS;
}
}
\ No newline at end of file
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/transforms/RoundTripObjectSwapTest_Base.java
b/juneau-utest/src/test/java/org/apache/juneau/transforms/RoundTripObjectSwapTest_Base.java
index 999adce98..7bea55d04 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/transforms/RoundTripObjectSwapTest_Base.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/transforms/RoundTripObjectSwapTest_Base.java
@@ -23,13 +23,13 @@ public abstract class RoundTripObjectSwapTest_Base extends
SimpleTestBase {
@ParameterizedTest
@MethodSource("testers")
- void testSwap(RoundTripObjectSwapTester<?,?> tester) throws Exception {
+ void testSwap(RoundTripObjectSwap_Tester<?,?> tester) throws Exception {
tester.testSwap();
}
@ParameterizedTest
@MethodSource("testers")
- void testUnswap(RoundTripObjectSwapTester<?,?> tester) throws Exception
{
+ void testUnswap(RoundTripObjectSwap_Tester<?,?> tester) throws
Exception {
tester.testUnswap();
}
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/transforms/RoundTripObjectSwapTester.java
b/juneau-utest/src/test/java/org/apache/juneau/transforms/RoundTripObjectSwap_Tester.java
similarity index 90%
rename from
juneau-utest/src/test/java/org/apache/juneau/transforms/RoundTripObjectSwapTester.java
rename to
juneau-utest/src/test/java/org/apache/juneau/transforms/RoundTripObjectSwap_Tester.java
index 7e9438b6e..d342fcbe7 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/transforms/RoundTripObjectSwapTester.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/transforms/RoundTripObjectSwap_Tester.java
@@ -24,13 +24,14 @@ import org.apache.juneau.swap.*;
* Tester class for round-trip object swap testing designed for JUnit 5
parameterized tests.
* Performs both swap and unswap operations.
*/
-public class RoundTripObjectSwapTester<T,S> {
+public class RoundTripObjectSwap_Tester<T,S> {
public static <T,S> Builder<T,S> create(int index, String label, T
object, ObjectSwap<T,S> swap, S expected, BeanSession beanSession) {
- return new Builder<>("["+index+"] " + label, ()->object, swap,
expected, beanSession);
+ return new Builder<>(index, label, ()->object, swap, expected,
beanSession);
}
public static class Builder<T,S> {
+ private int index;
private String label;
private Supplier<T> objectSupplier;
private ObjectSwap<T,S> swap;
@@ -38,7 +39,8 @@ public class RoundTripObjectSwapTester<T,S> {
private BeanSession beanSession;
private String exceptionMsg;
- public Builder(String label, Supplier<T> objectSupplier,
ObjectSwap<T,S> swap, S expected, BeanSession beanSession) {
+ public Builder(int index, String label, Supplier<T>
objectSupplier, ObjectSwap<T,S> swap, S expected, BeanSession beanSession) {
+ this.index = index;
this.label = label;
this.objectSupplier = objectSupplier;
this.swap = swap;
@@ -51,8 +53,8 @@ public class RoundTripObjectSwapTester<T,S> {
return this;
}
- public RoundTripObjectSwapTester<T,S> build() {
- return new RoundTripObjectSwapTester<>(this);
+ public RoundTripObjectSwap_Tester<T,S> build() {
+ return new RoundTripObjectSwap_Tester<>(this);
}
}
@@ -63,8 +65,8 @@ public class RoundTripObjectSwapTester<T,S> {
private final BeanSession beanSession;
private final String exceptionMsg;
- private RoundTripObjectSwapTester(Builder<T,S> b) {
- label = b.label;
+ private RoundTripObjectSwap_Tester(Builder<T,S> b) {
+ label = "[" + b.index + "] " + b.label;
objectSupplier = b.objectSupplier;
swap = b.swap;
expected = b.expected;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/transforms/StringSwapTest_Base.java
b/juneau-utest/src/test/java/org/apache/juneau/transforms/StringSwapTest_Base.java
index 02b12146f..20307e63a 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/transforms/StringSwapTest_Base.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/transforms/StringSwapTest_Base.java
@@ -23,13 +23,13 @@ public abstract class StringSwapTest_Base extends
SimpleTestBase {
@ParameterizedTest
@MethodSource("testers")
- void testSwap(StringSwapTester<?> tester) throws Exception {
+ void testSwap(StringSwap_Tester<?> tester) throws Exception {
tester.testSwap();
}
@ParameterizedTest
@MethodSource("testers")
- void testUnswap(StringSwapTester<?> tester) throws Exception {
+ void testUnswap(StringSwap_Tester<?> tester) throws Exception {
tester.testUnswap();
}
}
\ No newline at end of file
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/transforms/StringSwapTester.java
b/juneau-utest/src/test/java/org/apache/juneau/transforms/StringSwap_Tester.java
similarity index 96%
rename from
juneau-utest/src/test/java/org/apache/juneau/transforms/StringSwapTester.java
rename to
juneau-utest/src/test/java/org/apache/juneau/transforms/StringSwap_Tester.java
index 74ba6b4ee..46e58929b 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/transforms/StringSwapTester.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/transforms/StringSwap_Tester.java
@@ -23,7 +23,7 @@ import org.apache.juneau.swap.*;
/**
* Tester class for round-trip string swap testing designed for JUnit 5
parameterized tests.
*/
-public class StringSwapTester<T> {
+public class StringSwap_Tester<T> {
public static <T> Builder<T> create(int index, String label, T object,
StringSwap<T> swap, String expected, BeanSession beanSession) {
return new Builder<>("["+index+"] " + label, ()->object, swap,
expected, beanSession);
@@ -50,8 +50,8 @@ public class StringSwapTester<T> {
return this;
}
- public StringSwapTester<T> build() {
- return new StringSwapTester<>(this);
+ public StringSwap_Tester<T> build() {
+ return new StringSwap_Tester<>(this);
}
}
@@ -62,7 +62,7 @@ public class StringSwapTester<T> {
private final BeanSession beanSession;
private final String exceptionMsg;
- private StringSwapTester(Builder<T> b) {
+ private StringSwap_Tester(Builder<T> b) {
label = b.label;
objectSupplier = b.objectSupplier;
swap = b.swap;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/transforms/TemporalCalendarSwap_StringSwapTest.java
b/juneau-utest/src/test/java/org/apache/juneau/transforms/TemporalCalendarSwap_StringSwapTest.java
index 988b8d9d9..41e1b38c8 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/transforms/TemporalCalendarSwap_StringSwapTest.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/transforms/TemporalCalendarSwap_StringSwapTest.java
@@ -44,11 +44,11 @@ class TemporalCalendarSwap_StringSwapTest extends
StringSwapTest_Base {
T_Calendar.setTimeZone(TimeZone.getTimeZone("GMT-5"));
}
- private static <T> StringSwapTester<T> tester(int index, String label,
T object, StringSwap<T> swap, String expected, BeanSession bs) {
- return StringSwapTester.create(index, label, object, swap,
expected, bs).build();
+ private static <T> StringSwap_Tester<T> tester(int index, String label,
T object, StringSwap<T> swap, String expected, BeanSession bs) {
+ return StringSwap_Tester.create(index, label, object, swap,
expected, bs).build();
}
- private static final StringSwapTester<?>[] TESTERS = {
+ private static final StringSwap_Tester<?>[] TESTERS = {
tester(1, "BasicIsoDate, Default timezone", T_Calendar, new
TemporalCalendarSwap.BasicIsoDate(), "20121221-0500", BS_DEFAULT),
tester(2, "BasicIsoDate, Pacific timezone", T_Calendar, new
TemporalCalendarSwap.BasicIsoDate(), "20121221-0500", BS_PST),
tester(3, "IsoDate, Default timezone", T_Calendar, new
TemporalCalendarSwap.IsoDate(), "2012-12-21-05:00", BS_DEFAULT),
@@ -84,7 +84,7 @@ class TemporalCalendarSwap_StringSwapTest extends
StringSwapTest_Base {
tester(33, "BasicIsoDate, null", null, new
TemporalCalendarSwap.BasicIsoDate(), null, BS_DEFAULT)
};
- static StringSwapTester<?>[] testers() {
+ static StringSwap_Tester<?>[] testers() {
return TESTERS;
}
}
\ No newline at end of file
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/transforms/TemporalDateSwap_StringSwapTest.java
b/juneau-utest/src/test/java/org/apache/juneau/transforms/TemporalDateSwap_StringSwapTest.java
index 0350d8d8e..80dc40395 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/transforms/TemporalDateSwap_StringSwapTest.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/transforms/TemporalDateSwap_StringSwapTest.java
@@ -41,11 +41,11 @@ class TemporalDateSwap_StringSwapTest extends
StringSwapTest_Base {
private static Date T_Date =
Date.from(Instant.from(DateTimeFormatter.ISO_INSTANT.parse("2012-12-21T12:34:56Z")));
- private static <T> StringSwapTester<T> tester(int index, String label,
T object, StringSwap<T> swap, String expected, BeanSession bs) {
- return StringSwapTester.create(index, label, object, swap,
expected, bs).build();
+ private static <T> StringSwap_Tester<T> tester(int index, String label,
T object, StringSwap<T> swap, String expected, BeanSession bs) {
+ return StringSwap_Tester.create(index, label, object, swap,
expected, bs).build();
}
- private static final StringSwapTester<?>[] TESTERS = {
+ private static final StringSwap_Tester<?>[] TESTERS = {
tester(1, "BasicIsoDate, Default timezone", T_Date, new
TemporalDateSwap.BasicIsoDate(), "20121221-0500", BS_DEFAULT),
tester(2, "BasicIsoDate, Pacific timezone", T_Date, new
TemporalDateSwap.BasicIsoDate(), "20121221-0800", BS_PST),
tester(3, "IsoDate, Default timezone", T_Date, new
TemporalDateSwap.IsoDate(), "2012-12-21-05:00", BS_DEFAULT),
@@ -81,7 +81,7 @@ class TemporalDateSwap_StringSwapTest extends
StringSwapTest_Base {
tester(33, "BasicIsoDate, null", null, new
TemporalDateSwap.BasicIsoDate(), null, BS_DEFAULT)
};
- static StringSwapTester<?>[] testers() {
+ static StringSwap_Tester<?>[] testers() {
return TESTERS;
}
}
\ No newline at end of file
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/transforms/TemporalSwap_StringSwapTest.java
b/juneau-utest/src/test/java/org/apache/juneau/transforms/TemporalSwap_StringSwapTest.java
index 0e398248f..f3b266854 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/transforms/TemporalSwap_StringSwapTest.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/transforms/TemporalSwap_StringSwapTest.java
@@ -61,15 +61,15 @@ class TemporalSwap_StringSwapTest extends
StringSwapTest_Base {
DT_MinguoDate = MinguoDate.from(DT_ZonedDateTime),
DT_ThaiBuddhistDate = ThaiBuddhistDate.from(DT_ZonedDateTime);
- private static <T> StringSwapTester<T> tester(int index, String label,
T object, StringSwap<T> swap, String expected, BeanSession bs) {
- return StringSwapTester.create(index, label, object, swap,
expected, bs).build();
+ private static <T> StringSwap_Tester<T> tester(int index, String label,
T object, StringSwap<T> swap, String expected, BeanSession bs) {
+ return StringSwap_Tester.create(index, label, object, swap,
expected, bs).build();
}
//------------------------------------------------------------------------------------------------------------------
// Parameters
//------------------------------------------------------------------------------------------------------------------
- private static final StringSwapTester<?>[] TESTERS = {
+ private static final StringSwap_Tester<?>[] TESTERS = {
tester(1, "BasicIsoDate, DT_ZonedDateTime, Default timezone",
DT_ZonedDateTime, new TemporalSwap.BasicIsoDate(), "20121221Z", BS_DEFAULT),
tester(2, "BasicIsoDate, DT_Instant, Default timezone",
DT_Instant, new TemporalSwap.BasicIsoDate(), "20121221Z", BS_DEFAULT),
tester(3, "BasicIsoDate, DT_LocalDate, Default timezone",
DT_LocalDate, new TemporalSwap.BasicIsoDate(), "20121221", BS_DEFAULT),
@@ -515,7 +515,7 @@ class TemporalSwap_StringSwapTest extends
StringSwapTest_Base {
tester(443, "BasicIsoDate, null", null, new
TemporalSwap.BasicIsoDate(), null, BS_DEFAULT)
};
- static StringSwapTester<?>[] testers() {
+ static StringSwap_Tester<?>[] testers() {
return TESTERS;
}
}
\ No newline at end of file
