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 3f77cddd5 Unit test modernization.
3f77cddd5 is described below
commit 3f77cddd5240921ac7a435322981efbaa1e15e8e
Author: James Bognar <[email protected]>
AuthorDate: Fri Aug 8 08:27:14 2025 -0400
Unit test modernization.
---
.../java/org/apache/juneau/cp/BeanStore_Test.java | 24 +++++++++++-----------
.../java/org/apache/juneau/cp/Messages_Test.java | 6 +++---
.../apache/juneau/dto/swagger/Contact_Test.java | 4 ++--
.../dto/swagger/ExternalDocumentation_Test.java | 2 +-
.../apache/juneau/dto/swagger/HeaderInfo_Test.java | 10 ++++-----
.../org/apache/juneau/dto/swagger/Info_Test.java | 8 ++++----
.../org/apache/juneau/dto/swagger/Items_Test.java | 8 ++++----
.../apache/juneau/dto/swagger/License_Test.java | 2 +-
.../juneau/dto/swagger/ParameterInfo_Test.java | 12 +++++------
.../juneau/dto/swagger/ResponseInfo_Test.java | 2 +-
.../apache/juneau/dto/swagger/SchemaInfo_Test.java | 12 +++++------
.../juneau/dto/swagger/SecurityScheme_Test.java | 14 ++++++-------
.../apache/juneau/dto/swagger/Swagger_Test.java | 6 +++---
.../org/apache/juneau/dto/swagger/Tag_Test.java | 4 ++--
.../org/apache/juneau/dto/swagger/Xml_Test.java | 6 +++---
.../org/apache/juneau/http/MediaType_Test.java | 6 +++---
.../apache/juneau/http/SerializedHeader_Test.java | 8 ++++----
.../apache/juneau/http/SerializedPart_Test.java | 8 ++++----
.../org/apache/juneau/http/StringRanges_Test.java | 8 ++++----
.../juneau/http/header/HeaderBeanMeta_Test.java | 4 ++--
.../apache/juneau/http/part/PartBeanMeta_Test.java | 4 ++--
21 files changed, 79 insertions(+), 79 deletions(-)
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 291019133..400c816fa 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
@@ -301,11 +301,11 @@ class BeanStore_Test extends SimpleTestBase {
b1p.add(A1.class, a1a);
b2p.add(A1.class, a1a);
for (BeanStore b : array(b1p, b1c, b2p, b2c)) {
- assertString(b.getMissingParams(c1)).isNull();
+ assertNull(b.getMissingParams(c1));
assertString(A1n+"@foo", b.getMissingParams(c2));
- assertString(b.getMissingParams(m1)).isNull();
+ assertNull(b.getMissingParams(m1));
assertString(A1n+"@foo", b.getMissingParams(m2));
- assertString(b.getMissingParams(m3)).isNull();
+ assertNull(b.getMissingParams(m3));
assertTrue(b.hasAllParams(c1));
assertFalse(b.hasAllParams(c2));
assertTrue(b.hasAllParams(m1));
@@ -322,7 +322,7 @@ class BeanStore_Test extends SimpleTestBase {
b2p.add(A1.class, a1a, "foo");
for (BeanStore b : array(b1p, b1c, b2p, b2c)) {
for (ExecutableInfo e : array(c1, c2, m1, m2, m3)) {
- assertString(b.getMissingParams(e)).isNull();
+ assertNull(b.getMissingParams(e));
assertTrue(b.hasAllParams(e));
}
assertArray(b.getParams(c1), pA1a, pEmptyOptional,
pIsBeanStore);
@@ -336,7 +336,7 @@ class BeanStore_Test extends SimpleTestBase {
b2p.add(A1.class, a1b, "bar");
for (BeanStore b : array(b1p, b1c, b2p, b2c)) {
for (ExecutableInfo e : array(c1, c2, m1, m2, m3)) {
- assertString(b.getMissingParams(e)).isNull();
+ assertNull(b.getMissingParams(e));
assertTrue(b.hasAllParams(e));
}
assertArray(b.getParams(c1), pA1a, pEmptyOptional,
pIsBeanStore);
@@ -350,7 +350,7 @@ class BeanStore_Test extends SimpleTestBase {
b2p.add(A2.class, a2a, "bar");
for (BeanStore b : array(b1p, b1c, b2p, b2c)) {
for (ExecutableInfo e : array(c1, c2, m1, m2, m3)) {
- assertString(b.getMissingParams(e)).isNull();
+ assertNull(b.getMissingParams(e));
assertTrue(b.hasAllParams(e));
}
assertArray(b.getParams(c1), pA1a, pEmptyOptional,
pIsBeanStore);
@@ -364,7 +364,7 @@ class BeanStore_Test extends SimpleTestBase {
b2p.add(A2.class, a2a, null);
for (BeanStore b : array(b1p, b1c, b2p, b2c)) {
for (ExecutableInfo e : array(c1, c2, m1, m2, m3)) {
- assertString(b.getMissingParams(e)).isNull();
+ assertNull(b.getMissingParams(e));
assertTrue(b.hasAllParams(e));
}
assertArray(b.getParams(c1), pA1a, pA2a, pIsBeanStore);
@@ -425,7 +425,7 @@ class BeanStore_Test extends SimpleTestBase {
b1p.add(A1.class, a1a);
b2p.add(A1.class, a1a);
for (BeanStore b : array(b1p, b1c, b2p, b2c)) {
- assertString(b.getMissingParams(c1)).isNull();
+ assertNull(b.getMissingParams(c1));
assertString(A1n+"@foo", b.getMissingParams(c2));
assertTrue(b.hasAllParams(c1));
assertFalse(b.hasAllParams(c2));
@@ -437,7 +437,7 @@ class BeanStore_Test extends SimpleTestBase {
b2p.add(A1.class, a1a, "foo");
for (BeanStore b : array(b1p, b1c, b2p, b2c)) {
for (ExecutableInfo e : array(c1, c2)) {
- assertString(b.getMissingParams(e)).isNull();
+ assertNull(b.getMissingParams(e));
assertTrue(b.hasAllParams(e));
}
assertArray(b.getParams(c1), pThis, pA1a,
pEmptyOptional, pIsBeanStore);
@@ -448,7 +448,7 @@ class BeanStore_Test extends SimpleTestBase {
b2p.add(A1.class, a1b, "bar");
for (BeanStore b : array(b1p, b1c, b2p, b2c)) {
for (ExecutableInfo e : array(c1, c2)) {
- assertString(b.getMissingParams(e)).isNull();
+ assertNull(b.getMissingParams(e));
assertTrue(b.hasAllParams(e));
}
assertArray(b.getParams(c1), pThis, pA1a,
pEmptyOptional, pIsBeanStore);
@@ -459,7 +459,7 @@ class BeanStore_Test extends SimpleTestBase {
b2p.add(A2.class, a2a, "bar");
for (BeanStore b : array(b1p, b1c, b2p, b2c)) {
for (ExecutableInfo e : array(c1, c2)) {
- assertString(b.getMissingParams(e)).isNull();
+ assertNull(b.getMissingParams(e));
assertTrue(b.hasAllParams(e));
}
assertArray(b.getParams(c1), pThis, pA1a,
pEmptyOptional, pIsBeanStore);
@@ -1019,7 +1019,7 @@ class BeanStore_Test extends SimpleTestBase {
@Test void d17_createBean_builders_inherent() {
BeanStore bs = BeanStore.create().build();
- assertString(bs.createBean(D17.class).run().a).isNull();
+ assertNull(bs.createBean(D17.class).run().a);
assertThrowsWithMessage(ExecutableException.class, "Could not
instantiate class "+D17.class.getName()+": Protected constructor found but
could not find prerequisites: Builder or Builder,Integer or Integer.",
()->bs.createBean(D17.class).builder(Boolean.class, true).run());
}
diff --git a/juneau-utest/src/test/java/org/apache/juneau/cp/Messages_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/cp/Messages_Test.java
index eec4d4528..cafcf7b25 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/cp/Messages_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/cp/Messages_Test.java
@@ -132,10 +132,10 @@ public class Messages_Test extends SimpleTestBase {
@Test void a11_findFirstString() {
Messages x = Messages.of(MessageBundleTest1.class);
assertEquals("foo {0}", x.findFirstString("baz","foo"));
- assertString(x.findFirstString("baz","baz")).isNull();
+ assertNull(x.findFirstString("baz","baz"));
assertEquals("baz",
x.forLocale(JAPAN).findFirstString("baz","foo"));
-
assertString(x.forLocale(CHINA).findFirstString("baz","baz")).isNull();
-
assertString(x.forLocale(null).findFirstString("baz","baz")).isNull();
+ assertNull(x.forLocale(CHINA).findFirstString("baz","baz"));
+ assertNull(x.forLocale(null).findFirstString("baz","baz"));
}
@Test void a12_getKeys() {
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 15ad3eb64..093cc03f2 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
@@ -31,10 +31,10 @@ class Contact_Test extends SimpleTestBase {
@Test void a01_gettersAndSetters() {
Contact t = new Contact();
assertEquals("foo", t.setName("foo").getName());
- assertString(t.setName(null).getName()).isNull();
+ assertNull(t.setName(null).getName());
assertString("http://bar";,
t.setUrl(URI.create("http://bar";)).getUrl());
assertEquals("foo", t.setEmail("foo").getEmail());
- assertString(t.setEmail(null).getEmail()).isNull();
+ assertNull(t.setEmail(null).getEmail());
}
/**
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 41b88e840..f47a1899f 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
@@ -31,7 +31,7 @@ class ExternalDocumentation_Test extends SimpleTestBase {
@Test void a01_gettersAndSetters() {
ExternalDocumentation t = new ExternalDocumentation();
assertEquals("foo", t.setDescription("foo").getDescription());
- assertString(t.setDescription(null).getDescription()).isNull();
+ assertNull(t.setDescription(null).getDescription());
assertString("http://bar";,
t.setUrl(URI.create("http://bar";)).getUrl());
}
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 56f7c6ce3..ec17542d3 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
@@ -34,15 +34,15 @@ class HeaderInfo_Test extends SimpleTestBase {
@Test void a01_gettersAndSetters() {
HeaderInfo t = new HeaderInfo();
assertEquals("foo", t.setDescription("foo").getDescription());
- assertString(t.setDescription(null).getDescription()).isNull();
+ assertNull(t.setDescription(null).getDescription());
assertEquals("foo", t.setType("foo").getType());
- assertString(t.setType(null).getType()).isNull();
+ assertNull(t.setType(null).getType());
assertEquals("foo", t.setFormat("foo").getFormat());
- assertString(t.setFormat(null).getFormat()).isNull();
+ assertNull(t.setFormat(null).getFormat());
assertJson(t.setItems(items("foo")).getItems(), "{type:'foo'}");
assertNull(t.setItems((Items)null).getItems());
assertEquals("foo",
t.setCollectionFormat("foo").getCollectionFormat());
-
assertString(t.setCollectionFormat(null).getCollectionFormat()).isNull();
+ assertNull(t.setCollectionFormat(null).getCollectionFormat());
assertEquals("foo", t.setDefault("foo").getDefault());
assertString("foo", t.setDefault(new
StringBuilder("foo")).getDefault());
assertNull(t.setDefault(null).getDefault());
@@ -55,7 +55,7 @@ class HeaderInfo_Test extends SimpleTestBase {
assertEquals(123, t.setMaxLength(123).getMaxLength());
assertEquals(123, t.setMinLength(123).getMinLength());
assertEquals("foo", t.setPattern("foo").getPattern());
- assertString(t.setPattern(null).getPattern()).isNull();
+ assertNull(t.setPattern(null).getPattern());
assertEquals(123, t.setMaxItems(123).getMaxItems());
assertEquals(123, t.setMinItems(123).getMinItems());
assertTrue(t.setUniqueItems(true).getUniqueItems());
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 b305f6095..a11ca65da 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
@@ -30,15 +30,15 @@ class Info_Test extends SimpleTestBase {
@Test void a01_gettersAndSetters() {
Info t = new Info();
assertEquals("foo", t.setTitle("foo").getTitle());
- assertString(t.setTitle(null).getTitle()).isNull();
+ assertNull(t.setTitle(null).getTitle());
assertEquals("foo", t.setDescription("foo").getDescription());
- assertString(t.setDescription(null).getDescription()).isNull();
+ assertNull(t.setDescription(null).getDescription());
assertEquals("foo",
t.setTermsOfService("foo").getTermsOfService());
-
assertString(t.setTermsOfService(null).getTermsOfService()).isNull();
+ assertNull(t.setTermsOfService(null).getTermsOfService());
assertJson(t.setContact(contact("foo")).getContact(),
"{name:'foo'}");
assertJson(t.setLicense(license("foo")).getLicense(),
"{name:'foo'}");
assertEquals("foo", t.setVersion("foo").getVersion());
- assertString(t.setVersion(null).getVersion()).isNull();
+ assertNull(t.setVersion(null).getVersion());
}
/**
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 32cf58556..7b68231da 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
@@ -33,12 +33,12 @@ class Items_Test extends SimpleTestBase {
@Test void a01_gettersAndSetters() {
Items t = new Items();
assertEquals("foo", t.setType("foo").getType());
- assertString(t.setType(null).getType()).isNull();
+ assertNull(t.setType(null).getType());
assertEquals("foo", t.setFormat("foo").getFormat());
- assertString(t.setFormat(null).getFormat()).isNull();
+ assertNull(t.setFormat(null).getFormat());
assertJson(t.setItems(items("foo")).getItems(), "{type:'foo'}");
assertEquals("foo",
t.setCollectionFormat("foo").getCollectionFormat());
-
assertString(t.setCollectionFormat(null).getCollectionFormat()).isNull();
+ assertNull(t.setCollectionFormat(null).getCollectionFormat());
assertEquals("foo", t.setDefault("foo").getDefault());
assertString("foo", t.setDefault(new
StringBuilder("foo")).getDefault());
assertNull(t.setDefault(null).getDefault());
@@ -51,7 +51,7 @@ class Items_Test extends SimpleTestBase {
assertEquals(123, t.setMaxLength(123).getMaxLength());
assertEquals(123, t.setMinLength(123).getMinLength());
assertEquals("foo", t.setPattern("foo").getPattern());
- assertString(t.setPattern(null).getPattern()).isNull();
+ assertNull(t.setPattern(null).getPattern());
assertEquals(123, t.setMaxItems(123).getMaxItems());
assertEquals(123, t.setMinItems(123).getMinItems());
assertTrue(t.setUniqueItems(true).getUniqueItems());
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/dto/swagger/License_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/dto/swagger/License_Test.java
index 1f96deab8..cac78cdfc 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/dto/swagger/License_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/dto/swagger/License_Test.java
@@ -31,7 +31,7 @@ class License_Test extends SimpleTestBase {
@Test void a01_gettersAndSetters() {
License t = new License();
assertEquals("foo", t.setName("foo").getName());
- assertString(t.setName(null).getName()).isNull();
+ assertNull(t.setName(null).getName());
assertString("foo", t.setUrl(URI.create("foo")).getUrl());
}
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 d339761aa..849d2a50a 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
@@ -35,19 +35,19 @@ class ParameterInfo_Test extends SimpleTestBase {
assertEquals("foo", t.setName("foo").getName());
assertNull(t.setName(null).getName());
assertEquals("foo", t.setIn("foo").getIn());
- assertString(t.setIn(null).getIn()).isNull();
+ assertNull(t.setIn(null).getIn());
assertEquals("foo", t.setDescription("foo").getDescription());
- assertString(t.setDescription(null).getDescription()).isNull();
+ assertNull(t.setDescription(null).getDescription());
assertTrue(t.setRequired(true).getRequired());
assertJson(t.setSchema(schemaInfo().setTitle("foo")).getSchema(),
"{title:'foo'}");
assertEquals("foo", t.setType("foo").getType());
- assertString(t.setType(null).getType()).isNull();
+ assertNull(t.setType(null).getType());
assertEquals("foo", t.setFormat("foo").getFormat());
- assertString(t.setFormat(null).getFormat()).isNull();
+ assertNull(t.setFormat(null).getFormat());
assertTrue(t.setAllowEmptyValue(true).getAllowEmptyValue());
assertJson(t.setItems(items("foo")).getItems(), "{type:'foo'}");
assertEquals("foo",
t.setCollectionFormat("foo").getCollectionFormat());
-
assertString(t.setCollectionFormat(null).getCollectionFormat()).isNull();
+ assertNull(t.setCollectionFormat(null).getCollectionFormat());
assertEquals("foo", t.setDefault("foo").getDefault());
assertString("foo", t.setDefault(new
StringBuilder("foo")).getDefault());
assertNull(t.setDefault(null).getDefault());
@@ -60,7 +60,7 @@ class ParameterInfo_Test extends SimpleTestBase {
assertEquals(123, t.setMaxLength(123).getMaxLength());
assertEquals(123, t.setMinLength(123).getMinLength());
assertEquals("foo", t.setPattern("foo").getPattern());
- assertString(t.setPattern(null).getPattern()).isNull();
+ assertNull(t.setPattern(null).getPattern());
assertEquals(123, t.setMaxItems(123).getMaxItems());
assertEquals(123, t.setMinItems(123).getMinItems());
assertTrue(t.setUniqueItems(true).getUniqueItems());
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 65d48a799..356bf3f2f 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
@@ -33,7 +33,7 @@ class ResponseInfo_Test extends SimpleTestBase {
@Test void a01_gettersAndSetters() {
ResponseInfo t = new ResponseInfo();
assertEquals("foo", t.setDescription("foo").getDescription());
- assertString(t.setDescription(null).getDescription()).isNull();
+ assertNull(t.setDescription(null).getDescription());
assertJson(t.setSchema(schemaInfo().setTitle("foo")).getSchema(),
"{title:'foo'}");
assertJson(t.setHeaders(map("foo",headerInfo("bar"))).getHeaders(),
"{foo:{type:'bar'}}");
assertType(HeaderInfo.class,
t.setHeaders(map("foo",headerInfo("bar"))).getHeaders().get("foo"));
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 dad82aa4d..1ca507303 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
@@ -33,11 +33,11 @@ class SchemaInfo_Test extends SimpleTestBase {
@Test void a01_gettersAndSetters() {
SchemaInfo t = new SchemaInfo();
assertEquals("foo", t.setFormat("foo").getFormat());
- assertString(t.setFormat(null).getFormat()).isNull();
+ assertNull(t.setFormat(null).getFormat());
assertEquals("foo", t.setTitle("foo").getTitle());
- assertString(t.setTitle(null).getTitle()).isNull();
+ assertNull(t.setTitle(null).getTitle());
assertEquals("foo", t.setDescription("foo").getDescription());
- assertString(t.setDescription(null).getDescription()).isNull();
+ assertNull(t.setDescription(null).getDescription());
assertEquals("foo", t.setDefault("foo").getDefault());
assertString("foo", t.setDefault(new
StringBuilder("foo")).getDefault());
assertNull(t.setDefault(null).getDefault());
@@ -52,7 +52,7 @@ class SchemaInfo_Test extends SimpleTestBase {
assertEquals(123, t.setMaxLength(123).getMaxLength());
assertEquals(123, t.setMinLength(123).getMinLength());
assertEquals("foo", t.setPattern("foo").getPattern());
- assertString(t.setPattern(null).getPattern()).isNull();
+ assertNull(t.setPattern(null).getPattern());
assertEquals(123, t.setMaxItems(123).getMaxItems());
assertEquals(123, t.setMinItems(123).getMinItems());
assertTrue(t.setUniqueItems(true).getUniqueItems());
@@ -66,7 +66,7 @@ class SchemaInfo_Test extends SimpleTestBase {
assertJson(t.addEnum("foo","bar").getEnum(), "['foo','bar']");
assertJson(t.addEnum("baz").getEnum(), "['foo','bar','baz']");
assertEquals("foo", t.setType("foo").getType());
- assertString(t.setType(null).getType()).isNull();
+ assertNull(t.setType(null).getType());
assertJson(t.setItems(items("foo")).getItems(), "{type:'foo'}");
assertJson(t.setAllOf(set("foo","bar")).getAllOf(),
"['foo','bar']");
assertJson(t.setAllOf(set()).getAllOf(), "[]");
@@ -79,7 +79,7 @@ class SchemaInfo_Test extends SimpleTestBase {
assertJson(t.setAdditionalProperties(new
SchemaInfo()).getAdditionalProperties(), "{}");
assertNull(t.setAdditionalProperties((SchemaInfo)null).getAdditionalProperties());
assertEquals("foo",
t.setDiscriminator("foo").getDiscriminator());
-
assertString(t.setDiscriminator(null).getDiscriminator()).isNull();
+ assertNull(t.setDiscriminator(null).getDiscriminator());
assertTrue(t.setReadOnly(true).getReadOnly());
assertJson(t.setXml(xml().setName("foo")).getXml(),
"{name:'foo'}");
assertJson(t.setExternalDocs(externalDocumentation("foo")).getExternalDocs(),
"{url:'foo'}");
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 df42dbed7..b5c65b544 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
@@ -32,19 +32,19 @@ class SecurityScheme_Test extends SimpleTestBase {
@Test void a01_gettersAndSetters() {
SecurityScheme t = new SecurityScheme();
assertEquals("foo", t.setType("foo").getType());
- assertString(t.setType(null).getType()).isNull();
+ assertNull(t.setType(null).getType());
assertEquals("foo", t.setDescription("foo").getDescription());
- assertString(t.setDescription(null).getDescription()).isNull();
+ assertNull(t.setDescription(null).getDescription());
assertEquals("foo", t.setName("foo").getName());
- assertString(t.setName(null).getName()).isNull();
+ assertNull(t.setName(null).getName());
assertEquals("foo", t.setIn("foo").getIn());
- assertString(t.setIn(null).getIn()).isNull();
+ assertNull(t.setIn(null).getIn());
assertEquals("foo", t.setFlow("foo").getFlow());
- assertString(t.setFlow(null).getFlow()).isNull();
+ assertNull(t.setFlow(null).getFlow());
assertEquals("foo",
t.setAuthorizationUrl("foo").getAuthorizationUrl());
-
assertString(t.setAuthorizationUrl(null).getAuthorizationUrl()).isNull();
+ assertNull(t.setAuthorizationUrl(null).getAuthorizationUrl());
assertEquals("foo", t.setTokenUrl("foo").getTokenUrl());
- assertString(t.setTokenUrl(null).getTokenUrl()).isNull();
+ assertNull(t.setTokenUrl(null).getTokenUrl());
assertJson(t.setScopes(map("foo","bar")).getScopes(),
"{foo:'bar'}");
assertJson(t.setScopes(map()).getScopes(), "{}");
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 ae321a42a..ab1d7f47b 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
@@ -35,12 +35,12 @@ class Swagger_Test extends SimpleTestBase {
@Test void a01_gettersAndSetters() {
Swagger t = new Swagger();
assertEquals("foo", t.setSwagger("foo").getSwagger());
- assertString(t.setSwagger(null).getSwagger()).isNull();
+ assertNull(t.setSwagger(null).getSwagger());
assertJson(t.setInfo(info("foo", "bar")).getInfo(),
"{title:'foo',version:'bar'}");
assertEquals("foo", t.setHost("foo").getHost());
- assertString(t.setHost(null).getHost()).isNull();
+ assertNull(t.setHost(null).getHost());
assertEquals("foo", t.setBasePath("foo").getBasePath());
- assertString(t.setBasePath(null).getBasePath()).isNull();
+ assertNull(t.setBasePath(null).getBasePath());
assertJson(t.setSchemes(set("foo","bar")).getSchemes(),
"['foo','bar']");
assertJson(t.setSchemes(set()).getSchemes(), "[]");
assertNull(t.setSchemes((Collection<String>)null).getSchemes());
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/dto/swagger/Tag_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/dto/swagger/Tag_Test.java
index 6f1c377ef..0e6dc7334 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/dto/swagger/Tag_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/dto/swagger/Tag_Test.java
@@ -31,9 +31,9 @@ class Tag_Test extends SimpleTestBase {
@Test void a01_gettersAndSetters() {
Tag t = new Tag();
assertEquals("foo", t.setName("foo").getName());
- assertString(t.setName(null).getName()).isNull();
+ assertNull(t.setName(null).getName());
assertEquals("foo", t.setDescription("foo").getDescription());
- assertString(t.setDescription(null).getDescription()).isNull();
+ assertNull(t.setDescription(null).getDescription());
assertJson(t.setExternalDocs(externalDocumentation("foo")).getExternalDocs(),
"{url:'foo'}");
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/dto/swagger/Xml_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/dto/swagger/Xml_Test.java
index be5cc8c32..733a58bd0 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/dto/swagger/Xml_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/dto/swagger/Xml_Test.java
@@ -29,11 +29,11 @@ class Xml_Test extends SimpleTestBase {
@Test void a01_gettersAndSetters() {
Xml t = new Xml();
assertEquals("foo", t.setName("foo").getName());
- assertString(t.setName(null).getName()).isNull();
+ assertNull(t.setName(null).getName());
assertEquals("foo", t.setNamespace("foo").getNamespace());
- assertString(t.setNamespace(null).getNamespace()).isNull();
+ assertNull(t.setNamespace(null).getNamespace());
assertEquals("foo", t.setPrefix("foo").getPrefix());
- assertString(t.setPrefix(null).getPrefix()).isNull();
+ assertNull(t.setPrefix(null).getPrefix());
assertTrue(t.setAttribute(true).getAttribute());
assertTrue(t.setWrapped(true).getWrapped());
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/MediaType_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/MediaType_Test.java
index 6a3b60561..b48264663 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/http/MediaType_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/http/MediaType_Test.java
@@ -51,9 +51,9 @@ public class MediaType_Test extends SimpleTestBase {
@Test void a03_getParameter() {
MediaType x1 = MediaType.of("text/json;x=1;q=1;y=2");
assertEquals("1", x1.getParameter("x"));
- assertString(x1.getParameter("q")).isNull();
- assertString(x1.getParameter("y")).isNull();
- assertString(x1.getParameter(null)).isNull();
+ assertNull(x1.getParameter("q"));
+ assertNull(x1.getParameter("y"));
+ assertNull(x1.getParameter(null));
}
@Test void a04_equals() {
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/SerializedHeader_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/SerializedHeader_Test.java
index a82b056f9..6b21fc758 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/SerializedHeader_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/SerializedHeader_Test.java
@@ -55,9 +55,9 @@ class SerializedHeader_Test extends SimpleTestBase {
@Test void a04_skipIfEmpty() {
SerializedHeader x1 =
serializedHeader("Foo",null).skipIfEmpty();
- assertString(x1.getValue()).isNull();
+ assertNull(x1.getValue());
SerializedHeader x2 = serializedHeader("Foo","").skipIfEmpty();
- assertString(x2.getValue()).isNull();
+ assertNull(x2.getValue());
SerializedHeader x3 =
serializedHeader("Foo","").schema(schema(STRING)._default("bar").build()).serializer(OAPI_SERIALIZER).skipIfEmpty();
assertThrowsWithMessage(Exception.class, "Empty value not
allowed.", x3::getValue);
}
@@ -67,10 +67,10 @@ class SerializedHeader_Test extends SimpleTestBase {
assertEquals("1", x1.getValue());
SerializedHeader x2 =
serializedHeader("Foo",null).schema(schema(STRING).required().allowEmptyValue().build()).serializer(OAPI_SESSION);
- assertString(x2.getValue()).isNull();
+ assertNull(x2.getValue());
SerializedHeader x3 =
serializedHeader("Foo",null).schema(schema(STRING).required(false).build()).serializer(OAPI_SESSION);
- assertString(x3.getValue()).isNull();
+ assertNull(x3.getValue());
SerializedHeader x4 =
serializedHeader("Foo",null).schema(schema(STRING).required().build()).serializer(OAPI_SESSION);
assertThrowsWithMessage(Exception.class, "Required value not
provided.", x4::getValue);
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/SerializedPart_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/SerializedPart_Test.java
index ebcdda486..a341d2351 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/http/SerializedPart_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/http/SerializedPart_Test.java
@@ -56,9 +56,9 @@ class SerializedPart_Test extends SimpleTestBase {
@Test void a04_skipIfEmpty() {
SerializedPart x1 = serializedPart("Foo",null).skipIfEmpty();
- assertString(x1.getValue()).isNull();
+ assertNull(x1.getValue());
SerializedPart x2 = serializedPart("Foo","").skipIfEmpty();
- assertString(x2.getValue()).isNull();
+ assertNull(x2.getValue());
SerializedPart x3 =
serializedPart("Foo","").schema(schema(STRING)._default("bar").build()).serializer(OAPI_SERIALIZER).skipIfEmpty();
assertThrowsWithMessage(Exception.class, "Empty value not
allowed.", x3::getValue);
}
@@ -68,10 +68,10 @@ class SerializedPart_Test extends SimpleTestBase {
assertEquals("1", x1.getValue());
SerializedPart x2 =
serializedPart("Foo",null).schema(schema(STRING).required().allowEmptyValue().build()).serializer(OAPI_SESSION);
- assertString(x2.getValue()).isNull();
+ assertNull(x2.getValue());
SerializedPart x3 =
serializedPart("Foo",null).schema(schema(STRING).required(false).build()).serializer(OAPI_SESSION);
- assertString(x3.getValue()).isNull();
+ assertNull(x3.getValue());
SerializedPart x4 =
serializedPart("Foo",null).schema(schema(STRING).required().build()).serializer(OAPI_SESSION);
assertThrowsWithMessage(Exception.class, "Required value not
provided.", x4::getValue);
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/StringRanges_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/StringRanges_Test.java
index abe18e8be..bc50dbb7c 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/http/StringRanges_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/http/StringRanges_Test.java
@@ -41,10 +41,10 @@ class StringRanges_Test extends SimpleTestBase {
@Test void a02_getRange() {
assertString(of("foo").getRange(0)).isNotNull();
- assertString(of((String)null).getRange(0)).isNull();
- assertString(of("").getRange(0)).isNull();
- assertString(of((String)null).getRange(-1)).isNull();
- assertString(of((String)null).getRange(1)).isNull();
+ assertNull(of((String)null).getRange(0));
+ assertNull(of("").getRange(0));
+ assertNull(of((String)null).getRange(-1));
+ assertNull(of((String)null).getRange(1));
}
@Test void a03_getRanges() {
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/header/HeaderBeanMeta_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/header/HeaderBeanMeta_Test.java
index 32a820cb9..791065d37 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/header/HeaderBeanMeta_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/header/HeaderBeanMeta_Test.java
@@ -73,12 +73,12 @@ class HeaderBeanMeta_Test extends SimpleTestBase {
assertSame(a1, HeaderBeanMeta.of(A1.class));
assertJson(a1.construct("X", "foo"), "{name:'X',value:'foo'}");
assertThrown(()->a1.construct("foo")).asMessage().isContains("Constructor for
type "+TNAME+"$A1 requires a name as the first argument.");
- assertString(a1.getSchema().getName()).isNull();
+ assertNull(a1.getSchema().getName());
HeaderBeanMeta<A2> a2 = HeaderBeanMeta.of(A2.class);
assertJson(a2.construct("X", "foo"), "{name:'X',value:'foo'}");
assertThrown(()->a2.construct("foo")).asMessage().isContains("Constructor for
type "+TNAME+"$A2 requires a name as the first argument.");
- assertString(a2.getSchema().getName()).isNull();
+ assertNull(a2.getSchema().getName());
HeaderBeanMeta<A3> a3 = HeaderBeanMeta.of(A3.class);
assertJson(a3.construct("X", "foo"), "{value:'foo'}");
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/part/PartBeanMeta_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/part/PartBeanMeta_Test.java
index 10b71f35f..f379c9446 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/part/PartBeanMeta_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/part/PartBeanMeta_Test.java
@@ -79,12 +79,12 @@ class PartBeanMeta_Test extends SimpleTestBase {
assertSame(a1, PartBeanMeta.of(A1.class));
assertJson(a1.construct("X", "foo"), "{name:'X',value:'foo'}");
assertThrown(()->a1.construct("foo")).asMessage().isContains("Constructor for
type "+TNAME+"$A1 requires a name as the first argument.");
- assertString(a1.getSchema().getName()).isNull();
+ assertNull(a1.getSchema().getName());
PartBeanMeta<A2> a2 = PartBeanMeta.of(A2.class);
assertJson(a2.construct("X", "foo"), "{name:'X',value:'foo'}");
assertThrown(()->a2.construct("foo")).asMessage().isContains("Constructor for
type "+TNAME+"$A2 requires a name as the first argument.");
- assertString(a2.getSchema().getName()).isNull();
+ assertNull(a2.getSchema().getName());
PartBeanMeta<A3> a3 = PartBeanMeta.of(A3.class);
assertJson(a3.construct("X", "foo"), "{value:'foo'}");
