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 9f877c26f Unit test modernization.
9f877c26f is described below
commit 9f877c26fdf70682d3d815a93890a6f4d6a7179c
Author: James Bognar <[email protected]>
AuthorDate: Wed Aug 6 13:41:04 2025 -0400
Unit test modernization.
---
.../test/java/org/apache/juneau/Version_Test.java | 27 ++--
.../apache/juneau/assertions/Assertions_Test.java | 7 -
.../java/org/apache/juneau/cp/Messages_Test.java | 162 ++++++++++-----------
.../apache/juneau/dto/swagger/Contact_Test.java | 24 ++-
.../dto/swagger/ExternalDocumentation_Test.java | 22 ++-
.../apache/juneau/dto/swagger/HeaderInfo_Test.java | 14 +-
.../org/apache/juneau/dto/swagger/Info_Test.java | 22 +--
.../org/apache/juneau/dto/swagger/Items_Test.java | 44 +++---
.../apache/juneau/dto/swagger/License_Test.java | 8 +-
.../apache/juneau/dto/swagger/Operation_Test.java | 32 ++--
.../juneau/dto/swagger/ParameterInfo_Test.java | 64 ++++----
.../juneau/dto/swagger/ResponseInfo_Test.java | 12 +-
.../apache/juneau/dto/swagger/SchemaInfo_Test.java | 74 +++++-----
.../juneau/dto/swagger/SecurityScheme_Test.java | 32 ++--
.../apache/juneau/dto/swagger/Swagger_Test.java | 38 ++---
.../org/apache/juneau/dto/swagger/Tag_Test.java | 12 +-
.../org/apache/juneau/dto/swagger/Xml_Test.java | 18 +--
.../apache/juneau/http/BasicHttpResource_Test.java | 24 +--
.../org/apache/juneau/http/EntityTag_Test.java | 33 ++---
.../org/apache/juneau/http/MediaRanges_Test.java | 76 +++++-----
.../org/apache/juneau/http/MediaType_Test.java | 4 +-
.../apache/juneau/http/SerializedHeader_Test.java | 16 +-
.../apache/juneau/http/SerializedPart_Test.java | 16 +-
.../org/apache/juneau/http/StringRange_Test.java | 16 +-
.../org/apache/juneau/http/StringRanges_Test.java | 6 +-
.../juneau/http/header/ContentType_Test.java | 4 +-
.../org/apache/juneau/http/header/ETag_Test.java | 4 +-
.../juneau/http/header/HeaderBeanMeta_Test.java | 6 +-
.../apache/juneau/http/header/IfRange_Test.java | 4 +-
.../apache/juneau/http/part/PartBeanMeta_Test.java | 8 +-
.../remote/Remote_FormDataAnnotation_Test.java | 6 +-
.../http/remote/Remote_HeaderAnnotation_Test.java | 6 +-
.../http/remote/Remote_PathAnnotation_Test.java | 6 +-
.../http/remote/Remote_QueryAnnotation_Test.java | 6 +-
.../juneau/http/response/HttpException_Test.java | 16 +-
.../org/apache/juneau/marshaller/Csv_Test.java | 9 +-
.../org/apache/juneau/marshaller/Html_Test.java | 14 +-
.../org/apache/juneau/marshaller/Json5_Test.java | 14 +-
.../org/apache/juneau/marshaller/Json_Test.java | 14 +-
.../org/apache/juneau/marshaller/MsgPack_Test.java | 6 +-
.../org/apache/juneau/marshaller/OpenApi_Test.java | 14 +-
.../apache/juneau/marshaller/PlainText_Test.java | 14 +-
.../org/apache/juneau/marshaller/Uon_Test.java | 16 +-
.../apache/juneau/marshaller/UrlEncoding_Test.java | 14 +-
.../org/apache/juneau/marshaller/Xml_Test.java | 14 +-
.../org/apache/juneau/mstat/ThrownStore_Test.java | 6 +-
.../juneau/rest/RestContext_Builder_Test.java | 3 +-
.../rest/client/RestClient_Response_Body_Test.java | 18 +--
.../java/org/apache/juneau/utils/Tuple2_Test.java | 2 +-
.../java/org/apache/juneau/utils/Tuple3_Test.java | 2 +-
.../java/org/apache/juneau/utils/Tuple4_Test.java | 2 +-
.../java/org/apache/juneau/utils/Tuple5_Test.java | 2 +-
52 files changed, 511 insertions(+), 522 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 c0e971ab7..1e0a9879e 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
@@ -20,13 +20,11 @@ import static org.junit.runners.MethodSorters.*;
import java.util.*;
-import org.junit.*;
+import org.junit.jupiter.api.*;
-@FixMethodOrder(NAME_ASCENDING)
-public class Version_Test {
+class Version_Test extends SimpleTestBase {
- @Test
- public void a01_basic() {
+ @Test void a01_basic() {
assertNull(of(null));
assertObject(of("")).asString().is("0");
@@ -41,11 +39,10 @@ public class Version_Test {
assertInteger(x.getPart(3).orElse(null)).isNull();
x = of("1..x");
- assertString(x).is("1.0.2147483647");
+ assertString("1.0.2147483647", x);
}
- @Test
- public void a02_isAtLeast() {
+ @Test void a02_isAtLeast() {
Version x = of("1.2.3");
assertTrue(x.isAtLeast(of("1.2.2")));
@@ -62,8 +59,7 @@ public class Version_Test {
assertFalse(x.isAtLeast(of("1.3.0.1")));
}
- @Test
- public void a03_isAtMost() {
+ @Test void a03_isAtMost() {
Version x = of("1.2.3");
assertFalse(x.isAtMost(of("1.2.2")));
@@ -80,8 +76,7 @@ public class Version_Test {
assertTrue(x.isAtMost(of("1.3.0.1")));
}
- @Test
- public void a04_isEqualsTo() {
+ @Test void a04_isEqualsTo() {
Version x = of("1.2.3");
assertTrue(x.equals(of("1.2.3")));
@@ -90,8 +85,7 @@ public class Version_Test {
assertFalse(x.equals(of("1.2.4")));
}
- @Test
- public void a05_compareTo() {
+ @Test void a05_compareTo() {
List<Version> l = alist(
of("1.2.3"),
of("1.2"),
@@ -100,8 +94,9 @@ public class Version_Test {
of("2.0"),
of("2")
);
- assertList(l).asSorted().asString().is("[0, 1.2, 1.2.3,
1.2.3.4, 2, 2.0]");
+ Collections.sort(l);
+ assertList(l, "0,1.2,1.2.3,1.2.3.4,2,2.0");
Collections.reverse(l);
- assertList(l).asSorted().asString().is("[0, 1.2, 1.2.3,
1.2.3.4, 2, 2.0]");
+ assertList(l, "2.0,2,1.2.3.4,1.2.3,1.2,0");
}
}
\ No newline at end of file
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/assertions/Assertions_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/assertions/Assertions_Test.java
index 450b25b90..a7815bc67 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/assertions/Assertions_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/assertions/Assertions_Test.java
@@ -53,13 +53,6 @@ public class Assertions_Test {
assertObject("foo").asJson().is("'foo'");
}
- @Test
- public void a05_assertString() {
- assertString("foo").is("foo");
- assertString(optional("foo")).is("foo");
- assertString(empty()).isNull();
- }
-
@Test
public void a06_assertThrowable() {
assertThrowable(null).isNull();
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 4e6f5f0d7..43b5797f7 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
@@ -14,152 +14,140 @@ package org.apache.juneau.cp;
import static java.util.Locale.*;
import static org.apache.juneau.assertions.Assertions.*;
+import static org.junit.jupiter.api.Assertions.*;
import static org.junit.runners.MethodSorters.*;
import java.util.*;
+import org.apache.juneau.*;
import org.apache.juneau.cp.test3.*;
import org.apache.juneau.cp.test4.*;
-import org.junit.*;
+import org.junit.jupiter.api.*;
-@FixMethodOrder(NAME_ASCENDING)
-public class Messages_Test {
+public class Messages_Test extends SimpleTestBase {
- @Test
- public void a01_sameDirectory() {
+ @Test void a01_sameDirectory() {
Messages x1 = Messages.of(MessageBundleTest1.class);
-
assertString(x1.getString("file")).is("MessageBundleTest1.properties");
-
assertString(x1.forLocale(JAPANESE).getString("file")).is("MessageBundleTest1_ja.properties");
-
assertString(x1.forLocale(JAPAN).getString("file")).is("MessageBundleTest1_ja_JP.properties");
-
assertString(x1.forLocale(CHINA).getString("file")).is("MessageBundleTest1.properties");
-
assertString(x1.forLocale((Locale)null).getString("file")).is("MessageBundleTest1.properties");
+ assertEquals("MessageBundleTest1.properties",
x1.getString("file"));
+ assertEquals("MessageBundleTest1_ja.properties",
x1.forLocale(JAPANESE).getString("file"));
+ assertEquals("MessageBundleTest1_ja_JP.properties",
x1.forLocale(JAPAN).getString("file"));
+ assertEquals("MessageBundleTest1.properties",
x1.forLocale(CHINA).getString("file"));
+ assertEquals("MessageBundleTest1.properties",
x1.forLocale((Locale)null).getString("file"));
}
- @Test
- public void a02_customName() {
+ @Test void a02_customName() {
Messages x1 = Messages.of(MessageBundleTest1.class,
"files/Test1");
- assertString(x1.getString("file")).is("files/Test1.properties");
-
assertString(x1.forLocale(JAPANESE).getString("file")).is("files/Test1_ja.properties");
-
assertString(x1.forLocale(JAPAN).getString("file")).is("files/Test1_ja_JP.properties");
-
assertString(x1.forLocale(CHINA).getString("file")).is("files/Test1.properties");
-
assertString(x1.forLocale((Locale)null).getString("file")).is("files/Test1.properties");
+ assertEquals("files/Test1.properties", x1.getString("file"));
+ assertEquals("files/Test1_ja.properties",
x1.forLocale(JAPANESE).getString("file"));
+ assertEquals("files/Test1_ja_JP.properties",
x1.forLocale(JAPAN).getString("file"));
+ assertEquals("files/Test1.properties",
x1.forLocale(CHINA).getString("file"));
+ assertEquals("files/Test1.properties",
x1.forLocale((Locale)null).getString("file"));
Messages x2 =
Messages.create(MessageBundleTest1.class).name(null).build();
-
assertString(x2.getString("file")).is("MessageBundleTest1.properties");
-
assertString(x2.forLocale(JAPANESE).getString("file")).is("MessageBundleTest1_ja.properties");
-
assertString(x2.forLocale(JAPAN).getString("file")).is("MessageBundleTest1_ja_JP.properties");
-
assertString(x2.forLocale(CHINA).getString("file")).is("MessageBundleTest1.properties");
-
assertString(x2.forLocale((Locale)null).getString("file")).is("MessageBundleTest1.properties");
+ assertEquals("MessageBundleTest1.properties",
x2.getString("file"));
+ assertEquals("MessageBundleTest1_ja.properties",
x2.forLocale(JAPANESE).getString("file"));
+ assertEquals("MessageBundleTest1_ja_JP.properties",
x2.forLocale(JAPAN).getString("file"));
+ assertEquals("MessageBundleTest1.properties",
x2.forLocale(CHINA).getString("file"));
+ assertEquals("MessageBundleTest1.properties",
x2.forLocale((Locale)null).getString("file"));
}
- @Test
- public void a03_customSearchPaths() {
+ @Test void a03_customSearchPaths() {
Messages x =
Messages.create(MessageBundleTest1.class).name("Test1").baseNames("{package}.files.{name}").build();
- assertString(x.getString("file")).is("files/Test1.properties");
-
assertString(x.forLocale(JAPANESE).getString("file")).is("files/Test1_ja.properties");
-
assertString(x.forLocale(JAPAN).getString("file")).is("files/Test1_ja_JP.properties");
-
assertString(x.forLocale(CHINA).getString("file")).is("files/Test1.properties");
-
assertString(x.forLocale((Locale)null).getString("file")).is("files/Test1.properties");
+ assertEquals("files/Test1.properties", x.getString("file"));
+ assertEquals("files/Test1_ja.properties",
x.forLocale(JAPANESE).getString("file"));
+ assertEquals("files/Test1_ja_JP.properties",
x.forLocale(JAPAN).getString("file"));
+ assertEquals("files/Test1.properties",
x.forLocale(CHINA).getString("file"));
+ assertEquals("files/Test1.properties",
x.forLocale((Locale)null).getString("file"));
Messages x2 =
Messages.create(MessageBundleTest1.class).name("Test1").baseNames((String[])null).build();
- assertString(x2.getString("file")).is("{!file}");
+ assertEquals("{!file}", x2.getString("file"));
}
- @Test
- public void a04_customLocale() {
+ @Test void a04_customLocale() {
Messages x1 =
Messages.create(MessageBundleTest1.class).locale(Locale.JAPAN).build();
-
assertString(x1.getString("file")).is("MessageBundleTest1_ja_JP.properties");
-
assertString(x1.forLocale(JAPANESE).getString("file")).is("MessageBundleTest1_ja.properties");
-
assertString(x1.forLocale(JAPAN).getString("file")).is("MessageBundleTest1_ja_JP.properties");
-
assertString(x1.forLocale(CHINA).getString("file")).is("MessageBundleTest1.properties");
-
assertString(x1.forLocale((Locale)null).getString("file")).is("MessageBundleTest1.properties");
+ assertEquals("MessageBundleTest1_ja_JP.properties",
x1.getString("file"));
+ assertEquals("MessageBundleTest1_ja.properties",
x1.forLocale(JAPANESE).getString("file"));
+ assertEquals("MessageBundleTest1_ja_JP.properties",
x1.forLocale(JAPAN).getString("file"));
+ assertEquals("MessageBundleTest1.properties",
x1.forLocale(CHINA).getString("file"));
+ assertEquals("MessageBundleTest1.properties",
x1.forLocale((Locale)null).getString("file"));
Messages x2 =
Messages.create(MessageBundleTest1.class).locale((Locale)null).build();
-
assertString(x2.getString("file")).is("MessageBundleTest1.properties");
-
assertString(x2.forLocale(JAPANESE).getString("file")).is("MessageBundleTest1_ja.properties");
-
assertString(x2.forLocale(JAPAN).getString("file")).is("MessageBundleTest1_ja_JP.properties");
-
assertString(x2.forLocale(CHINA).getString("file")).is("MessageBundleTest1.properties");
-
assertString(x2.forLocale((Locale)null).getString("file")).is("MessageBundleTest1.properties");
+ assertEquals("MessageBundleTest1.properties",
x2.getString("file"));
+ assertEquals("MessageBundleTest1_ja.properties",
x2.forLocale(JAPANESE).getString("file"));
+ assertEquals("MessageBundleTest1_ja_JP.properties",
x2.forLocale(JAPAN).getString("file"));
+ assertEquals("MessageBundleTest1.properties",
x2.forLocale(CHINA).getString("file"));
+ assertEquals("MessageBundleTest1.properties",
x2.forLocale((Locale)null).getString("file"));
}
- @Test
- public void a05_nonExistentBundle() {
+ @Test void a05_nonExistentBundle() {
Messages x1 = Messages.of(MessageBundleTest1.class, "Bad");
- assertString(x1.getString("file")).is("{!file}");
-
assertString(x1.forLocale(JAPANESE).getString("file")).is("{!file}");
-
assertString(x1.forLocale(JAPAN).getString("file")).is("{!file}");
-
assertString(x1.forLocale(CHINA).getString("file")).is("{!file}");
-
assertString(x1.forLocale((Locale)null).getString("file")).is("{!file}");
+ assertEquals("{!file}", x1.getString("file"));
+ assertEquals("{!file}",
x1.forLocale(JAPANESE).getString("file"));
+ assertEquals("{!file}", x1.forLocale(JAPAN).getString("file"));
+ assertEquals("{!file}", x1.forLocale(CHINA).getString("file"));
+ assertEquals("{!file}",
x1.forLocale((Locale)null).getString("file"));
Messages x2 = x1.forLocale(JAPANESE);
- assertString(x2.getString("file")).is("{!file}");
+ assertEquals("{!file}", x2.getString("file"));
}
- @Test
- public void a06_parent() {
+ @Test void a06_parent() {
Messages x1 =
Messages.create(MessageBundleTest1.class).name("Bad").parent(Messages.of(Test2.class)).build();
- assertString(x1.getString("file")).is("Test2.properties");
-
assertString(x1.forLocale(JAPANESE).getString("file")).is("Test2_ja.properties");
-
assertString(x1.forLocale(JAPAN).getString("file")).is("Test2_ja_JP.properties");
-
assertString(x1.forLocale(CHINA).getString("file")).is("Test2.properties");
-
assertString(x1.forLocale((Locale)null).getString("file")).is("Test2.properties");
+ assertEquals("Test2.properties", x1.getString("file"));
+ assertEquals("Test2_ja.properties",
x1.forLocale(JAPANESE).getString("file"));
+ assertEquals("Test2_ja_JP.properties",
x1.forLocale(JAPAN).getString("file"));
+ assertEquals("Test2.properties",
x1.forLocale(CHINA).getString("file"));
+ assertEquals("Test2.properties",
x1.forLocale((Locale)null).getString("file"));
Messages x2 =
Messages.create(MessageBundleTest1.class).parent(Messages.of(Test2.class)).build();
-
assertString(x2.getString("file")).is("MessageBundleTest1.properties");
- assertString(x2.getString("yyy")).is("bar");
+ assertEquals("MessageBundleTest1.properties",
x2.getString("file"));
+ assertEquals("bar", x2.getString("yyy"));
}
- @Test
- public void a07_nonExistentMessage() {
+ @Test void a07_nonExistentMessage() {
Messages x =
Messages.create(MessageBundleTest1.class).name("Bad").parent(Messages.of(Test2.class)).build();
- assertString(x.getString("bad")).is("{!bad}");
+ assertEquals("{!bad}", x.getString("bad"));
}
- @Test
- public void a08_nonExistentMessage() {
+ @Test void a08_nonExistentMessage() {
Messages x =
Messages.create(MessageBundleTest1.class).name("Bad").parent(Messages.of(Test2.class)).build();
- assertString(x.getString("bad")).is("{!bad}");
+ assertEquals("{!bad}", x.getString("bad"));
}
- @Test
- public void a09_keySet_prefix() {
+ @Test void a09_keySet_prefix() {
Messages x = Messages.of(MessageBundleTest1.class);
assertObject(new
TreeSet<>(x.keySet("xx"))).asJson().is("['xx','xx.','xx.foo']");
}
- @Test
- public void a10_getString() {
+ @Test void a10_getString() {
Messages x = Messages.of(MessageBundleTest1.class);
- assertString(x.getString("foo","bar")).is("foo bar");
- assertString(x.getString("bar","bar")).is("bar bar");
- assertString(x.getString("baz","bar")).is("{!baz}");
-
assertString(x.forLocale(JAPAN).getString("foo","bar")).is("fooja bar");
- assertString(x.forLocale(CHINA).getString("foo","bar")).is("foo
bar");
- assertString(x.forLocale(null).getString("foo","bar")).is("foo
bar");
- assertString(x.forLocale(JAPAN).getString("baz")).is("baz");
- assertString(x.forLocale(CHINA).getString("baz")).is("{!baz}");
- assertString(x.forLocale(null).getString("baz")).is("{!baz}");
+ assertEquals("foo bar", x.getString("foo","bar"));
+ assertEquals("bar bar", x.getString("bar","bar"));
+ assertEquals("{!baz}", x.getString("baz","bar"));
+ assertEquals("fooja bar",
x.forLocale(JAPAN).getString("foo","bar"));
+ assertEquals("foo bar",
x.forLocale(CHINA).getString("foo","bar"));
+ assertEquals("foo bar",
x.forLocale(null).getString("foo","bar"));
+ assertEquals("baz", x.forLocale(JAPAN).getString("baz"));
+ assertEquals("{!baz}", x.forLocale(CHINA).getString("baz"));
+ assertEquals("{!baz}", x.forLocale(null).getString("baz"));
}
- @Test
- public void a11_findFirstString() {
+ @Test void a11_findFirstString() {
Messages x = Messages.of(MessageBundleTest1.class);
- assertString(x.findFirstString("baz","foo")).is("foo {0}");
+ assertEquals("foo {0}", x.findFirstString("baz","foo"));
assertString(x.findFirstString("baz","baz")).isNull();
-
assertString(x.forLocale(JAPAN).findFirstString("baz","foo")).is("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();
}
- @Test
- public void a12_getKeys() {
+ @Test void a12_getKeys() {
Messages x = Messages.of(Test2.class);
assertObject(x.getKeys()).asJson().is("['file','yyy']");
}
- @Test
- public void a13_toString() {
+ @Test void a13_toString() {
Messages x = Messages.of(Test2.class);
- assertString(x).is("{file:'Test2.properties',yyy:'bar'}");
+ assertString("{file:'Test2.properties',yyy:'bar'}", x);
}
}
\ No newline at end of file
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 ff05b3b08..871a09d90 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
@@ -18,34 +18,32 @@ import static org.junit.runners.MethodSorters.*;
import java.net.*;
+import org.apache.juneau.*;
import org.apache.juneau.bean.swagger.*;
import org.apache.juneau.json.*;
-import org.junit.*;
+import org.junit.jupiter.api.*;
/**
* Testcase for {@link Contact}.
*/
-@FixMethodOrder(NAME_ASCENDING)
-public class Contact_Test {
+class Contact_Test extends SimpleTestBase {
/**
* Test method for getters and setters.
*/
- @Test
- public void a01_gettersAndSetters() {
+ @Test void a01_gettersAndSetters() {
Contact t = new Contact();
- assertString(t.setName("foo").getName()).is("foo");
+ assertEquals("foo", t.setName("foo").getName());
assertString(t.setName(null).getName()).isNull();
-
assertString(t.setUrl(URI.create("http://bar";)).getUrl()).is("http://bar";);
- assertString(t.setEmail("foo").getEmail()).is("foo");
+ assertString("http://bar";,
t.setUrl(URI.create("http://bar";)).getUrl());
+ assertEquals("foo", t.setEmail("foo").getEmail());
assertString(t.setEmail(null).getEmail()).isNull();
}
/**
* Test method for {@link Contact#set(String, Object)}.
*/
- @Test
- public void b01_set() throws Exception {
+ @Test void b01_set() throws Exception {
Contact t = new Contact();
t
@@ -77,8 +75,7 @@ public class Contact_Test {
assertObject(JsonParser.DEFAULT.parse("{name:'foo',url:'bar',email:'baz','$ref':'qux'}",
Contact.class)).asJson().is("{name:'foo',url:'bar',email:'baz','$ref':'qux'}");
}
- @Test
- public void b02_copy() {
+ @Test void b02_copy() {
Contact t = new Contact();
t = t.copy();
@@ -95,8 +92,7 @@ public class Contact_Test {
assertObject(t).asJson().is("{name:'foo',url:'bar',email:'baz','$ref':'qux'}");
}
- @Test
- public void b03_keySet() {
+ @Test void b03_keySet() {
Contact t = new Contact();
assertObject(t.keySet()).asJson().is("[]");
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 cbb9602c8..d2cc48b85 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
@@ -18,32 +18,30 @@ import static org.junit.runners.MethodSorters.*;
import java.net.*;
+import org.apache.juneau.*;
import org.apache.juneau.bean.swagger.*;
import org.apache.juneau.json.*;
-import org.junit.*;
+import org.junit.jupiter.api.*;
/**
* Testcase for {@link ExternalDocumentation}.
*/
-@FixMethodOrder(NAME_ASCENDING)
-public class ExternalDocumentation_Test {
+class ExternalDocumentation_Test extends SimpleTestBase {
/**
* Test method for getters and setters.
*/
- @Test
- public void a01_gettersAndSetters() {
+ @Test void a01_gettersAndSetters() {
ExternalDocumentation t = new ExternalDocumentation();
-
assertString(t.setDescription("foo").getDescription()).is("foo");
+ assertEquals("foo", t.setDescription("foo").getDescription());
assertString(t.setDescription(null).getDescription()).isNull();
-
assertString(t.setUrl(URI.create("http://bar";)).getUrl()).is("http://bar";);
+ assertString("http://bar";,
t.setUrl(URI.create("http://bar";)).getUrl());
}
/**
* Test method for {@link ExternalDocumentation#set(java.lang.String,
java.lang.Object)}.
*/
- @Test
- public void b01_set() throws Exception {
+ @Test void b01_set() throws Exception {
ExternalDocumentation t = new ExternalDocumentation();
t
@@ -72,8 +70,7 @@ public class ExternalDocumentation_Test {
assertObject(JsonParser.DEFAULT.parse("{description:'foo',url:'bar','$ref':'baz'}",
ExternalDocumentation.class)).asJson().is("{description:'foo',url:'bar','$ref':'baz'}");
}
- @Test
- public void b02_copy() {
+ @Test void b02_copy() {
ExternalDocumentation t = new ExternalDocumentation();
t = t.copy();
@@ -89,8 +86,7 @@ public class ExternalDocumentation_Test {
assertObject(t).asJson().is("{description:'foo',url:'bar','$ref':'baz'}");
}
- @Test
- public void b03_keySet() {
+ @Test void b03_keySet() {
ExternalDocumentation t = new ExternalDocumentation();
assertObject(t.keySet()).asJson().is("[]");
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 159166f74..4019c6c08 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
@@ -36,17 +36,17 @@ public class HeaderInfo_Test {
@Test
public void a01_gettersAndSetters() {
HeaderInfo t = new HeaderInfo();
-
assertString(t.setDescription("foo").getDescription()).is("foo");
+ assertEquals("foo", t.setDescription("foo").getDescription());
assertString(t.setDescription(null).getDescription()).isNull();
- assertString(t.setType("foo").getType()).is("foo");
+ assertEquals("foo", t.setType("foo").getType());
assertString(t.setType(null).getType()).isNull();
- assertString(t.setFormat("foo").getFormat()).is("foo");
+ assertEquals("foo", t.setFormat("foo").getFormat());
assertString(t.setFormat(null).getFormat()).isNull();
assertObject(t.setItems(items("foo")).getItems()).asJson().is("{type:'foo'}");
assertNull(t.setItems((Items)null).getItems());
-
assertString(t.setCollectionFormat("foo").getCollectionFormat()).is("foo");
+ assertEquals("foo",
t.setCollectionFormat("foo").getCollectionFormat());
assertString(t.setCollectionFormat(null).getCollectionFormat()).isNull();
- assertString(t.setDefault("foo").getDefault()).is("foo");
+ assertEquals("foo", t.setDefault("foo").getDefault());
assertObject(t.setDefault(new
StringBuilder("foo")).getDefault()).isType(StringBuilder.class).asString().is("foo");
assertNull(t.setDefault(null).getDefault());
assertObject(t.setMaximum(123).getMaximum()).isType(Integer.class).is(123);
@@ -57,7 +57,7 @@ public class HeaderInfo_Test {
assertObject(t.setExclusiveMinimum(true).getExclusiveMinimum()).isType(Boolean.class).is(true);
assertObject(t.setMaxLength(123).getMaxLength()).isType(Integer.class).is(123);
assertObject(t.setMinLength(123).getMinLength()).isType(Integer.class).is(123);
- assertString(t.setPattern("foo").getPattern()).is("foo");
+ assertEquals("foo", t.setPattern("foo").getPattern());
assertString(t.setPattern(null).getPattern()).isNull();
assertObject(t.setMaxItems(123).getMaxItems()).isType(Integer.class).is(123);
assertObject(t.setMinItems(123).getMinItems()).isType(Integer.class).is(123);
@@ -73,7 +73,7 @@ public class HeaderInfo_Test {
assertObject(t.setExample("foo").getExample()).isType(String.class).is("foo");
assertObject(t.setExample(123f).getExample()).isType(Float.class).is(123f);
assertNull(t.setExample((String)null).getExample());
- assertString(t.setRef("foo").getRef()).is("foo");
+ assertEquals("foo", t.setRef("foo").getRef());
assertNull(t.setRef(null).getRef());
}
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 289376068..c76d993f1 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
@@ -33,15 +33,15 @@ public class Info_Test {
@Test
public void a01_gettersAndSetters() {
Info t = new Info();
- assertString(t.setTitle("foo").getTitle()).is("foo");
+ assertEquals("foo", t.setTitle("foo").getTitle());
assertString(t.setTitle(null).getTitle()).isNull();
-
assertString(t.setDescription("foo").getDescription()).is("foo");
+ assertEquals("foo", t.setDescription("foo").getDescription());
assertString(t.setDescription(null).getDescription()).isNull();
-
assertString(t.setTermsOfService("foo").getTermsOfService()).is("foo");
+ assertEquals("foo",
t.setTermsOfService("foo").getTermsOfService());
assertString(t.setTermsOfService(null).getTermsOfService()).isNull();
assertObject(t.setContact(contact("foo")).getContact()).asJson().is("{name:'foo'}");
assertObject(t.setLicense(license("foo")).getLicense()).isType(License.class).asJson().is("{name:'foo'}");
- assertString(t.setVersion("foo").getVersion()).is("foo");
+ assertEquals("foo", t.setVersion("foo").getVersion());
assertString(t.setVersion(null).getVersion()).isNull();
}
@@ -85,13 +85,13 @@ public class Info_Test {
assertObject(t).asJson().is("{title:'e',description:'b',version:'f',contact:{name:'a'},license:{name:'c'},termsOfService:'d','$ref':'ref'}");
- assertString(t.get("contact", String.class)).is("{name:'a'}");
- assertString(t.get("description", String.class)).is("b");
- assertString(t.get("license", String.class)).is("{name:'c'}");
- assertString(t.get("termsOfService", String.class)).is("d");
- assertString(t.get("title", String.class)).is("e");
- assertString(t.get("version", String.class)).is("f");
- assertString(t.get("$ref", String.class)).is("ref");
+ assertEquals("{name:'a'}", t.get("contact", String.class));
+ assertEquals("b", t.get("description", String.class));
+ assertEquals("{name:'c'}", t.get("license", String.class));
+ assertEquals("d", t.get("termsOfService", String.class));
+ assertEquals("e", t.get("title", String.class));
+ assertEquals("f", t.get("version", String.class));
+ assertEquals("ref", t.get("$ref", String.class));
assertObject(t.get("contact",
Object.class)).isType(Contact.class);
assertObject(t.get("description",
Object.class)).isType(String.class);
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 c44cad28b..4e361282f 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
@@ -36,12 +36,12 @@ public class Items_Test {
@Test
public void a01_gettersAndSetters() {
Items t = new Items();
- assertString(t.setType("foo").getType()).is("foo");
+ assertEquals("foo", t.setType("foo").getType());
assertString(t.setType(null).getType()).isNull();
- assertString(t.setFormat("foo").getFormat()).is("foo");
+ assertEquals("foo", t.setFormat("foo").getFormat());
assertString(t.setFormat(null).getFormat()).isNull();
assertObject(t.setItems(items("foo")).getItems()).asJson().is("{type:'foo'}");
-
assertString(t.setCollectionFormat("foo").getCollectionFormat()).is("foo");
+ assertEquals("foo",
t.setCollectionFormat("foo").getCollectionFormat());
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");
@@ -54,7 +54,7 @@ public class Items_Test {
assertObject(t.setExclusiveMinimum(true).getExclusiveMinimum()).isType(Boolean.class).is(true);
assertObject(t.setMaxLength(123).getMaxLength()).isType(Integer.class).is(123);
assertObject(t.setMinLength(123).getMinLength()).isType(Integer.class).is(123);
- assertString(t.setPattern("foo").getPattern()).is("foo");
+ assertEquals("foo", t.setPattern("foo").getPattern());
assertString(t.setPattern(null).getPattern()).isNull();
assertObject(t.setMaxItems(123).getMaxItems()).isType(Integer.class).is(123);
assertObject(t.setMinItems(123).getMinItems()).isType(Integer.class).is(123);
@@ -142,24 +142,24 @@ public class Items_Test {
assertObject(t).asJson().is("{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'}");
- assertString(t.get("default", String.class)).is("a");
- assertString(t.get("enum", String.class)).is("['b']");
- assertString(t.get("collectionFormat", String.class)).is("c");
- assertString(t.get("exclusiveMaximum",
String.class)).is("true");
- assertString(t.get("exclusiveMinimum",
String.class)).is("true");
- assertString(t.get("format", String.class)).is("g");
- assertString(t.get("items", String.class)).is("{type:'h'}");
- assertString(t.get("maximum", String.class)).is("123.0");
- assertString(t.get("maxItems", String.class)).is("123");
- assertString(t.get("maxLength", String.class)).is("123");
- assertString(t.get("minimum", String.class)).is("123.0");
- assertString(t.get("minItems", String.class)).is("123");
- assertString(t.get("minLength", String.class)).is("123");
- assertString(t.get("multipleOf", String.class)).is("123.0");
- assertString(t.get("pattern", String.class)).is("i");
- assertString(t.get("type", String.class)).is("j");
- assertString(t.get("uniqueItems", String.class)).is("true");
- assertString(t.get("$ref", String.class)).is("ref");
+ assertEquals("a", t.get("default", String.class));
+ assertEquals("['b']", t.get("enum", String.class));
+ assertEquals("c", t.get("collectionFormat", String.class));
+ assertEquals("true", t.get("exclusiveMaximum", String.class));
+ assertEquals("true", t.get("exclusiveMinimum", String.class));
+ assertEquals("g", t.get("format", String.class));
+ assertEquals("{type:'h'}", t.get("items", String.class));
+ assertEquals("123.0", t.get("maximum", String.class));
+ assertEquals("123", t.get("maxItems", String.class));
+ assertEquals("123", t.get("maxLength", String.class));
+ assertEquals("123.0", t.get("minimum", String.class));
+ assertEquals("123", t.get("minItems", String.class));
+ assertEquals("123", t.get("minLength", String.class));
+ assertEquals("123.0", t.get("multipleOf", String.class));
+ assertEquals("i", t.get("pattern", String.class));
+ assertEquals("j", t.get("type", String.class));
+ assertEquals("true", t.get("uniqueItems", String.class));
+ assertEquals("ref", t.get("$ref", String.class));
assertObject(t.get("default",
Object.class)).isType(StringBuilder.class);
assertObject(t.get("enum", Object.class)).isType(Set.class);
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 1a205a22b..a7926660c 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
@@ -34,7 +34,7 @@ public class License_Test {
@Test
public void a01_gettersAndSetters() {
License t = new License();
- assertString(t.setName("foo").getName()).is("foo");
+ assertEquals("foo", t.setName("foo").getName());
assertString(t.setName(null).getName()).isNull();
assertObject(t.setUrl(URI.create("foo")).getUrl()).isType(URI.class).asString().is("foo");
}
@@ -67,9 +67,9 @@ public class License_Test {
assertObject(t).asJson().is("{name:'a',url:'b','$ref':'ref'}");
- assertString(t.get("name", String.class)).is("a");
- assertString(t.get("url", String.class)).is("b");
- assertString(t.get("$ref", String.class)).is("ref");
+ assertEquals("a", t.get("name", String.class));
+ assertEquals("b", t.get("url", String.class));
+ assertEquals("ref", t.get("$ref", String.class));
assertObject(t.get("name", Object.class)).isType(String.class);
assertObject(t.get("url", Object.class)).isType(URI.class);
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 7dfc89455..b7d054831 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
@@ -41,10 +41,10 @@ public class Operation_Test {
assertObject(t.setTags("bar","baz").getTags()).isType(Set.class).asJson().is("['bar','baz']");
assertObject(t.setTags(set()).getTags()).isType(Set.class).asJson().is("[]");
assertNull(t.setTags((Collection<String>)null).getTags());
- assertString(t.setSummary("foo").getSummary()).is("foo");
-
assertString(t.setDescription("foo").getDescription()).is("foo");
+ assertEquals("foo", t.setSummary("foo").getSummary());
+ assertEquals("foo", t.setDescription("foo").getDescription());
assertObject(t.setExternalDocs(externalDocumentation("foo")).getExternalDocs()).isType(ExternalDocumentation.class).asJson().is("{url:'foo'}");
-
assertString(t.setOperationId("foo").getOperationId()).is("foo");
+ assertEquals("foo", t.setOperationId("foo").getOperationId());
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("[]");
assertNull(t.setConsumes((Collection<MediaType>)null).getConsumes());
@@ -124,19 +124,19 @@ public class Operation_Test {
assertObject(t).asJson().is("{operationId:'d',summary:'j',description:'b',tags:['k'],externalDocs:{url:'c'},consumes:['text/a'],produces:['text/f'],parameters:[{'in':'e1',name:'e2'}],responses:{'1':{description:'g'}},schemes:['h'],deprecated:true,security:[{i1:['i2']}],'$ref':'ref'}");
- assertString(t.get("consumes", String.class)).is("['text/a']");
- assertString(t.get("deprecated", String.class)).is("true");
- assertString(t.get("description", String.class)).is("b");
- assertString(t.get("externalDocs",
String.class)).is("{url:'c'}");
- assertString(t.get("operationId", String.class)).is("d");
- assertString(t.get("parameters",
String.class)).is("[{'in':'e1',name:'e2'}]");
- assertString(t.get("produces", String.class)).is("['text/f']");
- assertString(t.get("responses",
String.class)).is("{'1':{description:'g'}}");
- assertString(t.get("schemes", String.class)).is("['h']");
- assertString(t.get("security",
String.class)).is("[{i1:['i2']}]");
- assertString(t.get("summary", String.class)).is("j");
- assertString(t.get("tags", String.class)).is("['k']");
- assertString(t.get("$ref", String.class)).is("ref");
+ assertEquals("['text/a']", t.get("consumes", String.class));
+ assertEquals("true", t.get("deprecated", String.class));
+ assertEquals("b", t.get("description", String.class));
+ assertEquals("{url:'c'}", t.get("externalDocs", String.class));
+ assertEquals("d", t.get("operationId", String.class));
+ assertEquals("[{'in':'e1',name:'e2'}]", t.get("parameters",
String.class));
+ assertEquals("['text/f']", t.get("produces", String.class));
+ assertEquals("{'1':{description:'g'}}", t.get("responses",
String.class));
+ assertEquals("['h']", t.get("schemes", String.class));
+ assertEquals("[{i1:['i2']}]", t.get("security", String.class));
+ assertEquals("j", t.get("summary", String.class));
+ assertEquals("['k']", t.get("tags", String.class));
+ assertEquals("ref", t.get("$ref", String.class));
assertObject(t.get("consumes", Object.class)).isType(Set.class);
assertObject(t.get("consumes",
List.class).get(0)).isType(MediaType.class);
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 503bff424..ffdb1a61e 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
@@ -36,23 +36,23 @@ public class ParameterInfo_Test {
@Test
public void a01_gettersAndSetters() {
ParameterInfo t = new ParameterInfo();
- assertString(t.setName("foo").getName()).is("foo");
+ assertEquals("foo", t.setName("foo").getName());
assertNull(t.setName(null).getName());
- assertString(t.setIn("foo").getIn()).is("foo");
+ assertEquals("foo", t.setIn("foo").getIn());
assertString(t.setIn(null).getIn()).isNull();
-
assertString(t.setDescription("foo").getDescription()).is("foo");
+ assertEquals("foo", t.setDescription("foo").getDescription());
assertString(t.setDescription(null).getDescription()).isNull();
assertObject(t.setRequired(true).getRequired()).isType(Boolean.class).is(true);
assertObject(t.setSchema(schemaInfo().setTitle("foo")).getSchema()).asJson().is("{title:'foo'}");
- assertString(t.setType("foo").getType()).is("foo");
+ assertEquals("foo", t.setType("foo").getType());
assertString(t.setType(null).getType()).isNull();
- assertString(t.setFormat("foo").getFormat()).is("foo");
+ assertEquals("foo", t.setFormat("foo").getFormat());
assertString(t.setFormat(null).getFormat()).isNull();
assertObject(t.setAllowEmptyValue(true).getAllowEmptyValue()).isType(Boolean.class).is(true);
assertObject(t.setItems(items("foo")).getItems()).asJson().is("{type:'foo'}");
-
assertString(t.setCollectionFormat("foo").getCollectionFormat()).is("foo");
+ assertEquals("foo",
t.setCollectionFormat("foo").getCollectionFormat());
assertString(t.setCollectionFormat(null).getCollectionFormat()).isNull();
- assertString(t.setDefault("foo").getDefault()).is("foo");
+ assertEquals("foo", t.setDefault("foo").getDefault());
assertObject(t.setDefault(new
StringBuilder("foo")).getDefault()).isType(StringBuilder.class).asString().is("foo");
assertNull(t.setDefault(null).getDefault());
assertObject(t.setMaximum(123).getMaximum()).isType(Integer.class).is(123);
@@ -63,7 +63,7 @@ public class ParameterInfo_Test {
assertObject(t.setExclusiveMinimum(true).getExclusiveMinimum()).isType(Boolean.class).is(true);
assertObject(t.setMaxLength(123).getMaxLength()).isType(Integer.class).is(123);
assertObject(t.setMinLength(123).getMinLength()).isType(Integer.class).is(123);
- assertString(t.setPattern("foo").getPattern()).is("foo");
+ assertEquals("foo", t.setPattern("foo").getPattern());
assertString(t.setPattern(null).getPattern()).isNull();
assertObject(t.setMaxItems(123).getMaxItems()).isType(Integer.class).is(123);
assertObject(t.setMinItems(123).getMinItems()).isType(Integer.class).is(123);
@@ -168,30 +168,30 @@ public class ParameterInfo_Test {
assertObject(t).asJson().is("{'in':'f',name:'h',type:'k',description:'d',required:true,schema:{title:'j'},format:'e',allowEmptyValue:true,items:{type:'g'},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'}");
- assertString(t.get("default", String.class)).is("a");
- assertString(t.get("enum", String.class)).is("['b']");
- assertString(t.get("allowEmptyValue", String.class)).is("true");
- assertString(t.get("collectionFormat", String.class)).is("c");
- assertString(t.get("description", String.class)).is("d");
- assertString(t.get("exclusiveMaximum",
String.class)).is("true");
- assertString(t.get("exclusiveMinimum",
String.class)).is("true");
- assertString(t.get("format", String.class)).is("e");
- assertString(t.get("in", String.class)).is("f");
- assertString(t.get("items", String.class)).is("{type:'g'}");
- assertString(t.get("maximum", String.class)).is("123.0");
- assertString(t.get("maxItems", String.class)).is("123");
- assertString(t.get("maxLength", String.class)).is("123");
- assertString(t.get("minimum", String.class)).is("123.0");
- assertString(t.get("minItems", String.class)).is("123");
- assertString(t.get("minLength", String.class)).is("123");
- assertString(t.get("multipleOf", String.class)).is("123.0");
- assertString(t.get("name", String.class)).is("h");
- assertString(t.get("pattern", String.class)).is("i");
- assertString(t.get("required", String.class)).is("true");
- assertString(t.get("schema", String.class)).is("{title:'j'}");
- assertString(t.get("type", String.class)).is("k");
- assertString(t.get("uniqueItems", String.class)).is("true");
- assertString(t.get("$ref", String.class)).is("ref");
+ assertEquals("a", t.get("default", String.class));
+ assertEquals("['b']", t.get("enum", String.class));
+ assertEquals("true", t.get("allowEmptyValue", String.class));
+ assertEquals("c", t.get("collectionFormat", String.class));
+ assertEquals("d", t.get("description", String.class));
+ assertEquals("true", t.get("exclusiveMaximum", String.class));
+ assertEquals("true", t.get("exclusiveMinimum", String.class));
+ assertEquals("e", t.get("format", String.class));
+ assertEquals("f", t.get("in", String.class));
+ assertEquals("{type:'g'}", t.get("items", String.class));
+ assertEquals("123.0", t.get("maximum", String.class));
+ assertEquals("123", t.get("maxItems", String.class));
+ assertEquals("123", t.get("maxLength", String.class));
+ assertEquals("123.0", t.get("minimum", String.class));
+ assertEquals("123", t.get("minItems", String.class));
+ assertEquals("123", t.get("minLength", String.class));
+ assertEquals("123.0", t.get("multipleOf", String.class));
+ assertEquals("h", t.get("name", String.class));
+ assertEquals("i", t.get("pattern", String.class));
+ assertEquals("true", t.get("required", String.class));
+ assertEquals("{title:'j'}", t.get("schema", String.class));
+ assertEquals("k", t.get("type", String.class));
+ assertEquals("true", t.get("uniqueItems", String.class));
+ assertEquals("ref", t.get("$ref", String.class));
assertObject(t.get("default",
Object.class)).isType(StringBuilder.class);
assertObject(t.get("enum", Object.class)).isType(Set.class);
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 5fb3fc48e..63bd7bfc5 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
@@ -36,7 +36,7 @@ public class ResponseInfo_Test {
@Test
public void a01_gettersAndSetters() {
ResponseInfo t = new ResponseInfo();
-
assertString(t.setDescription("foo").getDescription()).is("foo");
+ assertEquals("foo", t.setDescription("foo").getDescription());
assertString(t.setDescription(null).getDescription()).isNull();
assertObject(t.setSchema(schemaInfo().setTitle("foo")).getSchema()).isType(SchemaInfo.class).asJson().is("{title:'foo'}");
assertObject(t.setHeaders(map("foo",headerInfo("bar"))).getHeaders()).isType(Map.class).asJson().is("{foo:{type:'bar'}}");
@@ -84,11 +84,11 @@ public class ResponseInfo_Test {
assertObject(t).asJson().is("{description:'a',schema:{type:'d'},headers:{a:{type:'a1'}},examples:{foo:'bar',baz:['qux']},'$ref':'ref'}");
- assertString(t.get("description", String.class)).is("a");
- assertString(t.get("examples",
String.class)).is("{foo:'bar',baz:['qux']}");
- assertString(t.get("headers",
String.class)).is("{a:{type:'a1'}}");
- assertString(t.get("schema", String.class)).is("{type:'d'}");
- assertString(t.get("$ref", String.class)).is("ref");
+ assertEquals("a", t.get("description", String.class));
+ assertEquals("{foo:'bar',baz:['qux']}", t.get("examples",
String.class));
+ assertEquals("{a:{type:'a1'}}", t.get("headers", String.class));
+ assertEquals("{type:'d'}", t.get("schema", String.class));
+ assertEquals("ref", t.get("$ref", String.class));
assertObject(t.get("description",
Object.class)).isType(String.class);
assertObject(t.get("examples", Object.class)).isType(Map.class);
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 d3e7ac9cd..0f2dc6e6c 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
@@ -36,13 +36,13 @@ public class SchemaInfo_Test {
@Test
public void a01_gettersAndSetters() {
SchemaInfo t = new SchemaInfo();
- assertString(t.setFormat("foo").getFormat()).is("foo");
+ assertEquals("foo", t.setFormat("foo").getFormat());
assertString(t.setFormat(null).getFormat()).isNull();
- assertString(t.setTitle("foo").getTitle()).is("foo");
+ assertEquals("foo", t.setTitle("foo").getTitle());
assertString(t.setTitle(null).getTitle()).isNull();
-
assertString(t.setDescription("foo").getDescription()).is("foo");
+ assertEquals("foo", t.setDescription("foo").getDescription());
assertString(t.setDescription(null).getDescription()).isNull();
- assertString(t.setDefault("foo").getDefault()).is("foo");
+ assertEquals("foo", t.setDefault("foo").getDefault());
assertObject(t.setDefault(new
StringBuilder("foo")).getDefault()).isType(StringBuilder.class).asString().is("foo");
assertNull(t.setDefault(null).getDefault());
assertObject(t.setMultipleOf(123).getMultipleOf()).isType(Integer.class).is(123);
@@ -55,7 +55,7 @@ public class SchemaInfo_Test {
assertObject(t.setExclusiveMinimum(true).getExclusiveMinimum()).isType(Boolean.class).is(true);
assertObject(t.setMaxLength(123).getMaxLength()).isType(Integer.class).is(123);
assertObject(t.setMinLength(123).getMinLength()).isType(Integer.class).is(123);
- assertString(t.setPattern("foo").getPattern()).is("foo");
+ assertEquals("foo", t.setPattern("foo").getPattern());
assertString(t.setPattern(null).getPattern()).isNull();
assertObject(t.setMaxItems(123).getMaxItems()).isType(Integer.class).is(123);
assertObject(t.setMinItems(123).getMinItems()).isType(Integer.class).is(123);
@@ -69,7 +69,7 @@ public class SchemaInfo_Test {
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");
+ assertEquals("foo", t.setType("foo").getType());
assertString(t.setType(null).getType()).isNull();
assertObject(t.setItems(items("foo")).getItems()).asJson().is("{type:'foo'}");
assertObject(t.setAllOf(set("foo","bar")).getAllOf()).isType(Set.class).asJson().is("['foo','bar']");
@@ -82,7 +82,7 @@ public class SchemaInfo_Test {
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("{}");
assertNull(t.setAdditionalProperties((SchemaInfo)null).getAdditionalProperties());
-
assertString(t.setDiscriminator("foo").getDiscriminator()).is("foo");
+ assertEquals("foo",
t.setDiscriminator("foo").getDiscriminator());
assertString(t.setDiscriminator(null).getDiscriminator()).isNull();
assertObject(t.setReadOnly(true).getReadOnly()).isType(Boolean.class).is(true);
assertObject(t.setXml(xml().setName("foo")).getXml()).asJson().is("{name:'foo'}");
@@ -201,36 +201,36 @@ public class SchemaInfo_Test {
assertObject(t).asJson().is("{format:'i',title:'m',description:'e','default':'a',multipleOf:123.0,maximum:123.0,exclusiveMaximum:true,minimum:123.0,exclusiveMinimum:true,maxLength:123,minLength:123,pattern:'k',maxItems:123,minItems:123,uniqueItems:true,maxProperties:123,minProperties:123,requiredProperties:['x'],'enum':['b'],type:'n',items:{type:'j'},allOf:['d'],properties:{l:{l1:1}},additionalProperties:{c:['c1']},discriminator:'f',readOnly:true,xml:{name:'o'},externalDocs:{url:'h'},e
[...]
- assertString(t.get("default", String.class)).is("a");
- assertString(t.get("enum", String.class)).is("['b']");
- assertString(t.get("additionalProperties",
String.class)).is("{c:['c1']}");
- assertString(t.get("allOf", String.class)).is("['d']");
- assertString(t.get("description", String.class)).is("e");
- assertString(t.get("discriminator", String.class)).is("f");
- assertString(t.get("example", String.class)).is("g");
- assertString(t.get("exclusiveMaximum",
String.class)).is("true");
- assertString(t.get("exclusiveMinimum",
String.class)).is("true");
- assertString(t.get("externalDocs",
String.class)).is("{url:'h'}");
- assertString(t.get("format", String.class)).is("i");
- assertString(t.get("items", String.class)).is("{type:'j'}");
- assertString(t.get("maximum", String.class)).is("123.0");
- assertString(t.get("maxItems", String.class)).is("123");
- assertString(t.get("maxLength", String.class)).is("123");
- assertString(t.get("maxProperties", String.class)).is("123");
- assertString(t.get("minimum", String.class)).is("123.0");
- assertString(t.get("minItems", String.class)).is("123");
- assertString(t.get("minLength", String.class)).is("123");
- assertString(t.get("minProperties", String.class)).is("123");
- assertString(t.get("multipleOf", String.class)).is("123.0");
- assertString(t.get("pattern", String.class)).is("k");
- assertString(t.get("properties",
String.class)).is("{l:{l1:1}}");
- assertString(t.get("readOnly", String.class)).is("true");
- assertString(t.get("requiredProperties",
String.class)).is("['x']");
- assertString(t.get("title", String.class)).is("m");
- assertString(t.get("type", String.class)).is("n");
- assertString(t.get("uniqueItems", String.class)).is("true");
- assertString(t.get("xml", String.class)).is("{name:'o'}");
- assertString(t.get("$ref", String.class)).is("ref");
+ assertEquals("a", t.get("default", String.class));
+ assertEquals("['b']", t.get("enum", String.class));
+ assertEquals("{c:['c1']}", t.get("additionalProperties",
String.class));
+ assertEquals("['d']", t.get("allOf", String.class));
+ assertEquals("e", t.get("description", String.class));
+ assertEquals("f", t.get("discriminator", String.class));
+ assertEquals("g", t.get("example", String.class));
+ assertEquals("true", t.get("exclusiveMaximum", String.class));
+ assertEquals("true", t.get("exclusiveMinimum", String.class));
+ assertEquals("{url:'h'}", t.get("externalDocs", String.class));
+ assertEquals("i", t.get("format", String.class));
+ assertEquals("{type:'j'}", t.get("items", String.class));
+ assertEquals("123.0", t.get("maximum", String.class));
+ assertEquals("123", t.get("maxItems", String.class));
+ assertEquals("123", t.get("maxLength", String.class));
+ assertEquals("123", t.get("maxProperties", String.class));
+ assertEquals("123.0", t.get("minimum", String.class));
+ assertEquals("123", t.get("minItems", String.class));
+ assertEquals("123", t.get("minLength", String.class));
+ assertEquals("123", t.get("minProperties", String.class));
+ assertEquals("123.0", t.get("multipleOf", String.class));
+ assertEquals("k", t.get("pattern", String.class));
+ assertEquals("{l:{l1:1}}", t.get("properties", String.class));
+ assertEquals("true", t.get("readOnly", String.class));
+ assertEquals("['x']", t.get("requiredProperties",
String.class));
+ assertEquals("m", t.get("title", String.class));
+ assertEquals("n", t.get("type", String.class));
+ assertEquals("true", t.get("uniqueItems", String.class));
+ assertEquals("{name:'o'}", t.get("xml", String.class));
+ assertEquals("ref", t.get("$ref", String.class));
assertObject(t.get("default",
Object.class)).isType(StringBuilder.class);
assertObject(t.get("enum", Object.class)).isType(Set.class);
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 9ec2fa454..d44938bce 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
@@ -35,19 +35,19 @@ public class SecurityScheme_Test {
@Test
public void a01_gettersAndSetters() {
SecurityScheme t = new SecurityScheme();
- assertString(t.setType("foo").getType()).is("foo");
+ assertEquals("foo", t.setType("foo").getType());
assertString(t.setType(null).getType()).isNull();
-
assertString(t.setDescription("foo").getDescription()).is("foo");
+ assertEquals("foo", t.setDescription("foo").getDescription());
assertString(t.setDescription(null).getDescription()).isNull();
- assertString(t.setName("foo").getName()).is("foo");
+ assertEquals("foo", t.setName("foo").getName());
assertString(t.setName(null).getName()).isNull();
- assertString(t.setIn("foo").getIn()).is("foo");
+ assertEquals("foo", t.setIn("foo").getIn());
assertString(t.setIn(null).getIn()).isNull();
- assertString(t.setFlow("foo").getFlow()).is("foo");
+ assertEquals("foo", t.setFlow("foo").getFlow());
assertString(t.setFlow(null).getFlow()).isNull();
-
assertString(t.setAuthorizationUrl("foo").getAuthorizationUrl()).is("foo");
+ assertEquals("foo",
t.setAuthorizationUrl("foo").getAuthorizationUrl());
assertString(t.setAuthorizationUrl(null).getAuthorizationUrl()).isNull();
- assertString(t.setTokenUrl("foo").getTokenUrl()).is("foo");
+ assertEquals("foo", t.setTokenUrl("foo").getTokenUrl());
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("{}");
@@ -100,15 +100,15 @@ public class SecurityScheme_Test {
assertObject(t).asJson().is("{type:'g',description:'b',name:'e','in':'d',flow:'c',authorizationUrl:'a',tokenUrl:'f',scopes:{foo:'bar'},'$ref':'ref'}");
- assertString(t.get("authorizationUrl", String.class)).is("a");
- assertString(t.get("description", String.class)).is("b");
- assertString(t.get("flow", String.class)).is("c");
- assertString(t.get("in", String.class)).is("d");
- assertString(t.get("name", String.class)).is("e");
- assertString(t.get("scopes", String.class)).is("{foo:'bar'}");
- assertString(t.get("tokenUrl", String.class)).is("f");
- assertString(t.get("type", String.class)).is("g");
- assertString(t.get("$ref", String.class)).is("ref");
+ assertEquals("a", t.get("authorizationUrl", String.class));
+ assertEquals("b", t.get("description", String.class));
+ assertEquals("c", t.get("flow", String.class));
+ assertEquals("d", t.get("in", String.class));
+ assertEquals("e", t.get("name", String.class));
+ assertEquals("{foo:'bar'}", t.get("scopes", String.class));
+ assertEquals("f", t.get("tokenUrl", String.class));
+ assertEquals("g", t.get("type", String.class));
+ assertEquals("ref", t.get("$ref", String.class));
assertObject(t.get("authorizationUrl",
Object.class)).isType(String.class);
assertObject(t.get("description",
Object.class)).isType(String.class);
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 4d22c1318..37137f887 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
@@ -38,12 +38,12 @@ public class Swagger_Test {
@Test
public void a01_gettersAndSetters() {
Swagger t = new Swagger();
- assertString(t.setSwagger("foo").getSwagger()).is("foo");
+ assertEquals("foo", t.setSwagger("foo").getSwagger());
assertString(t.setSwagger(null).getSwagger()).isNull();
assertObject(t.setInfo(info("foo",
"bar")).getInfo()).asJson().is("{title:'foo',version:'bar'}");
- assertString(t.setHost("foo").getHost()).is("foo");
+ assertEquals("foo", t.setHost("foo").getHost());
assertString(t.setHost(null).getHost()).isNull();
- assertString(t.setBasePath("foo").getBasePath()).is("foo");
+ assertEquals("foo", t.setBasePath("foo").getBasePath());
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("[]");
@@ -151,22 +151,22 @@ public class Swagger_Test {
assertObject(t).asJson().is("{swagger:'n',info:{title:'f1',version:'f2'},tags:[{name:'o'}],externalDocs:{url:'d'},basePath:'a',schemes:['k1'],consumes:['text/b'],produces:['text/i'],paths:{h:{h1:{operationId:'h2'}}},definitions:{c:{type:'c1'}},parameters:{g:{'in':'g1',name:'g2'}},responses:{j:{description:'j1'}},securityDefinitions:{m:{type:'m1'}},security:[{l1:['l2']}],'$ref':'ref'}");
- assertString(t.get("basePath", String.class)).is("a");
- assertString(t.get("consumes", String.class)).is("['text/b']");
- assertString(t.get("definitions",
String.class)).is("{c:{type:'c1'}}");
- assertString(t.get("externalDocs",
String.class)).is("{url:'d'}");
- assertString(t.get("host", String.class)).is("e");
- assertString(t.get("info",
String.class)).is("{title:'f1',version:'f2'}");
- assertString(t.get("parameters",
String.class)).is("{g:{'in':'g1',name:'g2'}}");
- assertString(t.get("paths",
String.class)).is("{h:{h1:{operationId:'h2'}}}");
- assertString(t.get("produces", String.class)).is("['text/i']");
- assertString(t.get("responses",
String.class)).is("{j:{description:'j1'}}");
- assertString(t.get("schemes", String.class)).is("['k1']");
- assertString(t.get("security",
String.class)).is("[{l1:['l2']}]");
- assertString(t.get("securityDefinitions",
String.class)).is("{m:{type:'m1'}}");
- assertString(t.get("swagger", String.class)).is("n");
- assertString(t.get("tags", String.class)).is("[{name:'o'}]");
- assertString(t.get("$ref", String.class)).is("ref");
+ assertEquals("a", t.get("basePath", String.class));
+ assertEquals("['text/b']", t.get("consumes", String.class));
+ assertEquals("{c:{type:'c1'}}", t.get("definitions",
String.class));
+ assertEquals("{url:'d'}", t.get("externalDocs", String.class));
+ assertEquals("e", t.get("host", String.class));
+ assertEquals("{title:'f1',version:'f2'}", t.get("info",
String.class));
+ assertEquals("{g:{'in':'g1',name:'g2'}}", t.get("parameters",
String.class));
+ assertEquals("{h:{h1:{operationId:'h2'}}}", t.get("paths",
String.class));
+ assertEquals("['text/i']", t.get("produces", String.class));
+ assertEquals("{j:{description:'j1'}}", t.get("responses",
String.class));
+ assertEquals("['k1']", t.get("schemes", String.class));
+ assertEquals("[{l1:['l2']}]", t.get("security", String.class));
+ assertEquals("{m:{type:'m1'}}", t.get("securityDefinitions",
String.class));
+ assertEquals("n", t.get("swagger", String.class));
+ assertEquals("[{name:'o'}]", t.get("tags", String.class));
+ assertEquals("ref", t.get("$ref", String.class));
assertObject(t.get("basePath",
Object.class)).isType(String.class);
assertObject(t.get("consumes", Object.class)).isType(Set.class);
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 e36328571..a594967f0 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
@@ -33,9 +33,9 @@ public class Tag_Test {
@Test
public void a01_gettersAndSetters() {
Tag t = new Tag();
- assertString(t.setName("foo").getName()).is("foo");
+ assertEquals("foo", t.setName("foo").getName());
assertString(t.setName(null).getName()).isNull();
-
assertString(t.setDescription("foo").getDescription()).is("foo");
+ assertEquals("foo", t.setDescription("foo").getDescription());
assertString(t.setDescription(null).getDescription()).isNull();
assertObject(t.setExternalDocs(externalDocumentation("foo")).getExternalDocs()).asJson().is("{url:'foo'}");
}
@@ -71,10 +71,10 @@ public class Tag_Test {
assertObject(t).asJson().is("{name:'c',description:'a',externalDocs:{url:'b'},'$ref':'ref'}");
- assertString(t.get("description", String.class)).is("a");
- assertString(t.get("externalDocs",
String.class)).is("{url:'b'}");
- assertString(t.get("name", String.class)).is("c");
- assertString(t.get("$ref", String.class)).is("ref");
+ assertEquals("a", t.get("description", String.class));
+ assertEquals("{url:'b'}", t.get("externalDocs", String.class));
+ assertEquals("c", t.get("name", String.class));
+ assertEquals("ref", t.get("$ref", String.class));
assertObject(t.get("description",
Object.class)).isType(String.class);
assertObject(t.get("externalDocs",
Object.class)).isType(ExternalDocumentation.class);
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 42111e3f4..81a8ed427 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
@@ -32,11 +32,11 @@ public class Xml_Test {
@Test
public void a01_gettersAndSetters() {
Xml t = new Xml();
- assertString(t.setName("foo").getName()).is("foo");
+ assertEquals("foo", t.setName("foo").getName());
assertString(t.setName(null).getName()).isNull();
- assertString(t.setNamespace("foo").getNamespace()).is("foo");
+ assertEquals("foo", t.setNamespace("foo").getNamespace());
assertString(t.setNamespace(null).getNamespace()).isNull();
- assertString(t.setPrefix("foo").getPrefix()).is("foo");
+ assertEquals("foo", t.setPrefix("foo").getPrefix());
assertString(t.setPrefix(null).getPrefix()).isNull();
assertObject(t.setAttribute(true).getAttribute()).isType(Boolean.class).is(true);
assertObject(t.setWrapped(true).getWrapped()).isType(Boolean.class).is(true);
@@ -79,12 +79,12 @@ public class Xml_Test {
assertObject(t).asJson().is("{name:'a',namespace:'b',prefix:'c',attribute:true,wrapped:true,'$ref':'ref'}");
- assertString(t.get("attribute", String.class)).is("true");
- assertString(t.get("name", String.class)).is("a");
- assertString(t.get("namespace", String.class)).is("b");
- assertString(t.get("prefix", String.class)).is("c");
- assertString(t.get("wrapped", String.class)).is("true");
- assertString(t.get("$ref", String.class)).is("ref");
+ assertEquals("true", t.get("attribute", String.class));
+ assertEquals("a", t.get("name", String.class));
+ assertEquals("b", t.get("namespace", String.class));
+ assertEquals("c", t.get("prefix", String.class));
+ assertEquals("true", t.get("wrapped", String.class));
+ assertEquals("ref", t.get("$ref", String.class));
assertObject(t.get("attribute",
Object.class)).isType(Boolean.class);
assertObject(t.get("name", Object.class)).isType(String.class);
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 b7ea99554..fa6fa1d8f 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
@@ -100,8 +100,8 @@ class BasicHttpResource_Test extends SimpleTestBase {
assertLong(readerResource(reader("foo")).setContentLength(3).getContentLength()).is(3L);
x = stringResource("foo",
contentType("text/plain")).setContentEncoding("identity");
- assertString(x.getContentType().getValue()).is("text/plain");
- assertString(x.getContentEncoding().getValue()).is("identity");
+ assertEquals("text/plain", x.getContentType().getValue());
+ assertEquals("identity", x.getContentEncoding().getValue());
x = stringResource("foo",
null).setContentEncoding((String)null);
assertNull(x.getContentType());
@@ -110,8 +110,8 @@ class BasicHttpResource_Test extends SimpleTestBase {
@Test void a02_header_String_Object() {
HeaderList x =
stringResource("foo").addHeader("Foo","bar").addHeader("Foo","baz").addHeader(null,"bar").addHeader("foo",null).getHeaders();
- assertString(x.getFirst("Foo").get().toString()).is("Foo: bar");
- assertString(x.getLast("Foo").get().toString()).is("Foo: baz");
+ assertEquals("Foo: bar", x.getFirst("Foo").get().toString());
+ assertEquals("Foo: baz", x.getLast("Foo").get().toString());
assertEmpty(x.getFirst("Bar"));
assertEmpty(x.getLast("Bar"));
assertObject(x.getAll()).asJson().is("['Foo: bar','Foo: baz']");
@@ -119,8 +119,8 @@ class BasicHttpResource_Test extends SimpleTestBase {
@Test void a03_header_Header() {
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");
+ assertEquals("Foo: bar", x.getFirst("Foo").get().toString());
+ assertEquals("Foo: baz", x.getLast("Foo").get().toString());
assertNull(x.getFirst("Bar").get().getValue());
assertNull(x.getLast("Bar").get().getValue());
assertObject(x.getAll()).asJson().is("['Foo: bar','Foo:
baz','Bar: null']");
@@ -128,8 +128,8 @@ class BasicHttpResource_Test extends SimpleTestBase {
@Test void a04_headers_List() {
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");
+ assertEquals("Foo: bar", x.getFirst("Foo").get().toString());
+ assertEquals("Foo: baz", x.getLast("Foo").get().toString());
assertNull(x.getFirst("Bar").get().getValue());
assertNull(x.getLast("Bar").get().getValue());
assertObject(x.getAll()).asJson().is("['Foo: bar','Foo:
baz','Bar: null']");
@@ -137,8 +137,8 @@ class BasicHttpResource_Test extends SimpleTestBase {
@Test void a05_headers_array() {
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");
+ assertEquals("Foo: bar", x.getFirst("Foo").get().toString());
+ assertEquals("Foo: baz", x.getLast("Foo").get().toString());
assertNull(x.getFirst("Bar").get().getValue());
assertNull(x.getLast("Bar").get().getValue());
assertObject(x.getAll()).asJson().is("['Foo: bar','Foo:
baz','Bar: null']");
@@ -161,14 +161,14 @@ class BasicHttpResource_Test extends SimpleTestBase {
@Test void a08_contentType_String() {
StringResource x1 =
stringResource("foo").setContentType("text/plain");
- assertString(x1.getContentType().getValue()).is("text/plain");
+ assertEquals("text/plain", x1.getContentType().getValue());
StringResource x2 =
stringResource("foo").setContentType((String)null);
assertNull(x2.getContentType());
}
@Test void a09_contentEncoding_String() {
StringResource x1 =
stringResource("foo").setContentEncoding("identity");
- assertString(x1.getContentEncoding().getValue()).is("identity");
+ assertEquals("identity", x1.getContentEncoding().getValue());
StringResource x2 =
stringResource("foo").setContentEncoding((String)null);
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 b4562be5c..bd3a7b46f 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
@@ -18,52 +18,51 @@ import static org.junit.runners.MethodSorters.*;
import java.util.function.*;
+import org.apache.juneau.*;
import org.apache.juneau.http.header.*;
-import org.junit.*;
+import org.junit.jupiter.api.*;
-@FixMethodOrder(NAME_ASCENDING)
-public class EntityTag_Test {
+class EntityTag_Test extends SimpleTestBase {
//------------------------------------------------------------------------------------------------------------------
// Method tests
//------------------------------------------------------------------------------------------------------------------
- @Test
- public void a01_basic() {
+ @Test void a01_basic() {
EntityTag x1 = new EntityTag("\"foo\"");
- assertString(x1).is("\"foo\"");
- assertString(x1.getEntityValue()).is("foo");
+ assertString("\"foo\"", x1);
+ assertEquals("foo", x1.getEntityValue());
assertFalse(x1.isWeak());
assertFalse(x1.isAny());
EntityTag x2 = new EntityTag("W/\"foo\"");
- assertString(x2).is("W/\"foo\"");
- assertString(x2.getEntityValue()).is("foo");
+ assertString("W/\"foo\"", x2);
+ assertEquals("foo", x2.getEntityValue());
assertTrue(x2.isWeak());
assertFalse(x2.isAny());
EntityTag x3 = new EntityTag("*");
- assertString(x3).is("*");
- assertString(x3.getEntityValue()).is("*");
+ assertString("*", x3);
+ assertEquals("*", x3.getEntityValue());
assertFalse(x3.isWeak());
assertTrue(x3.isAny());
EntityTag x5 = new EntityTag("\"\"");
- assertString(x5).is("\"\"");
- assertString(x5.getEntityValue()).is("");
+ assertString("\"\"", x5);
+ assertEquals("", x5.getEntityValue());
assertFalse(x5.isWeak());
assertFalse(x5.isAny());
EntityTag x6 = EntityTag.of("\"foo\"");
- assertString(x6).is("\"foo\"");
- assertString(x6.getEntityValue()).is("foo");
+ assertString("\"foo\"", x6);
+ assertEquals("foo", x6.getEntityValue());
assertFalse(x6.isWeak());
assertFalse(x6.isAny());
EntityTag x7 = EntityTag.of((Supplier<?>)()->"\"foo\"");
- assertString(x7).is("\"foo\"");
- assertString(x7.getEntityValue()).is("foo");
+ assertString("\"foo\"", x7);
+ assertEquals("foo", x7.getEntityValue());
assertFalse(x7.isWeak());
assertFalse(x7.isAny());
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/MediaRanges_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/MediaRanges_Test.java
index 80e18ddec..aba828413 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/http/MediaRanges_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/http/MediaRanges_Test.java
@@ -19,7 +19,7 @@ import static org.junit.Assert.*;
import org.apache.juneau.*;
import org.junit.jupiter.api.*;
-public class MediaRanges_Test extends SimpleTestBase {
+class MediaRanges_Test extends SimpleTestBase {
//-----------------------------------------------------------------------------------------------------------------
// Verifies that media type parameters are distinguished from media
range extensions.
@@ -30,9 +30,9 @@ public class MediaRanges_Test extends SimpleTestBase {
x1 = of("text/json");
x2 = x1.getRange(0);
- assertString(x2).is("text/json");
+ assertString("text/json", x2);
assertObject(x2.getParameters()).asJson().is("[]");
- assertString(x2.getQValue()).is("1.0");
+ assertString("1.0", x2.getQValue());
assertObject(x2.getExtensions()).asJson().is("[]");
assertNull(x1.getRange(-1));
@@ -40,65 +40,65 @@ public class MediaRanges_Test extends SimpleTestBase {
x1 = of("foo,bar");
x2 = x1.getRange(0);
- assertString(x2).is("foo");
+ assertString("foo", x2);
assertObject(x2.getParameters()).asJson().is("[]");
- assertString(x2.getQValue()).is("1.0");
+ assertString("1.0", x2.getQValue());
assertObject(x2.getExtensions()).asJson().is("[]");
x1 = of(" foo , bar ");
x2 = x1.getRange(0);
- assertString(x2).is("foo");
+ assertString("foo", x2);
assertObject(x2.getParameters()).asJson().is("[]");
- assertString(x2.getQValue()).is("1.0");
+ assertString("1.0", x2.getQValue());
assertObject(x2.getExtensions()).asJson().is("[]");
x1 = of("text/json;a=1;q=0.9;b=2");
x2 = x1.getRange(0);
- assertString(x2).is("text/json;a=1;q=0.9;b=2");
+ assertString("text/json;a=1;q=0.9;b=2", x2);
assertObject(x2.getParameters()).asJson().is("[{name:'a',value:'1'}]");
- assertString(x2.getQValue()).is("0.9");
+ assertString("0.9", x2.getQValue());
assertObject(x2.getExtensions()).asJson().is("[{name:'b',value:'2'}]");
x1 = of("text/json;a=1;a=2;q=0.9;b=3;b=4");
x2 = x1.getRange(0);
- assertString(x2).is("text/json;a=1;a=2;q=0.9;b=3;b=4");
+ assertString("text/json;a=1;a=2;q=0.9;b=3;b=4", x2);
assertObject(x2.getParameters()).asJson().is("[{name:'a',value:'1'},{name:'a',value:'2'}]");
- assertString(x2.getQValue()).is("0.9");
+ assertString("0.9", x2.getQValue());
assertObject(x2.getExtensions()).asJson().is("[{name:'b',value:'3'},{name:'b',value:'4'}]");
x1 = of("text/json;a=1;a=2;q=1.0;b=3;b=4");
x2 = x1.getRange(0);
- assertString(x2).is("text/json;a=1;a=2;q=1.0;b=3;b=4");
+ assertString("text/json;a=1;a=2;q=1.0;b=3;b=4", x2);
assertObject(x2.getParameters()).asJson().is("[{name:'a',value:'1'},{name:'a',value:'2'}]");
- assertString(x2.getQValue()).is("1.0");
+ assertString("1.0", x2.getQValue());
assertObject(x2.getExtensions()).asJson().is("[{name:'b',value:'3'},{name:'b',value:'4'}]");
x1 = of("text/json;a=1");
x2 = x1.getRange(0);
- assertString(x2).is("text/json;a=1");
+ assertString("text/json;a=1", x2);
assertObject(x2.getParameters()).asJson().is("[{name:'a',value:'1'}]");
- assertString(x2.getQValue()).is("1.0");
+ assertString("1.0", x2.getQValue());
assertObject(x2.getExtensions()).asJson().is("[]");
x1 = of("text/json;a=1;");
x2 = x1.getRange(0);
- assertString(x2).is("text/json;a=1");
+ assertString("text/json;a=1", x2);
assertObject(x2.getParameters()).asJson().is("[{name:'a',value:'1'}]");
- assertString(x2.getQValue()).is("1.0");
+ assertString("1.0", x2.getQValue());
assertObject(x2.getExtensions()).asJson().is("[]");
x1 = of("text/json;q=0.9");
x2 = x1.getRange(0);
- assertString(x2).is("text/json;q=0.9");
+ assertString("text/json;q=0.9", x2);
assertObject(x2.getParameters()).asJson().is("[]");
- assertString(x2.getQValue()).is("0.9");
+ assertString("0.9", x2.getQValue());
assertObject(x2.getExtensions()).asJson().is("[]");
x1 = of("text/json;q=0.9;");
x2 = x1.getRange(0);
- assertString(x2).is("text/json;q=0.9");
+ assertString("text/json;q=0.9", x2);
assertObject(x2.getParameters()).asJson().is("[]");
- assertString(x2.getQValue()).is("0.9");
+ assertString("0.9", x2.getQValue());
assertObject(x2.getExtensions()).asJson().is("[]");
}
@@ -111,23 +111,23 @@ public class MediaRanges_Test extends SimpleTestBase {
}
@Test void a03_ordering() {
- assertString(of("text/json")).is("text/json");
- assertString(of("text/json,text/*")).is("text/json,text/*");
- assertString(of("text/*,text/json")).is("text/json,text/*");
- assertString(of("text/*,text/*")).is("text/*,text/*");
- assertString(of("*/text,text/*")).is("text/*,*/text");
- assertString(of("text/*,*/text")).is("text/*,*/text");
- assertString(of("a;q=0.9,b;q=0.1")).is("a;q=0.9,b;q=0.1");
- assertString(of("b;q=0.9,a;q=0.1")).is("b;q=0.9,a;q=0.1");
-
assertString(of("a,b;q=0.9,c;q=0.1,d;q=0")).is("a,b;q=0.9,c;q=0.1,d;q=0.0");
-
assertString(of("d;q=0,c;q=0.1,b;q=0.9,a")).is("a,b;q=0.9,c;q=0.1,d;q=0.0");
-
assertString(of("a;q=1,b;q=0.9,c;q=0.1,d;q=0")).is("a,b;q=0.9,c;q=0.1,d;q=0.0");
-
assertString(of("d;q=0,c;q=0.1,b;q=0.9,a;q=1")).is("a,b;q=0.9,c;q=0.1,d;q=0.0");
-
assertString(of("a;q=0,b;q=0.1,c;q=0.9,d;q=1")).is("d,c;q=0.9,b;q=0.1,a;q=0.0");
- assertString(of("*")).is("*");
- assertString(of("")).is("");
- assertString(of(null)).is("");
- assertString(of("foo/bar/baz")).is("foo/bar/baz");
+ assertString("text/json", of("text/json"));
+ assertString("text/json,text/*", of("text/json,text/*"));
+ assertString("text/json,text/*", of("text/*,text/json"));
+ assertString("text/*,text/*", of("text/*,text/*"));
+ assertString("text/*,*/text", of("*/text,text/*"));
+ assertString("text/*,*/text", of("text/*,*/text"));
+ assertString("a;q=0.9,b;q=0.1", of("a;q=0.9,b;q=0.1"));
+ assertString("b;q=0.9,a;q=0.1", of("b;q=0.9,a;q=0.1"));
+ assertString("a,b;q=0.9,c;q=0.1,d;q=0.0",
of("a,b;q=0.9,c;q=0.1,d;q=0"));
+ assertString("a,b;q=0.9,c;q=0.1,d;q=0.0",
of("d;q=0,c;q=0.1,b;q=0.9,a"));
+ assertString("a,b;q=0.9,c;q=0.1,d;q=0.0",
of("a;q=1,b;q=0.9,c;q=0.1,d;q=0"));
+ assertString("a,b;q=0.9,c;q=0.1,d;q=0.0",
of("d;q=0,c;q=0.1,b;q=0.9,a;q=1"));
+ assertString("d,c;q=0.9,b;q=0.1,a;q=0.0",
of("a;q=0,b;q=0.1,c;q=0.9,d;q=1"));
+ assertString("*", of("*"));
+ assertString("", of(""));
+ assertString("", of(null));
+ assertString("foo/bar/baz", of("foo/bar/baz"));
}
@Test void a04_match() {
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 f111b556a..a2dea6dd1 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
@@ -31,7 +31,7 @@ public class MediaType_Test extends SimpleTestBase {
MediaType x2 = new MediaType((String)null); // Interpreted as
"/*"
assertString(x2.getType()).isEmpty();
- assertString(x2.getSubType()).is("*");
+ assertEquals("*", x2.getSubType());
assertObject(x2.getSubTypes()).asJson().is("['*']");
assertTrue(x2.isMetaSubtype());
@@ -51,7 +51,7 @@ public class MediaType_Test extends SimpleTestBase {
@Test void a03_getParameter() {
MediaType x1 = MediaType.of("text/json;x=1;q=1;y=2");
- assertString(x1.getParameter("x")).is("1");
+ assertEquals("1", x1.getParameter("x"));
assertString(x1.getParameter("q")).isNull();
assertString(x1.getParameter("y")).isNull();
assertString(x1.getParameter(null)).isNull();
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 b7c303af5..5537f1e2e 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
@@ -26,14 +26,14 @@ import org.apache.juneau.oapi.*;
import org.apache.juneau.serializer.*;
import org.junit.jupiter.api.*;
-public class SerializedHeader_Test extends SimpleTestBase {
+class SerializedHeader_Test extends SimpleTestBase {
private static final OpenApiSerializerSession OAPI_SESSION =
OpenApiSerializer.DEFAULT.getSession();
private static final OpenApiSerializer OAPI_SERIALIZER =
OpenApiSerializer.DEFAULT;
@Test void a01_basic() {
SerializedHeader x1 = new
SerializedHeader("Foo",alist("bar","baz"),OAPI_SESSION,T_ARRAY_PIPES,true);
- assertString(x1).is("Foo: bar|baz");
+ assertString("Foo: bar|baz", x1);
}
@Test void a02_type() {
@@ -43,15 +43,15 @@ public class SerializedHeader_Test extends SimpleTestBase {
@Test void a03_serializer() {
SerializedHeader x1 =
serializedHeader("Foo",alist("bar","baz")).serializer((HttpPartSerializer)null);
- assertString(x1.getValue()).is("[bar, baz]");
+ assertEquals("[bar, baz]", x1.getValue());
SerializedHeader x2 =
serializedHeader("Foo",alist("bar","baz")).serializer((HttpPartSerializer)null).serializer(OAPI_SERIALIZER);
- assertString(x2.getValue()).is("bar,baz");
+ assertEquals("bar,baz", x2.getValue());
SerializedHeader x3 =
serializedHeader("Foo",alist("bar","baz")).serializer(OAPI_SERIALIZER).serializer((HttpPartSerializerSession)null);
- assertString(x3.getValue()).is("[bar, baz]");
+ assertEquals("[bar, baz]", x3.getValue());
SerializedHeader x4 =
serializedHeader("Foo",alist("bar","baz")).serializer(OAPI_SERIALIZER).copyWith(null,null);
- assertString(x4.getValue()).is("bar,baz");
+ assertEquals("bar,baz", x4.getValue());
SerializedHeader x5 =
serializedHeader("Foo",alist("bar","baz")).copyWith(OAPI_SERIALIZER.getSession(),null);
- assertString(x5.getValue()).is("bar,baz");
+ assertEquals("bar,baz", x5.getValue());
}
@Test void a04_skipIfEmpty() {
@@ -65,7 +65,7 @@ public class SerializedHeader_Test extends SimpleTestBase {
@Test void a05_getValue_defaults() {
SerializedHeader x1 =
serializedHeader("Foo",null).schema(schema(INTEGER)._default("1").build()).serializer(OAPI_SESSION);
- assertString(x1.getValue()).is("1");
+ assertEquals("1", x1.getValue());
SerializedHeader x2 =
serializedHeader("Foo",null).schema(schema(STRING).required().allowEmptyValue().build()).serializer(OAPI_SESSION);
assertString(x2.getValue()).isNull();
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 494f008e1..24f473e78 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
@@ -27,14 +27,14 @@ import org.apache.juneau.oapi.*;
import org.apache.juneau.serializer.*;
import org.junit.jupiter.api.*;
-public class SerializedPart_Test extends SimpleTestBase {
+class SerializedPart_Test extends SimpleTestBase {
private static final OpenApiSerializerSession OAPI_SESSION =
OpenApiSerializer.DEFAULT.getSession();
private static final OpenApiSerializer OAPI_SERIALIZER =
OpenApiSerializer.DEFAULT;
@Test void a01_basic() {
SerializedPart x1 = new
SerializedPart("Foo",alist("bar","baz"),HEADER,OAPI_SESSION,T_ARRAY_PIPES,true);
- assertString(x1).is("Foo=bar|baz");
+ assertString("Foo=bar|baz", x1);
}
@Test void a02_type() {
@@ -44,15 +44,15 @@ public class SerializedPart_Test extends SimpleTestBase {
@Test void a03_serializer() {
SerializedPart x1 =
serializedPart("Foo",alist("bar","baz")).serializer((HttpPartSerializer)null);
- assertString(x1.getValue()).is("[bar, baz]");
+ assertEquals("[bar, baz]", x1.getValue());
SerializedPart x2 =
serializedPart("Foo",alist("bar","baz")).serializer((HttpPartSerializer)null).serializer(OAPI_SERIALIZER);
- assertString(x2.getValue()).is("bar,baz");
+ assertEquals("bar,baz", x2.getValue());
SerializedPart x3 =
serializedPart("Foo",alist("bar","baz")).serializer(OAPI_SERIALIZER).serializer((HttpPartSerializerSession)null);
- assertString(x3.getValue()).is("[bar, baz]");
+ assertEquals("[bar, baz]", x3.getValue());
SerializedPart x4 =
serializedPart("Foo",alist("bar","baz")).serializer(OAPI_SERIALIZER).copyWith(null,null);
- assertString(x4.getValue()).is("bar,baz");
+ assertEquals("bar,baz", x4.getValue());
SerializedPart x5 =
serializedPart("Foo",alist("bar","baz")).copyWith(OAPI_SERIALIZER.getPartSession(),null);
- assertString(x5.getValue()).is("bar,baz");
+ assertEquals("bar,baz", x5.getValue());
}
@Test void a04_skipIfEmpty() {
@@ -66,7 +66,7 @@ public class SerializedPart_Test extends SimpleTestBase {
@Test void a05_getValue_defaults() {
SerializedPart x1 =
serializedPart("Foo",null).schema(schema(INTEGER)._default("1").build()).serializer(OAPI_SESSION);
- assertString(x1.getValue()).is("1");
+ assertEquals("1", x1.getValue());
SerializedPart x2 =
serializedPart("Foo",null).schema(schema(STRING).required().allowEmptyValue().build()).serializer(OAPI_SESSION);
assertString(x2.getValue()).isNull();
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/StringRange_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/StringRange_Test.java
index be877c897..86e96485e 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/http/StringRange_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/http/StringRange_Test.java
@@ -18,19 +18,19 @@ import static org.junit.jupiter.api.Assertions.*;
import org.apache.juneau.*;
import org.junit.jupiter.api.*;
-public class StringRange_Test extends SimpleTestBase {
+class StringRange_Test extends SimpleTestBase {
@Test void a01_basic() {
StringRange x1 = of("foo;a=1;q=0.5;b=2");
- assertString(x1.getQValue()).is("0.5");
+ assertString("0.5", x1.getQValue());
assertObject(x1.getExtensions()).asJson().is("[{name:'a',value:'1'},{name:'b',value:'2'}]");
StringRange x2 = of("foo;q=1.0");
- assertString(x2.getQValue()).is("1.0");
+ assertString("1.0", x2.getQValue());
assertObject(x2.getExtensions()).asJson().is("[]");
StringRange x3 = of("foo;a=1");
- assertString(x3.getQValue()).is("1.0");
+ assertString("1.0", x3.getQValue());
assertObject(x3.getExtensions()).asJson().is("[{name:'a',value:'1'}]");
StringRange x4 = of("foo;a=1");
@@ -39,9 +39,9 @@ public class StringRange_Test extends SimpleTestBase {
assertObject(x3).asString().isNot("foo");
assertObject(x3.hashCode()).is(x4.hashCode());
- assertString(of((String)null)).is("*");
+ assertString("*", of((String)null));
- assertString(of("foo;q=0").match("foo")).is("0");
+ assertString("0", of("foo;q=0").match("foo"));
}
@Test void a02_match() {
@@ -53,8 +53,8 @@ public class StringRange_Test extends SimpleTestBase {
}
@Test void a03_getName() {
- assertString(of("foo;a=1;q=0.5;b=2").getName()).is("foo");
- assertString(of(null).getName()).is("*");
+ assertEquals("foo", of("foo;a=1;q=0.5;b=2").getName());
+ assertEquals("*", of(null).getName());
}
//------------------------------------------------------------------------------------------------------------------
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 0509b7d45..1e9e2db73 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
@@ -22,7 +22,7 @@ import java.util.*;
import org.apache.juneau.*;
import org.junit.jupiter.api.*;
-public class StringRanges_Test extends SimpleTestBase {
+class StringRanges_Test extends SimpleTestBase {
@Test void a01_match() {
List<String> x = alist("foo","bar","baz");
@@ -54,7 +54,7 @@ public class StringRanges_Test extends SimpleTestBase {
}
@Test void a04_toString() {
- assertString(new StringRange("*")).is("*");
- assertString(of("foo;q=0.6,bar;q=0.9,qux")).is("qux, bar;q=0.9,
foo;q=0.6");
+ assertString("*", new StringRange("*"));
+ assertString("qux, bar;q=0.9, foo;q=0.6",
of("foo;q=0.6,bar;q=0.9,qux"));
}
}
\ No newline at end of file
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/header/ContentType_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/header/ContentType_Test.java
index 79105b786..ec9f25630 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/header/ContentType_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/header/ContentType_Test.java
@@ -14,6 +14,8 @@ package org.apache.juneau.http.header;
import static org.apache.juneau.http.HttpHeaders.*;
import static org.apache.juneau.utest.utils.Utils2.*;
+import static org.junit.jupiter.api.Assertions.*;
+
import java.io.*;
import java.util.function.*;
@@ -61,7 +63,7 @@ class ContentType_Test extends SimpleTestBase {
}
@Test void a02_asMediaType() {
-
assertString(contentType(()->MediaType.JSON).asMediaType()).is("application/json");
+ assertString("application/json",
contentType(()->MediaType.JSON).asMediaType());
}
//------------------------------------------------------------------------------------------------------------------
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/header/ETag_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/header/ETag_Test.java
index 2de7c7905..e854f8a8b 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/http/header/ETag_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/http/header/ETag_Test.java
@@ -63,8 +63,8 @@ class ETag_Test extends SimpleTestBase {
@Test void a0_asEntityTag() {
EntityTag x = new ETag("W/\"foo\"").asEntityTag().get();
- assertString(x).is("W/\"foo\"");
- assertString(x.getEntityValue()).is("foo");
+ assertString("W/\"foo\"", x);
+ assertEquals("foo", x.getEntityValue());
assertTrue(x.isWeak());
assertFalse(x.isAny());
}
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 8c69c4551..573f27a10 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
@@ -83,16 +83,16 @@ class HeaderBeanMeta_Test extends SimpleTestBase {
HeaderBeanMeta<A3> a3 = HeaderBeanMeta.of(A3.class);
assertObject(a3.construct("X", "foo")).isJson("{value:'foo'}");
assertObject(a3.construct("foo")).isJson("{value:'foo'}");
- assertString(a3.getSchema().getName()).is("A3");
+ assertEquals("A3", a3.getSchema().getName());
HeaderBeanMeta<A4> a4 = HeaderBeanMeta.of(A4.class);
assertObject(a4.construct("X", "foo")).isJson("{value:'foo'}");
assertObject(a4.construct("foo")).isJson("{value:'foo'}");
- assertString(a4.getSchema().getName()).is("A4");
+ assertEquals("A4", a4.getSchema().getName());
HeaderBeanMeta<A5> a5 = HeaderBeanMeta.of(A5.class);
assertThrown(()->a5.construct("foo")).asMessage().isContains("Constructor for
type "+TNAME+"$A5 could not be found.");
- assertString(a5.getSchema().getName()).is("A5");
+ assertEquals("A5", a5.getSchema().getName());
HeaderBeanMeta<A6> a6 = HeaderBeanMeta.of(A6.class);
assertThrown(()->a6.construct("X",
"foo")).asMessages().isContains("oops");
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/header/IfRange_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/header/IfRange_Test.java
index 259972934..16d8bc46e 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/http/header/IfRange_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/http/header/IfRange_Test.java
@@ -16,6 +16,8 @@ import static java.time.format.DateTimeFormatter.*;
import static java.time.temporal.ChronoUnit.*;
import static org.apache.juneau.http.HttpHeaders.*;
import static org.apache.juneau.utest.utils.Utils2.*;
+import static org.junit.jupiter.api.Assertions.*;
+
import java.io.*;
import java.time.*;
import java.util.function.*;
@@ -78,7 +80,7 @@ class IfRange_Test extends SimpleTestBase {
@Test void a02_asEntityTag() {
EntityTag x = ifRange(VALUE1).asEntityTag().get();
- assertString(x).is("\"foo\"");
+ assertString("\"foo\"", x);
assertEmpty(ifRange(()->null).asEntityTag());
assertEmpty(ifRange(()->PARSED3).asEntityTag());
}
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 946a3c771..dcefa6984 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
@@ -89,22 +89,22 @@ class PartBeanMeta_Test extends SimpleTestBase {
PartBeanMeta<A3> a3 = PartBeanMeta.of(A3.class);
assertObject(a3.construct("X", "foo")).isJson("{value:'foo'}");
assertObject(a3.construct("foo")).isJson("{value:'foo'}");
- assertString(a3.getSchema().getName()).is("A3");
+ assertEquals("A3", a3.getSchema().getName());
PartBeanMeta<A4> a4 = PartBeanMeta.of(A4.class);
assertObject(a4.construct("X", "foo")).isJson("{value:'foo'}");
assertObject(a4.construct("foo")).isJson("{value:'foo'}");
- assertString(a4.getSchema().getName()).is("A4");
+ assertEquals("A4", a4.getSchema().getName());
PartBeanMeta<A5> a5 = PartBeanMeta.of(A5.class);
assertThrown(()->a5.construct("foo")).asMessage().isContains("Constructor for
type "+TNAME+"$A5 could not be found.");
- assertString(a5.getSchema().getName()).is("A5");
+ assertEquals("A5", a5.getSchema().getName());
PartBeanMeta<A6> a6 = PartBeanMeta.of(A6.class);
assertThrown(()->a6.construct("X",
"foo")).asMessages().isContains("oops");
PartBeanMeta<A7> a7 = PartBeanMeta.of(A7.class);
assertThrown(()->a7.construct("foo")).asMessage().isContains("Constructor for
type "+TNAME+"$A7 could not be found.");
- assertString(a7.getSchema().getName()).is("A7");
+ assertEquals("A7", a7.getSchema().getName());
}
}
\ No newline at end of file
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_FormDataAnnotation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_FormDataAnnotation_Test.java
index ab75081c8..eb3def9d6 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_FormDataAnnotation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_FormDataAnnotation_Test.java
@@ -940,9 +940,9 @@ class Remote_FormDataAnnotation_Test extends SimpleTestBase
{
@Test void k06_requestBean_collections() {
K6 x1 = remote(K.class,K6.class);
K6 x2 =
client(K.class).partSerializer(UonSerializer.class).build().getRemote(K6.class);
- assertString(x1.postX1(new
K6a())).is("{a:'foo,,true,123,null,true,123,null',b:'foo,,true,123,null,true,123,null',c:'xfoo||true|123|null|true|123|nullx',d:'',f:'foo,,true,123,null,true,123,null',g:'xfoo||true|123|null|true|123|nullx',h:''}");
- assertString(x2.postX1(new
K6a())).is("{a:'@(foo,\\'\\',\\'true\\',\\'123\\',\\'null\\',true,123,null)',b:'@(foo,\\'\\',\\'true\\',\\'123\\',\\'null\\',true,123,null)',c:'xfoo||true|123|null|true|123|nullx',d:'@()',f:'@(foo,\\'\\',\\'true\\',\\'123\\',\\'null\\',true,123,null)',g:'xfoo||true|123|null|true|123|nullx',h:'@()'}");
- assertString(x2.postX2(new
K6a())).is("{a:'xfoo||true|123|null|true|123|nullx',b:'xfoo||true|123|null|true|123|nullx',c:'xfoo||true|123|null|true|123|nullx',d:'xx',f:'xfoo||true|123|null|true|123|nullx',g:'xfoo||true|123|null|true|123|nullx',h:'xx'}");
+
assertEquals("{a:'foo,,true,123,null,true,123,null',b:'foo,,true,123,null,true,123,null',c:'xfoo||true|123|null|true|123|nullx',d:'',f:'foo,,true,123,null,true,123,null',g:'xfoo||true|123|null|true|123|nullx',h:''}",
x1.postX1(new K6a()));
+
assertEquals("{a:'@(foo,\\'\\',\\'true\\',\\'123\\',\\'null\\',true,123,null)',b:'@(foo,\\'\\',\\'true\\',\\'123\\',\\'null\\',true,123,null)',c:'xfoo||true|123|null|true|123|nullx',d:'@()',f:'@(foo,\\'\\',\\'true\\',\\'123\\',\\'null\\',true,123,null)',g:'xfoo||true|123|null|true|123|nullx',h:'@()'}",
x2.postX1(new K6a()));
+
assertEquals("{a:'xfoo||true|123|null|true|123|nullx',b:'xfoo||true|123|null|true|123|nullx',c:'xfoo||true|123|null|true|123|nullx',d:'xx',f:'xfoo||true|123|null|true|123|nullx',g:'xfoo||true|123|null|true|123|nullx',h:'xx'}",
x2.postX2(new K6a()));
}
//------------------------------------------------------------------------------------------------------------------
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_HeaderAnnotation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_HeaderAnnotation_Test.java
index b2aeafdd2..5922aa91e 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_HeaderAnnotation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_HeaderAnnotation_Test.java
@@ -865,9 +865,9 @@ class Remote_HeaderAnnotation_Test extends SimpleTestBase {
@Test void k04_requestBean_collections() {
K4 x1 = remote(K.class,K4.class);
K4 x2 =
client(K.class).partSerializer(UonSerializer.class).build().getRemote(K4.class);
- assertString(x1.getX1(new
K4a())).is("{a:'foo,,true,123,null,true,123,null',b:'foo,,true,123,null,true,123,null',c:'xfoo||true|123|null|true|123|nullx',d:'',f:'foo,,true,123,null,true,123,null',g:'xfoo||true|123|null|true|123|nullx',h:''}");
- assertString(x2.getX1(new
K4a())).is("{a:'@(foo,\\'\\',\\'true\\',\\'123\\',\\'null\\',true,123,null)',b:'@(foo,\\'\\',\\'true\\',\\'123\\',\\'null\\',true,123,null)',c:'xfoo||true|123|null|true|123|nullx',d:'@()',f:'@(foo,\\'\\',\\'true\\',\\'123\\',\\'null\\',true,123,null)',g:'xfoo||true|123|null|true|123|nullx',h:'@()'}");
- assertString(x2.getX2(new
K4a())).is("{a:'xfoo||true|123|null|true|123|nullx',b:'xfoo||true|123|null|true|123|nullx',c:'xfoo||true|123|null|true|123|nullx',d:'xx',f:'xfoo||true|123|null|true|123|nullx',g:'xfoo||true|123|null|true|123|nullx',h:'xx'}");
+
assertEquals("{a:'foo,,true,123,null,true,123,null',b:'foo,,true,123,null,true,123,null',c:'xfoo||true|123|null|true|123|nullx',d:'',f:'foo,,true,123,null,true,123,null',g:'xfoo||true|123|null|true|123|nullx',h:''}",
x1.getX1(new K4a()));
+
assertEquals("{a:'@(foo,\\'\\',\\'true\\',\\'123\\',\\'null\\',true,123,null)',b:'@(foo,\\'\\',\\'true\\',\\'123\\',\\'null\\',true,123,null)',c:'xfoo||true|123|null|true|123|nullx',d:'@()',f:'@(foo,\\'\\',\\'true\\',\\'123\\',\\'null\\',true,123,null)',g:'xfoo||true|123|null|true|123|nullx',h:'@()'}",
x2.getX1(new K4a()));
+
assertEquals("{a:'xfoo||true|123|null|true|123|nullx',b:'xfoo||true|123|null|true|123|nullx',c:'xfoo||true|123|null|true|123|nullx',d:'xx',f:'xfoo||true|123|null|true|123|nullx',g:'xfoo||true|123|null|true|123|nullx',h:'xx'}",
x2.getX2(new K4a()));
}
//------------------------------------------------------------------------------------------------------------------
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_PathAnnotation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_PathAnnotation_Test.java
index 27ad7ee21..f715b1956 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_PathAnnotation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_PathAnnotation_Test.java
@@ -749,9 +749,9 @@ class Remote_PathAnnotation_Test extends SimpleTestBase {
@Test void k04_requestBean_collections() {
K4 x1 = remote(K.class,K4.class);
K4 x2 =
client(K.class).partSerializer(UonSerializer.class).build().getRemote(K4.class);
- assertString(x1.getX1(new
K4a())).is("foo,,true,123,null,true,123,null/foo,,true,123,null,true,123,null/xfoo||true|123|null|true|123|nullx//foo,,true,123,null,true,123,null/xfoo||true|123|null|true|123|nullx/");
- assertString(x2.getX1(new
K4a())).is("@(foo,'','true','123','null',true,123,null)/@(foo,'','true','123','null',true,123,null)/xfoo||true|123|null|true|123|nullx/@()/@(foo,'','true','123','null',true,123,null)/xfoo||true|123|null|true|123|nullx/@()");
- assertString(x2.getX2(new
K4a())).is("xfoo||true|123|null|true|123|nullx/xfoo||true|123|null|true|123|nullx/xfoo||true|123|null|true|123|nullx/xx/xfoo||true|123|null|true|123|nullx/xfoo||true|123|null|true|123|nullx/xx");
+
assertEquals("foo,,true,123,null,true,123,null/foo,,true,123,null,true,123,null/xfoo||true|123|null|true|123|nullx//foo,,true,123,null,true,123,null/xfoo||true|123|null|true|123|nullx/",
x1.getX1(new K4a()));
+
assertEquals("@(foo,'','true','123','null',true,123,null)/@(foo,'','true','123','null',true,123,null)/xfoo||true|123|null|true|123|nullx/@()/@(foo,'','true','123','null',true,123,null)/xfoo||true|123|null|true|123|nullx/@()",
x2.getX1(new K4a()));
+
assertEquals("xfoo||true|123|null|true|123|nullx/xfoo||true|123|null|true|123|nullx/xfoo||true|123|null|true|123|nullx/xx/xfoo||true|123|null|true|123|nullx/xfoo||true|123|null|true|123|nullx/xx",
x2.getX2(new K4a()));
}
//------------------------------------------------------------------------------------------------------------------
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_QueryAnnotation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_QueryAnnotation_Test.java
index 6bb71c932..fcb4e4a36 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_QueryAnnotation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_QueryAnnotation_Test.java
@@ -903,9 +903,9 @@ class Remote_QueryAnnotation_Test extends SimpleTestBase {
@Test void k06_requestBean_collections() {
K6 x1 = remote(K.class,K6.class);
K6 x2 =
client(K.class).partSerializer(UonSerializer.class).build().getRemote(K6.class);
- assertString(x1.getX1(new
K6a())).is("{a:'foo,,true,123,null,true,123,null',b:'foo,,true,123,null,true,123,null',c:'xfoo||true|123|null|true|123|nullx',d:'',f:'foo,,true,123,null,true,123,null',g:'xfoo||true|123|null|true|123|nullx',h:''}");
- assertString(x2.getX1(new
K6a())).is("{a:'@(foo,\\'\\',\\'true\\',\\'123\\',\\'null\\',true,123,null)',b:'@(foo,\\'\\',\\'true\\',\\'123\\',\\'null\\',true,123,null)',c:'xfoo||true|123|null|true|123|nullx',d:'@()',f:'@(foo,\\'\\',\\'true\\',\\'123\\',\\'null\\',true,123,null)',g:'xfoo||true|123|null|true|123|nullx',h:'@()'}");
- assertString(x2.getX2(new
K6a())).is("{a:'xfoo||true|123|null|true|123|nullx',b:'xfoo||true|123|null|true|123|nullx',c:'xfoo||true|123|null|true|123|nullx',d:'xx',f:'xfoo||true|123|null|true|123|nullx',g:'xfoo||true|123|null|true|123|nullx',h:'xx'}");
+
assertEquals("{a:'foo,,true,123,null,true,123,null',b:'foo,,true,123,null,true,123,null',c:'xfoo||true|123|null|true|123|nullx',d:'',f:'foo,,true,123,null,true,123,null',g:'xfoo||true|123|null|true|123|nullx',h:''}",
x1.getX1(new K6a()));
+
assertEquals("{a:'@(foo,\\'\\',\\'true\\',\\'123\\',\\'null\\',true,123,null)',b:'@(foo,\\'\\',\\'true\\',\\'123\\',\\'null\\',true,123,null)',c:'xfoo||true|123|null|true|123|nullx',d:'@()',f:'@(foo,\\'\\',\\'true\\',\\'123\\',\\'null\\',true,123,null)',g:'xfoo||true|123|null|true|123|nullx',h:'@()'}",
x2.getX1(new K6a()));
+
assertEquals("{a:'xfoo||true|123|null|true|123|nullx',b:'xfoo||true|123|null|true|123|nullx',c:'xfoo||true|123|null|true|123|nullx',d:'xx',f:'xfoo||true|123|null|true|123|nullx',g:'xfoo||true|123|null|true|123|nullx',h:'xx'}",
x2.getX2(new K6a()));
}
//------------------------------------------------------------------------------------------------------------------
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 5c9fe17f0..7769bae74 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
@@ -90,20 +90,20 @@ public class HttpException_Test extends SimpleTestBase {
@Test void a03_getFullStackMessage() {
BasicHttpException x = new BasicHttpException(100, null);
- assertString(x.getFullStackMessage(false)).is("Continue");
- assertString(x.getFullStackMessage(true)).is("Continue");
+ assertEquals("Continue", x.getFullStackMessage(false));
+ assertEquals("Continue", x.getFullStackMessage(true));
x = new BasicHttpException(100, "foo<bar>&baz");
- assertString(x.getFullStackMessage(false)).is("foo<bar>&baz");
- assertString(x.getFullStackMessage(true)).is("foo bar baz");
+ assertEquals("foo<bar>&baz", x.getFullStackMessage(false));
+ assertEquals("foo bar baz", x.getFullStackMessage(true));
x = new BasicHttpException(100, new
RuntimeException("foo<bar>&qux"), "foo{0}","<bar>&baz");
-
assertString(x.getFullStackMessage(false)).is("foo<bar>&baz\nCaused by
(RuntimeException): foo<bar>&qux");
- assertString(x.getFullStackMessage(true)).is("foo bar
baz\nCaused by (RuntimeException): foo bar qux");
+ assertEquals("foo<bar>&baz\nCaused by (RuntimeException):
foo<bar>&qux", x.getFullStackMessage(false));
+ assertEquals("foo bar baz\nCaused by (RuntimeException): foo
bar qux", x.getFullStackMessage(true));
x = new BasicHttpException(100, new RuntimeException(),
"foo{0}","<bar>&baz");
-
assertString(x.getFullStackMessage(false)).is("foo<bar>&baz\nCaused by
(RuntimeException)");
- assertString(x.getFullStackMessage(true)).is("foo bar
baz\nCaused by (RuntimeException)");
+ assertEquals("foo<bar>&baz\nCaused by (RuntimeException)",
x.getFullStackMessage(false));
+ assertEquals("foo bar baz\nCaused by (RuntimeException)",
x.getFullStackMessage(true));
assertInteger(x.hashCode()).isExists();
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/marshaller/Csv_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/marshaller/Csv_Test.java
index 448493adb..e9c566dc5 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/marshaller/Csv_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/marshaller/Csv_Test.java
@@ -29,13 +29,12 @@ class Csv_Test extends SimpleTestBase{
Object in1 = "foo", in2 = new
Object[]{JsonMap.of("a","foo","b","bar")};
String expected1="value\nfoo\n", expected2 = "a,b\nfoo,bar\n";
- assertString(Csv.of(in1)).is(expected1);
- assertString(Csv.of(in1,stringWriter())).is(expected1);
- assertString(Csv.of(in2)).is(expected2);
- assertString(Csv.of(in2,stringWriter())).is(expected2);
+ assertString(expected1, Csv.of(in1));
+ assertString(expected1, Csv.of(in1,stringWriter()));
+ assertString(expected2, Csv.of(in2));
+ assertString(expected2, Csv.of(in2,stringWriter()));
}
-
@Test void a02_from() {
String in1 = "'foo'", in2 = "{foo:'bar'}";
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/marshaller/Html_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/marshaller/Html_Test.java
index 7f06f6928..81e9c616a 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/marshaller/Html_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/marshaller/Html_Test.java
@@ -13,6 +13,8 @@
package org.apache.juneau.marshaller;
import static org.apache.juneau.assertions.Assertions.*;
+import static org.junit.jupiter.api.Assertions.*;
+
import java.io.*;
import java.util.*;
@@ -26,18 +28,18 @@ public class Html_Test extends SimpleTestBase {
Object in1 = "foo", in2 = JsonMap.of("foo", "bar");
String expected1 = "<string>foo</string>", expected2 =
"<table><tr><td>foo</td><td>bar</td></tr></table>";
- assertString(Html.of(in1)).is(expected1);
- assertString(Html.of(in1,stringWriter())).is(expected1);
- assertString(Html.of(in2)).is(expected2);
- assertString(Html.of(in2,stringWriter())).is(expected2);
+ assertString(expected1, Html.of(in1));
+ assertString(expected1, Html.of(in1,stringWriter()));
+ assertString(expected2, Html.of(in2));
+ assertString(expected2, Html.of(in2,stringWriter()));
}
@Test void a02_from() throws Exception {
String in1 = "<string>foo</string>", in2 =
"<table><tr><td>foo</td><td>bar</td></tr></table>";
String expected1 = "foo", expected2 = "{foo:'bar'}";
- assertString(Html.to(in1, String.class)).is(expected1);
- assertString(Html.to(stringReader(in1),
String.class)).is(expected1);
+ assertEquals(expected1, Html.to(in1, String.class));
+ assertEquals(expected1, Html.to(stringReader(in1),
String.class));
assertObject(Html.to(in2, Map.class, String.class,
String.class)).asJson().is(expected2);
assertObject(Html.to(stringReader(in2), Map.class,
String.class, String.class)).asJson().is(expected2);
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/marshaller/Json5_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/marshaller/Json5_Test.java
index 7d9ab928e..aeea603e6 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/marshaller/Json5_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/marshaller/Json5_Test.java
@@ -13,6 +13,8 @@
package org.apache.juneau.marshaller;
import static org.apache.juneau.assertions.Assertions.*;
+import static org.junit.jupiter.api.Assertions.*;
+
import java.io.*;
import java.util.*;
@@ -26,18 +28,18 @@ class Json5_Test extends SimpleTestBase {
Object in1 = "foo", in2 = JsonMap.of("foo", "bar");
String expected1 = "'foo'", expected2 = "{foo:'bar'}";
- assertString(Json5.of(in1)).is(expected1);
- assertString(Json5.of(in1,stringWriter())).is(expected1);
- assertString(Json5.of(in2)).is(expected2);
- assertString(Json5.of(in2,stringWriter())).is(expected2);
+ assertString(expected1, Json5.of(in1));
+ assertString(expected1, Json5.of(in1,stringWriter()));
+ assertString(expected2, Json5.of(in2));
+ assertString(expected2, Json5.of(in2,stringWriter()));
}
@Test void a02_from() throws Exception {
String in1 = "'foo'", in2 = "{foo:'bar'}";
String expected1 = "foo", expected2 = "{foo:'bar'}";
- assertString(Json5.to(in1, String.class)).is(expected1);
- assertString(Json5.to(stringReader(in1),
String.class)).is(expected1);
+ assertString(expected1, Json5.to(in1, String.class));
+ assertString(expected1, Json5.to(stringReader(in1),
String.class));
assertObject(Json5.to(in2, Map.class, String.class,
String.class)).asJson().is(expected2);
assertObject(Json5.to(stringReader(in2), Map.class,
String.class, String.class)).asJson().is(expected2);
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/marshaller/Json_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/marshaller/Json_Test.java
index 7d63bee15..4d5c102d0 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/marshaller/Json_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/marshaller/Json_Test.java
@@ -13,6 +13,8 @@
package org.apache.juneau.marshaller;
import static org.apache.juneau.assertions.Assertions.*;
+import static org.junit.jupiter.api.Assertions.*;
+
import java.io.*;
import java.util.*;
@@ -26,18 +28,18 @@ class Json_Test extends SimpleTestBase {
Object in1 = "foo", in2 = JsonMap.of("foo", "bar");
String expected1 = "\"foo\"", expected2 = "{\"foo\":\"bar\"}";
- assertString(Json.of(in1)).is(expected1);
- assertString(Json.of(in1,stringWriter())).is(expected1);
- assertString(Json.of(in2)).is(expected2);
- assertString(Json.of(in2,stringWriter())).is(expected2);
+ assertString(expected1, Json.of(in1));
+ assertString(expected1, Json.of(in1,stringWriter()));
+ assertString(expected2, Json.of(in2));
+ assertString(expected2, Json.of(in2,stringWriter()));
}
@Test void a02_from() throws Exception {
String in1 = "\"foo\"", in2 = "{\"foo\":\"bar\"}";
String expected1 = "foo", expected2 = "{foo:'bar'}";
- assertString(Json.to(in1, String.class)).is(expected1);
- assertString(Json.to(stringReader(in1),
String.class)).is(expected1);
+ assertEquals(expected1, Json.to(in1, String.class));
+ assertEquals(expected1, Json.to(stringReader(in1),
String.class));
assertObject(Json.to(in2, Map.class, String.class,
String.class)).asJson().is(expected2);
assertObject(Json.to(stringReader(in2), Map.class,
String.class, String.class)).asJson().is(expected2);
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/marshaller/MsgPack_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/marshaller/MsgPack_Test.java
index 7b9f991f5..a722b466d 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/marshaller/MsgPack_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/marshaller/MsgPack_Test.java
@@ -14,6 +14,8 @@ package org.apache.juneau.marshaller;
import static org.apache.juneau.assertions.Assertions.*;
import static org.apache.juneau.common.internal.StringUtils.*;
+import static org.junit.jupiter.api.Assertions.*;
+
import java.io.*;
import java.util.*;
@@ -37,8 +39,8 @@ class MsgPack_Test extends SimpleTestBase {
String in1 = "A3666F6F", in2 = "81A3666F6FA3626172";
String expected1 = "foo", expected2 = "{foo:'bar'}";
- assertString(MsgPack.to(in1, String.class)).is(expected1);
- assertString(MsgPack.to(fromHex(in1),
String.class)).is(expected1);
+ assertEquals(expected1, MsgPack.to(in1, String.class));
+ assertEquals(expected1, MsgPack.to(fromHex(in1), String.class));
assertObject(MsgPack.to(in2, Map.class, String.class,
String.class)).asJson().is(expected2);
assertObject(MsgPack.to(fromHex(in2), Map.class, String.class,
String.class)).asJson().is(expected2);
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/marshaller/OpenApi_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/marshaller/OpenApi_Test.java
index e5c366a45..1c82e39fa 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/marshaller/OpenApi_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/marshaller/OpenApi_Test.java
@@ -13,6 +13,8 @@
package org.apache.juneau.marshaller;
import static org.apache.juneau.assertions.Assertions.*;
+import static org.junit.jupiter.api.Assertions.*;
+
import java.io.*;
import java.util.*;
@@ -26,18 +28,18 @@ class OpenApi_Test extends SimpleTestBase {
Object in1 = "foo", in2 = JsonMap.of("foo", "bar");
String expected1 = "foo", expected2 = "foo=bar";
- assertString(OpenApi.of(in1)).is(expected1);
- assertString(OpenApi.of(in1,stringWriter())).is(expected1);
- assertString(OpenApi.of(in2)).is(expected2);
- assertString(OpenApi.of(in2,stringWriter())).is(expected2);
+ assertString(expected1, OpenApi.of(in1));
+ assertString(expected1, OpenApi.of(in1,stringWriter()));
+ assertString(expected2, OpenApi.of(in2));
+ assertString(expected2, OpenApi.of(in2,stringWriter()));
}
@Test void a02_from() throws Exception {
String in1 = "foo", in2 = "foo=bar";
String expected1 = "foo", expected2 = "{foo:'bar'}";
- assertString(OpenApi.to(in1, String.class)).is(expected1);
- assertString(OpenApi.to(stringReader(in1),
String.class)).is(expected1);
+ assertEquals(expected1, OpenApi.to(in1, String.class));
+ assertEquals(expected1, OpenApi.to(stringReader(in1),
String.class));
assertObject(OpenApi.to(in2, Map.class, String.class,
String.class)).asJson().is(expected2);
assertObject(OpenApi.to(stringReader(in2), Map.class,
String.class, String.class)).asJson().is(expected2);
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/marshaller/PlainText_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/marshaller/PlainText_Test.java
index ffdfddf90..7e6107559 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/marshaller/PlainText_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/marshaller/PlainText_Test.java
@@ -13,6 +13,8 @@
package org.apache.juneau.marshaller;
import static org.apache.juneau.assertions.Assertions.*;
+import static org.junit.jupiter.api.Assertions.*;
+
import java.io.*;
import java.util.*;
@@ -26,18 +28,18 @@ class PlainText_Test extends SimpleTestBase {
Object in1 = "foo", in2 = JsonMap.of("foo", "bar");
String expected1 = "foo", expected2 = "{foo:'bar'}";
- assertString(PlainText.of(in1)).is(expected1);
- assertString(PlainText.of(in1,stringWriter())).is(expected1);
- assertString(PlainText.of(in2)).is(expected2);
- assertString(PlainText.of(in2,stringWriter())).is(expected2);
+ assertString(expected1, PlainText.of(in1));
+ assertString(expected1, PlainText.of(in1,stringWriter()));
+ assertString(expected2, PlainText.of(in2));
+ assertString(expected2, PlainText.of(in2,stringWriter()));
}
@Test void a02_from() throws Exception {
String in1 = "foo", in2 = "{foo:'bar'}";
String expected1 = "foo", expected2 = "{foo:'bar'}";
- assertString(PlainText.to(in1, String.class)).is(expected1);
- assertString(PlainText.to(stringReader(in1),
String.class)).is(expected1);
+ assertEquals(expected1, PlainText.to(in1, String.class));
+ assertEquals(expected1, PlainText.to(stringReader(in1),
String.class));
assertObject(PlainText.to(in2, Map.class, String.class,
String.class)).asJson().is(expected2);
assertObject(PlainText.to(stringReader(in2), Map.class,
String.class, String.class)).asJson().is(expected2);
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/marshaller/Uon_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/marshaller/Uon_Test.java
index aa872b792..3af004974 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/marshaller/Uon_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/marshaller/Uon_Test.java
@@ -13,6 +13,8 @@
package org.apache.juneau.marshaller;
import static org.apache.juneau.assertions.Assertions.*;
+import static org.junit.jupiter.api.Assertions.*;
+
import java.io.*;
import java.util.*;
@@ -20,24 +22,24 @@ import org.apache.juneau.*;
import org.apache.juneau.collections.*;
import org.junit.jupiter.api.*;
-public class Uon_Test extends SimpleTestBase {
+class Uon_Test extends SimpleTestBase {
@Test void a01_to() throws Exception {
Object in1 = "foo", in2 = JsonMap.of("foo", "bar");
String expected1 = "foo", expected2 = "(foo=bar)";
- assertString(Uon.of(in1)).is(expected1);
- assertString(Uon.of(in1,stringWriter())).is(expected1);
- assertString(Uon.of(in2)).is(expected2);
- assertString(Uon.of(in2,stringWriter())).is(expected2);
+ assertString(expected1, Uon.of(in1));
+ assertString(expected1, Uon.of(in1,stringWriter()));
+ assertString(expected2, Uon.of(in2));
+ assertString(expected2, Uon.of(in2,stringWriter()));
}
@Test void a02_from() throws Exception {
String in1 = "foo", in2 = "(foo=bar)";
String expected1 = "foo", expected2 = "{foo:'bar'}";
- assertString(Uon.to(in1, String.class)).is(expected1);
- assertString(Uon.to(stringReader(in1),
String.class)).is(expected1);
+ assertEquals(expected1, Uon.to(in1, String.class));
+ assertEquals(expected1, Uon.to(stringReader(in1),
String.class));
assertObject(Uon.to(in2, Map.class, String.class,
String.class)).asJson().is(expected2);
assertObject(Uon.to(stringReader(in2), Map.class, String.class,
String.class)).asJson().is(expected2);
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/marshaller/UrlEncoding_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/marshaller/UrlEncoding_Test.java
index 4f8eee910..78c4f22ef 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/marshaller/UrlEncoding_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/marshaller/UrlEncoding_Test.java
@@ -13,6 +13,8 @@
package org.apache.juneau.marshaller;
import static org.apache.juneau.assertions.Assertions.*;
+import static org.junit.jupiter.api.Assertions.*;
+
import java.io.*;
import java.util.*;
@@ -26,18 +28,18 @@ class UrlEncoding_Test extends SimpleTestBase {
Object in1 = "foo", in2 = JsonMap.of("foo", "bar");
String expected1 = "_value=foo", expected2 = "foo=bar";
- assertString(UrlEncoding.of(in1)).is(expected1);
- assertString(UrlEncoding.of(in1,stringWriter())).is(expected1);
- assertString(UrlEncoding.of(in2)).is(expected2);
- assertString(UrlEncoding.of(in2,stringWriter())).is(expected2);
+ assertString(expected1, UrlEncoding.of(in1));
+ assertString(expected1, UrlEncoding.of(in1,stringWriter()));
+ assertString(expected2, UrlEncoding.of(in2));
+ assertString(expected2, UrlEncoding.of(in2,stringWriter()));
}
@Test void a02_from() throws Exception {
String in1 = "_value=foo", in2 = "foo=bar";
String expected1 = "foo", expected2 = "{foo:'bar'}";
- assertString(UrlEncoding.to(in1, String.class)).is(expected1);
- assertString(UrlEncoding.to(stringReader(in1),
String.class)).is(expected1);
+ assertEquals(expected1, UrlEncoding.to(in1, String.class));
+ assertEquals(expected1, UrlEncoding.to(stringReader(in1),
String.class));
assertObject(UrlEncoding.to(in2, Map.class, String.class,
String.class)).asJson().is(expected2);
assertObject(UrlEncoding.to(stringReader(in2), Map.class,
String.class, String.class)).asJson().is(expected2);
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/marshaller/Xml_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/marshaller/Xml_Test.java
index fcc7da147..a4021d094 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/marshaller/Xml_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/marshaller/Xml_Test.java
@@ -13,6 +13,8 @@
package org.apache.juneau.marshaller;
import static org.apache.juneau.assertions.Assertions.*;
+import static org.junit.jupiter.api.Assertions.*;
+
import java.io.*;
import java.util.*;
@@ -25,18 +27,18 @@ class Xml_Test extends SimpleTestBase {
Object in1 = "foo", in2 = JsonMap.of("foo", "bar");
String expected1 = "<string>foo</string>", expected2 =
"<object><foo>bar</foo></object>";
- assertString(Xml.of(in1)).is(expected1);
- assertString(Xml.of(in1,stringWriter())).is(expected1);
- assertString(Xml.of(in2)).is(expected2);
- assertString(Xml.of(in2,stringWriter())).is(expected2);
+ assertString(expected1, Xml.of(in1));
+ assertString(expected1, Xml.of(in1,stringWriter()));
+ assertString(expected2, Xml.of(in2));
+ assertString(expected2, Xml.of(in2,stringWriter()));
}
@Test void a02_from() throws Exception {
String in1 = "<string>foo</string>", in2 =
"<object><foo>bar</foo></object>";
String expected1 = "foo", expected2 = "{foo:'bar'}";
- assertString(Xml.to(in1, String.class)).is(expected1);
- assertString(Xml.to(stringReader(in1),
String.class)).is(expected1);
+ assertEquals(expected1, Xml.to(in1, String.class));
+ assertEquals(expected1, Xml.to(stringReader(in1),
String.class));
assertObject(Xml.to(in2, Map.class, String.class,
String.class)).asJson().is(expected2);
assertObject(Xml.to(stringReader(in2), Map.class, String.class,
String.class)).asJson().is(expected2);
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/mstat/ThrownStore_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/mstat/ThrownStore_Test.java
index 66180acba..0d390c2fd 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/mstat/ThrownStore_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/mstat/ThrownStore_Test.java
@@ -278,7 +278,7 @@ class ThrownStore_Test extends SimpleTestBase {
assertLong(stats.getGuid()).isNot(0L);
assertLong(stats.getFirstOccurrence()).isNot(0L);
assertLong(stats.getLastOccurrence()).isNot(0L);
- assertString(stats.getFirstMessage()).is("bar");
+ assertEquals("bar", stats.getFirstMessage());
assertObject(stats.getStackTrace()).asJson().isContains("org.apache.juneau");
assertObject(stats).asString().isContains("bar");
@@ -287,7 +287,7 @@ class ThrownStore_Test extends SimpleTestBase {
assertLong(stats.getGuid()).isNot(0L);
assertLong(stats.getFirstOccurrence()).isNot(0L);
assertLong(stats.getLastOccurrence()).isNot(0L);
- assertString(stats.getFirstMessage()).is("bar");
+ assertEquals("bar", stats.getFirstMessage());
assertObject(stats.getStackTrace()).asJson().isContains("org.apache.juneau");
assertObject(stats).asString().isContains("bar");
@@ -296,7 +296,7 @@ class ThrownStore_Test extends SimpleTestBase {
assertLong(stats.getGuid()).isNot(0L);
assertLong(stats.getFirstOccurrence()).isNot(0L);
assertLong(stats.getLastOccurrence()).isNot(0L);
- assertString(stats.getFirstMessage()).is("foo");
+ assertEquals("foo", stats.getFirstMessage());
assertObject(stats.getStackTrace()).asJson().isContains("org.apache.juneau");
assertObject(stats).asString().isContains("foo");
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/RestContext_Builder_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/RestContext_Builder_Test.java
index 0e0360341..a9c72a428 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/RestContext_Builder_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/RestContext_Builder_Test.java
@@ -13,6 +13,7 @@
package org.apache.juneau.rest;
import static org.apache.juneau.assertions.Assertions.*;
+import static org.junit.jupiter.api.Assertions.*;
import static org.junit.runners.MethodSorters.*;
import org.apache.juneau.annotation.*;
@@ -40,7 +41,7 @@ public class RestContext_Builder_Test {
@Test
public void a01_createBeanStore_default() {
MockRestClient.buildLax(A1.class);
-
assertString(A1.beanStore.getClass().getSimpleName()).is("BeanStore");
+ assertEquals("BeanStore",
A1.beanStore.getClass().getSimpleName());
}
public static class MyBeanStore extends BeanStore {
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Response_Body_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Response_Body_Test.java
index 96adfa270..16dd6a5de 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Response_Body_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Response_Body_Test.java
@@ -169,11 +169,11 @@ class RestClient_Response_Body_Test extends
SimpleTestBase {
StringWriter sw = new StringWriter();
client().build().get("/bean").run().getContent().pipeTo(sw);
- assertString(sw.toString()).is("{f:1}");
+ assertEquals("{f:1}", sw.toString());
sw = new StringWriter();
client().build().get("/bean").run().getContent().pipeTo(sw,UTF8);
- assertString(sw.toString()).is("{f:1}");
+ assertEquals("{f:1}", sw.toString());
}
public static class A7a {
@@ -228,29 +228,29 @@ class RestClient_Response_Body_Test extends
SimpleTestBase {
assertObject(x12.get()).asJson().is("[1,2]");
String x14 =
testClient().entity(stringEntity("{f:1}")).get().run().getContent().asString();
- assertString(x14).is("{f:1}");
+ assertEquals("{f:1}", x14);
assertThrown(()->testClient().entity(new
InputStreamEntity(badStream())).get().run().getContent().asString()).asMessages().isContains("foo");
Future<String> x16 =
testClient().entity(stringEntity("{f:1}")).get().run().getContent().asStringFuture();
- assertString(x16.get()).is("{f:1}");
+ assertEquals("{f:1}", x16.get());
String x18 =
testClient().entity(stringEntity("12345")).get().run().getContent().asAbbreviatedString(4);
- assertString(x18).is("1...");
+ assertEquals("1...", x18);
ObjectRest x20 =
testClient().entity(stringEntity("{f:1}")).get().run().getContent().asObjectRest(ABean.class);
- assertString(x20.get("f")).is("1");
+ assertString("1", x20.get("f"));
ObjectRest x22 =
testClient().entity(stringEntity("{f:1}")).get().run().getContent().asObjectRest();
- assertString(x22.get("f")).is("1");
+ assertString("1", x22.get("f"));
Matcher x24 =
testClient().entity(stringEntity("foo=123")).get().run().getContent().asMatcher(Pattern.compile("foo=(.*)"));
assertTrue(x24.matches());
- assertString(x24.group(1)).is("123");
+ assertEquals("123", x24.group(1));
Matcher x26 =
testClient().entity(stringEntity("foo=123")).get().run().getContent().asMatcher("foo=(.*)");
assertTrue(x26.matches());
- assertString(x26.group(1)).is("123");
+ assertEquals("123", x26.group(1));
}
//------------------------------------------------------------------------------------------------------------------
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/utils/Tuple2_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/utils/Tuple2_Test.java
index a675bdb45..d5a3b4d72 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/utils/Tuple2_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/utils/Tuple2_Test.java
@@ -24,7 +24,7 @@ public class Tuple2_Test extends SimpleTestBase {
//------------------------------------------------------------------------------------------------------------------
@Test void a01_basic() {
Tuple2<String,Integer> x = Tuple2.of("foo",1);
- assertString(x.getA()).is("foo");
+ assertEquals("foo", x.getA());
assertEquals(1, x.getB());
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/utils/Tuple3_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/utils/Tuple3_Test.java
index 94e0f344c..3e1602953 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/utils/Tuple3_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/utils/Tuple3_Test.java
@@ -24,7 +24,7 @@ public class Tuple3_Test extends SimpleTestBase {
//------------------------------------------------------------------------------------------------------------------
@Test void a01_basic() {
Tuple3<String,Integer,Integer> x = Tuple3.of("foo",1,2);
- assertString(x.getA()).is("foo");
+ assertEquals("foo", x.getA());
assertEquals(1, x.getB());
assertEquals(2, x.getC());
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/utils/Tuple4_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/utils/Tuple4_Test.java
index 54ea5800e..8b83e5409 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/utils/Tuple4_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/utils/Tuple4_Test.java
@@ -24,7 +24,7 @@ class Tuple4_Test extends SimpleTestBase {
//------------------------------------------------------------------------------------------------------------------
@Test void a01_basic() {
Tuple4<String,Integer,Integer,Integer> x =
Tuple4.of("foo",1,2,3);
- assertString(x.getA()).is("foo");
+ assertEquals("foo", x.getA());
assertEquals(1, x.getB());
assertEquals(2, x.getC());
assertEquals(3, x.getD());
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/utils/Tuple5_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/utils/Tuple5_Test.java
index c94db82e3..d07eaaf67 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/utils/Tuple5_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/utils/Tuple5_Test.java
@@ -24,7 +24,7 @@ class Tuple5_Test extends SimpleTestBase {
//------------------------------------------------------------------------------------------------------------------
@Test void a01_basic() {
Tuple5<String,Integer,Integer,Integer,Integer> x =
Tuple5.of("foo",1,2,3,4);
- assertString(x.getA()).is("foo");
+ assertEquals("foo", x.getA());
assertEquals(1, x.getB());
assertEquals(2, x.getC());
assertEquals(3, x.getD());
