Return-Path: Delivered-To: apmail-incubator-directory-cvs-archive@www.apache.org Received: (qmail 21794 invoked from network); 15 Dec 2004 16:47:48 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 15 Dec 2004 16:47:48 -0000 Received: (qmail 56930 invoked by uid 500); 15 Dec 2004 16:31:14 -0000 Delivered-To: apmail-incubator-directory-cvs-archive@incubator.apache.org Received: (qmail 51309 invoked by uid 500); 15 Dec 2004 16:30:31 -0000 Mailing-List: contact directory-cvs-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: directory-dev@incubator.apache.org Delivered-To: mailing list directory-cvs@incubator.apache.org Received: (qmail 35684 invoked by uid 99); 15 Dec 2004 16:26:12 -0000 X-ASF-Spam-Status: No, hits=-10.0 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Wed, 15 Dec 2004 08:26:11 -0800 Received: (qmail 1021 invoked by uid 65534); 15 Dec 2004 16:25:49 -0000 Date: 15 Dec 2004 16:25:49 -0000 Message-ID: <20041215162549.1018.qmail@minotaur.apache.org> From: bloritsch@apache.org To: directory-cvs@incubator.apache.org Subject: svn commit: r111989 - /incubator/directory/network/trunk/sedang/src/test/org/apache/directory/seda/output/test/TestWriter.java MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N Author: bloritsch Date: Wed Dec 15 08:25:47 2004 New Revision: 111989 URL: http://svn.apache.org/viewcvs?view=rev&rev=111989 Log: Fix the problem I ran into earlier reading the info passed in. Modified: incubator/directory/network/trunk/sedang/src/test/org/apache/directory/seda/output/test/TestWriter.java Modified: incubator/directory/network/trunk/sedang/src/test/org/apache/directory/seda/output/test/TestWriter.java Url: http://svn.apache.org/viewcvs/incubator/directory/network/trunk/sedang/src/test/org/apache/directory/seda/output/test/TestWriter.java?view=diff&rev=111989&p1=incubator/directory/network/trunk/sedang/src/test/org/apache/directory/seda/output/test/TestWriter.java&r1=111988&p2=incubator/directory/network/trunk/sedang/src/test/org/apache/directory/seda/output/test/TestWriter.java&r2=111989 ============================================================================== --- incubator/directory/network/trunk/sedang/src/test/org/apache/directory/seda/output/test/TestWriter.java (original) +++ incubator/directory/network/trunk/sedang/src/test/org/apache/directory/seda/output/test/TestWriter.java Wed Dec 15 08:25:47 2004 @@ -22,9 +22,12 @@ import org.apache.protocol.bufferpool.BufferPool; import java.io.IOException; +import java.io.InputStreamReader; import java.nio.channels.ServerSocketChannel; import java.nio.channels.SocketChannel; import java.nio.ByteBuffer; +import java.nio.charset.Charset; +import java.nio.charset.CharsetDecoder; import java.net.InetSocketAddress; import java.net.InetAddress; @@ -97,7 +100,13 @@ m_channel.read( buffer ); buffer.flip(); - assertEquals("test", buffer.asCharBuffer().toString()); + assertEquals("test", readString(buffer, "ISO-8859-1")); + } + + private String readString( final ByteBuffer buffer, final String charset ) + { + final Charset set = Charset.forName( charset ); + return set.decode( buffer ).toString(); } public void testSendIncorrectEvent()