From 1caddc67a325fd4c4de9d78ec784294c7a1afae4 Mon Sep 17 00:00:00 2001 From: Ludwig Meyer Date: Mon, 12 Nov 2018 11:11:04 +0100 Subject: [PATCH] Fixed conversion from byte array to String --- .../main/java/com/consol/citrus/util/TypeConversionUtils.java | 2 +- .../java/com/consol/citrus/util/TypeConversionUtilsTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/citrus-core/src/main/java/com/consol/citrus/util/TypeConversionUtils.java b/modules/citrus-core/src/main/java/com/consol/citrus/util/TypeConversionUtils.java index 7bf82fdcfb..7b38f3ab1e 100644 --- a/modules/citrus-core/src/main/java/com/consol/citrus/util/TypeConversionUtils.java +++ b/modules/citrus-core/src/main/java/com/consol/citrus/util/TypeConversionUtils.java @@ -165,7 +165,7 @@ public static T convertIfNecessary(Object target, Class type) { if (ByteBuffer.class.isAssignableFrom(target.getClass())) { return (T) new String(((ByteBuffer) target).array()); } else if (byte[].class.isAssignableFrom(target.getClass())) { - return (T) Arrays.toString((byte[]) target); + return (T) new String((byte[]) target); } } diff --git a/modules/citrus-core/src/test/java/com/consol/citrus/util/TypeConversionUtilsTest.java b/modules/citrus-core/src/test/java/com/consol/citrus/util/TypeConversionUtilsTest.java index 4cb999d345..3fb22623c8 100644 --- a/modules/citrus-core/src/test/java/com/consol/citrus/util/TypeConversionUtilsTest.java +++ b/modules/citrus-core/src/test/java/com/consol/citrus/util/TypeConversionUtilsTest.java @@ -50,7 +50,7 @@ public void testConvertIfNecessary() { Assert.assertEquals(TypeConversionUtils.convertIfNecessary(payload, InputStream.class).getClass(), ByteArrayInputStream.class); Assert.assertEquals(TypeConversionUtils.convertIfNecessary(payload, Source.class).getClass(), StringSource.class); Assert.assertEquals(TypeConversionUtils.convertIfNecessary(payload, byte[].class), payload.getBytes()); - Assert.assertEquals(TypeConversionUtils.convertIfNecessary(payload.getBytes(), String.class), Arrays.toString(payload.getBytes())); + Assert.assertEquals(TypeConversionUtils.convertIfNecessary(payload.getBytes(), String.class), new String(payload.getBytes())); Assert.assertEquals(TypeConversionUtils.convertIfNecessary(ByteBuffer.wrap(payload.getBytes()), String.class), payload); }