HADOOP-18508. Tune ITestS3AEncryptionSSEC

-always create base dir at the start of each test
-use methodPath()
-remove final relics of s3guard comments/qualifiers
-remove parameterization on directory marker retention,
 the default of "keep" stresses the trickiest bit
 of the code as it leaves more markers around.

Change-Id: Ib1fa2940116170bd5d00375ab51ed582f8cad1f6

Author: steveloughran

hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/ITestS3AEncryptionSSEC.java

@@ -20,13 +20,9 @@
 
 import java.io.IOException;
 import java.nio.file.AccessDeniedException;
-import java.util.Arrays;
-import java.util.Collection;
 
 import org.assertj.core.api.Assertions;
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
 
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FileSystem;
@@ -37,15 +33,11 @@
 
 import static org.apache.hadoop.fs.contract.ContractTestUtils.dataset;
 import static org.apache.hadoop.fs.contract.ContractTestUtils.touch;
-import static org.apache.hadoop.fs.s3a.Constants.DIRECTORY_MARKER_POLICY;
-import static org.apache.hadoop.fs.s3a.Constants.DIRECTORY_MARKER_POLICY_DELETE;
-import static org.apache.hadoop.fs.s3a.Constants.DIRECTORY_MARKER_POLICY_KEEP;
 import static org.apache.hadoop.fs.s3a.Constants.ETAG_CHECKSUM_ENABLED;
 import static org.apache.hadoop.fs.s3a.Constants.S3_ENCRYPTION_ALGORITHM;
 import static org.apache.hadoop.fs.s3a.Constants.S3_ENCRYPTION_KEY;
 import static org.apache.hadoop.fs.s3a.Constants.SERVER_SIDE_ENCRYPTION_ALGORITHM;
 import static org.apache.hadoop.fs.s3a.Constants.SERVER_SIDE_ENCRYPTION_KEY;
-import static org.apache.hadoop.fs.s3a.S3ATestUtils.createTestPath;
 import static org.apache.hadoop.fs.s3a.S3ATestUtils.getTestBucketName;
 import static org.apache.hadoop.fs.s3a.S3ATestUtils.maybeSkipRootTests;
 import static org.apache.hadoop.fs.s3a.S3ATestUtils.removeBaseAndBucketOverrides;
@@ -59,7 +51,6 @@
  * Equally "vexing" has been the optimizations of getFileStatus(), wherein
  * LIST comes before HEAD path + /
  */
