You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2013/06/27 22:10:40 UTC
svn commit: r1497552 -
/tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java
Author: markt
Date: Thu Jun 27 20:10:40 2013
New Revision: 1497552
URL: http://svn.apache.org/r1497552
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55151
Fix bugs in test
Modified:
tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java
Modified: tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java?rev=1497552&r1=1497551&r2=1497552&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java (original)
+++ tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java Thu Jun 27 20:10:40 2013
@@ -108,7 +108,7 @@ public class TestEncodingDecoding extend
Assert.assertEquals(MESSAGE_ONE,
((MsgString) MsgStringMessageHandler.received.peek()).getData());
Assert.assertEquals(MESSAGE_ONE,
- ((MsgString) client.received.peek()).getData());
+ new String(((MsgByte) client.received.peek()).getData()));
session.close();
}
@@ -272,8 +272,8 @@ public class TestEncodingDecoding extend
public void onMessage(MsgString in) {
received.add(in);
try {
- MsgString msg = new MsgString();
- msg.setData(MESSAGE_ONE);
+ MsgByte msg = new MsgByte();
+ msg.setData(MESSAGE_ONE.getBytes());
session.getBasicRemote().sendObject(msg);
} catch (IOException | EncodeException e) {
e.printStackTrace();
@@ -368,6 +368,7 @@ public class TestEncodingDecoding extend
reply.put((byte) 0x12);
reply.put((byte) 0x34);
reply.put(data);
+ reply.flip();
return reply;
}
}
@@ -388,7 +389,6 @@ public class TestEncodingDecoding extend
@Override
public MsgByte decode(ByteBuffer bb) throws DecodeException {
MsgByte result = new MsgByte();
- bb.position(bb.position() + 2);
byte[] data = new byte[bb.limit() - bb.position()];
bb.get(data);
result.setData(data);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r1497552 - /tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java
Posted by Nick Williams <ni...@nicholaswilliams.net>.
On Jun 27, 2013, at 6:14 PM, Konstantin Kolinko wrote:
> 2013/6/28 <ma...@apache.org>:
>> Author: markt
>> Date: Thu Jun 27 20:10:40 2013
>> New Revision: 1497552
>>
>> URL: http://svn.apache.org/r1497552
>> Log:
>> Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55151
>> Fix bugs in test
>>
>> Modified:
>> tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java
>>
>> Modified: tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java
>> URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java?rev=1497552&r1=1497551&r2=1497552&view=diff
>> ==============================================================================
>> --- tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java (original)
>> +++ tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java Thu Jun 27 20:10:40 2013
>> @@ -108,7 +108,7 @@ public class TestEncodingDecoding extend
>> Assert.assertEquals(MESSAGE_ONE,
>> ((MsgString) MsgStringMessageHandler.received.peek()).getData());
>> Assert.assertEquals(MESSAGE_ONE,
>> - ((MsgString) client.received.peek()).getData());
>> + new String(((MsgByte) client.received.peek()).getData()));
>
> It is "new String(byte[])" here. It would be better with explicit
> encoding name such as "ISO-8859-1".
Or with a Charset instance, if you have one, because that's immune from an encoding unlike a String charset name. If the charset is always going to be fixed here, this is Java 7 so you could use StandardCharsets.UTF8, etc.
N
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r1497552 - /tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java
Posted by Konstantin Kolinko <kn...@gmail.com>.
2013/6/28 <ma...@apache.org>:
> Author: markt
> Date: Thu Jun 27 20:10:40 2013
> New Revision: 1497552
>
> URL: http://svn.apache.org/r1497552
> Log:
> Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55151
> Fix bugs in test
>
> Modified:
> tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java
>
> Modified: tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java
> URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java?rev=1497552&r1=1497551&r2=1497552&view=diff
> ==============================================================================
> --- tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java (original)
> +++ tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java Thu Jun 27 20:10:40 2013
> @@ -108,7 +108,7 @@ public class TestEncodingDecoding extend
> Assert.assertEquals(MESSAGE_ONE,
> ((MsgString) MsgStringMessageHandler.received.peek()).getData());
> Assert.assertEquals(MESSAGE_ONE,
> - ((MsgString) client.received.peek()).getData());
> + new String(((MsgByte) client.received.peek()).getData()));
It is "new String(byte[])" here. It would be better with explicit
encoding name such as "ISO-8859-1".
> session.close();
> }
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org