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 a89bba2 Tests.
a89bba2 is described below
commit a89bba228ec3d4bbe5838817c6b17903acbd238e
Author: JamesBognar <[email protected]>
AuthorDate: Thu Jun 25 15:47:23 2020 -0400
Tests.
---
.../java/org/apache/juneau/BasicBeanTests.java | 5 ++-
.../apache/juneau/ReadWriteOnlyPropertiesTest.java | 5 ++-
.../juneau/a/rttests/RoundTripBeanMapsTest.java | 15 ++++-----
.../a/rttests/RoundTripTransformBeansTest.java | 5 ++-
.../apache/juneau/annotation/BeanIgnoreTest.java | 5 ++-
.../apache/juneau/pojotools/PojoSearcherTest.java | 39 +++++++++++-----------
.../org/apache/juneau/testutils/TestUtils.java | 10 +-----
7 files changed, 35 insertions(+), 49 deletions(-)
diff --git
a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/BasicBeanTests.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/BasicBeanTests.java
index aed59a6..b195698 100644
---
a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/BasicBeanTests.java
+++
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/BasicBeanTests.java
@@ -13,7 +13,6 @@
package org.apache.juneau;
import static org.apache.juneau.assertions.ObjectAssertion.*;
-import static org.apache.juneau.testutils.TestUtils.*;
import static org.junit.runners.MethodSorters.*;
import java.beans.*;
@@ -53,13 +52,13 @@ public class BasicBeanTests {
@Test
public void a02_testTransientFieldsIgnored_overrideSetting() {
JsonSerializer s =
SimpleJsonSerializer.DEFAULT.builder().dontIgnoreTransientFields().build();
- assertObjectEquals("{f1:1,f2:2}", A1.create(), s);
+ assertObject(A1.create()).serialized(s).is("{f1:1,f2:2}");
}
@Test
public void a03_testTransientFieldsIgnored_overrideAnnotation() {
JsonSerializer s =
SimpleJsonSerializer.DEFAULT.builder().applyAnnotations(A.class).build();
- assertObjectEquals("{f1:1,f2:2}", A1.create(), s);
+ assertObject(A1.create()).serialized(s).is("{f1:1,f2:2}");
}
public static class A2 {
diff --git
a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/ReadWriteOnlyPropertiesTest.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/ReadWriteOnlyPropertiesTest.java
index 31c480a..e28175b 100644
---
a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/ReadWriteOnlyPropertiesTest.java
+++
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/ReadWriteOnlyPropertiesTest.java
@@ -13,7 +13,6 @@
package org.apache.juneau;
import static org.apache.juneau.assertions.ObjectAssertion.*;
-import static org.apache.juneau.testutils.TestUtils.*;
import static org.junit.Assert.*;
import static org.junit.runners.MethodSorters.*;
@@ -263,7 +262,7 @@ public class ReadWriteOnlyPropertiesTest {
@Test
public void d03_beanAnnotation_bproAll_serializer_usingConfig() throws
Exception {
- assertObjectEquals("{f1:1,f2:2}", Dc.create(),
SimpleJsonSerializer.DEFAULT.builder().applyAnnotations(Dc.class).build());
+
assertObject(Dc.create()).serialized(SimpleJsonSerializer.DEFAULT.builder().applyAnnotations(Dc.class).build()).is("{f1:1,f2:2}");
}
@Test
@@ -317,7 +316,7 @@ public class ReadWriteOnlyPropertiesTest {
@Test
public void e03_beanAnnotation_bpwoAll_serializer_usingConfig() throws
Exception {
- assertObjectEquals("{}", E.create(),
SimpleJsonSerializer.DEFAULT.builder().applyAnnotations(Ec.class).build());
+
assertObject(E.create()).serialized(SimpleJsonSerializer.DEFAULT.builder().applyAnnotations(Ec.class).build()).is("{}");
}
@Test
diff --git
a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripBeanMapsTest.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripBeanMapsTest.java
index bb140bc..45803b1 100755
---
a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripBeanMapsTest.java
+++
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripBeanMapsTest.java
@@ -13,7 +13,6 @@
package org.apache.juneau.a.rttests;
import static org.apache.juneau.assertions.ObjectAssertion.*;
-import static org.apache.juneau.testutils.TestUtils.*;
import static org.junit.Assert.*;
import static org.junit.runners.MethodSorters.*;
@@ -234,19 +233,19 @@ public class RoundTripBeanMapsTest extends RoundTripTest {
Object r = s.serialize(b1);
B b = p.parse(r, B.class);
assertTrue(b instanceof B1);
- assertObjectEquals("{_type:'B1',f0:'f0',f1:'f1'}", b, js);
+
assertObject(b).serialized(js).is("{_type:'B1',f0:'f0',f1:'f1'}");
B2 b2 = B2.create();
r = s.serialize(b2);
b = p.parse(r, B.class);
assertTrue(b instanceof B2);
- assertObjectEquals("{_type:'B2',f0:'f0',f2:1}", b, js);
+ assertObject(b).serialized(js).is("{_type:'B2',f0:'f0',f2:1}");
B3 b3 = B3.create();
r = s.serialize(b3);
b = p.parse(r, B.class);
assertTrue(b instanceof B3);
-
assertObjectEquals("{_type:'B3',f0:'f0',f3:'2001-01-01T12:34:56.789Z'}", b, js);
+
assertObject(b).serialized(js).is("{_type:'B3',f0:'f0',f3:'2001-01-01T12:34:56.789Z'}");
}
@Bean(
@@ -307,19 +306,19 @@ public class RoundTripBeanMapsTest extends RoundTripTest {
Object r = s.serialize(c1);
C c = p.parse(r, C.class);
assertTrue(c instanceof C1);
- assertObjectEquals("{f0:'f0',f1:'f1'}", c, js);
+ assertObject(c).serialized(js).is("{f0:'f0',f1:'f1'}");
C2 c2 = C2.create();
r = s.serialize(c2);
c = p.parse(r, C.class);
assertTrue(c instanceof C2);
- assertObjectEquals("{f0:'f0',f2:1}", c, js);
+ assertObject(c).serialized(js).is("{f0:'f0',f2:1}");
C3 c3 = C3.create();
r = s.serialize(c3);
c = p.parse(r, C.class);
assertTrue(c instanceof C3);
- assertObjectEquals("{f0:'f0',f3:'2001-01-01T12:34:56.789Z'}",
c, js);
+
assertObject(c).serialized(js).is("{f0:'f0',f3:'2001-01-01T12:34:56.789Z'}");
}
public abstract static class C {
@@ -499,7 +498,7 @@ public class RoundTripBeanMapsTest extends RoundTripTest {
Object r = s.serialize(d);
d = p.parse(r, D2.class);
assertNull(d.f1);
- assertObjectEquals("{f3:'f3',f2:'f2'}", d, js);
+ assertObject(d).serialized(js).is("{f3:'f3',f2:'f2'}");
}
public static class D2 {
diff --git
a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripTransformBeansTest.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripTransformBeansTest.java
index 7a727aa..fb60c11 100755
---
a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripTransformBeansTest.java
+++
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripTransformBeansTest.java
@@ -14,7 +14,6 @@ package org.apache.juneau.a.rttests;
import static org.apache.juneau.assertions.ObjectAssertion.*;
import static org.apache.juneau.internal.DateUtils.*;
-import static org.apache.juneau.testutils.TestUtils.*;
import static org.junit.Assert.*;
import static org.junit.runners.MethodSorters.*;
@@ -545,7 +544,7 @@ public class RoundTripTransformBeansTest extends
RoundTripTest {
assertEquals("{c:'2018-12-12T05:12:00'}", r);
x = p.parse(r, F1c.class);
- assertObjectEquals("{c:'2018-12-12T05:12:00'}", x, s);
+ assertObject(x).serialized(s).is("{c:'2018-12-12T05:12:00'}");
x = roundTrip(x, F1c.class);
}
@@ -625,7 +624,7 @@ public class RoundTripTransformBeansTest extends
RoundTripTest {
assertEquals("{c:'2018-12-12T05:12:00'}", r);
x = p.parse(r, F2.class);
- assertObjectEquals("{c:'2018-12-12T05:12:00'}", x, s);
+ assertObject(x).serialized(s).is("{c:'2018-12-12T05:12:00'}");
x = roundTrip(x, F2.class);
}
diff --git
a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/annotation/BeanIgnoreTest.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/annotation/BeanIgnoreTest.java
index e0a1a19..4af1ceb 100644
---
a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/annotation/BeanIgnoreTest.java
+++
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/annotation/BeanIgnoreTest.java
@@ -13,7 +13,6 @@
package org.apache.juneau.annotation;
import static org.apache.juneau.assertions.ObjectAssertion.*;
-import static org.apache.juneau.testutils.TestUtils.*;
import static org.junit.runners.MethodSorters.*;
import org.apache.juneau.json.*;
@@ -68,7 +67,7 @@ public class BeanIgnoreTest {
@Test
public void testBeanIgnoreOnProperties_usingConfig() throws Exception {
- assertObjectEquals("{c:'c',a:'a'}", new Ac(),
SimpleJsonSerializer.DEFAULT.builder().applyAnnotations(Ac.class).build());
+ assertObject(new
Ac()).serialized(SimpleJsonSerializer.DEFAULT.builder().applyAnnotations(Ac.class).build()).is("{c:'c',a:'a'}");
}
//------------------------------------------------------------------------------------------------------------------
@@ -120,7 +119,7 @@ public class BeanIgnoreTest {
@Test
public void testBeanIgnoreOnBean_usingConfig() throws Exception {
- assertObjectEquals("{f2:2,f3:'xxx',f4:'xxx'}", new Bc(),
SimpleJsonSerializer.DEFAULT.builder().applyAnnotations(B1c.class).build());
+ assertObject(new
Bc()).serialized(SimpleJsonSerializer.DEFAULT.builder().applyAnnotations(B1c.class).build()).is("{f2:2,f3:'xxx',f4:'xxx'}");
}
}
diff --git
a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/pojotools/PojoSearcherTest.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/pojotools/PojoSearcherTest.java
index c4eafbc..bfce52b 100755
---
a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/pojotools/PojoSearcherTest.java
+++
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/pojotools/PojoSearcherTest.java
@@ -13,7 +13,6 @@
package org.apache.juneau.pojotools;
import static org.apache.juneau.assertions.ObjectAssertion.*;
-import static org.apache.juneau.testutils.TestUtils.*;
import static org.junit.Assert.*;
import static org.junit.runners.MethodSorters.*;
@@ -462,7 +461,7 @@ public class PojoSearcherTest {
"f = '2011' ",
"f = \"2011\" "
))
-
assertObjectEquals("[{f:'2011-01-01T00:00:00'},{f:'2011-01-31T00:00:00'}]",
run(in, s), ws);
+ assertObject(run(in,
s)).serialized(ws).is("[{f:'2011-01-01T00:00:00'},{f:'2011-01-31T00:00:00'}]");
}
@Test
@@ -474,32 +473,32 @@ public class PojoSearcherTest {
"f='2011-01'",
"f=\"2011-01\""
))
-
assertObjectEquals("[{f:'2011-01-01T00:00:00'},{f:'2011-01-31T00:00:00'}]",
run(in, s), ws);
+ assertObject(run(in,
s)).serialized(ws).is("[{f:'2011-01-01T00:00:00'},{f:'2011-01-31T00:00:00'}]");
}
@Test
public void dateSearch_singleDate_ymd() throws Exception {
B[] in = B.create("2010-01-01", "2011-01-01", "2011-01-31",
"2012-01-01");
- assertObjectEquals("[{f:'2011-01-01T00:00:00'}]", run(in,
"f=2011-01-01"), ws);
+ assertObject(run(in,
"f=2011-01-01")).serialized(ws).is("[{f:'2011-01-01T00:00:00'}]");
}
@Test
public void dateSearch_singleDate_ymdh() throws Exception {
B[] in = B.create("2011-01-01T11:15:59", "2011-01-01T12:00:00",
"2011-01-01T12:59:59", "2011-01-01T13:00:00");
-
assertObjectEquals("[{f:'2011-01-01T12:00:00'},{f:'2011-01-01T12:59:59'}]",
run(in, "f=2011-01-01T12"), ws);
+ assertObject(run(in,
"f=2011-01-01T12")).serialized(ws).is("[{f:'2011-01-01T12:00:00'},{f:'2011-01-01T12:59:59'}]");
}
@Test
public void dateSearch_singleDate_ymdhm() throws Exception {
B[] in = B.create("2011-01-01T12:29:59", "2011-01-01T12:30:00",
"2011-01-01T12:30:59", "2011-01-01T12:31:00");
-
assertObjectEquals("[{f:'2011-01-01T12:30:00'},{f:'2011-01-01T12:30:59'}]",
run(in, "f=2011-01-01T12:30"), ws);
+ assertObject(run(in,
"f=2011-01-01T12:30")).serialized(ws).is("[{f:'2011-01-01T12:30:00'},{f:'2011-01-01T12:30:59'}]");
}
@Test
public void dateSearch_singleDate_ymdhms() throws Exception {
B[] in = B.create("2011-01-01T12:30:29", "2011-01-01T12:30:30",
"2011-01-01T12:30:31");
- assertObjectEquals("[{f:'2011-01-01T12:30:30'}]", run(in,
"f=2011-01-01T12:30:30"), ws);
+ assertObject(run(in,
"f=2011-01-01T12:30:30")).serialized(ws).is("[{f:'2011-01-01T12:30:30'}]");
}
@Test
@@ -519,7 +518,7 @@ public class PojoSearcherTest {
"f>=\"2001\"",
"f >= \"2001\" "
))
- assertObjectEquals("[{f:'2001-01-01T00:00:00'}]",
run(in, s), ws);
+ assertObject(run(in,
s)).serialized(ws).is("[{f:'2001-01-01T00:00:00'}]");
for (String s : a(
"f<2001",
"f < 2001 ",
@@ -534,21 +533,21 @@ public class PojoSearcherTest {
"f<=\"2000\"",
"f <= \"2000\" "
))
- assertObjectEquals("[{f:'2000-12-31T00:00:00'}]",
run(in, s), ws);
+ assertObject(run(in,
s)).serialized(ws).is("[{f:'2000-12-31T00:00:00'}]");
}
@Test
public void dateSearch_openEndedRanges_toMinute() throws Exception {
B[] in = B.create("2011-01-01T12:29:59", "2011-01-01T12:30:00");
- assertObjectEquals("[{f:'2011-01-01T12:30:00'}]", run(in,
"f>=2011-01-01T12:30"), ws);
- assertObjectEquals("[{f:'2011-01-01T12:29:59'}]", run(in,
"f<2011-01-01T12:30"), ws);
+ assertObject(run(in,
"f>=2011-01-01T12:30")).serialized(ws).is("[{f:'2011-01-01T12:30:00'}]");
+ assertObject(run(in,
"f<2011-01-01T12:30")).serialized(ws).is("[{f:'2011-01-01T12:29:59'}]");
}
@Test
public void dateSearch_openEndedRanges_toSecond() throws Exception {
B[] in = B.create("2011-01-01T12:30:59", "2011-01-01T12:31:00");
- assertObjectEquals("[{f:'2011-01-01T12:31:00'}]", run(in,
"f>2011-01-01T12:30"), ws);
- assertObjectEquals("[{f:'2011-01-01T12:30:59'}]", run(in,
"f<=2011-01-01T12:30"), ws);
+ assertObject(run(in,
"f>2011-01-01T12:30")).serialized(ws).is("[{f:'2011-01-01T12:31:00'}]");
+ assertObject(run(in,
"f<=2011-01-01T12:30")).serialized(ws).is("[{f:'2011-01-01T12:30:59'}]");
}
@Test
@@ -567,7 +566,7 @@ public class PojoSearcherTest {
"f=2001 -\"2003-06-30\"",
"f= 2001 - \"2003-06-30\" "
))
-
assertObjectEquals("[{f:'2001-01-01T00:00:00'},{f:'2003-06-30T23:59:59'}]",
run(in, s), ws);
+ assertObject(run(in,
s)).serialized(ws).is("[{f:'2001-01-01T00:00:00'},{f:'2003-06-30T23:59:59'}]");
for (String s : a(
"f= 2001 - 2003-06-30 2000",
@@ -592,7 +591,7 @@ public class PojoSearcherTest {
"f= 2001 - \"2003-06-30\" '2000'",
"f= 2001 - \"2003-06-30\" \"2000\""
))
-
assertObjectEquals("[{f:'2000-12-31T23:59:59'},{f:'2001-01-01T00:00:00'},{f:'2003-06-30T23:59:59'}]",
run(in, s), ws);
+ assertObject(run(in,
s)).serialized(ws).is("[{f:'2000-12-31T23:59:59'},{f:'2001-01-01T00:00:00'},{f:'2003-06-30T23:59:59'}]");
}
@Test
@@ -606,7 +605,7 @@ public class PojoSearcherTest {
"f=\"2001\" \"2003\" \"2005\"",
"f= \"2001\" \"2003\" \"2005\" "
))
-
assertObjectEquals("[{f:'2001-01-01T00:00:00'},{f:'2001-12-31T00:00:00'}]",
run(in, s), ws);
+ assertObject(run(in,
s)).serialized(ws).is("[{f:'2001-01-01T00:00:00'},{f:'2001-12-31T00:00:00'}]");
}
@Test
@@ -620,7 +619,7 @@ public class PojoSearcherTest {
"f=\"2001\" \"2003\" \"2005\"",
"f= \"2001\" \"2003\" \"2005\" "
))
-
assertObjectEquals("[{f:'2003-01-01T00:00:00'},{f:'2003-12-31T00:00:00'}]",
run(in, s), ws);
+ assertObject(run(in,
s)).serialized(ws).is("[{f:'2003-01-01T00:00:00'},{f:'2003-12-31T00:00:00'}]");
}
@Test
@@ -634,7 +633,7 @@ public class PojoSearcherTest {
"f=\"2001\" \"2003\" \"2005\"",
"f= \"2001\" \"2003\" \"2005\" "
))
-
assertObjectEquals("[{f:'2005-01-01T00:00:00'},{f:'2005-12-31T00:00:00'}]",
run(in, s), ws);
+ assertObject(run(in,
s)).serialized(ws).is("[{f:'2005-01-01T00:00:00'},{f:'2005-12-31T00:00:00'}]");
}
@Test
@@ -666,7 +665,7 @@ public class PojoSearcherTest {
"f=>=\"2003\" \"2001\"",
"f= >=\"2003\" \"2001\" "
))
-
assertObjectEquals("[{f:'2001-01-01T00:00:00'},{f:'2003-01-01T00:00:00'}]",
run(in, s), ws);
+ assertObject(run(in,
s)).serialized(ws).is("[{f:'2001-01-01T00:00:00'},{f:'2003-01-01T00:00:00'}]");
for (String s : a(
"f=<2001 2003",
"f= <2001 2003 ",
@@ -693,7 +692,7 @@ public class PojoSearcherTest {
"f=\"2003\" <=\"2000\"",
"f= \"2003\" <=\"2000\" "
))
-
assertObjectEquals("[{f:'2000-12-31T00:00:00'},{f:'2003-01-01T00:00:00'}]",
run(in, s), ws);
+ assertObject(run(in,
s)).serialized(ws).is("[{f:'2000-12-31T00:00:00'},{f:'2003-01-01T00:00:00'}]");
}
@Test
diff --git
a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/testutils/TestUtils.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/testutils/TestUtils.java
index d2317bd..1fe322b 100644
---
a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/testutils/TestUtils.java
+++
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/testutils/TestUtils.java
@@ -12,6 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.testutils;
+import static org.apache.juneau.assertions.ObjectAssertion.*;
import static org.apache.juneau.internal.IOUtils.*;
import static org.apache.juneau.internal.StringUtils.*;
@@ -233,15 +234,6 @@ public class TestUtils {
Assert.assertEquals(sortXml(expected), sortXml(actual));
}
- /**
- * Assert that the object equals the specified string after running it
through ws.toString().
- */
- public static final void assertObjectEquals(String s, Object o,
WriterSerializer ws) {
- if ("xxx".equals(s))
- System.err.println(ws.toString(o).replaceAll("\\\\",
"\\\\\\\\")); // NOT DEBUG
- Assert.assertEquals(s, ws.toString(o));
- }
-
public static final void assertObjectMatches(String s, Object o) {
assertObjectMatches(s, o, js2);
}
