cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject svn commit: r1468603 - in /cxf/branches/2.6.x-fixes: ./ rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/dom4j/DOM4JProviderTest.java
Date Tue, 16 Apr 2013 20:43:44 GMT
Author: sergeyb
Date: Tue Apr 16 20:43:44 2013
New Revision: 1468603

URL: http://svn.apache.org/r1468603
Log:
Merged revisions 1468601 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes

........
  r1468601 | sergeyb | 2013-04-16 21:34:46 +0100 (Tue, 16 Apr 2013) | 1 line
  
  [CXF-4967] Fixing the build failure in branches
........

Modified:
    cxf/branches/2.6.x-fixes/   (props changed)
    cxf/branches/2.6.x-fixes/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/dom4j/DOM4JProviderTest.java

Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
  Merged /cxf/branches/2.7.x-fixes:r1468601

Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.6.x-fixes/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/dom4j/DOM4JProviderTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/dom4j/DOM4JProviderTest.java?rev=1468603&r1=1468602&r2=1468603&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/dom4j/DOM4JProviderTest.java
(original)
+++ cxf/branches/2.6.x-fixes/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/dom4j/DOM4JProviderTest.java
Tue Apr 16 20:43:44 2013
@@ -105,7 +105,7 @@ public class DOM4JProviderTest extends A
     
     @Test
     public void testWriteJSONDropRoot() throws Exception {
-        org.dom4j.Document dom = readXML("<root><a/></root>");
+        org.dom4j.Document dom = readXML("<Document><a/></Document>");
         DOM4JProvider p = new DOM4JProvider();
         p.setProviders(new ProvidersImpl(createMessageWithJSONProvider()));
         
@@ -142,7 +142,7 @@ public class DOM4JProviderTest extends A
     }
     
     private Message createMessageWithJSONProvider() {
-        ProviderFactory factory = ServerProviderFactory.getInstance();
+        ProviderFactory factory = ProviderFactory.getInstance();
         JSONProvider<Object> provider = new JSONProvider<Object>();
         provider.setDropRootElement(true);
         provider.setIgnoreNamespaces(true);
@@ -161,7 +161,7 @@ public class DOM4JProviderTest extends A
         EasyMock.expectLastCall().andReturn(0).anyTimes();
         endpoint.isEmpty();
         EasyMock.expectLastCall().andReturn(true).anyTimes();
-        endpoint.get(ServerProviderFactory.class.getName());
+        endpoint.get(ProviderFactory.class.getName());
         EasyMock.expectLastCall().andReturn(factory).anyTimes();
         EasyMock.replay(endpoint);
         e.put(Endpoint.class, endpoint);



Mime
View raw message