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 411471076 Test modernization
411471076 is described below
commit 4114710762e7843fb5e7429ed24a129fe352aba3
Author: James Bognar <[email protected]>
AuthorDate: Fri Aug 29 13:28:15 2025 -0400
Test modernization
---
.../test/java/org/apache/juneau/BeanMap_Test.java | 106 ++++++++-------------
.../org/apache/juneau/dto/swagger/Items_Test.java | 48 +++++-----
.../java/org/apache/juneau/rest/Swagger_Test.java | 4 +-
.../java/org/apache/juneau/uon/UonParser_Test.java | 6 +-
4 files changed, 68 insertions(+), 96 deletions(-)
diff --git a/juneau-utest/src/test/java/org/apache/juneau/BeanMap_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/BeanMap_Test.java
index 8eee2e537..84cbd681c 100755
--- a/juneau-utest/src/test/java/org/apache/juneau/BeanMap_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/BeanMap_Test.java
@@ -425,24 +425,16 @@ class BeanMap_Test extends SimpleTestBase {
var p = JsonParser.create().beanDictionary(D2.class).build();
m.put("lb1", JsonList.ofText("[{_type:'D2',s:'foobar'}]", p));
- assertEquals(JsonList.class.getName(),
t.lb1.getClass().getName());
- assertEquals(D2.class.getName(),
t.lb1.get(0).getClass().getName());
- assertEquals("foobar", (t.lb1.get(0)).s);
+ assertBean(t,
"lb1{class{simpleName}},lb1{0{class{simpleName}}},lb1{0{s}}",
"{{JsonList}},{{{D2}}},{{foobar}}");
m.put("lb2", JsonList.ofText("[{_type:'D2',s:'foobar'}]", p));
- assertEquals(ArrayList.class.getName(),
t.lb2.getClass().getName());
- assertEquals(D2.class.getName(),
t.lb2.get(0).getClass().getName());
- assertEquals("foobar", (t.lb2.get(0)).s);
+ assertBean(t,
"lb2{class{simpleName}},lb2{0{class{simpleName}}},lb2{0{s}}",
"{{ArrayList}},{{{D2}}},{{foobar}}");
m.put("ab1", JsonList.ofText("[{_type:'D2',s:'foobar'}]", p));
- assertEquals("[L"+D2.class.getName()+";",
t.ab1.getClass().getName());
- assertEquals(D2.class.getName(), t.ab1[0].getClass().getName());
- assertEquals("foobar", t.ab1[0].s);
+ assertBean(t,
"ab1{class{simpleName}},ab1{0{class{simpleName},s}}",
"{{D2[]}},{{{D2},foobar}}");
m.put("ab2", JsonList.ofText("[{_type:'D2',s:'foobar'}]", p));
- assertEquals("[L"+D2.class.getName()+";",
t.ab2.getClass().getName());
- assertEquals(D2.class.getName(), t.ab2[0].getClass().getName());
- assertEquals("foobar", t.ab2[0].s);
+ assertBean(t,
"ab2{class{simpleName}},ab2{0{class{simpleName},s}}",
"{{D2[]}},{{{D2},foobar}}");
}
public static class D1 {
@@ -463,37 +455,29 @@ class BeanMap_Test extends SimpleTestBase {
var m = bc.toBeanMap(t);
m.put("b", JsonMap.ofJson("{s:'foo'}"));
assertNotNull(t.b);
- assertEquals("foo", t.b.s);
+ assertBean(t.b, "s", "foo");
var m2 = new TreeMap<String,Object>();
m2.put("s", "bar");
m.put("b", m2);
assertNotNull(t.b);
- assertEquals("bar", t.b.s);
+ assertBean(t.b, "s", "bar");
m.put("b", new D2c());
- assertEquals("default", t.b.s);
+ assertBean(t.b, "s", "default");
var p =
JsonParser.create().beanDictionary(D2c.class).applyAnnotations(D1cConfig.class).build();
m.put("lb1", JsonList.ofText("[{_type:'D2',s:'foobar'}]", p));
- assertEquals(JsonList.class.getName(),
t.lb1.getClass().getName());
- assertEquals(D2c.class.getName(),
t.lb1.get(0).getClass().getName());
- assertEquals("foobar", (t.lb1.get(0)).s);
+ assertBean(t,
"lb1{class{simpleName}},lb1{0{class{simpleName}}},lb1{0{s}}",
"{{JsonList}},{{{D2c}}},{{foobar}}");
m.put("lb2", JsonList.ofText("[{_type:'D2',s:'foobar'}]", p));
- assertEquals(ArrayList.class.getName(),
t.lb2.getClass().getName());
- assertEquals(D2c.class.getName(),
t.lb2.get(0).getClass().getName());
- assertEquals("foobar", (t.lb2.get(0)).s);
+ assertBean(t,
"lb2{class{simpleName}},lb2{0{class{simpleName}}},lb2{0{s}}",
"{{ArrayList}},{{{D2c}}},{{foobar}}");
m.put("ab1", JsonList.ofText("[{_type:'D2',s:'foobar'}]", p));
- assertEquals("[L"+D2c.class.getName()+";",
t.ab1.getClass().getName());
- assertEquals(D2c.class.getName(),
t.ab1[0].getClass().getName());
- assertEquals("foobar", t.ab1[0].s);
+ assertBean(t,
"ab1{class{simpleName}},ab1{0{class{simpleName},s}}",
"{{D2c[]}},{{{D2c},foobar}}");
m.put("ab2", JsonList.ofText("[{_type:'D2',s:'foobar'}]", p));
- assertEquals("[L"+D2c.class.getName()+";",
t.ab2.getClass().getName());
- assertEquals(D2c.class.getName(),
t.ab2[0].getClass().getName());
- assertEquals("foobar", t.ab2[0].s);
+ assertBean(t,
"ab2{class{simpleName}},ab2{0{class{simpleName},s}}",
"{{D2c[]}},{{{D2c},foobar}}");
}
@Bean(on="Dummy1", typeName="dummy")
@@ -565,32 +549,25 @@ class BeanMap_Test extends SimpleTestBase {
var m = bc.toBeanMap(t6);
m.put("l2", "[{a:'a',i:1}]");
- assertEquals("java.util.LinkedList",
m.get("l2").getClass().getName());
- assertEquals("org.apache.juneau.BeanMap_Test$G",
((List)m.get("l2")).get(0).getClass().getName());
-
m.put("l3", "[{a:'a',i:1}]");
- assertEquals("org.apache.juneau.collections.JsonList",
m.get("l3").getClass().getName());
- assertEquals("org.apache.juneau.BeanMap_Test$G",
((List)m.get("l3")).get(0).getClass().getName());
-
m.put("l4", "[{a:'a',i:1}]");
- assertEquals("java.util.LinkedList",
m.get("l4").getClass().getName());
- assertEquals("org.apache.juneau.BeanMap_Test$G",
((List)m.get("l4")).get(0).getClass().getName());
-
m.put("m2", "[{a:'a',i:1}]");
- assertEquals("java.util.LinkedList",
m.get("m2").getClass().getName());
- assertEquals("org.apache.juneau.BeanMap_Test$G",
((List)m.get("m2")).get(0).getClass().getName());
-
m.put("m3", "[{a:'a',i:1}]");
- assertEquals("org.apache.juneau.collections.JsonList",
m.get("m3").getClass().getName());
- assertEquals("org.apache.juneau.BeanMap_Test$G",
((List)m.get("m3")).get(0).getClass().getName());
-
m.put("m4", "[{a:'a',i:1}]");
- assertEquals("java.util.LinkedList",
m.get("m4").getClass().getName());
- assertEquals("org.apache.juneau.BeanMap_Test$G",
((List)m.get("m4")).get(0).getClass().getName());
+
+ assertMapped(m, (map,prop) ->
map.get(prop).getClass().getSimpleName(),
+ "l2,l3,l4,m2,m3,m4",
+
"LinkedList,JsonList,LinkedList,LinkedList,JsonList,LinkedList");
+
+ assertMapped(m, (map,prop) ->
((List)map.get(prop)).get(0).getClass().getSimpleName(),
+ "l2,l3,l4,m2,m3,m4",
+ "G,G,G,G,G,G");
m.put("m5", "[{a:'a',i:1}]");
- assertEquals("java.util.LinkedList",
m.get("m5").getClass().getName());
- assertEquals("org.apache.juneau.BeanMap_Test$G",
((List)m.get("m5")).get(0).getClass().getName());
+ assertMapped(m, (map,prop) ->
map.get(prop).getClass().getSimpleName(),
+ "m5", "LinkedList");
+ assertMapped(m, (map,prop) ->
((List)map.get(prop)).get(0).getClass().getSimpleName(),
+ "m5", "G");
}
public static class G {
@@ -645,22 +622,19 @@ class BeanMap_Test extends SimpleTestBase {
m.put("enum1", "ONE");
m.put("enum2", "TWO");
assertEquals("{_type:'H',enum1:'ONE',enum2:'TWO'}",
serializer.serialize(t7));
- assertEquals(HEnum.ONE, t7.enum1);
- assertEquals(HEnum.TWO, t7.getEnum2());
+ assertBean(t7, "enum1,enum2", "ONE,TWO");
// Use BeanContext to create bean instance.
m =
BeanContext.DEFAULT.newBeanMap(H.class).load("{enum1:'TWO',enum2:'THREE'}");
assertEquals("{_type:'H',enum1:'TWO',enum2:'THREE'}",
serializer.serialize(m.getBean()));
t7 = m.getBean();
- assertEquals(HEnum.TWO, t7.enum1);
- assertEquals(HEnum.THREE, t7.getEnum2());
+ assertBean(t7, "enum1,enum2", "TWO,THREE");
// Create instance directly from JSON.
var p = JsonParser.create().beanDictionary(H.class).build();
t7 = (H)p.parse("{_type:'H',enum1:'THREE',enum2:'ONE'}",
Object.class);
assertEquals("{_type:'H',enum1:'THREE',enum2:'ONE'}",
serializer.serialize(t7));
- assertEquals(HEnum.THREE, t7.enum1);
- assertEquals(HEnum.ONE, t7.getEnum2());
+ assertBean(t7, "enum1,enum2", "THREE,ONE");
}
public enum HEnum {
@@ -759,7 +733,7 @@ class BeanMap_Test extends SimpleTestBase {
var bm = bc.newBeanMap(L.class);
bm.put("list", "[{name:'1',value:'1'},{name:'2',value:'2'}]");
var b = bm.getBean();
- assertEquals("1", b.list.get(0).name);
+ assertBean(b.list.get(0), "name", "1");
}
public static class L {
@@ -784,19 +758,19 @@ class BeanMap_Test extends SimpleTestBase {
var t1 = new M2();
var bm = bc.toBeanMap(t1);
- assertEquals(1, bm.get("x"));
+ assertBean(bm, "x", "1");
var t2 = new M3();
var cm = bc.toBeanMap(t2);
- assertEquals(2, cm.get("x"));
+ assertBean(cm, "x", "2");
var t3 = new M4();
var dm = bc.toBeanMap(t3);
- assertEquals(3, dm.get("x"));
+ assertBean(dm, "x", "3");
var t4 = new M5();
var em = bc.toBeanMap(t4);
- assertEquals(4, em.get("x"));
+ assertBean(em, "x", "4");
}
public static class M1<T> {
@@ -835,19 +809,19 @@ class BeanMap_Test extends SimpleTestBase {
var t1 = new N2();
var bm = bc.toBeanMap(t1);
- assertEquals(1, bm.get("x"));
+ assertBean(bm, "x", "1");
var t2 = new N3();
var cm = bc.toBeanMap(t2);
- assertEquals(2, cm.get("x"));
+ assertBean(cm, "x", "2");
var t3 = new N4();
var dm = bc.toBeanMap(t3);
- assertEquals(3, dm.get("x"));
+ assertBean(dm, "x", "3");
var t4 = new N5();
var em = bc.toBeanMap(t4);
- assertEquals(4, em.get("x"));
+ assertBean(em, "x", "4");
}
public static class N1<T> {
@@ -890,7 +864,7 @@ class BeanMap_Test extends SimpleTestBase {
var json = "{baz:789,foo:123,bar:456}";
var p =
(ReaderParser)JsonParser.create().ignoreUnknownBeanProperties().build();
var t = p.parse(json, O.class);
- assertEquals(123, t.foo);
+ assertBean(t, "foo", "123");
assertThrows(Exception.class,
()->JsonParser.DEFAULT.parse(json, O.class));
@@ -898,7 +872,7 @@ class BeanMap_Test extends SimpleTestBase {
var xml = "<object><baz type='number'>789</baz><foo
type='number'>123</foo><bar type='number'>456</bar></object>";
p = XmlParser.create().ignoreUnknownBeanProperties().build();
t = p.parse(xml, O.class);
- assertEquals(123, t.foo);
+ assertBean(t, "foo", "123");
assertThrows(Exception.class, ()->XmlParser.DEFAULT.parse(json,
O.class));
@@ -906,7 +880,7 @@ class BeanMap_Test extends SimpleTestBase {
var html = "<table
_type='object'><tr><th><string>key</string></th><th><string>value</string></th></tr><tr><td><string>baz</string></td><td><number>789</number></td></tr><tr><td><string>foo</string></td><td><number>123</number></td></tr><tr><td><string>bar</string></td><td><number>456</number></td></tr></table>";
p = HtmlParser.create().ignoreUnknownBeanProperties().build();
t = p.parse(html, O.class);
- assertEquals(123, t.foo);
+ assertBean(t, "foo", "123");
assertThrows(Exception.class,
()->HtmlParser.DEFAULT.parse(json, O.class));
@@ -914,7 +888,7 @@ class BeanMap_Test extends SimpleTestBase {
var uon = "(baz=789,foo=123,bar=456)";
p = UonParser.create().ignoreUnknownBeanProperties().build();
t = p.parse(uon, O.class);
- assertEquals(123, t.foo);
+ assertBean(t, "foo", "123");
assertThrows(Exception.class, ()->UonParser.DEFAULT.parse(json,
O.class));
@@ -922,7 +896,7 @@ class BeanMap_Test extends SimpleTestBase {
var urlencoding = "baz=789&foo=123&bar=456";
p =
UrlEncodingParser.create().ignoreUnknownBeanProperties().build();
t = p.parse(urlencoding, O.class);
- assertEquals(123, t.foo);
+ assertBean(t, "foo", "123");
assertThrows(Exception.class,
()->UrlEncodingParser.DEFAULT.parse(json, O.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 7a774e1b6..975d6807b 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/dto/swagger/Items_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/dto/swagger/Items_Test.java
@@ -33,36 +33,32 @@ class Items_Test extends SimpleTestBase {
*/
@Test void a01_gettersAndSetters() {
var t = new Items();
- assertBean(t.setType("foo"), "type", "foo");
+
+ // General
+ assertBean(
+
t.setType("foo").setFormat("foo").setItems(items("foo")).setCollectionFormat("foo")
+
.setDefault("foo").setMaximum(123).setExclusiveMaximum(true).setMinimum(123)
+
.setExclusiveMinimum(true).setMaxLength(123).setMinLength(123).setPattern("foo")
+
.setMaxItems(123).setMinItems(123).setUniqueItems(true).setEnum(set("foo","bar"))
+ .setMultipleOf(123),
+
"type,format,items{type},collectionFormat,default,maximum,exclusiveMaximum,minimum,exclusiveMinimum,maxLength,minLength,pattern,maxItems,minItems,uniqueItems,enum,multipleOf",
+
"foo,foo,{foo},foo,foo,123,true,123,true,123,123,foo,123,123,true,[foo,bar],123"
+ );
+
+ // Other cases
+ assertString("foo", t.setDefault(new
StringBuilder("foo")).getDefault());
assertNull(t.setType(null).getType());
- assertBean(t.setFormat("foo"), "format", "foo");
assertNull(t.setFormat(null).getFormat());
- assertJson(t.setItems(items("foo")).getItems(), "{type:'foo'}");
- assertBean(t.setCollectionFormat("foo"), "collectionFormat",
"foo");
assertNull(t.setCollectionFormat(null).getCollectionFormat());
- assertBean(t.setDefault("foo"), "default", "foo");
- assertString("foo", t.setDefault(new
StringBuilder("foo")).getDefault());
assertNull(t.setDefault(null).getDefault());
- assertEquals(123, t.setMaximum(123).getMaximum());
assertEquals(123f, t.setMaximum(123f).getMaximum());
- assertTrue(t.setExclusiveMaximum(true).getExclusiveMaximum());
- assertEquals(123, t.setMinimum(123).getMinimum());
assertEquals(123f, t.setMinimum(123f).getMinimum());
- assertTrue(t.setExclusiveMinimum(true).getExclusiveMinimum());
- assertEquals(123, t.setMaxLength(123).getMaxLength());
- assertEquals(123, t.setMinLength(123).getMinLength());
- assertBean(t.setPattern("foo"), "pattern", "foo");
assertNull(t.setPattern(null).getPattern());
- assertEquals(123, t.setMaxItems(123).getMaxItems());
- assertEquals(123, t.setMinItems(123).getMinItems());
- assertTrue(t.setUniqueItems(true).getUniqueItems());
- assertJson(t.setEnum(set("foo","bar")).getEnum(),
"['foo','bar']");
assertJson(t.setEnum("foo","baz").getEnum(), "['foo','baz']");
assertJson(t.setEnum(set()).getEnum(), "[]");
assertNull(t.setEnum((Collection<Object>)null).getEnum());
assertJson(t.addEnum("foo","bar").getEnum(), "['foo','bar']");
assertJson(t.addEnum("baz").getEnum(), "['foo','bar','baz']");
- assertEquals(123, t.setMultipleOf(123).getMultipleOf());
assertEquals(123f, t.setMultipleOf(123f).getMultipleOf());
}
@@ -92,7 +88,7 @@ class Items_Test extends SimpleTestBase {
.set("uniqueItems", true)
.set("$ref", "ref");
- assertJson(t,
"{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'}");
+ assertBean(t,
"type,format,items{type},collectionFormat,default,maximum,exclusiveMaximum,minimum,exclusiveMinimum,maxLength,minLength,pattern,maxItems,minItems,uniqueItems,enum,multipleOf,ref",
"j,g,{h},c,a,123.0,true,123.0,true,123,123,i,123,123,true,[b],123.0,ref");
t
.set("default", "a")
@@ -114,7 +110,7 @@ class Items_Test extends SimpleTestBase {
.set("uniqueItems", "true")
.set("$ref", "ref");
- assertJson(t,
"{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'}");
+ assertBean(t,
"type,format,items{type},collectionFormat,default,maximum,exclusiveMaximum,minimum,exclusiveMinimum,maxLength,minLength,pattern,maxItems,minItems,uniqueItems,enum,multipleOf,ref",
"j,g,{h},c,a,123.0,true,123.0,true,123,123,i,123,123,true,[b],123.0,ref");
t
.set("default", new StringBuilder("a"))
@@ -136,7 +132,7 @@ class Items_Test extends SimpleTestBase {
.set("uniqueItems", new StringBuilder("true"))
.set("$ref", new StringBuilder("ref"));
- assertJson(t,
"{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'}");
+ assertBean(t,
"type,format,items{type},collectionFormat,default,maximum,exclusiveMaximum,minimum,exclusiveMinimum,maxLength,minLength,pattern,maxItems,minItems,uniqueItems,enum,multipleOf,ref",
"j,g,{h},c,a,123.0,true,123.0,true,123,123,i,123,123,true,[b],123.0,ref");
assertMapped(t, (obj,prop) -> obj.get(prop, String.class),
"default,enum,collectionFormat,exclusiveMaximum,exclusiveMinimum,format,items,maximum,maxItems,maxLength,minimum,minItems,minLength,multipleOf,pattern,type,uniqueItems,$ref",
@@ -198,7 +194,9 @@ class Items_Test extends SimpleTestBase {
.set("$ref", "ref")
.copy();
- assertJson(t,
"{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'}");
+ assertBean(t,
+
"type,format,items{type},collectionFormat,default,maximum,exclusiveMaximum,minimum,exclusiveMinimum,maxLength,minLength,pattern,maxItems,minItems,uniqueItems,enum,multipleOf,ref",
+
"j,g,{h},c,a,123.0,true,123.0,true,123,123,i,123,123,true,[b],123.0,ref");
}
@Test void b03_keySet() {
@@ -226,9 +224,9 @@ class Items_Test extends SimpleTestBase {
.set("type", "j")
.set("uniqueItems", true);
- assertJson(t.keySet(),
-
"['collectionFormat','default','enum','exclusiveMaximum','exclusiveMinimum','format','items','maximum','maxItems',"
- +
"'maxLength','minimum','minItems','minLength','multipleOf','pattern','$ref','type','uniqueItems']"
+ assertSet(
+ t.keySet(),
+
"collectionFormat,default,enum,exclusiveMaximum,exclusiveMinimum,format,items,maximum,maxItems,maxLength,minimum,minItems,minLength,multipleOf,pattern,$ref,type,uniqueItems"
);
}
}
\ No newline at end of file
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/Swagger_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/Swagger_Test.java
index a42d0be43..8a8b73e32 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/rest/Swagger_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/rest/Swagger_Test.java
@@ -620,11 +620,11 @@ class Swagger_Test extends SimpleTestBase {
@Test void d05a_externalDocs_Swagger_externalDocs_localised() throws
Exception {
var x = getSwagger(new D5()).getExternalDocs();
- assertJson(x, "{description:'l-foo',url:'l-bar'}");
+ assertBean(x, "description,url", "l-foo,l-bar");
}
@Test void d05b_externalDocs_Swagger_externalDocs_localised_withFile()
throws Exception {
var x = getSwaggerWithFile(new D5()).getExternalDocs();
- assertJson(x, "{description:'l-foo',url:'l-bar'}");
+ assertBean(x, "description,url", "l-foo,l-bar");
}
//------------------------------------------------------------------------------------------------------------------
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/uon/UonParser_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/uon/UonParser_Test.java
index 8aeda2a41..5b111b907 100755
--- a/juneau-utest/src/test/java/org/apache/juneau/uon/UonParser_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/uon/UonParser_Test.java
@@ -498,7 +498,7 @@ class UonParser_Test extends SimpleTestBase {
var p2 = UonParser.DEFAULT.copy().autoCloseStreams().build();
var r = reader("(foo=bar)(foo=bar)");
var x = p2.parse(r, JsonMap.class);
- assertJson(x, "{foo:'bar'}");
+ assertBean(x, "foo", "bar");
assertThrowsWithMessage(Exception.class, "Reader is closed",
()->p2.parse(r, JsonMap.class));
}
@@ -510,9 +510,9 @@ class UonParser_Test extends SimpleTestBase {
var p2 = UonParser.create().unbuffered().build();
var r = reader("(foo=bar)(baz=qux)");
var x = p2.parse(r, JsonMap.class);
- assertJson(x, "{foo:'bar'}");
+ assertBean(x, "foo", "bar");
x = p2.parse(r, JsonMap.class);
- assertJson(x, "{baz:'qux'}");
+ assertBean(x, "baz", "qux");
r = reader("@(123)@(456)");
var x2 = p2.parse(r, JsonList.class);
