cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r895812 - in /cxf/trunk/systests/jaxrs/src/test: java/org/apache/cxf/systest/jaxrs/JAXRSLoggingAtomPullSpringTest.java resources/jaxrs_logging_atompull/WEB-INF/beans.xml
Date Mon, 04 Jan 2010 22:40:28 GMT
Author: dkulp
Date: Mon Jan  4 22:40:27 2010
New Revision: 895812

URL: http://svn.apache.org/viewvc?rev=895812&view=rev
Log:
Fix jaxrs test

Modified:
    cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSLoggingAtomPullSpringTest.java
    cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_logging_atompull/WEB-INF/beans.xml

Modified: cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSLoggingAtomPullSpringTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSLoggingAtomPullSpringTest.java?rev=895812&r1=895811&r2=895812&view=diff
==============================================================================
--- cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSLoggingAtomPullSpringTest.java
(original)
+++ cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSLoggingAtomPullSpringTest.java
Mon Jan  4 22:40:27 2010
@@ -71,7 +71,6 @@
     }
 
     @Test
-    @Ignore("For some reasons two tests step on each other - fix it")
     public void testFeed() throws Exception {
         WebClient wc = WebClient.create("http://localhost:9080/resource/root");
         wc.path("/log").get();
@@ -89,13 +88,14 @@
     }
     
     @Test
+    @Ignore("For some reasons two tests step on each other - fix it")
     public void testPagedFeed() throws Exception {
-        WebClient wc = WebClient.create("http://localhost:9080/resource/paged");
+        WebClient wc = WebClient.create("http://localhost:9080/resource2/paged");
         wc.path("/log").get();
         Thread.sleep(3000);
         
-        verifyPages("http://localhost:9080/atom2/logs", "next", 3, 2);
-        verifyPages("http://localhost:9080/atom2/logs?page=3", "previous", 2, 3);
+        verifyPages("http://localhost:9080/atom/logs", "next", 3, 2);
+        verifyPages("http://localhost:9080/atom/logs?page=3", "previous", 2, 3);
     }
     
     private void verifyPages(String startAddress, String rel, int firstValue, int lastValue)


Modified: cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_logging_atompull/WEB-INF/beans.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_logging_atompull/WEB-INF/beans.xml?rev=895812&r1=895811&r2=895812&view=diff
==============================================================================
--- cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_logging_atompull/WEB-INF/beans.xml (original)
+++ cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_logging_atompull/WEB-INF/beans.xml Mon
Jan  4 22:40:27 2010
@@ -58,6 +58,14 @@
 			<ref bean="feed" />
 		</jaxrs:providers>
 	</jaxrs:server>
+	<jaxrs:server id="resource2Server" address="/resource2">
+		<jaxrs:serviceBeans>
+			<bean class="org.apache.cxf.systest.jaxrs.JAXRSLoggingAtomPullSpringTest$Resource2"/>
+		</jaxrs:serviceBeans>
+		<jaxrs:providers>
+			<ref bean="feed" />
+		</jaxrs:providers>
+	</jaxrs:server>
 
 
     <jaxrs:server id="atomServer" address="/atom">



Mime
View raw message