Merge branch 'master' into snapshot

Author: jayunit100

pom.xml

@@ -18,6 +18,16 @@
       <artifactId>hadoop-core</artifactId>
       <version>0.20.2</version>
     </dependency>
+    <dependency>
+      <groupId>org.apache.hadoop</groupId>
+      <artifactId>hadoop-common-test</artifactId>
+      <version>0.22.0</version>
+	</dependency>
+	<dependency>
+	   <groupId>org.apache.hadoop</groupId>
+	   <artifactId>hadoop-test</artifactId>
+	   <version>1.0.0</version>
+	</dependency>
     <dependency>
 	    <groupId>org.slf4j</groupId>
 	    <artifactId>slf4j-api</artifactId>

src/test/java/org/gluster/test/GFSUtil.java

@@ -61,7 +61,8 @@ public static Configuration initializeConfig(File mount, boolean automount) thro
         conf.set("fs.glusterfs.mount", mount.getAbsolutePath());
         conf.set("fs.glusterfs.server", glusterHost);
         conf.set("fs.default.name", "glusterfs://"+glusterHost+":9000");
-
+        //Not necessary - but for 1.0 might be.
+        conf.set("fs.glusterfs.impl", "org.apache.hadoop.fs.glusterfs.GlusterFileSystem");
         return conf;
     }
 
@@ -91,10 +92,7 @@ public static File initializeMounts(File tempDirectory) throws Exception {
      */
     static GlusterFileSystem gfs ;
 
-    /**
-     * Use this method to create a new instance of a gluster file system class.
-     */
-    public static GlusterFileSystem create(boolean automount) throws Exception{
+    public static Configuration createConfiguration(boolean automount) throws Exception{
         if(gfs != null){
             gfs.close();
         }
@@ -105,7 +103,14 @@ public static GlusterFileSystem create(boolean automount) throws Exception{
 
         //Now set up the config object, with automount=true
         final Configuration conf = initializeConfig(mount,automount);
-        
+        return conf;
+    }
+    /**
+     * Use this method to create a new instance of a gluster file system class.
+     */
+    public static GlusterFileSystem create(boolean automount) throws Exception{
+
+        Configuration conf = createConfiguration(automount);
         //Initialize GlusterFileSystem
         gfs.initialize(getTempDirectory().toURI(), conf);
 

src/test/java/org/gluster/test/TestFSMainOperationsGlusterFileSystem.java

@@ -0,0 +1,48 @@
+package org.gluster.test;
+
+import java.io.IOException;
+
+import junit.framework.Assert;
+
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.FSMainOperationsBaseTest;
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.FileSystemTestHelper;
+import org.apache.hadoop.fs.Path;
+import org.apache.tools.ant.util.FileUtils;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.Test;
+
+public class TestFSMainOperationsGlusterFileSystem extends FSMainOperationsBaseTest {
+
+  @Before
+  public void setUp() throws Exception {
+    fSys =GFSUtil.create(true);
+    super.setUp();
+  }
+
+  static Path wd = null;
+  protected Path getDefaultWorkingDirectory() throws IOException {
+    if (wd == null)
+      wd = fSys.getWorkingDirectory();
+    return wd;
+  }
+
+  @After
+  public void tearDown() throws Exception {
+      fSys.close();
+      FileUtils.delete(GFSUtil.getTempDirectory());
+  }
+
+  @Test
+  @Override
+  public void testWDAbsolute() throws IOException {
+    Path absoluteDir = FileSystemTestHelper.getTestRootPath(fSys,
+        "test/existingDir");
+    fSys.mkdirs(absoluteDir);
+    fSys.setWorkingDirectory(absoluteDir);
+    Assert.assertEquals(absoluteDir, fSys.getWorkingDirectory());
+  }
+}

src/test/java/org/gluster/test/TestGlusterFileBlockLocations.java

@@ -0,0 +1,26 @@
+package org.gluster.test;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.TestGetFileBlockLocations;
+
+public class TestGlusterFileBlockLocations extends TestGetFileBlockLocations{
+
+    @Override
+    protected void setUp() throws IOException{
+        try{
+            Configuration cfg = GFSUtil.createConfiguration(true);
+            cfg.writeXml(new FileOutputStream(new File("/tmp/core-site.xml")));
+            Configuration.addDefaultResource("/tmp/core-site.xml");
+            cfg.writeXml(System.out);
+        }
+        catch(Exception e)
+        {
+            throw new IOException(e);
+        }
+        super.setUp();
+    }
+}

src/test/java/org/gluster/test/TestGlusterFileSystemContract.java

@@ -0,0 +1,96 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *  
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *  
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package org.gluster.test;
+
+import java.io.IOException;
+
+import org.apache.hadoop.fs.FileSystemContractBaseTest;
+import org.slf4j.LoggerFactory;
+
+/**
+ * This is the full filesystem contract test -which requires the
+ * Default config set up to point to a filesystem
+ */
+public class TestGlusterFileSystemContract
+  extends FileSystemContractBaseTest {
+  private static final org.slf4j.Logger LOG = LoggerFactory.getLogger(TestGlusterFileSystemContract.class);
+
+  @Override
+  protected void setUp() throws Exception{
+      fs=GFSUtil.create(true);
+      super.setUp();
+  }
+
+    /**
+     * junit.framework.AssertionFailedError: Rename result expected:<false> but was:<true>
+     */
+    @Override
+    public void testRenameFileAsExistingFile() throws Exception{
+        super.testRenameFileAsExistingFile();
+    }
+
+    /**
+     * java.lang.RuntimeException: org.apache.hadoop.util.Shell$ExitCodeException: chmod: cannot access `/tmp/gluster-test-mount-point/mount/test/hadoop/file/subdir': Not a directory
+     */
+    @Override
+    public void testMkdirsFailsForSubdirectoryOfExistingFile() throws Exception{
+        super.testMkdirsFailsForSubdirectoryOfExistingFile();
+    }
+
+    /**
+     * java.io.IOException: Stream closed.
+     */
+    @Override
+    public void testOutputStreamClosedTwice() throws IOException{
+        super.testOutputStreamClosedTwice();
+    }
+ 
+    /**
+     * junit.framework.AssertionFailedError: Rename result expected:<false> but was:<true>  
+     */
+    @Override
+    public void testListStatusThrowsExceptionForNonExistentFile() throws Exception{
+        super.testListStatusThrowsExceptionForNonExistentFile();
+    }
+
+    /**
+     * junit.framework.AssertionFailedError: expected:<file://null/user/root> but was:</tmp/gluster-test-mount-point/mount>
+     */
+    @Override
+    public void testWorkingDirectory() throws Exception{
+        super.testWorkingDirectory();
+    }
+
+    /**
+     * AssertionFailedError: null
+     */
+    @Override
+    public void testMkdirs() throws Exception{
+        super.testMkdirs();
+    }
+
+    /**
+    java.lang.NoSuchMethodError: org.apache.hadoop.fs.FileSystem.getStatus()Lorg/apache/hadoop/fs/FsStatus;
+     */
+    @Override
+    public void testFsStatus() throws Exception{
+        super.testFsStatus();
+    }
+    
+}