Author: dkulp
Date: Fri Feb 5 19:51:45 2010
New Revision: 907072
URL: http://svn.apache.org/viewvc?rev=907072&view=rev
Log:
Merged revisions 907066 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r907066 | dkulp | 2010-02-05 14:42:47 -0500 (Fri, 05 Feb 2010) | 1 line
Fix test.
........
Modified:
cxf/branches/2.2.x-fixes/ (props changed)
cxf/branches/2.2.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSUriInfoTest.java
Propchange: cxf/branches/2.2.x-fixes/
('svn:mergeinfo' removed)
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.2.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSUriInfoTest.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSUriInfoTest.java?rev=907072&r1=907071&r2=907072&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSUriInfoTest.java
(original)
+++
cxf/branches/2.2.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSUriInfoTest.java
Fri Feb 5 19:51:45 2010
@@ -62,15 +62,15 @@
public void testBasePathAndPathAndPathParam() throws Exception {
checkUriInfo("http://localhost:9080/app/v1";, "\"\"", "/");
checkUriInfo("http://localhost:9080/app/v1/";, "\"\"", "/");
- checkUriInfo("http://localhost:9080/app/v1/test";, "\"test\"", "/test");
+ checkUriInfo("http://localhost:9080/app/v1/test";, "\"test\"", "test");
checkUriInfo("http://localhost:9080/app/v1/";, "\"\"", "/");
checkUriInfo("http://localhost:9080/app/v1";, "\"\"", "/");
- checkUriInfo("http://localhost:9080/app/v1/bar";, "\"bar\"", "/bar");
- checkUriInfo("http://localhost:9080/app/v1/bar";, "\"bar\"", "/bar");
- checkUriInfo("http://localhost:9080/app/v1/bar/test";, "\"bar/test\"",
"/bar/test");
- checkUriInfo("http://localhost:9080/app/v1/bar";, "\"bar\"", "/bar");
- checkUriInfo("http://localhost:9080/app/v1/bar";, "\"bar\"", "/bar");
+ checkUriInfo("http://localhost:9080/app/v1/bar";, "\"bar\"", "bar");
+ checkUriInfo("http://localhost:9080/app/v1/bar";, "\"bar\"", "bar");
+ checkUriInfo("http://localhost:9080/app/v1/bar/test";, "\"bar/test\"",
"bar/test");
+ checkUriInfo("http://localhost:9080/app/v1/bar";, "\"bar\"", "bar");
+ checkUriInfo("http://localhost:9080/app/v1/bar";, "\"bar\"", "bar");
}
private void checkUriInfo(String address, String path, String pathParam) {
