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 8b7f288c8 Unit test modernization.
8b7f288c8 is described below
commit 8b7f288c8a99b07d06d2e100d5c8d33732ae96f7
Author: James Bognar <[email protected]>
AuthorDate: Wed Aug 6 13:21:22 2025 -0400
Unit test modernization.
---
.../test/java/org/apache/juneau/Version_Test.java | 2 +-
.../java/org/apache/juneau/config/ConfigTest.java | 8 +-
.../java/org/apache/juneau/cp/BeanStore_Test.java | 94 +++++++++++-----------
.../apache/juneau/dto/swagger/Contact_Test.java | 7 +-
.../dto/swagger/ExternalDocumentation_Test.java | 7 +-
.../apache/juneau/dto/swagger/HeaderInfo_Test.java | 17 ++--
.../org/apache/juneau/dto/swagger/Info_Test.java | 7 +-
.../org/apache/juneau/dto/swagger/Items_Test.java | 4 +-
.../apache/juneau/dto/swagger/Operation_Test.java | 14 ++--
.../juneau/dto/swagger/ParameterInfo_Test.java | 6 +-
.../juneau/dto/swagger/ResponseInfo_Test.java | 4 +-
.../apache/juneau/dto/swagger/SchemaInfo_Test.java | 14 ++--
.../juneau/dto/swagger/SecurityScheme_Test.java | 2 +-
.../apache/juneau/dto/swagger/Swagger_Test.java | 22 ++---
.../apache/juneau/http/BasicHttpResource_Test.java | 20 ++---
.../org/apache/juneau/http/EntityTag_Test.java | 4 +-
.../org/apache/juneau/http/header/Accept_Test.java | 4 +-
.../juneau/http/response/HttpException_Test.java | 6 +-
.../juneau/objecttools/ObjectSorter_Test.java | 2 +-
19 files changed, 125 insertions(+), 119 deletions(-)
diff --git a/juneau-utest/src/test/java/org/apache/juneau/Version_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/Version_Test.java
index ee9198d85..c0e971ab7 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/Version_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/Version_Test.java
@@ -27,7 +27,7 @@ public class Version_Test {
@Test
public void a01_basic() {
- assertObject(of(null)).isNull();
+ assertNull(of(null));
assertObject(of("")).asString().is("0");
Version x = of("1.2.3");
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/config/ConfigTest.java
b/juneau-utest/src/test/java/org/apache/juneau/config/ConfigTest.java
index 4fe0b14ed..d76708176 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/config/ConfigTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/config/ConfigTest.java
@@ -252,11 +252,11 @@ public class ConfigTest {
Config c = init("a1=1,2", "a2= 2 , 3 ", "[S]", "b1=1", "b2=");
assertObject(c.get("a1").as(String[].class).orElse(null)).asJson().is("['1','2']");
assertObject(c.get("a2").as(String[].class).orElse(null)).asJson().is("['2','3']");
-
assertObject(c.get("a3").as(String[].class).orElse(null)).isNull();
+ assertNull(c.get("a3").as(String[].class).orElse(null));
assertObject(c.get("S/b1").as(String[].class).orElse(null)).asJson().is("['1']");
assertObject(c.get("S/b2").as(String[].class).orElse(null)).asJson().is("[]");
-
assertObject(c.get("S/b3").as(String[].class).orElse(null)).isNull();
-
assertObject(c.get("T/c1").as(String[].class).orElse(null)).isNull();
+ assertNull(c.get("S/b3").as(String[].class).orElse(null));
+ assertNull(c.get("T/c1").as(String[].class).orElse(null));
}
//====================================================================================================
@@ -1397,7 +1397,7 @@ public class ConfigTest {
assertObject(cf.get("A/a1").asStringArray().get()).asJson().is("['1','2','3']");
assertObject(cf.get("A/a2").asStringArray().orElse(new
String[]{"4","5","6"})).asJson().is("['4','5','6']");
assertObject(cf.get("B/a1").asStringArray().orElse(new
String[]{"7","8","9"})).asJson().is("['7','8','9']");
-
assertObject(cf.get("B/a1").asStringArray().orElse(null)).isNull();
+ assertNull(cf.get("B/a1").asStringArray().orElse(null));
cf = init("[A]", "a1 = 1 ,\n\t2 ,\n\t3 ");
assertObject(cf.get("A/a1").asStringArray().get()).asJson().is("['1','2','3']");
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/cp/BeanStore_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/cp/BeanStore_Test.java
index 57e7a90ee..1842edcc6 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/cp/BeanStore_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/cp/BeanStore_Test.java
@@ -517,21 +517,21 @@ class BeanStore_Test extends SimpleTestBase {
for (String m : array("createA0", "createA2", "createA3",
"createA4", "createA5", "createA6")) {
for (BeanStore b : array(b1c, b2c, b3c)) {
- assertObject(b.createMethodFinder(C.class,
x).find(m).run()).isNull();
- assertObject(b.createMethodFinder(C.class,
C1.class).find(m).run()).isNull();
+ assertNull(b.createMethodFinder(C.class,
x).find(m).run());
+ assertNull(b.createMethodFinder(C.class,
C1.class).find(m).run());
}
for (BeanStore b : array(b2c, b3c)) {
-
assertObject(b.createMethodFinder(C.class).find(m).run()).isNull();
+
assertNull(b.createMethodFinder(C.class).find(m).run());
}
}
assertObject(b1c.createMethodFinder(C.class,
x).find("createA1").run()).isNotNull();
- assertObject(b1c.createMethodFinder(C.class,
C1.class).find("createA1").run()).isNull();
+ assertNull(b1c.createMethodFinder(C.class,
C1.class).find("createA1").run());
assertObject(b2c.createMethodFinder(C.class).find("createA1").run()).isNotNull();
-
assertObject(b3c.createMethodFinder(C.class).find("createA1").run()).isNull();
+
assertNull(b3c.createMethodFinder(C.class).find("createA1").run());
assertThrown(()->b1c.createMethodFinder(C.class,
x).find("createA7").run()).asMessage().isContains("foo");
- assertObject(b1c.createMethodFinder(C.class,
C1.class).find("createA7").run()).isNull();
+ assertNull(b1c.createMethodFinder(C.class,
C1.class).find("createA7").run());
assertThrown(()->b2c.createMethodFinder(C.class).find("createA7").run()).asMessage().isContains("foo");
-
assertObject(b3c.createMethodFinder(C.class).find("createA7").run()).isNull();
+
assertNull(b3c.createMethodFinder(C.class).find("createA7").run());
}
// Static methods.
@@ -556,21 +556,21 @@ class BeanStore_Test extends SimpleTestBase {
for (String m : array("createB0", "createB2", "createB3",
"createB4", "createB5", "createB6")) {
for (BeanStore b : array(b1c, b2c, b3c)) {
- assertObject(b.createMethodFinder(C.class,
x).find(m).run()).isNull();
- assertObject(b.createMethodFinder(C.class,
C2.class).find(m).run()).isNull();
+ assertNull(b.createMethodFinder(C.class,
x).find(m).run());
+ assertNull(b.createMethodFinder(C.class,
C2.class).find(m).run());
}
for (BeanStore b : array(b2c, b3c)) {
-
assertObject(b.createMethodFinder(C.class).find(m).run()).isNull();
+
assertNull(b.createMethodFinder(C.class).find(m).run());
}
}
assertObject(b1c.createMethodFinder(C.class,
x).find("createB1").run()).isNotNull();
assertObject(b1c.createMethodFinder(C.class,
C2.class).find("createB1").run()).isNotNull();
assertObject(b2c.createMethodFinder(C.class).find("createB1").run()).isNotNull();
-
assertObject(b3c.createMethodFinder(C.class).find("createB1").run()).isNull();
+
assertNull(b3c.createMethodFinder(C.class).find("createB1").run());
assertThrown(()->b1c.createMethodFinder(C.class,
x).find("createB7").run()).asMessage().isContains("foo");
assertThrown(()->b1c.createMethodFinder(C.class,
C2.class).find("createB7").run()).asMessage().isContains("foo");
assertThrown(()->b2c.createMethodFinder(C.class).find("createB7").run()).asMessage().isContains("foo");
-
assertObject(b3c.createMethodFinder(C.class).find("createB7").run()).isNull();
+
assertNull(b3c.createMethodFinder(C.class).find("createB7").run());
}
// Bean matching.
@@ -593,11 +593,11 @@ class BeanStore_Test extends SimpleTestBase {
BeanStore b3c =
BeanStore.create().outer(this).parent(b3p).build();
for (BeanStore b : array(b1c, b2c, b3c)) {
- assertObject(b.createMethodFinder(C.class,
x).find("createC1").run()).isNull();
- assertObject(b.createMethodFinder(C.class,
x).find("createC2").run()).isNull();
- assertObject(b.createMethodFinder(C.class,
x).find("createC3").run().a).isNull();
- assertObject(b.createMethodFinder(C.class,
x).find("createC4").run()).isNull();
- assertObject(b.createMethodFinder(C.class,
x).find("createC5").run().a).isNull();
+ assertNull(b.createMethodFinder(C.class,
x).find("createC1").run());
+ assertNull(b.createMethodFinder(C.class,
x).find("createC2").run());
+ assertNull(b.createMethodFinder(C.class,
x).find("createC3").run().a);
+ assertNull(b.createMethodFinder(C.class,
x).find("createC4").run());
+ assertNull(b.createMethodFinder(C.class,
x).find("createC5").run().a);
assertObject(b.createMethodFinder(C.class,
x).find("createC6").run()).isNotNull();
}
@@ -608,24 +608,24 @@ class BeanStore_Test extends SimpleTestBase {
assertObject(b.createMethodFinder(C.class,
x).find("createC1").run()).isNotNull();
assertObject(b.createMethodFinder(C.class,
x).find("createC2").run()).isNotNull();
assertObject(b.createMethodFinder(C.class,
x).find("createC3").run().a).isNotNull();
- assertObject(b.createMethodFinder(C.class,
x).find("createC4").run()).isNull();
- assertObject(b.createMethodFinder(C.class,
x).find("createC5").run().a).isNull();
+ assertNull(b.createMethodFinder(C.class,
x).find("createC4").run());
+ assertNull(b.createMethodFinder(C.class,
x).find("createC5").run().a);
assertObject(b.createMethodFinder(C.class,
x).find("createC6").run()).isNotNull();
- assertObject(b.createMethodFinder(C.class,
C3.class).find("createC1").run()).isNull();
+ assertNull(b.createMethodFinder(C.class,
C3.class).find("createC1").run());
assertObject(b.createMethodFinder(C.class,
C3.class).find("createC2").run()).isNotNull();
assertObject(b.createMethodFinder(C.class,
C3.class).find("createC3").run().a).isNotNull();
- assertObject(b.createMethodFinder(C.class,
C3.class).find("createC4").run()).isNull();
- assertObject(b.createMethodFinder(C.class,
C3.class).find("createC5").run().a).isNull();
+ assertNull(b.createMethodFinder(C.class,
C3.class).find("createC4").run());
+ assertNull(b.createMethodFinder(C.class,
C3.class).find("createC5").run().a);
assertObject(b.createMethodFinder(C.class,
C3.class).find("createC6").run()).isNotNull();
}
assertObject(b2c.createMethodFinder(C.class).find("createC1").run()).isNotNull();
assertObject(b2c.createMethodFinder(C.class).find("createC2").run()).isNotNull();
assertObject(b2c.createMethodFinder(C.class).find("createC3").run().a).isNotNull();
-
assertObject(b2c.createMethodFinder(C.class).find("createC4").run()).isNull();
-
assertObject(b2c.createMethodFinder(C.class).find("createC5").run().a).isNull();
+
assertNull(b2c.createMethodFinder(C.class).find("createC4").run());
+
assertNull(b2c.createMethodFinder(C.class).find("createC5").run().a);
assertObject(b2c.createMethodFinder(C.class).find("createC6").run()).isNotNull();
for (String m :
array("createC1","createC2","createC3","createC4","createC5","createC6")) {
-
assertObject(b3c.createMethodFinder(C.class).find(m).run()).isNull();
+
assertNull(b3c.createMethodFinder(C.class).find(m).run());
}
b1p.clear().addSupplier(A1.class, A1::new);
@@ -634,24 +634,24 @@ class BeanStore_Test extends SimpleTestBase {
assertObject(b.createMethodFinder(C.class,
x).find("createC1").run()).isNotNull();
assertObject(b.createMethodFinder(C.class,
x).find("createC2").run()).isNotNull();
assertObject(b.createMethodFinder(C.class,
x).find("createC3").run().a).isNotNull();
- assertObject(b.createMethodFinder(C.class,
x).find("createC4").run()).isNull();
- assertObject(b.createMethodFinder(C.class,
x).find("createC5").run().a).isNull();
+ assertNull(b.createMethodFinder(C.class,
x).find("createC4").run());
+ assertNull(b.createMethodFinder(C.class,
x).find("createC5").run().a);
assertObject(b.createMethodFinder(C.class,
x).find("createC6").run()).isNotNull();
- assertObject(b.createMethodFinder(C.class,
C3.class).find("createC1").run()).isNull();
+ assertNull(b.createMethodFinder(C.class,
C3.class).find("createC1").run());
assertObject(b.createMethodFinder(C.class,
C3.class).find("createC2").run()).isNotNull();
assertObject(b.createMethodFinder(C.class,
C3.class).find("createC3").run().a).isNotNull();
- assertObject(b.createMethodFinder(C.class,
C3.class).find("createC4").run()).isNull();
- assertObject(b.createMethodFinder(C.class,
C3.class).find("createC5").run().a).isNull();
+ assertNull(b.createMethodFinder(C.class,
C3.class).find("createC4").run());
+ assertNull(b.createMethodFinder(C.class,
C3.class).find("createC5").run().a);
assertObject(b.createMethodFinder(C.class,
C3.class).find("createC6").run()).isNotNull();
}
assertObject(b2c.createMethodFinder(C.class).find("createC1").run()).isNotNull();
assertObject(b2c.createMethodFinder(C.class).find("createC2").run()).isNotNull();
assertObject(b2c.createMethodFinder(C.class).find("createC3").run().a).isType(A1.class);
-
assertObject(b2c.createMethodFinder(C.class).find("createC4").run()).isNull();
-
assertObject(b2c.createMethodFinder(C.class).find("createC5").run().a).isNull();
+
assertNull(b2c.createMethodFinder(C.class).find("createC4").run());
+
assertNull(b2c.createMethodFinder(C.class).find("createC5").run().a);
assertObject(b2c.createMethodFinder(C.class).find("createC6").run()).isNotNull();
for (String m :
array("createC1","createC2","createC3","createC4","createC5","createC6")) {
-
assertObject(b3c.createMethodFinder(C.class).find(m).run()).isNull();
+
assertNull(b3c.createMethodFinder(C.class).find(m).run());
}
b1p.clear().add(A1.class, null);
@@ -659,25 +659,25 @@ class BeanStore_Test extends SimpleTestBase {
for (BeanStore b : array(b1c, b2c)) {
assertObject(b.createMethodFinder(C.class,
x).find("createC1").run()).isNotNull();
assertObject(b.createMethodFinder(C.class,
x).find("createC2").run()).isNotNull();
- assertObject(b.createMethodFinder(C.class,
x).find("createC3").run().a).isNull();
- assertObject(b.createMethodFinder(C.class,
x).find("createC4").run()).isNull();
- assertObject(b.createMethodFinder(C.class,
x).find("createC5").run().a).isNull();
+ assertNull(b.createMethodFinder(C.class,
x).find("createC3").run().a);
+ assertNull(b.createMethodFinder(C.class,
x).find("createC4").run());
+ assertNull(b.createMethodFinder(C.class,
x).find("createC5").run().a);
assertObject(b.createMethodFinder(C.class,
x).find("createC6").run()).isNotNull();
- assertObject(b.createMethodFinder(C.class,
C3.class).find("createC1").run()).isNull();
+ assertNull(b.createMethodFinder(C.class,
C3.class).find("createC1").run());
assertObject(b.createMethodFinder(C.class,
C3.class).find("createC2").run()).isNotNull();
- assertObject(b.createMethodFinder(C.class,
C3.class).find("createC3").run().a).isNull();
- assertObject(b.createMethodFinder(C.class,
C3.class).find("createC4").run()).isNull();
- assertObject(b.createMethodFinder(C.class,
C3.class).find("createC5").run().a).isNull();
+ assertNull(b.createMethodFinder(C.class,
C3.class).find("createC3").run().a);
+ assertNull(b.createMethodFinder(C.class,
C3.class).find("createC4").run());
+ assertNull(b.createMethodFinder(C.class,
C3.class).find("createC5").run().a);
assertObject(b.createMethodFinder(C.class,
C3.class).find("createC6").run()).isNotNull();
}
assertObject(b2c.createMethodFinder(C.class).find("createC1").run()).isNotNull();
assertObject(b2c.createMethodFinder(C.class).find("createC2").run()).isNotNull();
-
assertObject(b2c.createMethodFinder(C.class).find("createC3").run().a).isNull();
-
assertObject(b2c.createMethodFinder(C.class).find("createC4").run()).isNull();
-
assertObject(b2c.createMethodFinder(C.class).find("createC5").run().a).isNull();
+
assertNull(b2c.createMethodFinder(C.class).find("createC3").run().a);
+
assertNull(b2c.createMethodFinder(C.class).find("createC4").run());
+
assertNull(b2c.createMethodFinder(C.class).find("createC5").run().a);
assertObject(b2c.createMethodFinder(C.class).find("createC6").run()).isNotNull();
for (String m :
array("createC1","createC2","createC3","createC4","createC5","createC6")) {
-
assertObject(b3c.createMethodFinder(C.class).find(m).run()).isNull();
+
assertNull(b3c.createMethodFinder(C.class).find(m).run());
}
b1p.clear().addBean(A1.class, new A1()).add(A1.class, new A1(),
"Foo");
@@ -689,7 +689,7 @@ class BeanStore_Test extends SimpleTestBase {
assertObject(b.createMethodFinder(C.class,
x).find("createC4").run()).isNotNull();
assertObject(b.createMethodFinder(C.class,
x).find("createC5").run().a).isNotNull();
assertObject(b.createMethodFinder(C.class,
x).find("createC6").run()).isNotNull();
- assertObject(b.createMethodFinder(C.class,
C3.class).find("createC1").run()).isNull();
+ assertNull(b.createMethodFinder(C.class,
C3.class).find("createC1").run());
assertObject(b.createMethodFinder(C.class,
C3.class).find("createC2").run()).isNotNull();
assertObject(b.createMethodFinder(C.class,
C3.class).find("createC3").run().a).isNotNull();
assertObject(b.createMethodFinder(C.class,
C3.class).find("createC4").run()).isNotNull();
@@ -703,7 +703,7 @@ class BeanStore_Test extends SimpleTestBase {
assertObject(b2c.createMethodFinder(C.class).find("createC5").run().a).isNotNull();
assertObject(b2c.createMethodFinder(C.class).find("createC6").run()).isNotNull();
for (String m :
array("createC1","createC2","createC3","createC4","createC5","createC6")) {
-
assertObject(b3c.createMethodFinder(C.class).find(m).run()).isNull();
+
assertNull(b3c.createMethodFinder(C.class).find(m).run());
}
}
@@ -782,7 +782,7 @@ class BeanStore_Test extends SimpleTestBase {
BeanStore bs = BeanStore.create().outer(new
BeanStore_Test()).build();
assertObject(bs.createBean(D1a.class).run()).isNotNull();
assertObject(bs.createBean(D1b.class).run()).isNotNull();
- assertObject(bs.createBean(null).run()).isNull();
+ assertNull(bs.createBean(null).run());
}
public static class D2 {
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/dto/swagger/Contact_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/dto/swagger/Contact_Test.java
index e57c76214..ff05b3b08 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/dto/swagger/Contact_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/dto/swagger/Contact_Test.java
@@ -13,6 +13,7 @@
package org.apache.juneau.dto.swagger;
import static org.apache.juneau.assertions.Assertions.*;
+import static org.junit.jupiter.api.Assertions.*;
import static org.junit.runners.MethodSorters.*;
import java.net.*;
@@ -69,9 +70,9 @@ public class Contact_Test {
assertObject(t.get("$ref",
String.class)).isType(String.class).is("qux");
t.set("null", null).set(null, "null");
- assertObject(t.get("null", Object.class)).isNull();
- assertObject(t.get(null, Object.class)).isNull();
- assertObject(t.get("foo", Object.class)).isNull();
+ assertNull(t.get("null", Object.class));
+ assertNull(t.get(null, Object.class));
+ assertNull(t.get("foo", Object.class));
assertObject(JsonParser.DEFAULT.parse("{name:'foo',url:'bar',email:'baz','$ref':'qux'}",
Contact.class)).asJson().is("{name:'foo',url:'bar',email:'baz','$ref':'qux'}");
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/dto/swagger/ExternalDocumentation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/dto/swagger/ExternalDocumentation_Test.java
index c2d377cc9..cbb9602c8 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/dto/swagger/ExternalDocumentation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/dto/swagger/ExternalDocumentation_Test.java
@@ -13,6 +13,7 @@
package org.apache.juneau.dto.swagger;
import static org.apache.juneau.assertions.Assertions.*;
+import static org.junit.jupiter.api.Assertions.*;
import static org.junit.runners.MethodSorters.*;
import java.net.*;
@@ -64,9 +65,9 @@ public class ExternalDocumentation_Test {
assertObject(t.get("$ref",
String.class)).isType(String.class).is("baz");
t.set("null", null).set(null, "null");
- assertObject(t.get("null", Object.class)).isNull();
- assertObject(t.get(null, Object.class)).isNull();
- assertObject(t.get("foo", Object.class)).isNull();
+ assertNull(t.get("null", Object.class));
+ assertNull(t.get(null, Object.class));
+ assertNull(t.get("foo", Object.class));
assertObject(JsonParser.DEFAULT.parse("{description:'foo',url:'bar','$ref':'baz'}",
ExternalDocumentation.class)).asJson().is("{description:'foo',url:'bar','$ref':'baz'}");
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/dto/swagger/HeaderInfo_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/dto/swagger/HeaderInfo_Test.java
index 1cae85dca..159166f74 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/dto/swagger/HeaderInfo_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/dto/swagger/HeaderInfo_Test.java
@@ -15,6 +15,7 @@ package org.apache.juneau.dto.swagger;
import static org.apache.juneau.assertions.Assertions.*;
import static org.apache.juneau.bean.swagger.SwaggerBuilder.*;
import static org.apache.juneau.utest.utils.Utils2.*;
+import static org.junit.jupiter.api.Assertions.*;
import static org.junit.runners.MethodSorters.*;
import java.util.*;
@@ -42,12 +43,12 @@ public class HeaderInfo_Test {
assertString(t.setFormat("foo").getFormat()).is("foo");
assertString(t.setFormat(null).getFormat()).isNull();
assertObject(t.setItems(items("foo")).getItems()).asJson().is("{type:'foo'}");
- assertObject(t.setItems((Items)null).getItems()).isNull();
+ assertNull(t.setItems((Items)null).getItems());
assertString(t.setCollectionFormat("foo").getCollectionFormat()).is("foo");
assertString(t.setCollectionFormat(null).getCollectionFormat()).isNull();
assertString(t.setDefault("foo").getDefault()).is("foo");
assertObject(t.setDefault(new
StringBuilder("foo")).getDefault()).isType(StringBuilder.class).asString().is("foo");
- assertObject(t.setDefault(null).getDefault()).isNull();
+ assertNull(t.setDefault(null).getDefault());
assertObject(t.setMaximum(123).getMaximum()).isType(Integer.class).is(123);
assertObject(t.setMaximum(123f).getMaximum()).isType(Float.class).is(123f);
assertObject(t.setExclusiveMaximum(true).getExclusiveMaximum()).isType(Boolean.class).is(true);
@@ -64,16 +65,16 @@ public class HeaderInfo_Test {
assertObject(t.setEnum(set("foo","bar")).getEnum()).isType(Set.class).asJson().is("['foo','bar']");
assertObject(t.setEnum(set()).getEnum()).isType(Set.class).asJson().is("[]");
assertObject(t.setEnum("foo","bar").getEnum()).isType(Set.class).asJson().is("['foo','bar']");
- assertObject(t.setEnum((Set<Object>)null).getEnum()).isNull();
+ assertNull(t.setEnum((Set<Object>)null).getEnum());
assertObject(t.addEnum("foo","bar").getEnum()).isType(Set.class).asJson().is("['foo','bar']");
assertObject(t.addEnum("baz").getEnum()).isType(Set.class).asJson().is("['foo','bar','baz']");
assertObject(t.setMultipleOf(123).getMultipleOf()).isType(Integer.class).is(123);
assertObject(t.setMultipleOf(123f).getMultipleOf()).isType(Float.class).is(123f);
assertObject(t.setExample("foo").getExample()).isType(String.class).is("foo");
assertObject(t.setExample(123f).getExample()).isType(Float.class).is(123f);
- assertObject(t.setExample((String)null).getExample()).isNull();
+ assertNull(t.setExample((String)null).getExample());
assertString(t.setRef("foo").getRef()).is("foo");
- assertObject(t.setRef(null).getRef()).isNull();
+ assertNull(t.setRef(null).getRef());
}
/**
@@ -177,9 +178,9 @@ public class HeaderInfo_Test {
assertObject(t.get("$ref",
Object.class)).isType(String.class).is("ref");
t.set("null", null).set(null, "null");
- assertObject(t.get("null", Object.class)).isNull();
- assertObject(t.get(null, Object.class)).isNull();
- assertObject(t.get("foo", Object.class)).isNull();
+ assertNull(t.get("null", Object.class));
+ assertNull(t.get(null, Object.class));
+ assertNull(t.get("foo", Object.class));
String s =
"{description:'d',type:'j',format:'g',items:{type:'h'},collectionFormat:'c','default':'a',maximum:123.0,exclusiveMaximum:true,minimum:123.0,exclusiveMinimum:true,maxLength:123,minLength:123,pattern:'i',maxItems:123,minItems:123,uniqueItems:true,'enum':['b'],multipleOf:123.0,'$ref':'ref',example:'e'}";
assertObject(JsonParser.DEFAULT.parse(s,
HeaderInfo.class)).asJson().is(s);
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/dto/swagger/Info_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/dto/swagger/Info_Test.java
index 033b8010b..289376068 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/dto/swagger/Info_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/dto/swagger/Info_Test.java
@@ -14,6 +14,7 @@ package org.apache.juneau.dto.swagger;
import static org.apache.juneau.assertions.Assertions.*;
import static org.apache.juneau.bean.swagger.SwaggerBuilder.*;
+import static org.junit.jupiter.api.Assertions.*;
import static org.junit.runners.MethodSorters.*;
import org.apache.juneau.bean.swagger.*;
@@ -101,9 +102,9 @@ public class Info_Test {
assertObject(t.get("$ref",
Object.class)).isType(StringBuilder.class);
t.set("null", null).set(null, "null");
- assertObject(t.get("null", Object.class)).isNull();
- assertObject(t.get(null, Object.class)).isNull();
- assertObject(t.get("foo", Object.class)).isNull();
+ assertNull(t.get("null", Object.class));
+ assertNull(t.get(null, Object.class));
+ assertNull(t.get("foo", Object.class));
String s =
"{title:'e',description:'b',version:'f',contact:{name:'a'},license:{name:'c'},termsOfService:'d','$ref':'ref'}";
assertObject(JsonParser.DEFAULT.parse(s,
Info.class)).asJson().is(s);
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/dto/swagger/Items_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/dto/swagger/Items_Test.java
index ad6795f3e..c44cad28b 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/dto/swagger/Items_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/dto/swagger/Items_Test.java
@@ -45,7 +45,7 @@ public class Items_Test {
assertString(t.setCollectionFormat(null).getCollectionFormat()).isNull();
assertObject(t.setDefault("foo").getDefault()).is("foo");
assertObject(t.setDefault(new
StringBuilder("foo")).getDefault()).isType(StringBuilder.class).asString().is("foo");
- assertObject(t.setDefault(null).getDefault()).isNull();
+ assertNull(t.setDefault(null).getDefault());
assertObject(t.setMaximum(123).getMaximum()).isType(Integer.class).is(123);
assertObject(t.setMaximum(123f).getMaximum()).isType(Float.class).is(123f);
assertObject(t.setExclusiveMaximum(true).getExclusiveMaximum()).isType(Boolean.class).is(true);
@@ -62,7 +62,7 @@ public class Items_Test {
assertObject(t.setEnum(set("foo","bar")).getEnum()).isType(Set.class).asJson().is("['foo','bar']");
assertObject(t.setEnum("foo","baz").getEnum()).isType(Set.class).asJson().is("['foo','baz']");
assertObject(t.setEnum(set()).getEnum()).isType(Set.class).asJson().is("[]");
-
assertObject(t.setEnum((Collection<Object>)null).getEnum()).isNull();
+ assertNull(t.setEnum((Collection<Object>)null).getEnum());
assertObject(t.addEnum("foo","bar").getEnum()).isType(Set.class).asJson().is("['foo','bar']");
assertObject(t.addEnum("baz").getEnum()).isType(Set.class).asJson().is("['foo','bar','baz']");
assertObject(t.setMultipleOf(123).getMultipleOf()).isType(Integer.class).is(123);
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/dto/swagger/Operation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/dto/swagger/Operation_Test.java
index d6308494c..7dfc89455 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/dto/swagger/Operation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/dto/swagger/Operation_Test.java
@@ -40,29 +40,29 @@ public class Operation_Test {
assertObject(t.setTags(set("foo","bar")).getTags()).isType(Set.class).asJson().is("['foo','bar']");
assertObject(t.setTags("bar","baz").getTags()).isType(Set.class).asJson().is("['bar','baz']");
assertObject(t.setTags(set()).getTags()).isType(Set.class).asJson().is("[]");
-
assertObject(t.setTags((Collection<String>)null).getTags()).isNull();
+ assertNull(t.setTags((Collection<String>)null).getTags());
assertString(t.setSummary("foo").getSummary()).is("foo");
assertString(t.setDescription("foo").getDescription()).is("foo");
assertObject(t.setExternalDocs(externalDocumentation("foo")).getExternalDocs()).isType(ExternalDocumentation.class).asJson().is("{url:'foo'}");
assertString(t.setOperationId("foo").getOperationId()).is("foo");
assertObject(t.setConsumes(set(MediaType.of("text/foo"))).getConsumes()).isType(Set.class).asJson().is("['text/foo']");
assertObject(t.setConsumes(set()).getConsumes()).isType(Set.class).asJson().is("[]");
-
assertObject(t.setConsumes((Collection<MediaType>)null).getConsumes()).isNull();
+
assertNull(t.setConsumes((Collection<MediaType>)null).getConsumes());
assertObject(t.setProduces(set(MediaType.of("text/foo"))).getProduces()).isType(Set.class).asJson().is("['text/foo']");
assertObject(t.setProduces(set()).getProduces()).isType(Set.class).asJson().is("[]");
-
assertObject(t.setProduces((Collection<MediaType>)null).getProduces()).isNull();
+
assertNull(t.setProduces((Collection<MediaType>)null).getProduces());
assertObject(t.setParameters(set(parameterInfo("foo","bar"))).getParameters()).isType(List.class).asJson().is("[{'in':'foo',name:'bar'}]");
assertObject(t.setParameters(set()).getParameters()).isType(List.class).asJson().is("[]");
-
assertObject(t.setParameters((Collection<ParameterInfo>)null).getParameters()).isNull();
+
assertNull(t.setParameters((Collection<ParameterInfo>)null).getParameters());
assertObject(t.setResponses(map("123",responseInfo("bar"))).getResponses()).isType(Map.class).asJson().is("{'123':{description:'bar'}}");
assertObject(t.setResponses(map()).getResponses()).isType(Map.class).asJson().is("{}");
-
assertObject(t.setResponses((Map<String,ResponseInfo>)null).getResponses()).isNull();
+
assertNull(t.setResponses((Map<String,ResponseInfo>)null).getResponses());
assertObject(t.setSchemes(set("foo")).getSchemes()).isType(Set.class).asJson().is("['foo']");
assertObject(t.setSchemes(set()).getSchemes()).isType(Set.class).asJson().is("[]");
-
assertObject(t.setSchemes((Set<String>)null).getSchemes()).isNull();
+ assertNull(t.setSchemes((Set<String>)null).getSchemes());
assertObject(t.setSecurity(alist(map("foo",alist("bar")))).getSecurity()).isType(List.class).asJson().is("[{foo:['bar']}]");
assertObject(t.setSecurity(alist()).getSecurity()).isType(List.class).asJson().is("[]");
-
assertObject(t.setSecurity((List<Map<String,List<String>>>)null).getSecurity()).isNull();
+
assertNull(t.setSecurity((List<Map<String,List<String>>>)null).getSecurity());
assertObject(t.setDeprecated(true).getDeprecated()).isType(Boolean.class).is(true);
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/dto/swagger/ParameterInfo_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/dto/swagger/ParameterInfo_Test.java
index 49e20e5d4..503bff424 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/dto/swagger/ParameterInfo_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/dto/swagger/ParameterInfo_Test.java
@@ -37,7 +37,7 @@ public class ParameterInfo_Test {
public void a01_gettersAndSetters() {
ParameterInfo t = new ParameterInfo();
assertString(t.setName("foo").getName()).is("foo");
- assertObject(t.setName(null).getName()).isNull();
+ assertNull(t.setName(null).getName());
assertString(t.setIn("foo").getIn()).is("foo");
assertString(t.setIn(null).getIn()).isNull();
assertString(t.setDescription("foo").getDescription()).is("foo");
@@ -54,7 +54,7 @@ public class ParameterInfo_Test {
assertString(t.setCollectionFormat(null).getCollectionFormat()).isNull();
assertString(t.setDefault("foo").getDefault()).is("foo");
assertObject(t.setDefault(new
StringBuilder("foo")).getDefault()).isType(StringBuilder.class).asString().is("foo");
- assertObject(t.setDefault(null).getDefault()).isNull();
+ assertNull(t.setDefault(null).getDefault());
assertObject(t.setMaximum(123).getMaximum()).isType(Integer.class).is(123);
assertObject(t.setMaximum(123f).getMaximum()).isType(Float.class).is(123f);
assertObject(t.setExclusiveMaximum(true).getExclusiveMaximum()).isType(Boolean.class).is(true);
@@ -70,7 +70,7 @@ public class ParameterInfo_Test {
assertObject(t.setUniqueItems(true).getUniqueItems()).isType(Boolean.class).is(true);
assertObject(t.setEnum(set("foo","bar")).getEnum()).isType(Set.class).asJson().is("['foo','bar']");
assertObject(t.setEnum(set()).getEnum()).isType(Set.class).asJson().is("[]");
-
assertObject(t.setEnum((Collection<Object>)null).getEnum()).isNull();
+ assertNull(t.setEnum((Collection<Object>)null).getEnum());
assertObject(t.addEnum("foo","bar").getEnum()).isType(Set.class).asJson().is("['foo','bar']");
assertObject(t.addEnum("baz").getEnum()).isType(Set.class).asJson().is("['foo','bar','baz']");
assertObject(t.setMultipleOf(123).getMultipleOf()).isType(Integer.class).is(123);
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/dto/swagger/ResponseInfo_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/dto/swagger/ResponseInfo_Test.java
index 0a963801f..5fb3fc48e 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/dto/swagger/ResponseInfo_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/dto/swagger/ResponseInfo_Test.java
@@ -42,10 +42,10 @@ public class ResponseInfo_Test {
assertObject(t.setHeaders(map("foo",headerInfo("bar"))).getHeaders()).isType(Map.class).asJson().is("{foo:{type:'bar'}}");
assertObject(t.setHeaders(map("foo",headerInfo("bar"))).getHeaders().get("foo")).isType(HeaderInfo.class);
assertObject(t.setHeaders(map()).getHeaders()).isType(Map.class).asJson().is("{}");
-
assertObject(t.setHeaders((Map<String,HeaderInfo>)null).getHeaders()).isNull();
+
assertNull(t.setHeaders((Map<String,HeaderInfo>)null).getHeaders());
assertObject(t.setExamples(map("foo","bar","baz",alist("qux"))).getExamples()).isType(Map.class).asJson().is("{foo:'bar',baz:['qux']}");
assertObject(t.setExamples(map()).getExamples()).isType(Map.class).asJson().is("{}");
-
assertObject(t.setExamples((Map<String,Object>)null).getExamples()).isNull();
+
assertNull(t.setExamples((Map<String,Object>)null).getExamples());
assertObject(t.setExamples(map("foo","bar","baz",alist("qux"))).getExamples()).isType(Map.class).asJson().is("{foo:'bar',baz:['qux']}");
assertObject(t.setExamples(map()).addExample("text/a",
"a").addExample("text/b", null).addExample(null,
"c").getExamples()).asJson().is("{'text/a':'a','text/b':null,null:'c'}");
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/dto/swagger/SchemaInfo_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/dto/swagger/SchemaInfo_Test.java
index 7abe9af89..d3e7ac9cd 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/dto/swagger/SchemaInfo_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/dto/swagger/SchemaInfo_Test.java
@@ -44,7 +44,7 @@ public class SchemaInfo_Test {
assertString(t.setDescription(null).getDescription()).isNull();
assertString(t.setDefault("foo").getDefault()).is("foo");
assertObject(t.setDefault(new
StringBuilder("foo")).getDefault()).isType(StringBuilder.class).asString().is("foo");
- assertObject(t.setDefault(null).getDefault()).isNull();
+ assertNull(t.setDefault(null).getDefault());
assertObject(t.setMultipleOf(123).getMultipleOf()).isType(Integer.class).is(123);
assertObject(t.setMultipleOf(123f).getMultipleOf()).isType(Float.class).is(123f);
assertObject(t.setMaximum(123).getMaximum()).isType(Integer.class).is(123);
@@ -63,10 +63,10 @@ public class SchemaInfo_Test {
assertObject(t.setMaxProperties(123).getMaxProperties()).isType(Integer.class).is(123);
assertObject(t.setMinProperties(123).getMinProperties()).isType(Integer.class).is(123);
assertObject(t.setRequiredProperties("x").getRequiredProperties()).isType(Set.class).asJson().is("['x']");
-
assertObject(t.setRequiredProperties((Collection<String>)null).getRequiredProperties()).isNull();
+
assertNull(t.setRequiredProperties((Collection<String>)null).getRequiredProperties());
assertObject(t.setEnum(set("foo","bar")).getEnum()).isType(Set.class).asJson().is("['foo','bar']");
assertObject(t.setEnum(set()).getEnum()).isType(Set.class).asJson().is("[]");
-
assertObject(t.setEnum((Collection<Object>)null).getEnum()).isNull();
+ assertNull(t.setEnum((Collection<Object>)null).getEnum());
assertObject(t.addEnum("foo","bar").getEnum()).isType(Set.class).asJson().is("['foo','bar']");
assertObject(t.addEnum("baz").getEnum()).isType(Set.class).asJson().is("['foo','bar','baz']");
assertString(t.setType("foo").getType()).is("foo");
@@ -74,14 +74,14 @@ public class SchemaInfo_Test {
assertObject(t.setItems(items("foo")).getItems()).asJson().is("{type:'foo'}");
assertObject(t.setAllOf(set("foo","bar")).getAllOf()).isType(Set.class).asJson().is("['foo','bar']");
assertObject(t.setAllOf(set()).getAllOf()).isType(Set.class).asJson().is("[]");
-
assertObject(t.setAllOf((Collection<Object>)null).getAllOf()).isNull();
+ assertNull(t.setAllOf((Collection<Object>)null).getAllOf());
assertObject(t.addAllOf("foo","bar").getAllOf()).isType(Set.class).asJson().is("['foo','bar']");
assertObject(t.setProperties(map("foo",new
SchemaInfo().setType("foo"))).getProperties()).isType(Map.class).asJson().is("{foo:{type:'foo'}}");
assertObject(t.setProperties(map()).getProperties()).isType(Map.class).asJson().is("{}");
-
assertObject(t.setProperties((Map<String,SchemaInfo>)null).getProperties()).isNull();
+
assertNull(t.setProperties((Map<String,SchemaInfo>)null).getProperties());
assertObject(t.setAdditionalProperties(new
SchemaInfo().setType("foo")).getAdditionalProperties()).isType(SchemaInfo.class).asJson().is("{type:'foo'}");
assertObject(t.setAdditionalProperties(new
SchemaInfo()).getAdditionalProperties()).isType(SchemaInfo.class).asJson().is("{}");
-
assertObject(t.setAdditionalProperties((SchemaInfo)null).getAdditionalProperties()).isNull();
+
assertNull(t.setAdditionalProperties((SchemaInfo)null).getAdditionalProperties());
assertString(t.setDiscriminator("foo").getDiscriminator()).is("foo");
assertString(t.setDiscriminator(null).getDiscriminator()).isNull();
assertObject(t.setReadOnly(true).getReadOnly()).isType(Boolean.class).is(true);
@@ -89,7 +89,7 @@ public class SchemaInfo_Test {
assertObject(t.setExternalDocs(externalDocumentation("foo")).getExternalDocs()).asJson().is("{url:'foo'}");
assertObject(t.setExample("foo").getExample()).is("foo");
assertObject(t.setExample(123).getExample()).is(123);
- assertObject(t.setExample(null).getExample()).isNull();
+ assertNull(t.setExample(null).getExample());
}
/**
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/dto/swagger/SecurityScheme_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/dto/swagger/SecurityScheme_Test.java
index b3a98f98e..9ec2fa454 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/dto/swagger/SecurityScheme_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/dto/swagger/SecurityScheme_Test.java
@@ -51,7 +51,7 @@ public class SecurityScheme_Test {
assertString(t.setTokenUrl(null).getTokenUrl()).isNull();
assertObject(t.setScopes(map("foo","bar")).getScopes()).isType(Map.class).asJson().is("{foo:'bar'}");
assertObject(t.setScopes(map()).getScopes()).isType(Map.class).asJson().is("{}");
-
assertObject(t.setScopes((Map<String,String>)null).getScopes()).isNull();
+ assertNull(t.setScopes((Map<String,String>)null).getScopes());
}
/**
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/dto/swagger/Swagger_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/dto/swagger/Swagger_Test.java
index c0785a6a0..4d22c1318 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/dto/swagger/Swagger_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/dto/swagger/Swagger_Test.java
@@ -47,40 +47,40 @@ public class Swagger_Test {
assertString(t.setBasePath(null).getBasePath()).isNull();
assertObject(t.setSchemes(set("foo","bar")).getSchemes()).isType(Set.class).asJson().is("['foo','bar']");
assertObject(t.setSchemes(set()).getSchemes()).isType(Set.class).asJson().is("[]");
-
assertObject(t.setSchemes((Collection<String>)null).getSchemes()).isNull();
+ assertNull(t.setSchemes((Collection<String>)null).getSchemes());
assertObject(t.setConsumes(set(MediaType.of("text/foo"))).getConsumes()).isType(Set.class).asJson().is("['text/foo']");
assertObject(t.setConsumes(set()).getConsumes()).isType(Set.class).asJson().is("[]");
-
assertObject(t.setConsumes((Collection<MediaType>)null).getConsumes()).isNull();
+
assertNull(t.setConsumes((Collection<MediaType>)null).getConsumes());
assertObject(t.setProduces(set(MediaType.of("text/foo"))).getProduces()).isType(Set.class).asJson().is("['text/foo']");
assertObject(t.setProduces(set()).getProduces()).isType(Set.class).asJson().is("[]");
-
assertObject(t.setProduces((Collection<MediaType>)null).getProduces()).isNull();
+
assertNull(t.setProduces((Collection<MediaType>)null).getProduces());
assertObject(t.setPaths(map("foo", new
OperationMap().append("bar",operation().setSummary("baz")))).getPaths()).isType(Map.class).asJson().is("{foo:{bar:{summary:'baz'}}}");
- assertObject(t.setPaths(map()).getPaths()).isNull();
-
assertObject(t.setPaths((Map<String,OperationMap>)null).getPaths()).isNull();
+ assertNull(t.setPaths(map()).getPaths());
+
assertNull(t.setPaths((Map<String,OperationMap>)null).getPaths());
assertObject(t.setPaths(null).addPath("a", "a1",
operation().setDescription("a2")).addPath("b", null,
null).getPaths()).asJson().is("{a:{a1:{description:'a2'}},b:{null:null}}");
assertObject(t.setDefinitions(map("foo",JsonMap.of("type","bar"))).getDefinitions()).isType(Map.class).asJson().is("{foo:{type:'bar'}}");
assertObject(t.setDefinitions(map()).getDefinitions()).isType(Map.class).asJson().is("{}");
-
assertObject(t.setDefinitions((Map<String,JsonMap>)null).getDefinitions()).isNull();
+
assertNull(t.setDefinitions((Map<String,JsonMap>)null).getDefinitions());
assertObject(t.setDefinitions(null).addDefinition("a",
JsonMap.of("type","a1")).addDefinition("b", (JsonMap)null).addDefinition(null,
JsonMap.of("type",
"c1")).getDefinitions()).asJson().is("{a:{type:'a1'},b:null,null:{type:'c1'}}");
assertObject(t.setParameters(map("foo",parameterInfo().setName("bar"))).getParameters()).isType(Map.class).asJson().is("{foo:{name:'bar'}}");
assertObject(t.setParameters(map()).getParameters()).isType(Map.class).asJson().is("{}");
-
assertObject(t.setParameters((Map<String,ParameterInfo>)null).getParameters()).isNull();
+
assertNull(t.setParameters((Map<String,ParameterInfo>)null).getParameters());
assertObject(t.setParameters(null).addParameter("a",
parameterInfo().setIn("a1")).addParameter("b", null).addParameter(null,
parameterInfo().setIn("c1")).getParameters()).asJson().is("{a:{'in':'a1'},b:null,null:{'in':'c1'}}");
assertObject(t.setResponses(map("123",responseInfo("bar"))).getResponses()).isType(Map.class).asJson().is("{'123':{description:'bar'}}");
assertObject(t.setResponses(map()).getResponses()).isType(Map.class).asJson().is("{}");
-
assertObject(t.setResponses((Map<String,ResponseInfo>)null).getResponses()).isNull();
+
assertNull(t.setResponses((Map<String,ResponseInfo>)null).getResponses());
assertObject(t.setResponses(null).addResponse("a",
responseInfo("a1")).addResponse(null, responseInfo("b1")).addResponse("c",
null).getResponses()).asJson().is("{a:{description:'a1'},null:{description:'b1'},c:null}");
assertObject(t.setSecurityDefinitions(map("foo",securityScheme("bar"))).getSecurityDefinitions()).isType(Map.class).asJson().is("{foo:{type:'bar'}}");
assertObject(t.setSecurityDefinitions(map()).getSecurityDefinitions()).isType(Map.class).asJson().is("{}");
-
assertObject(t.setSecurityDefinitions((Map<String,SecurityScheme>)null).getSecurityDefinitions()).isNull();
+
assertNull(t.setSecurityDefinitions((Map<String,SecurityScheme>)null).getSecurityDefinitions());
assertObject(t.setSecurityDefinitions(null).addSecurityDefinition("a",
securityScheme("a1")).addSecurityDefinition("b",
null).addSecurityDefinition(null,
securityScheme("c1")).getSecurityDefinitions()).asJson().is("{a:{type:'a1'},b:null,null:{type:'c1'}}");
assertObject(t.setSecurity(set(map("foo",alist("bar")))).getSecurity()).isType(List.class).asJson().is("[{foo:['bar']}]");
assertObject(t.setSecurity(set()).getSecurity()).isType(List.class).asJson().is("[]");
- assertObject(t.setSecurity((Collection<Map<String,
List<String>>>)null).getSecurity()).isNull();
+ assertNull(t.setSecurity((Collection<Map<String,
List<String>>>)null).getSecurity());
assertObject(t.setSecurity(null).addSecurity("a", "a1",
"a2").addSecurity("b", (String)null).addSecurity(null, "d1",
"d2").getSecurity()).asJson().is("[{a:['a1','a2']},{b:[null]},{null:['d1','d2']}]");
assertObject(t.setTags(set(tag("foo"))).getTags()).isType(Set.class).asJson().is("[{name:'foo'}]");
assertObject(t.setTags(set()).getTags()).isType(Set.class).asJson().is("[]");
-
assertObject(t.setTags((Collection<Tag>)null).getTags()).isNull();
+ assertNull(t.setTags((Collection<Tag>)null).getTags());
assertObject(t.setExternalDocs(externalDocumentation("foo")).getExternalDocs()).asJson().is("{url:'foo'}");
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/BasicHttpResource_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/BasicHttpResource_Test.java
index fe003f375..b7ea99554 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/BasicHttpResource_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/BasicHttpResource_Test.java
@@ -104,8 +104,8 @@ class BasicHttpResource_Test extends SimpleTestBase {
assertString(x.getContentEncoding().getValue()).is("identity");
x = stringResource("foo",
null).setContentEncoding((String)null);
- assertObject(x.getContentType()).isNull();
- assertObject(x.getContentEncoding()).isNull();
+ assertNull(x.getContentType());
+ assertNull(x.getContentEncoding());
}
@Test void a02_header_String_Object() {
@@ -121,8 +121,8 @@ class BasicHttpResource_Test extends SimpleTestBase {
HeaderList x =
stringResource("foo").addHeaders(header("Foo","bar")).addHeaders(header("Foo","baz")).addHeaders(header("Bar",null)).getHeaders();
assertString(x.getFirst("Foo").get().toString()).is("Foo: bar");
assertString(x.getLast("Foo").get().toString()).is("Foo: baz");
- assertObject(x.getFirst("Bar").get().getValue()).isNull();
- assertObject(x.getLast("Bar").get().getValue()).isNull();
+ assertNull(x.getFirst("Bar").get().getValue());
+ assertNull(x.getLast("Bar").get().getValue());
assertObject(x.getAll()).asJson().is("['Foo: bar','Foo:
baz','Bar: null']");
}
@@ -130,8 +130,8 @@ class BasicHttpResource_Test extends SimpleTestBase {
HeaderList x =
stringResource("foo").addHeaders(header("Foo","bar"),header("Foo","baz"),header("Bar",null),null).getHeaders();
assertString(x.getFirst("Foo").get().toString()).is("Foo: bar");
assertString(x.getLast("Foo").get().toString()).is("Foo: baz");
- assertObject(x.getFirst("Bar").get().getValue()).isNull();
- assertObject(x.getLast("Bar").get().getValue()).isNull();
+ assertNull(x.getFirst("Bar").get().getValue());
+ assertNull(x.getLast("Bar").get().getValue());
assertObject(x.getAll()).asJson().is("['Foo: bar','Foo:
baz','Bar: null']");
}
@@ -139,8 +139,8 @@ class BasicHttpResource_Test extends SimpleTestBase {
HeaderList x =
stringResource("foo").addHeaders(header("Foo","bar"),header("Foo","baz"),header("Bar",null),null).getHeaders();
assertString(x.getFirst("Foo").get().toString()).is("Foo: bar");
assertString(x.getLast("Foo").get().toString()).is("Foo: baz");
- assertObject(x.getFirst("Bar").get().getValue()).isNull();
- assertObject(x.getLast("Bar").get().getValue()).isNull();
+ assertNull(x.getFirst("Bar").get().getValue());
+ assertNull(x.getLast("Bar").get().getValue());
assertObject(x.getAll()).asJson().is("['Foo: bar','Foo:
baz','Bar: null']");
}
@@ -163,14 +163,14 @@ class BasicHttpResource_Test extends SimpleTestBase {
StringResource x1 =
stringResource("foo").setContentType("text/plain");
assertString(x1.getContentType().getValue()).is("text/plain");
StringResource x2 =
stringResource("foo").setContentType((String)null);
- assertObject(x2.getContentType()).isNull();
+ assertNull(x2.getContentType());
}
@Test void a09_contentEncoding_String() {
StringResource x1 =
stringResource("foo").setContentEncoding("identity");
assertString(x1.getContentEncoding().getValue()).is("identity");
StringResource x2 =
stringResource("foo").setContentEncoding((String)null);
- assertObject(x2.getContentEncoding()).isNull();
+ assertNull(x2.getContentEncoding());
}
//------------------------------------------------------------------------------------------------------------------
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/EntityTag_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/EntityTag_Test.java
index 2f900dc22..b4562be5c 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/http/EntityTag_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/http/EntityTag_Test.java
@@ -67,8 +67,8 @@ public class EntityTag_Test {
assertFalse(x7.isWeak());
assertFalse(x7.isAny());
- assertObject(EntityTag.of(null)).isNull();
- assertObject(EntityTag.of((Supplier<?>)()->null)).isNull();
+ assertNull(EntityTag.of(null));
+ assertNull(EntityTag.of((Supplier<?>)()->null));
assertThrows(IllegalArgumentException.class, ()->new
EntityTag("foo"), "Invalid value for entity-tag: [foo]");
assertThrows(IllegalArgumentException.class, ()->new
EntityTag("\""), "Invalid value for entity-tag: [\"]");
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/header/Accept_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/header/Accept_Test.java
index 4384c368e..48089ab23 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/http/header/Accept_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/http/header/Accept_Test.java
@@ -67,9 +67,9 @@ class Accept_Test extends SimpleTestBase {
}
@Test void a02_asRanges() {
- assertObject(new
Accept((String)null).asMediaRanges().orElse(null)).isNull();
+ assertNull(new
Accept((String)null).asMediaRanges().orElse(null));
assertEquals(-1, new
Accept((String)null).match(alist(MediaType.JSON)));
- assertObject(new Accept((String)null).getRange(0)).isNull();
+ assertNull(new Accept((String)null).getRange(0));
assertObject(new
Accept(MediaRanges.of("application/json"))).asString().is("Accept:
application/json");
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/response/HttpException_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/response/HttpException_Test.java
index d09042350..5c9fe17f0 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/response/HttpException_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/response/HttpException_Test.java
@@ -14,6 +14,8 @@ package org.apache.juneau.http.response;
import static org.apache.juneau.assertions.Assertions.*;
import static org.apache.juneau.http.HttpResponses.*;
+import static org.junit.jupiter.api.Assertions.*;
+
import java.lang.reflect.*;
import org.apache.juneau.*;
@@ -71,10 +73,10 @@ public class HttpException_Test extends SimpleTestBase {
@Test void a02_getRootCause() {
BasicHttpException x = new BasicHttpException(100, null);
- assertObject(x.getRootCause()).isNull();
+ assertNull(x.getRootCause());
x = new BasicHttpException(100, new
BasicHttpException(100,"foo"));
- assertObject(x.getRootCause()).isNull();
+ assertNull(x.getRootCause());
x = new BasicHttpException(100, new RuntimeException("foo"));
assertObject(x.getRootCause()).isType(RuntimeException.class);
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/objecttools/ObjectSorter_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/objecttools/ObjectSorter_Test.java
index 84b77a67e..bea4e3082 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/objecttools/ObjectSorter_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/objecttools/ObjectSorter_Test.java
@@ -45,7 +45,7 @@ class ObjectSorter_Test extends SimpleTestBase {
Object in = map("a","b");
SortArgs sa = SortArgs.create("x");
assertObject(os.run(bs, in, sa)).asJson().is("{a:'b'}");
- assertObject(os.run(in, "x")).isNull();
+ assertNull(os.run(in, "x"));
}
//-----------------------------------------------------------------------------------------------------------------
