Return-Path: X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org Delivered-To: apmail-hadoop-common-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 17F04D213 for ; Thu, 16 Aug 2012 22:20:09 +0000 (UTC) Received: (qmail 60907 invoked by uid 500); 16 Aug 2012 22:20:08 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 60860 invoked by uid 500); 16 Aug 2012 22:20:08 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 60852 invoked by uid 99); 16 Aug 2012 22:20:08 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 Aug 2012 22:20:08 +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, 16 Aug 2012 22:20:07 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 286E023888E4; Thu, 16 Aug 2012 22:19:24 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1374085 - in /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common: CHANGES.txt src/test/java/org/apache/hadoop/fs/TestFileSystemCanonicalization.java Date: Thu, 16 Aug 2012 22:19:23 -0000 To: common-commits@hadoop.apache.org From: tgraves@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120816221924.286E023888E4@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: tgraves Date: Thu Aug 16 22:19:23 2012 New Revision: 1374085 URL: http://svn.apache.org/viewvc?rev=1374085&view=rev Log: merge -r 1374083:1374084 from trunk. FIXES: HADOOP-8390 Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFileSystemCanonicalization.java Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1374085&r1=1374084&r2=1374085&view=diff ============================================================================== --- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt Thu Aug 16 22:19:23 2012 @@ -733,6 +733,9 @@ Release 0.23.3 - UNRELEASED HADOOP-8703. distcpV2: turn CRC checking off for 0 byte size (Dave Thompson via bobby) + HADOOP-8390. TestFileSystemCanonicalization fails with JDK7 (Trevor + Robinson via tgraves) + Release 0.23.2 - UNRELEASED NEW FEATURES Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFileSystemCanonicalization.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFileSystemCanonicalization.java?rev=1374085&r1=1374084&r2=1374085&view=diff ============================================================================== --- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFileSystemCanonicalization.java (original) +++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFileSystemCanonicalization.java Thu Aug 16 22:19:23 2012 @@ -18,18 +18,20 @@ package org.apache.hadoop.fs; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + import java.io.IOException; import java.net.URI; -import junit.framework.TestCase; - import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.permission.FsPermission; import org.apache.hadoop.security.NetUtilsTestResolver; import org.apache.hadoop.util.Progressable; +import org.junit.BeforeClass; import org.junit.Test; -public class TestFileSystemCanonicalization extends TestCase { +public class TestFileSystemCanonicalization { static String[] authorities = { "myfs://host", "myfs://host.a", @@ -41,8 +43,8 @@ public class TestFileSystemCanonicalizat }; - @Test - public void testSetupResolver() throws Exception { + @BeforeClass + public static void initialize() throws Exception { NetUtilsTestResolver.install(); }