Skip to content

Conversation

@kaijchen
Copy link
Member

@kaijchen kaijchen commented May 15, 2022

What changes were proposed in this pull request?

Migrate simple tests in hdds-server-scm to JUnit5, in which "simple" means without @Rule and @RunWith.

Steps of the migration, each corresponding to one commit:

  1. Run the following sed command against each file to substitute the class names.
  2. Fix errors mannually (c787267).
  3. Fix checkstyle (LineLength).
sed -i $1 \
	-e 's/org.junit.After;/org.junit.jupiter.api.AfterEach;/' \
	-e 's/@After$/@AfterEach/' \
	-e 's/org.junit.AfterClass;/org.junit.jupiter.api.AfterAll;/' \
	-e 's/@AfterClass$/@AfterAll/' \
	-e 's/org.junit.Before;/org.junit.jupiter.api.BeforeEach;/' \
	-e 's/@Before$/@BeforeEach/' \
	-e 's/org.junit.BeforeClass;/org.junit.jupiter.api.BeforeAll;/' \
	-e 's/@BeforeClass$/@BeforeAll/' \
	-e 's/org.junit.Test/org.junit.jupiter.api.Test/' \
	-e 's/org.junit.Assert/org.junit.jupiter.api.Assertions/' \
	-e 's/junit.framework.TestCase/org.junit.jupiter.api.Assertions/' \
	-e 's/Assert\./Assertions./'

What is the link to the Apache JIRA

https://issues.apache.org/jira/browse/HDDS-6750

How was this patch tested?

Full CI: https://github.com/kaijchen/ozone/actions/runs/2326780703

Copy link
Contributor

@adoroszlai adoroszlai left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @kaijchen for working on this. LGTM, but noticed two empty @After methods that can be removed.

@kaijchen
Copy link
Member Author

Thanks for reviewing @adoroszlai.

Copy link
Contributor

@adoroszlai adoroszlai left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @kaijchen for updating the patch.

@adoroszlai adoroszlai merged commit 5ba03da into apache:master May 17, 2022
@kaijchen kaijchen deleted the HDDS-6750 branch May 17, 2022 12:02
errose28 added a commit to errose28/ozone that referenced this pull request May 20, 2022
* master: (96 commits)
  HDDS-6738. Migrate tests with rules in hdds-server-framework to JUnit5 (apache#3415)
  HDDS-6650. S3MultipartUpload support update bucket usedNamespace. (apache#3404)
  HDDS-6491. Support FSO keys in getExpiredOpenKeys (apache#3226)
  HDDS-6596. EC: Support ListBlock from CoordinatorDN (apache#3410)
  HDDS-6737. Migrate parameterized tests in hdds-server-framework to JUnit5 (apache#3414)
  HDDS-6660: EC: Add the DN side Reconstruction Handler class. (apache#3399)
  HDDS-6750. Migrate simple tests in hdds-server-scm to JUnit5 (apache#3417)
  HDDS-6749. SCM includes itself as peer in addSCM request (apache#3413)
  HDDS-6657. Improve Ozone integrated Ranger configuration instructions (apache#3365)
  HDDS-6742. Audit operation category mismatch (apache#3407)
  HDDS-6748. Intermittent timeout in TestECBlockReconstructedInputStream#testReadDataWithUnbuffer (apache#3416)
  HDDS-6731. Migrate simple tests in hdds-server-framework to JUnit5 (apache#3412)
  HDDS-5919. In kubernetes OM HA has circular dependency on service availability (apache#3185)
  HDDS-6730. Migrate tests in hdds-tools to JUnit5 (apache#3402)
  HDDS-6630. Explicitly remove node after being chosen (apache#3332)
  HDDS-6560. Add general Grafana dashboard (apache#3285)
  HDDS-6704. EC: ReplicationManager - create version of ContainerReplicaCounts applicable to EC (apache#3405)
  HDDS-6680. Pre-Finalize behaviour for Bucket Layout Feature. (apache#3377)
  HDDS-6619. Add freon command to run r/w mix workload using ObjectStore APIs (apache#3383)
  HDDS-6734. ozone admin pipeline list CLI is not backward compatible (apache#3406)
  ...

Conflicts:
hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/scm/metadata/SCMMetadataStore.java
hadoop-hdds/interface-server/src/main/proto/SCMRatisProtocol.proto
hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/metadata/SCMDBDefinition.java
hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/metadata/SCMMetadataStoreImpl.java
hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants