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(); }