You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2013/08/02 14:02:38 UTC
svn commit: r1509648 - in /cxf/branches/2.6.x-fixes: ./
rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/UriBuilderImplTest.java
Author: sergeyb
Date: Fri Aug 2 12:02:37 2013
New Revision: 1509648
URL: http://svn.apache.org/r1509648
Log:
Merged revisions 1509624 via svnmerge from
https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes
................
r1509624 | sergeyb | 2013-08-02 12:08:44 +0100 (Fri, 02 Aug 2013) | 9 lines
Merged revisions 1508424 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1508424 | sergeyb | 2013-07-30 13:47:46 +0100 (Tue, 30 Jul 2013) | 1 line
Re-enabling a couple of UriBuilderTests
........
................
Modified:
cxf/branches/2.6.x-fixes/ (props changed)
cxf/branches/2.6.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/UriBuilderImplTest.java
Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
Merged /cxf/branches/2.7.x-fixes:r1509624
Merged /cxf/trunk:r1508424
Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.6.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/UriBuilderImplTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/UriBuilderImplTest.java?rev=1509648&r1=1509647&r2=1509648&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/UriBuilderImplTest.java (original)
+++ cxf/branches/2.6.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/UriBuilderImplTest.java Fri Aug 2 12:02:37 2013
@@ -34,7 +34,6 @@ import org.apache.cxf.jaxrs.resources.Ur
import org.apache.cxf.jaxrs.utils.JAXRSUtils;
import org.junit.Assert;
-import org.junit.Ignore;
import org.junit.Test;
public class UriBuilderImplTest extends Assert {
@@ -1260,7 +1259,6 @@ public class UriBuilderImplTest extends
assertEquals(expected, uri.toString());
}
- @Ignore
@Test
public void testPathParamSpaceBuild() {
String expected = "http://localhost:8080/name/%20";
@@ -1310,7 +1308,6 @@ public class UriBuilderImplTest extends
assertEquals(expected, uri.toString());
}
- @Ignore
@Test
public void testQueryParamSpaceBuild2() {
String expected = "http://localhost:8080?name=%2520";