HDDS-10081. Copy and migrate Hadoop base test classes to JUnit5#5939
HDDS-10081. Copy and migrate Hadoop base test classes to JUnit5#5939adoroszlai merged 6 commits intoapache:masterfrom
Conversation
|
@hemantk-12 can you please take a look? |
|
@swamirishi could you please take a look as well? |
|
This might seem to be a large change, but most of the code is copied from Hadoop. Since this code is intended to be temporary in Ozone, I don't think we need to inspect it in detail, or adapt to Ozone coding conventions (beyond what checkstyle/findbugs complains about). Having the same number of tests before/after the change, and with all tests passing, I think it should be fine. If it helps during review, the follow-up change (conversion of Ozone contract tests to JUnit5) can be peeked at: adoroszlai@708f49b. |
hemantk-12
left a comment
There was a problem hiding this comment.
Thanks @adoroszlai for the patch.
Approving it without paying much attention to details as it is copied.
|
Thanks @hemantk-12 for the review. I pushed a new commit that replaces an import, because it is no longer accepted in Ozone after HDDS-10099: -import org.apache.hadoop.thirdparty.com.google.common.base.Charsets;
+import com.google.common.base.Charsets; |
smengcl
left a comment
There was a problem hiding this comment.
lgtm at a glance. Thanks @adoroszlai
|
Thanks @hemantk-12, @smengcl for the review. |
…t5 (apache#5939)" This reverts commit 17be182.
…t5 (apache#5939)" This reverts commit 17be182. Conflicts: hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/contract/AbstractContractAppendTest.java hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/contract/AbstractContractConcatTest.java hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/contract/AbstractContractContentSummaryTest.java hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/contract/AbstractContractCopyFromLocalTest.java hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/contract/AbstractContractCreateTest.java hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/contract/AbstractContractDeleteTest.java hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/contract/AbstractContractEtagTest.java hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/contract/AbstractContractGetFileStatusTest.java hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/contract/AbstractContractLeaseRecoveryTest.java hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/contract/AbstractContractMkdirTest.java hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/contract/AbstractContractMultipartUploaderTest.java hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/contract/AbstractContractOpenTest.java hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/contract/AbstractContractRenameTest.java hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/contract/AbstractContractRootDirectoryTest.java hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/contract/AbstractContractSafeModeTest.java hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/contract/AbstractContractSeekTest.java hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/contract/AbstractContractSetTimesTest.java hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/contract/AbstractContractUnbufferTest.java hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/contract/AbstractFSContractTestBase.java hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/tools/contract/AbstractContractDistCpTest.java Change-Id: I7565c9d60e33f41b637a128fed33058bf429caae
…t5 (apache#5939)" This reverts commit 17be182. Conflicts: hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/contract/AbstractContractAppendTest.java hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/contract/AbstractContractConcatTest.java hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/contract/AbstractContractContentSummaryTest.java hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/contract/AbstractContractCopyFromLocalTest.java hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/contract/AbstractContractCreateTest.java hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/contract/AbstractContractDeleteTest.java hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/contract/AbstractContractEtagTest.java hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/contract/AbstractContractGetFileStatusTest.java hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/contract/AbstractContractLeaseRecoveryTest.java hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/contract/AbstractContractMkdirTest.java hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/contract/AbstractContractMultipartUploaderTest.java hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/contract/AbstractContractOpenTest.java hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/contract/AbstractContractRenameTest.java hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/contract/AbstractContractRootDirectoryTest.java hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/contract/AbstractContractSafeModeTest.java hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/contract/AbstractContractSeekTest.java hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/contract/AbstractContractSetTimesTest.java hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/contract/AbstractContractUnbufferTest.java hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/contract/AbstractFSContractTestBase.java hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/tools/contract/AbstractContractDistCpTest.java Change-Id: I7565c9d60e33f41b637a128fed33058bf429caae
What changes were proposed in this pull request?
Ozone relies on base test classes from Hadoop for:
TestOzoneConfigurationFieldsCurrently those base classes are implemented using JUnit4 (migration is in progress in Hadoop repo).
This PR:
TestConfigurationFieldsBaseis completely migrated.Abstract contract tests:
extends Assertremoved fromAbstractFSContractTestBaseandContractTestUtils@Testannotations left unchanged (still using JUnit4)Most Ozone contract tests use
Parameterizedrunner, which requires quite some refactoring for migrating to JUnit5. HDDS-10074 will finish that by refactoring Ozone's contract tests to JUnit5, and simply replacing@Testannotations in the abstract contract test base classes.https://issues.apache.org/jira/browse/HDDS-10081
How was this patch tested?
Existing integration (contract) check in CI: