Author: dkulp
Date: Mon Sep 14 17:51:58 2009
New Revision: 814752
URL: http://svn.apache.org/viewvc?rev=814752&view=rev
Log:
Service list stuff is different on 2.1.x
Modified:
cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/servlet/SpringServletTest.java
Modified:
cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/servlet/SpringServletTest.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/servlet/SpringServletTest.java?rev=814752&r1=814751&r2=814752&view=diff
==============================================================================
---
cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/servlet/SpringServletTest.java
(original)
+++
cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/servlet/SpringServletTest.java
Mon Sep 14 17:51:58 2009
@@ -22,7 +22,6 @@
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;
@@ -31,8 +30,6 @@
import org.apache.cxf.Bus;
import org.apache.cxf.BusException;
import org.apache.cxf.helpers.DOMUtils;
-import org.apache.cxf.testsupport.AbstractServletTest;
-
import org.junit.Test;
public class SpringServletTest extends AbstractServletTest {
@@ -149,17 +146,17 @@
}
@Test
- public void testIgnoreServiceList() throws Exception {
+ public void testGetServiceList() throws Exception {
ServletUnitClient client = newClient();
client.setExceptionsThrownOnErrorStatus(true);
WebRequest req =
new GetMethodQueryWebRequest(CONTEXT_URL + "/services/");
- try {
- client.getResponse(req);
- fail();
- } catch (HttpNotFoundException ex) {
- // expected
- }
+ 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);
+
}
+
}