-@RunWith(Parameterized.class)
 public class ITestS3AEncryptionSSEC extends AbstractTestS3AEncryption {
 
   private static final String SERVICE_AMAZON_S3_STATUS_CODE_403
@@ -74,31 +65,11 @@ public class ITestS3AEncryptionSSEC extends AbstractTestS3AEncryption {
       = "msdo3VvvZznp66Gth58a91Hxe/UpExMkwU9BHkIjfW8=";
   private static final int TEST_FILE_LEN = 2048;
 
-  /**
-   * Parameterization.
-   */
-  @Parameterized.Parameters(name = "{0}")
-  public static Collection<Object[]> params() {
-    return Arrays.asList(new Object[][]{
-        {"keep-markers", true},
-        {"delete-markers", false}
-    });
-  }
-
-  /**
-   * Parameter: should directory markers be retained?
-   */
-  private final boolean keepMarkers;
-
   /**
    * Filesystem created with a different key.
    */
   private S3AFileSystem fsKeyB;
 
-  public ITestS3AEncryptionSSEC(final String name,
-      final boolean keepMarkers) {
-    this.keepMarkers = keepMarkers;
-  }
 
   @SuppressWarnings("deprecation")
   @Override
@@ -107,16 +78,11 @@ protected Configuration createConfiguration() {
     String bucketName = getTestBucketName(conf);
     // directory marker options
     removeBaseAndBucketOverrides(bucketName, conf,
-        DIRECTORY_MARKER_POLICY,
         ETAG_CHECKSUM_ENABLED,
         S3_ENCRYPTION_ALGORITHM,
         S3_ENCRYPTION_KEY,
         SERVER_SIDE_ENCRYPTION_ALGORITHM,
         SERVER_SIDE_ENCRYPTION_KEY);
-    conf.set(DIRECTORY_MARKER_POLICY,
-        keepMarkers
-            ? DIRECTORY_MARKER_POLICY_KEEP
-            : DIRECTORY_MARKER_POLICY_DELETE);
     conf.set(S3_ENCRYPTION_ALGORITHM,
         getSSEAlgorithm().getMethod());
     conf.set(S3_ENCRYPTION_KEY, KEY_1);
@@ -156,7 +122,7 @@ public void testCreateFileAndReadWithDifferentEncryptionKey() throws
         () -> {
           int len = TEST_FILE_LEN;
           describe("Create an encrypted file of size " + len);
-          Path src = path("testCreateFileAndReadWithDifferentEncryptionKey");
+          Path src = methodPath();
           writeThenReadFile(src, len);
 
           //extract the test FS
@@ -176,7 +142,7 @@ public void testCreateFileAndReadWithDifferentEncryptionKey() throws
    */
   @Test
   public void testCreateSubdirWithDifferentKey() throws Exception {
-    Path base = path("testCreateSubdirWithDifferentKey");
+    Path base = methodPath();
     Path nestedDirectory = new Path(base, "nestedDir");
     fsKeyB = createNewFileSystemWithSSECKey(
         KEY_2);
@@ -215,9 +181,10 @@ public void testCreateFileThenMoveWithDifferentSSECKey() throws Exception {
    */
   @Test
   public void testRenameFile() throws Exception {
-    Path src = path("original-path.txt");
+    final Path base = methodPath();
+    Path src = new Path(base, "original-path.txt");
     writeThenReadFile(src, TEST_FILE_LEN);
-    Path newPath = path("different-path.txt");
+    Path newPath = new Path(base, "different-path.txt");
     getFileSystem().rename(src, newPath);
     byte[] data = dataset(TEST_FILE_LEN, 'a', 'z');
     ContractTestUtils.verifyFileContents(getFileSystem(), newPath, data);
@@ -230,11 +197,11 @@ public void testRenameFile() throws Exception {
   @Test
   public void testListEncryptedDir() throws Exception {
 
-    Path pathABC = path("testListEncryptedDir/a/b/c/");
+    Path pathABC = new Path(methodPath(), "a/b/c/");
     Path pathAB = pathABC.getParent();
     Path pathA = pathAB.getParent();
 
-    Path nestedDirectory = createTestPath(pathABC);
+    Path nestedDirectory = pathABC;
     assertTrue(getFileSystem().mkdirs(nestedDirectory));
 
     fsKeyB = createNewFileSystemWithSSECKey(KEY_4);
@@ -263,7 +230,7 @@ public void testListEncryptedDir() throws Exception {
   @Test
   public void testListStatusEncryptedDir() throws Exception {
 
-    Path pathABC = path("testListStatusEncryptedDir/a/b/c/");
+    Path pathABC = new Path(methodPath(), "a/b/c/");
     Path pathAB = pathABC.getParent();
     Path pathA = pathAB.getParent();
     assertTrue(getFileSystem().mkdirs(pathABC));
@@ -298,7 +265,7 @@ public void testListStatusEncryptedDir() throws Exception {
    */
   @Test
   public void testListStatusEncryptedFile() throws Exception {
-    Path pathABC = path("testListStatusEncryptedFile/a/b/c/");
+    Path pathABC = new Path(methodPath(), "a/b/c/");
     assertTrue("mkdirs failed", getFileSystem().mkdirs(pathABC));
 
     Path fileToStat = new Path(pathABC, "fileToStat.txt");
@@ -307,23 +274,9 @@ public void testListStatusEncryptedFile() throws Exception {
     fsKeyB = createNewFileSystemWithSSECKey(KEY_4);
 
     //Until this point, no exception is thrown about access
-    if (statusProbesCheckS3(fsKeyB, fileToStat)) {
-      intercept(AccessDeniedException.class,
-          SERVICE_AMAZON_S3_STATUS_CODE_403,
-          () -> fsKeyB.listStatus(fileToStat));
-    } else {
-      fsKeyB.listStatus(fileToStat);
-    }
-  }
-
-  /**
-   * Do file status probes check S3?
-   * @param fs filesystem
-   * @param path file path
-   * @return true if check for a path being a file will issue a HEAD request.
-   */
-  private boolean statusProbesCheckS3(S3AFileSystem fs, Path path) {
-    return true;
+    intercept(AccessDeniedException.class,
+        SERVICE_AMAZON_S3_STATUS_CODE_403,
+        () -> fsKeyB.listStatus(fileToStat));
   }
 
   /**
@@ -334,22 +287,17 @@ private boolean statusProbesCheckS3(S3AFileSystem fs, Path path) {
    */
   @Test
   public void testDeleteEncryptedObjectWithDifferentKey() throws Exception {
-    //requireUnguardedFilesystem();
-    Path pathABC = path("testDeleteEncryptedObjectWithDifferentKey/a/b/c/");
 
+    Path pathABC = new Path(methodPath(), "a/b/c/");
     Path pathAB = pathABC.getParent();
     Path pathA = pathAB.getParent();
     assertTrue(getFileSystem().mkdirs(pathABC));
     Path fileToDelete = new Path(pathABC, "filetobedeleted.txt");
     writeThenReadFile(fileToDelete, TEST_FILE_LEN);
     fsKeyB = createNewFileSystemWithSSECKey(KEY_4);
-    if (statusProbesCheckS3(fsKeyB, fileToDelete)) {
-      intercept(AccessDeniedException.class,
-          SERVICE_AMAZON_S3_STATUS_CODE_403,
-          () -> fsKeyB.delete(fileToDelete, false));
-    } else {
-      fsKeyB.delete(fileToDelete, false);
-    }
+    intercept(AccessDeniedException.class,
+        SERVICE_AMAZON_S3_STATUS_CODE_403,
+        () -> fsKeyB.delete(fileToDelete, false));
     //This is possible
     fsKeyB.delete(pathABC, true);
     fsKeyB.delete(pathAB, true);
@@ -362,7 +310,7 @@ public void testDeleteEncryptedObjectWithDifferentKey() throws Exception {
    */
   @Test
   public void testChecksumRequiresReadAccess() throws Throwable {
-    Path path = path("tagged-file");
+    Path path = methodPath();
     S3AFileSystem fs = getFileSystem();
     touch(fs, path);
     Assertions.assertThat(fs.getFileChecksum(path))