FrankChen021 commented on code in PR #19909:
URL: https://github.com/apache/druid/pull/19909#discussion_r3737231930
##########
sql/src/test/java/org/apache/druid/sql/calcite/parser/DruidSqlParserUtilsTest.java:
##########
@@ -114,72 +105,78 @@
);
}
- TimeUnit timeUnit;
- Period period;
- Granularity expectedGranularity;
-
- public FloorToGranularityConversionTest(TimeUnit timeUnit, Period period,
Granularity expectedGranularity)
- {
- this.timeUnit = timeUnit;
- this.period = period;
- this.expectedGranularity = expectedGranularity;
- }
-
- @Test
- public void testGetGranularityFromFloor()
+ @ParameterizedTest(name = "{1}")
+ @MethodSource("constructorFeeder")
+ public void testGetGranularityFromFloor(TimeUnit timeUnit, Period period,
Granularity expectedGranularity)
{
// parserPos doesn't matter
final SqlNodeList args = new SqlNodeList(SqlParserPos.ZERO);
args.add(new SqlIdentifier("__time", SqlParserPos.ZERO));
- args.add(new SqlIntervalQualifier(this.timeUnit, null,
SqlParserPos.ZERO));
+ args.add(new SqlIntervalQualifier(timeUnit, null, SqlParserPos.ZERO));
final SqlNode floorCall = SqlStdOperatorTable.FLOOR.createCall(args);
Granularity actualGranularity =
DruidSqlParserUtils.convertSqlNodeToGranularity(floorCall);
- Assert.assertEquals(expectedGranularity, actualGranularity);
+ Assertions.assertEquals(expectedGranularity, actualGranularity);
}
/**
* Tests clause like "PARTITIONED BY 'day'"
*/
- @Test
- public void testConvertSqlNodeToGranularityAsLiteral()
+ @ParameterizedTest(name = "{1}")
+ @MethodSource("constructorFeeder")
+ public void testConvertSqlNodeToGranularityAsLiteral(
+ TimeUnit timeUnit,
+ Period period,
Review Comment:
Fixed in b86b850e58. This test now uses focused parameter sources: time-unit
cases receive only (TimeUnit, Granularity), while period cases receive only
(Period, Granularity). The unused period parameter has been removed, and
DruidSqlParserUtilsTest passes locally with 57 tests and 0 failures.
##########
sql/src/test/java/org/apache/druid/sql/calcite/parser/DruidSqlParserUtilsTest.java:
##########
@@ -114,72 +105,78 @@
);
}
- TimeUnit timeUnit;
- Period period;
- Granularity expectedGranularity;
-
- public FloorToGranularityConversionTest(TimeUnit timeUnit, Period period,
Granularity expectedGranularity)
- {
- this.timeUnit = timeUnit;
- this.period = period;
- this.expectedGranularity = expectedGranularity;
- }
-
- @Test
- public void testGetGranularityFromFloor()
+ @ParameterizedTest(name = "{1}")
+ @MethodSource("constructorFeeder")
+ public void testGetGranularityFromFloor(TimeUnit timeUnit, Period period,
Granularity expectedGranularity)
{
// parserPos doesn't matter
final SqlNodeList args = new SqlNodeList(SqlParserPos.ZERO);
args.add(new SqlIdentifier("__time", SqlParserPos.ZERO));
- args.add(new SqlIntervalQualifier(this.timeUnit, null,
SqlParserPos.ZERO));
+ args.add(new SqlIntervalQualifier(timeUnit, null, SqlParserPos.ZERO));
final SqlNode floorCall = SqlStdOperatorTable.FLOOR.createCall(args);
Granularity actualGranularity =
DruidSqlParserUtils.convertSqlNodeToGranularity(floorCall);
- Assert.assertEquals(expectedGranularity, actualGranularity);
+ Assertions.assertEquals(expectedGranularity, actualGranularity);
}
/**
* Tests clause like "PARTITIONED BY 'day'"
*/
- @Test
- public void testConvertSqlNodeToGranularityAsLiteral()
+ @ParameterizedTest(name = "{1}")
+ @MethodSource("constructorFeeder")
+ public void testConvertSqlNodeToGranularityAsLiteral(
+ TimeUnit timeUnit,
+ Period period,
+ Granularity expectedGranularity
+ )
{
SqlNode sqlNode = SqlLiteral.createCharString(timeUnit.name(),
SqlParserPos.ZERO);
Granularity actualGranularity =
DruidSqlParserUtils.convertSqlNodeToGranularity(sqlNode);
- Assert.assertEquals(expectedGranularity, actualGranularity);
+ Assertions.assertEquals(expectedGranularity, actualGranularity);
}
/**
* Tests clause like "PARTITIONED BY PT1D"
*/
- @Test
- public void testConvertSqlNodeToPeriodFormGranularityAsIdentifier()
+ @ParameterizedTest(name = "{1}")
+ @MethodSource("constructorFeeder")
+ public void testConvertSqlNodeToPeriodFormGranularityAsIdentifier(
+ TimeUnit timeUnit,
+ Period period,
+ Granularity expectedGranularity
+ )
{
SqlNode sqlNode = new SqlIdentifier(period.toString(),
SqlParserPos.ZERO);
Granularity actualGranularity =
DruidSqlParserUtils.convertSqlNodeToGranularity(sqlNode);
- Assert.assertEquals(expectedGranularity, actualGranularity);
+ Assertions.assertEquals(expectedGranularity, actualGranularity);
}
/**
* Tests clause like "PARTITIONED BY 'PT1D'"
*/
- @Test
- public void testConvertSqlNodeToPeriodFormGranularityAsLiteral()
+ @ParameterizedTest(name = "{1}")
+ @MethodSource("constructorFeeder")
+ public void testConvertSqlNodeToPeriodFormGranularityAsLiteral(
+ TimeUnit timeUnit,
Review Comment:
Fixed in b86b850e58. This test now uses the period-specific source with only
(Period, Granularity), so the unused timeUnit parameter has been removed.
DruidSqlParserUtilsTest passes locally with 57 tests and 0 failures.
##########
sql/src/test/java/org/apache/druid/sql/calcite/parser/DruidSqlParserUtilsTest.java:
##########
@@ -114,72 +105,78 @@
);
}
- TimeUnit timeUnit;
- Period period;
- Granularity expectedGranularity;
-
- public FloorToGranularityConversionTest(TimeUnit timeUnit, Period period,
Granularity expectedGranularity)
- {
- this.timeUnit = timeUnit;
- this.period = period;
- this.expectedGranularity = expectedGranularity;
- }
-
- @Test
- public void testGetGranularityFromFloor()
+ @ParameterizedTest(name = "{1}")
+ @MethodSource("constructorFeeder")
+ public void testGetGranularityFromFloor(TimeUnit timeUnit, Period period,
Granularity expectedGranularity)
{
// parserPos doesn't matter
final SqlNodeList args = new SqlNodeList(SqlParserPos.ZERO);
args.add(new SqlIdentifier("__time", SqlParserPos.ZERO));
- args.add(new SqlIntervalQualifier(this.timeUnit, null,
SqlParserPos.ZERO));
+ args.add(new SqlIntervalQualifier(timeUnit, null, SqlParserPos.ZERO));
final SqlNode floorCall = SqlStdOperatorTable.FLOOR.createCall(args);
Granularity actualGranularity =
DruidSqlParserUtils.convertSqlNodeToGranularity(floorCall);
- Assert.assertEquals(expectedGranularity, actualGranularity);
+ Assertions.assertEquals(expectedGranularity, actualGranularity);
}
/**
* Tests clause like "PARTITIONED BY 'day'"
*/
- @Test
- public void testConvertSqlNodeToGranularityAsLiteral()
+ @ParameterizedTest(name = "{1}")
+ @MethodSource("constructorFeeder")
+ public void testConvertSqlNodeToGranularityAsLiteral(
+ TimeUnit timeUnit,
+ Period period,
+ Granularity expectedGranularity
+ )
{
SqlNode sqlNode = SqlLiteral.createCharString(timeUnit.name(),
SqlParserPos.ZERO);
Granularity actualGranularity =
DruidSqlParserUtils.convertSqlNodeToGranularity(sqlNode);
- Assert.assertEquals(expectedGranularity, actualGranularity);
+ Assertions.assertEquals(expectedGranularity, actualGranularity);
}
/**
* Tests clause like "PARTITIONED BY PT1D"
*/
- @Test
- public void testConvertSqlNodeToPeriodFormGranularityAsIdentifier()
+ @ParameterizedTest(name = "{1}")
+ @MethodSource("constructorFeeder")
+ public void testConvertSqlNodeToPeriodFormGranularityAsIdentifier(
+ TimeUnit timeUnit,
Review Comment:
Fixed in b86b850e58. This test now uses the period-specific source with only
(Period, Granularity), so the unused timeUnit parameter has been removed.
DruidSqlParserUtilsTest passes locally with 57 tests and 0 failures.
##########
sql/src/test/java/org/apache/druid/sql/calcite/parser/DruidSqlParserUtilsTest.java:
##########
@@ -114,72 +105,78 @@
);
}
- TimeUnit timeUnit;
- Period period;
- Granularity expectedGranularity;
-
- public FloorToGranularityConversionTest(TimeUnit timeUnit, Period period,
Granularity expectedGranularity)
- {
- this.timeUnit = timeUnit;
- this.period = period;
- this.expectedGranularity = expectedGranularity;
- }
-
- @Test
- public void testGetGranularityFromFloor()
+ @ParameterizedTest(name = "{1}")
+ @MethodSource("constructorFeeder")
+ public void testGetGranularityFromFloor(TimeUnit timeUnit, Period period,
Granularity expectedGranularity)
Review Comment:
Fixed in b86b850e58. This test now uses focused parameter sources: time-unit
cases receive only (TimeUnit, Granularity), while period cases receive only
(Period, Granularity). The unused period parameter has been removed, and
DruidSqlParserUtilsTest passes locally with 57 tests and 0 failures.
--
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]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
