Address the comments to change the UT

Change-Id: Ib9ac4be0a896531a529c260197431df1c3adf77a

Author: jerryshao

core/src/test/scala/org/apache/spark/deploy/SparkHadoopUtilSuite.scala

@@ -0,0 +1,83 @@
+/*
+ * 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.apache.spark.deploy
+
+import org.apache.hadoop.fs.FileStatus
+import org.apache.hadoop.fs.permission.{FsAction, FsPermission}
+import org.apache.hadoop.security.UserGroupInformation
+import org.scalatest.Matchers
+
+import org.apache.spark.SparkFunSuite
+
+class SparkHadoopUtilSuite extends SparkFunSuite with Matchers {
+  test("check file permission") {
+    import FsAction._
+    val user = UserGroupInformation.getCurrentUser.getShortUserName
+    val groups = UserGroupInformation.getCurrentUser.getGroupNames
+    require(!groups.isEmpty)
+    val sparkHadoopUtil = new SparkHadoopUtil
+
+    // If file is owned by user and user has access permission
+    var status = fileStatus(user, groups.head, READ_WRITE, READ_WRITE, NONE)
+    sparkHadoopUtil.checkAccessPermission(status, READ) should be (true)
+    sparkHadoopUtil.checkAccessPermission(status, WRITE) should be (true)
+
+    // If file is owned by user but user has no access permission
+    status = fileStatus(user, groups.head, NONE, READ_WRITE, NONE)
+    sparkHadoopUtil.checkAccessPermission(status, READ) should be (false)
+    sparkHadoopUtil.checkAccessPermission(status, WRITE) should be (false)
+
+    // If file is owned by user's group and user's group has access permission
+    status = fileStatus("test", groups.head, NONE, READ_WRITE, NONE)
+    sparkHadoopUtil.checkAccessPermission(status, READ) should be (true)
+    sparkHadoopUtil.checkAccessPermission(status, WRITE) should be (true)
+
+    // If file is owned by user's group but user's group has no access permission
+    status = fileStatus("test", groups.head, READ_WRITE, NONE, NONE)
+    sparkHadoopUtil.checkAccessPermission(status, READ) should be (false)
+    sparkHadoopUtil.checkAccessPermission(status, WRITE) should be (false)
+
+    // If file is owned by other user and this user has access permission
+    status = fileStatus("test", "test", READ_WRITE, READ_WRITE, READ_WRITE)
+    sparkHadoopUtil.checkAccessPermission(status, READ) should be (true)
+    sparkHadoopUtil.checkAccessPermission(status, WRITE) should be (true)
+
+    // If file is owned by other user but this user has no access permission
+    status = fileStatus("test", "test", READ_WRITE, READ_WRITE, NONE)
+    sparkHadoopUtil.checkAccessPermission(status, READ) should be (false)
+    sparkHadoopUtil.checkAccessPermission(status, WRITE) should be (false)
+  }
+
+  private def fileStatus(
+      owner: String,
+      group: String,
+      userAction: FsAction,
+      groupAction: FsAction,
+      otherAction: FsAction): FileStatus = {
+    new FileStatus(0L,
+      false,
+      0,
+      0L,
+      0L,
+      0L,
+      new FsPermission(userAction, groupAction, otherAction),
+      owner,
+      group,
+      null)
+  }
+}

core/src/test/scala/org/apache/spark/deploy/history/FsHistoryProviderSuite.scala

@@ -27,8 +27,7 @@ import scala.concurrent.duration._
 import scala.language.postfixOps
 
 import com.google.common.io.{ByteStreams, Files}
-import org.apache.hadoop.fs.{FileStatus, Path}
-import org.apache.hadoop.fs.permission.FsAction
+import org.apache.hadoop.fs.FileStatus
 import org.apache.hadoop.hdfs.DistributedFileSystem
 import org.json4s.jackson.JsonMethods._
 import org.mockito.Matchers.any
@@ -38,7 +37,6 @@ import org.scalatest.Matchers
 import org.scalatest.concurrent.Eventually._
 
 import org.apache.spark.{SecurityManager, SparkConf, SparkFunSuite}
-import org.apache.spark.deploy.SparkHadoopUtil
 import org.apache.spark.internal.Logging
 import org.apache.spark.io._
 import org.apache.spark.scheduler._
@@ -156,20 +154,7 @@ class FsHistoryProviderSuite extends SparkFunSuite with BeforeAndAfter with Matc
       SparkListenerApplicationStart("app1-2", Some("app1-2"), 1L, "test", None),
       SparkListenerApplicationEnd(2L)
       )
-
-    val path = new Path(logFile2.toURI)
-    val fs = path.getFileSystem(SparkHadoopUtil.get.conf)
-    val status = fs.getFileStatus(path)
-    SparkHadoopUtil.get.checkAccessPermission(status, FsAction.READ) should be (true)
-
     logFile2.setReadable(false, false)
-    val status1 = fs.getFileStatus(path)
-    SparkHadoopUtil.get.checkAccessPermission(status1, FsAction.READ) should be (false)
-
-    logFile2.setReadable(false, true)
-    val status2 = fs.getFileStatus(path)
-    SparkHadoopUtil.get.checkAccessPermission(status2, FsAction.READ) should be (false)
-
 
     updateAndCheck(provider) { list =>
       list.size should be (1)