Author: sergeyb
Date: Wed Apr 28 20:45:41 2010
New Revision: 939083
URL: http://svn.apache.org/viewvc?rev=939083&view=rev
Log:
Merged revisions 939079 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r939079 | sergeyb | 2010-04-28 21:33:05 +0100 (Wed, 28 Apr 2010) | 1 line
Attempting to fix the JAXRS test
........
Modified:
cxf/branches/2.2.x-fixes/ (props changed)
cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/PrimitiveTextProviderTest.java
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr 28 20:45:41 2010
@@ -1 +1 @@
-/cxf/trunk:935945,935995,936318,937409,938804,939012
+/cxf/trunk:935945,935995,936318,937409,938804,939012,939079
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/PrimitiveTextProviderTest.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/PrimitiveTextProviderTest.java?rev=939083&r1=939082&r2=939083&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/PrimitiveTextProviderTest.java
(original)
+++
cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/PrimitiveTextProviderTest.java
Wed Apr 28 20:45:41 2010
@@ -108,7 +108,7 @@ public class PrimitiveTextProviderTest e
p.writeTo("Hello, my name is Félix Agnès",
String.class, String.class, null,
MediaType.valueOf("text/plain;charset=ISO-8859-1"),
headers, os);
- assertEquals("Hello, my name is Félix Agnès", new
String(os.toByteArray()));
+ assertEquals("Hello, my name is Félix Agnès",
os.toString("ISO-8859-1"));
}
