svn commit: r939773 - in /hadoop/hdfs/trunk: CHANGES.txt src/test/hdfs/org/apache/hadoop/fs/TestHDFSFileContextMainOperations.java

[hairong]

Author: hairong
Date: Fri Apr 30 18:47:51 2010
New Revision: 939773

URL: http://svn.apache.org/viewvc?rev=939773&view=rev
Log:
Revert the change made by HDFS-1089.

Modified:
    hadoop/hdfs/trunk/CHANGES.txt
    
hadoop/hdfs/trunk/src/test/hdfs/org/apache/hadoop/fs/TestHDFSFileContextMainOperations.java

Modified: hadoop/hdfs/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/hdfs/trunk/CHANGES.txt?rev=939773&r1=939772&r2=939773&view=diff
==============================================================================
--- hadoop/hdfs/trunk/CHANGES.txt (original)
+++ hadoop/hdfs/trunk/CHANGES.txt Fri Apr 30 18:47:51 2010
@@ -162,9 +162,6 @@ Trunk (unreleased changes)
     HDFS-1100. Override unwrapException in TestFcHdfsSymlink to test 
     symlink API conformance. (Eli Collins via suresh).
 
-    HDFS-1089. Remove uses of FileContext#isFile, isDirectory and exists.
-    (Eli Collins via hairong)
-
   OPTIMIZATIONS
 
     HDFS-946. NameNode should not return full path name when lisitng a

Modified: 
hadoop/hdfs/trunk/src/test/hdfs/org/apache/hadoop/fs/TestHDFSFileContextMainOperations.java
URL: 
http://svn.apache.org/viewvc/hadoop/hdfs/trunk/src/test/hdfs/org/apache/hadoop/fs/TestHDFSFileContextMainOperations.java?rev=939773&r1=939772&r2=939773&view=diff
==============================================================================
--- 
hadoop/hdfs/trunk/src/test/hdfs/org/apache/hadoop/fs/TestHDFSFileContextMainOperations.java
 (original)
+++ 
hadoop/hdfs/trunk/src/test/hdfs/org/apache/hadoop/fs/TestHDFSFileContextMainOperations.java
 Fri Apr 30 18:47:51 2010
@@ -40,7 +40,7 @@ import org.junit.Test;
 import static org.apache.hadoop.fs.FileContextTestHelper.*;
 
 public class TestHDFSFileContextMainOperations extends
-    FileContextMainOperationsBaseTest {
+                                  FileContextMainOperationsBaseTest {
   private static MiniDFSCluster cluster;
   private static Path defaultWorkingDirectory;
   private static HdfsConfiguration CONF = new HdfsConfiguration();
@@ -259,8 +259,8 @@ public class TestHDFSFileContextMainOper
     } catch (Exception ex) {
       Assert.assertTrue(exception);
     }
-    Assert.assertEquals(renameSucceeds, !exists(fc, src));
-    Assert.assertEquals(renameSucceeds, exists(fc, dst));
+    Assert.assertEquals(renameSucceeds, !fc.exists(src));
+    Assert.assertEquals(renameSucceeds, fc.exists(dst));
   }
   
   private void rename(Path src, Path dst, boolean dstExists,
@@ -272,7 +272,7 @@ public class TestHDFSFileContextMainOper
     } catch (Exception ex) {
       Assert.assertTrue(exception);
     }
-    Assert.assertEquals(renameSucceeds, !exists(fc, src));
-    Assert.assertEquals((dstExists||renameSucceeds), exists(fc, dst));
+    Assert.assertEquals(renameSucceeds, !fc.exists(src));
+    Assert.assertEquals((dstExists||renameSucceeds), fc.exists(dst));
   }
 }