You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by or...@apache.org on 2018/09/20 21:12:02 UTC
qpid-broker-j git commit: QPID-8241: Fix conversion tests
Repository: qpid-broker-j
Updated Branches:
refs/heads/master 5578e9438 -> e60023bbd
QPID-8241: Fix conversion tests
Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/e60023bb
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/e60023bb
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/e60023bb
Branch: refs/heads/master
Commit: e60023bbd54eb31e97ce347451cf551046c94671
Parents: 5578e94
Author: Alex Rudyy <or...@apache.org>
Authored: Thu Sep 20 21:55:04 2018 +0100
Committer: Alex Rudyy <or...@apache.org>
Committed: Thu Sep 20 21:55:04 2018 +0100
----------------------------------------------------------------------
.../end_to_end_conversion/client/Client.java | 6 +++
.../client/MessageVerifier.java | 42 ++++++++++++--------
2 files changed, 32 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/e60023bb/systests/end-to-end-conversion-tests/src/main/java/org/apache/qpid/systests/end_to_end_conversion/client/Client.java
----------------------------------------------------------------------
diff --git a/systests/end-to-end-conversion-tests/src/main/java/org/apache/qpid/systests/end_to_end_conversion/client/Client.java b/systests/end-to-end-conversion-tests/src/main/java/org/apache/qpid/systests/end_to_end_conversion/client/Client.java
index 91f849b..745c8db 100644
--- a/systests/end-to-end-conversion-tests/src/main/java/org/apache/qpid/systests/end_to_end_conversion/client/Client.java
+++ b/systests/end-to-end-conversion-tests/src/main/java/org/apache/qpid/systests/end_to_end_conversion/client/Client.java
@@ -150,6 +150,12 @@ public class Client
e.printStackTrace();
e.printStackTrace(System.out);
}
+ catch (Error e)
+ {
+ e.printStackTrace();
+ e.printStackTrace(System.out);
+ throw e;
+ }
}
private String stringifyStacktrace(final Throwable e)
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/e60023bb/systests/end-to-end-conversion-tests/src/main/java/org/apache/qpid/systests/end_to_end_conversion/client/MessageVerifier.java
----------------------------------------------------------------------
diff --git a/systests/end-to-end-conversion-tests/src/main/java/org/apache/qpid/systests/end_to_end_conversion/client/MessageVerifier.java b/systests/end-to-end-conversion-tests/src/main/java/org/apache/qpid/systests/end_to_end_conversion/client/MessageVerifier.java
index 4f9183b..c35787c 100644
--- a/systests/end-to-end-conversion-tests/src/main/java/org/apache/qpid/systests/end_to_end_conversion/client/MessageVerifier.java
+++ b/systests/end-to-end-conversion-tests/src/main/java/org/apache/qpid/systests/end_to_end_conversion/client/MessageVerifier.java
@@ -40,8 +40,6 @@ import javax.jms.ObjectMessage;
import javax.jms.StreamMessage;
import javax.jms.TextMessage;
-import org.apache.qpid.server.util.StringUtil;
-
public class MessageVerifier
{
public static void verifyMessage(final MessageDescription messageDescription, final Message message)
@@ -258,16 +256,6 @@ public class MessageVerifier
{
final byte[] expectedValueAsBytes = (byte[]) expectedValue;
final byte[] actualValueAsBytes = (byte[]) actualValue;
- String expectedValueAsString = StringUtil.toHex(expectedValueAsBytes);
- if (expectedValueAsString.length() > 20)
- {
- expectedValueAsString = expectedValueAsString.substring(0, 20) + "...";
- }
- String actualValueAsString = StringUtil.toHex(actualValueAsBytes);
- if (actualValueAsString.length() > 20)
- {
- actualValueAsString = actualValueAsString.substring(0, 20) + "...";
- }
if (expectedValueAsBytes.length != actualValueAsBytes.length)
{
throw new VerificationException(String.format(
@@ -275,15 +263,15 @@ public class MessageVerifier
failureMessage,
expectedValueAsBytes.length,
actualValueAsBytes.length,
- expectedValueAsString,
- actualValueAsString));
+ encode(expectedValueAsBytes),
+ encode(actualValueAsBytes)));
}
if (!Arrays.equals(expectedValueAsBytes, actualValueAsBytes))
{
throw new VerificationException(String.format("%s: arrays do not match ('%s' vs '%s')",
failureMessage,
- expectedValueAsString,
- actualValueAsString));
+ encode(expectedValueAsBytes),
+ encode(actualValueAsBytes)));
}
}
else if (expectedValue instanceof Map)
@@ -352,4 +340,26 @@ public class MessageVerifier
}
}
}
+
+ private static String encode(final byte[] expectedValueAsBytes)
+ {
+ String expectedValueAsString = toHex(expectedValueAsBytes);
+ if (expectedValueAsString.length() > 20)
+ {
+ expectedValueAsString = expectedValueAsString.substring(0, 20) + "...";
+ }
+ return expectedValueAsString;
+ }
+
+ private static final char[] HEX = "0123456789ABCDEF".toCharArray();
+
+ private static String toHex(byte[] bin)
+ {
+ StringBuilder result = new StringBuilder(2 * bin.length);
+ for (byte b : bin) {
+ result.append(HEX[(b >> 4) & 0xF]);
+ result.append(HEX[(b & 0xF)]);
+ }
+ return result.toString();
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org