This is an automated email from the ASF dual-hosted git repository.
ivandika3 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new b31b3cd71c9 HDDS-15752. Rename base tests and helpers for naming
convention in OM (#10672)
b31b3cd71c9 is described below
commit b31b3cd71c9b07434e131b4627be273aa66c0cfb
Author: Doroszlai, Attila <[email protected]>
AuthorDate: Thu Jul 9 03:28:26 2026 +0200
HDDS-15752. Rename base tests and helpers for naming convention in OM
(#10672)
---
.../bucket/{TestBucketRequest.java => BucketRequestTests.java} | 2 +-
.../hadoop/ozone/om/request/bucket/TestOMBucketCreateRequest.java | 2 +-
.../hadoop/ozone/om/request/bucket/TestOMBucketDeleteRequest.java | 2 +-
.../ozone/om/request/bucket/TestOMBucketSetPropertyRequest.java | 2 +-
.../ozone/om/request/bucket/acl/TestOMBucketAddAclRequest.java | 4 ++--
.../ozone/om/request/bucket/acl/TestOMBucketRemoveAclRequest.java | 4 ++--
.../ozone/om/request/bucket/acl/TestOMBucketSetAclRequest.java | 4 ++--
.../hadoop/ozone/om/request/file/TestOMFileCreateRequest.java | 4 ++--
.../hadoop/ozone/om/request/file/TestOMRecoverLeaseRequest.java | 4 ++--
.../request/key/{TestOMKeyRequest.java => OMKeyRequestTests.java} | 2 +-
.../hadoop/ozone/om/request/key/TestOMAllocateBlockRequest.java | 2 +-
.../om/request/key/TestOMDirectoriesPurgeRequestAndResponse.java | 2 +-
.../org/apache/hadoop/ozone/om/request/key/TestOMKeyAclRequest.java | 2 +-
.../apache/hadoop/ozone/om/request/key/TestOMKeyCommitRequest.java | 2 +-
.../apache/hadoop/ozone/om/request/key/TestOMKeyCreateRequest.java | 2 +-
.../apache/hadoop/ozone/om/request/key/TestOMKeyDeleteRequest.java | 2 +-
.../ozone/om/request/key/TestOMKeyPurgeRequestAndResponse.java | 2 +-
.../apache/hadoop/ozone/om/request/key/TestOMKeyRenameRequest.java | 2 +-
.../apache/hadoop/ozone/om/request/key/TestOMKeysDeleteRequest.java | 2 +-
.../apache/hadoop/ozone/om/request/key/TestOMKeysRenameRequest.java | 2 +-
.../hadoop/ozone/om/request/key/TestOMOpenKeysDeleteRequest.java | 2 +-
.../apache/hadoop/ozone/om/request/key/TestOMPrefixAclRequest.java | 2 +-
.../apache/hadoop/ozone/om/request/key/TestOMSetTimesRequest.java | 2 +-
.../{TestS3MultipartRequest.java => S3MultipartRequestTests.java} | 2 +-
.../s3/multipart/TestS3ExpiredMultipartUploadsAbortRequest.java | 2 +-
.../request/s3/multipart/TestS3InitiateMultipartUploadRequest.java | 2 +-
.../om/request/s3/multipart/TestS3MultipartUploadAbortRequest.java | 2 +-
.../s3/multipart/TestS3MultipartUploadCommitPartRequest.java | 2 +-
.../request/s3/multipart/TestS3MultipartUploadCompleteRequest.java | 2 +-
.../om/request/s3/tagging/TestS3DeleteBucketTaggingRequest.java | 4 ++--
.../om/request/s3/tagging/TestS3DeleteObjectTaggingRequest.java | 4 ++--
.../ozone/om/request/s3/tagging/TestS3PutBucketTaggingRequest.java | 4 ++--
.../ozone/om/request/s3/tagging/TestS3PutObjectTaggingRequest.java | 4 ++--
...legationTokenRequest.java => OMDelegationTokenRequestTests.java} | 2 +-
.../ozone/om/request/security/TestOMGetDelegationTokenRequest.java | 2 +-
.../ozone/om/request/snapshot/TestOMSnapshotCreateRequest.java | 4 ++--
.../ozone/om/request/snapshot/TestOMSnapshotDeleteRequest.java | 4 ++--
.../om/request/snapshot/TestOMSnapshotMoveTableKeysRequest.java | 4 ++--
.../om/request/snapshot/TestOMSnapshotPurgeRequestAndResponse.java | 4 ++--
.../ozone/om/request/snapshot/TestOMSnapshotRenameRequest.java | 4 ++--
.../snapshot/TestOMSnapshotSetPropertyRequestAndResponse.java | 4 ++--
.../hadoop/ozone/om/request/upgrade/TestOMCancelPrepareRequest.java | 4 ++--
.../volume/{TestOMVolumeRequest.java => OMVolumeRequestTests.java} | 2 +-
.../hadoop/ozone/om/request/volume/TestOMVolumeCreateRequest.java | 2 +-
.../hadoop/ozone/om/request/volume/TestOMVolumeDeleteRequest.java | 2 +-
.../hadoop/ozone/om/request/volume/TestOMVolumeSetOwnerRequest.java | 2 +-
.../hadoop/ozone/om/request/volume/TestOMVolumeSetQuotaRequest.java | 2 +-
.../ozone/om/request/volume/acl/TestOMVolumeAddAclRequest.java | 4 ++--
.../ozone/om/request/volume/acl/TestOMVolumeRemoveAclRequest.java | 4 ++--
.../ozone/om/request/volume/acl/TestOMVolumeSetAclRequest.java | 4 ++--
.../response/{TestOMResponseUtils.java => OMResponseTestUtils.java} | 4 ++--
.../hadoop/ozone/om/response/bucket/TestOMBucketCreateResponse.java | 4 ++--
.../hadoop/ozone/om/response/bucket/TestOMBucketDeleteResponse.java | 4 ++--
.../ozone/om/response/bucket/TestOMBucketSetPropertyResponse.java | 4 ++--
.../ozone/om/response/file/TestOMDirectoryCreateResponse.java | 4 ++--
.../om/response/file/TestOMDirectoryCreateResponseWithFSO.java | 4 ++--
.../key/{TestOMKeyResponse.java => OMKeyResponseTests.java} | 2 +-
.../hadoop/ozone/om/response/key/TestOMAllocateBlockResponse.java | 2 +-
.../hadoop/ozone/om/response/key/TestOMKeyCommitResponse.java | 2 +-
.../hadoop/ozone/om/response/key/TestOMKeyCreateResponse.java | 2 +-
.../hadoop/ozone/om/response/key/TestOMKeyDeleteResponse.java | 2 +-
.../hadoop/ozone/om/response/key/TestOMKeyRenameResponse.java | 2 +-
.../ozone/om/response/key/TestOMKeyRenameResponseWithFSO.java | 4 ++--
.../hadoop/ozone/om/response/key/TestOMKeysDeleteResponse.java | 2 +-
.../hadoop/ozone/om/response/key/TestOMKeysRenameResponse.java | 2 +-
.../hadoop/ozone/om/response/key/TestOMOpenKeysDeleteResponse.java | 2 +-
.../ozone/om/response/key/acl/prefix/TestOMPrefixAclResponse.java | 4 ++--
.../{TestS3MultipartResponse.java => S3MultipartResponseTests.java} | 2 +-
.../s3/multipart/TestS3ExpiredMultipartUploadsAbortResponse.java | 2 +-
.../s3/multipart/TestS3InitiateMultipartUploadResponse.java | 2 +-
.../response/s3/multipart/TestS3MultipartUploadAbortResponse.java | 2 +-
.../s3/multipart/TestS3MultipartUploadCommitPartResponse.java | 2 +-
.../s3/multipart/TestS3MultipartUploadCompleteResponse.java | 2 +-
.../om/response/s3/tagging/TestS3DeleteObjectTaggingResponse.java | 4 ++--
.../om/response/s3/tagging/TestS3PutObjectTaggingResponse.java | 4 ++--
...gationTokenResponse.java => OMDelegationTokenResponseTests.java} | 2 +-
.../om/response/security/TestOMGetDelegationTokenResponse.java | 2 +-
.../om/response/snapshot/TestOMSnapshotMoveTableKeysResponse.java | 4 ++--
.../{TestOMVolumeResponse.java => OMVolumeResponseTests.java} | 2 +-
.../hadoop/ozone/om/response/volume/TestOMVolumeCreateResponse.java | 2 +-
.../hadoop/ozone/om/response/volume/TestOMVolumeDeleteResponse.java | 2 +-
.../ozone/om/response/volume/TestOMVolumeSetOwnerResponse.java | 2 +-
.../ozone/om/response/volume/TestOMVolumeSetQuotaResponse.java | 2 +-
.../org/apache/hadoop/ozone/om/service/TestQuotaRepairTask.java | 4 ++--
...RequestAndResponse.java => SnapshotRequestAndResponseTests.java} | 6 +++---
85 files changed, 118 insertions(+), 118 deletions(-)
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/bucket/TestBucketRequest.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/bucket/BucketRequestTests.java
similarity index 99%
rename from
hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/bucket/TestBucketRequest.java
rename to
hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/bucket/BucketRequestTests.java
index 40f54be4cc0..0e97cb77b17 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/bucket/TestBucketRequest.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/bucket/BucketRequestTests.java
@@ -46,7 +46,7 @@
* Base test class for Bucket request.
*/
@SuppressWarnings("visibilityModifier")
-public class TestBucketRequest {
+public class BucketRequestTests {
@TempDir
private Path folder;
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/bucket/TestOMBucketCreateRequest.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/bucket/TestOMBucketCreateRequest.java
index 6fe196b7d86..96a60b647d2 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/bucket/TestOMBucketCreateRequest.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/bucket/TestOMBucketCreateRequest.java
@@ -59,7 +59,7 @@
/**
* Tests OMBucketCreateRequest class, which handles CreateBucket request.
*/
-public class TestOMBucketCreateRequest extends TestBucketRequest {
+public class TestOMBucketCreateRequest extends BucketRequestTests {
@Test
public void testPreExecute() throws Exception {
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/bucket/TestOMBucketDeleteRequest.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/bucket/TestOMBucketDeleteRequest.java
index 7ec39944817..210f8d305bb 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/bucket/TestOMBucketDeleteRequest.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/bucket/TestOMBucketDeleteRequest.java
@@ -44,7 +44,7 @@
/**
* Tests OMBucketDeleteRequest class which handles DeleteBucket request.
*/
-public class TestOMBucketDeleteRequest extends TestBucketRequest {
+public class TestOMBucketDeleteRequest extends BucketRequestTests {
@Test
public void testPreExecute() throws Exception {
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/bucket/TestOMBucketSetPropertyRequest.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/bucket/TestOMBucketSetPropertyRequest.java
index c7c27abeb6a..2e41d4c8b17 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/bucket/TestOMBucketSetPropertyRequest.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/bucket/TestOMBucketSetPropertyRequest.java
@@ -48,7 +48,7 @@
* Tests OMBucketSetPropertyRequest class which handles OMSetBucketProperty
* request.
*/
-public class TestOMBucketSetPropertyRequest extends TestBucketRequest {
+public class TestOMBucketSetPropertyRequest extends BucketRequestTests {
private static final String TEST_KEY = "key1";
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/bucket/acl/TestOMBucketAddAclRequest.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/bucket/acl/TestOMBucketAddAclRequest.java
index 51e7f306601..be3230bdbf3 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/bucket/acl/TestOMBucketAddAclRequest.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/bucket/acl/TestOMBucketAddAclRequest.java
@@ -26,7 +26,7 @@
import java.util.UUID;
import org.apache.hadoop.ozone.OzoneAcl;
import org.apache.hadoop.ozone.om.request.OMRequestTestUtils;
-import org.apache.hadoop.ozone.om.request.bucket.TestBucketRequest;
+import org.apache.hadoop.ozone.om.request.bucket.BucketRequestTests;
import org.apache.hadoop.ozone.om.response.OMClientResponse;
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos;
import
org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMRequest;
@@ -36,7 +36,7 @@
/**
* Tests bucket addAcl request.
*/
-public class TestOMBucketAddAclRequest extends TestBucketRequest {
+public class TestOMBucketAddAclRequest extends BucketRequestTests {
@Test
public void testPreExecute() throws Exception {
String volumeName = UUID.randomUUID().toString();
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/bucket/acl/TestOMBucketRemoveAclRequest.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/bucket/acl/TestOMBucketRemoveAclRequest.java
index 2888fbf0c39..7e572a452ac 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/bucket/acl/TestOMBucketRemoveAclRequest.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/bucket/acl/TestOMBucketRemoveAclRequest.java
@@ -26,7 +26,7 @@
import java.util.UUID;
import org.apache.hadoop.ozone.OzoneAcl;
import org.apache.hadoop.ozone.om.request.OMRequestTestUtils;
-import org.apache.hadoop.ozone.om.request.bucket.TestBucketRequest;
+import org.apache.hadoop.ozone.om.request.bucket.BucketRequestTests;
import org.apache.hadoop.ozone.om.response.OMClientResponse;
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos;
import
org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMRequest;
@@ -36,7 +36,7 @@
/**
* Tests bucket removeAcl request.
*/
-public class TestOMBucketRemoveAclRequest extends TestBucketRequest {
+public class TestOMBucketRemoveAclRequest extends BucketRequestTests {
@Test
public void testPreExecute() throws Exception {
String volumeName = UUID.randomUUID().toString();
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/bucket/acl/TestOMBucketSetAclRequest.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/bucket/acl/TestOMBucketSetAclRequest.java
index b39e1a0b56b..b68f0a6381b 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/bucket/acl/TestOMBucketSetAclRequest.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/bucket/acl/TestOMBucketSetAclRequest.java
@@ -27,7 +27,7 @@
import java.util.UUID;
import org.apache.hadoop.ozone.OzoneAcl;
import org.apache.hadoop.ozone.om.request.OMRequestTestUtils;
-import org.apache.hadoop.ozone.om.request.bucket.TestBucketRequest;
+import org.apache.hadoop.ozone.om.request.bucket.BucketRequestTests;
import org.apache.hadoop.ozone.om.response.OMClientResponse;
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos;
import
org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMRequest;
@@ -37,7 +37,7 @@
/**
* Tests bucket setAcl request.
*/
-public class TestOMBucketSetAclRequest extends TestBucketRequest {
+public class TestOMBucketSetAclRequest extends BucketRequestTests {
@Test
public void testPreExecute() throws Exception {
String volumeName = UUID.randomUUID().toString();
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/file/TestOMFileCreateRequest.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/file/TestOMFileCreateRequest.java
index 3004f511480..48ef29faf9e 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/file/TestOMFileCreateRequest.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/file/TestOMFileCreateRequest.java
@@ -67,7 +67,7 @@
import org.apache.hadoop.ozone.om.helpers.OmKeyLocationInfo;
import org.apache.hadoop.ozone.om.lock.OzoneLockProvider;
import org.apache.hadoop.ozone.om.request.OMRequestTestUtils;
-import org.apache.hadoop.ozone.om.request.key.TestOMKeyRequest;
+import org.apache.hadoop.ozone.om.request.key.OMKeyRequestTests;
import org.apache.hadoop.ozone.om.response.OMClientResponse;
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos;
import
org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.CreateFileRequest;
@@ -82,7 +82,7 @@
/**
* Tests OMFileCreateRequest.
*/
-public class TestOMFileCreateRequest extends TestOMKeyRequest {
+public class TestOMFileCreateRequest extends OMKeyRequestTests {
@Test
public void testPreExecute() throws Exception {
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/file/TestOMRecoverLeaseRequest.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/file/TestOMRecoverLeaseRequest.java
index 590d1250819..6a3f8b51988 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/file/TestOMRecoverLeaseRequest.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/file/TestOMRecoverLeaseRequest.java
@@ -44,7 +44,7 @@
import org.apache.hadoop.ozone.om.request.OMRequestTestUtils;
import org.apache.hadoop.ozone.om.request.key.OMAllocateBlockRequestWithFSO;
import org.apache.hadoop.ozone.om.request.key.OMKeyCommitRequestWithFSO;
-import org.apache.hadoop.ozone.om.request.key.TestOMKeyRequest;
+import org.apache.hadoop.ozone.om.request.key.OMKeyRequestTests;
import org.apache.hadoop.ozone.om.response.OMClientResponse;
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos;
import
org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.AllocateBlockRequest;
@@ -63,7 +63,7 @@
/**
* Tests OMRecoverLeaseRequest.
*/
-public class TestOMRecoverLeaseRequest extends TestOMKeyRequest {
+public class TestOMRecoverLeaseRequest extends OMKeyRequestTests {
private long parentId;
private boolean forceRecovery = false;
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyRequest.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/OMKeyRequestTests.java
similarity index 99%
rename from
hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyRequest.java
rename to
hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/OMKeyRequestTests.java
index 405cc706ef9..167fbc354a3 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyRequest.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/OMKeyRequestTests.java
@@ -101,7 +101,7 @@
* Base test class for key request.
*/
@SuppressWarnings("visibilitymodifier")
-public class TestOMKeyRequest {
+public class OMKeyRequestTests {
@TempDir
private Path folder;
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMAllocateBlockRequest.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMAllocateBlockRequest.java
index 1318e5b0645..8f720deaf1b 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMAllocateBlockRequest.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMAllocateBlockRequest.java
@@ -41,7 +41,7 @@
/**
* Tests OMAllocateBlockRequest class.
*/
-public class TestOMAllocateBlockRequest extends TestOMKeyRequest {
+public class TestOMAllocateBlockRequest extends OMKeyRequestTests {
@Test
public void testPreExecute() throws Exception {
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMDirectoriesPurgeRequestAndResponse.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMDirectoriesPurgeRequestAndResponse.java
index 4692039ef0c..8c74321f848 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMDirectoriesPurgeRequestAndResponse.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMDirectoriesPurgeRequestAndResponse.java
@@ -84,7 +84,7 @@
/**
* Tests {@link OMKeyPurgeRequest} and {@link OMKeyPurgeResponse}.
*/
-public class TestOMDirectoriesPurgeRequestAndResponse extends TestOMKeyRequest
{
+public class TestOMDirectoriesPurgeRequestAndResponse extends
OMKeyRequestTests {
private int numKeys = 10;
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyAclRequest.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyAclRequest.java
index 774fab2574b..8b9b4b2e832 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyAclRequest.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyAclRequest.java
@@ -46,7 +46,7 @@
/**
* Test Key ACL requests.
*/
-public class TestOMKeyAclRequest extends TestOMKeyRequest {
+public class TestOMKeyAclRequest extends OMKeyRequestTests {
@Test
public void testKeyAddAclRequest() throws Exception {
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyCommitRequest.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyCommitRequest.java
index 61852561ac9..c64196c590f 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyCommitRequest.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyCommitRequest.java
@@ -71,7 +71,7 @@
/**
* Class tests OMKeyCommitRequest class.
*/
-public class TestOMKeyCommitRequest extends TestOMKeyRequest {
+public class TestOMKeyCommitRequest extends OMKeyRequestTests {
private static final int DEFAULT_COMMIT_BLOCK_SIZE = 5;
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyCreateRequest.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyCreateRequest.java
index aec1c720a05..108a10bc240 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyCreateRequest.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyCreateRequest.java
@@ -97,7 +97,7 @@
/**
* This class tests the OM Key Create Request.
*/
-public class TestOMKeyCreateRequest extends TestOMKeyRequest {
+public class TestOMKeyCreateRequest extends OMKeyRequestTests {
public static Collection<Object[]> data() {
return Arrays.asList(
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyDeleteRequest.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyDeleteRequest.java
index 8aba4c88683..3878e3aca8b 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyDeleteRequest.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyDeleteRequest.java
@@ -42,7 +42,7 @@
/**
* Tests OmKeyDelete request.
*/
-public class TestOMKeyDeleteRequest extends TestOMKeyRequest {
+public class TestOMKeyDeleteRequest extends OMKeyRequestTests {
@ParameterizedTest
@ValueSource(strings = {"keyName", "a/b/keyName", "a/.snapshot/keyName",
"a.snapshot/b/keyName"})
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyPurgeRequestAndResponse.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyPurgeRequestAndResponse.java
index b2ee2539079..1f05105d39f 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyPurgeRequestAndResponse.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyPurgeRequestAndResponse.java
@@ -59,7 +59,7 @@
/**
* Tests {@link OMKeyPurgeRequest} and {@link OMKeyPurgeResponse}.
*/
-public class TestOMKeyPurgeRequestAndResponse extends TestOMKeyRequest {
+public class TestOMKeyPurgeRequestAndResponse extends OMKeyRequestTests {
private int numKeys = 10;
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyRenameRequest.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyRenameRequest.java
index 145cb364d9d..8d89f2157d4 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyRenameRequest.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyRenameRequest.java
@@ -40,7 +40,7 @@
* Tests RenameKey request.
*/
@SuppressWarnings("checkstyle:VisibilityModifier")
-public class TestOMKeyRenameRequest extends TestOMKeyRequest {
+public class TestOMKeyRenameRequest extends OMKeyRequestTests {
protected OmKeyInfo fromKeyInfo;
protected String fromKeyName;
protected String toKeyName;
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeysDeleteRequest.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeysDeleteRequest.java
index 4f5989e386d..52d83860245 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeysDeleteRequest.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeysDeleteRequest.java
@@ -41,7 +41,7 @@
/**
* Class tests OMKeysDeleteRequest.
*/
-public class TestOMKeysDeleteRequest extends TestOMKeyRequest {
+public class TestOMKeysDeleteRequest extends OMKeyRequestTests {
private List<String> deleteKeyList;
private OMRequest omRequest;
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeysRenameRequest.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeysRenameRequest.java
index 14d7017c561..8eca1660da4 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeysRenameRequest.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeysRenameRequest.java
@@ -41,7 +41,7 @@
/**
* Tests RenameKey request.
*/
-public class TestOMKeysRenameRequest extends TestOMKeyRequest {
+public class TestOMKeysRenameRequest extends OMKeyRequestTests {
private int count = 10;
private String parentDir = "/test";
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMOpenKeysDeleteRequest.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMOpenKeysDeleteRequest.java
index 6634f1ec20f..03f9b774411 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMOpenKeysDeleteRequest.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMOpenKeysDeleteRequest.java
@@ -62,7 +62,7 @@
/**
* This class tests the OM Open Keys Delete Request.
*/
-public class TestOMOpenKeysDeleteRequest extends TestOMKeyRequest {
+public class TestOMOpenKeysDeleteRequest extends OMKeyRequestTests {
private BucketLayout bucketLayout;
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMPrefixAclRequest.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMPrefixAclRequest.java
index 1014aa30974..07402f42738 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMPrefixAclRequest.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMPrefixAclRequest.java
@@ -45,7 +45,7 @@
/**
* Tests Prefix ACL requests.
*/
-public class TestOMPrefixAclRequest extends TestOMKeyRequest {
+public class TestOMPrefixAclRequest extends OMKeyRequestTests {
@Test
public void testAddAclRequest() throws Exception {
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMSetTimesRequest.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMSetTimesRequest.java
index 5ffa719c847..ac50e3f5e34 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMSetTimesRequest.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMSetTimesRequest.java
@@ -33,7 +33,7 @@
/**
* Test cases for OMSetTimesRequest.
*/
-public class TestOMSetTimesRequest extends TestOMKeyRequest {
+public class TestOMSetTimesRequest extends OMKeyRequestTests {
/**
* Verify that setTimes() on key works as expected.
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/multipart/TestS3MultipartRequest.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3MultipartRequestTests.java
similarity index 99%
rename from
hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/multipart/TestS3MultipartRequest.java
rename to
hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3MultipartRequestTests.java
index 15ed924cc40..e23b84f5293 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/multipart/TestS3MultipartRequest.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3MultipartRequestTests.java
@@ -65,7 +65,7 @@
* Base test class for S3 Multipart upload request.
*/
@SuppressWarnings("visibilitymodifier")
-public class TestS3MultipartRequest {
+public class S3MultipartRequestTests {
@TempDir
private Path folder;
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/multipart/TestS3ExpiredMultipartUploadsAbortRequest.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/multipart/TestS3ExpiredMultipartUploadsAbortRequest.java
index fb23385b7c8..031988ec0b0 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/multipart/TestS3ExpiredMultipartUploadsAbortRequest.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/multipart/TestS3ExpiredMultipartUploadsAbortRequest.java
@@ -64,7 +64,7 @@
* Tests S3ExpiredMultipartUploadsAbortRequest.
*/
public class TestS3ExpiredMultipartUploadsAbortRequest
- extends TestS3MultipartRequest {
+ extends S3MultipartRequestTests {
private BucketLayout bucketLayout;
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/multipart/TestS3InitiateMultipartUploadRequest.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/multipart/TestS3InitiateMultipartUploadRequest.java
index 742d17a87b0..79cf8743e3d 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/multipart/TestS3InitiateMultipartUploadRequest.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/multipart/TestS3InitiateMultipartUploadRequest.java
@@ -42,7 +42,7 @@
* Tests S3 Initiate Multipart Upload request.
*/
public class TestS3InitiateMultipartUploadRequest
- extends TestS3MultipartRequest {
+ extends S3MultipartRequestTests {
@Test
public void testPreExecute() throws Exception {
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/multipart/TestS3MultipartUploadAbortRequest.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/multipart/TestS3MultipartUploadAbortRequest.java
index d9f84523204..53ae47f5756 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/multipart/TestS3MultipartUploadAbortRequest.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/multipart/TestS3MultipartUploadAbortRequest.java
@@ -34,7 +34,7 @@
/**
* Test Multipart upload abort request.
*/
-public class TestS3MultipartUploadAbortRequest extends TestS3MultipartRequest {
+public class TestS3MultipartUploadAbortRequest extends S3MultipartRequestTests
{
@Test
public void testPreExecute() throws IOException {
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/multipart/TestS3MultipartUploadCommitPartRequest.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/multipart/TestS3MultipartUploadCommitPartRequest.java
index b5d78662507..9eea5a665ed 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/multipart/TestS3MultipartUploadCommitPartRequest.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/multipart/TestS3MultipartUploadCommitPartRequest.java
@@ -52,7 +52,7 @@
* Tests S3 Multipart upload commit part request.
*/
public class TestS3MultipartUploadCommitPartRequest
- extends TestS3MultipartRequest {
+ extends S3MultipartRequestTests {
@Test
public void testPreExecute() throws Exception {
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/multipart/TestS3MultipartUploadCompleteRequest.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/multipart/TestS3MultipartUploadCompleteRequest.java
index dbf82cc18ea..819f4bf448d 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/multipart/TestS3MultipartUploadCompleteRequest.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/multipart/TestS3MultipartUploadCompleteRequest.java
@@ -50,7 +50,7 @@
* Tests S3 Multipart Upload Complete request.
*/
public class TestS3MultipartUploadCompleteRequest
- extends TestS3MultipartRequest {
+ extends S3MultipartRequestTests {
@Test
public void testPreExecute() throws Exception {
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/tagging/TestS3DeleteBucketTaggingRequest.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/tagging/TestS3DeleteBucketTaggingRequest.java
index 01d5c13eb48..c4361023fad 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/tagging/TestS3DeleteBucketTaggingRequest.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/tagging/TestS3DeleteBucketTaggingRequest.java
@@ -38,7 +38,7 @@
import org.apache.hadoop.ozone.om.helpers.OmBucketInfo;
import org.apache.hadoop.ozone.om.request.OMClientRequest;
import org.apache.hadoop.ozone.om.request.OMRequestTestUtils;
-import org.apache.hadoop.ozone.om.request.bucket.TestBucketRequest;
+import org.apache.hadoop.ozone.om.request.bucket.BucketRequestTests;
import org.apache.hadoop.ozone.om.response.OMClientResponse;
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos;
import
org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.BucketArgs;
@@ -54,7 +54,7 @@
/**
* Tests for {@link S3DeleteBucketTaggingRequest}.
*/
-public class TestS3DeleteBucketTaggingRequest extends TestBucketRequest {
+public class TestS3DeleteBucketTaggingRequest extends BucketRequestTests {
private String volumeName;
private String bucketName;
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/tagging/TestS3DeleteObjectTaggingRequest.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/tagging/TestS3DeleteObjectTaggingRequest.java
index f7c39afc703..f930e3aa54c 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/tagging/TestS3DeleteObjectTaggingRequest.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/tagging/TestS3DeleteObjectTaggingRequest.java
@@ -29,7 +29,7 @@
import org.apache.hadoop.ozone.OzoneConsts;
import org.apache.hadoop.ozone.om.helpers.OmKeyInfo;
import org.apache.hadoop.ozone.om.request.OMRequestTestUtils;
-import org.apache.hadoop.ozone.om.request.key.TestOMKeyRequest;
+import org.apache.hadoop.ozone.om.request.key.OMKeyRequestTests;
import org.apache.hadoop.ozone.om.response.OMClientResponse;
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos;
import
org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.DeleteObjectTaggingRequest;
@@ -42,7 +42,7 @@
/**
* Test delete object tagging request.
*/
-public class TestS3DeleteObjectTaggingRequest extends TestOMKeyRequest {
+public class TestS3DeleteObjectTaggingRequest extends OMKeyRequestTests {
@Test
public void testPreExecute() throws Exception {
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/tagging/TestS3PutBucketTaggingRequest.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/tagging/TestS3PutBucketTaggingRequest.java
index 348a3de8d87..f96df5a9e2c 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/tagging/TestS3PutBucketTaggingRequest.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/tagging/TestS3PutBucketTaggingRequest.java
@@ -39,7 +39,7 @@
import org.apache.hadoop.ozone.om.helpers.OmBucketInfo;
import org.apache.hadoop.ozone.om.request.OMClientRequest;
import org.apache.hadoop.ozone.om.request.OMRequestTestUtils;
-import org.apache.hadoop.ozone.om.request.bucket.TestBucketRequest;
+import org.apache.hadoop.ozone.om.request.bucket.BucketRequestTests;
import org.apache.hadoop.ozone.om.response.OMClientResponse;
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos;
import
org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.BucketArgs;
@@ -54,7 +54,7 @@
/**
* Tests for {@link S3PutBucketTaggingRequest}.
*/
-public class TestS3PutBucketTaggingRequest extends TestBucketRequest {
+public class TestS3PutBucketTaggingRequest extends BucketRequestTests {
private String volumeName;
private String bucketName;
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/tagging/TestS3PutObjectTaggingRequest.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/tagging/TestS3PutObjectTaggingRequest.java
index e2b71715e1e..1e9947bfa3d 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/tagging/TestS3PutObjectTaggingRequest.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/tagging/TestS3PutObjectTaggingRequest.java
@@ -31,7 +31,7 @@
import org.apache.hadoop.ozone.om.helpers.KeyValueUtil;
import org.apache.hadoop.ozone.om.helpers.OmKeyInfo;
import org.apache.hadoop.ozone.om.request.OMRequestTestUtils;
-import org.apache.hadoop.ozone.om.request.key.TestOMKeyRequest;
+import org.apache.hadoop.ozone.om.request.key.OMKeyRequestTests;
import org.apache.hadoop.ozone.om.response.OMClientResponse;
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos;
import
org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.KeyArgs;
@@ -44,7 +44,7 @@
/**
* Test put object tagging request.
*/
-public class TestS3PutObjectTaggingRequest extends TestOMKeyRequest {
+public class TestS3PutObjectTaggingRequest extends OMKeyRequestTests {
@Test
public void testPreExecute() throws Exception {
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/security/TestOMDelegationTokenRequest.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/security/OMDelegationTokenRequestTests.java
similarity index 98%
rename from
hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/security/TestOMDelegationTokenRequest.java
rename to
hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/security/OMDelegationTokenRequestTests.java
index 767861f7c57..c8230c0f3ca 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/security/TestOMDelegationTokenRequest.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/security/OMDelegationTokenRequestTests.java
@@ -36,7 +36,7 @@
* Base class for testing OM delegation token request.
*/
@SuppressWarnings("visibilitymodifier")
-public class TestOMDelegationTokenRequest {
+public class OMDelegationTokenRequestTests {
@TempDir
private Path folder;
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/security/TestOMGetDelegationTokenRequest.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/security/TestOMGetDelegationTokenRequest.java
index 750a29af6c5..3dd020386fb 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/security/TestOMGetDelegationTokenRequest.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/security/TestOMGetDelegationTokenRequest.java
@@ -52,7 +52,7 @@
* The class tests OMGetDelegationTokenRequest.
*/
public class TestOMGetDelegationTokenRequest extends
- TestOMDelegationTokenRequest {
+ OMDelegationTokenRequestTests {
private OzoneDelegationTokenSecretManager secretManager;
private OzoneTokenIdentifier identifier;
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/snapshot/TestOMSnapshotCreateRequest.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/snapshot/TestOMSnapshotCreateRequest.java
index 051d4518383..f3f16d7286f 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/snapshot/TestOMSnapshotCreateRequest.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/snapshot/TestOMSnapshotCreateRequest.java
@@ -54,7 +54,7 @@
import org.apache.hadoop.ozone.om.response.OMClientResponse;
import org.apache.hadoop.ozone.om.response.key.OMKeyRenameResponse;
import org.apache.hadoop.ozone.om.response.key.OMKeyRenameResponseWithFSO;
-import org.apache.hadoop.ozone.om.snapshot.TestSnapshotRequestAndResponse;
+import org.apache.hadoop.ozone.om.snapshot.SnapshotRequestAndResponseTests;
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos;
import
org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMRequest;
import
org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMResponse;
@@ -68,7 +68,7 @@
/**
* Tests OMSnapshotCreateRequest class, which handles CreateSnapshot request.
*/
-public class TestOMSnapshotCreateRequest extends
TestSnapshotRequestAndResponse {
+public class TestOMSnapshotCreateRequest extends
SnapshotRequestAndResponseTests {
private String snapshotName1;
private String snapshotName2;
private String snapshotName3;
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/snapshot/TestOMSnapshotDeleteRequest.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/snapshot/TestOMSnapshotDeleteRequest.java
index 7a6f41be0f0..38c87083ff1 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/snapshot/TestOMSnapshotDeleteRequest.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/snapshot/TestOMSnapshotDeleteRequest.java
@@ -42,7 +42,7 @@
import org.apache.hadoop.ozone.om.helpers.SnapshotInfo;
import org.apache.hadoop.ozone.om.request.OMClientRequest;
import org.apache.hadoop.ozone.om.response.OMClientResponse;
-import org.apache.hadoop.ozone.om.snapshot.TestSnapshotRequestAndResponse;
+import org.apache.hadoop.ozone.om.snapshot.SnapshotRequestAndResponseTests;
import
org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMRequest;
import
org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMResponse;
import
org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.Status;
@@ -58,7 +58,7 @@
* Mostly mirrors TestOMSnapshotCreateRequest.
* testEntryNotExist() and testEntryExists() are unique.
*/
-public class TestOMSnapshotDeleteRequest extends
TestSnapshotRequestAndResponse {
+public class TestOMSnapshotDeleteRequest extends
SnapshotRequestAndResponseTests {
private String snapshotName;
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/snapshot/TestOMSnapshotMoveTableKeysRequest.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/snapshot/TestOMSnapshotMoveTableKeysRequest.java
index a815d7f0a7b..9d5fdb6b5e5 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/snapshot/TestOMSnapshotMoveTableKeysRequest.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/snapshot/TestOMSnapshotMoveTableKeysRequest.java
@@ -34,8 +34,8 @@
import org.apache.hadoop.ozone.om.helpers.OmKeyInfo;
import org.apache.hadoop.ozone.om.helpers.SnapshotInfo;
import org.apache.hadoop.ozone.om.response.OMClientResponse;
+import org.apache.hadoop.ozone.om.snapshot.SnapshotRequestAndResponseTests;
import org.apache.hadoop.ozone.om.snapshot.SnapshotUtils;
-import org.apache.hadoop.ozone.om.snapshot.TestSnapshotRequestAndResponse;
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
@@ -44,7 +44,7 @@
/**
* Class to test OmSnapshotMoveTableKeyRequest.
*/
-public class TestOMSnapshotMoveTableKeysRequest extends
TestSnapshotRequestAndResponse {
+public class TestOMSnapshotMoveTableKeysRequest extends
SnapshotRequestAndResponseTests {
private String snapshotName1;
private String snapshotName2;
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/snapshot/TestOMSnapshotPurgeRequestAndResponse.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/snapshot/TestOMSnapshotPurgeRequestAndResponse.java
index b5a969b4f6c..04a4756c181 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/snapshot/TestOMSnapshotPurgeRequestAndResponse.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/snapshot/TestOMSnapshotPurgeRequestAndResponse.java
@@ -54,7 +54,7 @@
import org.apache.hadoop.ozone.om.response.snapshot.OMSnapshotPurgeResponse;
import org.apache.hadoop.ozone.om.snapshot.OmSnapshotLocalDataManager;
import
org.apache.hadoop.ozone.om.snapshot.OmSnapshotLocalDataManager.ReadableOmSnapshotLocalDataProvider;
-import org.apache.hadoop.ozone.om.snapshot.TestSnapshotRequestAndResponse;
+import org.apache.hadoop.ozone.om.snapshot.SnapshotRequestAndResponseTests;
import
org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMRequest;
import
org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.SnapshotPurgeRequest;
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.Type;
@@ -69,7 +69,7 @@
/**
* Tests OMSnapshotPurgeRequest class.
*/
-public class TestOMSnapshotPurgeRequestAndResponse extends
TestSnapshotRequestAndResponse {
+public class TestOMSnapshotPurgeRequestAndResponse extends
SnapshotRequestAndResponseTests {
private final List<Path> checkpointPaths = new ArrayList<>();
private String keyName;
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/snapshot/TestOMSnapshotRenameRequest.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/snapshot/TestOMSnapshotRenameRequest.java
index 7b67b753e55..c93e9a183d1 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/snapshot/TestOMSnapshotRenameRequest.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/snapshot/TestOMSnapshotRenameRequest.java
@@ -51,7 +51,7 @@
import org.apache.hadoop.ozone.om.request.OMClientRequest;
import org.apache.hadoop.ozone.om.request.OMRequestTestUtils;
import org.apache.hadoop.ozone.om.response.OMClientResponse;
-import org.apache.hadoop.ozone.om.snapshot.TestSnapshotRequestAndResponse;
+import org.apache.hadoop.ozone.om.snapshot.SnapshotRequestAndResponseTests;
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos;
import org.apache.hadoop.util.Time;
import org.junit.jupiter.api.BeforeEach;
@@ -62,7 +62,7 @@
/**
* Tests OMSnapshotRenameRequest class, which handles RenameSnapshot request.
*/
-public class TestOMSnapshotRenameRequest extends
TestSnapshotRequestAndResponse {
+public class TestOMSnapshotRenameRequest extends
SnapshotRequestAndResponseTests {
private String snapshotName1;
private String snapshotName2;
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/snapshot/TestOMSnapshotSetPropertyRequestAndResponse.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/snapshot/TestOMSnapshotSetPropertyRequestAndResponse.java
index bb0d3717341..2ae4ba892a2 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/snapshot/TestOMSnapshotSetPropertyRequestAndResponse.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/snapshot/TestOMSnapshotSetPropertyRequestAndResponse.java
@@ -36,7 +36,7 @@
import org.apache.hadoop.ozone.om.helpers.SnapshotInfo;
import org.apache.hadoop.ozone.om.request.OMRequestTestUtils;
import
org.apache.hadoop.ozone.om.response.snapshot.OMSnapshotSetPropertyResponse;
-import org.apache.hadoop.ozone.om.snapshot.TestSnapshotRequestAndResponse;
+import org.apache.hadoop.ozone.om.snapshot.SnapshotRequestAndResponseTests;
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos;
import
org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMRequest;
import
org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.SetSnapshotPropertyRequest;
@@ -48,7 +48,7 @@
* Tests TestOMSnapshotSetPropertyRequest
* TestOMSnapshotSetPropertyResponse class.
*/
-public class TestOMSnapshotSetPropertyRequestAndResponse extends
TestSnapshotRequestAndResponse {
+public class TestOMSnapshotSetPropertyRequestAndResponse extends
SnapshotRequestAndResponseTests {
private String snapName;
private long exclusiveSize;
private long exclusiveSizeAfterRepl;
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/upgrade/TestOMCancelPrepareRequest.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/upgrade/TestOMCancelPrepareRequest.java
index e36573bc326..91d802e5dd5 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/upgrade/TestOMCancelPrepareRequest.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/upgrade/TestOMCancelPrepareRequest.java
@@ -24,8 +24,8 @@
import java.util.UUID;
import org.apache.hadoop.ozone.om.OzoneManagerPrepareState;
+import org.apache.hadoop.ozone.om.request.key.OMKeyRequestTests;
import org.apache.hadoop.ozone.om.request.key.OMOpenKeysDeleteRequest;
-import org.apache.hadoop.ozone.om.request.key.TestOMKeyRequest;
import org.apache.hadoop.ozone.om.response.OMClientResponse;
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos;
import
org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMRequest;
@@ -37,7 +37,7 @@
* Unit testing of cancel prepare request. Cancel prepare response does not
* perform an action, so it has no unit testing.
*/
-public class TestOMCancelPrepareRequest extends TestOMKeyRequest {
+public class TestOMCancelPrepareRequest extends OMKeyRequestTests {
private static final long LOG_INDEX = 1;
@Test
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/volume/TestOMVolumeRequest.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/volume/OMVolumeRequestTests.java
similarity index 99%
rename from
hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/volume/TestOMVolumeRequest.java
rename to
hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/volume/OMVolumeRequestTests.java
index 71cb1b16627..ccdc293c53a 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/volume/TestOMVolumeRequest.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/volume/OMVolumeRequestTests.java
@@ -48,7 +48,7 @@
* Base test class for Volume request.
*/
@SuppressWarnings("visibilitymodifier")
-public class TestOMVolumeRequest {
+public class OMVolumeRequestTests {
@TempDir
private Path folder;
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/volume/TestOMVolumeCreateRequest.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/volume/TestOMVolumeCreateRequest.java
index 628e163a6af..89baf523481 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/volume/TestOMVolumeCreateRequest.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/volume/TestOMVolumeCreateRequest.java
@@ -50,7 +50,7 @@
/**
* Tests create volume request.
*/
-public class TestOMVolumeCreateRequest extends TestOMVolumeRequest {
+public class TestOMVolumeCreateRequest extends OMVolumeRequestTests {
@Test
public void testPreExecute() throws Exception {
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/volume/TestOMVolumeDeleteRequest.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/volume/TestOMVolumeDeleteRequest.java
index c7d3cc325f5..c2243c62d1a 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/volume/TestOMVolumeDeleteRequest.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/volume/TestOMVolumeDeleteRequest.java
@@ -34,7 +34,7 @@
/**
* Tests delete volume request.
*/
-public class TestOMVolumeDeleteRequest extends TestOMVolumeRequest {
+public class TestOMVolumeDeleteRequest extends OMVolumeRequestTests {
@Test
public void testPreExecute() throws Exception {
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/volume/TestOMVolumeSetOwnerRequest.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/volume/TestOMVolumeSetOwnerRequest.java
index 99106e43c11..aec9b7da4df 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/volume/TestOMVolumeSetOwnerRequest.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/volume/TestOMVolumeSetOwnerRequest.java
@@ -38,7 +38,7 @@
/**
* Tests set volume property request.
*/
-public class TestOMVolumeSetOwnerRequest extends TestOMVolumeRequest {
+public class TestOMVolumeSetOwnerRequest extends OMVolumeRequestTests {
@Test
public void testPreExecute() throws Exception {
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/volume/TestOMVolumeSetQuotaRequest.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/volume/TestOMVolumeSetQuotaRequest.java
index 96084a47f9c..f9bf2361459 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/volume/TestOMVolumeSetQuotaRequest.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/volume/TestOMVolumeSetQuotaRequest.java
@@ -37,7 +37,7 @@
/**
* Tests set volume property request.
*/
-public class TestOMVolumeSetQuotaRequest extends TestOMVolumeRequest {
+public class TestOMVolumeSetQuotaRequest extends OMVolumeRequestTests {
@Test
public void testPreExecute() throws Exception {
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/volume/acl/TestOMVolumeAddAclRequest.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/volume/acl/TestOMVolumeAddAclRequest.java
index 82c44456cd9..4f0e0f65326 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/volume/acl/TestOMVolumeAddAclRequest.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/volume/acl/TestOMVolumeAddAclRequest.java
@@ -27,7 +27,7 @@
import org.apache.hadoop.ozone.OzoneAcl;
import org.apache.hadoop.ozone.om.helpers.OmVolumeArgs;
import org.apache.hadoop.ozone.om.request.OMRequestTestUtils;
-import org.apache.hadoop.ozone.om.request.volume.TestOMVolumeRequest;
+import org.apache.hadoop.ozone.om.request.volume.OMVolumeRequestTests;
import org.apache.hadoop.ozone.om.response.OMClientResponse;
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos;
import
org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMRequest;
@@ -37,7 +37,7 @@
/**
* Tests volume addAcl request.
*/
-public class TestOMVolumeAddAclRequest extends TestOMVolumeRequest {
+public class TestOMVolumeAddAclRequest extends OMVolumeRequestTests {
@Test
public void testPreExecute() throws Exception {
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/volume/acl/TestOMVolumeRemoveAclRequest.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/volume/acl/TestOMVolumeRemoveAclRequest.java
index 666e816cba5..ab5e9d696b6 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/volume/acl/TestOMVolumeRemoveAclRequest.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/volume/acl/TestOMVolumeRemoveAclRequest.java
@@ -27,7 +27,7 @@
import org.apache.hadoop.ozone.OzoneAcl;
import org.apache.hadoop.ozone.om.helpers.OmVolumeArgs;
import org.apache.hadoop.ozone.om.request.OMRequestTestUtils;
-import org.apache.hadoop.ozone.om.request.volume.TestOMVolumeRequest;
+import org.apache.hadoop.ozone.om.request.volume.OMVolumeRequestTests;
import org.apache.hadoop.ozone.om.response.OMClientResponse;
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos;
import
org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMRequest;
@@ -37,7 +37,7 @@
/**
* Tests volume removeAcl request.
*/
-public class TestOMVolumeRemoveAclRequest extends TestOMVolumeRequest {
+public class TestOMVolumeRemoveAclRequest extends OMVolumeRequestTests {
@Test
public void testPreExecute() throws Exception {
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/volume/acl/TestOMVolumeSetAclRequest.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/volume/acl/TestOMVolumeSetAclRequest.java
index 049794c19ff..52431b22e26 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/volume/acl/TestOMVolumeSetAclRequest.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/volume/acl/TestOMVolumeSetAclRequest.java
@@ -28,7 +28,7 @@
import org.apache.hadoop.ozone.OzoneAcl;
import org.apache.hadoop.ozone.om.helpers.OmVolumeArgs;
import org.apache.hadoop.ozone.om.request.OMRequestTestUtils;
-import org.apache.hadoop.ozone.om.request.volume.TestOMVolumeRequest;
+import org.apache.hadoop.ozone.om.request.volume.OMVolumeRequestTests;
import org.apache.hadoop.ozone.om.response.OMClientResponse;
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos;
import
org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMRequest;
@@ -38,7 +38,7 @@
/**
* Tests volume setAcl request.
*/
-public class TestOMVolumeSetAclRequest extends TestOMVolumeRequest {
+public class TestOMVolumeSetAclRequest extends OMVolumeRequestTests {
@Test
public void testPreExecute() throws Exception {
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/TestOMResponseUtils.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/OMResponseTestUtils.java
similarity index 95%
rename from
hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/TestOMResponseUtils.java
rename to
hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/OMResponseTestUtils.java
index a12d10e40e2..ccf7d368c0d 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/TestOMResponseUtils.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/OMResponseTestUtils.java
@@ -25,10 +25,10 @@
/**
* Helper class to test OMClientResponse classes.
*/
-public final class TestOMResponseUtils {
+public final class OMResponseTestUtils {
// No one can instantiate, this is just utility class with all static
methods.
- private TestOMResponseUtils() {
+ private OMResponseTestUtils() {
}
public static OmBucketInfo createBucket(String volume, String bucket) {
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/bucket/TestOMBucketCreateResponse.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/bucket/TestOMBucketCreateResponse.java
index 7ae5f878a26..015fb33c0b6 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/bucket/TestOMBucketCreateResponse.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/bucket/TestOMBucketCreateResponse.java
@@ -28,7 +28,7 @@
import org.apache.hadoop.ozone.om.OMMetadataManager;
import org.apache.hadoop.ozone.om.OmMetadataManagerImpl;
import org.apache.hadoop.ozone.om.helpers.OmBucketInfo;
-import org.apache.hadoop.ozone.om.response.TestOMResponseUtils;
+import org.apache.hadoop.ozone.om.response.OMResponseTestUtils;
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos;
import
org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.CreateBucketResponse;
import
org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMResponse;
@@ -68,7 +68,7 @@ public void tearDown() {
public void testAddToDBBatch() throws Exception {
String volumeName = UUID.randomUUID().toString();
String bucketName = UUID.randomUUID().toString();
- OmBucketInfo omBucketInfo = TestOMResponseUtils.createBucket(
+ OmBucketInfo omBucketInfo = OMResponseTestUtils.createBucket(
volumeName, bucketName);
assertEquals(0,
omMetadataManager.countRowsInTable(omMetadataManager.getBucketTable()));
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/bucket/TestOMBucketDeleteResponse.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/bucket/TestOMBucketDeleteResponse.java
index 3699b91cd27..45020adfb07 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/bucket/TestOMBucketDeleteResponse.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/bucket/TestOMBucketDeleteResponse.java
@@ -27,7 +27,7 @@
import org.apache.hadoop.ozone.om.OMMetadataManager;
import org.apache.hadoop.ozone.om.OmMetadataManagerImpl;
import org.apache.hadoop.ozone.om.helpers.OmBucketInfo;
-import org.apache.hadoop.ozone.om.response.TestOMResponseUtils;
+import org.apache.hadoop.ozone.om.response.OMResponseTestUtils;
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos;
import
org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.CreateBucketResponse;
import
org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.DeleteBucketResponse;
@@ -68,7 +68,7 @@ public void tearDown() {
public void testAddToDBBatch() throws Exception {
String volumeName = UUID.randomUUID().toString();
String bucketName = UUID.randomUUID().toString();
- OmBucketInfo omBucketInfo = TestOMResponseUtils.createBucket(
+ OmBucketInfo omBucketInfo = OMResponseTestUtils.createBucket(
volumeName, bucketName);
OMBucketCreateResponse omBucketCreateResponse =
new OMBucketCreateResponse(OMResponse.newBuilder()
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/bucket/TestOMBucketSetPropertyResponse.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/bucket/TestOMBucketSetPropertyResponse.java
index 56254935764..ab2724cfb2e 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/bucket/TestOMBucketSetPropertyResponse.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/bucket/TestOMBucketSetPropertyResponse.java
@@ -28,7 +28,7 @@
import org.apache.hadoop.ozone.om.OMMetadataManager;
import org.apache.hadoop.ozone.om.OmMetadataManagerImpl;
import org.apache.hadoop.ozone.om.helpers.OmBucketInfo;
-import org.apache.hadoop.ozone.om.response.TestOMResponseUtils;
+import org.apache.hadoop.ozone.om.response.OMResponseTestUtils;
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos;
import
org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.CreateBucketResponse;
import
org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMResponse;
@@ -69,7 +69,7 @@ public void testAddToDBBatch() throws Exception {
String volumeName = UUID.randomUUID().toString();
String bucketName = UUID.randomUUID().toString();
- OmBucketInfo omBucketInfo = TestOMResponseUtils.createBucket(
+ OmBucketInfo omBucketInfo = OMResponseTestUtils.createBucket(
volumeName, bucketName);
OMBucketSetPropertyResponse omBucketCreateResponse =
new OMBucketSetPropertyResponse(OMResponse.newBuilder()
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/file/TestOMDirectoryCreateResponse.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/file/TestOMDirectoryCreateResponse.java
index aa152a5d2b7..0cdcc85ac57 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/file/TestOMDirectoryCreateResponse.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/file/TestOMDirectoryCreateResponse.java
@@ -38,7 +38,7 @@
import org.apache.hadoop.ozone.om.helpers.OzoneFSUtils;
import org.apache.hadoop.ozone.om.request.OMRequestTestUtils;
import org.apache.hadoop.ozone.om.request.file.OMDirectoryCreateRequest.Result;
-import org.apache.hadoop.ozone.om.response.TestOMResponseUtils;
+import org.apache.hadoop.ozone.om.response.OMResponseTestUtils;
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos;
import
org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMResponse;
import org.junit.jupiter.api.AfterEach;
@@ -85,7 +85,7 @@ public void testAddToDBBatch() throws Exception {
ThreadLocalRandom random = ThreadLocalRandom.current();
long usedNamespace = Math.abs(random.nextLong(Long.MAX_VALUE));
- OmBucketInfo omBucketInfo = TestOMResponseUtils.createBucket(
+ OmBucketInfo omBucketInfo = OMResponseTestUtils.createBucket(
volumeName, bucketName);
omBucketInfo = omBucketInfo.toBuilder()
.setUsedNamespace(usedNamespace).build();
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/file/TestOMDirectoryCreateResponseWithFSO.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/file/TestOMDirectoryCreateResponseWithFSO.java
index 37939a9358d..0a5cc330186 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/file/TestOMDirectoryCreateResponseWithFSO.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/file/TestOMDirectoryCreateResponseWithFSO.java
@@ -40,7 +40,7 @@
import org.apache.hadoop.ozone.om.helpers.OmVolumeArgs;
import org.apache.hadoop.ozone.om.request.OMRequestTestUtils;
import org.apache.hadoop.ozone.om.request.file.OMDirectoryCreateRequestWithFSO;
-import org.apache.hadoop.ozone.om.response.TestOMResponseUtils;
+import org.apache.hadoop.ozone.om.response.OMResponseTestUtils;
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos;
import
org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMResponse;
import org.junit.jupiter.api.BeforeEach;
@@ -90,7 +90,7 @@ public void testAddToDBBatch() throws Exception {
.build();
ThreadLocalRandom random = ThreadLocalRandom.current();
long usedNamespace = Math.abs(random.nextLong(Long.MAX_VALUE));
- OmBucketInfo omBucketInfo = TestOMResponseUtils.createBucket(
+ OmBucketInfo omBucketInfo = OMResponseTestUtils.createBucket(
volumeName, bucketName);
omBucketInfo = omBucketInfo.toBuilder()
.setUsedNamespace(usedNamespace).build();
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeyResponse.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/OMKeyResponseTests.java
similarity index 99%
rename from
hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeyResponse.java
rename to
hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/OMKeyResponseTests.java
index 02afd43960e..99842c9cfb3 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeyResponse.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/OMKeyResponseTests.java
@@ -48,7 +48,7 @@
* Base test class for key response.
*/
@SuppressWarnings("visibilitymodifier")
-public class TestOMKeyResponse {
+public class OMKeyResponseTests {
@TempDir
private Path folder;
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMAllocateBlockResponse.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMAllocateBlockResponse.java
index e4c3a64d66c..d832ea882b9 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMAllocateBlockResponse.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMAllocateBlockResponse.java
@@ -33,7 +33,7 @@
/**
* Tests OMAllocateBlockResponse.
*/
-public class TestOMAllocateBlockResponse extends TestOMKeyResponse {
+public class TestOMAllocateBlockResponse extends OMKeyResponseTests {
@Test
public void testAddToDBBatch() throws Exception {
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeyCommitResponse.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeyCommitResponse.java
index 1c2338f9d8a..fefe0d3596a 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeyCommitResponse.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeyCommitResponse.java
@@ -40,7 +40,7 @@
* Tests OMKeyCommitResponse.
*/
@SuppressWarnings("visibilitymodifier")
-public class TestOMKeyCommitResponse extends TestOMKeyResponse {
+public class TestOMKeyCommitResponse extends OMKeyResponseTests {
@Test
public void testAddToDBBatch() throws Exception {
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeyCreateResponse.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeyCreateResponse.java
index a44d955cb96..6262f025394 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeyCreateResponse.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeyCreateResponse.java
@@ -32,7 +32,7 @@
/**
* Tests MKeyCreateResponse.
*/
-public class TestOMKeyCreateResponse extends TestOMKeyResponse {
+public class TestOMKeyCreateResponse extends OMKeyResponseTests {
protected long getVolumeId() throws IOException {
return omMetadataManager.getVolumeId(volumeName);
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeyDeleteResponse.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeyDeleteResponse.java
index 33fcd137e66..5c8f9973166 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeyDeleteResponse.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeyDeleteResponse.java
@@ -39,7 +39,7 @@
/**
* Tests OMKeyDeleteResponse.
*/
-public class TestOMKeyDeleteResponse extends TestOMKeyResponse {
+public class TestOMKeyDeleteResponse extends OMKeyResponseTests {
@Test
public void testAddToDBBatch() throws Exception {
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeyRenameResponse.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeyRenameResponse.java
index aa9e6946695..18bc81fe0cf 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeyRenameResponse.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeyRenameResponse.java
@@ -36,7 +36,7 @@
* Tests OMKeyRenameResponse.
*/
@SuppressWarnings("checkstyle:VisibilityModifier")
-public class TestOMKeyRenameResponse extends TestOMKeyResponse {
+public class TestOMKeyRenameResponse extends OMKeyResponseTests {
protected OmKeyInfo fromKeyParent;
protected OmKeyInfo toKeyParent;
protected OmBucketInfo bucketInfo;
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeyRenameResponseWithFSO.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeyRenameResponseWithFSO.java
index a1d14fadad3..30dbabd5138 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeyRenameResponseWithFSO.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeyRenameResponseWithFSO.java
@@ -26,7 +26,7 @@
import org.apache.hadoop.ozone.om.helpers.BucketLayout;
import org.apache.hadoop.ozone.om.helpers.OmKeyInfo;
import org.apache.hadoop.ozone.om.request.OMRequestTestUtils;
-import org.apache.hadoop.ozone.om.response.TestOMResponseUtils;
+import org.apache.hadoop.ozone.om.response.OMResponseTestUtils;
/**
* Tests TestOMKeyRenameResponseWithFSO.
@@ -90,7 +90,7 @@ protected void createParent() {
.build();
String volumeName = UUID.randomUUID().toString();
String bucketName = UUID.randomUUID().toString();
- bucketInfo = TestOMResponseUtils.createBucket(volumeName, bucketName);
+ bucketInfo = OMResponseTestUtils.createBucket(volumeName, bucketName);
}
@Override
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeysDeleteResponse.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeysDeleteResponse.java
index 229f4cb459b..8912c97c119 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeysDeleteResponse.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeysDeleteResponse.java
@@ -40,7 +40,7 @@
/**
* Class to test OMKeysDeleteResponse.
*/
-public class TestOMKeysDeleteResponse extends TestOMKeyResponse {
+public class TestOMKeysDeleteResponse extends OMKeyResponseTests {
private List<OmKeyInfo> omKeyInfoList = new ArrayList<>();
private List<String> ozoneKeys = new ArrayList<>();
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeysRenameResponse.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeysRenameResponse.java
index baf2db80fe4..b9ce4373287 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeysRenameResponse.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeysRenameResponse.java
@@ -36,7 +36,7 @@
/**
* Tests OMKeyRenameResponse.
*/
-public class TestOMKeysRenameResponse extends TestOMKeyResponse {
+public class TestOMKeysRenameResponse extends OMKeyResponseTests {
private OmRenameKeys omRenameKeys;
private int count = 10;
private String parentDir = "/test";
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMOpenKeysDeleteResponse.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMOpenKeysDeleteResponse.java
index 9ee50336d19..e0b001ffd8f 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMOpenKeysDeleteResponse.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMOpenKeysDeleteResponse.java
@@ -41,7 +41,7 @@
/**
* Tests the OM Response when open keys are deleted.
*/
-public class TestOMOpenKeysDeleteResponse extends TestOMKeyResponse {
+public class TestOMOpenKeysDeleteResponse extends OMKeyResponseTests {
private static final long KEY_LENGTH = 100;
private BucketLayout bucketLayout;
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/acl/prefix/TestOMPrefixAclResponse.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/acl/prefix/TestOMPrefixAclResponse.java
index 80bd9f166de..0beda12d3b8 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/acl/prefix/TestOMPrefixAclResponse.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/acl/prefix/TestOMPrefixAclResponse.java
@@ -35,7 +35,7 @@
import org.apache.hadoop.ozone.om.ResolvedBucket;
import org.apache.hadoop.ozone.om.helpers.BucketLayout;
import org.apache.hadoop.ozone.om.helpers.OmPrefixInfo;
-import org.apache.hadoop.ozone.om.response.key.TestOMKeyResponse;
+import org.apache.hadoop.ozone.om.response.key.OMKeyResponseTests;
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos;
import org.apache.hadoop.ozone.security.acl.IAccessAuthorizer.ACLType;
import org.apache.hadoop.ozone.security.acl.OzoneObj;
@@ -45,7 +45,7 @@
/**
* Tests TestOMPrefixAclResponse.
*/
-public class TestOMPrefixAclResponse extends TestOMKeyResponse {
+public class TestOMPrefixAclResponse extends OMKeyResponseTests {
@Test
public void testAddToDBBatch() throws Exception {
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/s3/multipart/TestS3MultipartResponse.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3MultipartResponseTests.java
similarity index 99%
rename from
hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/s3/multipart/TestS3MultipartResponse.java
rename to
hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3MultipartResponseTests.java
index cd407d39eb8..d24a68e1339 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/s3/multipart/TestS3MultipartResponse.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3MultipartResponseTests.java
@@ -60,7 +60,7 @@
*/
@SuppressWarnings("VisibilityModifier")
-public class TestS3MultipartResponse {
+public class S3MultipartResponseTests {
@TempDir
private Path folder;
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/s3/multipart/TestS3ExpiredMultipartUploadsAbortResponse.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/s3/multipart/TestS3ExpiredMultipartUploadsAbortResponse.java
index 96190117430..e1f013ab4f9 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/s3/multipart/TestS3ExpiredMultipartUploadsAbortResponse.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/s3/multipart/TestS3ExpiredMultipartUploadsAbortResponse.java
@@ -53,7 +53,7 @@
* Tests S3 Expired Multipart Upload Abort Responses.
*/
public class TestS3ExpiredMultipartUploadsAbortResponse
- extends TestS3MultipartResponse {
+ extends S3MultipartResponseTests {
private BucketLayout bucketLayout;
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/s3/multipart/TestS3InitiateMultipartUploadResponse.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/s3/multipart/TestS3InitiateMultipartUploadResponse.java
index aa2bbc90e4b..3d690cf1479 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/s3/multipart/TestS3InitiateMultipartUploadResponse.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/s3/multipart/TestS3InitiateMultipartUploadResponse.java
@@ -29,7 +29,7 @@
* Class tests S3 Initiate MPU response.
*/
public class TestS3InitiateMultipartUploadResponse
- extends TestS3MultipartResponse {
+ extends S3MultipartResponseTests {
@Test
public void testAddDBToBatch() throws Exception {
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/s3/multipart/TestS3MultipartUploadAbortResponse.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/s3/multipart/TestS3MultipartUploadAbortResponse.java
index 7b9de57e099..76496c8b019 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/s3/multipart/TestS3MultipartUploadAbortResponse.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/s3/multipart/TestS3MultipartUploadAbortResponse.java
@@ -35,7 +35,7 @@
* Test multipart upload abort response.
*/
public class TestS3MultipartUploadAbortResponse
- extends TestS3MultipartResponse {
+ extends S3MultipartResponseTests {
@Test
public void testAddDBToBatch() throws Exception {
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/s3/multipart/TestS3MultipartUploadCommitPartResponse.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/s3/multipart/TestS3MultipartUploadCommitPartResponse.java
index b3263cfb5f6..f2683206416 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/s3/multipart/TestS3MultipartUploadCommitPartResponse.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/s3/multipart/TestS3MultipartUploadCommitPartResponse.java
@@ -40,7 +40,7 @@
* Test multipart upload commit part response.
*/
public class TestS3MultipartUploadCommitPartResponse
- extends TestS3MultipartResponse {
+ extends S3MultipartResponseTests {
@Test
public void testAddDBToBatch() throws Exception {
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/s3/multipart/TestS3MultipartUploadCompleteResponse.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/s3/multipart/TestS3MultipartUploadCompleteResponse.java
index 9aeaf89cf5f..942bf38a368 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/s3/multipart/TestS3MultipartUploadCompleteResponse.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/s3/multipart/TestS3MultipartUploadCompleteResponse.java
@@ -44,7 +44,7 @@
* Test multipart upload complete response.
*/
public class TestS3MultipartUploadCompleteResponse
- extends TestS3MultipartResponse {
+ extends S3MultipartResponseTests {
@Test
public void testAddDBToBatch() throws Exception {
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/s3/tagging/TestS3DeleteObjectTaggingResponse.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/s3/tagging/TestS3DeleteObjectTaggingResponse.java
index bfcde032e2d..eba39d9a606 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/s3/tagging/TestS3DeleteObjectTaggingResponse.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/s3/tagging/TestS3DeleteObjectTaggingResponse.java
@@ -29,14 +29,14 @@
import org.apache.hadoop.hdds.protocol.proto.HddsProtos;
import org.apache.hadoop.ozone.om.helpers.OmKeyInfo;
import org.apache.hadoop.ozone.om.request.OMRequestTestUtils;
-import org.apache.hadoop.ozone.om.response.key.TestOMKeyResponse;
+import org.apache.hadoop.ozone.om.response.key.OMKeyResponseTests;
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos;
import org.junit.jupiter.api.Test;
/**
* Test delete object tagging response.
*/
-public class TestS3DeleteObjectTaggingResponse extends TestOMKeyResponse {
+public class TestS3DeleteObjectTaggingResponse extends OMKeyResponseTests {
@Test
public void testAddToBatch() throws Exception {
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/s3/tagging/TestS3PutObjectTaggingResponse.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/s3/tagging/TestS3PutObjectTaggingResponse.java
index fb901bf25db..a824ec0b977 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/s3/tagging/TestS3PutObjectTaggingResponse.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/s3/tagging/TestS3PutObjectTaggingResponse.java
@@ -28,14 +28,14 @@
import org.apache.hadoop.hdds.protocol.proto.HddsProtos;
import org.apache.hadoop.ozone.om.helpers.OmKeyInfo;
import org.apache.hadoop.ozone.om.request.OMRequestTestUtils;
-import org.apache.hadoop.ozone.om.response.key.TestOMKeyResponse;
+import org.apache.hadoop.ozone.om.response.key.OMKeyResponseTests;
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos;
import org.junit.jupiter.api.Test;
/**
* Test put object tagging response.
*/
-public class TestS3PutObjectTaggingResponse extends TestOMKeyResponse {
+public class TestS3PutObjectTaggingResponse extends OMKeyResponseTests {
@Test
public void testAddToDBBatch() throws Exception {
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/security/TestOMDelegationTokenResponse.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/security/OMDelegationTokenResponseTests.java
similarity index 97%
rename from
hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/security/TestOMDelegationTokenResponse.java
rename to
hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/security/OMDelegationTokenResponseTests.java
index 13568e0ca23..67679a8306d 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/security/TestOMDelegationTokenResponse.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/security/OMDelegationTokenResponseTests.java
@@ -31,7 +31,7 @@
/** Base test class for delegation token response. */
@SuppressWarnings("visibilitymodifier")
-public class TestOMDelegationTokenResponse {
+public class OMDelegationTokenResponseTests {
@TempDir
private Path folder;
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/security/TestOMGetDelegationTokenResponse.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/security/TestOMGetDelegationTokenResponse.java
index d5683d3f0ac..9688da35645 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/security/TestOMGetDelegationTokenResponse.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/security/TestOMGetDelegationTokenResponse.java
@@ -35,7 +35,7 @@
/** The class tests OMGetDelegationTokenResponse. */
public class TestOMGetDelegationTokenResponse extends
- TestOMDelegationTokenResponse {
+ OMDelegationTokenResponseTests {
private OzoneTokenIdentifier identifier;
private UpdateGetDelegationTokenRequest updateGetDelegationTokenRequest;
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/snapshot/TestOMSnapshotMoveTableKeysResponse.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/snapshot/TestOMSnapshotMoveTableKeysResponse.java
index 0c88e379e68..eb3d2a6612a 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/snapshot/TestOMSnapshotMoveTableKeysResponse.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/snapshot/TestOMSnapshotMoveTableKeysResponse.java
@@ -51,8 +51,8 @@
import org.apache.hadoop.ozone.om.helpers.SnapshotInfo;
import org.apache.hadoop.ozone.om.lock.IOzoneManagerLock;
import org.apache.hadoop.ozone.om.request.key.OMKeyRequest;
+import org.apache.hadoop.ozone.om.snapshot.SnapshotRequestAndResponseTests;
import org.apache.hadoop.ozone.om.snapshot.SnapshotUtils;
-import org.apache.hadoop.ozone.om.snapshot.TestSnapshotRequestAndResponse;
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos;
import org.apache.ratis.util.function.UncheckedAutoCloseableSupplier;
import org.junit.jupiter.api.Assertions;
@@ -63,7 +63,7 @@
/**
* Test class to test OMSnapshotMoveTableKeysResponse.
*/
-public class TestOMSnapshotMoveTableKeysResponse extends
TestSnapshotRequestAndResponse {
+public class TestOMSnapshotMoveTableKeysResponse extends
SnapshotRequestAndResponseTests {
private String snapshotName1;
private String snapshotName2;
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/volume/TestOMVolumeResponse.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/volume/OMVolumeResponseTests.java
similarity index 98%
rename from
hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/volume/TestOMVolumeResponse.java
rename to
hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/volume/OMVolumeResponseTests.java
index e8d1707bbe9..17a618260f4 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/volume/TestOMVolumeResponse.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/volume/OMVolumeResponseTests.java
@@ -30,7 +30,7 @@
/**
* Base test class for OM volume response.
*/
-public class TestOMVolumeResponse {
+public class OMVolumeResponseTests {
@TempDir
private Path folder;
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/volume/TestOMVolumeCreateResponse.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/volume/TestOMVolumeCreateResponse.java
index 5ad8f2b60d0..d151f918276 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/volume/TestOMVolumeCreateResponse.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/volume/TestOMVolumeCreateResponse.java
@@ -33,7 +33,7 @@
/**
* This class tests OMVolumeCreateResponse.
*/
-public class TestOMVolumeCreateResponse extends TestOMVolumeResponse {
+public class TestOMVolumeCreateResponse extends OMVolumeResponseTests {
@Test
public void testAddToDBBatch() throws Exception {
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/volume/TestOMVolumeDeleteResponse.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/volume/TestOMVolumeDeleteResponse.java
index 7b0252baa1c..9ea39242e6a 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/volume/TestOMVolumeDeleteResponse.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/volume/TestOMVolumeDeleteResponse.java
@@ -34,7 +34,7 @@
/**
* This class tests OMVolumeCreateResponse.
*/
-public class TestOMVolumeDeleteResponse extends TestOMVolumeResponse {
+public class TestOMVolumeDeleteResponse extends OMVolumeResponseTests {
@Test
public void testAddToDBBatch() throws Exception {
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/volume/TestOMVolumeSetOwnerResponse.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/volume/TestOMVolumeSetOwnerResponse.java
index 7a0661c5c23..23ebabd4736 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/volume/TestOMVolumeSetOwnerResponse.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/volume/TestOMVolumeSetOwnerResponse.java
@@ -34,7 +34,7 @@
/**
* This class tests OMVolumeCreateResponse.
*/
-public class TestOMVolumeSetOwnerResponse extends TestOMVolumeResponse {
+public class TestOMVolumeSetOwnerResponse extends OMVolumeResponseTests {
@Test
public void testAddToDBBatch() throws Exception {
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/volume/TestOMVolumeSetQuotaResponse.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/volume/TestOMVolumeSetQuotaResponse.java
index 896f4d19e80..60d3e4ab1dc 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/volume/TestOMVolumeSetQuotaResponse.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/volume/TestOMVolumeSetQuotaResponse.java
@@ -33,7 +33,7 @@
/**
* This class tests OMVolumeCreateResponse.
*/
-public class TestOMVolumeSetQuotaResponse extends TestOMVolumeResponse {
+public class TestOMVolumeSetQuotaResponse extends OMVolumeResponseTests {
@Test
public void testAddToDBBatch() throws Exception {
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/service/TestQuotaRepairTask.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/service/TestQuotaRepairTask.java
index cf8ddfbba56..a956fb3cb21 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/service/TestQuotaRepairTask.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/service/TestQuotaRepairTask.java
@@ -43,7 +43,7 @@
import org.apache.hadoop.ozone.om.helpers.RepeatedOmKeyInfo;
import org.apache.hadoop.ozone.om.ratis.OzoneManagerRatisServer;
import org.apache.hadoop.ozone.om.request.OMRequestTestUtils;
-import org.apache.hadoop.ozone.om.request.key.TestOMKeyRequest;
+import org.apache.hadoop.ozone.om.request.key.OMKeyRequestTests;
import org.apache.hadoop.ozone.om.request.volume.OMQuotaRepairRequest;
import org.apache.hadoop.ozone.om.response.OMClientResponse;
import org.apache.hadoop.ozone.om.response.volume.OMQuotaRepairResponse;
@@ -56,7 +56,7 @@
* Test class for quota repair.
*/
@Timeout(120)
-public class TestQuotaRepairTask extends TestOMKeyRequest {
+public class TestQuotaRepairTask extends OMKeyRequestTests {
/** Seconds; must match {@link Timeout} on this class. */
private static final int REPAIR_TEST_TIMEOUT_SECONDS = 120;
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestSnapshotRequestAndResponse.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/snapshot/SnapshotRequestAndResponseTests.java
similarity index 98%
rename from
hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestSnapshotRequestAndResponse.java
rename to
hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/snapshot/SnapshotRequestAndResponseTests.java
index e3776a5b837..e4adfa4907d 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestSnapshotRequestAndResponse.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/snapshot/SnapshotRequestAndResponseTests.java
@@ -76,7 +76,7 @@
/**
* Base class to test snapshot functionalities.
*/
-public class TestSnapshotRequestAndResponse {
+public class SnapshotRequestAndResponseTests {
@TempDir
private File testDir;
@@ -131,11 +131,11 @@ public String getVolumeName() {
return volumeName;
}
- protected TestSnapshotRequestAndResponse() {
+ protected SnapshotRequestAndResponseTests() {
this.isAdmin = false;
}
- protected TestSnapshotRequestAndResponse(boolean isAdmin) {
+ protected SnapshotRequestAndResponseTests(boolean isAdmin) {
this.isAdmin = isAdmin;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
