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 30905ba1d Test modernization
30905ba1d is described below
commit 30905ba1d047774dfe562a2ddc2bbdb3dd330cff
Author: James Bognar <[email protected]>
AuthorDate: Tue Aug 26 10:17:53 2025 -0400
Test modernization
---
.../juneau/assertions/AnyAssertion_Test.java | 98 ++++++++++----
.../juneau/assertions/ArrayAssertion_Test.java | 95 +++++++++----
.../assertions/AssertionPredicates_Test.java | 3 +-
.../juneau/assertions/BeanAssertion_Test.java | 85 ++++++++----
.../juneau/assertions/BooleanAssertion_Test.java | 72 +++++++---
.../assertions/ComparableAssertion_Test.java | 87 ++++++++----
.../juneau/assertions/DateAssertion_Test.java | 127 +++++++++++++-----
.../juneau/assertions/IntegerAssertion_Test.java | 95 +++++++++----
.../juneau/assertions/LongAssertion_Test.java | 96 +++++++++----
.../juneau/assertions/ObjectAssertion_Test.java | 74 ++++++++---
.../juneau/assertions/StringAssertion_Test.java | 148 +++++++++++++++------
.../juneau/assertions/ThrowableAssertion_Test.java | 108 +++++++++++----
.../org/apache/juneau/assertions/Verify_Test.java | 4 +-
.../juneau/assertions/VersionAssertion_Test.java | 111 +++++++++++-----
.../assertions/ZonedDateTimeAssertion_Test.java | 119 ++++++++++++-----
.../java/org/apache/juneau/cp/FileFinder_Test.java | 16 ++-
.../juneau/rest/client/RestClient_Query_Test.java | 3 +-
.../org/apache/juneau/utils/ArrayUtilsTest.java | 13 +-
18 files changed, 985 insertions(+), 369 deletions(-)
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/assertions/AnyAssertion_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/assertions/AnyAssertion_Test.java
index d283992f7..e6876339e 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/assertions/AnyAssertion_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/assertions/AnyAssertion_Test.java
@@ -71,13 +71,15 @@ class AnyAssertion_Test extends SimpleTestBase {
//-----------------------------------------------------------------------------------------------------------------
@Test void ba01a_asString() {
- Integer x = 1, nil = null;
+ var x = 1;
+ var nil = (Integer)null;
test(x).asString().is("1");
test(nil).asString().isNull();
}
@Test void ba01b_asString_wSerializer() {
- Integer x = 1, nil = null;
+ var x = 1;
+ var nil = (Integer)null;
WriterSerializer s = Json5Serializer.DEFAULT;
test(x).asString(s).is("1");
test(nil).asString(s).is("null");
@@ -89,14 +91,16 @@ class AnyAssertion_Test extends SimpleTestBase {
}
@Test void ba02_asJson() {
- Integer x = 1, nil = null;
+ var x = 1;
+ var nil = (Integer)null;
test(x).asJson().is("1");
test(nil).asJson().is("null");
assertThrown(()->test(new
A2()).asJson()).asMessages().isAny(contains("Could not call getValue() on
property 'foo'"));
}
@Test void ba03_asJsonSorted() {
- Integer[] x1 = {2,1}, nil = null;
+ var x1 = a(2,1);
+ var nil = (Integer[])null;
Object x2 = new A1();
test(x1).asJsonSorted().is("[1,2]");
test(x2).asJsonSorted().is("{a:1,b:2}");
@@ -104,12 +108,14 @@ class AnyAssertion_Test extends SimpleTestBase {
}
@Test void ba04_apply() {
- Integer x1 = 1, x2 = 2;
+ var x1 = 1;
+ var x2 = 2;
test(x1).asTransformed(x -> x2).is(x2);
}
@Test void bb01_asArray() {
- Integer[] x1 = {1,2}, nil = null;
+ var x1 = a(1,2);
+ var nil = (Integer[])null;
String x2 = "";
test(x1).asArray(Integer.class).asItem(0).is(1);
test(nil).asArray(Integer.class).isNull();
@@ -182,7 +188,8 @@ class AnyAssertion_Test extends SimpleTestBase {
}
@Test void bb10_asBoolean() {
- Boolean x1 = true, nil = null;
+ var x1 = true;
+ var nil = (Boolean)null;
Object x2 = "";
test(x1).asBoolean().isString("true");
test(nil).asBoolean().isNull();
@@ -215,7 +222,8 @@ class AnyAssertion_Test extends SimpleTestBase {
}
@Test void bb14_asComparable() {
- Integer x1 = 1, nil = null;
+ var x1 = 1;
+ var nil = (Integer)null;
Object x2 = list();
test(x1).asComparable().isString("1");
test(nil).asComparable().isNull();
@@ -223,7 +231,8 @@ class AnyAssertion_Test extends SimpleTestBase {
}
@Test void bb15_asDate() {
- Date x1 = date("2000-06-01T12:34:56Z"), nil = null;
+ var x1 = date("2000-06-01T12:34:56Z");
+ var nil = (Date)null;
Object x2 = "";
test(x1).asDate().asString().isMatches("*2000");
test(nil).asDate().isNull();
@@ -231,7 +240,8 @@ class AnyAssertion_Test extends SimpleTestBase {
}
@Test void bb16_asInteger() {
- Integer x1 = 1, nil = null;
+ var x1 = 1;
+ var nil = (Integer)null;
Object x2 = "";
test(x1).asInteger().isString("1");
test(nil).asInteger().isNull();
@@ -239,7 +249,8 @@ class AnyAssertion_Test extends SimpleTestBase {
}
@Test void bb17_asLong() {
- Long x1 = 1L, nil = null;
+ var x1 = 1L;
+ var nil = (Long)null;
Object x2 = "";
test(x1).asLong().isString("1");
test(nil).asLong().isNull();
@@ -282,13 +293,15 @@ class AnyAssertion_Test extends SimpleTestBase {
}
@Test void bb22_asBean() {
- A1 x1 = A1, nil = null;
+ var x1 = A1;
+ var nil = (A1)null;
test(x1).asBean().isString("a=1,b=2");
test(nil).asBean().isNull();
}
@Test void bb23_asBean_wType() {
- A1 x1 = A1, nil = null;
+ var x1 = A1;
+ var nil = (A1)null;
Object x2 = "";
test(x1).asBean().isString("a=1,b=2");
test(nil).asBean(A1.class).isNull();
@@ -306,7 +319,8 @@ class AnyAssertion_Test extends SimpleTestBase {
}
@Test void bb25_asZonedDateTime() {
- Object x1 = zdt("2000-06-01T12:34:56Z"), nil = null;
+ var x1 = zdt("2000-06-01T12:34:56Z");
+ var nil = (Object)null;
Object x2 = "";
test(x1).asZonedDateTime().asString().isMatches("2000*");
test(nil).asZonedDateTime().isNull();
@@ -326,25 +340,31 @@ class AnyAssertion_Test extends SimpleTestBase {
//-----------------------------------------------------------------------------------------------------------------
@Test void ca01_exists() {
- Integer x = 1, nil = null;
+ var x = 1;
+ var nil = (Integer)null;
test(x).isExists().isExists();
assertThrowsWithMessage(BasicAssertionError.class, "Value was
null.", ()->test(nil).isExists());
}
@Test void ca02_isNull() {
- Integer x = 1, nil = null;
+ var x = 1;
+ var nil = (Integer)null;
test(nil).isNull();
assertThrowsWithMessage(BasicAssertionError.class, "Value was
not null.", ()->test(x).isNull());
}
@Test void ca03_isNotNull() {
- Integer x = 1, nil = null;
+ var x = 1;
+ var nil = (Integer)null;
test(x).isNotNull();
assertThrowsWithMessage(BasicAssertionError.class, "Value was
null.", ()->test(nil).isNotNull());
}
@Test void ca04a_is_T() {
- Integer x1 = 1, x1a = 1, x2 = 2, nil = null;
+ var x1 = 1;
+ var x1a = 1;
+ var x2 = 2;
+ var nil = (Integer)null;
test(x1).is(x1);
test(x1).is(x1a);
test(nil).is(nil);
@@ -361,7 +381,10 @@ class AnyAssertion_Test extends SimpleTestBase {
}
@Test void ca05_isNot() {
- Integer x1 = 1, x1a = 1, x2 = 2, nil = null;
+ var x1 = 1;
+ var x1a = 1;
+ var x2 = 2;
+ var nil = (Integer)null;
test(x1).isNot(x2);
test(x1).isNot(nil);
test(nil).isNot(x1);
@@ -370,7 +393,10 @@ class AnyAssertion_Test extends SimpleTestBase {
}
@Test void ca06_isAny() {
- Integer x1 = 1, x1a = 1, x2 = 2, nil = null;
+ var x1 = 1;
+ var x1a = 1;
+ var x2 = 2;
+ var nil = (Integer)null;
test(x1).isAny(x1a, x2);
assertThrown(()->test(x1).isAny(x2)).asMessage().asOneLine().is("Expected value
not found. Expect='[2]'. Actual='1'.");
assertThrown(()->test(x1).isAny()).asMessage().asOneLine().is("Expected value
not found. Expect='[]'. Actual='1'.");
@@ -378,7 +404,10 @@ class AnyAssertion_Test extends SimpleTestBase {
}
@Test void ca07_isNotAny() {
- Integer x1 = 1, x1a = 1, x2 = 2, nil = null;
+ var x1 = 1;
+ var x1a = 1;
+ var x2 = 2;
+ var nil = (Integer)null;
test(x1).isNotAny(x2);
test(x1).isNotAny();
test(nil).isNotAny(x2);
@@ -398,7 +427,10 @@ class AnyAssertion_Test extends SimpleTestBase {
}
@Test void ca09_isSameJsonAs() {
- Integer x1 = 1, x1a = 1, x2 = 2, nil = null;
+ var x1 = 1;
+ var x1a = 1;
+ var x2 = 2;
+ var nil = (Integer)null;
test(x1).isSameJsonAs(x1a);
test(nil).isSameJsonAs(nil);
assertThrown(()->test(x1a).isSameJsonAs(x2)).asMessage().asOneLine().is("Unexpected
comparison. Expect='2'. Actual='1'.");
@@ -407,7 +439,10 @@ class AnyAssertion_Test extends SimpleTestBase {
}
@Test void ca10_isSameSortedJsonAs() {
- Integer x1 = 1, x1a = 1, x2 = 2, nil = null;
+ var x1 = 1;
+ var x1a = 1;
+ var x2 = 2;
+ var nil = (Integer)null;
test(x1).isSameSortedJsonAs(x1a);
test(nil).isSameSortedJsonAs(nil);
assertThrown(()->test(x1a).isSameSortedJsonAs(x2)).asMessage().asOneLine().is("Unexpected
comparison. Expect='2'. Actual='1'.");
@@ -416,7 +451,10 @@ class AnyAssertion_Test extends SimpleTestBase {
}
@Test void ca11_isSameSerializedAs() {
- Integer x1 = 1, x1a = 1, x2 = 2, nil = null;
+ var x1 = 1;
+ var x1a = 1;
+ var x2 = 2;
+ var nil = (Integer)null;
WriterSerializer s = Json5Serializer.DEFAULT;
test(x1).isSameSerializedAs(x1a, s);
test(nil).isSameSerializedAs(nil, s);
@@ -426,7 +464,8 @@ class AnyAssertion_Test extends SimpleTestBase {
}
@Test void ca12_isType() {
- Integer x = 1, nil = null;
+ var x = 1;
+ var nil = (Integer)null;
test(x).isType(Integer.class);
test(x).isType(Object.class);
assertThrown(()->test(x).isType(String.class)).asMessage().asOneLine().is("Unexpected
type. Expect='java.lang.String'. Actual='java.lang.Integer'.");
@@ -435,7 +474,8 @@ class AnyAssertion_Test extends SimpleTestBase {
}
@Test void ca13_isExactType() {
- Integer x = 1, nil = null;
+ var x = 1;
+ var nil = (Integer)null;
test(x).isExactType(Integer.class);
assertThrown(()->test(x).isExactType(Object.class)).asMessage().asOneLine().is("Unexpected
type. Expect='java.lang.Object'. Actual='java.lang.Integer'.");
assertThrown(()->test(x).isExactType(String.class)).asMessage().asOneLine().is("Unexpected
type. Expect='java.lang.String'. Actual='java.lang.Integer'.");
@@ -444,7 +484,8 @@ class AnyAssertion_Test extends SimpleTestBase {
}
@Test void ca14_isString() {
- Integer x = 1, nil = null;
+ var x = 1;
+ var nil = (Integer)null;
test(x).isString("1");
test(nil).isString(null);
assertThrown(()->test(x).isString("bad")).asMessage().asOneLine().is("String
differed at position 0. Expect='bad'. Actual='1'.");
@@ -453,7 +494,8 @@ class AnyAssertion_Test extends SimpleTestBase {
}
@Test void ca15_isJson() {
- Integer x = 1, nil = null;
+ var x = 1;
+ var nil = (Integer)null;
test(x).isJson("1");
test(nil).isJson("null");
assertThrown(()->test(x).isJson("bad")).asMessage().asOneLine().is("String
differed at position 0. Expect='bad'. Actual='1'.");
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/assertions/ArrayAssertion_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/assertions/ArrayAssertion_Test.java
index 63af900f6..6db7d0be7 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/assertions/ArrayAssertion_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/assertions/ArrayAssertion_Test.java
@@ -14,6 +14,8 @@ package org.apache.juneau.assertions;
import static org.apache.juneau.assertions.AssertionPredicates.*;
import static org.apache.juneau.assertions.Assertions.*;
+import static org.apache.juneau.TestUtils.*;
+
import static org.junit.jupiter.api.Assertions.*;
import static org.junit.runners.MethodSorters.*;
@@ -64,14 +66,16 @@ public class ArrayAssertion_Test {
@Test
public void ba01a_asString() {
- Integer[] x = {1,2}, nil = null;
+ var x = a(1,2);
+ var nil = (Integer[])null;
test(x).asString().is("[1, 2]");
test(nil).asString().isNull();
}
@Test
public void ba01b_asString_wSerializer() {
- Integer[] x = {1,2}, nil = null;
+ var x = a(1,2);
+ var nil = (Integer[])null;
WriterSerializer s = Json5Serializer.DEFAULT;
test(x).asString(s).is("[1,2]");
test(nil).asString(s).is("null");
@@ -85,41 +89,47 @@ public class ArrayAssertion_Test {
@Test
public void ba02_asJson() {
- Integer[] x = {1,2}, nil = null;
+ var x = a(1,2);
+ var nil = (Integer[])null;
test(x).asJson().is("[1,2]");
test(nil).asJson().is("null");
}
@Test
public void ba03_asJsonSorted() {
- Integer[] x1 = {2,1}, nil = null;
+ var x1 = a(2,1);
+ var nil = (Integer[])null;
test(x1).asJsonSorted().is("[1,2]");
test(nil).asJsonSorted().is("null");
}
@Test
public void ba04_apply() {
- Integer[] x1 = {1,2}, x2 = {3,4};
+ var x1 = a(1,2);
+ var x2 = a(3,4);
test(x1).asTransformed(x -> x2).is(x2);
}
@Test
public void bb01_asStrings() {
- Integer[] x1 = {1,2}, nil = null;
+ var x1 = a(1,2);
+ var nil = (Integer[])null;
test(x1).asStrings().asJoin().is("12");
test(nil).asStrings().isNull();
}
@Test
public void bb02_asBeanList() {
- A[] x = {A,A}, nil = null;
+ var x = a(A,A);
+ var nil = (Integer[])null;
test(x).asBeanList().asProperty("a").asJson().is("[1,1]");
test(nil).asBeanList().isNull();
}
@Test
public void bb03_item() {
- A[] x = {A,A}, nil = null;
+ var x = a(A,A);
+ var nil = (Integer[])null;
test(x).asItem(0).asBean().asProperty("a").is(1);
test(x).asItem(-1).isNull();
test(x).asItem(2).isNull();
@@ -128,7 +138,8 @@ public class ArrayAssertion_Test {
@Test
public void bb04a_sorted() {
- Integer[] x = {2,3,1}, nil = null;
+ var x = a(2,3,1);
+ var nil = (Integer[])null;
test(x).asSorted().asJson().is("[1,2,3]");
test(x).asSorted(Comparator.reverseOrder()).asJson().is("[3,2,1]");
test(x).asSorted(null).asJson().is("[1,2,3]");
@@ -137,7 +148,8 @@ public class ArrayAssertion_Test {
@Test
public void bb04b_sorted_wComparator() {
- Integer[] x = {2,3,1}, nil = null;
+ var x = a(2,3,1);
+ var nil = (Integer[])null;
test(x).asSorted().asJson().is("[1,2,3]");
test(x).asSorted(Comparator.reverseOrder()).asJson().is("[3,2,1]");
test(x).asSorted(null).asJson().is("[1,2,3]");
@@ -171,7 +183,10 @@ public class ArrayAssertion_Test {
@Test
public void ca04a_is_T() {
- Integer[] x1 = {null,1,2}, x1a = {null,1,2}, x1b = {null,1,3},
nil = null;
+ var x1 = a(null,1,2);
+ var x1a = a(null,1,2);
+ var x1b = a(null,1,3);
+ var nil = (Integer[])null;
test(x1).is(x1);
test(x1).is(x1a);
test(nil).is(nil);
@@ -190,7 +205,10 @@ public class ArrayAssertion_Test {
@Test
public void ca05_isNot() {
- Integer[] x1 = {null,1,2}, x1a = {null,1,2}, x2 = {null,1,3},
nil = null;
+ var x1 = a(null,1,2);
+ var x1a = a(null,1,2);
+ var x2 = a(null,1,3);
+ var nil = (Integer[])null;
test(x1).isNot(x2);
test(x1).isNot(nil);
test(nil).isNot(x1);
@@ -200,7 +218,10 @@ public class ArrayAssertion_Test {
@Test
public void ca06_isAny() {
- Integer[] x1 = {null,1,2}, x1a = {null,1,2}, x2 = {null,1,3},
nil = null;
+ var x1 = a(null,1,2);
+ var x1a = a(null,1,2);
+ var x2 = a(null,1,3);
+ var nil = (Integer[])null;
test(x1).isAny(x1a, x2);
assertThrown(()->test(x1).isAny(x2)).asMessage().asOneLine().is("Expected value
not found. Expect='[[null, 1, 3]]'. Actual='[null, 1, 2]'.");
assertThrown(()->test(x1).isAny()).asMessage().asOneLine().is("Expected value
not found. Expect='[]'. Actual='[null, 1, 2]'.");
@@ -209,7 +230,10 @@ public class ArrayAssertion_Test {
@Test
public void ca07_isNotAny() {
- Integer[] x1 = {null,1,2}, x1a = {null,1,2}, x2 = {null,1,3},
nil = null;
+ var x1 = a(null,1,2);
+ var x1a = a(null,1,2);
+ var x2 = a(null,1,3);
+ var nil = (Integer[])null;
test(x1).isNotAny(x2);
test(x1).isNotAny();
test(nil).isNotAny(x2);
@@ -219,7 +243,9 @@ public class ArrayAssertion_Test {
@Test
public void ca08_isSame() {
- Integer[] x1 = {null,1,2}, x1a = {null,1,2}, nil = null;
+ var x1 = a(null,1,2);
+ var x1a = a(null,1,2);
+ var nil = (Integer[])null;
test(x1).isSame(x1);
test(nil).isSame(nil);
assertThrown(()->test(x1).isSame(x1a)).asMessage().asOneLine().isMatches("Not
the same value. Expect='[null, 1, 2](Integer[]@*)'. Actual='[null, 1,
2](Integer[]@*)'.");
@@ -229,7 +255,10 @@ public class ArrayAssertion_Test {
@Test
public void ca09_isSameJsonAs() {
- Integer[] x1 = {null,1,2}, x1a = {null,1,2}, x2 = {null,1,3},
nil = null;
+ var x1 = a(null,1,2);
+ var x1a = a(null,1,2);
+ var x2 = a(null,1,3);
+ var nil = (Integer[])null;
test(x1).isSameJsonAs(x1a);
test(nil).isSameJsonAs(nil);
assertThrown(()->test(x1a).isSameJsonAs(x2)).asMessage().asOneLine().is("Unexpected
comparison. Expect='[null,1,3]'. Actual='[null,1,2]'.");
@@ -239,7 +268,10 @@ public class ArrayAssertion_Test {
@Test
public void ca10_isSameSortedJsonAs() {
- Integer[] x1 = {1,2}, x1a = {2,1}, x2 = {1,3}, nil = null; //
Note that nulls are not sortable.
+ var x1 = a(1,2);
+ var x1a = a(2,1);
+ var x2 = a(1,3);
+ var nil = (Integer[])null;
test(x1).isSameSortedJsonAs(x1a);
test(nil).isSameSortedJsonAs(nil);
assertThrown(()->test(x1a).isSameSortedJsonAs(x2)).asMessage().asOneLine().is("Unexpected
comparison. Expect='[1,3]'. Actual='[1,2]'.");
@@ -249,7 +281,10 @@ public class ArrayAssertion_Test {
@Test
public void ca11_isSameSerializedAs() {
- Integer[] x1 = {null,1,2}, x1a = {null,1,2}, x2 = {null,1,3},
nil = null;
+ var x1 = a(null,1,2);
+ var x1a = a(null,1,2);
+ var x2 = a(null,1,3);
+ var nil = (Integer[])null;
WriterSerializer s = Json5Serializer.DEFAULT;
test(x1).isSameSerializedAs(x1a, s);
test(nil).isSameSerializedAs(nil, s);
@@ -280,7 +315,8 @@ public class ArrayAssertion_Test {
@Test
public void ca14_isString() {
- Integer[] x = {null,1,2}, nil = null;
+ var x = a(null,1,2);
+ var nil = (Integer[])null;
test(x).isString("[null, 1, 2]");
test(nil).isString(null);
assertThrown(()->test(x).isString("bad")).asMessage().asOneLine().is("String
differed at position 0. Expect='bad'. Actual='[null, 1, 2]'.");
@@ -290,7 +326,8 @@ public class ArrayAssertion_Test {
@Test
public void ca15_isJson() {
- Integer[] x = {null,1,2}, nil = null;
+ var x = a(null,1,2);
+ var nil = (Integer[])null;
test(x).isJson("[null,1,2]");
test(nil).isJson("null");
assertThrown(()->test(x).isJson("bad")).asMessage().asOneLine().is("String
differed at position 0. Expect='bad'. Actual='[null,1,2]'.");
@@ -300,7 +337,8 @@ public class ArrayAssertion_Test {
@Test
public void cb01_is_predicates() {
- Integer[] x1 = {null,1,2}, nil = null;
+ var x1 = a(null,1,2);
+ var nil = (Integer[])null;
test(x1).is(isNull(),eq("1"),eq("2"));
test(x1).is(isNull(),eq(1),eq(2));
assertThrown(()->test(x1).is(isNull(),eq("1"),eq("3"))).asMessage().asOneLine().is("Array
did not contain expected value at index 2. Value did not match expected.
Expect='3'. Actual='2'.");
@@ -310,7 +348,8 @@ public class ArrayAssertion_Test {
@Test
public void cb02_any() {
- Integer[] x1 = {2,3,1}, nil = null;
+ var x1 = a(2,3,1);
+ var nil = (Integer[])null;
test(x1).isAny(x -> x .equals(3));
test(x1).isAny(eq(3));
assertThrown(()->test(x1).isAny(x ->
x.equals(4))).asMessage().asOneLine().is("Array did not contain any matching
value. Value='[2, 3, 1]'.");
@@ -320,7 +359,8 @@ public class ArrayAssertion_Test {
@Test
public void cb03_all() {
- Integer[] x1 = {2,3,1}, nil = null;
+ var x1 = a(2,3,1);
+ var nil = (Integer[])null;
test(x1).isAll(x -> x < 4);
assertThrown(()->test(x1).isAll(x -> x <
3)).asMessage().asOneLine().is("Array contained non-matching value at index 1.
Unexpected value: '3'.");
assertThrown(()->test(x1).isAll(ne(3))).asMessage().asOneLine().is("Array
contained non-matching value at index 1. Value unexpectedly matched.
Value='3'.");
@@ -346,7 +386,8 @@ public class ArrayAssertion_Test {
@Test
public void cb06_contains() {
- Integer[] x1 = {null,1,2}, nil = null;
+ var x1 = a(null,1,2);
+ var nil = (Integer[])null;
test(x1).isContains(null);
test(x1).isContains(1);
assertThrown(()->test(x1).isContains(3)).asMessage().asOneLine().is("Array did
not contain expected value. Expect='3'. Actual='[null, 1, 2]'.");
@@ -356,7 +397,8 @@ public class ArrayAssertion_Test {
@Test
public void cb07_doesNotContain() {
- Integer[] x1 = {null,1,2}, nil = null;
+ var x1 = a(null,1,2);
+ var nil = (Integer[])null;
test(x1).isNotContains(3);
assertThrown(()->test(x1).isNotContains(1)).asMessage().asOneLine().is("Array
contained unexpected value. Unexpected='1'. Actual='[null, 1, 2]'.");
assertThrown(()->test(x1).isNotContains(null)).asMessage().asOneLine().is("Array
contained unexpected value. Unexpected='null'. Actual='[null, 1, 2]'.");
@@ -375,7 +417,8 @@ public class ArrayAssertion_Test {
@Test
public void cb09_has() {
- String[] x={"foo","bar"}, nil = null;
+ var x= a("foo","bar");
+ var nil = (String[])null;
test(x).isHas("foo","bar");
assertThrown(()->test(x).isHas("foo","baz")).asMessage().asOneLine().is("Array
did not contain expected value at index 1. Value did not match expected.
Expect='baz'. Actual='bar'.");
assertThrown(()->test(x).isHas("foo")).asMessage().asOneLine().is("Array did
not have the expected size. Expect=1. Actual=2.");
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/assertions/AssertionPredicates_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/assertions/AssertionPredicates_Test.java
index ea6852da3..0eef3a41c 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/assertions/AssertionPredicates_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/assertions/AssertionPredicates_Test.java
@@ -121,7 +121,8 @@ public class AssertionPredicates_Test {
@Test
public void a12_regex_wPattern() {
- Pattern p1 = Pattern.compile("FO.*", CASE_INSENSITIVE), p2 =
Pattern.compile("BA.*", CASE_INSENSITIVE);
+ var p1 = Pattern.compile("FO.*", CASE_INSENSITIVE);
+ var p2 = Pattern.compile("BA.*", CASE_INSENSITIVE);
A1.is(regex(p1));
assertThrown(()->A1.is(regex(p2))).asMessage().asOneLine().is("Value did not
match pattern. Pattern='BA.*'. Value='foo'.");
assertThrown(()->A2.is(regex(p2))).asMessage().asOneLine().is("Value did not
match pattern. Pattern='BA.*'. Value='null'.");
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/assertions/BeanAssertion_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/assertions/BeanAssertion_Test.java
index a0a598505..96d8105e6 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/assertions/BeanAssertion_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/assertions/BeanAssertion_Test.java
@@ -14,6 +14,7 @@ package org.apache.juneau.assertions;
import static org.apache.juneau.assertions.AssertionPredicates.*;
import static org.apache.juneau.assertions.Assertions.*;
+import static org.apache.juneau.TestUtils.*;
import static org.junit.jupiter.api.Assertions.*;
import static org.junit.runners.MethodSorters.*;
@@ -67,14 +68,16 @@ public class BeanAssertion_Test {
@Test
public void ba01a_asString() {
- A x = A1, nil = null;
+ var x = A1;
+ var nil = (A)null;
test(x).asString().is("a=1,b=2");
test(nil).asString().isNull();
}
@Test
public void ba01b_asString_wSerializer() {
- A x = A1, nil = null;
+ var x = A1;
+ var nil = (A)null;
WriterSerializer s = Json5Serializer.DEFAULT;
test(x).asString(s).is("{a:1,b:2}");
test(nil).asString(s).is("null");
@@ -88,27 +91,31 @@ public class BeanAssertion_Test {
@Test
public void ba02_asJson() {
- A x = A1, nil = null;
+ var x = A1;
+ var nil = (A)null;
test(x).asJson().is("{a:1,b:2}");
test(nil).asJson().is("null");
}
@Test
public void ba03_asJsonSorted() {
- A[] x1 = {A2,A1}, nil = null;
+ var x1 = a(A2,A1);
+ var nil = (A)null;
test(x1).asJsonSorted().is("[{a:1,b:2},{a:2,b:3}]");
test(nil).asJsonSorted().is("null");
}
@Test
public void ba04_apply() {
- A x1 = A1, x2 = A2;
+ var x1 = A1;
+ var x2 = A2;
test(x1).asTransformed(x -> x2).is(x2);
}
@Test
public void bb01_extract() {
- A x = A1, nil = null;
+ var x = A1;
+ var nil = (A)null;
test(x).asPropertyMap("b,a").asJson().is("{b:2,a:1}");
test(x).asPropertyMap("x").asJson().is("{}");
assertThrows(BasicAssertionError.class,
()->test(nil).asPropertyMap("x"), "Value was null.");
@@ -116,7 +123,8 @@ public class BeanAssertion_Test {
@Test
public void bb02_property() {
- A x = A1, nil = null;
+ var x = A1;
+ var nil = (A)null;
test(x).asProperty("a").asInteger().is(1);
test(x).asProperty("x").asInteger().isNull();
assertThrows(BasicAssertionError.class,
()->test(nil).asProperty("x"), "Value was null.");
@@ -124,7 +132,8 @@ public class BeanAssertion_Test {
@Test
public void bb03_properties() {
- A x = A1, nil = null;
+ var x = A1;
+ var nil = (A)null;
test(x).asProperties("a").asJson().is("[1]");
test(x).asProperties("x").asJson().is("[null]");
assertThrows(BasicAssertionError.class,
()->test(nil).asProperties("x"), "Value was null.");
@@ -136,28 +145,34 @@ public class BeanAssertion_Test {
@Test
public void ca01_exists() {
- A x = A1, nil = null;
+ var x = A1;
+ var nil = (A)null;
test(x).isExists().isExists();
assertThrows(BasicAssertionError.class,
()->test(nil).isExists(), "Value was null.");
}
@Test
public void ca02_isNull() {
- A x = A1, nil = null;
+ var x = A1;
+ var nil = (A)null;
test(nil).isNull();
assertThrows(BasicAssertionError.class, ()->test(x).isNull(),
"Value was not null.");
}
@Test
public void ca03_isNotNull() {
- A x = A1, nil = null;
+ var x = A1;
+ var nil = (A)null;
test(x).isNotNull();
assertThrows(BasicAssertionError.class,
()->test(nil).isNotNull(), "Value was null.");
}
@Test
public void ca04a_is_T() {
- A x1 = A1, x1a = A1a, x2 = A2, nil = null;
+ var x1 = A1;
+ var x1a = A1a;
+ var x2 = A2;
+ var nil = (A)null;
test(x1).is(x1);
test(x1).is(x1a);
test(nil).is(nil);
@@ -176,7 +191,10 @@ public class BeanAssertion_Test {
@Test
public void ca05_isNot() {
- A x1 = A1, x1a = A1a, x2 = A2, nil = null;
+ var x1 = A1;
+ var x1a = A1a;
+ var x2 = A2;
+ var nil = (A)null;
test(x1).isNot(x2);
test(x1).isNot(nil);
test(nil).isNot(x1);
@@ -186,7 +204,10 @@ public class BeanAssertion_Test {
@Test
public void ca06_isAny() {
- A x1 = A1, x1a = A1a, x2 = A2, nil = null;
+ var x1 = A1;
+ var x1a = A1a;
+ var x2 = A2;
+ var nil = (A)null;
test(x1).isAny(x1a, x2);
assertThrown(()->test(x1).isAny(x2)).asMessage().asOneLine().is("Expected value
not found. Expect='[a=2,b=3]'. Actual='a=1,b=2'.");
assertThrown(()->test(x1).isAny()).asMessage().asOneLine().is("Expected value
not found. Expect='[]'. Actual='a=1,b=2'.");
@@ -195,7 +216,10 @@ public class BeanAssertion_Test {
@Test
public void ca07_isNotAny() {
- A x1 = A1, x1a = A1a, x2 = A2, nil = null;
+ var x1 = A1;
+ var x1a = A1a;
+ var x2 = A2;
+ var nil = (A)null;
test(x1).isNotAny(x2);
test(x1).isNotAny();
test(nil).isNotAny(x2);
@@ -205,7 +229,9 @@ public class BeanAssertion_Test {
@Test
public void ca08_isSame() {
- A x1 = A1, x1a = A1a, nil = null;
+ var x1 = A1;
+ var x1a = A1a;
+ var nil = (A)null;
test(x1).isSame(x1);
test(nil).isSame(nil);
assertThrown(()->test(x1).isSame(x1a)).asMessage().asOneLine().isMatches("Not
the same value. Expect='a=1,b=2(BeanAssertion_Test$A@*)'.
Actual='a=1,b=2(BeanAssertion_Test$A@*)'.");
@@ -215,7 +241,10 @@ public class BeanAssertion_Test {
@Test
public void ca09_isSameJsonAs() {
- A x1 = A1, x1a = A1a, x2 = A2, nil = null;
+ var x1 = A1;
+ var x1a = A1a;
+ var x2 = A2;
+ var nil = (A)null;
test(x1).isSameJsonAs(x1a);
test(nil).isSameJsonAs(nil);
assertThrown(()->test(x1a).isSameJsonAs(x2)).asMessage().asOneLine().is("Unexpected
comparison. Expect='{a:2,b:3}'. Actual='{a:1,b:2}'.");
@@ -225,7 +254,10 @@ public class BeanAssertion_Test {
@Test
public void ca10_isSameSortedJsonAs() {
- A x1 = A1, x1a = A1a, x2 = A2, nil = null;
+ var x1 = A1;
+ var x1a = A1a;
+ var x2 = A2;
+ var nil = (A)null;
test(x1).isSameSortedJsonAs(x1a);
test(nil).isSameSortedJsonAs(nil);
assertThrown(()->test(x1a).isSameSortedJsonAs(x2)).asMessage().asOneLine().is("Unexpected
comparison. Expect='{a:2,b:3}'. Actual='{a:1,b:2}'.");
@@ -235,7 +267,10 @@ public class BeanAssertion_Test {
@Test
public void ca11_isSameSerializedAs() {
- A x1 = A1, x1a = A1a, x2 = A2, nil = null;
+ var x1 = A1;
+ var x1a = A1a;
+ var x2 = A2;
+ var nil = (A)null;
WriterSerializer s = Json5Serializer.DEFAULT;
test(x1).isSameSerializedAs(x1a, s);
test(nil).isSameSerializedAs(nil, s);
@@ -246,7 +281,8 @@ public class BeanAssertion_Test {
@Test
public void ca12_isType() {
- A x = A1, nil = null;
+ var x = A1;
+ var nil = (A)null;
test(x).isType(A.class);
test(x).isType(Object.class);
assertThrown(()->test(x).isType(String.class)).asMessage().asOneLine().is("Unexpected
type. Expect='java.lang.String'.
Actual='org.apache.juneau.assertions.BeanAssertion_Test$A'.");
@@ -256,7 +292,8 @@ public class BeanAssertion_Test {
@Test
public void ca13_isExactType() {
- A x = A1, nil = null;
+ var x = A1;
+ var nil = (A)null;
test(x).isExactType(A.class);
assertThrown(()->test(x).isExactType(String.class)).asMessage().asOneLine().is("Unexpected
type. Expect='java.lang.String'.
Actual='org.apache.juneau.assertions.BeanAssertion_Test$A'.");
assertThrown(()->test(nil).isExactType(String.class)).asMessage().asOneLine().is("Value
was null.");
@@ -265,7 +302,8 @@ public class BeanAssertion_Test {
@Test
public void ca14_isString() {
- A x = A1, nil = null;
+ var x = A1;
+ var nil = (A)null;
test(x).isString("a=1,b=2");
test(nil).isString(null);
assertThrown(()->test(x).isString("bad")).asMessage().asOneLine().is("String
differed at position 0. Expect='bad'. Actual='a=1,b=2'.");
@@ -275,7 +313,8 @@ public class BeanAssertion_Test {
@Test
public void ca15_isJson() {
- A x = A1, nil = null;
+ var x = A1;
+ var nil = (A)null;
test(x).isJson("{a:1,b:2}");
test(nil).isJson("null");
assertThrown(()->test(x).isJson("bad")).asMessage().asOneLine().is("String
differed at position 0. Expect='bad'. Actual='{a:1,b:2}'.");
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/assertions/BooleanAssertion_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/assertions/BooleanAssertion_Test.java
index 405c112c9..22afa1c45 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/assertions/BooleanAssertion_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/assertions/BooleanAssertion_Test.java
@@ -55,14 +55,16 @@ public class BooleanAssertion_Test {
@Test
public void ba01a_asString() {
- Boolean x = true, nil = null;
+ var x = true;
+ var nil = (Boolean)null;
test(x).asString().is("true");
test(nil).asString().isNull();
}
@Test
public void ba01b_asString_wSerializer() {
- Boolean x = true, nil = null;
+ var x = true;
+ var nil = (Boolean)null;
WriterSerializer s = Json5Serializer.DEFAULT;
test(x).asString(s).is("true");
test(nil).asString(s).is("null");
@@ -76,14 +78,16 @@ public class BooleanAssertion_Test {
@Test
public void ba02_asJson() {
- Boolean x = true, nil = null;
+ var x = true;
+ var nil = (Boolean)null;
test(x).asJson().is("true");
test(nil).asJson().is("null");
}
@Test
public void ba03_asJsonSorted() {
- Boolean x1 = true, nil = null;
+ var x1 = true;
+ var nil = (Boolean)null;
test(x1).asJsonSorted().is("true");
test(nil).asJsonSorted().is("null");
}
@@ -100,28 +104,34 @@ public class BooleanAssertion_Test {
@Test
public void ca01_exists() {
- Boolean x = true, nil = null;
+ var x = true;
+ var nil = (Boolean)null;
test(x).isExists().isExists();
assertThrows(BasicAssertionError.class,
()->test(nil).isExists(), "Value was null.");
}
@Test
public void ca02_isNull() {
- Boolean x = true, nil = null;
+ var x = true;
+ var nil = (Boolean)null;
test(nil).isNull();
assertThrows(BasicAssertionError.class, ()->test(x).isNull(),
"Value was not null.");
}
@Test
public void ca03_isNotNull() {
- Boolean x = true, nil = null;
+ var x = true;
+ var nil = (Boolean)null;
test(x).isNotNull();
assertThrows(BasicAssertionError.class,
()->test(nil).isNotNull(), "Value was null.");
}
@Test
public void ca04a_is_T() {
- Boolean x1 = true, x1a = true, x2 = false, nil = null;
+ var x1 = true;
+ var x1a = true;
+ var x2 = false;
+ var nil = (Boolean)null;
test(x1).is(x1);
test(x1).is(x1a);
test(nil).is(nil);
@@ -140,7 +150,10 @@ public class BooleanAssertion_Test {
@Test
public void ca05_isNot() {
- Boolean x1 = true, x1a = true, x2 = false, nil = null;
+ var x1 = true;
+ var x1a = true;
+ var x2 = false;
+ var nil = (Boolean)null;
test(x1).isNot(x2);
test(x1).isNot(nil);
test(nil).isNot(x1);
@@ -150,7 +163,10 @@ public class BooleanAssertion_Test {
@Test
public void ca06_isAny() {
- Boolean x1 = true, x1a = true, x2 = false, nil = null;
+ var x1 = true;
+ var x1a = true;
+ var x2 = false;
+ var nil = (Boolean)null;
test(x1).isAny(x1a, x2);
assertThrown(()->test(x1).isAny(x2)).asMessage().asOneLine().is("Expected value
not found. Expect='[false]'. Actual='true'.");
assertThrown(()->test(x1).isAny()).asMessage().asOneLine().is("Expected value
not found. Expect='[]'. Actual='true'.");
@@ -159,7 +175,10 @@ public class BooleanAssertion_Test {
@Test
public void ca07_isNotAny() {
- Boolean x1 = true, x1a = true, x2 = false, nil = null;
+ var x1 = true;
+ var x1a = true;
+ var x2 = false;
+ var nil = (Boolean)null;
test(x1).isNotAny(x2);
test(x1).isNotAny();
test(nil).isNotAny(x2);
@@ -181,7 +200,10 @@ public class BooleanAssertion_Test {
@Test
public void ca09_isSameJsonAs() {
- Boolean x1 = true, x1a = true, x2 = false, nil = null;
+ var x1 = true;
+ var x1a = true;
+ var x2 = false;
+ var nil = (Boolean)null;
test(x1).isSameJsonAs(x1a);
test(nil).isSameJsonAs(nil);
assertThrown(()->test(x1a).isSameJsonAs(x2)).asMessage().asOneLine().is("Unexpected
comparison. Expect='false'. Actual='true'.");
@@ -191,7 +213,10 @@ public class BooleanAssertion_Test {
@Test
public void ca10_isSameSortedJsonAs() {
- Boolean x1 = true, x1a = true, x2 = false, nil = null;
+ var x1 = true;
+ var x1a = true;
+ var x2 = false;
+ var nil = (Boolean)null;
test(x1).isSameSortedJsonAs(x1a);
test(nil).isSameSortedJsonAs(nil);
assertThrown(()->test(x1a).isSameSortedJsonAs(x2)).asMessage().asOneLine().is("Unexpected
comparison. Expect='false'. Actual='true'.");
@@ -201,7 +226,10 @@ public class BooleanAssertion_Test {
@Test
public void ca11_isSameSerializedAs() {
- Boolean x1 = true, x1a = true, x2 = false, nil = null;
+ var x1 = true;
+ var x1a = true;
+ var x2 = false;
+ var nil = (Boolean)null;
WriterSerializer s = Json5Serializer.DEFAULT;
test(x1).isSameSerializedAs(x1a, s);
test(nil).isSameSerializedAs(nil, s);
@@ -212,7 +240,8 @@ public class BooleanAssertion_Test {
@Test
public void ca12_isType() {
- Boolean x = true, nil = null;
+ var x = true;
+ var nil = (Boolean)null;
test(x).isType(Boolean.class);
test(x).isType(Object.class);
assertThrown(()->test(x).isType(String.class)).asMessage().asOneLine().is("Unexpected
type. Expect='java.lang.String'. Actual='java.lang.Boolean'.");
@@ -222,7 +251,8 @@ public class BooleanAssertion_Test {
@Test
public void ca13_isExactType() {
- Boolean x = true, nil = null;
+ var x = true;
+ var nil = (Boolean)null;
test(x).isExactType(Boolean.class);
assertThrown(()->test(x).isExactType(Object.class)).asMessage().asOneLine().is("Unexpected
type. Expect='java.lang.Object'. Actual='java.lang.Boolean'.");
assertThrown(()->test(nil).isExactType(String.class)).asMessage().asOneLine().is("Value
was null.");
@@ -231,7 +261,8 @@ public class BooleanAssertion_Test {
@Test
public void ca14_isString() {
- Boolean x = true, nil = null;
+ var x = true;
+ var nil = (Boolean)null;
test(x).isString("true");
test(nil).isString(null);
assertThrown(()->test(x).isString("bad")).asMessage().asOneLine().is("String
differed at position 0. Expect='bad'. Actual='true'.");
@@ -241,7 +272,8 @@ public class BooleanAssertion_Test {
@Test
public void ca15_isJson() {
- Boolean x = true, nil = null;
+ var x = true;
+ var nil = (Boolean)null;
test(x).isJson("true");
test(nil).isJson("null");
assertThrown(()->test(x).isJson("bad")).asMessage().asOneLine().is("String
differed at position 0. Expect='bad'. Actual='true'.");
@@ -251,7 +283,7 @@ public class BooleanAssertion_Test {
@Test
public void cc01_isTrue() {
- Boolean nil = null;
+ var nil = (Boolean)null;
test(true).isTrue();
assertThrows(BasicAssertionError.class,
()->test(false).isTrue(), "Value was false.");
assertThrows(BasicAssertionError.class, ()->test(nil).isTrue(),
"Value was null.");
@@ -259,7 +291,7 @@ public class BooleanAssertion_Test {
@Test
public void cc02_isFalse() {
- Boolean nil = null;
+ var nil = (Boolean)null;
test(false).isFalse();
assertThrows(BasicAssertionError.class,
()->test(true).isFalse(), "Value was true.");
assertThrows(BasicAssertionError.class,
()->test(nil).isFalse(), "Value was null.");
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/assertions/ComparableAssertion_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/assertions/ComparableAssertion_Test.java
index f09c4eac5..dda0222b7 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/assertions/ComparableAssertion_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/assertions/ComparableAssertion_Test.java
@@ -55,14 +55,16 @@ public class ComparableAssertion_Test {
@Test
public void ba01a_asString() {
- Integer x = 1, nil = null;
+ var x = 1;
+ var nil = (Integer)null;
test(x).asString().is("1");
test(nil).asString().isNull();
}
@Test
public void ba01b_asString_wSerializer() {
- Integer x = 1, nil = null;
+ var x = 1;
+ var nil = (Integer)null;
WriterSerializer s = Json5Serializer.DEFAULT;
test(x).asString(s).is("1");
test(nil).asString(s).is("null");
@@ -70,27 +72,30 @@ public class ComparableAssertion_Test {
@Test
public void ba01c_asString_wPredicate() {
- Integer x1 = 1;
+ var x1 = 1;
test(x1).asString(x -> "foo").is("foo");
}
@Test
public void ba02_asJson() {
- Integer x = 1, nil = null;
+ var x = 1;
+ var nil = (Integer)null;
test(x).asJson().is("1");
test(nil).asJson().is("null");
}
@Test
public void ba03_asJsonSorted() {
- Integer x = 1, nil = null;
+ var x = 1;
+ var nil = (Integer)null;
test(x).asJsonSorted().is("1");
test(nil).asJsonSorted().is("null");
}
@Test
public void ba04_apply() {
- Integer x1 = 1, x2 = 2;
+ var x1 = 1;
+ var x2 = 2;
test(x1).asTransformed(x -> x2).is(x2);
}
@@ -100,28 +105,34 @@ public class ComparableAssertion_Test {
@Test
public void ca01_exists() {
- Integer x = 1, nil = null;
+ var x = 1;
+ var nil = (Integer)null;
test(x).isExists().isExists();
assertThrows(BasicAssertionError.class,
()->test(nil).isExists(), "Value was null.");
}
@Test
public void ca02_isNull() {
- Integer x = 1, nil = null;
+ var x = 1;
+ var nil = (Integer)null;
test(nil).isNull();
assertThrows(BasicAssertionError.class, ()->test(x).isNull(),
"Value was not null.");
}
@Test
public void ca03_isNotNull() {
- Integer x = 1, nil = null;
+ var x = 1;
+ var nil = (Integer)null;
test(x).isNotNull();
assertThrows(BasicAssertionError.class,
()->test(nil).isNotNull(), "Value was null.");
}
@Test
public void ca04a_is_T() {
- Integer x1 = 1, x1a = 1, x2 = 2, nil = null;
+ var x1 = 1;
+ var x1a = 1;
+ var x2 = 2;
+ var nil = (Integer)null;
test(x1).is(x1);
test(x1).is(x1a);
test(nil).is(nil);
@@ -140,7 +151,10 @@ public class ComparableAssertion_Test {
@Test
public void ca05_isNot() {
- Integer x1 = 1, x1a = 1, x2 = 2, nil = null;
+ var x1 = 1;
+ var x1a = 1;
+ var x2 = 2;
+ var nil = (Integer)null;
test(x1).isNot(x2);
test(x1).isNot(nil);
test(nil).isNot(x1);
@@ -150,7 +164,10 @@ public class ComparableAssertion_Test {
@Test
public void ca06_isAny() {
- Integer x1 = 1, x1a = 1, x2 = 2, nil = null;
+ var x1 = 1;
+ var x1a = 1;
+ var x2 = 2;
+ var nil = (Integer)null;
test(x1).isAny(x1a, x2);
assertThrown(()->test(x1).isAny(x2)).asMessage().asOneLine().is("Expected value
not found. Expect='[2]'. Actual='1'.");
assertThrown(()->test(x1).isAny()).asMessage().asOneLine().is("Expected value
not found. Expect='[]'. Actual='1'.");
@@ -159,7 +176,10 @@ public class ComparableAssertion_Test {
@Test
public void ca07_isNotAny() {
- Integer x1 = 1, x1a = 1, x2 = 2, nil = null;
+ var x1 = 1;
+ var x1a = 1;
+ var x2 = 2;
+ var nil = (Integer)null;
test(x1).isNotAny(x2);
test(x1).isNotAny();
test(nil).isNotAny(x2);
@@ -181,7 +201,10 @@ public class ComparableAssertion_Test {
@Test
public void ca09_isSameJsonAs() {
- Integer x1 = 1, x1a = 1, x2 = 2, nil = null;
+ var x1 = 1;
+ var x1a = 1;
+ var x2 = 2;
+ var nil = (Integer)null;
test(x1).isSameJsonAs(x1a);
test(nil).isSameJsonAs(nil);
assertThrown(()->test(x1a).isSameJsonAs(x2)).asMessage().asOneLine().is("Unexpected
comparison. Expect='2'. Actual='1'.");
@@ -191,7 +214,10 @@ public class ComparableAssertion_Test {
@Test
public void ca10_isSameSortedJsonAs() {
- Integer x1 = 1, x1a = 1, x2 = 2, nil = null;
+ var x1 = 1;
+ var x1a = 1;
+ var x2 = 2;
+ var nil = (Integer)null;
test(x1).isSameSortedJsonAs(x1a);
test(nil).isSameSortedJsonAs(nil);
assertThrown(()->test(x1a).isSameSortedJsonAs(x2)).asMessage().asOneLine().is("Unexpected
comparison. Expect='2'. Actual='1'.");
@@ -201,7 +227,10 @@ public class ComparableAssertion_Test {
@Test
public void ca11_isSameSerializedAs() {
- Integer x1 = 1, x1a = 1, x2 = 2, nil = null;
+ var x1 = 1;
+ var x1a = 1;
+ var x2 = 2;
+ var nil = (Integer)null;
WriterSerializer s = Json5Serializer.DEFAULT;
test(x1).isSameSerializedAs(x1a, s);
test(nil).isSameSerializedAs(nil, s);
@@ -212,7 +241,8 @@ public class ComparableAssertion_Test {
@Test
public void ca12_isType() {
- Integer x = 1, nil = null;
+ var x = 1;
+ var nil = (Integer)null;
test(x).isType(Integer.class);
test(x).isType(Object.class);
assertThrown(()->test(x).isType(String.class)).asMessage().asOneLine().is("Unexpected
type. Expect='java.lang.String'. Actual='java.lang.Integer'.");
@@ -222,7 +252,8 @@ public class ComparableAssertion_Test {
@Test
public void ca13_isExactType() {
- Integer x = 1, nil = null;
+ var x = 1;
+ var nil = (Integer)null;
test(x).isExactType(Integer.class);
assertThrown(()->test(x).isExactType(Object.class)).asMessage().asOneLine().is("Unexpected
type. Expect='java.lang.Object'. Actual='java.lang.Integer'.");
assertThrown(()->test(x).isExactType(String.class)).asMessage().asOneLine().is("Unexpected
type. Expect='java.lang.String'. Actual='java.lang.Integer'.");
@@ -232,7 +263,8 @@ public class ComparableAssertion_Test {
@Test
public void ca14_isString() {
- Integer x = 1, nil = null;
+ var x = 1;
+ var nil = (Integer)null;
test(x).isString("1");
test(nil).isString(null);
assertThrown(()->test(x).isString("bad")).asMessage().asOneLine().is("String
differed at position 0. Expect='bad'. Actual='1'.");
@@ -242,7 +274,8 @@ public class ComparableAssertion_Test {
@Test
public void ca15_isJson() {
- Integer x = 1, nil = null;
+ var x = 1;
+ var nil = (Integer)null;
test(x).isJson("1");
test(nil).isJson("null");
assertThrown(()->test(x).isJson("bad")).asMessage().asOneLine().is("String
differed at position 0. Expect='bad'. Actual='1'.");
@@ -252,7 +285,9 @@ public class ComparableAssertion_Test {
@Test
public void cb01_isGt() {
- Integer x1 = 1, x2 = 2, nil = null;
+ var x1 = 1;
+ var x2 = 2;
+ var nil = (Integer)null;
test(x2).isGt(x1);
assertThrown(()->test(x1).isGt(x1)).asMessage().asOneLine().is("Value was not
greater than expected. Expect='1'. Actual='1'.");
assertThrown(()->test(x1).isGt(x2)).asMessage().asOneLine().is("Value was not
greater than expected. Expect='2'. Actual='1'.");
@@ -276,7 +311,9 @@ public class ComparableAssertion_Test {
@Test
public void cb03_isLt() {
- Integer x1 = 1, x2 = 2, nil = null;
+ var x1 = 1;
+ var x2 = 2;
+ var nil = (Integer)null;
test(x1).isLt(x2);
assertThrown(()->test(x1).isLt(x1)).asMessage().asOneLine().is("Value was not
less than expected. Expect='1'. Actual='1'.");
assertThrown(()->test(x2).isLt(x1)).asMessage().asOneLine().is("Value was not
less than expected. Expect='1'. Actual='2'.");
@@ -300,7 +337,11 @@ public class ComparableAssertion_Test {
@Test
public void cb05_isBetween() {
- Integer x1 = 1, x2 = 2, x3 = 3, x4 = 4, nil = null;
+ var x1 = 1;
+ var x2 = 2;
+ var x3 = 3;
+ var x4 = 4;
+ var nil = (Integer)null;
test(x1).isBetween(x1, x3);
test(x2).isBetween(x1, x3);
test(x3).isBetween(x1, x3);
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/assertions/DateAssertion_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/assertions/DateAssertion_Test.java
index 2309a2939..082b277aa 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/assertions/DateAssertion_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/assertions/DateAssertion_Test.java
@@ -71,14 +71,16 @@ public class DateAssertion_Test {
@Test
public void ba01a_asString() {
- Date x = MID1, nil = null;
+ var x = MID1;
+ var nil = (Date)null;
test(x).asString().isMatches("*2000");
test(nil).asString().isNull();
}
@Test
public void ba01b_asString_wSerializer() {
- Date x = MID1, nil = null;
+ var x = MID1;
+ var nil = (Date)null;
WriterSerializer s = Json5Serializer.DEFAULT;
test(x).asString(s).isMatches("'2000-*'");
test(nil).asString(s).is("null");
@@ -92,34 +94,39 @@ public class DateAssertion_Test {
@Test
public void ba02_asJson() {
- Date x = MID1, nil = null;
+ var x = MID1;
+ var nil = (Date)null;
test(x).asJson().isMatches("'2000-*'");
test(nil).asJson().is("null");
}
@Test
public void ba03_asJsonSorted() {
- Date x1 = MID1, nil = null;
+ var x1 = MID1;
+ var nil = (Date)null;
test(x1).asJsonSorted().isMatches("'2000-*'");
test(nil).asJsonSorted().is("null");
}
@Test
public void ba04_apply() {
- Date x1 = MID1, x2 = MID2;
+ var x1 = MID1;
+ var x2 = MID2;
test(x1).asTransformed(x -> x2).is(MID2);
}
@Test
public void bc04a_asEpochMillis() {
- Date x = MID1, nil = null;
+ var x = MID1;
+ var nil = (Date)null;
test(x).asEpochMillis().is(959862896000L);
test(nil).asEpochMillis().isNull();
}
@Test
public void bc04b_asEpochSeconds() {
- Date x = MID1, nil = null;
+ var x = MID1;
+ var nil = (Date)null;
test(x).asEpochSeconds().is(959862896L);
test(nil).asEpochSeconds().isNull();
}
@@ -130,28 +137,34 @@ public class DateAssertion_Test {
@Test
public void ca01_exists() {
- Date x = MID1, nil = null;
+ var x = MID1;
+ var nil = (Date)null;
test(x).isExists().isExists();
assertThrows(BasicAssertionError.class,
()->test(nil).isExists(), "Value was null.");
}
@Test
public void ca02_isNull() {
- Date x = MID1, nil = null;
+ var x = MID1;
+ var nil = (Date)null;
test(nil).isNull();
assertThrows(BasicAssertionError.class, ()->test(x).isNull(),
"Value was not null.");
}
@Test
public void ca03_isNotNull() {
- Date x = MID1, nil = null;
+ var x = MID1;
+ var nil = (Date)null;
test(x).isNotNull();
assertThrows(BasicAssertionError.class,
()->test(nil).isNotNull(), "Value was null.");
}
@Test
public void ca04a_is_T() {
- Date x1 = MID1, x1a = MID1a, x2 = MID2, nil = null;
+ var x1 = MID1;
+ var x1a = MID1a;
+ var x2 = MID2;
+ var nil = (Date)null;
test(x1).is(x1);
test(x1).is(x1a);
test(nil).is(nil);
@@ -162,7 +175,7 @@ public class DateAssertion_Test {
@Test
public void ca04b_is_predicate() {
- Date x1 = MID1;
+ var x1 = MID1;
test(x1).is(x->x!=null);
assertThrown(()->test(x1).is(x->x==null)).asMessage().asOneLine().isMatches("Unexpected
value: '*2000'.");
assertThrown(()->test(x1).is(ne(x1))).asMessage().asOneLine().isMatches("Value
unexpectedly matched. Value='*2000'.");
@@ -170,7 +183,10 @@ public class DateAssertion_Test {
@Test
public void ca05_isNot() {
- Date x1 = MID1, x1a = MID1a, x2 = MID2, nil = null;
+ var x1 = MID1;
+ var x1a = MID1a;
+ var x2 = MID2;
+ var nil = (Date)null;
test(x1).isNot(x2);
test(x1).isNot(nil);
test(nil).isNot(x1);
@@ -180,7 +196,10 @@ public class DateAssertion_Test {
@Test
public void ca06_isAny() {
- Date x1 = MID1, x1a = MID1a, x2 = MID2, nil = null;
+ var x1 = MID1;
+ var x1a = MID1a;
+ var x2 = MID2;
+ var nil = (Date)null;
test(x1).isAny(x1a, x2);
assertThrown(()->test(x1).isAny(x2)).asMessage().asOneLine().isMatches("Expected
value not found. Expect='[*2010]'. Actual='*2000'.");
assertThrown(()->test(x1).isAny()).asMessage().asOneLine().isMatches("Expected
value not found. Expect='[]'. Actual='*2000'.");
@@ -189,7 +208,10 @@ public class DateAssertion_Test {
@Test
public void ca07_isNotAny() {
- Date x1 = MID1, x1a = MID1a, x2 = MID2, nil = null;
+ var x1 = MID1;
+ var x1a = MID1a;
+ var x2 = MID2;
+ var nil = (Date)null;
test(x1).isNotAny(x2);
test(x1).isNotAny();
test(nil).isNotAny(x2);
@@ -199,7 +221,9 @@ public class DateAssertion_Test {
@Test
public void ca08_isSame() {
- Date x1 = MID1, x1a = MID1a, nil = null;
+ var x1 = MID1;
+ var x1a = MID1a;
+ var nil = (Date)null;
test(x1).isSame(x1);
test(nil).isSame(nil);
assertThrown(()->test(x1).isSame(x1a)).asMessage().asOneLine().isMatches("Not
the same value. Expect='*2000(Date@*)'. Actual='*2000(Date@*)'.");
@@ -209,7 +233,10 @@ public class DateAssertion_Test {
@Test
public void ca09_isSameJsonAs() {
- Date x1 = MID1, x1a = MID1a, x2 = MID2, nil = null;
+ var x1 = MID1;
+ var x1a = MID1a;
+ var x2 = MID2;
+ var nil = (Date)null;
test(x1).isSameJsonAs(x1a);
test(nil).isSameJsonAs(nil);
assertThrown(()->test(x1a).isSameJsonAs(x2)).asMessage().asOneLine().isMatches("Unexpected
comparison. Expect=''2010*''. Actual=''2000*''.");
@@ -219,7 +246,10 @@ public class DateAssertion_Test {
@Test
public void ca10_isSameSortedJsonAs() {
- Date x1 = MID1, x1a = MID1a, x2 = MID2, nil = null;
+ var x1 = MID1;
+ var x1a = MID1a;
+ var x2 = MID2;
+ var nil = (Date)null;
test(x1).isSameSortedJsonAs(x1a);
test(nil).isSameSortedJsonAs(nil);
assertThrown(()->test(x1a).isSameSortedJsonAs(x2)).asMessage().asOneLine().isMatches("Unexpected
comparison. Expect=''2010*''. Actual=''2000*''.");
@@ -229,7 +259,10 @@ public class DateAssertion_Test {
@Test
public void ca11_isSameSerializedAs() {
- Date x1 = MID1, x1a = MID1a, x2 = MID2, nil = null;
+ var x1 = MID1;
+ var x1a = MID1a;
+ var x2 = MID2;
+ var nil = (Date)null;
WriterSerializer s = Json5Serializer.DEFAULT;
test(x1).isSameSerializedAs(x1a, s);
test(nil).isSameSerializedAs(nil, s);
@@ -240,7 +273,8 @@ public class DateAssertion_Test {
@Test
public void ca12_isType() {
- Date x = MID1, nil = null;
+ var x = MID1;
+ var nil = (Date)null;
test(x).isType(Date.class);
test(x).isType(Object.class);
assertThrown(()->test(x).isType(String.class)).asMessage().asOneLine().is("Unexpected
type. Expect='java.lang.String'. Actual='java.util.Date'.");
@@ -250,7 +284,8 @@ public class DateAssertion_Test {
@Test
public void ca13_isExactType() {
- Date x = MID1, nil = null;
+ var x = MID1;
+ var nil = (Date)null;
test(x).isExactType(Date.class);
assertThrown(()->test(x).isExactType(Object.class)).asMessage().asOneLine().is("Unexpected
type. Expect='java.lang.Object'. Actual='java.util.Date'.");
assertThrown(()->test(x).isExactType(String.class)).asMessage().asOneLine().is("Unexpected
type. Expect='java.lang.String'. Actual='java.util.Date'.");
@@ -260,7 +295,8 @@ public class DateAssertion_Test {
@Test
public void ca14_isString() {
- Date x = MID1, nil = null;
+ var x = MID1;
+ var nil = (Date)null;
test(x).isString(x.toString());
test(nil).isString(null);
assertThrown(()->test(x).isString("bad")).asMessage().asOneLine().isMatches("String
differed at position 0. Expect='bad'. Actual='*2000'.");
@@ -270,7 +306,8 @@ public class DateAssertion_Test {
@Test
public void ca15_isJson() {
- Date x = MID1, nil = null;
+ var x = MID1;
+ var nil = (Date)null;
test(nil).isJson("null");
assertThrown(()->test(x).isJson("bad")).asMessage().asOneLine().isMatches("String
differed at position 0. Expect='bad'. Actual=''2000*''.");
assertThrown(()->test(x).isJson(null)).asMessage().asOneLine().isMatches("String
differed at position 0. Expect='null'. Actual=''2000*''.");
@@ -279,7 +316,9 @@ public class DateAssertion_Test {
@Test
public void cb01_isGt() {
- Date x1 = MID1, x2 = MID2, nil = null;
+ var x1 = MID1;
+ var x2 = MID2;
+ var nil = (Date)null;
test(x2).isGt(x1);
assertThrown(()->test(x1).isGt(x1)).asMessage().asOneLine().isMatches("Value
was not greater than expected. Expect='*2000'. Actual='*2000'.");
assertThrown(()->test(x1).isGt(x2)).asMessage().asOneLine().isMatches("Value
was not greater than expected. Expect='*2010'. Actual='*2000'.");
@@ -289,7 +328,9 @@ public class DateAssertion_Test {
@Test
public void cb02_isGte() {
- Date x1 = MID1, x2 = MID2, nil = null;
+ var x1 = MID1;
+ var x2 = MID2;
+ var nil = (Date)null;
test(x2).isGte(x1);
test(x1).isGte(x1);
assertThrown(()->test(x1).isGte(x2)).asMessage().asOneLine().isMatches("Value
was not greater than or equals to expected. Expect='*2010'. Actual='*2000'.");
@@ -299,7 +340,9 @@ public class DateAssertion_Test {
@Test
public void cb03_isLt() {
- Date x1 = MID1, x2 = MID2, nil = null;
+ var x1 = MID1;
+ var x2 = MID2;
+ var nil = (Date)null;
test(x1).isLt(x2);
assertThrown(()->test(x1).isLt(x1)).asMessage().asOneLine().isMatches("Value
was not less than expected. Expect='*2000'. Actual='*2000'.");
assertThrown(()->test(x2).isLt(x1)).asMessage().asOneLine().isMatches("Value
was not less than expected. Expect='*2000'. Actual='*2010'.");
@@ -309,7 +352,9 @@ public class DateAssertion_Test {
@Test
public void cb04_isLte() {
- Date x1 = MID1, x2 = MID2, nil = null;
+ var x1 = MID1;
+ var x2 = MID2;
+ var nil = (Date)null;
test(x1).isLte(x2);
test(x1).isLte(x1);
assertThrown(()->test(x2).isLte(x1)).asMessage().asOneLine().isMatches("Value
was not less than or equals to expected. Expect='*2000'. Actual='*2010'.");
@@ -319,7 +364,11 @@ public class DateAssertion_Test {
@Test
public void cb05_isBetween() {
- Date x1 = MIN, x2 = MID1, x3 = MID2, x4 = MAX, nil = null;
+ var x1 = MIN;
+ var x2 = MID1;
+ var x3 = MID2;
+ var x4 = MAX;
+ var nil = (Date)null;
test(x1).isBetween(x1, x3);
test(x2).isBetween(x1, x3);
test(x3).isBetween(x1, x3);
@@ -331,7 +380,10 @@ public class DateAssertion_Test {
@Test
public void cc01_is_wChrono() {
- Date x1 = MID1, x1a = MID1a, x2 = MIN, nil = null;
+ var x1 = MID1;
+ var x1a = MID1a;
+ var x2 = MIN;
+ var nil = (Date)null;
test(x1).is(x1, ChronoUnit.DAYS);
test(x1).is(x1a, ChronoUnit.DAYS);
assertThrown(()->test(nil).is(nil,
ChronoUnit.DAYS)).asMessage().isContains("Value was null.");
@@ -341,7 +393,10 @@ public class DateAssertion_Test {
@Test
public void cc02_isAfter() {
- Date x1 = MIN, x2 = MID1, x3 = MAX, nil = null;
+ var x1 = MIN;
+ var x2 = MID1;
+ var x3 = MAX;
+ var nil = (Date)null;
test(x3).isAfter(x2);
assertThrows(IllegalArgumentException.class,
()->test(x1).isAfter(nil), "Argument 'value' cannot be null.");
assertThrown(()->test(x1).isAfter(x2)).asMessage().isContains("Value was not
after expected.");
@@ -350,7 +405,9 @@ public class DateAssertion_Test {
@Test
public void cc03_isAfterNow() {
- Date x1 = MIN, x2 = MAX, nil = null;
+ var x1 = MIN;
+ var x2 = MAX;
+ var nil = (Date)null;
test(x2).isAfterNow();
assertThrown(()->test(x1).isAfterNow()).asMessage().isContains("Value was not
after expected.");
assertThrown(()->test(nil).isAfterNow()).asMessage().isContains("Value was
null.");
@@ -358,7 +415,9 @@ public class DateAssertion_Test {
@Test
public void cc04_isBefore() {
- Date x1 = MIN, x2 = MID1, nil = null;
+ var x1 = MIN;
+ var x2 = MID1;
+ var nil = (Date)null;
test(x1).isBefore(x2);
assertThrows(IllegalArgumentException.class,
()->test(x1).isBefore(nil), "Argument 'value' cannot be null.");
assertThrown(()->test(x2).isBefore(x1)).asMessage().isContains("Value was not
before expected.");
@@ -367,7 +426,9 @@ public class DateAssertion_Test {
@Test
public void cc05_isBeforeNow() {
- Date x1 = MIN, x2 = MAX, nil = null;
+ var x1 = MIN;
+ var x2 = MAX;
+ var nil = (Date)null;
test(x1).isBeforeNow();
assertThrown(()->test(x2).isBeforeNow()).asMessage().isContains("Value was not
before expected.");
assertThrown(()->test(nil).isBeforeNow()).asMessage().isContains("Value was
null.");
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/assertions/IntegerAssertion_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/assertions/IntegerAssertion_Test.java
index 75404a388..453385990 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/assertions/IntegerAssertion_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/assertions/IntegerAssertion_Test.java
@@ -54,14 +54,16 @@ public class IntegerAssertion_Test {
@Test
public void ba01a_asString() {
- Integer x = 1, nil = null;
+ var x = 1;
+ var nil = (Integer)null;
test(x).asString().is("1");
test(nil).asString().isNull();
}
@Test
public void ba01b_asString_wSerializer() {
- Integer x = 1, nil = null;
+ var x = 1;
+ var nil = (Integer)null;
WriterSerializer s = Json5Serializer.DEFAULT;
test(x).asString(s).is("1");
test(nil).asString(s).is("null");
@@ -75,21 +77,24 @@ public class IntegerAssertion_Test {
@Test
public void ba02_asJson() {
- Integer x = 1, nil = null;
+ var x = 1;
+ var nil = (Integer)null;
test(x).asJson().is("1");
test(nil).asJson().is("null");
}
@Test
public void ba03_asJsonSorted() {
- Integer x = 1, nil = null;
+ var x = 1;
+ var nil = (Integer)null;
test(x).asJsonSorted().is("1");
test(nil).asJsonSorted().is("null");
}
@Test
public void ba04_apply() {
- Integer x1 = 1, x2 = 2;
+ var x1 = 1;
+ var x2 = 2;
test(x1).asTransformed(x -> x2).is(x2);
}
@@ -106,21 +111,26 @@ public class IntegerAssertion_Test {
@Test
public void ca02_isNull() {
- Integer x = 1, nil = null;
+ var x = 1;
+ var nil = (Integer)null;
test(nil).isNull();
assertThrows(BasicAssertionError.class, ()->test(x).isNull(),
"Value was not null.");
}
@Test
public void ca03_isNotNull() {
- Integer x = 1, nil = null;
+ var x = 1;
+ var nil = (Integer)null;
test(x).isNotNull();
assertThrows(BasicAssertionError.class,
()->test(nil).isNotNull(), "Value was null.");
}
@Test
public void ca04a_is_T() {
- Integer x1 = 1, x1a = 1, x2 = 2, nil = null;
+ var x1 = 1;
+ var x1a = 1;
+ var x2 = 2;
+ var nil = (Integer)null;
test(x1).is(x1);
test(x1).is(x1a);
test(nil).is(nil);
@@ -131,7 +141,10 @@ public class IntegerAssertion_Test {
@Test
public void ca04b_is_predicate() {
- Integer x1 = 1, x1a = 1, x2 = 2, nil = null;
+ var x1 = 1;
+ var x1a = 1;
+ var x2 = 2;
+ var nil = (Integer)null;
test(x1).isNot(x2);
test(x1).isNot(nil);
test(nil).isNot(x1);
@@ -141,7 +154,10 @@ public class IntegerAssertion_Test {
@Test
public void ca05_isNot() {
- Integer x1 = 1, x1a = 1, x2 = 2, nil = null;
+ var x1 = 1;
+ var x1a = 1;
+ var x2 = 2;
+ var nil = (Integer)null;
test(x1).isNot(x2);
test(x1).isNot(nil);
test(nil).isNot(x1);
@@ -151,7 +167,10 @@ public class IntegerAssertion_Test {
@Test
public void ca06_isAny() {
- Integer x1 = 1, x1a = 1, x2 = 2, nil = null;
+ var x1 = 1;
+ var x1a = 1;
+ var x2 = 2;
+ var nil = (Integer)null;
test(x1).isAny(x1a, x2);
assertThrown(()->test(x1).isAny(x2)).asMessage().asOneLine().is("Expected value
not found. Expect='[2]'. Actual='1'.");
assertThrown(()->test(x1).isAny()).asMessage().asOneLine().is("Expected value
not found. Expect='[]'. Actual='1'.");
@@ -160,7 +179,10 @@ public class IntegerAssertion_Test {
@Test
public void ca07_isNotAny() {
- Integer x1 = 1, x1a = 1, x2 = 2, nil = null;
+ var x1 = 1;
+ var x1a = 1;
+ var x2 = 2;
+ var nil = (Integer)null;
test(x1).isNotAny(x2);
test(x1).isNotAny();
test(nil).isNotAny(x2);
@@ -182,7 +204,10 @@ public class IntegerAssertion_Test {
@Test
public void ca09_isSameJsonAs() {
- Integer x1 = 1, x1a = 1, x2 = 2, nil = null;
+ var x1 = 1;
+ var x1a = 1;
+ var x2 = 2;
+ var nil = (Integer)null;
test(x1).isSameJsonAs(x1a);
test(nil).isSameJsonAs(nil);
assertThrown(()->test(x1).isSameJsonAs(x2)).asMessage().asOneLine().is("Unexpected
comparison. Expect='2'. Actual='1'.");
@@ -192,7 +217,10 @@ public class IntegerAssertion_Test {
@Test
public void ca10_isSameSortedJsonAs() {
- Integer x1 = 1, x1a = 1, x2 = 2, nil = null;
+ var x1 = 1;
+ var x1a = 1;
+ var x2 = 2;
+ var nil = (Integer)null;
test(x1).isSameSortedJsonAs(x1a);
test(nil).isSameSortedJsonAs(nil);
assertThrown(()->test(x1).isSameSortedJsonAs(x2)).asMessage().asOneLine().is("Unexpected
comparison. Expect='2'. Actual='1'.");
@@ -202,7 +230,10 @@ public class IntegerAssertion_Test {
@Test
public void ca11_isSameSerializedAs() {
- Integer x1 = 1, x1a = 1, x2 = 2, nil = null;
+ var x1 = 1;
+ var x1a = 1;
+ var x2 = 2;
+ var nil = (Integer)null;
WriterSerializer s = Json5Serializer.DEFAULT;
test(x1).isSameSerializedAs(x1a, s);
test(nil).isSameSerializedAs(nil, s);
@@ -213,7 +244,8 @@ public class IntegerAssertion_Test {
@Test
public void ca12_isType() {
- Integer x = 1, nil = null;
+ var x = 1;
+ var nil = (Integer)null;
test(x).isType(Integer.class);
test(x).isType(Object.class);
assertThrown(()->test(x).isType(String.class)).asMessage().asOneLine().is("Unexpected
type. Expect='java.lang.String'. Actual='java.lang.Integer'.");
@@ -223,7 +255,8 @@ public class IntegerAssertion_Test {
@Test
public void ca13_isExactType() {
- Integer x = 1, nil = null;
+ var x = 1;
+ var nil = (Integer)null;
test(x).isExactType(Integer.class);
assertThrown(()->test(x).isExactType(Object.class)).asMessage().asOneLine().is("Unexpected
type. Expect='java.lang.Object'. Actual='java.lang.Integer'.");
assertThrown(()->test(x).isExactType(String.class)).asMessage().asOneLine().is("Unexpected
type. Expect='java.lang.String'. Actual='java.lang.Integer'.");
@@ -233,7 +266,8 @@ public class IntegerAssertion_Test {
@Test
public void ca14_isString() {
- Integer x = 1, nil = null;
+ var x = 1;
+ var nil = (Integer)null;
test(x).isString("1");
test(nil).isString(null);
assertThrown(()->test(x).isString("bad")).asMessage().asOneLine().is("String
differed at position 0. Expect='bad'. Actual='1'.");
@@ -243,7 +277,8 @@ public class IntegerAssertion_Test {
@Test
public void ca15_isJson() {
- Integer x = 1, nil = null;
+ var x = 1;
+ var nil = (Integer)null;
test(x).isJson("1");
test(nil).isJson("null");
assertThrown(()->test(x).isJson("bad")).asMessage().asOneLine().is("String
differed at position 0. Expect='bad'. Actual='1'.");
@@ -253,7 +288,9 @@ public class IntegerAssertion_Test {
@Test
public void cb01_isGt() {
- Integer x1 = 1, x2 = 2, nil = null;
+ var x1 = 1;
+ var x2 = 2;
+ var nil = (Integer)null;
test(x2).isGt(x1);
assertThrown(()->test(x1).isGt(x1)).asMessage().asOneLine().is("Value was not
greater than expected. Expect='1'. Actual='1'.");
assertThrown(()->test(x1).isGt(x2)).asMessage().asOneLine().is("Value was not
greater than expected. Expect='2'. Actual='1'.");
@@ -263,7 +300,9 @@ public class IntegerAssertion_Test {
@Test
public void cb02_isGte() {
- Integer x1 = 1, x2 = 2, nil = null;
+ var x1 = 1;
+ var x2 = 2;
+ var nil = (Integer)null;
test(x2).isGte(x1);
test(x1).isGte(x1);
assertThrown(()->test(x1).isGte(x2)).asMessage().asOneLine().is("Value was not
greater than or equals to expected. Expect='2'. Actual='1'.");
@@ -273,7 +312,9 @@ public class IntegerAssertion_Test {
@Test
public void cb03_isLt() {
- Integer x1 = 1, x2 = 2, nil = null;
+ var x1 = 1;
+ var x2 = 2;
+ var nil = (Integer)null;
test(x1).isLt(x2);
assertThrown(()->test(x1).isLt(x1)).asMessage().asOneLine().is("Value was not
less than expected. Expect='1'. Actual='1'.");
assertThrown(()->test(x2).isLt(x1)).asMessage().asOneLine().is("Value was not
less than expected. Expect='1'. Actual='2'.");
@@ -283,7 +324,9 @@ public class IntegerAssertion_Test {
@Test
public void cb04_isLte() {
- Integer x1 = 1, x2 = 2, nil = null;
+ var x1 = 1;
+ var x2 = 2;
+ var nil = (Integer)null;
test(x1).isLte(x2);
test(x1).isLte(x1);
assertThrown(()->test(x2).isLte(x1)).asMessage().asOneLine().is("Value was not
less than or equals to expected. Expect='1'. Actual='2'.");
@@ -293,7 +336,11 @@ public class IntegerAssertion_Test {
@Test
public void cb05_isBetween() {
- Integer x1 = 1, x2 = 2, x3 = 3, x4 = 4, nil = null;
+ var x1 = 1;
+ var x2 = 2;
+ var x3 = 3;
+ var x4 = 4;
+ var nil = (Integer)null;
test(x1).isBetween(x1, x3);
test(x2).isBetween(x1, x3);
test(x3).isBetween(x1, x3);
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/assertions/LongAssertion_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/assertions/LongAssertion_Test.java
index 61a86b01d..9ede9e873 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/assertions/LongAssertion_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/assertions/LongAssertion_Test.java
@@ -55,14 +55,16 @@ public class LongAssertion_Test {
@Test
public void ba01a_asString() {
- Long x = 1L, nil = null;
+ var x = 1L;
+ var nil = (Long)null;
test(x).asString().is("1");
test(nil).asString().isNull();
}
@Test
public void ba01b_asString_wSerializer() {
- Long x = 1L, nil = null;
+ var x = 1L;
+ var nil = (Long)null;
WriterSerializer s = Json5Serializer.DEFAULT;
test(x).asString(s).is("1");
test(nil).asString(s).is("null");
@@ -76,27 +78,31 @@ public class LongAssertion_Test {
@Test
public void ba02_asJson() {
- Long x = 1L, nil = null;
+ var x = 1L;
+ var nil = (Long)null;
test(x).asJson().is("1");
test(nil).asJson().is("null");
}
@Test
public void ba03_asJsonSorted() {
- Long x1 = 1L, nil = null;
+ var x1 = 1L;
+ var nil = (Long)null;
test(x1).asJsonSorted().is("1");
test(nil).asJsonSorted().is("null");
}
@Test
public void ba04_apply() {
- Long x1 = 1L, x2 = 2L;
+ var x1 = 1L;
+ var x2 = 2L;
test(x1).asTransformed(x -> x2).is(x2);
}
@Test
public void bc01_asInteger() {
- Long x1 = 1L, nil = null;
+ var x1 = 1L;
+ var nil = (Long)null;
test(x1).asInteger().is(1);
test(nil).asInteger().isNull();
}
@@ -107,28 +113,34 @@ public class LongAssertion_Test {
@Test
public void ca01_exists() {
- Long x = 1L, nil = null;
+ var x = 1L;
+ var nil = (Long)null;
test(x).isExists().isExists();
assertThrows(BasicAssertionError.class,
()->test(nil).isExists(), "Value was null.");
}
@Test
public void ca02_isNull() {
- Long x = 1L, nil = null;
+ var x = 1L;
+ var nil = (Long)null;
test(nil).isNull();
assertThrows(BasicAssertionError.class, ()->test(x).isNull(),
"Value was not null.");
}
@Test
public void ca03_isNotNull() {
- Long x = 1L, nil = null;
+ var x = 1L;
+ var nil = (Long)null;
test(x).isNotNull();
assertThrows(BasicAssertionError.class,
()->test(nil).isNotNull(), "Value was null.");
}
@Test
public void ca04a_is_T() {
- Long x1 = 1L, x1a = 1L, x2 = 2L, nil = null;
+ var x1 = 1L;
+ var x1a = 1L;
+ var x2 = 2L;
+ var nil = (Long)null;
test(x1).is(x1);
test(x1).is(x1a);
test(nil).is(nil);
@@ -147,7 +159,10 @@ public class LongAssertion_Test {
@Test
public void ca05_isNot() {
- Long x1 = 1L, x1a = 1L, x2 = 2L, nil = null;
+ var x1 = 1L;
+ var x1a = 1L;
+ var x2 = 2L;
+ var nil = (Long)null;
test(x1).isNot(x2);
test(x1).isNot(nil);
test(nil).isNot(x1);
@@ -157,7 +172,10 @@ public class LongAssertion_Test {
@Test
public void ca06_isAny() {
- Long x1 = 1L, x1a = 1L, x2 = 2L, nil = null;
+ var x1 = 1L;
+ var x1a = 1L;
+ var x2 = 2L;
+ var nil = (Long)null;
test(x1).isAny(x1a, x2);
assertThrown(()->test(x1).isAny(x2)).asMessage().asOneLine().is("Expected value
not found. Expect='[2]'. Actual='1'.");
assertThrown(()->test(x1).isAny()).asMessage().asOneLine().is("Expected value
not found. Expect='[]'. Actual='1'.");
@@ -166,7 +184,10 @@ public class LongAssertion_Test {
@Test
public void ca07_isNotAny() {
- Long x1 = 1L, x1a = 1L, x2 = 2L, nil = null;
+ var x1 = 1L;
+ var x1a = 1L;
+ var x2 = 2L;
+ var nil = (Long)null;
test(x1).isNotAny(x2);
test(x1).isNotAny();
test(nil).isNotAny(x2);
@@ -186,7 +207,10 @@ public class LongAssertion_Test {
@Test
public void ca09_isSameJsonAs() {
- Long x1 = 1L, x1a = 1L, x2 = 2L, nil = null;
+ var x1 = 1L;
+ var x1a = 1L;
+ var x2 = 2L;
+ var nil = (Long)null;
test(x1).isSameJsonAs(x1a);
test(nil).isSameJsonAs(nil);
assertThrown(()->test(x1a).isSameJsonAs(x2)).asMessage().asOneLine().is("Unexpected
comparison. Expect='2'. Actual='1'.");
@@ -196,7 +220,10 @@ public class LongAssertion_Test {
@Test
public void ca10_isSameSortedJsonAs() {
- Long x1 = 1L, x1a = 1L, x2 = 2L, nil = null;
+ var x1 = 1L;
+ var x1a = 1L;
+ var x2 = 2L;
+ var nil = (Long)null;
test(x1).isSameSortedJsonAs(x1a);
test(nil).isSameSortedJsonAs(nil);
assertThrown(()->test(x1a).isSameSortedJsonAs(x2)).asMessage().asOneLine().is("Unexpected
comparison. Expect='2'. Actual='1'.");
@@ -206,7 +233,10 @@ public class LongAssertion_Test {
@Test
public void ca11_isSameSerializedAs() {
- Long x1 = 1L, x1a = 1L, x2 = 2L, nil = null;
+ var x1 = 1L;
+ var x1a = 1L;
+ var x2 = 2L;
+ var nil = (Long)null;
WriterSerializer s = Json5Serializer.DEFAULT;
test(x1).isSameSerializedAs(x1a, s);
test(nil).isSameSerializedAs(nil, s);
@@ -217,7 +247,8 @@ public class LongAssertion_Test {
@Test
public void ca12_isType() {
- Long x = 1L, nil = null;
+ var x = 1L;
+ var nil = (Long)null;
test(x).isType(Long.class);
test(x).isType(Object.class);
assertThrown(()->test(x).isType(String.class)).asMessage().asOneLine().is("Unexpected
type. Expect='java.lang.String'. Actual='java.lang.Long'.");
@@ -227,7 +258,8 @@ public class LongAssertion_Test {
@Test
public void ca13_isExactType() {
- Long x = 1L, nil = null;
+ var x = 1L;
+ var nil = (Long)null;
test(x).isExactType(Long.class);
assertThrown(()->test(x).isExactType(Object.class)).asMessage().asOneLine().is("Unexpected
type. Expect='java.lang.Object'. Actual='java.lang.Long'.");
assertThrown(()->test(x).isExactType(String.class)).asMessage().asOneLine().is("Unexpected
type. Expect='java.lang.String'. Actual='java.lang.Long'.");
@@ -237,7 +269,8 @@ public class LongAssertion_Test {
@Test
public void ca14_isString() {
- Long x = 1L, nil = null;
+ var x = 1L;
+ var nil = (Long)null;
test(x).isString("1");
test(nil).isString(null);
assertThrown(()->test(x).isString("bad")).asMessage().asOneLine().is("String
differed at position 0. Expect='bad'. Actual='1'.");
@@ -247,7 +280,8 @@ public class LongAssertion_Test {
@Test
public void ca15_isJson() {
- Long x = 1L, nil = null;
+ var x = 1L;
+ var nil = (Long)null;
test(x).isJson("1");
test(nil).isJson("null");
assertThrown(()->test(x).isJson("bad")).asMessage().asOneLine().is("String
differed at position 0. Expect='bad'. Actual='1'.");
@@ -257,7 +291,9 @@ public class LongAssertion_Test {
@Test
public void cb01_isGt() {
- Long x1 = 1L, x2 = 2L, nil = null;
+ var x1 = 1L;
+ var x2 = 2L;
+ var nil = (Long)null;
test(x2).isGt(x1);
assertThrown(()->test(x1).isGt(x1)).asMessage().asOneLine().is("Value was not
greater than expected. Expect='1'. Actual='1'.");
assertThrown(()->test(x1).isGt(x2)).asMessage().asOneLine().is("Value was not
greater than expected. Expect='2'. Actual='1'.");
@@ -267,7 +303,9 @@ public class LongAssertion_Test {
@Test
public void cb02_isGte() {
- Long x1 = 1L, x2 = 2L, nil = null;
+ var x1 = 1L;
+ var x2 = 2L;
+ var nil = (Long)null;
test(x2).isGte(x1);
test(x1).isGte(x1);
assertThrown(()->test(x1).isGte(x2)).asMessage().asOneLine().is("Value was not
greater than or equals to expected. Expect='2'. Actual='1'.");
@@ -277,7 +315,9 @@ public class LongAssertion_Test {
@Test
public void cb03_isLt() {
- Long x1 = 1L, x2 = 2L, nil = null;
+ var x1 = 1L;
+ var x2 = 2L;
+ var nil = (Long)null;
test(x1).isLt(x2);
assertThrown(()->test(x1).isLt(x1)).asMessage().asOneLine().is("Value was not
less than expected. Expect='1'. Actual='1'.");
assertThrown(()->test(x2).isLt(x1)).asMessage().asOneLine().is("Value was not
less than expected. Expect='1'. Actual='2'.");
@@ -287,7 +327,9 @@ public class LongAssertion_Test {
@Test
public void cb04_isLte() {
- Long x1 = 1L, x2 = 2L, nil = null;
+ var x1 = 1L;
+ var x2 = 2L;
+ var nil = (Long)null;
test(x1).isLte(x2);
test(x1).isLte(x1);
assertThrown(()->test(x2).isLte(x1)).asMessage().asOneLine().is("Value was not
less than or equals to expected. Expect='1'. Actual='2'.");
@@ -297,7 +339,11 @@ public class LongAssertion_Test {
@Test
public void cb05_isBetween() {
- Long x1 = 1L, x2 = 2L, x3 = 3L, x4 = 4L, nil = null;
+ var x1 = 1L;
+ var x2 = 2L;
+ var x3 = 3L;
+ var x4 = 4L;
+ var nil = (Long)null;
test(x1).isBetween(x1, x3);
test(x2).isBetween(x1, x3);
test(x3).isBetween(x1, x3);
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/assertions/ObjectAssertion_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/assertions/ObjectAssertion_Test.java
index 1d0bf0658..cee71b2ba 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/assertions/ObjectAssertion_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/assertions/ObjectAssertion_Test.java
@@ -14,6 +14,7 @@ package org.apache.juneau.assertions;
import static org.apache.juneau.assertions.AssertionPredicates.*;
import static org.apache.juneau.assertions.Assertions.*;
+import static org.apache.juneau.TestUtils.*;
import static org.junit.jupiter.api.Assertions.*;
import static org.junit.runners.MethodSorters.*;
@@ -67,14 +68,16 @@ public class ObjectAssertion_Test {
@Test
public void ba01a_asString() {
- Integer x = 1, nil = null;
+ var x = 1;
+ var nil = (Integer)null;
test(x).asString().is("1");
test(nil).asString().isNull();
}
@Test
public void ba01b_asString_wSerializer() {
- Integer x = 1, nil = null;
+ var x = 1;
+ var nil = (Integer)null;
WriterSerializer s = Json5Serializer.DEFAULT;
test(x).asString(s).is("1");
test(nil).asString(s).is("null");
@@ -82,13 +85,14 @@ public class ObjectAssertion_Test {
@Test
public void ba01c_asString_wPredicate() {
- Integer x1 = 1;
+ var x1 = 1;
test(x1).asString(x -> "foo").is("foo");
}
@Test
public void ba02_asJson() {
- Integer x = 1, nil = null;
+ var x = 1;
+ var nil = (Integer)null;
test(x).asJson().is("1");
test(nil).asJson().is("null");
assertThrown(()->test(new
A2()).asJson()).asMessages().isAny(contains("Could not call getValue() on
property 'foo'"));
@@ -96,7 +100,8 @@ public class ObjectAssertion_Test {
@Test
public void ba03_asJsonSorted() {
- Integer[] x1 = {2,1}, nil = null;
+ var x1 = a(2,1);
+ var nil = (Integer[])null;
Object x2 = A1;
test(x1).asJsonSorted().is("[1,2]");
test(x2).asJsonSorted().is("{a:1,b:2}");
@@ -111,7 +116,8 @@ public class ObjectAssertion_Test {
@Test
public void ba05_asAny() {
- Integer x = 1, nil = null;
+ var x = 1;
+ var nil = (Integer)null;
test(x).asAny().asInteger().is(1);
test(nil).asAny().isNull();
}
@@ -122,28 +128,34 @@ public class ObjectAssertion_Test {
@Test
public void ca01_exists() {
- Integer x = 1, nil = null;
+ var x = 1;
+ var nil = (Integer)null;
test(x).isExists().isExists();
assertThrows(BasicAssertionError.class,
()->test(nil).isExists(), "Value was null.");
}
@Test
public void ca02_isNull() {
- Integer x = 1, nil = null;
+ var x = 1;
+ var nil = (Integer)null;
test(nil).isNull();
assertThrows(BasicAssertionError.class, ()->test(x).isNull(),
"Value was not null.");
}
@Test
public void ca03_isNotNull() {
- Integer x = 1, nil = null;
+ var x = 1;
+ var nil = (Integer)null;
test(x).isNotNull();
assertThrows(BasicAssertionError.class,
()->test(nil).isNotNull(), "Value was null.");
}
@Test
public void ca04a_is_T() {
- Integer x1 = 1, x1a = 1, x2 = 2, nil = null;
+ var x1 = 1;
+ var x1a = 1;
+ var x2 = 2;
+ var nil = (Integer)null;
test(x1).is(x1);
test(x1).is(x1a);
test(nil).is(nil);
@@ -163,7 +175,10 @@ public class ObjectAssertion_Test {
@Test
public void ca05_isNot() {
- Integer x1 = 1, x1a = 1, x2 = 2, nil = null;
+ var x1 = 1;
+ var x1a = 1;
+ var x2 = 2;
+ var nil = (Integer)null;
test(x1).isNot(x2);
test(x1).isNot(nil);
test(nil).isNot(x1);
@@ -173,7 +188,10 @@ public class ObjectAssertion_Test {
@Test
public void ca06_isAny() {
- Integer x1 = 1, x1a = 1, x2 = 2, nil = null;
+ var x1 = 1;
+ var x1a = 1;
+ var x2 = 2;
+ var nil = (Integer)null;
test(x1).isAny(x1a, x2);
assertThrown(()->test(x1).isAny(x2)).asMessage().asOneLine().is("Expected value
not found. Expect='[2]'. Actual='1'.");
assertThrown(()->test(x1).isAny()).asMessage().asOneLine().is("Expected value
not found. Expect='[]'. Actual='1'.");
@@ -182,7 +200,10 @@ public class ObjectAssertion_Test {
@Test
public void ca07_isNotAny() {
- Integer x1 = 1, x1a = 1, x2 = 2, nil = null;
+ var x1 = 1;
+ var x1a = 1;
+ var x2 = 2;
+ var nil = (Integer)null;
test(x1).isNotAny(x2);
test(x1).isNotAny();
test(nil).isNotAny(x2);
@@ -204,7 +225,10 @@ public class ObjectAssertion_Test {
@Test
public void ca09_isSameJsonAs() {
- Integer x1 = 1, x1a = 1, x2 = 2, nil = null;
+ var x1 = 1;
+ var x1a = 1;
+ var x2 = 2;
+ var nil = (Integer)null;
test(x1).isSameJsonAs(x1a);
test(nil).isSameJsonAs(nil);
assertThrown(()->test(x1a).isSameJsonAs(x2)).asMessage().asOneLine().is("Unexpected
comparison. Expect='2'. Actual='1'.");
@@ -214,7 +238,10 @@ public class ObjectAssertion_Test {
@Test
public void ca10_isSameSortedJsonAs() {
- Integer x1 = 1, x1a = 1, x2 = 2, nil = null;
+ var x1 = 1;
+ var x1a = 1;
+ var x2 = 2;
+ var nil = (Integer)null;
test(x1).isSameSortedJsonAs(x1a);
test(nil).isSameSortedJsonAs(nil);
assertThrown(()->test(x1a).isSameSortedJsonAs(x2)).asMessage().asOneLine().is("Unexpected
comparison. Expect='2'. Actual='1'.");
@@ -224,7 +251,10 @@ public class ObjectAssertion_Test {
@Test
public void ca11_isSameSerializedAs() {
- Integer x1 = 1, x1a = 1, x2 = 2, nil = null;
+ var x1 = 1;
+ var x1a = 1;
+ var x2 = 2;
+ var nil = (Integer)null;
WriterSerializer s = Json5Serializer.DEFAULT;
test(x1).isSameSerializedAs(x1a, s);
test(nil).isSameSerializedAs(nil, s);
@@ -235,7 +265,8 @@ public class ObjectAssertion_Test {
@Test
public void ca12_isType() {
- Integer x = 1, nil = null;
+ var x = 1;
+ var nil = (Integer)null;
test(x).isType(Integer.class);
test(x).isType(Object.class);
assertThrown(()->test(x).isType(String.class)).asMessage().asOneLine().is("Unexpected
type. Expect='java.lang.String'. Actual='java.lang.Integer'.");
@@ -245,7 +276,8 @@ public class ObjectAssertion_Test {
@Test
public void ca13_isExactType() {
- Integer x = 1, nil = null;
+ var x = 1;
+ var nil = (Integer)null;
test(x).isExactType(Integer.class);
assertThrown(()->test(x).isExactType(Object.class)).asMessage().asOneLine().is("Unexpected
type. Expect='java.lang.Object'. Actual='java.lang.Integer'.");
assertThrown(()->test(x).isExactType(String.class)).asMessage().asOneLine().is("Unexpected
type. Expect='java.lang.String'. Actual='java.lang.Integer'.");
@@ -255,7 +287,8 @@ public class ObjectAssertion_Test {
@Test
public void ca14_isString() {
- Integer x = 1, nil = null;
+ var x = 1;
+ var nil = (Integer)null;
test(x).isString("1");
test(nil).isString(null);
assertThrown(()->test(x).isString("bad")).asMessage().asOneLine().is("String
differed at position 0. Expect='bad'. Actual='1'.");
@@ -265,7 +298,8 @@ public class ObjectAssertion_Test {
@Test
public void ca15_isJson() {
- Integer x = 1, nil = null;
+ var x = 1;
+ var nil = (Integer)null;
test(x).isJson("1");
test(nil).isJson("null");
assertThrown(()->test(x).isJson("bad")).asMessage().asOneLine().is("String
differed at position 0. Expect='bad'. Actual='1'.");
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/assertions/StringAssertion_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/assertions/StringAssertion_Test.java
index 57e91f2f8..beb6ffb0f 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/assertions/StringAssertion_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/assertions/StringAssertion_Test.java
@@ -62,14 +62,16 @@ public class StringAssertion_Test {
@Test
public void ba01a_asString() {
- String x = "1", nil = null;
+ var x = "1";
+ var nil = (String)null;
test(x).asString().is("1");
test(nil).asString().isNull();
}
@Test
public void ba01b_asString_wSerializer() {
- String x = "1", nil = null;
+ var x = "1";
+ var nil = (String)null;
WriterSerializer s = Json5Serializer.DEFAULT;
test(x).asString(s).is("'1'");
test(nil).asString(s).is("null");
@@ -77,33 +79,37 @@ public class StringAssertion_Test {
@Test
public void ba01c_asString_wPredicate() {
- String x1 = "1";
+ var x1 = "1";
test(x1).asString(x -> "foo").is("foo");
}
@Test
public void ba02_asJson() {
- String x = "1", nil = null;
+ var x = "1";
+ var nil = (String)null;
test(x).asJson().is("'1'");
test(nil).asJson().is("null");
}
@Test
public void ba03_asJsonSorted() {
- String x = "1", nil = null;
+ var x = "1";
+ var nil = (String)null;
test(x).asJsonSorted().is("'1'");
test(nil).asJsonSorted().is("null");
}
@Test
public void ba04_apply() {
- String x1 = "1", x2 = "2";
+ var x1 = "1";
+ var x2 = "2";
test(x1).asTransformed(x -> x2).is(x2);
}
@Test
public void bb01_replaceAll() {
- String x = "foobar", nil = null;
+ var x = "foobar";
+ var nil = (String)null;
test(x).asReplaceAll("fo+","bar").is("barbar").is("foobar");
test(nil).asReplaceAll("fo+","bar").isNull();
assertThrows(IllegalArgumentException.class,
()->test(x).asReplaceAll(null,""), "Argument 'regex' cannot be null.");
@@ -112,7 +118,8 @@ public class StringAssertion_Test {
@Test
public void bb02_replace() {
- String x = "foobar", nil = null;
+ var x = "foobar";
+ var nil = (String)null;
test(x).asReplace("foo","bar").is("barbar").is("foobar");
test(nil).asReplace("foo","bar").isNull();
assertThrows(IllegalArgumentException.class,
()->test(x).asReplace(null,"bar").isNull(), "Argument 'target' cannot be
null.");
@@ -121,35 +128,40 @@ public class StringAssertion_Test {
@Test
public void bb03_urlDecode() {
- String x = "foo%20bar", nil = null;
+ var x = "foo%20bar";
+ var nil = (String)null;
test(x).asUrlDecode().is("foo bar").is("foo%20bar");
test(nil).asUrlDecode().isNull();
}
@Test
public void bb04_lc() {
- String x = "FOOBAR", nil = null;
+ var x = "FOOBAR";
+ var nil = (String)null;
test(x).asLc().is("foobar").is("FOOBAR");
test(nil).asLc().isNull();
}
@Test
public void bb05_uc() {
- String x = "foobar", nil = null;
+ var x = "foobar";
+ var nil = (String)null;
test(x).asUc().is("FOOBAR").is("foobar");
test(nil).asUc().isNull();
}
@Test
public void bb06_lines() {
- String x = "foo\nbar", nil = null;
+ var x = "foo\nbar";
+ var nil = (String)null;
test(x).asLines().isHas("foo","bar");
test(nil).asLines().isNull();
}
@Test
public void bb07_oneLine() {
- String x = "foo bar", nil = null;
+ var x = "foo bar";
+ var nil = (String)null;
test(x).asOneLine().is("foo bar");
test(nil).asOneLine().isNull();
}
@@ -160,28 +172,34 @@ public class StringAssertion_Test {
@Test
public void ca01_exists() {
- String x = "1", nil = null;
+ var x = "1";
+ var nil = (String)null;
test(x).isExists().isExists();
assertThrows(BasicAssertionError.class,
()->test(nil).isExists(), "Value was null.");
}
@Test
public void ca02_isNull() {
- String x = "1", nil = null;
+ var x = "1";
+ var nil = (String)null;
test(nil).isNull();
assertThrows(BasicAssertionError.class, ()->test(x).isNull(),
"Value was not null.");
}
@Test
public void ca03_isNotNull() {
- String x = "1", nil = null;
+ var x = "1";
+ var nil = (String)null;
test(x).isNotNull();
assertThrows(BasicAssertionError.class,
()->test(nil).isNotNull(), "Value was null.");
}
@Test
public void ca04a_is_T() {
- String x1 = "1", x1a = "1", x2 = "2", nil = null;
+ var x1 = "1";
+ var x1a = "1";
+ var x2 = "2";
+ var nil = (String)null;
test(x1).is(x1);
test(x1).is(x1a);
test(nil).is(nil);
@@ -192,7 +210,7 @@ public class StringAssertion_Test {
@Test
public void ca04b_is_predicate() {
- String x1 = "1";
+ var x1 = "1";
test(x1).is(x->x.length()==1);
assertThrown(()->test(x1).is(x->x.length()==2)).asMessage().asOneLine().is("Unexpected
value: '1'.");
assertThrown(()->test(x1).is(ne(x1))).asMessage().asOneLine().is("Value
unexpectedly matched. Value='1'.");
@@ -200,7 +218,10 @@ public class StringAssertion_Test {
@Test
public void ca05_isNot() {
- String x1 = "1", x1a = "1", x2 = "2", nil = null;
+ var x1 = "1";
+ var x1a = "1";
+ var x2 = "2";
+ var nil = (String)null;
test(x1).isNot(x2);
test(x1).isNot(nil);
test(nil).isNot(x1);
@@ -210,7 +231,10 @@ public class StringAssertion_Test {
@Test
public void ca06_isAny() {
- String x1 = "1", x1a = "1", x2 = "2", nil = null;
+ var x1 = "1";
+ var x1a = "1";
+ var x2 = "2";
+ var nil = (String)null;
test(x1).isAny(x1a, x2);
assertThrown(()->test(x1).isAny(x2)).asMessage().asOneLine().is("Expected value
not found. Expect='[2]'. Actual='1'.");
assertThrown(()->test(x1).isAny()).asMessage().asOneLine().is("Expected value
not found. Expect='[]'. Actual='1'.");
@@ -219,7 +243,10 @@ public class StringAssertion_Test {
@Test
public void ca07_isNotAny() {
- String x1 = "1", x1a = "1", x2 = "2", nil = null;
+ var x1 = "1";
+ var x1a = "1";
+ var x2 = "2";
+ var nil = (String)null;
test(x1).isNotAny(x2);
test(x1).isNotAny();
test(nil).isNotAny(x2);
@@ -231,7 +258,7 @@ public class StringAssertion_Test {
public void ca08_isSame() {
var x1 = new String("1");
var x1a = new String("1");
- String nil = null;
+ var nil = (String)null;
test(x1).isSame(x1);
test(nil).isSame(nil);
assertThrown(()->test(x1).isSame(x1a)).asMessage().asOneLine().isMatches("Not
the same value. Expect='1(String@*)'. Actual='1(String@*)'.");
@@ -241,7 +268,10 @@ public class StringAssertion_Test {
@Test
public void ca09_isSameJsonAs() {
- String x1 = "1", x1a = "1", x2 = "2", nil = null;
+ var x1 = "1";
+ var x1a = "1";
+ var x2 = "2";
+ var nil = (String)null;
test(x1).isSameJsonAs(x1a);
test(nil).isSameJsonAs(nil);
assertThrown(()->test(x1a).isSameJsonAs(x2)).asMessage().asOneLine().is("Unexpected
comparison. Expect=''2''. Actual=''1''.");
@@ -251,7 +281,10 @@ public class StringAssertion_Test {
@Test
public void ca10_isSameSortedJsonAs() {
- String x1 = "1", x1a = "1", x2 = "2", nil = null;
+ var x1 = "1";
+ var x1a = "1";
+ var x2 = "2";
+ var nil = (String)null;
test(x1).isSameSortedJsonAs(x1a);
test(nil).isSameSortedJsonAs(nil);
assertThrown(()->test(x1a).isSameSortedJsonAs(x2)).asMessage().asOneLine().is("Unexpected
comparison. Expect=''2''. Actual=''1''.");
@@ -261,7 +294,10 @@ public class StringAssertion_Test {
@Test
public void ca11_isSameSerializedAs() {
- String x1 = "1", x1a = "1", x2 = "2", nil = null;
+ var x1 = "1";
+ var x1a = "1";
+ var x2 = "2";
+ var nil = (String)null;
WriterSerializer s = Json5Serializer.DEFAULT;
test(x1).isSameSerializedAs(x1a, s);
test(nil).isSameSerializedAs(nil, s);
@@ -272,7 +308,8 @@ public class StringAssertion_Test {
@Test
public void ca12_isType() {
- String x = "1", nil = null;
+ var x = "1";
+ var nil = (String)null;
test(x).isType(String.class);
test(x).isType(Object.class);
assertThrown(()->test(x).isType(Integer.class)).asMessage().asOneLine().is("Unexpected
type. Expect='java.lang.Integer'. Actual='java.lang.String'.");
@@ -282,7 +319,8 @@ public class StringAssertion_Test {
@Test
public void ca13_isExactType() {
- String x = "1", nil = null;
+ var x = "1";
+ var nil = (String)null;
test(x).isExactType(String.class);
assertThrown(()->test(x).isExactType(Object.class)).asMessage().asOneLine().is("Unexpected
type. Expect='java.lang.Object'. Actual='java.lang.String'.");
assertThrown(()->test(x).isExactType(Integer.class)).asMessage().asOneLine().is("Unexpected
type. Expect='java.lang.Integer'. Actual='java.lang.String'.");
@@ -292,7 +330,8 @@ public class StringAssertion_Test {
@Test
public void ca14_isString() {
- String x = "1", nil = null;
+ var x = "1";
+ var nil = (String)null;
test(x).isString("1");
test(nil).isString(null);
assertThrown(()->test(x).isString("bad")).asMessage().asOneLine().is("String
differed at position 0. Expect='bad'. Actual='1'.");
@@ -302,7 +341,8 @@ public class StringAssertion_Test {
@Test
public void ca15_isJson() {
- String x = "1", nil = null;
+ var x = "1";
+ var nil = (String)null;
test(x).isJson("'1'");
test(nil).isJson("null");
assertThrown(()->test(x).isJson("bad")).asMessage().asOneLine().is("String
differed at position 0. Expect='bad'. Actual=''1''.");
@@ -312,7 +352,8 @@ public class StringAssertion_Test {
@Test
public void cb01_isIc() {
- String x = "foobar", nil = null;
+ var x = "foobar";
+ var nil = (String)null;
test(x).isIc("FOOBAR");
assertThrown(()->test(x).isIc("FOOBAZ")).asMessage().asOneLine().is("String
differed at position 5. Expect='FOOBAZ'. Actual='foobar'.");
assertThrown(()->test(nil).isIc("FOOBAZ")).asMessage().asOneLine().is("String
differed at position 0. Expect='FOOBAZ'. Actual='null'.");
@@ -321,7 +362,8 @@ public class StringAssertion_Test {
@Test
public void cb02_isNotIc() {
- String x = "foobar", nil = null;
+ var x = "foobar";
+ var nil = (String)null;
test(x).isNotIc("foobaz");
assertThrown(()->test(x).isNotIc("Foobar")).asMessage().asOneLine().is("String
equaled unexpected. Value='foobar'.");
assertThrown(()->test(nil).isNotIc(null)).asMessage().asOneLine().is("String
equaled unexpected. Value='null'.");
@@ -331,7 +373,8 @@ public class StringAssertion_Test {
@Test
public void cb03_isLines() {
- String x = "foo\nbar\nbaz", nil = null;
+ var x = "foo\nbar\nbaz";
+ var nil = (String)null;
test(x).isLines("foo","bar","baz");
assertThrows(IllegalArgumentException.class,
()->test(nil).isLines((String[])null), "Argument 'lines' cannot be null.");
assertThrows(BasicAssertionError.class,
()->test(nil).isLines((String)null), "Value was null.");
@@ -340,7 +383,10 @@ public class StringAssertion_Test {
@Test
public void cb04_isSortedLines() {
- String x1 = "foo\nbar\nbaz", x2 = "foo", empty = "", nil = null;
+ var x1 = "foo\nbar\nbaz";
+ var x2 = "foo";
+ var empty = "";
+ var nil = (String)null;
test(x1).isSortedLines("bar","foo","baz");
assertThrows(IllegalArgumentException.class,
()->test(nil).isSortedLines((String[])null), "Argument 'lines' cannot be
null.");
test(empty).isSortedLines((String)null);
@@ -353,7 +399,8 @@ public class StringAssertion_Test {
@Test
public void cb05_contains() {
- String x = "foobar", nil = null;
+ var x = "foobar";
+ var nil = (String)null;
test(x).isContains("foo","bar");
assertThrown(()->test(x).isContains("foo","baz")).asMessage().asOneLine().is("String
did not contain expected substring. Substring='baz'. Value='foobar'.");
test(nil).isContains();
@@ -364,7 +411,8 @@ public class StringAssertion_Test {
@Test
public void cb06_doesNotContain() {
- String x = "foobar", nil = null;
+ var x = "foobar";
+ var nil = (String)null;
test(x).isNotContains("baz","qux");
assertThrown(()->test(x).isNotContains("foo","baz")).asMessage().asOneLine().is("String
contained unexpected substring. Substring='foo'. Value='foobar'.");
test(nil).isNotContains();
@@ -375,7 +423,9 @@ public class StringAssertion_Test {
@Test
public void cb07_isEmpty() {
- String x = "1", empty = "", nil = null;
+ var x = "1";
+ var empty = "";
+ var nil = (String)null;
test(empty).isEmpty();
test(nil).isEmpty();
assertThrown(()->test(x).isEmpty()).asMessage().asOneLine().is("String was not
empty. Value='1'.");
@@ -383,7 +433,9 @@ public class StringAssertion_Test {
@Test
public void cb08_isNotEmpty() {
- String x = "1", empty = "", nil = null;
+ var x = "1";
+ var empty = "";
+ var nil = (String)null;
test(x).isNotEmpty();
assertThrows(BasicAssertionError.class,
()->test(empty).isNotEmpty(), "String was empty.");
assertThrows(BasicAssertionError.class,
()->test(nil).isNotEmpty(), "String was null.");
@@ -391,7 +443,9 @@ public class StringAssertion_Test {
@Test
public void cb09_matches() {
- String x = "foo", empty = "", nil = null;
+ var x = "foo";
+ var empty = "";
+ var nil = (String)null;
test(x).isMatches("fo*");
assertThrown(()->test(x).isMatches("b*")).asMessage().asOneLine().is("String
did not match expected pattern. Pattern='\\Qb\\E.*\\Q\\E'. Value='foo'.");
assertThrows(BasicAssertionError.class,
()->test(nil).isMatches("b*"), "Value was null.");
@@ -400,7 +454,9 @@ public class StringAssertion_Test {
@Test
public void cb10_regex() {
- String x = "foo", empty = "", nil = null;
+ var x = "foo";
+ var empty = "";
+ var nil = (String)null;
test(x).isPattern("fo+");
assertThrown(()->test(x).isPattern("bar")).asMessage().asOneLine().is("String
did not match expected pattern. Pattern='bar'. Value='foo'.");
assertThrows(BasicAssertionError.class,
()->test(nil).isPattern("fo+"), "Value was null.");
@@ -409,7 +465,9 @@ public class StringAssertion_Test {
@Test
public void cb10b_regex_wFlags() {
- String x = "foo", empty = "", nil = null;
+ var x = "foo";
+ var empty = "";
+ var nil = (String)null;
test(x).isPattern("FO+", Pattern.CASE_INSENSITIVE);
assertThrown(()->test(x).isPattern("bar")).asMessage().asOneLine().is("String
did not match expected pattern. Pattern='bar'. Value='foo'.");
assertThrows(BasicAssertionError.class,
()->test(nil).isPattern("fo+"), "Value was null.");
@@ -418,7 +476,9 @@ public class StringAssertion_Test {
@Test
public void cb10c_regex_wPattern() {
- String x = "foo", empty = "", nil = null;
+ var x = "foo";
+ var empty = "";
+ var nil = (String)null;
test(x).isPattern(Pattern.compile("FO+",
Pattern.CASE_INSENSITIVE));
assertThrown(()->test(x).isPattern("bar")).asMessage().asOneLine().is("String
did not match expected pattern. Pattern='bar'. Value='foo'.");
assertThrows(BasicAssertionError.class,
()->test(nil).isPattern("fo+"), "Value was null.");
@@ -427,7 +487,8 @@ public class StringAssertion_Test {
@Test
public void cb12_startsWith() {
- String x = "foo", nil = null;
+ var x = "foo";
+ var nil = (String)null;
test(x).isStartsWith("fo");
assertThrown(()->test(x).isStartsWith("x")).asMessage().asOneLine().is("String
did not start with expected substring. Substring='x'. Value='foo'.");
assertThrows(BasicAssertionError.class,
()->test(nil).isStartsWith("x"), "Value was null.");
@@ -435,7 +496,8 @@ public class StringAssertion_Test {
@Test
public void cb13_endsWith() {
- String x = "foo", nil = null;
+ var x = "foo";
+ var nil = (String)null;
test(x).isEndsWith("oo");
assertThrown(()->test(x).isEndsWith("x")).asMessage().asOneLine().is("String
did not end with expected substring. Substring='x'. Value='foo'.");
assertThrows(BasicAssertionError.class,
()->test(nil).isEndsWith("x"), "Value was null.");
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/assertions/ThrowableAssertion_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/assertions/ThrowableAssertion_Test.java
index 250546767..c7dcdf964 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/assertions/ThrowableAssertion_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/assertions/ThrowableAssertion_Test.java
@@ -68,14 +68,16 @@ public class ThrowableAssertion_Test {
@Test
public void ba01a_asString() {
- Throwable x = throwable("1"), nil = null;
+ var x = throwable("1");
+ var nil = (Throwable)null;
test(x).asString().is("java.lang.RuntimeException: 1");
test(nil).asString().isNull();
}
@Test
public void ba01b_asString_wSerializer() {
- Throwable x = throwable("1"), nil = null;
+ var x = throwable("1");
+ var nil = (Throwable)null;
WriterSerializer s = Json5Serializer.DEFAULT;
test(x).asString(s).is("'java.lang.RuntimeException: 1'");
test(nil).asString(s).is("null");
@@ -89,27 +91,32 @@ public class ThrowableAssertion_Test {
@Test
public void ba02_asJson() {
- Throwable x = throwable("1"), nil = null;
+ var x = throwable("1");
+ var nil = (Throwable)null;
test(x).asJson().is("'java.lang.RuntimeException: 1'");
test(nil).asJson().is("null");
}
@Test
public void ba03_asJsonSorted() {
- Throwable x1 = throwable("1"), nil = null;
+ var x1 = throwable("1");
+ var nil = (Throwable)null;
test(x1).asJsonSorted().is("'java.lang.RuntimeException: 1'");
test(nil).asJsonSorted().is("null");
}
@Test
public void ba04_apply() {
- Throwable x1 = throwable("1"), x2 = throwable("2");
+ var x1 = throwable("1");
+ var x2 = throwable("2");
test(x1).asTransformed(x -> x2).is(x2);
}
@Test
public void bb01_message() {
- Throwable x1 = throwable("1"), x2 = throwable(), nil = null;
+ var x1 = throwable("1");
+ var x2 = throwable();
+ var nil = (Throwable)null;
test(x1).asMessage().is("1");
test(x2).asMessage().isNull();
test(nil).asMessage().isNull();
@@ -117,7 +124,9 @@ public class ThrowableAssertion_Test {
@Test
public void bb02_messages() {
- Throwable x1 = throwable("1"), x2 = throwable(x1), nil = null;
+ var x1 = throwable("1");
+ var x2 = throwable(x1);
+ var nil = (Throwable)null;
test(x1).asMessages().isString("[1]");
test(x2).asMessages().isString("[java.lang.RuntimeException: 1,
1]");
test(nil).asMessages().isNull();
@@ -125,7 +134,9 @@ public class ThrowableAssertion_Test {
@Test
public void bb03_localizedMessage() {
- Throwable x1 = throwable("1"), x2 = throwable(), nil = null;
+ var x1 = throwable("1");
+ var x2 = throwable();
+ var nil = (Throwable)null;
test(x1).asLocalizedMessage().is("1");
test(x2).asLocalizedMessage().isNull();
test(nil).asLocalizedMessage().isNull();
@@ -133,7 +144,9 @@ public class ThrowableAssertion_Test {
@Test
public void bb04_localizedMessages() {
- Throwable x1 = throwable("1"), x2 = throwable(x1), nil = null;
+ var x1 = throwable("1");
+ var x2 = throwable(x1);
+ var nil = (Throwable)null;
test(x1).asLocalizedMessages().isString("[1]");
test(x2).asLocalizedMessages().isString("[java.lang.RuntimeException: 1, 1]");
test(nil).asLocalizedMessages().isNull();
@@ -141,14 +154,17 @@ public class ThrowableAssertion_Test {
@Test
public void bb05_stackTrace() {
- Throwable x1 = throwable(), nil = null;
+ var x1 = throwable();
+ var nil = (Throwable)null;
test(x1).asStackTrace().asJoin().isContains("RuntimeException");
test(nil).asStackTrace().isNull();
}
@Test
public void bb06a_causedBy() {
- Throwable x1 = throwable(throwable("1")), x2 = throwable(), nil
= null;
+ var x1 = throwable(throwable("1"));
+ var x2 = throwable();
+ var nil = (Throwable)null;
test(x1).asCausedBy().asMessage().is("1");
test(x2).asMessage().isNull();
test(nil).asCausedBy().asMessage().isNull();
@@ -156,7 +172,9 @@ public class ThrowableAssertion_Test {
@Test
public void bb06b_causedBy_wType() {
- Throwable x1 = throwable(throwable("1")), x2 = throwable(), nil
= null;
+ var x1 = throwable(throwable("1"));
+ var x2 = throwable();
+ var nil = (Throwable)null;
test(x1).asCausedBy(RuntimeException.class).asMessage().is("1");
test(x2).asCausedBy(RuntimeException.class).isNull();
test(nil).asCausedBy(RuntimeException.class).isNull();
@@ -165,7 +183,9 @@ public class ThrowableAssertion_Test {
@Test
public void bb07_find() {
- Throwable x1 = throwable(new IOException()), x2 = throwable(),
nil = null;
+ var x1 = throwable(new IOException());
+ var x2 = throwable();
+ var nil = (Throwable)null;
test(x1).asFind(RuntimeException.class).isExists();
test(x1).asFind(IOException.class).isExists();
test(x1).asFind(Exception.class).isExists();
@@ -181,28 +201,34 @@ public class ThrowableAssertion_Test {
@Test
public void ca01_exists() {
- Throwable x = throwable(), nil = null;
+ var x = throwable();
+ var nil = (Throwable)null;
test(x).isExists().isExists();
assertThrows(BasicAssertionError.class,
()->test(nil).isExists(), "Exception was not thrown.");
}
@Test
public void ca02_isNull() {
- Throwable x = throwable(), nil = null;
+ var x = throwable();
+ var nil = (Throwable)null;
test(nil).isNull();
assertThrows(BasicAssertionError.class, ()->test(x).isNull(),
"Value was not null.");
}
@Test
public void ca03_isNotNull() {
- Throwable x = throwable(), nil = null;
+ var x = throwable();
+ var nil = (Throwable)null;
test(x).isNotNull();
assertThrows(BasicAssertionError.class,
()->test(nil).isNotNull(), "Value was null.");
}
@Test
public void ca04a_is_T() {
- Throwable x1 = throwable("1"), x1a = throwable("1"), x2 =
throwable("2"), nil = null;
+ var x1 = throwable("1");
+ var x1a = throwable("1");
+ var x2 = throwable("2");
+ var nil = (Throwable)null;
test(x1).is(x1);
test(x1).is(x1a);
test(nil).is(nil);
@@ -213,7 +239,7 @@ public class ThrowableAssertion_Test {
@Test
public void ca04b_is_predicate() {
- Throwable x1 = throwable("1");
+ var x1 = throwable("1");
test(x1).is(x->x.getMessage().equals("1"));
assertThrown(()->test(x1).is(x->x.getMessage().length()==4)).asMessage().asOneLine().is("Unexpected
value: 'java.lang.RuntimeException: 1'.");
assertThrown(()->test(x1).is(ne(x1))).asMessage().asOneLine().is("Value
unexpectedly matched. Value='java.lang.RuntimeException: 1'.");
@@ -221,7 +247,10 @@ public class ThrowableAssertion_Test {
@Test
public void ca05_isNot() {
- Throwable x1 = throwable("1"), x1a = throwable("1"), x2 =
throwable("2"), nil = null;
+ var x1 = throwable("1");
+ var x1a = throwable("1");
+ var x2 = throwable("2");
+ var nil = (Throwable)null;
test(x1).isNot(x2);
test(x1).isNot(nil);
test(nil).isNot(x1);
@@ -231,7 +260,10 @@ public class ThrowableAssertion_Test {
@Test
public void ca06_isAny() {
- Throwable x1 = throwable("1"), x1a = throwable("1"), x2 =
throwable("2"), nil = null;
+ var x1 = throwable("1");
+ var x1a = throwable("1");
+ var x2 = throwable("2");
+ var nil = (Throwable)null;
test(x1).isAny(x1a, x2);
assertThrown(()->test(x1).isAny(x2)).asMessage().asOneLine().is("Expected value
not found. Expect='[java.lang.RuntimeException: 2]'.
Actual='java.lang.RuntimeException: 1'.");
assertThrown(()->test(x1).isAny()).asMessage().asOneLine().is("Expected value
not found. Expect='[]'. Actual='java.lang.RuntimeException: 1'.");
@@ -240,7 +272,10 @@ public class ThrowableAssertion_Test {
@Test
public void ca07_isNotAny() {
- Throwable x1 = throwable("1"), x1a = throwable("1"), x2 =
throwable("2"), nil = null;
+ var x1 = throwable("1");
+ var x1a = throwable("1");
+ var x2 = throwable("2");
+ var nil = (Throwable)null;
test(x1).isNotAny(x2);
test(x1).isNotAny();
test(nil).isNotAny(x2);
@@ -250,7 +285,9 @@ public class ThrowableAssertion_Test {
@Test
public void ca08_isSame() {
- Throwable x1 = throwable("1"), x1a = throwable("1"), nil = null;
+ var x1 = throwable("1");
+ var x1a = throwable("1");
+ var nil = (Throwable)null;
test(x1).isSame(x1);
test(nil).isSame(nil);
assertThrown(()->test(x1).isSame(x1a)).asMessage().asOneLine().isMatches("Not
the same value. Expect='java.lang.RuntimeException: 1(RuntimeException@*)'.
Actual='java.lang.RuntimeException: 1(RuntimeException@*)'.");
@@ -260,7 +297,10 @@ public class ThrowableAssertion_Test {
@Test
public void ca09_isSameJsonAs() {
- Throwable x1 = throwable("1"), x1a = throwable("1"), x2 =
throwable("2"), nil = null;
+ var x1 = throwable("1");
+ var x1a = throwable("1");
+ var x2 = throwable("2");
+ var nil = (Throwable)null;
test(x1).isSameJsonAs(x1a);
test(nil).isSameJsonAs(nil);
assertThrown(()->test(x1a).isSameJsonAs(x2)).asMessage().asOneLine().is("Unexpected
comparison. Expect=''java.lang.RuntimeException: 2''.
Actual=''java.lang.RuntimeException: 1''.");
@@ -270,7 +310,10 @@ public class ThrowableAssertion_Test {
@Test
public void ca10_isSameSortedJsonAs() {
- Throwable x1 = throwable("1"), x1a = throwable("1"), x2 =
throwable("2"), nil = null;
+ var x1 = throwable("1");
+ var x1a = throwable("1");
+ var x2 = throwable("2");
+ var nil = (Throwable)null;
test(x1).isSameSortedJsonAs(x1a);
test(nil).isSameSortedJsonAs(nil);
assertThrown(()->test(x1a).isSameSortedJsonAs(x2)).asMessage().asOneLine().is("Unexpected
comparison. Expect=''java.lang.RuntimeException: 2''.
Actual=''java.lang.RuntimeException: 1''.");
@@ -280,7 +323,10 @@ public class ThrowableAssertion_Test {
@Test
public void ca11_isSameSerializedAs() {
- Throwable x1 = throwable("1"), x1a = throwable("1"), x2 =
throwable("2"), nil = null;
+ var x1 = throwable("1");
+ var x1a = throwable("1");
+ var x2 = throwable("2");
+ var nil = (Throwable)null;
WriterSerializer s = Json5Serializer.DEFAULT;
test(x1).isSameSerializedAs(x1a, s);
test(nil).isSameSerializedAs(nil, s);
@@ -291,7 +337,8 @@ public class ThrowableAssertion_Test {
@Test
public void ca12_isType() {
- Throwable x = throwable(), nil = null;
+ var x = throwable();
+ var nil = (Throwable)null;
test(x).isType(Exception.class);
test(x).isType(Object.class);
assertThrown(()->test(x).isType(String.class)).asMessage().asOneLine().is("Exception
was not expected type. Expect='java.lang.String'.
Actual='java.lang.RuntimeException'.");
@@ -301,7 +348,8 @@ public class ThrowableAssertion_Test {
@Test
public void ca13_isExactType() {
- Throwable x = throwable(), nil = null;
+ var x = throwable();
+ var nil = (Throwable)null;
test(x).isExactType(RuntimeException.class);
assertThrown(()->test(x).isExactType(Object.class)).asMessage().asOneLine().is("Exception
was not expected type. Expect='java.lang.Object'.
Actual='java.lang.RuntimeException'.");
assertThrown(()->test(x).isExactType(String.class)).asMessage().asOneLine().is("Exception
was not expected type. Expect='java.lang.String'.
Actual='java.lang.RuntimeException'.");
@@ -311,7 +359,8 @@ public class ThrowableAssertion_Test {
@Test
public void ca14_isString() {
- Throwable x = throwable("1"), nil = null;
+ var x = throwable("1");
+ var nil = (Throwable)null;
test(x).isString("java.lang.RuntimeException: 1");
test(nil).isString(null);
assertThrown(()->test(x).isString("bad")).asMessage().asOneLine().is("String
differed at position 0. Expect='bad'. Actual='java.lang.RuntimeException:
1'.");
@@ -321,7 +370,8 @@ public class ThrowableAssertion_Test {
@Test
public void ca15_isJson() {
- Throwable x = throwable("1"), nil = null;
+ var x = throwable("1");
+ var nil = (Throwable)null;
test(x).isJson("'java.lang.RuntimeException: 1'");
test(nil).isJson("null");
assertThrown(()->test(x).isJson("bad")).asMessage().asOneLine().is("String
differed at position 0. Expect='bad'. Actual=''java.lang.RuntimeException:
1''.");
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/assertions/Verify_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/assertions/Verify_Test.java
index 110e19a36..8c3804655 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/assertions/Verify_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/assertions/Verify_Test.java
@@ -38,7 +38,9 @@ public class Verify_Test {
@Test
public void a01_basic() {
- Verify x1 = verify("foo"), x2 = verify(null), x3 = verify(new
Date(0));
+ var x1 = verify("foo");
+ var x2 = verify(null);
+ var x3 = verify(new Date(0));
test(x1.is("foo")).isNull();
test(x1.is("bar")).is("Expected 'bar' but was 'foo'.");
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/assertions/VersionAssertion_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/assertions/VersionAssertion_Test.java
index ca5e5c354..aca4852dd 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/assertions/VersionAssertion_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/assertions/VersionAssertion_Test.java
@@ -56,14 +56,16 @@ public class VersionAssertion_Test {
@Test
public void ba01a_asString() {
- Version x = of("1"), nil = null;
+ var x = of("1");
+ var nil = (Version)null;
test(x).asString().is("1");
test(nil).asString().isNull();
}
@Test
public void ba01b_asString_wSerializer() {
- Version x = of("1"), nil = null;
+ var x = of("1");
+ var nil = (Version)null;
WriterSerializer s = Json5Serializer.DEFAULT;
test(x).asString(s).is("{maintenance:null,major:1,minor:null}");
test(nil).asString(s).is("null");
@@ -71,33 +73,37 @@ public class VersionAssertion_Test {
@Test
public void ba01c_asString_wPredicate() {
- Version x1 = of("1");
+ var x1 = of("1");
test(x1).asString(x -> "foo").is("foo");
}
@Test
public void ba02_asJson() {
- Version x = of("1"), nil = null;
+ var x = of("1");
+ var nil = (Version)null;
test(x).asJson().is("{maintenance:null,major:1,minor:null}");
test(nil).asJson().is("null");
}
@Test
public void ba03_asJsonSorted() {
- Version x = of("1"), nil = null;
+ var x = of("1");
+ var nil = (Version)null;
test(x).asJsonSorted().is("{maintenance:null,major:1,minor:null}");
test(nil).asJsonSorted().is("null");
}
@Test
public void ba04_apply() {
- Version x1 = of("1"), x2 = of("2");
+ var x1 = of("1");
+ var x2 = of("2");
test(x1).asTransformed(x -> x2).is(x2);
}
@Test
public void bc01_part() {
- Version x = of("1.2.3"), nil = null;
+ var x = of("1.2.3");
+ var nil = (Version)null;
test(x).asPart(-1).isNull();
test(x).asPart(0).is(1);
test(x).asPart(1).is(2);
@@ -108,21 +114,24 @@ public class VersionAssertion_Test {
@Test
public void bc02_major() {
- Version x = of("1.2.3"), nil = null;
+ var x = of("1.2.3");
+ var nil = (Version)null;
test(x).asMajor().is(1);
test(nil).asMajor().isNull();
}
@Test
public void bc03_minor() {
- Version x = of("1.2.3"), nil = null;
+ var x = of("1.2.3");
+ var nil = (Version)null;
test(x).asMinor().is(2);
test(nil).asMinor().isNull();
}
@Test
public void bc04_maintenance() {
- Version x = of("1.2.3"), nil = null;
+ var x = of("1.2.3");
+ var nil = (Version)null;
test(x).asMaintenance().is(3);
test(nil).asMaintenance().isNull();
}
@@ -133,28 +142,34 @@ public class VersionAssertion_Test {
@Test
public void ca01_exists() {
- Version x = of("1"), nil = null;
+ var x = of("1");
+ var nil = (Version)null;
test(x).isExists().isExists();
assertThrows(BasicAssertionError.class,
()->test(nil).isExists(), "Value was null.");
}
@Test
public void ca02_isNull() {
- Version x = of("1"), nil = null;
+ var x = of("1");
+ var nil = (Version)null;
test(nil).isNull();
assertThrows(BasicAssertionError.class, ()->test(x).isNull(),
"Value was not null.");
}
@Test
public void ca03_isNotNull() {
- Version x = of("1"), nil = null;
+ var x = of("1");
+ var nil = (Version)null;
test(x).isNotNull();
assertThrows(BasicAssertionError.class,
()->test(nil).isNotNull(), "Value was null.");
}
@Test
public void ca04a_is_T() {
- Version x1 = of("1"), x1a = of("1"), x2 = of("2"), nil = null;
+ var x1 = of("1");
+ var x1a = of("1");
+ var x2 = of("2");
+ var nil = (Version)null;
test(x1).is(x1);
test(x1).is(x1a);
test(nil).is(nil);
@@ -173,7 +188,10 @@ public class VersionAssertion_Test {
@Test
public void ca05_isNot() {
- Version x1 = of("1"), x1a = of("1"), x2 = of("2"), nil = null;
+ var x1 = of("1");
+ var x1a = of("1");
+ var x2 = of("2");
+ var nil = (Version)null;
test(x1).isNot(x2);
test(x1).isNot(nil);
test(nil).isNot(x1);
@@ -183,7 +201,10 @@ public class VersionAssertion_Test {
@Test
public void ca06_isAny() {
- Version x1 = of("1"), x1a = of("1"), x2 = of("2"), nil = null;
+ var x1 = of("1");
+ var x1a = of("1");
+ var x2 = of("2");
+ var nil = (Version)null;
test(x1).isAny(x1a, x2);
assertThrown(()->test(x1).isAny(x2)).asMessage().asOneLine().is("Expected value
not found. Expect='[2]'. Actual='1'.");
assertThrown(()->test(x1).isAny()).asMessage().asOneLine().is("Expected value
not found. Expect='[]'. Actual='1'.");
@@ -192,7 +213,10 @@ public class VersionAssertion_Test {
@Test
public void ca07_isNotAny() {
- Version x1 = of("1"), x1a = of("1"), x2 = of("2"), nil = null;
+ var x1 = of("1");
+ var x1a = of("1");
+ var x2 = of("2");
+ var nil = (Version)null;
test(x1).isNotAny(x2);
test(x1).isNotAny();
test(nil).isNotAny(x2);
@@ -202,7 +226,9 @@ public class VersionAssertion_Test {
@Test
public void ca08_isSame() {
- Version x1 = of("1"), x1a = of("1"), nil = null;
+ var x1 = of("1");
+ var x1a = of("1");
+ var nil = (Version)null;
test(x1).isSame(x1);
test(nil).isSame(nil);
assertThrown(()->test(x1).isSame(x1a)).asMessage().asOneLine().isMatches("Not
the same value. Expect='1(Version@*)'. Actual='1(Version@*)'.");
@@ -212,7 +238,10 @@ public class VersionAssertion_Test {
@Test
public void ca09_isSameJsonAs() {
- Version x1 = of("1"), x1a = of("1"), x2 = of("2"), nil = null;
+ var x1 = of("1");
+ var x1a = of("1");
+ var x2 = of("2");
+ var nil = (Version)null;
test(x1).isSameJsonAs(x1a);
test(nil).isSameJsonAs(nil);
assertThrown(()->test(x1a).isSameJsonAs(x2)).asMessage().asOneLine().is("Unexpected
comparison. Expect='{maintenance:null,major:2,minor:null}'.
Actual='{maintenance:null,major:1,minor:null}'.");
@@ -222,7 +251,10 @@ public class VersionAssertion_Test {
@Test
public void ca10_isSameSortedJsonAs() {
- Version x1 = of("1"), x1a = of("1"), x2 = of("2"), nil = null;
+ var x1 = of("1");
+ var x1a = of("1");
+ var x2 = of("2");
+ var nil = (Version)null;
test(x1).isSameSortedJsonAs(x1a);
test(nil).isSameSortedJsonAs(nil);
assertThrown(()->test(x1a).isSameSortedJsonAs(x2)).asMessage().asOneLine().is("Unexpected
comparison. Expect='{maintenance:null,major:2,minor:null}'.
Actual='{maintenance:null,major:1,minor:null}'.");
@@ -232,7 +264,10 @@ public class VersionAssertion_Test {
@Test
public void ca11_isSameSerializedAs() {
- Version x1 = of("1"), x1a = of("1"), x2 = of("2"), nil = null;
+ var x1 = of("1");
+ var x1a = of("1");
+ var x2 = of("2");
+ var nil = (Version)null;
WriterSerializer s = Json5Serializer.DEFAULT;
test(x1).isSameSerializedAs(x1a, s);
test(nil).isSameSerializedAs(nil, s);
@@ -243,7 +278,8 @@ public class VersionAssertion_Test {
@Test
public void ca12_isType() {
- Version x = of("1"), nil = null;
+ var x = of("1");
+ var nil = (Version)null;
test(x).isType(Version.class);
test(x).isType(Object.class);
assertThrown(()->test(x).isType(String.class)).asMessage().asOneLine().is("Unexpected
type. Expect='java.lang.String'. Actual='org.apache.juneau.Version'.");
@@ -253,7 +289,8 @@ public class VersionAssertion_Test {
@Test
public void ca13_isExactType() {
- Version x = of("1"), nil = null;
+ var x = of("1");
+ var nil = (Version)null;
test(x).isExactType(Version.class);
assertThrown(()->test(x).isExactType(Object.class)).asMessage().asOneLine().is("Unexpected
type. Expect='java.lang.Object'. Actual='org.apache.juneau.Version'.");
assertThrown(()->test(x).isExactType(String.class)).asMessage().asOneLine().is("Unexpected
type. Expect='java.lang.String'. Actual='org.apache.juneau.Version'.");
@@ -263,7 +300,8 @@ public class VersionAssertion_Test {
@Test
public void ca14_isString() {
- Version x = of("1"), nil = null;
+ var x = of("1");
+ var nil = (Version)null;
test(x).isString("1");
test(nil).isString(null);
assertThrown(()->test(x).isString("bad")).asMessage().asOneLine().is("String
differed at position 0. Expect='bad'. Actual='1'.");
@@ -273,7 +311,8 @@ public class VersionAssertion_Test {
@Test
public void ca15_isJson() {
- Version x = of("1"), nil = null;
+ var x = of("1");
+ var nil = (Version)null;
test(x).isJson("{maintenance:null,major:1,minor:null}");
test(nil).isJson("null");
assertThrown(()->test(x).isJson("bad")).asMessage().asOneLine().is("String
differed at position 0. Expect='bad'.
Actual='{maintenance:null,major:1,minor:null}'.");
@@ -283,7 +322,9 @@ public class VersionAssertion_Test {
@Test
public void cb01_isGt() {
- Version x1 = of("1"), x2 = of("2"), nil = null;
+ var x1 = of("1");
+ var x2 = of("2");
+ var nil = (Version)null;
test(x2).isGt(x1);
assertThrown(()->test(x1).isGt(x1)).asMessage().asOneLine().is("Value was not
greater than expected. Expect='1'. Actual='1'.");
assertThrown(()->test(x1).isGt(x2)).asMessage().asOneLine().is("Value was not
greater than expected. Expect='2'. Actual='1'.");
@@ -293,7 +334,9 @@ public class VersionAssertion_Test {
@Test
public void cb02_isGte() {
- Version x1 = of("1"), x2 = of("2"), nil = null;
+ var x1 = of("1");
+ var x2 = of("2");
+ var nil = (Version)null;
test(x2).isGte(x1);
test(x1).isGte(x1);
assertThrown(()->test(x1).isGte(x2)).asMessage().asOneLine().is("Value was not
greater than or equals to expected. Expect='2'. Actual='1'.");
@@ -303,7 +346,9 @@ public class VersionAssertion_Test {
@Test
public void cb03_isLt() {
- Version x1 = of("1"), x2 = of("2"), nil = null;
+ var x1 = of("1");
+ var x2 = of("2");
+ var nil = (Version)null;
test(x1).isLt(x2);
assertThrown(()->test(x1).isLt(x1)).asMessage().asOneLine().is("Value was not
less than expected. Expect='1'. Actual='1'.");
assertThrown(()->test(x2).isLt(x1)).asMessage().asOneLine().is("Value was not
less than expected. Expect='1'. Actual='2'.");
@@ -313,7 +358,9 @@ public class VersionAssertion_Test {
@Test
public void cb04_isLte() {
- Version x1 = of("1"), x2 = of("2"), nil = null;
+ var x1 = of("1");
+ var x2 = of("2");
+ var nil = (Version)null;
test(x1).isLte(x2);
test(x1).isLte(x1);
assertThrown(()->test(x2).isLte(x1)).asMessage().asOneLine().is("Value was not
less than or equals to expected. Expect='1'. Actual='2'.");
@@ -323,7 +370,11 @@ public class VersionAssertion_Test {
@Test
public void cb05_isBetween() {
- Version x1 = of("1"), x2 = of("2"), x3 = of("3"), x4 = of("4"),
nil = null;
+ var x1 = of("1");
+ var x2 = of("2");
+ var x3 = of("3");
+ var x4 = of("4");
+ var nil = (Version)null;
test(x1).isBetween(x1, x3);
test(x2).isBetween(x1, x3);
test(x3).isBetween(x1, x3);
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/assertions/ZonedDateTimeAssertion_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/assertions/ZonedDateTimeAssertion_Test.java
index 3bde13e71..c4ff6aabe 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/assertions/ZonedDateTimeAssertion_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/assertions/ZonedDateTimeAssertion_Test.java
@@ -69,14 +69,16 @@ public class ZonedDateTimeAssertion_Test {
@Test
public void ba01a_asString() {
- ZonedDateTime x = MID1, nil = null;
+ var x = MID1;
+ var nil = (ZonedDateTime)null;
test(x).asString().is("2000-06-01T12:34:56Z");
test(nil).asString().isNull();
}
@Test
public void ba01b_asString_wSerializer() {
- ZonedDateTime x = MID1, nil = null;
+ var x = MID1;
+ var nil = (ZonedDateTime)null;
WriterSerializer s = Json5Serializer.DEFAULT;
test(x).asString(s).is("'2000-06-01T12:34:56Z'");
test(nil).asString(s).is("null");
@@ -90,21 +92,24 @@ public class ZonedDateTimeAssertion_Test {
@Test
public void ba02_asJson() {
- ZonedDateTime x = MID1, nil = null;
+ var x = MID1;
+ var nil = (ZonedDateTime)null;
test(x).asJson().is("'2000-06-01T12:34:56Z'");
test(nil).asJson().is("null");
}
@Test
public void ba03_asJsonSorted() {
- ZonedDateTime x1 = MID1, nil = null;
+ var x1 = MID1;
+ var nil = (ZonedDateTime)null;
test(x1).asJsonSorted().is("'2000-06-01T12:34:56Z'");
test(nil).asJsonSorted().is("null");
}
@Test
public void ba04_apply() {
- ZonedDateTime x1 = MID1, x2 = MID2;
+ var x1 = MID1;
+ var x2 = MID2;
test(x1).asTransformed(x -> x2).is(x2);
}
@@ -114,28 +119,34 @@ public class ZonedDateTimeAssertion_Test {
@Test
public void ca01_exists() {
- ZonedDateTime x = MID1, nil = null;
+ var x = MID1;
+ var nil = (ZonedDateTime)null;
test(x).isExists().isExists();
assertThrows(BasicAssertionError.class,
()->test(nil).isExists(), "Value was null.");
}
@Test
public void ca02_isNull() {
- ZonedDateTime x = MID1, nil = null;
+ var x = MID1;
+ var nil = (ZonedDateTime)null;
test(nil).isNull();
assertThrows(BasicAssertionError.class, ()->test(x).isNull(),
"Value was not null.");
}
@Test
public void ca03_isNotNull() {
- ZonedDateTime x = MID1, nil = null;
+ var x = MID1;
+ var nil = (ZonedDateTime)null;
test(x).isNotNull();
assertThrows(BasicAssertionError.class,
()->test(nil).isNotNull(), "Value was null.");
}
@Test
public void ca04a_is_T() {
- ZonedDateTime x1 = MID1, x1a = MID1a, x2 = MID2, nil = null;
+ var x1 = MID1;
+ var x1a = MID1a;
+ var x2 = MID2;
+ var nil = (ZonedDateTime)null;
test(x1).is(x1);
test(x1).is(x1a);
test(nil).is(nil);
@@ -146,7 +157,7 @@ public class ZonedDateTimeAssertion_Test {
@Test
public void ca04b_is_predicate() {
- ZonedDateTime x1 = MID1;
+ var x1 = MID1;
test(x1).is(x->x!=null);
assertThrown(()->test(x1).is(x->x==null)).asMessage().asOneLine().is("Unexpected
value: '2000-06-01T12:34:56Z'.");
assertThrown(()->test(x1).is(ne(x1))).asMessage().asOneLine().is("Value
unexpectedly matched. Value='2000-06-01T12:34:56Z'.");
@@ -154,7 +165,10 @@ public class ZonedDateTimeAssertion_Test {
@Test
public void ca05_isNot() {
- ZonedDateTime x1 = MID1, x1a = MID1a, x2 = MID2, nil = null;
+ var x1 = MID1;
+ var x1a = MID1a;
+ var x2 = MID2;
+ var nil = (ZonedDateTime)null;
test(x1).isNot(x2);
test(x1).isNot(nil);
test(nil).isNot(x1);
@@ -164,7 +178,10 @@ public class ZonedDateTimeAssertion_Test {
@Test
public void ca06_isAny() {
- ZonedDateTime x1 = MID1, x1a = MID1a, x2 = MID2, nil = null;
+ var x1 = MID1;
+ var x1a = MID1a;
+ var x2 = MID2;
+ var nil = (ZonedDateTime)null;
test(x1).isAny(x1a, x2);
assertThrown(()->test(x1).isAny(x2)).asMessage().asOneLine().is("Expected value
not found. Expect='[2010-06-01T12:34:56Z]'. Actual='2000-06-01T12:34:56Z'.");
assertThrown(()->test(x1).isAny()).asMessage().asOneLine().is("Expected value
not found. Expect='[]'. Actual='2000-06-01T12:34:56Z'.");
@@ -173,7 +190,10 @@ public class ZonedDateTimeAssertion_Test {
@Test
public void ca07_isNotAny() {
- ZonedDateTime x1 = MID1, x1a = MID1a, x2 = MID2, nil = null;
+ var x1 = MID1;
+ var x1a = MID1a;
+ var x2 = MID2;
+ var nil = (ZonedDateTime)null;
test(x1).isNotAny(x2);
test(x1).isNotAny();
test(nil).isNotAny(x2);
@@ -183,7 +203,9 @@ public class ZonedDateTimeAssertion_Test {
@Test
public void ca08_isSame() {
- ZonedDateTime x1 = MID1, x1a = MID1a, nil = null;
+ var x1 = MID1;
+ var x1a = MID1a;
+ var nil = (ZonedDateTime)null;
test(x1).isSame(x1);
test(nil).isSame(nil);
assertThrown(()->test(x1).isSame(x1a)).asMessage().asOneLine().isMatches("Not
the same value. Expect='2000-06-01T12:34:56Z(ZonedDateTime@*)'.
Actual='2000-06-01T12:34:56Z(ZonedDateTime@*)'.");
@@ -193,7 +215,10 @@ public class ZonedDateTimeAssertion_Test {
@Test
public void ca09_isSameJsonAs() {
- ZonedDateTime x1 = MID1, x1a = MID1a, x2 = MID2, nil = null;
+ var x1 = MID1;
+ var x1a = MID1a;
+ var x2 = MID2;
+ var nil = (ZonedDateTime)null;
test(x1).isSameJsonAs(x1a);
test(nil).isSameJsonAs(nil);
assertThrown(()->test(x1a).isSameJsonAs(x2)).asMessage().asOneLine().is("Unexpected
comparison. Expect=''2010-06-01T12:34:56Z''.
Actual=''2000-06-01T12:34:56Z''.");
@@ -203,7 +228,10 @@ public class ZonedDateTimeAssertion_Test {
@Test
public void ca10_isSameSortedJsonAs() {
- ZonedDateTime x1 = MID1, x1a = MID1a, x2 = MID2, nil = null;
+ var x1 = MID1;
+ var x1a = MID1a;
+ var x2 = MID2;
+ var nil = (ZonedDateTime)null;
test(x1).isSameSortedJsonAs(x1a);
test(nil).isSameSortedJsonAs(nil);
assertThrown(()->test(x1a).isSameSortedJsonAs(x2)).asMessage().asOneLine().is("Unexpected
comparison. Expect=''2010-06-01T12:34:56Z''.
Actual=''2000-06-01T12:34:56Z''.");
@@ -213,7 +241,10 @@ public class ZonedDateTimeAssertion_Test {
@Test
public void ca11_isSameSerializedAs() {
- ZonedDateTime x1 = MID1, x1a = MID1a, x2 = MID2, nil = null;
+ var x1 = MID1;
+ var x1a = MID1a;
+ var x2 = MID2;
+ var nil = (ZonedDateTime)null;
WriterSerializer s = Json5Serializer.DEFAULT;
test(x1).isSameSerializedAs(x1a, s);
test(nil).isSameSerializedAs(nil, s);
@@ -224,7 +255,8 @@ public class ZonedDateTimeAssertion_Test {
@Test
public void ca12_isType() {
- ZonedDateTime x = MID1, nil = null;
+ var x = MID1;
+ var nil = (ZonedDateTime)null;
test(x).isType(ZonedDateTime.class);
test(x).isType(Object.class);
assertThrown(()->test(x).isType(String.class)).asMessage().asOneLine().is("Unexpected
type. Expect='java.lang.String'. Actual='java.time.ZonedDateTime'.");
@@ -234,7 +266,8 @@ public class ZonedDateTimeAssertion_Test {
@Test
public void ca13_isExactType() {
- ZonedDateTime x = MID1, nil = null;
+ var x = MID1;
+ var nil = (ZonedDateTime)null;
test(x).isExactType(ZonedDateTime.class);
assertThrown(()->test(x).isExactType(Object.class)).asMessage().asOneLine().is("Unexpected
type. Expect='java.lang.Object'. Actual='java.time.ZonedDateTime'.");
assertThrown(()->test(x).isExactType(String.class)).asMessage().asOneLine().is("Unexpected
type. Expect='java.lang.String'. Actual='java.time.ZonedDateTime'.");
@@ -244,7 +277,8 @@ public class ZonedDateTimeAssertion_Test {
@Test
public void ca14_isString() {
- ZonedDateTime x = MID1, nil = null;
+ var x = MID1;
+ var nil = (ZonedDateTime)null;
test(x).isString("2000-06-01T12:34:56Z");
test(nil).isString(null);
assertThrown(()->test(x).isString("bad")).asMessage().asOneLine().is("String
differed at position 0. Expect='bad'. Actual='2000-06-01T12:34:56Z'.");
@@ -254,7 +288,8 @@ public class ZonedDateTimeAssertion_Test {
@Test
public void ca15_isJson() {
- ZonedDateTime x = MID1, nil = null;
+ var x = MID1;
+ var nil = (ZonedDateTime)null;
test(x).isJson("'2000-06-01T12:34:56Z'");
test(nil).isJson("null");
assertThrown(()->test(x).isJson("bad")).asMessage().asOneLine().is("String
differed at position 0. Expect='bad'. Actual=''2000-06-01T12:34:56Z''.");
@@ -264,7 +299,9 @@ public class ZonedDateTimeAssertion_Test {
@Test
public void cb01_isGt() {
- ZonedDateTime x1 = MIN, x2 = MID1, nil = null;
+ var x1 = MIN;
+ var x2 = MID1;
+ var nil = (ZonedDateTime)null;
test(x2).isGt(x1);
assertThrown(()->test(x1).isGt(x1)).asMessage().asOneLine().is("Value was not
greater than expected. Expect='1900-06-01T12:34:56Z'.
Actual='1900-06-01T12:34:56Z'.");
assertThrown(()->test(x1).isGt(x2)).asMessage().asOneLine().is("Value was not
greater than expected. Expect='2000-06-01T12:34:56Z'.
Actual='1900-06-01T12:34:56Z'.");
@@ -274,7 +311,9 @@ public class ZonedDateTimeAssertion_Test {
@Test
public void cb02_isGte() {
- ZonedDateTime x1 = MIN, x2 = MID1, nil = null;
+ var x1 = MIN;
+ var x2 = MID1;
+ var nil = (ZonedDateTime)null;
test(x2).isGte(x1);
test(x1).isGte(x1);
assertThrown(()->test(x1).isGte(x2)).asMessage().asOneLine().is("Value was not
greater than or equals to expected. Expect='2000-06-01T12:34:56Z'.
Actual='1900-06-01T12:34:56Z'.");
@@ -284,7 +323,9 @@ public class ZonedDateTimeAssertion_Test {
@Test
public void cb03_isLt() {
- ZonedDateTime x1 = MIN, x2 = MID1, nil = null;
+ var x1 = MIN;
+ var x2 = MID1;
+ var nil = (ZonedDateTime)null;
test(x1).isLt(x2);
assertThrown(()->test(x1).isLt(x1)).asMessage().asOneLine().is("Value was not
less than expected. Expect='1900-06-01T12:34:56Z'.
Actual='1900-06-01T12:34:56Z'.");
assertThrown(()->test(x2).isLt(x1)).asMessage().asOneLine().is("Value was not
less than expected. Expect='1900-06-01T12:34:56Z'.
Actual='2000-06-01T12:34:56Z'.");
@@ -294,7 +335,9 @@ public class ZonedDateTimeAssertion_Test {
@Test
public void cb04_isLte() {
- ZonedDateTime x1 = MIN, x2 = MID1, nil = null;
+ var x1 = MIN;
+ var x2 = MID1;
+ var nil = (ZonedDateTime)null;
test(x1).isLte(x2);
test(x1).isLte(x1);
assertThrown(()->test(x2).isLte(x1)).asMessage().asOneLine().is("Value was not
less than or equals to expected. Expect='1900-06-01T12:34:56Z'.
Actual='2000-06-01T12:34:56Z'.");
@@ -304,7 +347,11 @@ public class ZonedDateTimeAssertion_Test {
@Test
public void cb05_isBetween() {
- ZonedDateTime x1 = MIN, x2 = MID1, x3 = MID2, x4 = MAX, nil =
null;
+ var x1 = MIN;
+ var x2 = MID1;
+ var x3 = MID2;
+ var x4 = MAX;
+ var nil = (ZonedDateTime)null;
test(x1).isBetween(x1, x3);
test(x2).isBetween(x1, x3);
test(x3).isBetween(x1, x3);
@@ -316,7 +363,9 @@ public class ZonedDateTimeAssertion_Test {
@Test
public void cc01_is_wChrono() {
- ZonedDateTime x1 = zdt("1950-01-01T12:34:56Z"), x1a =
zdt("1950-01-01T12:35:55Z"), nil = null;
+ var x1 = zdt("1950-01-01T12:34:56Z");
+ var x1a = zdt("1950-01-01T12:35:55Z");
+ var nil = (ZonedDateTime)null;
test(x1).is(x1a, HOURS);
test(x1).is(x1a, MINUTES);
test(nil).is(nil, MINUTES);
@@ -328,7 +377,9 @@ public class ZonedDateTimeAssertion_Test {
@Test
public void cc02_isAfter() {
- ZonedDateTime x1 = zdt("1950-01-01T12:34:56Z"), x2 =
zdt("2050-01-01T12:34:56Z"), nil = null;
+ var x1 = zdt("1950-01-01T12:34:56Z");
+ var x2 = zdt("2050-01-01T12:34:56Z");
+ var nil = (ZonedDateTime)null;
test(x2).isAfter(x1);
assertThrown(()->test(x1).isAfter(x2)).asMessage().isContains("Value was not
after expected.");
assertThrows(IllegalArgumentException.class,
()->test(x1).isAfter(nil), "Argument 'value' cannot be null.");
@@ -337,7 +388,9 @@ public class ZonedDateTimeAssertion_Test {
@Test
public void cc03_isAfterNow() {
- ZonedDateTime x1 = zdt("1950-01-01T12:34:56Z"), x2 =
zdt("2050-01-01T12:34:56Z"), nil = null;
+ var x1 = zdt("1950-01-01T12:34:56Z");
+ var x2 = zdt("2050-01-01T12:34:56Z");
+ var nil = (ZonedDateTime)null;
test(x2).isAfterNow();
assertThrown(()->test(x1).isAfterNow()).asMessage().isContains("Value was not
after expected.");
assertThrown(()->test(nil).isAfterNow()).asMessage().isContains("Value was
null.");
@@ -345,7 +398,9 @@ public class ZonedDateTimeAssertion_Test {
@Test
public void cc04_isBefore() {
- ZonedDateTime x1 = zdt("1950-01-01T12:34:56Z"), x2 =
zdt("2050-01-01T12:34:56Z"), nil = null;
+ var x1 = zdt("1950-01-01T12:34:56Z");
+ var x2 = zdt("2050-01-01T12:34:56Z");
+ var nil = (ZonedDateTime)null;
test(x1).isBefore(x2);
assertThrown(()->test(x2).isBefore(x1)).asMessage().isContains("Value was not
before expected.");
assertThrows(IllegalArgumentException.class,
()->test(x1).isBefore(nil), "Argument 'value' cannot be null.");
@@ -354,7 +409,9 @@ public class ZonedDateTimeAssertion_Test {
@Test
public void cc05_isBeforeNow() {
- ZonedDateTime x1 = zdt("1950-01-01T12:34:56Z"), x2 =
zdt("2050-01-01T12:34:56Z"), nil = null;
+ var x1 = zdt("1950-01-01T12:34:56Z");
+ var x2 = zdt("2050-01-01T12:34:56Z");
+ var nil = (ZonedDateTime)null;
test(x1).isBeforeNow();
assertThrown(()->test(x2).isBeforeNow()).asMessage().isContains("Value was not
before expected.");
assertThrown(()->test(nil).isBeforeNow()).asMessage().isContains("Value was
null.");
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/cp/FileFinder_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/cp/FileFinder_Test.java
index 41d8385da..8cc2e431b 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/cp/FileFinder_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/cp/FileFinder_Test.java
@@ -109,7 +109,9 @@ public class FileFinder_Test extends SimpleTestBase { //
NOSONAR - Needs to be
String[] patterns_ja_JP =
{"_a_ja_JP.txt","_b_ja_JP",".c",".d_ja_JP.txt","e_ja_JP.txt","f_ja_JP","g_foo_ja_JP.txt","h.foo_ja_JP.txt","i_foo_ja_JP"};
for (int i = 0; i < patterns.length; i++) {
- String p = patterns[i], p_ja = patterns_ja[i], p_ja_JP
= patterns_ja_JP[i];
+ var p = patterns[i];
+ var p_ja = patterns_ja[i];
+ var p_ja_JP = patterns_ja_JP[i];
assertContains("[home:/files/test1/"+p+"]",
read(x,"test1/"+p,null));
assertContains("[home:/files/test1/dir/"+p+"]",
read(x,"test1/dir/"+p,null));
@@ -234,7 +236,9 @@ public class FileFinder_Test extends SimpleTestBase { //
NOSONAR - Needs to be
String[] patterns_ja_JP =
{"_a_ja_JP.txt","_b_ja_JP",".c",".d_ja_JP.txt","e_ja_JP.txt","f_ja_JP","g_foo_ja_JP.txt","h.foo_ja_JP.txt","i_foo_ja_JP"};
for (int i = 0; i < patterns.length; i++) {
- String p = patterns[i], p_ja = patterns_ja[i], p_ja_JP
= patterns_ja_JP[i];
+ var p = patterns[i];
+ var p_ja = patterns_ja[i];
+ var p_ja_JP = patterns_ja_JP[i];
assertContains("[cp:/files/test1/"+p+"]",
read(x,"test1/"+p,null));
assertContains("[cp:/files/test1/dir/"+p+"]",
read(x,"test1/dir/"+p,null));
@@ -398,7 +402,9 @@ public class FileFinder_Test extends SimpleTestBase { //
NOSONAR - Needs to be
String[] patterns_ja_JP =
{"_a_ja_JP.txt","_b_ja_JP",".c",".d_ja_JP.txt","e_ja_JP.txt","f_ja_JP","g_foo_ja_JP.txt","h.foo_ja_JP.txt","i_foo_ja_JP"};
for (int i = 0; i < patterns.length; i++) {
- String p = patterns[i], p_ja = patterns_ja[i], p_ja_JP
= patterns_ja_JP[i];
+ var p = patterns[i];
+ var p_ja = patterns_ja[i];
+ var p_ja_JP = patterns_ja_JP[i];
assertContains("[cp:/org/apache/juneau/cp/files/test1/"+p+"]",
read(x,"test1/"+p,null));
assertContains("[cp:/org/apache/juneau/cp/files/test1/dir/"+p+"]",
read(x,"test1/dir/"+p,null));
@@ -443,7 +449,9 @@ public class FileFinder_Test extends SimpleTestBase { //
NOSONAR - Needs to be
String[] patterns_ja_JP =
{"_a_ja_JP.txt","_b_ja_JP",".c",".d_ja_JP.txt","e_ja_JP.txt","f_ja_JP","g_foo_ja_JP.txt","h.foo_ja_JP.txt","i_foo_ja_JP"};
for (int i = 0; i < patterns.length; i++) {
- String p = patterns[i], p_ja = patterns_ja[i], p_ja_JP
= patterns_ja_JP[i];
+ var p = patterns[i];
+ var p_ja = patterns_ja[i];
+ var p_ja_JP = patterns_ja_JP[i];
assertContains("[cp:/org/apache/juneau/cp/files/test1/"+p+"]",
read(x,"test1/"+p,null));
assertContains("[cp:/org/apache/juneau/cp/files/test1/dir/"+p+"]",
read(x,"test1/dir/"+p,null));
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Query_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Query_Test.java
index 8380033c3..1b6297500 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Query_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Query_Test.java
@@ -70,7 +70,8 @@ class RestClient_Query_Test extends SimpleTestBase {
}
@Test void a07_query_String_Supplier_Schema() throws Exception {
- String[] l1 = {"foo","bar"},l2 = {"bar","baz"};
+ var l1 = a("foo","bar");
+ var l2 = a("bar","baz");
var s = MutableSupplier.of(l1);
RestClient x =
client().queryData(part("foo",s,T_ARRAY_PIPES)).build();
x.get("/query").queryData(part("bar",s,T_ARRAY_PIPES)).run().assertContent().asString().asUrlDecode().is("foo=foo|bar&bar=foo|bar");
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/utils/ArrayUtilsTest.java
b/juneau-utest/src/test/java/org/apache/juneau/utils/ArrayUtilsTest.java
index 9bf667a34..79b98a846 100755
--- a/juneau-utest/src/test/java/org/apache/juneau/utils/ArrayUtilsTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/utils/ArrayUtilsTest.java
@@ -38,7 +38,7 @@ class ArrayUtilsTest extends SimpleTestBase {
s = append(s);
assertArray(s, "a,b,c");
- Object[] o = append((Object[])null);
+ var o = append((Object[])null);
assertArray(o);
s = append((String[])null, "a", "b");
@@ -49,12 +49,10 @@ class ArrayUtilsTest extends SimpleTestBase {
// asSet(T[])
//====================================================================================================
@Test void a02_asSet() {
- String[] s = null;
-
assertThrows(IllegalArgumentException.class,
()->asSet((String[])null));
- s = new String[]{"a"};
- Iterator<String> i = asSet(s).iterator();
+ var s = a("a");
+ var i = asSet(s).iterator();
assertEquals("a", i.next());
assertThrows(UnsupportedOperationException.class, i::remove);
@@ -65,7 +63,8 @@ class ArrayUtilsTest extends SimpleTestBase {
// combine(T[]...)
//====================================================================================================
@Test void a03_combine() {
- String[] s1 = {"a"}, s2 = {"b"};
+ var s1 = a("a");
+ var s2 = a("b");
assertArray(combine(s1, s2), "a,b");
assertArray(combine(s1), "a");
@@ -75,4 +74,4 @@ class ArrayUtilsTest extends SimpleTestBase {
assertNull(combine(null,null));
assertNull(combine());
}
-}
+}
\ No newline at end of file
