Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 13DA6200C25 for ; Fri, 10 Feb 2017 07:20:33 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 12A67160B6B; Fri, 10 Feb 2017 06:20:33 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 617AD160B64 for ; Fri, 10 Feb 2017 07:20:32 +0100 (CET) Received: (qmail 69268 invoked by uid 500); 10 Feb 2017 06:20:31 -0000 Mailing-List: contact commits-help@beam.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@beam.apache.org Delivered-To: mailing list commits@beam.apache.org Received: (qmail 69255 invoked by uid 99); 10 Feb 2017 06:20:31 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 10 Feb 2017 06:20:31 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 5BB3FDFBDB; Fri, 10 Feb 2017 06:20:31 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: dhalperi@apache.org To: commits@beam.apache.org Date: Fri, 10 Feb 2017 06:20:31 -0000 Message-Id: <1965d30e12f748f98da13931a608de8d@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] beam git commit: [BEAM-1453] LocalResourceIdTest: disable unicode tests. archived-at: Fri, 10 Feb 2017 06:20:33 -0000 Repository: beam Updated Branches: refs/heads/master c88297680 -> 712a1d6e3 [BEAM-1453] LocalResourceIdTest: disable unicode tests. Project: http://git-wip-us.apache.org/repos/asf/beam/repo Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/7829dc86 Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/7829dc86 Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/7829dc86 Branch: refs/heads/master Commit: 7829dc8638b4409cfd729854ccb484e7da6b0a53 Parents: c882976 Author: Pei He Authored: Thu Feb 9 15:52:33 2017 -0800 Committer: Dan Halperin Committed: Thu Feb 9 22:03:31 2017 -0800 ---------------------------------------------------------------------- .../apache/beam/sdk/io/LocalResourceIdTest.java | 24 ++------------------ 1 file changed, 2 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/beam/blob/7829dc86/sdks/java/core/src/test/java/org/apache/beam/sdk/io/LocalResourceIdTest.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/io/LocalResourceIdTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/io/LocalResourceIdTest.java index 94e7620..37bd303 100644 --- a/sdks/java/core/src/test/java/org/apache/beam/sdk/io/LocalResourceIdTest.java +++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/io/LocalResourceIdTest.java @@ -32,6 +32,8 @@ import org.junit.runners.JUnit4; /** * Tests for {@link LocalResourceId}. + * + *

TODO: re-enable unicode tests when BEAM-1453 is resolved. */ @RunWith(JUnit4.class) public class LocalResourceIdTest { @@ -68,16 +70,6 @@ public class LocalResourceIdTest { toResourceIdentifier("file:/aa"), toResourceIdentifier("file:///") .resolve("aa", StandardResolveOptions.RESOLVE_FILE)); - - // Tests path with unicode - assertEquals( - toResourceIdentifier("/根目录/输出 文件01.txt"), - toResourceIdentifier("/根目录/") - .resolve("输出 文件01.txt", StandardResolveOptions.RESOLVE_FILE)); - assertEquals( - toResourceIdentifier("file://根目录/输出 文件01.txt"), - toResourceIdentifier("file://根目录/") - .resolve("输出 文件01.txt", StandardResolveOptions.RESOLVE_FILE)); } @Test @@ -199,15 +191,6 @@ public class LocalResourceIdTest { toResourceIdentifier("/"), toResourceIdentifier("/").getCurrentDirectory()); - // Tests path with unicode - assertEquals( - toResourceIdentifier("/根目录/"), - toResourceIdentifier("/根目录/输出 文件01.txt").getCurrentDirectory()); - assertEquals( - toResourceIdentifier("file://根目录/"), - toResourceIdentifier("file://根目录/输出 文件01.txt").getCurrentDirectory()); - - // Tests path without parent. assertEquals( toResourceIdentifier("./"), @@ -218,9 +201,6 @@ public class LocalResourceIdTest { public void testGetScheme() throws Exception { // Tests for local files without the scheme. assertEquals("file", toResourceIdentifier("/root/tmp/").getScheme()); - - // Tests path with unicode. - assertEquals("file", toResourceIdentifier("file://根目录/").getScheme()); } @Test