chia7712 commented on code in PR #22518:
URL: https://github.com/apache/kafka/pull/22518#discussion_r3387298002
##########
server-common/src/test/java/org/apache/kafka/server/common/MetadataVersionTest.java:
##########
@@ -135,60 +91,32 @@ public void testMetadataVersionsToString() {
MetadataVersion.metadataVersionsToString(MetadataVersion.IBP_3_5_IV0,
MetadataVersion.IBP_3_6_IV0));
}
- @Test
- public void testShortVersion() {
- assertEquals("3.3", IBP_3_3_IV3.shortVersion());
- assertEquals("3.4", IBP_3_4_IV0.shortVersion());
- assertEquals("3.5", IBP_3_5_IV0.shortVersion());
- assertEquals("3.5", IBP_3_5_IV1.shortVersion());
- assertEquals("3.5", IBP_3_5_IV2.shortVersion());
- assertEquals("3.6", IBP_3_6_IV0.shortVersion());
- assertEquals("3.6", IBP_3_6_IV1.shortVersion());
- assertEquals("3.6", IBP_3_6_IV2.shortVersion());
- assertEquals("3.7", IBP_3_7_IV0.shortVersion());
- assertEquals("3.7", IBP_3_7_IV1.shortVersion());
- assertEquals("3.7", IBP_3_7_IV2.shortVersion());
- assertEquals("3.7", IBP_3_7_IV3.shortVersion());
- assertEquals("3.7", IBP_3_7_IV4.shortVersion());
- assertEquals("3.8", IBP_3_8_IV0.shortVersion());
- assertEquals("3.9", IBP_3_9_IV0.shortVersion());
- assertEquals("4.0", IBP_4_0_IV0.shortVersion());
- assertEquals("4.0", IBP_4_0_IV1.shortVersion());
- assertEquals("4.0", IBP_4_0_IV2.shortVersion());
- assertEquals("4.0", IBP_4_0_IV3.shortVersion());
- assertEquals("4.1", IBP_4_1_IV0.shortVersion());
- assertEquals("4.1", IBP_4_1_IV1.shortVersion());
- assertEquals("4.2", IBP_4_2_IV0.shortVersion());
- assertEquals("4.2", IBP_4_2_IV1.shortVersion());
- assertEquals("4.3", IBP_4_3_IV0.shortVersion());
+ @ParameterizedTest
+ @EnumSource(value = MetadataVersion.class)
+ public void testShortVersion(MetadataVersion metadataVersion) {
+ String expectedShortVersion = deriveShortVersion(metadataVersion);
+ assertEquals(expectedShortVersion, metadataVersion.shortVersion());
}
- @Test
- public void testVersion() {
- assertEquals("3.3-IV3", IBP_3_3_IV3.version());
- assertEquals("3.4-IV0", IBP_3_4_IV0.version());
- assertEquals("3.5-IV0", IBP_3_5_IV0.version());
- assertEquals("3.5-IV1", IBP_3_5_IV1.version());
- assertEquals("3.5-IV2", IBP_3_5_IV2.version());
- assertEquals("3.6-IV0", IBP_3_6_IV0.version());
- assertEquals("3.6-IV1", IBP_3_6_IV1.version());
- assertEquals("3.6-IV2", IBP_3_6_IV2.version());
- assertEquals("3.7-IV0", IBP_3_7_IV0.version());
- assertEquals("3.7-IV1", IBP_3_7_IV1.version());
- assertEquals("3.7-IV2", IBP_3_7_IV2.version());
- assertEquals("3.7-IV3", IBP_3_7_IV3.version());
- assertEquals("3.7-IV4", IBP_3_7_IV4.version());
- assertEquals("3.8-IV0", IBP_3_8_IV0.version());
- assertEquals("3.9-IV0", IBP_3_9_IV0.version());
- assertEquals("4.0-IV0", IBP_4_0_IV0.version());
- assertEquals("4.0-IV1", IBP_4_0_IV1.version());
- assertEquals("4.0-IV2", IBP_4_0_IV2.version());
- assertEquals("4.0-IV3", IBP_4_0_IV3.version());
- assertEquals("4.1-IV0", IBP_4_1_IV0.version());
- assertEquals("4.1-IV1", IBP_4_1_IV1.version());
- assertEquals("4.2-IV0", IBP_4_2_IV0.version());
- assertEquals("4.2-IV1", IBP_4_2_IV1.version());
- assertEquals("4.3-IV0", IBP_4_3_IV0.version());
+ @ParameterizedTest
+ @EnumSource(value = MetadataVersion.class)
+ public void testVersion(MetadataVersion metadataVersion) {
+ String expectedVersion = deriveVersion(metadataVersion);
Review Comment:
ditto
##########
server-common/src/test/java/org/apache/kafka/server/common/MetadataVersionTest.java:
##########
@@ -135,60 +91,32 @@ public void testMetadataVersionsToString() {
MetadataVersion.metadataVersionsToString(MetadataVersion.IBP_3_5_IV0,
MetadataVersion.IBP_3_6_IV0));
}
- @Test
- public void testShortVersion() {
- assertEquals("3.3", IBP_3_3_IV3.shortVersion());
- assertEquals("3.4", IBP_3_4_IV0.shortVersion());
- assertEquals("3.5", IBP_3_5_IV0.shortVersion());
- assertEquals("3.5", IBP_3_5_IV1.shortVersion());
- assertEquals("3.5", IBP_3_5_IV2.shortVersion());
- assertEquals("3.6", IBP_3_6_IV0.shortVersion());
- assertEquals("3.6", IBP_3_6_IV1.shortVersion());
- assertEquals("3.6", IBP_3_6_IV2.shortVersion());
- assertEquals("3.7", IBP_3_7_IV0.shortVersion());
- assertEquals("3.7", IBP_3_7_IV1.shortVersion());
- assertEquals("3.7", IBP_3_7_IV2.shortVersion());
- assertEquals("3.7", IBP_3_7_IV3.shortVersion());
- assertEquals("3.7", IBP_3_7_IV4.shortVersion());
- assertEquals("3.8", IBP_3_8_IV0.shortVersion());
- assertEquals("3.9", IBP_3_9_IV0.shortVersion());
- assertEquals("4.0", IBP_4_0_IV0.shortVersion());
- assertEquals("4.0", IBP_4_0_IV1.shortVersion());
- assertEquals("4.0", IBP_4_0_IV2.shortVersion());
- assertEquals("4.0", IBP_4_0_IV3.shortVersion());
- assertEquals("4.1", IBP_4_1_IV0.shortVersion());
- assertEquals("4.1", IBP_4_1_IV1.shortVersion());
- assertEquals("4.2", IBP_4_2_IV0.shortVersion());
- assertEquals("4.2", IBP_4_2_IV1.shortVersion());
- assertEquals("4.3", IBP_4_3_IV0.shortVersion());
+ @ParameterizedTest
+ @EnumSource(value = MetadataVersion.class)
+ public void testShortVersion(MetadataVersion metadataVersion) {
+ String expectedShortVersion = deriveShortVersion(metadataVersion);
Review Comment:
While `deriveShortVersion` is used by this method, we could just inline it.
##########
server-common/src/test/java/org/apache/kafka/server/common/MetadataVersionTest.java:
##########
@@ -135,60 +91,32 @@ public void testMetadataVersionsToString() {
MetadataVersion.metadataVersionsToString(MetadataVersion.IBP_3_5_IV0,
MetadataVersion.IBP_3_6_IV0));
}
- @Test
- public void testShortVersion() {
- assertEquals("3.3", IBP_3_3_IV3.shortVersion());
- assertEquals("3.4", IBP_3_4_IV0.shortVersion());
- assertEquals("3.5", IBP_3_5_IV0.shortVersion());
- assertEquals("3.5", IBP_3_5_IV1.shortVersion());
- assertEquals("3.5", IBP_3_5_IV2.shortVersion());
- assertEquals("3.6", IBP_3_6_IV0.shortVersion());
- assertEquals("3.6", IBP_3_6_IV1.shortVersion());
- assertEquals("3.6", IBP_3_6_IV2.shortVersion());
- assertEquals("3.7", IBP_3_7_IV0.shortVersion());
- assertEquals("3.7", IBP_3_7_IV1.shortVersion());
- assertEquals("3.7", IBP_3_7_IV2.shortVersion());
- assertEquals("3.7", IBP_3_7_IV3.shortVersion());
- assertEquals("3.7", IBP_3_7_IV4.shortVersion());
- assertEquals("3.8", IBP_3_8_IV0.shortVersion());
- assertEquals("3.9", IBP_3_9_IV0.shortVersion());
- assertEquals("4.0", IBP_4_0_IV0.shortVersion());
- assertEquals("4.0", IBP_4_0_IV1.shortVersion());
- assertEquals("4.0", IBP_4_0_IV2.shortVersion());
- assertEquals("4.0", IBP_4_0_IV3.shortVersion());
- assertEquals("4.1", IBP_4_1_IV0.shortVersion());
- assertEquals("4.1", IBP_4_1_IV1.shortVersion());
- assertEquals("4.2", IBP_4_2_IV0.shortVersion());
- assertEquals("4.2", IBP_4_2_IV1.shortVersion());
- assertEquals("4.3", IBP_4_3_IV0.shortVersion());
+ @ParameterizedTest
+ @EnumSource(value = MetadataVersion.class)
+ public void testShortVersion(MetadataVersion metadataVersion) {
+ String expectedShortVersion = deriveShortVersion(metadataVersion);
+ assertEquals(expectedShortVersion, metadataVersion.shortVersion());
}
- @Test
- public void testVersion() {
- assertEquals("3.3-IV3", IBP_3_3_IV3.version());
- assertEquals("3.4-IV0", IBP_3_4_IV0.version());
- assertEquals("3.5-IV0", IBP_3_5_IV0.version());
- assertEquals("3.5-IV1", IBP_3_5_IV1.version());
- assertEquals("3.5-IV2", IBP_3_5_IV2.version());
- assertEquals("3.6-IV0", IBP_3_6_IV0.version());
- assertEquals("3.6-IV1", IBP_3_6_IV1.version());
- assertEquals("3.6-IV2", IBP_3_6_IV2.version());
- assertEquals("3.7-IV0", IBP_3_7_IV0.version());
- assertEquals("3.7-IV1", IBP_3_7_IV1.version());
- assertEquals("3.7-IV2", IBP_3_7_IV2.version());
- assertEquals("3.7-IV3", IBP_3_7_IV3.version());
- assertEquals("3.7-IV4", IBP_3_7_IV4.version());
- assertEquals("3.8-IV0", IBP_3_8_IV0.version());
- assertEquals("3.9-IV0", IBP_3_9_IV0.version());
- assertEquals("4.0-IV0", IBP_4_0_IV0.version());
- assertEquals("4.0-IV1", IBP_4_0_IV1.version());
- assertEquals("4.0-IV2", IBP_4_0_IV2.version());
- assertEquals("4.0-IV3", IBP_4_0_IV3.version());
- assertEquals("4.1-IV0", IBP_4_1_IV0.version());
- assertEquals("4.1-IV1", IBP_4_1_IV1.version());
- assertEquals("4.2-IV0", IBP_4_2_IV0.version());
- assertEquals("4.2-IV1", IBP_4_2_IV1.version());
- assertEquals("4.3-IV0", IBP_4_3_IV0.version());
+ @ParameterizedTest
+ @EnumSource(value = MetadataVersion.class)
+ public void testVersion(MetadataVersion metadataVersion) {
+ String expectedVersion = deriveVersion(metadataVersion);
+ assertEquals(expectedVersion, metadataVersion.version());
+ }
+
+ private static final Pattern ENUM_NAME_PATTERN =
Pattern.compile("IBP_(\\d+)_(\\d+)_IV(\\d+)");
Review Comment:
Would you mind moving it to line 49?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
