From aea28af33247829d2b6abb6a45525d10fb8f2f35 Mon Sep 17 00:00:00 2001 From: Mark Fisher Date: Thu, 16 Sep 2010 13:58:30 -0700 Subject: [PATCH] INT-1459 removed dependency on 1.6 in tests --- .../config/xml/PayloadDeserializingTransformerParserTests.java | 3 +-- .../config/xml/PayloadSerializingTransformerParserTests.java | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/PayloadDeserializingTransformerParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/PayloadDeserializingTransformerParserTests.java index cfb38ff629..692e7b7b2f 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/PayloadDeserializingTransformerParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/PayloadDeserializingTransformerParserTests.java @@ -24,7 +24,6 @@ import java.io.ByteArrayOutputStream; import java.io.ObjectOutputStream; import java.io.Serializable; import java.io.UnsupportedEncodingException; -import java.nio.charset.Charset; import org.junit.Test; import org.junit.runner.RunWith; @@ -107,7 +106,7 @@ public class PayloadDeserializingTransformerParserTests { @Test public void customConverter() throws Exception { - customConverterInput.send(new GenericMessage("test".getBytes(Charset.forName("UTF-8")))); + customConverterInput.send(new GenericMessage("test".getBytes("UTF-8"))); Message result = output.receive(3000); assertNotNull(result); assertEquals(String.class, result.getPayload().getClass()); diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/PayloadSerializingTransformerParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/PayloadSerializingTransformerParserTests.java index 118dc37466..3ec6df8bd0 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/PayloadSerializingTransformerParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/PayloadSerializingTransformerParserTests.java @@ -24,7 +24,6 @@ import java.io.ByteArrayInputStream; import java.io.ObjectInputStream; import java.io.Serializable; import java.io.UnsupportedEncodingException; -import java.nio.charset.Charset; import org.junit.Test; import org.junit.runner.RunWith; @@ -109,7 +108,7 @@ public class PayloadSerializingTransformerParserTests { Message result = output.receive(3000); assertNotNull(result); assertEquals(byte[].class, result.getPayload().getClass()); - assertEquals("TEST", new String((byte[]) result.getPayload(), Charset.forName("UTF-8"))); + assertEquals("TEST", new String((byte[]) result.getPayload(), "UTF-8")); }