svn commit: r1034184 - in /hadoop/common/trunk: CHANGES.txt src/java/org/apache/hadoop/fs/FileSystem.java src/test/core/org/apache/hadoop/fs/FileSystemTestHelper.java

[jghoman]

Author: jghoman
Date: Thu Nov 11 22:34:52 2010
New Revision: 1034184

URL: http://svn.apache.org/viewvc?rev=1034184&view=rev
Log:
HADOOP-7024. Create a test method for adding file systems during tests.  
Contributed by Kan Zhang.

Modified:
    hadoop/common/trunk/CHANGES.txt
    hadoop/common/trunk/src/java/org/apache/hadoop/fs/FileSystem.java
    
hadoop/common/trunk/src/test/core/org/apache/hadoop/fs/FileSystemTestHelper.java

Modified: hadoop/common/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/CHANGES.txt?rev=1034184&r1=1034183&r2=1034184&view=diff
==============================================================================
--- hadoop/common/trunk/CHANGES.txt (original)
+++ hadoop/common/trunk/CHANGES.txt Thu Nov 11 22:34:52 2010
@@ -168,6 +168,9 @@ Trunk (unreleased changes)
 
     HADOOP-6977. Herriot daemon clients should vend statistics (cos)
 
+    HADOOP-7024. Create a test method for adding file systems during tests.
+    (Kan Zhang via jghoman)
+
   OPTIMIZATIONS
 
     HADOOP-6884. Add LOG.isDebugEnabled() guard for each LOG.debug(..).

Modified: hadoop/common/trunk/src/java/org/apache/hadoop/fs/FileSystem.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/src/java/org/apache/hadoop/fs/FileSystem.java?rev=1034184&r1=1034183&r2=1034184&view=diff
==============================================================================
--- hadoop/common/trunk/src/java/org/apache/hadoop/fs/FileSystem.java (original)
+++ hadoop/common/trunk/src/java/org/apache/hadoop/fs/FileSystem.java Thu Nov 
11 22:34:52 2010
@@ -104,6 +104,19 @@ public abstract class FileSystem extends
   private Set<Path> deleteOnExit = new TreeSet<Path>();
   
   /**
+   * This method adds a file system for testing so that we can find it later. 
It
+   * is only for testing.
+   * @param uri the uri to store it under
+   * @param conf the configuration to store it under
+   * @param fs the file system to store
+   * @throws IOException
+   */
+  static void addFileSystemForTesting(URI uri, Configuration conf,
+      FileSystem fs) throws IOException {
+    CACHE.map.put(new Cache.Key(uri, conf), fs);
+  }
+
+  /**
    * Get a filesystem instance based on the uri, the passed
    * configuration and the user
    * @param uri

Modified: 
hadoop/common/trunk/src/test/core/org/apache/hadoop/fs/FileSystemTestHelper.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/src/test/core/org/apache/hadoop/fs/FileSystemTestHelper.java?rev=1034184&r1=1034183&r2=1034184&view=diff
==============================================================================
--- 
hadoop/common/trunk/src/test/core/org/apache/hadoop/fs/FileSystemTestHelper.java
 (original)
+++ 
hadoop/common/trunk/src/test/core/org/apache/hadoop/fs/FileSystemTestHelper.java
 Thu Nov 11 22:34:52 2010
@@ -20,8 +20,10 @@ package org.apache.hadoop.fs;
 import java.io.DataInputStream;
 import java.io.IOException;
 import java.io.FileNotFoundException;
+import java.net.URI;
 
 
+import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.io.IOUtils;
 import org.junit.Assert;
 
@@ -40,6 +42,11 @@ public final class FileSystemTestHelper 
   /** Hidden constructor */
   private FileSystemTestHelper() {}
   
+  public static void addFileSystemForTesting(URI uri, Configuration conf,
+      FileSystem fs) throws IOException {
+    FileSystem.addFileSystemForTesting(uri, conf, fs);
+  }
+  
   public static int getDefaultBlockSize() {
     return DEFAULT_BLOCK_SIZE;
   }