svn commit: r1428106 - in /hadoop/common/branches/branch-1-win: CHANGES.branch-1-win.txt src/test/org/apache/hadoop/io/TestWritableName.java

[suresh]

Author: suresh
Date: Wed Jan  2 23:18:03 2013
New Revision: 1428106

URL: http://svn.apache.org/viewvc?rev=1428106&view=rev
Log:
HADOOP-9175. Merge change 1428105 from branch-1

Modified:
    hadoop/common/branches/branch-1-win/CHANGES.branch-1-win.txt
    
hadoop/common/branches/branch-1-win/src/test/org/apache/hadoop/io/TestWritableName.java

Modified: hadoop/common/branches/branch-1-win/CHANGES.branch-1-win.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1-win/CHANGES.branch-1-win.txt?rev=1428106&r1=1428105&r2=1428106&view=diff
==============================================================================
--- hadoop/common/branches/branch-1-win/CHANGES.branch-1-win.txt (original)
+++ hadoop/common/branches/branch-1-win/CHANGES.branch-1-win.txt Wed Jan  2 
23:18:03 2013
@@ -312,3 +312,6 @@ Branch-hadoop-1-win (branched from branc
 
     HADOOP-9174. TestSecurityUtil fails with Open JDK 7. (Arpit Agarwal via
     suresh)
+
+    HADOOP-9175. TestWritableName fails with Open JDK 7. Contributed by Arpit
+    Agarwal.

Modified: 
hadoop/common/branches/branch-1-win/src/test/org/apache/hadoop/io/TestWritableName.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1-win/src/test/org/apache/hadoop/io/TestWritableName.java?rev=1428106&r1=1428105&r2=1428106&view=diff
==============================================================================
--- 
hadoop/common/branches/branch-1-win/src/test/org/apache/hadoop/io/TestWritableName.java
 (original)
+++ 
hadoop/common/branches/branch-1-win/src/test/org/apache/hadoop/io/TestWritableName.java
 Wed Jan  2 23:18:03 2013
@@ -66,29 +66,25 @@ public class TestWritableName extends Te
 
   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 Te
       assertTrue(e.getMessage().matches(".*unknown_junk.*"));
     }
   }
-       
+
 }