This is an automated email from the ASF dual-hosted git repository.
adoroszlai 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 89a45ea68e0 HDDS-15751. Rename test parent classes for naming
convention (#10713)
89a45ea68e0 is described below
commit 89a45ea68e040176c08bf3b3dee73f35ec9bbbb0
Author: Doroszlai, Attila <[email protected]>
AuthorDate: Mon Jul 13 21:15:42 2026 +0200
HDDS-15751. Rename test parent classes for naming convention (#10713)
---
...ContainerStateMachine.java => ContainerStateMachineTests.java} | 4 ++--
.../transport/server/ratis/TestContainerStateMachineFollower.java | 2 +-
.../transport/server/ratis/TestContainerStateMachineLeader.java | 2 +-
...tContainerScannersAbstract.java => ContainerScannerTests.java} | 2 +-
.../container/ozoneimpl/TestBackgroundContainerDataScanner.java | 2 +-
.../ozoneimpl/TestBackgroundContainerMetadataScanner.java | 2 +-
.../ozone/container/ozoneimpl/TestOnDemandContainerScanner.java | 2 +-
.../ozone/erasurecode/{TestCoderBase.java => CoderTests.java} | 2 +-
.../rawcoder/{TestRSRawCoderBase.java => RSRawCoderTests.java} | 4 ++--
.../rawcoder/{TestRawCoderBase.java => RawCoderTests.java} | 6 +++---
.../org/apache/ozone/erasurecode/rawcoder/TestDummyRawCoder.java | 2 +-
.../apache/ozone/erasurecode/rawcoder/TestNativeRSRawCoder.java | 2 +-
.../apache/ozone/erasurecode/rawcoder/TestNativeXORRawCoder.java | 2 +-
.../org/apache/ozone/erasurecode/rawcoder/TestRSRawCoder.java | 2 +-
.../org/apache/ozone/erasurecode/rawcoder/TestXORRawCoder.java | 2 +-
.../rawcoder/{TestXORRawCoderBase.java => XORRawCoderTests.java} | 4 ++--
...MisReplicationHandler.java => MisReplicationHandlerTests.java} | 2 +-
.../scm/container/replication/TestECMisReplicationHandler.java | 2 +-
.../scm/container/replication/TestRatisMisReplicationHandler.java | 2 +-
...ConfigurationFieldsBase.java => ConfigurationFieldsTests.java} | 8 ++++----
.../org/apache/hadoop/ozone/TestOzoneConfigurationFields.java | 4 ++--
.../rpc/read/{TestInputStreamBase.java => InputStreamTests.java} | 2 +-
.../apache/hadoop/ozone/client/rpc/read/TestChunkInputStream.java | 2 +-
.../apache/hadoop/ozone/client/rpc/read/TestKeyInputStream.java | 2 +-
.../hadoop/ozone/client/rpc/read/TestStreamBlockInputStream.java | 2 +-
...grationAbstract.java => ContainerScannerIntegrationTests.java} | 2 +-
.../dn/scanner/TestBackgroundContainerDataScannerIntegration.java | 2 +-
.../TestBackgroundContainerMetadataScannerIntegration.java | 2 +-
.../ozone/dn/scanner/TestOnDemandContainerScannerIntegration.java | 2 +-
.../ozone/freon/{TestDataValidate.java => DataValidateTests.java} | 2 +-
.../hadoop/ozone/freon/TestDataValidateWithDummyContainers.java | 2 +-
.../ozone/freon/TestDataValidateWithSafeByteOperations.java | 2 +-
.../ozone/freon/TestDataValidateWithUnsafeByteOperations.java | 2 +-
...erHAFollowerRead.java => OzoneManagerHAFollowerReadTests.java} | 2 +-
.../om/{TestOzoneManagerHA.java => OzoneManagerHATests.java} | 2 +-
.../org/apache/hadoop/ozone/om/TestAddRemoveOzoneManager.java | 2 +-
.../ozone/om/TestOzoneManagerHAFollowerReadWithAllRunning.java | 2 +-
.../ozone/om/TestOzoneManagerHAFollowerReadWithStoppedNodes.java | 2 +-
.../apache/hadoop/ozone/om/TestOzoneManagerHAWithAllRunning.java | 2 +-
.../hadoop/ozone/om/TestOzoneManagerHAWithStoppedNodes.java | 2 +-
.../java/org/apache/hadoop/ozone/om/TestOzoneManagerPrepare.java | 2 +-
.../om/snapshot/{TestOmSnapshot.java => OmSnapshotTests.java} | 4 ++--
.../hadoop/ozone/om/snapshot/TestOmSnapshotFsoWithNativeLib.java | 2 +-
.../ozone/om/snapshot/TestOmSnapshotFsoWithoutNativeLib.java | 2 +-
.../TestOmSnapshotFsoWithoutNativeLibWithLinkedBuckets.java | 2 +-
.../hadoop/ozone/om/snapshot/TestOmSnapshotObjectStore.java | 2 +-
.../om/snapshot/TestOmSnapshotWithoutBucketLinkingLegacy.java | 2 +-
47 files changed, 57 insertions(+), 57 deletions(-)
diff --git
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/TestContainerStateMachine.java
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/ContainerStateMachineTests.java
similarity index 99%
rename from
hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/TestContainerStateMachine.java
rename to
hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/ContainerStateMachineTests.java
index ddfe4ebb553..8ad92ec358e 100644
---
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/TestContainerStateMachine.java
+++
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/ContainerStateMachineTests.java
@@ -70,7 +70,7 @@
* Test class to ContainerStateMachine class.
*/
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
-abstract class TestContainerStateMachine {
+abstract class ContainerStateMachineTests {
private ContainerDispatcher dispatcher;
private final OzoneConfiguration conf = new OzoneConfiguration();
private ContainerStateMachine stateMachine;
@@ -82,7 +82,7 @@ abstract class TestContainerStateMachine {
private final boolean isLeader;
private static final String CONTAINER_DATA = "Test Data";
- TestContainerStateMachine(boolean isLeader) {
+ ContainerStateMachineTests(boolean isLeader) {
this.isLeader = isLeader;
}
diff --git
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/TestContainerStateMachineFollower.java
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/TestContainerStateMachineFollower.java
index e63dfac3ffe..3c068f0d93f 100644
---
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/TestContainerStateMachineFollower.java
+++
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/TestContainerStateMachineFollower.java
@@ -20,7 +20,7 @@
/**
* Test class to ContainerStateMachine class for follower.
*/
-public class TestContainerStateMachineFollower extends
TestContainerStateMachine {
+public class TestContainerStateMachineFollower extends
ContainerStateMachineTests {
public TestContainerStateMachineFollower() {
super(false);
}
diff --git
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/TestContainerStateMachineLeader.java
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/TestContainerStateMachineLeader.java
index 29ded1465b1..0a7e184c1a6 100644
---
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/TestContainerStateMachineLeader.java
+++
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/TestContainerStateMachineLeader.java
@@ -20,7 +20,7 @@
/**
* Test class to ContainerStateMachine class for leader.
*/
-public class TestContainerStateMachineLeader extends TestContainerStateMachine
{
+public class TestContainerStateMachineLeader extends
ContainerStateMachineTests {
public TestContainerStateMachineLeader() {
super(true);
}
diff --git
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestContainerScannersAbstract.java
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/ContainerScannerTests.java
similarity index 99%
rename from
hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestContainerScannersAbstract.java
rename to
hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/ContainerScannerTests.java
index 7bd45c3b503..88fbd29fccd 100644
---
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestContainerScannersAbstract.java
+++
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/ContainerScannerTests.java
@@ -58,7 +58,7 @@
*/
@MockitoSettings(strictness = Strictness.LENIENT)
@SuppressWarnings("checkstyle:VisibilityModifier")
-public abstract class TestContainerScannersAbstract {
+public abstract class ContainerScannerTests {
private static final AtomicLong CONTAINER_SEQ_ID = new AtomicLong(100);
diff --git
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestBackgroundContainerDataScanner.java
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestBackgroundContainerDataScanner.java
index 4180a7fb34d..50968c49d49 100644
---
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestBackgroundContainerDataScanner.java
+++
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestBackgroundContainerDataScanner.java
@@ -78,7 +78,7 @@
*/
@MockitoSettings(strictness = Strictness.LENIENT)
public class TestBackgroundContainerDataScanner extends
- TestContainerScannersAbstract {
+ ContainerScannerTests {
private BackgroundContainerDataScanner scanner;
diff --git
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestBackgroundContainerMetadataScanner.java
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestBackgroundContainerMetadataScanner.java
index f71b9b26bd7..9d87da35594 100644
---
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestBackgroundContainerMetadataScanner.java
+++
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestBackgroundContainerMetadataScanner.java
@@ -64,7 +64,7 @@
*/
@MockitoSettings(strictness = Strictness.LENIENT)
public class TestBackgroundContainerMetadataScanner extends
- TestContainerScannersAbstract {
+ ContainerScannerTests {
private BackgroundContainerMetadataScanner scanner;
diff --git
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestOnDemandContainerScanner.java
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestOnDemandContainerScanner.java
index 69b117db123..5f72471e9d0 100644
---
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestOnDemandContainerScanner.java
+++
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestOnDemandContainerScanner.java
@@ -65,7 +65,7 @@
*/
@MockitoSettings(strictness = Strictness.LENIENT)
public class TestOnDemandContainerScanner extends
- TestContainerScannersAbstract {
+ ContainerScannerTests {
private OnDemandContainerScanner onDemandScanner;
private static final String TEST_SCAN = "Test Scan";
diff --git
a/hadoop-hdds/erasurecode/src/test/java/org/apache/ozone/erasurecode/TestCoderBase.java
b/hadoop-hdds/erasurecode/src/test/java/org/apache/ozone/erasurecode/CoderTests.java
similarity index 99%
rename from
hadoop-hdds/erasurecode/src/test/java/org/apache/ozone/erasurecode/TestCoderBase.java
rename to
hadoop-hdds/erasurecode/src/test/java/org/apache/ozone/erasurecode/CoderTests.java
index 056503abb74..357f53e3145 100644
---
a/hadoop-hdds/erasurecode/src/test/java/org/apache/ozone/erasurecode/TestCoderBase.java
+++
b/hadoop-hdds/erasurecode/src/test/java/org/apache/ozone/erasurecode/CoderTests.java
@@ -30,7 +30,7 @@
* coders.
*/
@SuppressWarnings({"checkstyle:VisibilityModifier", "checkstyle:HiddenField"})
-public abstract class TestCoderBase {
+public abstract class CoderTests {
private static int fixedDataGenerator = 0;
protected boolean allowDump = true;
protected int numDataUnits;
diff --git
a/hadoop-hdds/erasurecode/src/test/java/org/apache/ozone/erasurecode/rawcoder/TestRSRawCoderBase.java
b/hadoop-hdds/erasurecode/src/test/java/org/apache/ozone/erasurecode/rawcoder/RSRawCoderTests.java
similarity index 97%
rename from
hadoop-hdds/erasurecode/src/test/java/org/apache/ozone/erasurecode/rawcoder/TestRSRawCoderBase.java
rename to
hadoop-hdds/erasurecode/src/test/java/org/apache/ozone/erasurecode/rawcoder/RSRawCoderTests.java
index bed2b8fa485..c7f38ab53f5 100644
---
a/hadoop-hdds/erasurecode/src/test/java/org/apache/ozone/erasurecode/rawcoder/TestRSRawCoderBase.java
+++
b/hadoop-hdds/erasurecode/src/test/java/org/apache/ozone/erasurecode/rawcoder/RSRawCoderTests.java
@@ -22,9 +22,9 @@
/**
* Test base for raw Reed-solomon coders.
*/
-public abstract class TestRSRawCoderBase extends TestRawCoderBase {
+public abstract class RSRawCoderTests extends RawCoderTests {
- public TestRSRawCoderBase(
+ public RSRawCoderTests(
Class<? extends RawErasureCoderFactory> encoderFactoryClass,
Class<? extends RawErasureCoderFactory> decoderFactoryClass) {
super(encoderFactoryClass, decoderFactoryClass);
diff --git
a/hadoop-hdds/erasurecode/src/test/java/org/apache/ozone/erasurecode/rawcoder/TestRawCoderBase.java
b/hadoop-hdds/erasurecode/src/test/java/org/apache/ozone/erasurecode/rawcoder/RawCoderTests.java
similarity index 98%
rename from
hadoop-hdds/erasurecode/src/test/java/org/apache/ozone/erasurecode/rawcoder/TestRawCoderBase.java
rename to
hadoop-hdds/erasurecode/src/test/java/org/apache/ozone/erasurecode/rawcoder/RawCoderTests.java
index 4338875e860..bdc32f74fbd 100644
---
a/hadoop-hdds/erasurecode/src/test/java/org/apache/ozone/erasurecode/rawcoder/TestRawCoderBase.java
+++
b/hadoop-hdds/erasurecode/src/test/java/org/apache/ozone/erasurecode/rawcoder/RawCoderTests.java
@@ -24,21 +24,21 @@
import java.io.IOException;
import org.apache.hadoop.hdds.client.ECReplicationConfig;
+import org.apache.ozone.erasurecode.CoderTests;
import org.apache.ozone.erasurecode.ECChunk;
-import org.apache.ozone.erasurecode.TestCoderBase;
import org.junit.jupiter.api.Test;
/**
* Raw coder test base with utilities.
*/
@SuppressWarnings("checkstyle:VisibilityModifier")
-public abstract class TestRawCoderBase extends TestCoderBase {
+public abstract class RawCoderTests extends CoderTests {
private final Class<? extends RawErasureCoderFactory> encoderFactoryClass;
private final Class<? extends RawErasureCoderFactory> decoderFactoryClass;
private RawErasureEncoder encoder;
private RawErasureDecoder decoder;
- public TestRawCoderBase(
+ public RawCoderTests(
Class<? extends RawErasureCoderFactory> encoderFactoryClass,
Class<? extends RawErasureCoderFactory> decoderFactoryClass) {
this.encoderFactoryClass = encoderFactoryClass;
diff --git
a/hadoop-hdds/erasurecode/src/test/java/org/apache/ozone/erasurecode/rawcoder/TestDummyRawCoder.java
b/hadoop-hdds/erasurecode/src/test/java/org/apache/ozone/erasurecode/rawcoder/TestDummyRawCoder.java
index c9fad6d5a86..2afb9e0470d 100644
---
a/hadoop-hdds/erasurecode/src/test/java/org/apache/ozone/erasurecode/rawcoder/TestDummyRawCoder.java
+++
b/hadoop-hdds/erasurecode/src/test/java/org/apache/ozone/erasurecode/rawcoder/TestDummyRawCoder.java
@@ -28,7 +28,7 @@
/**
* Test dummy raw coder.
*/
-public class TestDummyRawCoder extends TestRawCoderBase {
+public class TestDummyRawCoder extends RawCoderTests {
public TestDummyRawCoder() {
super(DummyRawErasureCoderFactory.class,
DummyRawErasureCoderFactory.class);
diff --git
a/hadoop-hdds/erasurecode/src/test/java/org/apache/ozone/erasurecode/rawcoder/TestNativeRSRawCoder.java
b/hadoop-hdds/erasurecode/src/test/java/org/apache/ozone/erasurecode/rawcoder/TestNativeRSRawCoder.java
index 3009d7d84c1..1d293752fe1 100644
---
a/hadoop-hdds/erasurecode/src/test/java/org/apache/ozone/erasurecode/rawcoder/TestNativeRSRawCoder.java
+++
b/hadoop-hdds/erasurecode/src/test/java/org/apache/ozone/erasurecode/rawcoder/TestNativeRSRawCoder.java
@@ -24,7 +24,7 @@
/**
* Test native raw Reed-solomon encoding and decoding.
*/
-public class TestNativeRSRawCoder extends TestRSRawCoderBase {
+public class TestNativeRSRawCoder extends RSRawCoderTests {
public TestNativeRSRawCoder() {
super(NativeRSRawErasureCoderFactory.class,
diff --git
a/hadoop-hdds/erasurecode/src/test/java/org/apache/ozone/erasurecode/rawcoder/TestNativeXORRawCoder.java
b/hadoop-hdds/erasurecode/src/test/java/org/apache/ozone/erasurecode/rawcoder/TestNativeXORRawCoder.java
index fa646f48afc..bb3340b51a6 100644
---
a/hadoop-hdds/erasurecode/src/test/java/org/apache/ozone/erasurecode/rawcoder/TestNativeXORRawCoder.java
+++
b/hadoop-hdds/erasurecode/src/test/java/org/apache/ozone/erasurecode/rawcoder/TestNativeXORRawCoder.java
@@ -24,7 +24,7 @@
/**
* Test NativeXOR encoding and decoding.
*/
-public class TestNativeXORRawCoder extends TestXORRawCoderBase {
+public class TestNativeXORRawCoder extends XORRawCoderTests {
public TestNativeXORRawCoder() {
super(NativeXORRawErasureCoderFactory.class,
diff --git
a/hadoop-hdds/erasurecode/src/test/java/org/apache/ozone/erasurecode/rawcoder/TestRSRawCoder.java
b/hadoop-hdds/erasurecode/src/test/java/org/apache/ozone/erasurecode/rawcoder/TestRSRawCoder.java
index ddcd5b8f064..d7abe69dc7c 100644
---
a/hadoop-hdds/erasurecode/src/test/java/org/apache/ozone/erasurecode/rawcoder/TestRSRawCoder.java
+++
b/hadoop-hdds/erasurecode/src/test/java/org/apache/ozone/erasurecode/rawcoder/TestRSRawCoder.java
@@ -22,7 +22,7 @@
/**
* Test the new raw Reed-solomon coder implemented in Java.
*/
-public class TestRSRawCoder extends TestRSRawCoderBase {
+public class TestRSRawCoder extends RSRawCoderTests {
public TestRSRawCoder() {
super(RSRawErasureCoderFactory.class, RSRawErasureCoderFactory.class);
diff --git
a/hadoop-hdds/erasurecode/src/test/java/org/apache/ozone/erasurecode/rawcoder/TestXORRawCoder.java
b/hadoop-hdds/erasurecode/src/test/java/org/apache/ozone/erasurecode/rawcoder/TestXORRawCoder.java
index f882e32536c..c51dc5703bb 100644
---
a/hadoop-hdds/erasurecode/src/test/java/org/apache/ozone/erasurecode/rawcoder/TestXORRawCoder.java
+++
b/hadoop-hdds/erasurecode/src/test/java/org/apache/ozone/erasurecode/rawcoder/TestXORRawCoder.java
@@ -20,7 +20,7 @@
/**
* Test pure Java XOR encoding and decoding.
*/
-public class TestXORRawCoder extends TestXORRawCoderBase {
+public class TestXORRawCoder extends XORRawCoderTests {
public TestXORRawCoder() {
super(XORRawErasureCoderFactory.class, XORRawErasureCoderFactory.class);
diff --git
a/hadoop-hdds/erasurecode/src/test/java/org/apache/ozone/erasurecode/rawcoder/TestXORRawCoderBase.java
b/hadoop-hdds/erasurecode/src/test/java/org/apache/ozone/erasurecode/rawcoder/XORRawCoderTests.java
similarity index 95%
rename from
hadoop-hdds/erasurecode/src/test/java/org/apache/ozone/erasurecode/rawcoder/TestXORRawCoderBase.java
rename to
hadoop-hdds/erasurecode/src/test/java/org/apache/ozone/erasurecode/rawcoder/XORRawCoderTests.java
index 084bc16c9b1..4bd6750cd35 100644
---
a/hadoop-hdds/erasurecode/src/test/java/org/apache/ozone/erasurecode/rawcoder/TestXORRawCoderBase.java
+++
b/hadoop-hdds/erasurecode/src/test/java/org/apache/ozone/erasurecode/rawcoder/XORRawCoderTests.java
@@ -22,9 +22,9 @@
/**
* Test base for raw XOR coders.
*/
-public abstract class TestXORRawCoderBase extends TestRawCoderBase {
+public abstract class XORRawCoderTests extends RawCoderTests {
- public TestXORRawCoderBase(
+ public XORRawCoderTests(
Class<? extends RawErasureCoderFactory> encoderFactoryClass,
Class<? extends RawErasureCoderFactory> decoderFactoryClass) {
super(encoderFactoryClass, decoderFactoryClass);
diff --git
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/TestMisReplicationHandler.java
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/MisReplicationHandlerTests.java
similarity index 99%
rename from
hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/TestMisReplicationHandler.java
rename to
hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/MisReplicationHandlerTests.java
index d65cd2afc08..4d3c42d84f4 100644
---
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/TestMisReplicationHandler.java
+++
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/MisReplicationHandlerTests.java
@@ -67,7 +67,7 @@
/**
* Tests the MisReplicationHandling functionalities to test implementations.
*/
-public abstract class TestMisReplicationHandler {
+public abstract class MisReplicationHandlerTests {
private ContainerInfo container;
private OzoneConfiguration conf;
diff --git
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/TestECMisReplicationHandler.java
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/TestECMisReplicationHandler.java
index eb45e3fc9d6..5bcba983a2c 100644
---
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/TestECMisReplicationHandler.java
+++
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/TestECMisReplicationHandler.java
@@ -57,7 +57,7 @@
/**
* Tests the ECMisReplicationHandling functionality.
*/
-public class TestECMisReplicationHandler extends TestMisReplicationHandler {
+public class TestECMisReplicationHandler extends MisReplicationHandlerTests {
private static final int DATA = 3;
private static final int PARITY = 2;
diff --git
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/TestRatisMisReplicationHandler.java
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/TestRatisMisReplicationHandler.java
index 29b2492475b..e5b25f8be4d 100644
---
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/TestRatisMisReplicationHandler.java
+++
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/TestRatisMisReplicationHandler.java
@@ -57,7 +57,7 @@
/**
* Tests the RatisReplicationHandling functionality.
*/
-public class TestRatisMisReplicationHandler extends TestMisReplicationHandler {
+public class TestRatisMisReplicationHandler extends MisReplicationHandlerTests
{
@BeforeEach
void setup(@TempDir File testDir) throws NodeNotFoundException,
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/conf/TestConfigurationFieldsBase.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/conf/ConfigurationFieldsTests.java
similarity index 99%
rename from
hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/conf/TestConfigurationFieldsBase.java
rename to
hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/conf/ConfigurationFieldsTests.java
index d87838287e4..41fffe6e137 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/conf/TestConfigurationFieldsBase.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/conf/ConfigurationFieldsTests.java
@@ -43,16 +43,16 @@
* Copied from Hadoop until the original one is migrated to JUnit5.
*/
@SuppressWarnings("VisibilityModifier")
-public abstract class TestConfigurationFieldsBase {
+public abstract class ConfigurationFieldsTests {
private static final Logger LOG = LoggerFactory.getLogger(
- TestConfigurationFieldsBase.class);
+ ConfigurationFieldsTests.class);
private static final Logger LOG_CONFIG = LoggerFactory.getLogger(
- "org.apache.hadoop.conf.TestConfigurationFieldsBase.config");
+ "org.apache.hadoop.conf.ConfigurationFieldsTests.config");
private static final Logger LOG_XML = LoggerFactory.getLogger(
- "org.apache.hadoop.conf.TestConfigurationFieldsBase.xml");
+ "org.apache.hadoop.conf.ConfigurationFieldsTests.xml");
/**
* Member variable for storing xml filename.
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestOzoneConfigurationFields.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestOzoneConfigurationFields.java
index d4a340b311a..ac3fe6cca8a 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestOzoneConfigurationFields.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestOzoneConfigurationFields.java
@@ -18,7 +18,7 @@
package org.apache.hadoop.ozone;
import java.util.Arrays;
-import org.apache.hadoop.conf.TestConfigurationFieldsBase;
+import org.apache.hadoop.conf.ConfigurationFieldsTests;
import org.apache.hadoop.hdds.HddsConfigKeys;
import org.apache.hadoop.hdds.recon.ReconConfigKeys;
import org.apache.hadoop.hdds.scm.ScmConfigKeys;
@@ -32,7 +32,7 @@
/**
* Tests if configuration constants documented in ozone-defaults.xml.
*/
-public class TestOzoneConfigurationFields extends TestConfigurationFieldsBase {
+public class TestOzoneConfigurationFields extends ConfigurationFieldsTests {
@Override
public void initializeMemberVariables() {
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/read/TestInputStreamBase.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/read/InputStreamTests.java
similarity index 99%
rename from
hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/read/TestInputStreamBase.java
rename to
hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/read/InputStreamTests.java
index 79ef3f50b25..7a2a0885bdc 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/read/TestInputStreamBase.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/read/InputStreamTests.java
@@ -41,7 +41,7 @@
import org.junit.jupiter.api.TestInstance;
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
-abstract class TestInputStreamBase {
+abstract class InputStreamTests {
static final int CHUNK_SIZE = 1024 * 1024; // 1MB
static final int FLUSH_SIZE = 2 * CHUNK_SIZE; // 2MB
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/read/TestChunkInputStream.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/read/TestChunkInputStream.java
index 730b76ecf0a..57f0ebcecf9 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/read/TestChunkInputStream.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/read/TestChunkInputStream.java
@@ -38,7 +38,7 @@
* Tests {@link ChunkInputStream}.
*/
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
-class TestChunkInputStream extends TestInputStreamBase {
+class TestChunkInputStream extends InputStreamTests {
/**
* Run the tests as a single test method to avoid needing a new mini-cluster
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/read/TestKeyInputStream.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/read/TestKeyInputStream.java
index 7fd87d47cf7..50dae1ee2d3 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/read/TestKeyInputStream.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/read/TestKeyInputStream.java
@@ -64,7 +64,7 @@
*/
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
-class TestKeyInputStream extends TestInputStreamBase {
+class TestKeyInputStream extends InputStreamTests {
/**
* This method does random seeks and reads and validates the reads are
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/read/TestStreamBlockInputStream.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/read/TestStreamBlockInputStream.java
index 44b753210d9..874d78ddde6 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/read/TestStreamBlockInputStream.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/read/TestStreamBlockInputStream.java
@@ -43,7 +43,7 @@
/**
* Tests {@link StreamBlockInputStream}.
*/
-public class TestStreamBlockInputStream extends TestInputStreamBase {
+public class TestStreamBlockInputStream extends InputStreamTests {
private static final Logger LOG =
LoggerFactory.getLogger(TestStreamBlockInputStream.class);
{
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/dn/scanner/TestContainerScannerIntegrationAbstract.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/dn/scanner/ContainerScannerIntegrationTests.java
similarity index 99%
rename from
hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/dn/scanner/TestContainerScannerIntegrationAbstract.java
rename to
hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/dn/scanner/ContainerScannerIntegrationTests.java
index f99157e7c9f..8defc894c9d 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/dn/scanner/TestContainerScannerIntegrationAbstract.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/dn/scanner/ContainerScannerIntegrationTests.java
@@ -60,7 +60,7 @@
/**
* This class tests the data scanner functionality.
*/
-public abstract class TestContainerScannerIntegrationAbstract {
+public abstract class ContainerScannerIntegrationTests {
private static MiniOzoneCluster cluster;
private static OzoneClient ozClient = null;
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/dn/scanner/TestBackgroundContainerDataScannerIntegration.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/dn/scanner/TestBackgroundContainerDataScannerIntegration.java
index 5e53eec00d3..bcfd013a7ad 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/dn/scanner/TestBackgroundContainerDataScannerIntegration.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/dn/scanner/TestBackgroundContainerDataScannerIntegration.java
@@ -46,7 +46,7 @@
* checks all data and metadata in the container.
*/
class TestBackgroundContainerDataScannerIntegration
- extends TestContainerScannerIntegrationAbstract {
+ extends ContainerScannerIntegrationTests {
@BeforeAll
static void init() throws Exception {
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/dn/scanner/TestBackgroundContainerMetadataScannerIntegration.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/dn/scanner/TestBackgroundContainerMetadataScannerIntegration.java
index b25df7e1136..a26093b8a3e 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/dn/scanner/TestBackgroundContainerMetadataScannerIntegration.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/dn/scanner/TestBackgroundContainerMetadataScannerIntegration.java
@@ -48,7 +48,7 @@
* faster than a full data scan.
*/
class TestBackgroundContainerMetadataScannerIntegration
- extends TestContainerScannerIntegrationAbstract {
+ extends ContainerScannerIntegrationTests {
private final GenericTestUtils.LogCapturer logCapturer =
GenericTestUtils.LogCapturer.log4j2(ContainerLogger.LOG_NAME);
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/dn/scanner/TestOnDemandContainerScannerIntegration.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/dn/scanner/TestOnDemandContainerScannerIntegration.java
index 5f1b049c028..14c0945ba9d 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/dn/scanner/TestOnDemandContainerScannerIntegration.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/dn/scanner/TestOnDemandContainerScannerIntegration.java
@@ -56,7 +56,7 @@
* container.
*/
class TestOnDemandContainerScannerIntegration
- extends TestContainerScannerIntegrationAbstract {
+ extends ContainerScannerIntegrationTests {
private final GenericTestUtils.LogCapturer logCapturer =
GenericTestUtils.LogCapturer.log4j2(ContainerLogger.LOG_NAME);
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestDataValidate.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/DataValidateTests.java
similarity index 99%
rename from
hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestDataValidate.java
rename to
hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/DataValidateTests.java
index 417eb47bdbe..f437b1c4412 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestDataValidate.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/DataValidateTests.java
@@ -34,7 +34,7 @@
/**
* Tests Freon, with MiniOzoneCluster and validate data.
*/
-public abstract class TestDataValidate {
+public abstract class DataValidateTests {
private static MiniOzoneCluster cluster = null;
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestDataValidateWithDummyContainers.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestDataValidateWithDummyContainers.java
index 05a762313c0..5de9c578fba 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestDataValidateWithDummyContainers.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestDataValidateWithDummyContainers.java
@@ -32,7 +32,7 @@
*/
public class TestDataValidateWithDummyContainers
- extends TestDataValidate {
+ extends DataValidateTests {
private static final Logger LOG =
LoggerFactory.getLogger(TestDataValidateWithDummyContainers.class);
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestDataValidateWithSafeByteOperations.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestDataValidateWithSafeByteOperations.java
index 86d0bbe84b6..28ad9a8abee 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestDataValidateWithSafeByteOperations.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestDataValidateWithSafeByteOperations.java
@@ -26,7 +26,7 @@
* Tests Freon, with MiniOzoneCluster and validate data.
*/
-public class TestDataValidateWithSafeByteOperations extends TestDataValidate {
+public class TestDataValidateWithSafeByteOperations extends DataValidateTests {
@BeforeAll
public static void init() throws Exception {
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestDataValidateWithUnsafeByteOperations.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestDataValidateWithUnsafeByteOperations.java
index e68a0a7838b..924758eaf08 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestDataValidateWithUnsafeByteOperations.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestDataValidateWithUnsafeByteOperations.java
@@ -25,7 +25,7 @@
/**
* Tests Freon, with MiniOzoneCluster and validate data.
*/
-public class TestDataValidateWithUnsafeByteOperations extends TestDataValidate
{
+public class TestDataValidateWithUnsafeByteOperations extends
DataValidateTests {
@BeforeAll
public static void init() throws Exception {
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerHAFollowerRead.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/OzoneManagerHAFollowerReadTests.java
similarity index 96%
rename from
hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerHAFollowerRead.java
rename to
hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/OzoneManagerHAFollowerReadTests.java
index cf5098959d4..2db23fdbe7e 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerHAFollowerRead.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/OzoneManagerHAFollowerReadTests.java
@@ -28,7 +28,7 @@
/**
* Base class for Ozone Manager HA follower read tests.
*/
-public abstract class TestOzoneManagerHAFollowerRead extends
AbstractOzoneManagerHATest {
+public abstract class OzoneManagerHAFollowerReadTests extends
AbstractOzoneManagerHATest {
@BeforeAll
public static void init() throws Exception {
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerHA.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/OzoneManagerHATests.java
similarity index 94%
rename from
hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerHA.java
rename to
hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/OzoneManagerHATests.java
index 36646cc924d..a29c1257799 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerHA.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/OzoneManagerHATests.java
@@ -22,7 +22,7 @@
/**
* Base class for Ozone Manager HA tests.
*/
-public abstract class TestOzoneManagerHA extends AbstractOzoneManagerHATest {
+public abstract class OzoneManagerHATests extends AbstractOzoneManagerHATest {
@BeforeAll
public static void init() throws Exception {
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestAddRemoveOzoneManager.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestAddRemoveOzoneManager.java
index 926d97c24e1..fe5269a1924 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestAddRemoveOzoneManager.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestAddRemoveOzoneManager.java
@@ -21,7 +21,7 @@
import static org.apache.hadoop.ozone.OzoneConsts.SCM_DUMMY_SERVICE_ID;
import static
org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_DECOMMISSIONED_NODES_KEY;
import static
org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_RATIS_SERVER_REQUEST_TIMEOUT_DEFAULT;
-import static org.apache.hadoop.ozone.om.TestOzoneManagerHA.createKey;
+import static org.apache.hadoop.ozone.om.OzoneManagerHATests.createKey;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerHAFollowerReadWithAllRunning.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerHAFollowerReadWithAllRunning.java
index 5dd6a6fecb6..06fdcc1674a 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerHAFollowerReadWithAllRunning.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerHAFollowerReadWithAllRunning.java
@@ -86,7 +86,7 @@
* Ozone Manager HA follower read tests where all OMs are running throughout
all tests.
* @see TestOzoneManagerHAFollowerReadWithAllRunning
*/
-public class TestOzoneManagerHAFollowerReadWithAllRunning extends
TestOzoneManagerHAFollowerRead {
+public class TestOzoneManagerHAFollowerReadWithAllRunning extends
OzoneManagerHAFollowerReadTests {
@Test
void testOMFollowerReadProxyProviderInitialization() {
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerHAFollowerReadWithStoppedNodes.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerHAFollowerReadWithStoppedNodes.java
index faa2d170fe3..d5792eaecd7 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerHAFollowerReadWithStoppedNodes.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerHAFollowerReadWithStoppedNodes.java
@@ -64,7 +64,7 @@
* @see TestOzoneManagerHAFollowerReadWithAllRunning
*/
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
-public class TestOzoneManagerHAFollowerReadWithStoppedNodes extends
TestOzoneManagerHAFollowerRead {
+public class TestOzoneManagerHAFollowerReadWithStoppedNodes extends
OzoneManagerHAFollowerReadTests {
/**
* After restarting OMs we need to wait
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerHAWithAllRunning.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerHAWithAllRunning.java
index 8636fe0c24e..a2f37e0db17 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerHAWithAllRunning.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerHAWithAllRunning.java
@@ -94,7 +94,7 @@
* Ozone Manager HA tests where all OMs are running throughout all tests.
* @see TestOzoneManagerHAWithStoppedNodes
*/
-class TestOzoneManagerHAWithAllRunning extends TestOzoneManagerHA {
+class TestOzoneManagerHAWithAllRunning extends OzoneManagerHATests {
@Test
void testFileOperationsWithRecursive() throws Exception {
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerHAWithStoppedNodes.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerHAWithStoppedNodes.java
index 66c4851c3b8..5913578fcd0 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerHAWithStoppedNodes.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerHAWithStoppedNodes.java
@@ -92,7 +92,7 @@
* @see TestOzoneManagerHAWithAllRunning
*/
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
-public class TestOzoneManagerHAWithStoppedNodes extends TestOzoneManagerHA {
+public class TestOzoneManagerHAWithStoppedNodes extends OzoneManagerHATests {
private static final org.slf4j.Logger LOG = LoggerFactory.getLogger(
TestOzoneManagerHAWithStoppedNodes.class);
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerPrepare.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerPrepare.java
index edc9b569b2a..93eeae9f3e4 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerPrepare.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerPrepare.java
@@ -64,7 +64,7 @@
* Test OM prepare against actual mini cluster.
*/
@Flaky("HDDS-5990")
-public class TestOzoneManagerPrepare extends TestOzoneManagerHA {
+public class TestOzoneManagerPrepare extends OzoneManagerHATests {
private static final String BUCKET = "bucket";
private static final String VOLUME = "volume";
private static final String KEY_PREFIX = "key";
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestOmSnapshot.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/OmSnapshotTests.java
similarity index 99%
rename from
hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestOmSnapshot.java
rename to
hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/OmSnapshotTests.java
index 462ea280303..79d041b7a33 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestOmSnapshot.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/OmSnapshotTests.java
@@ -172,7 +172,7 @@
* Abstract class to test OmSnapshot.
*/
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
-public abstract class TestOmSnapshot {
+public abstract class OmSnapshotTests {
static {
Logger.getLogger(ManagedRocksObjectUtils.class).setLevel(Level.DEBUG);
}
@@ -206,7 +206,7 @@ public abstract class TestOmSnapshot {
private final boolean createLinkedBucket;
private final Map<String, String> linkedBuckets = new HashMap<>();
- public TestOmSnapshot(BucketLayout newBucketLayout,
+ public OmSnapshotTests(BucketLayout newBucketLayout,
boolean newEnableFileSystemPaths,
boolean forceFullSnapDiff,
boolean disableNativeDiff,
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestOmSnapshotFsoWithNativeLib.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestOmSnapshotFsoWithNativeLib.java
index 5fb86f5b162..6bd3c7d555a 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestOmSnapshotFsoWithNativeLib.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestOmSnapshotFsoWithNativeLib.java
@@ -26,7 +26,7 @@
* Test OmSnapshot for FSO bucket type when native lib is enabled.
*/
@EnabledIfSystemProperty(named = ROCKS_TOOLS_NATIVE_PROPERTY, matches = "true")
-class TestOmSnapshotFsoWithNativeLib extends TestOmSnapshot {
+class TestOmSnapshotFsoWithNativeLib extends OmSnapshotTests {
TestOmSnapshotFsoWithNativeLib() throws Exception {
super(FILE_SYSTEM_OPTIMIZED, false, false, false, false);
}
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestOmSnapshotFsoWithoutNativeLib.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestOmSnapshotFsoWithoutNativeLib.java
index 149527f6f7b..379b9c40c6b 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestOmSnapshotFsoWithoutNativeLib.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestOmSnapshotFsoWithoutNativeLib.java
@@ -22,7 +22,7 @@
/**
* Test OmSnapshot for FSO bucket type when native lib is disabled.
*/
-public class TestOmSnapshotFsoWithoutNativeLib extends TestOmSnapshot {
+public class TestOmSnapshotFsoWithoutNativeLib extends OmSnapshotTests {
public TestOmSnapshotFsoWithoutNativeLib() throws Exception {
super(FILE_SYSTEM_OPTIMIZED, false, false, true, false);
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestOmSnapshotFsoWithoutNativeLibWithLinkedBuckets.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestOmSnapshotFsoWithoutNativeLibWithLinkedBuckets.java
index 4d58158fb2a..a3f65f4f27b 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestOmSnapshotFsoWithoutNativeLibWithLinkedBuckets.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestOmSnapshotFsoWithoutNativeLibWithLinkedBuckets.java
@@ -22,7 +22,7 @@
/**
* Test OmSnapshot for FSO bucket type when native lib is disabled.
*/
-public class TestOmSnapshotFsoWithoutNativeLibWithLinkedBuckets extends
TestOmSnapshot {
+public class TestOmSnapshotFsoWithoutNativeLibWithLinkedBuckets extends
OmSnapshotTests {
public TestOmSnapshotFsoWithoutNativeLibWithLinkedBuckets() throws Exception
{
super(FILE_SYSTEM_OPTIMIZED, false, false, true, true);
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestOmSnapshotObjectStore.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestOmSnapshotObjectStore.java
index b628448cd99..f96e9544799 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestOmSnapshotObjectStore.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestOmSnapshotObjectStore.java
@@ -22,7 +22,7 @@
/**
* Test OmSnapshot for Object Store bucket type.
*/
-public class TestOmSnapshotObjectStore extends TestOmSnapshot {
+public class TestOmSnapshotObjectStore extends OmSnapshotTests {
public TestOmSnapshotObjectStore() throws Exception {
super(OBJECT_STORE, false, false, false, false);
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestOmSnapshotWithoutBucketLinkingLegacy.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestOmSnapshotWithoutBucketLinkingLegacy.java
index ee301b4d76a..3ccfc197f6c 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestOmSnapshotWithoutBucketLinkingLegacy.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestOmSnapshotWithoutBucketLinkingLegacy.java
@@ -22,7 +22,7 @@
/**
* Test OmSnapshot for Legacy bucket type.
*/
-public class TestOmSnapshotWithoutBucketLinkingLegacy extends TestOmSnapshot {
+public class TestOmSnapshotWithoutBucketLinkingLegacy extends OmSnapshotTests {
public TestOmSnapshotWithoutBucketLinkingLegacy() throws Exception {
super(LEGACY, false, false, false, false);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
