You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by rl...@apache.org on 2015/04/11 00:13:53 UTC
ambari git commit: AMBARI-10447. Unit tests fail due to Java 1.7 code
- java.nio.file.* (rlevas)
Repository: ambari
Updated Branches:
refs/heads/branch-2.0.maint 96c6ccad1 -> 1f569fb9b
AMBARI-10447. Unit tests fail due to Java 1.7 code - java.nio.file.* (rlevas)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/1f569fb9
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1f569fb9
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1f569fb9
Branch: refs/heads/branch-2.0.maint
Commit: 1f569fb9ba711b7ccbfc174c71fda68d29eac81d
Parents: 96c6cca
Author: Robert Levas <rl...@hortonworks.com>
Authored: Fri Apr 10 18:13:41 2015 -0400
Committer: Robert Levas <rl...@hortonworks.com>
Committed: Fri Apr 10 18:14:16 2015 -0400
----------------------------------------------------------------------
.../CreateKeytabFilesServerActionTest.java | 47 +++-----------------
1 file changed, 6 insertions(+), 41 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/1f569fb9/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/CreateKeytabFilesServerActionTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/CreateKeytabFilesServerActionTest.java b/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/CreateKeytabFilesServerActionTest.java
index d2252a9..bbde8e0 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/CreateKeytabFilesServerActionTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/CreateKeytabFilesServerActionTest.java
@@ -24,11 +24,6 @@ import org.junit.Test;
import org.junit.rules.TemporaryFolder;
import java.io.File;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.nio.file.attribute.PosixFilePermission;
-import java.util.Set;
public class CreateKeytabFilesServerActionTest {
@@ -37,32 +32,15 @@ public class CreateKeytabFilesServerActionTest {
@Test
public void testEnsureAmbariOnlyAccess() throws Exception {
- Path path;
- Set<PosixFilePermission> permissions;
-
File directory = testFolder.newFolder();
Assert.assertNotNull(directory);
new CreateKeytabFilesServerAction().ensureAmbariOnlyAccess(directory);
// The directory is expected to have the following permissions: rwx------ (700)
- path = Paths.get(directory.getAbsolutePath());
- Assert.assertNotNull(path);
-
- permissions = Files.getPosixFilePermissions(path);
- Assert.assertNotNull(permissions);
-
- Assert.assertNotNull(permissions);
- Assert.assertEquals(3, permissions.size());
- Assert.assertTrue(permissions.contains(PosixFilePermission.OWNER_READ));
- Assert.assertTrue(permissions.contains(PosixFilePermission.OWNER_WRITE));
- Assert.assertTrue(permissions.contains(PosixFilePermission.OWNER_EXECUTE));
- Assert.assertFalse(permissions.contains(PosixFilePermission.GROUP_READ));
- Assert.assertFalse(permissions.contains(PosixFilePermission.GROUP_WRITE));
- Assert.assertFalse(permissions.contains(PosixFilePermission.GROUP_EXECUTE));
- Assert.assertFalse(permissions.contains(PosixFilePermission.OTHERS_READ));
- Assert.assertFalse(permissions.contains(PosixFilePermission.OTHERS_WRITE));
- Assert.assertFalse(permissions.contains(PosixFilePermission.OTHERS_EXECUTE));
+ Assert.assertTrue(directory.canRead());
+ Assert.assertTrue(directory.canWrite());
+ Assert.assertTrue(directory.canExecute());
File file = File.createTempFile("temp_", "", directory);
Assert.assertNotNull(file);
@@ -71,21 +49,8 @@ public class CreateKeytabFilesServerActionTest {
new CreateKeytabFilesServerAction().ensureAmbariOnlyAccess(file);
// The file is expected to have the following permissions: rw------- (600)
- path = Paths.get(file.getAbsolutePath());
- Assert.assertNotNull(path);
-
- permissions = Files.getPosixFilePermissions(path);
- Assert.assertNotNull(permissions);
-
- Assert.assertEquals(2, permissions.size());
- Assert.assertTrue(permissions.contains(PosixFilePermission.OWNER_READ));
- Assert.assertTrue(permissions.contains(PosixFilePermission.OWNER_WRITE));
- Assert.assertFalse(permissions.contains(PosixFilePermission.OWNER_EXECUTE));
- Assert.assertFalse(permissions.contains(PosixFilePermission.GROUP_READ));
- Assert.assertFalse(permissions.contains(PosixFilePermission.GROUP_WRITE));
- Assert.assertFalse(permissions.contains(PosixFilePermission.GROUP_EXECUTE));
- Assert.assertFalse(permissions.contains(PosixFilePermission.OTHERS_READ));
- Assert.assertFalse(permissions.contains(PosixFilePermission.OTHERS_WRITE));
- Assert.assertFalse(permissions.contains(PosixFilePermission.OTHERS_EXECUTE));
+ Assert.assertTrue(file.canRead());
+ Assert.assertTrue(file.canWrite());
+ Assert.assertFalse(file.canExecute());
}
}
\ No newline at end of file