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 c25f4f5 Tests.
c25f4f5 is described below
commit c25f4f5397aaf31486efb0abe62419e339038abf
Author: JamesBognar <[email protected]>
AuthorDate: Thu Jun 25 15:55:11 2020 -0400
Tests.
---
.../a/rttests/RoundTripObjectsAsStringsTest.java | 17 ++++++++++++++-
.../org/apache/juneau/a/rttests/RoundTripTest.java | 3 ++-
.../a/rttests/RoundTripTransformBeansTest.java | 22 +++++++++++++++----
.../org/apache/juneau/testutils/TestUtils.java | 25 ----------------------
.../org/apache/juneau/internal/StringUtils.java | 16 ++++++++++++++
5 files changed, 52 insertions(+), 31 deletions(-)
diff --git
a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripObjectsAsStringsTest.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripObjectsAsStringsTest.java
index 2e50c3a..0264d64 100755
---
a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripObjectsAsStringsTest.java
+++
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripObjectsAsStringsTest.java
@@ -13,6 +13,7 @@
package org.apache.juneau.a.rttests;
import static org.apache.juneau.assertions.ObjectAssertion.*;
+import static org.apache.juneau.internal.IOUtils.*;
import static org.apache.juneau.testutils.TestUtils.*;
import static org.junit.Assert.*;
import static org.junit.runners.MethodSorters.*;
@@ -126,7 +127,7 @@ public class RoundTripObjectsAsStringsTest extends
RoundTripTest {
B t = new B().init();
if (! returnOriginalObject) {
Object r = getSerializer().serialize(t);
- assertTrue(TestUtils.toString(r).contains("X-2"));
+ assertTrue(toString(r).contains("X-2"));
}
t = roundTrip(t);
assertObject(t).json().is("{b1:'X1',b2:'X-2'}");
@@ -274,4 +275,18 @@ public class RoundTripObjectsAsStringsTest extends
RoundTripTest {
return "C4" + f;
}
}
+
+
//------------------------------------------------------------------------------------------------------------------
+ // Utility methods.
+
//------------------------------------------------------------------------------------------------------------------
+
+ private static final String toString(Object o) {
+ if (o == null)
+ return null;
+ if (o instanceof String)
+ return (String)o;
+ if (o instanceof byte[])
+ return new String((byte[])o, UTF8);
+ return o.toString();
+ }
}
diff --git
a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripTest.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripTest.java
index a1a137c..b995f91 100755
---
a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripTest.java
+++
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripTest.java
@@ -20,6 +20,7 @@ import java.util.Map.*;
import org.apache.juneau.collections.*;
import org.apache.juneau.html.*;
+import org.apache.juneau.internal.*;
import org.apache.juneau.jena.*;
import org.apache.juneau.json.*;
import org.apache.juneau.msgpack.*;
@@ -286,7 +287,7 @@ public abstract class RoundTripTest {
}
if (debug)
- System.err.println("Serialized contents from
["+label+"]...\n---START---\n" + (out instanceof byte[] ?
TestUtils.toReadableBytes((byte[])out) : out) + "\n---END---\n"); // NOT DEBUG
+ System.err.println("Serialized contents from
["+label+"]...\n---START---\n" + (out instanceof byte[] ?
StringUtils.toReadableBytes((byte[])out) : out) + "\n---END---\n"); // NOT DEBUG
if (validateXmlWhitespace)
TestUtils.checkXmlWhitespace(out.toString());
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 fb60c11..01a15fd 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,6 +14,7 @@ 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.internal.IOUtils.*;
import static org.junit.Assert.*;
import static org.junit.runners.MethodSorters.*;
@@ -28,7 +29,6 @@ import org.apache.juneau.collections.*;
import org.apache.juneau.json.*;
import org.apache.juneau.parser.*;
import org.apache.juneau.serializer.*;
-import org.apache.juneau.testutils.*;
import org.apache.juneau.transform.*;
import org.apache.juneau.transforms.*;
import org.junit.*;
@@ -357,7 +357,7 @@ public class RoundTripTransformBeansTest extends
RoundTripTest {
assertEquals("f1", x.f1);
r = getSerializer().serialize(x);
- assertTrue(TestUtils.toString(r).contains("f2"));
+ assertTrue(toString(r).contains("f2"));
x = roundTrip(x, D1.class);
}
@@ -399,7 +399,7 @@ public class RoundTripTransformBeansTest extends
RoundTripTest {
assertEquals("f1", x.f1);
r = getSerializer().serialize(x);
- assertTrue(TestUtils.toString(r).contains("f2"));
+ assertTrue(toString(r).contains("f2"));
x = roundTrip(x, E1.class);
}
@@ -442,7 +442,7 @@ public class RoundTripTransformBeansTest extends
RoundTripTest {
assertEquals("f1", x.f1);
r = getSerializer().serialize(x);
- assertTrue(TestUtils.toString(r).contains("f2"));
+ assertTrue(toString(r).contains("f2"));
x = roundTrip(x, E1c.class);
}
@@ -660,4 +660,18 @@ public class RoundTripTransformBeansTest extends
RoundTripTest {
assertObject(f).json().is("{f1:1,f2:2}");
}
+
+
//------------------------------------------------------------------------------------------------------------------
+ // Utility methods.
+
//------------------------------------------------------------------------------------------------------------------
+
+ private static final String toString(Object o) {
+ if (o == null)
+ return null;
+ if (o instanceof String)
+ return (String)o;
+ if (o instanceof byte[])
+ return new String((byte[])o, UTF8);
+ return o.toString();
+ }
}
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 1fe322b..fa97cf7 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
@@ -13,7 +13,6 @@
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.*;
import java.io.*;
@@ -246,30 +245,6 @@ public class TestUtils {
throw new ComparisonFailure(null, s, o2);
}
- public static final String toReadableBytes(byte[] b) {
- StringBuilder sb = new StringBuilder();
- for (byte b2 : b)
- sb.append((b2 < ' ' || b2 > 'z') ?
String.format("[%02X]", b2) : (char)b2 + " ");
- sb.append("\n");
- for (byte b2 : b)
- sb.append(String.format("[%02X]", b2));
- return sb.toString();
- }
-
- /**
- * Tries to turn the serialized output to a String.
- * If it's a byte[], convert it to a UTF-8 encoded String.
- */
- public static final String toString(Object o) {
- if (o == null)
- return null;
- if (o instanceof String)
- return (String)o;
- if (o instanceof byte[])
- return new String((byte[])o, UTF8);
- return o.toString();
- }
-
private static ThreadLocal<TimeZone> systemTimeZone = new
ThreadLocal<>();
private static ThreadLocal<Locale> systemLocale = new ThreadLocal<>();
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/StringUtils.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/StringUtils.java
index 4101dfa..e866f98 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/StringUtils.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/StringUtils.java
@@ -1126,6 +1126,22 @@ public final class StringUtils {
}
/**
+ * Converts the specified bytes into a readable string.
+ *
+ * @param b The number to convert to hex.
+ * @return A <code><jk>char</jk>[2]</code> containing the specified
characters.
+ */
+ public static final String toReadableBytes(byte[] b) {
+ StringBuilder sb = new StringBuilder();
+ for (byte b2 : b)
+ sb.append((b2 < ' ' || b2 > 'z') ?
String.format("[%02X]", b2) : (char)b2 + " ");
+ sb.append("\n");
+ for (byte b2 : b)
+ sb.append(String.format("[%02X]", b2));
+ return sb.toString();
+ }
+
+ /**
* Converts the specified number into a 4 hexadecimal characters.
*
* @param num The number to convert to hex.
