You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2011/12/23 13:16:54 UTC
svn commit: r1222654 - in /cxf/branches/2.4.x-fixes: ./
rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JSONProviderTest.java
Author: sergeyb
Date: Fri Dec 23 12:16:53 2011
New Revision: 1222654
URL: http://svn.apache.org/viewvc?rev=1222654&view=rev
Log:
Merged revisions 1222652 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1222652 | sergeyb | 2011-12-23 11:59:06 +0000 (Fri, 23 Dec 2011) | 1 line
Minor update to JSONProviderTest
........
Modified:
cxf/branches/2.4.x-fixes/ (props changed)
cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JSONProviderTest.java
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec 23 12:16:53 2011
@@ -1 +1 @@
-/cxf/trunk:1221825
+/cxf/trunk:1221825,1222652
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JSONProviderTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JSONProviderTest.java?rev=1222654&r1=1222653&r2=1222654&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JSONProviderTest.java (original)
+++ cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JSONProviderTest.java Fri Dec 23 12:16:53 2011
@@ -502,7 +502,6 @@ public class JSONProviderTest extends As
}
@Test
- @Ignore("Enable once http://jira.codehaus.org/browse/JETTISON-104 gets resolved")
public void testReadQualifiedArray() throws Exception {
String data = "{\"ns1.thetag\":[{\"group\":\"b\",\"name\":\"a\"}"
+ ",{\"group\":\"d\",\"name\":\"c\"}]}";
@@ -576,9 +575,9 @@ public class JSONProviderTest extends As
}
@Test
- @Ignore("This is hitting http://jira.codehaus.org/browse/JETTISON-44")
+ @Ignore("Enable once http://jira.codehaus.org/browse/JETTISON-75 gets fixed")
public void testWriteMixedContent() throws Exception {
- doTestMixedContent("{\"Book\":{\"name\":\"CXF\",\"id\":125,\"$\":\"\\n \\n\"}}",
+ doTestMixedContent("{\"Book\":{\"name\":\"CXF\",\"id\":125}}",
false, "book.xml");
}