Author: ningjiang
Date: Mon Dec 22 23:46:37 2008
New Revision: 728897
URL: http://svn.apache.org/viewvc?rev=728897&view=rev
Log:
Added a Junit test of JAXRS endpoint with ServletTranspot
Added:
cxf/trunk/systests/src/test/java/org/apache/cxf/systest/servlet/JaxRsServletTest.java
(with props)
cxf/trunk/systests/src/test/java/org/apache/cxf/systest/servlet/cxf-jaxrs.xml
(with props)
cxf/trunk/systests/src/test/java/org/apache/cxf/systest/servlet/web-jaxrs.xml
(with props)
Added:
cxf/trunk/systests/src/test/java/org/apache/cxf/systest/servlet/JaxRsServletTest.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/servlet/JaxRsServletTest.java?rev=728897&view=auto
==============================================================================
---
cxf/trunk/systests/src/test/java/org/apache/cxf/systest/servlet/JaxRsServletTest.java
(added)
+++
cxf/trunk/systests/src/test/java/org/apache/cxf/systest/servlet/JaxRsServletTest.java
Mon Dec 22 23:46:37 2008
@@ -0,0 +1,80 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cxf.systest.servlet;
+
+import java.io.InputStream;
+
+import com.meterware.httpunit.WebRequest;
+import com.meterware.httpunit.WebResponse;
+import com.meterware.servletunit.ServletUnitClient;
+
+import org.apache.cxf.Bus;
+import org.apache.cxf.BusException;
+import org.apache.cxf.helpers.IOUtils;
+import org.apache.cxf.io.CachedOutputStream;
+import org.apache.cxf.systest.jaxrs.JAXRSClientServerProxySpringBookTest;
+import org.junit.Test;
+
+
+
+public class JaxRsServletTest extends AbstractServletTest {
+
+
+ @Override
+ protected String getConfiguration() {
+ return "/org/apache/cxf/systest/servlet/web-jaxrs.xml";
+ }
+
+ @Override
+ protected Bus createBus() throws BusException {
+ // don't set up the bus, let the servlet do it
+ return null;
+ }
+
+ @Test
+ public void testGetThatBook123() throws Exception {
+ testInvokingBookService("/jaxrs/bookstorestorage/thosebooks/123");
+ }
+
+ private void testInvokingBookService(String serviceAddress) throws
Exception {
+ ServletUnitClient client = newClient();
+ client.setExceptionsThrownOnErrorStatus(false);
+
+ WebRequest req =
+ new GetMethodQueryWebRequest(CONTEXT_URL + serviceAddress);
+
+ WebResponse response = client.getResponse(req);
+ InputStream in = response.getInputStream();
+ InputStream expected = JAXRSClientServerProxySpringBookTest.class
+ .getResourceAsStream("resources/expected_get_book123.txt");
+
+ assertEquals(" Can't get the expected result ",
+ getStringFromInputStream(expected),
+ getStringFromInputStream(in));
+
+ }
+
+ private String getStringFromInputStream(InputStream in) throws Exception {
+ CachedOutputStream bos = new CachedOutputStream();
+ IOUtils.copy(in, bos);
+ in.close();
+ bos.close();
+ return bos.getOut().toString();
+ }
+}
Propchange:
cxf/trunk/systests/src/test/java/org/apache/cxf/systest/servlet/JaxRsServletTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
cxf/trunk/systests/src/test/java/org/apache/cxf/systest/servlet/JaxRsServletTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added:
cxf/trunk/systests/src/test/java/org/apache/cxf/systest/servlet/cxf-jaxrs.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/servlet/cxf-jaxrs.xml?rev=728897&view=auto
==============================================================================
---
cxf/trunk/systests/src/test/java/org/apache/cxf/systest/servlet/cxf-jaxrs.xml
(added)
+++
cxf/trunk/systests/src/test/java/org/apache/cxf/systest/servlet/cxf-jaxrs.xml
Mon Dec 22 23:46:37 2008
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xmlns:jaxrs="http://cxf.apache.org/jaxrs";
+ xmlns:aop="http://www.springframework.org/schema/aop";
+ xsi:schemaLocation="
+http://www.springframework.org/schema/beans
+http://www.springframework.org/schema/beans/spring-beans.xsd
+http://www.springframework.org/schema/aop
+http://www.springframework.org/schema/aop/spring-aop.xsd
+http://cxf.apache.org/jaxrs
+http://cxf.apache.org/schemas/jaxrs.xsd";>
+
+ <jaxrs:server id="bookservice"
+ address="/">
+ <jaxrs:serviceBeans>
+ <ref bean="bookstore"/>
+ <ref bean="bookstoreInterface"/>
+ </jaxrs:serviceBeans>
+ </jaxrs:server>
+ <bean id="bookstore" scope="prototype"
class="org.apache.cxf.systest.jaxrs.BookStore"/>
+ <bean id="bookstoreInterface" scope="prototype"
class="org.apache.cxf.systest.jaxrs.BookStoreWithInterface"/>
+
+</beans>
Propchange:
cxf/trunk/systests/src/test/java/org/apache/cxf/systest/servlet/cxf-jaxrs.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
cxf/trunk/systests/src/test/java/org/apache/cxf/systest/servlet/cxf-jaxrs.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange:
cxf/trunk/systests/src/test/java/org/apache/cxf/systest/servlet/cxf-jaxrs.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added:
cxf/trunk/systests/src/test/java/org/apache/cxf/systest/servlet/web-jaxrs.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/servlet/web-jaxrs.xml?rev=728897&view=auto
==============================================================================
---
cxf/trunk/systests/src/test/java/org/apache/cxf/systest/servlet/web-jaxrs.xml
(added)
+++
cxf/trunk/systests/src/test/java/org/apache/cxf/systest/servlet/web-jaxrs.xml
Mon Dec 22 23:46:37 2008
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!DOCTYPE web-app
+ PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+ "http://java.sun.com/dtd/web-app_2_3.dtd";>
+
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+<web-app>
+
+ <servlet>
+ <servlet-name>CXFServlet</servlet-name>
+ <display-name>CXF Servlet</display-name>
+ <servlet-class>
+ org.apache.cxf.transport.servlet.CXFServlet
+ </servlet-class>
+ <init-param>
+ <param-name>config-location</param-name>
+ <param-value>/org/apache/cxf/systest/servlet/cxf-jaxrs.xml</param-value>
+ </init-param>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>CXFServlet</servlet-name>
+ <url-pattern>/jaxrs/*</url-pattern>
+ </servlet-mapping>
+
+
+</web-app>
\ No newline at end of file
Propchange:
cxf/trunk/systests/src/test/java/org/apache/cxf/systest/servlet/web-jaxrs.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
cxf/trunk/systests/src/test/java/org/apache/cxf/systest/servlet/web-jaxrs.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange:
cxf/trunk/systests/src/test/java/org/apache/cxf/systest/servlet/web-jaxrs.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
