HADOOP-9175. TestWritableName fails with Open JDK 7. Contributed by Arpit Agarwal.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1@1428105 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -376,6 +376,9 @@ Release 1.2.0 - unreleased
     HADOOP-9174. TestSecurityUtil fails with Open JDK 7. (Arpit Agarwal via
     suresh)
 
+    HADOOP-9175. TestWritableName fails with Open JDK 7. (Arpit Agarwal via
+    suresh)
+
 Release 1.1.2 - Unreleased
 
   INCOMPATIBLE CHANGES

src/test/org/apache/hadoop/io/TestWritableName.java

@@ -66,29 +66,25 @@ public class TestWritableName extends TestCase {
 
   public void testGoodName() throws Exception {
     Configuration conf = new Configuration();
-    Class<?> test = WritableName.getClass("long",conf);
+    Class<?> test = WritableName.getClass("long", conf);
     assertTrue(test != null);
   }
 
-  public void testSetName() throws Exception {
+  public void testAddNames() throws Exception {
     Configuration conf = new Configuration();
-    WritableName.setName(SimpleWritable.class, testName);
 
+    // Add a name, check it works.
+    WritableName.setName(SimpleWritable.class, testName);
     Class<?> test = WritableName.getClass(testName,conf);
     assertTrue(test.equals(SimpleWritable.class));
-  }
-
 
-  public void testAddName() throws Exception {
-    Configuration conf = new Configuration();
+    // Add a new name, check it works.
     String altName = testName + ".alt";
-
     WritableName.addName(SimpleWritable.class, altName);
-
-    Class<?> test = WritableName.getClass(altName, conf);
+    test = WritableName.getClass(altName, conf);
     assertTrue(test.equals(SimpleWritable.class));
 
-    // check original name still works
+    // Check that the original name still works.
     test = WritableName.getClass(testName, conf);
     assertTrue(test.equals(SimpleWritable.class));
 
@@ -103,5 +99,5 @@ public class TestWritableName extends TestCase {
       assertTrue(e.getMessage().matches(".*unknown_junk.*"));
     }
   }
-	
+
 }