Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 2E53F947A for ; Thu, 27 Oct 2011 20:33:06 +0000 (UTC) Received: (qmail 18940 invoked by uid 500); 27 Oct 2011 20:33:06 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 18891 invoked by uid 500); 27 Oct 2011 20:33:06 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 18883 invoked by uid 99); 27 Oct 2011 20:33:05 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 27 Oct 2011 20:33:05 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 27 Oct 2011 20:33:04 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 9FF0A238897A for ; Thu, 27 Oct 2011 20:32:44 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1190003 - in /cxf/branches/2.3.x-fixes: ./ tools/common/src/test/java/org/apache/cxf/tools/util/URIParserUtilTest.java Date: Thu, 27 Oct 2011 20:32:44 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111027203244.9FF0A238897A@eris.apache.org> Author: dkulp Date: Thu Oct 27 20:32:44 2011 New Revision: 1190003 URL: http://svn.apache.org/viewvc?rev=1190003&view=rev Log: Merged revisions 1189736 via svnmerge from https://svn.us.apache.org/repos/asf/cxf/branches/2.4.x-fixes ................ r1189736 | ay | 2011-10-27 09:06:42 -0400 (Thu, 27 Oct 2011) | 9 lines 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.3.x-fixes/ (props changed) cxf/branches/2.3.x-fixes/tools/common/src/test/java/org/apache/cxf/tools/util/URIParserUtilTest.java Propchange: cxf/branches/2.3.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.3.x-fixes/tools/common/src/test/java/org/apache/cxf/tools/util/URIParserUtilTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/tools/common/src/test/java/org/apache/cxf/tools/util/URIParserUtilTest.java?rev=1190003&r1=1190002&r2=1190003&view=diff ============================================================================== --- cxf/branches/2.3.x-fixes/tools/common/src/test/java/org/apache/cxf/tools/util/URIParserUtilTest.java (original) +++ cxf/branches/2.3.x-fixes/tools/common/src/test/java/org/apache/cxf/tools/util/URIParserUtilTest.java Thu Oct 27 20:32:44 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; @@ -98,6 +97,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")); } }