cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject svn commit: r790076 - in /cxf/branches/2.2.x-fixes: ./ systests/src/test/java/org/apache/cxf/systest/servlet/SpringServletTest.java
Date Wed, 01 Jul 2009 09:00:12 GMT
Author: sergeyb
Date: Wed Jul  1 09:00:12 2009
New Revision: 790076

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

........
  r790074 | sergeyb | 2009-07-01 09:50:31 +0100 (Wed, 01 Jul 2009) | 1 line
  
  Fixing a test failure
........

Modified:
    cxf/branches/2.2.x-fixes/   (props changed)
    cxf/branches/2.2.x-fixes/systests/src/test/java/org/apache/cxf/systest/servlet/SpringServletTest.java

Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul  1 09:00:12 2009
@@ -1 +1 @@
-/cxf/trunk:782728-782730,783097,783294,783396,784059,784181-784184,784893,784895,785279-785282,785468,785621,785624,785651,785734,785866,786142,786271-786272,786395,786512,786514,786582-786583,786638,786647,786850,787200,787269,787277-787279,787290-787291,787305,787323,787366,787849,788030,788060,788187,788444,788451,788703,788752,788774,788819-788820,789013,789371,789387,789420,789527-789530,789704-789705,789788,789811,789896-789901
+/cxf/trunk:782728-782730,783097,783294,783396,784059,784181-784184,784893,784895,785279-785282,785468,785621,785624,785651,785734,785866,786142,786271-786272,786395,786512,786514,786582-786583,786638,786647,786850,787200,787269,787277-787279,787290-787291,787305,787323,787366,787849,788030,788060,788187,788444,788451,788703,788752,788774,788819-788820,789013,789371,789387,789420,789527-789530,789704-789705,789788,789811,789896-789901,790074

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

Modified: cxf/branches/2.2.x-fixes/systests/src/test/java/org/apache/cxf/systest/servlet/SpringServletTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/src/test/java/org/apache/cxf/systest/servlet/SpringServletTest.java?rev=790076&r1=790075&r2=790076&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/systests/src/test/java/org/apache/cxf/systest/servlet/SpringServletTest.java
(original)
+++ cxf/branches/2.2.x-fixes/systests/src/test/java/org/apache/cxf/systest/servlet/SpringServletTest.java
Wed Jul  1 09:00:12 2009
@@ -22,6 +22,7 @@
 
 import org.w3c.dom.Document;
 
+import com.meterware.httpunit.HttpNotFoundException;
 import com.meterware.httpunit.PostMethodWebRequest;
 import com.meterware.httpunit.WebRequest;
 import com.meterware.httpunit.WebResponse;
@@ -30,8 +31,6 @@
 import org.apache.cxf.Bus;
 import org.apache.cxf.BusException;
 import org.apache.cxf.helpers.DOMUtils;
-
-import org.junit.Ignore;
 import org.junit.Test;
 
 public class SpringServletTest extends AbstractServletTest {
@@ -148,18 +147,17 @@
     }
     
     @Test
-    @Ignore("not working for some reason")
-    public void testGetServiceList() throws Exception {
+    public void testIgnoreServiceList() throws Exception {
         ServletUnitClient client = newClient();
         client.setExceptionsThrownOnErrorStatus(true);
         
         WebRequest req = 
             new GetMethodQueryWebRequest(CONTEXT_URL + "/services/");
-        WebResponse res = client.getResponse(req);
-        assertEquals(200, res.getResponseCode());
-        assertEquals("text/html", res.getContentType());
-        assertEquals("Here should have no services links ", 0, res.getLinks().length);
-                
+        try {
+            client.getResponse(req);
+            fail();
+        } catch (HttpNotFoundException ex) {
+            // expected
+        }
     }
-    
 }



Mime
View raw message