svn commit: r1189736 - in /cxf/branches/2.4.x-fixes: ./ tools/common/src/test/java/org/apache/cxf/tools/util/URIParserUtilTest.java

[ay]

Author: ay
Date: Thu Oct 27 13:06:42 2011
New Revision: 1189736

URL: http://svn.apache.org/viewvc?rev=1189736&view=rev
Log:
Merged revisions 1189705 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1189705 | ay | 2011-10-27 13:24:39 +0200 (Thu, 27 Oct 2011) | 1 line
  
  fixing windows related issue for CXF-3855 unit test
........

Modified:
    cxf/branches/2.4.x-fixes/   (props changed)
    
cxf/branches/2.4.x-fixes/tools/common/src/test/java/org/apache/cxf/tools/util/URIParserUtilTest.java

Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
    svn:mergeinfo = /cxf/trunk:1189705

Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
cxf/branches/2.4.x-fixes/tools/common/src/test/java/org/apache/cxf/tools/util/URIParserUtilTest.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/tools/common/src/test/java/org/apache/cxf/tools/util/URIParserUtilTest.java?rev=1189736&r1=1189735&r2=1189736&view=diff
==============================================================================
--- 
cxf/branches/2.4.x-fixes/tools/common/src/test/java/org/apache/cxf/tools/util/URIParserUtilTest.java
 (original)
+++ 
cxf/branches/2.4.x-fixes/tools/common/src/test/java/org/apache/cxf/tools/util/URIParserUtilTest.java
 Thu Oct 27 13:06:42 2011
@@ -19,8 +19,7 @@
 
 package org.apache.cxf.tools.util;
 
-import java.io.File;
-import java.net.URI;
+import java.net.URLDecoder;
 
 import org.junit.Assert;
 import org.junit.Test;
@@ -101,6 +100,6 @@ public class URIParserUtilTest extends A
         String orig = new String(new byte[] {-47, -122}, "UTF-8");
         orig = "/foo" + orig + ".txt";
         String s = URIParserUtil.escapeChars(orig);
-        assertEquals(orig, new File(new URI("file:" + s)).getAbsolutePath());
+        assertEquals(orig, URLDecoder.decode(s, "UTF-8"));
     }
 }