Modified tests

Author: rajdchak

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

@@ -205,61 +205,4 @@ public void testInvalidConfigurationThrows() throws Exception {
         () -> S3SeekableInputStreamConfiguration.fromConfiguration(connectorConfiguration));
   }
 
-  /**
-   * This test verifies that the OpenStreamInfo object contains correct encryption
-   * settings when reading an SSEC encrypted file with analytics stream.
-   *
-   * @throws Exception
-   */
-
-  @Test
-  public void testAnalyticsStreamOpenStreamInfoWhenSSECEncryptionEnabled() throws Exception {
-    Configuration confSSEC = this.createConfiguration();
-    S3ATestUtils.disableFilesystemCaching(confSSEC);
-    removeBaseAndBucketOverrides(getTestBucketName(confSSEC), confSSEC, S3_ENCRYPTION_ALGORITHM, S3_ENCRYPTION_KEY);
-
-    confSSEC.set(S3_ENCRYPTION_ALGORITHM, S3AEncryptionMethods.SSE_C.getMethod());
-    confSSEC.set(S3_ENCRYPTION_KEY, SSEC_KEY);
-
-    S3AContract contractSSEC = (S3AContract) createContract(confSSEC);
-    contractSSEC.init();
-    contractSSEC.setConf(confSSEC);
-    S3AFileSystem fileSystemSSEC = (S3AFileSystem) contractSSEC.getTestFileSystem();
-
-    int len = TEST_FILE_LEN;
-    describe("Create an encrypted file and verify OpenStreamInfo encryption settings");
-    Path src = methodPath();
-    byte[] data = dataset(len, 'a', 'z');
-    writeDataset(fileSystemSSEC, src, data, len, 1024 * 1024, true);
-    // Read with encryption settings
-    OpenStreamInformation originalInfo;
-    try (FSDataInputStream in = fileSystemSSEC.open(src)) {
-      AnalyticsStream s3AInputStream = (AnalyticsStream) in.getWrappedStream();
-      Field inputStreamField = s3AInputStream.getClass().getDeclaredField("inputStream");
-      inputStreamField.setAccessible(true);
-      S3SeekableInputStream seekableInputStream = (S3SeekableInputStream) inputStreamField.get(s3AInputStream);
-
-      Field logicalIOField = seekableInputStream.getClass().getDeclaredField("logicalIO");
-      logicalIOField.setAccessible(true);
-      Object logicalIO = logicalIOField.get(seekableInputStream);
-
-      Field physicalIOField = logicalIO.getClass().getDeclaredField("physicalIO");
-      physicalIOField.setAccessible(true);
-      Object physicalIO = physicalIOField.get(logicalIO);
-
-      Field openStreamInfoField = physicalIO.getClass().getDeclaredField("openStreamInformation");
-      openStreamInfoField.setAccessible(true);
-      originalInfo = (OpenStreamInformation) openStreamInfoField.get(physicalIO);
-
-      // Verify the OpenStreamInfo object exists
-      assertNotNull(originalInfo.getEncryptionSecrets().getSsecCustomerKey().get(), "OpenStreamInfo should not be null");
-      assertEquals(SSEC_KEY, originalInfo.getEncryptionSecrets().getSsecCustomerKey().get());
-    }
-
-    // Clean up
-    fileSystemSSEC.delete(src, false);
-  }
-
-
-
 }

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

@@ -40,6 +40,7 @@
 import static org.apache.hadoop.fs.s3a.Constants.SERVER_SIDE_ENCRYPTION_KEY;
 
 import static org.apache.hadoop.fs.s3a.S3ATestUtils.assumeStoreAwsHosted;
+import static org.apache.hadoop.fs.s3a.S3ATestUtils.enableAnalyticsAccelerator;
 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;
@@ -324,6 +325,65 @@ public void testChecksumRequiresReadAccess() throws Throwable {
         () -> fsKeyB.getFileChecksum(path));
   }
 
+
+  /**
+   * Tests the creation and reading of a file using a different encryption key
+   * when Analytics Accelerator is enabled.
+   *
+   * @throws Exception if any error occurs during the test execution
+   */
+  @Test
+  public void testCreateFileAndReadWithDifferentEncryptionKeyWithAnalyticsAcceleratorEnabled() throws Exception {
+    enableAnalyticsAccelerator(getConfiguration());
+    testCreateFileAndReadWithDifferentEncryptionKey();
+  }
+
+  /**
+   * Tests the creation and movement of a file using a different SSE-C key
+   * when Analytics Accelerator is enabled.
+   *
+   * @throws Exception if any error occurs during the test execution
+   */
+  @Test
+  public void testCreateFileThenMoveWithDifferentSSECKeyWithAnalyticsAcceleratorEnabled() throws Exception {
+    enableAnalyticsAccelerator(getConfiguration());
+    testCreateFileThenMoveWithDifferentSSECKey();
+  }
+
+  /**
+   * Tests create and file rename operation when Analytics Accelerator is enabled.
+   *
+   * @throws Exception if any error occurs during the test execution
+   */
+  @Test
+  public void testCreateFileAndRenameFileWithAnalyticsAcceleratorEnabled() throws Exception {
+    enableAnalyticsAccelerator(getConfiguration());
+    testRenameFile();
+  }
+
+  /**
+   * Tests the creation and listing of encrypted files when Analytics Accelerator is enabled.
+   *
+   * @throws Exception if any error occurs during the test execution
+   */
+  @Test
+  public void testCreateFileAndListStatusEncryptedFileWithAnalyticsAcceleratorEnabled() throws Exception {
+    enableAnalyticsAccelerator(getConfiguration());
+    testListStatusEncryptedFile();
+  }
+
+  /**
+   * Tests the creation and deletion of an encrypted object using a different key
+   * when Analytics Accelerator is enabled.t.
+   *
+   * @throws Exception if any error occurs during the test execution
+   */
+  @Test
+  public void testCreateFileAndDeleteEncryptedObjectWithDifferentKeyWithAnalyticsAcceleratorEnabled() throws Exception {
+    enableAnalyticsAccelerator(getConfiguration());
+    testDeleteEncryptedObjectWithDifferentKey();
+  }
+
   private S3AFileSystem createNewFileSystemWithSSECKey(String sseCKey) throws
       IOException {
     Configuration conf = this.createConfiguration();