diff --git a/itests/hive-unit-hadoop2/src/test/java/org/apache/hadoop/hive/ql/security/TestExtendedAcls.java b/itests/hive-unit-hadoop2/src/test/java/org/apache/hadoop/hive/ql/security/TestExtendedAcls.java index fc5bb8a..d846a63 100644 --- a/itests/hive-unit-hadoop2/src/test/java/org/apache/hadoop/hive/ql/security/TestExtendedAcls.java +++ b/itests/hive-unit-hadoop2/src/test/java/org/apache/hadoop/hive/ql/security/TestExtendedAcls.java @@ -34,6 +34,7 @@ import org.junit.Assert; import org.junit.BeforeClass; +import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; public class TestExtendedAcls extends FolderPermissionBase { @@ -46,7 +47,7 @@ public static void setup() throws Exception { baseSetup(); } - List aclSpec1 = Lists.newArrayList( + private final ImmutableList aclSpec1 = ImmutableList.of( aclEntry(ACCESS, USER, FsAction.ALL), aclEntry(ACCESS, GROUP, FsAction.ALL), aclEntry(ACCESS, OTHER, FsAction.ALL), @@ -55,7 +56,7 @@ public static void setup() throws Exception { aclEntry(ACCESS, GROUP, "bar", FsAction.READ_WRITE), aclEntry(ACCESS, GROUP, "foo", FsAction.READ_EXECUTE)); - List aclSpec2 = Lists.newArrayList( + private final ImmutableList aclSpec2 = ImmutableList.of( aclEntry(ACCESS, USER, FsAction.ALL), aclEntry(ACCESS, GROUP, FsAction.ALL), aclEntry(ACCESS, OTHER, FsAction.READ_EXECUTE), @@ -83,20 +84,20 @@ public void verifyPermission(String locn, int permIndex) throws Exception { switch (permIndex) { case 0: FsPermission perm = fs.getFileStatus(new Path(locn)).getPermission(); - Assert.assertEquals(perm.toString(), "rwxrwxrwx"); + Assert.assertEquals("Location: " + locn, "rwxrwxrwx", String.valueOf(perm)); List actual = getAcl(locn); verifyAcls(aclSpec1, actual); break; case 1: perm = fs.getFileStatus(new Path(locn)).getPermission(); - Assert.assertEquals(perm.toString(), "rwxrwxr-x"); + Assert.assertEquals("Location: " + locn, "rwxrwxr-x", String.valueOf(perm)); List acls = getAcl(locn); verifyAcls(aclSpec2, acls); break; default: - throw new RuntimeException("Only 2 permissions by this test"); + throw new RuntimeException("Only 2 permissions by this test: " + permIndex); } } diff --git a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/security/FolderPermissionBase.java b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/security/FolderPermissionBase.java index fb6d526..7f8ca87 100644 --- a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/security/FolderPermissionBase.java +++ b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/security/FolderPermissionBase.java @@ -52,7 +52,7 @@ protected static Path warehouseDir; protected static Path baseDfsDir; - public static final PathFilter hiddenFileFilter = new PathFilter(){ + protected static final PathFilter hiddenFileFilter = new PathFilter(){ public boolean accept(Path p){ String name = p.getName(); return !name.startsWith("_") && !name.startsWith("."); @@ -591,7 +591,7 @@ private void assertExistence(String locn) throws Exception { private List listStatus(String locn) throws Exception { List results = new ArrayList(); - FileStatus[] listStatus = fs.listStatus(new Path(locn)); + FileStatus[] listStatus = fs.listStatus(new Path(locn), hiddenFileFilter); for (FileStatus status : listStatus) { results.add(status.getPath().toString()); }