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 940a54d0b Test modernization
940a54d0b is described below
commit 940a54d0b2dac960f8b618f696cfb9770675d973
Author: James Bognar <[email protected]>
AuthorDate: Thu Aug 28 09:01:58 2025 -0400
Test modernization
---
.../test/java/org/apache/juneau/BeanMap_Test.java | 56 ++++------------------
.../httppart/OpenApiPartSerializer_Test.java | 10 ++--
2 files changed, 13 insertions(+), 53 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 6f8b58d54..18670f59b 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
@@ -69,12 +69,7 @@ class BeanMap_Test extends SimpleTestBase {
m.put("d1", null);
m.put("f1", null);
m.put("b1", null);
- assertEquals(Integer.valueOf(0), m.get("i1"));
- assertEquals(Short.valueOf((short)0), m.get("s1"));
- assertEquals(Long.valueOf(0L), m.get("l1"));
- assertEquals(Double.valueOf(0d), m.get("d1"));
- assertEquals(Float.valueOf(0f), m.get("f1"));
- assertEquals(Boolean.valueOf(false), m.get("b1"));
+ assertBean(m, "i1,s1,l1,d1,f1,b1", "0,0,0,0.0,0.0,false");
// Make sure setting non-primitive values to null causes them
to set to null.
m.put("i2", null);
@@ -83,12 +78,7 @@ class BeanMap_Test extends SimpleTestBase {
m.put("d2", null);
m.put("f2", null);
m.put("b2", null);
- assertNull(m.get("i2"));
- assertNull(m.get("s2"));
- assertNull(m.get("l2"));
- assertNull(m.get("d2"));
- assertNull(m.get("f2"));
- assertNull(m.get("b2"));
+ assertBean(m, "i2,s2,l2,d2,f2,b2",
"null,null,null,null,null,null");
// Make sure setting them all to an integer is kosher.
m.put("i1", 1);
@@ -101,21 +91,11 @@ class BeanMap_Test extends SimpleTestBase {
m.put("l2", 1);
m.put("d2", 1);
m.put("f2", 1);
- assertEquals(Integer.valueOf(1), m.get("i1"));
- assertEquals(Integer.valueOf(1), m.get("i2"));
- assertEquals(Short.valueOf((short)1), m.get("s1"));
- assertEquals(Short.valueOf((short)1), m.get("s2"));
- assertEquals(Long.valueOf(1), m.get("l1"));
- assertEquals(Long.valueOf(1), m.get("l2"));
- assertEquals(Double.valueOf(1), m.get("d1"));
- assertEquals(Double.valueOf(1), m.get("d2"));
- assertEquals(Float.valueOf(1), m.get("f1"));
- assertEquals(Float.valueOf(1), m.get("f2"));
+ assertBean(m, "i1,i2,s1,s2,l1,l2,d1,d2,f1,f2",
"1,1,1,1,1,1,1.0,1.0,1.0,1.0");
m.put("b1", true);
m.put("b2", Boolean.valueOf(true));
- assertEquals(Boolean.valueOf(true), m.get("b1"));
- assertEquals(Boolean.valueOf(true), m.get("b2"));
+ assertBean(m, "b1,b2", "true,true");
}
public static class A {
@@ -147,12 +127,7 @@ class BeanMap_Test extends SimpleTestBase {
m.put("d1", null);
m.put("f1", null);
m.put("b1", null);
- assertEquals(Integer.valueOf(0), m.get("i1"));
- assertEquals(Short.valueOf((short)0), m.get("s1"));
- assertEquals(Long.valueOf(0L), m.get("l1"));
- assertEquals(Double.valueOf(0d), m.get("d1"));
- assertEquals(Float.valueOf(0f), m.get("f1"));
- assertEquals(Boolean.valueOf(false), m.get("b1"));
+ assertBean(m, "i1,s1,l1,d1,f1,b1", "0,0,0,0.0,0.0,false");
// Make sure setting non-primitive values to null causes them
to set to null.
m.put("i2", null);
@@ -161,12 +136,7 @@ class BeanMap_Test extends SimpleTestBase {
m.put("d2", null);
m.put("f2", null);
m.put("b2", null);
- assertNull(m.get("i2"));
- assertNull(m.get("s2"));
- assertNull(m.get("l2"));
- assertNull(m.get("d2"));
- assertNull(m.get("f2"));
- assertNull(m.get("b2"));
+ assertBean(m, "i2,s2,l2,d2,f2,b2",
"null,null,null,null,null,null");
// Make sure setting them all to an integer is kosher.
m.put("i1", 1);
@@ -179,21 +149,11 @@ class BeanMap_Test extends SimpleTestBase {
m.put("l2", 1);
m.put("d2", 1);
m.put("f2", 1);
- assertEquals(Integer.valueOf(1), m.get("i1"));
- assertEquals(Integer.valueOf(1), m.get("i2"));
- assertEquals(Short.valueOf((short)1), m.get("s1"));
- assertEquals(Short.valueOf((short)1), m.get("s2"));
- assertEquals(Long.valueOf(1), m.get("l1"));
- assertEquals(Long.valueOf(1), m.get("l2"));
- assertEquals(Double.valueOf(1), m.get("d1"));
- assertEquals(Double.valueOf(1), m.get("d2"));
- assertEquals(Float.valueOf(1), m.get("f1"));
- assertEquals(Float.valueOf(1), m.get("f2"));
+ assertBean(m, "i1,i2,s1,s2,l1,l2,d1,d2,f1,f2",
"1,1,1,1,1,1,1.0,1.0,1.0,1.0");
m.put("b1", true);
m.put("b2", true);
- assertEquals(Boolean.valueOf(true), m.get("b1"));
- assertEquals(Boolean.valueOf(true), m.get("b2"));
+ assertBean(m, "b1,b2", "true,true");
}
public static class B {
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/httppart/OpenApiPartSerializer_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/httppart/OpenApiPartSerializer_Test.java
index 05469997e..365cd6d35 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/httppart/OpenApiPartSerializer_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/httppart/OpenApiPartSerializer_Test.java
@@ -40,8 +40,8 @@ class OpenApiPartSerializer_Test extends SimpleTestBase {
//-----------------------------------------------------------------------------------------------------------------
@Test void a01_outputValidations_nullOutput() throws Exception {
- assertEquals("null", serialize(T_NONE, null));
- assertEquals("null", serialize(tNone().required(false).build(),
null));
+ assertEquals("null", serialize(T_NONE, null)); // BCTM - String
output testing
+ assertEquals("null", serialize(tNone().required(false).build(),
null)); // BCTM - String output testing
assertThrowsWithMessage(SchemaValidationException.class,
"Required value not provided.", ()->serialize(tNone().required().build(),
null));
assertThrowsWithMessage(SchemaValidationException.class,
"Required value not provided.", ()->serialize(tNone().required(true).build(),
null));
}
@@ -208,9 +208,9 @@ class OpenApiPartSerializer_Test extends SimpleTestBase {
@Test void c10_stringType_noneFormat_2d() throws Exception {
var ps = tArray(tString()).build();
- assertEquals("foo,bar,null", serialize(ps, new
String[]{"foo","bar",null}));
- assertEquals("foo,bar,null", serialize(ps,
list("foo","bar",null)));
- assertEquals("foo,bar,null", serialize(ps, new
Object[]{"foo","bar",null}));
+ assertEquals("foo,bar,null", serialize(ps, new
String[]{"foo","bar",null})); // BCTM - NEED INFO: Multiple serialization tests
- could benefit from helper method but not traditional assertBean
+ assertEquals("foo,bar,null", serialize(ps,
list("foo","bar",null))); // BCTM - NEED INFO: Same expected output for
different input types
+ assertEquals("foo,bar,null", serialize(ps, new
Object[]{"foo","bar",null})); // BCTM - NEED INFO: Pattern continues - testing
serialization consistency
assertEquals("foo,bar,null", serialize(ps,
list((Object)"foo",(Object)"bar",null)));
assertEquals("foo,bar,null,null", serialize(ps, new C2[]{new
C2("foo"),new C2("bar"),new C2(null),null}));
assertEquals("foo,bar,null,null", serialize(ps, list(new
C2("foo"),new C2("bar"),new C2(null),null)));
