cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1235433 - in /cxf/branches/2.5.x-fixes: ./ rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestinationTest.java
Date Tue, 24 Jan 2012 19:34:07 GMT
Author: dkulp
Date: Tue Jan 24 19:34:06 2012
New Revision: 1235433

URL: http://svn.apache.org/viewvc?rev=1235433&view=rev
Log:
Merged revisions 1235426 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1235426 | dkulp | 2012-01-24 14:19:41 -0500 (Tue, 24 Jan 2012) | 1 line
  
  Fix mocks
........

Modified:
    cxf/branches/2.5.x-fixes/   (props changed)
    cxf/branches/2.5.x-fixes/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestinationTest.java

Propchange: cxf/branches/2.5.x-fixes/
            ('svn:mergeinfo' removed)

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

Modified: cxf/branches/2.5.x-fixes/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestinationTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestinationTest.java?rev=1235433&r1=1235432&r2=1235433&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestinationTest.java
(original)
+++ cxf/branches/2.5.x-fixes/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestinationTest.java
Tue Jan 24 19:34:06 2012
@@ -674,6 +674,8 @@ public class JettyHTTPDestinationTest ex
         EasyMock.expectLastCall().andReturn(method).atLeastOnce();
         request.getConnection();
         EasyMock.expectLastCall().andReturn(null).anyTimes();
+        request.getUserPrincipal();
+        EasyMock.expectLastCall().andReturn(null).anyTimes();
         
         if (setRedirectURL) {
             policy.setRedirectURL(NOWHERE + "foo/bar");
@@ -751,16 +753,20 @@ public class JettyHTTPDestinationTest ex
         }
         
         if (decoupled) {
-            decoupledBackChannel = EasyMock.createMock(Conduit.class);
-            decoupledBackChannel.setMessageObserver(EasyMock.isA(MessageObserver.class));
          
-            decoupledBackChannel.prepare(EasyMock.isA(Message.class));
-            EasyMock.expectLastCall();
-            EasyMock.replay(decoupledBackChannel);
+            setupDecoupledBackChannel();
         }
         EasyMock.replay(response);
         EasyMock.replay(request);
     }
     
+    private void setupDecoupledBackChannel() throws IOException {
+        decoupledBackChannel = EasyMock.createMock(Conduit.class);
+        decoupledBackChannel.setMessageObserver(EasyMock.isA(MessageObserver.class));   
       
+        decoupledBackChannel.prepare(EasyMock.isA(Message.class));
+        EasyMock.expectLastCall();
+        EasyMock.replay(decoupledBackChannel);
+    }
+    
     private void setUpInMessage() {
         inMessage.setExchange(new ExchangeImpl());
     }



Mime
View raw message