This is an automated email from the ASF dual-hosted git repository.
zhangliang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new 4863b7e975b Refactor @ParameterizedTest name of agent module (#37849)
4863b7e975b is described below
commit 4863b7e975b95b1180ba90c8c3bf92a3a77fb8de
Author: Liang Zhang <[email protected]>
AuthorDate: Mon Jan 26 12:49:49 2026 +0800
Refactor @ParameterizedTest name of agent module (#37849)
---
.../plugin/core/util/SQLStatementUtilsTest.java | 35 +++++++++++-----------
.../core/advice/SQLParseCountAdviceTest.java | 29 +++++++++---------
2 files changed, 33 insertions(+), 31 deletions(-)
diff --git
a/agent/plugins/core/src/test/java/org/apache/shardingsphere/agent/plugin/core/util/SQLStatementUtilsTest.java
b/agent/plugins/core/src/test/java/org/apache/shardingsphere/agent/plugin/core/util/SQLStatementUtilsTest.java
index 7a7d9beb482..4b265058937 100644
---
a/agent/plugins/core/src/test/java/org/apache/shardingsphere/agent/plugin/core/util/SQLStatementUtilsTest.java
+++
b/agent/plugins/core/src/test/java/org/apache/shardingsphere/agent/plugin/core/util/SQLStatementUtilsTest.java
@@ -33,6 +33,7 @@ import
org.apache.shardingsphere.sql.parser.statement.core.statement.type.dml.In
import
org.apache.shardingsphere.sql.parser.statement.core.statement.type.dml.SelectStatement;
import
org.apache.shardingsphere.sql.parser.statement.core.statement.type.dml.UpdateStatement;
import
org.apache.shardingsphere.sql.parser.statement.core.statement.type.tcl.TCLStatement;
+import org.junit.jupiter.api.Named;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;
@@ -47,27 +48,27 @@ class SQLStatementUtilsTest {
@ParameterizedTest(name = "{index}: {0}")
@MethodSource("provideStatements")
- void assertGetType(final String name, final SQLStatement sqlStatement,
final SQLStatementType expectedType) {
+ void assertGetType(final SQLStatement sqlStatement, final SQLStatementType
expectedType) {
assertThat(SQLStatementUtils.getType(sqlStatement), is(expectedType));
}
private static Stream<Arguments> provideStatements() {
return Stream.of(
- Arguments.of("null", null, SQLStatementType.OTHER),
- Arguments.of("select", mock(SelectStatement.class),
SQLStatementType.SELECT),
- Arguments.of("insert", mock(InsertStatement.class),
SQLStatementType.INSERT),
- Arguments.of("update", mock(UpdateStatement.class),
SQLStatementType.UPDATE),
- Arguments.of("delete", mock(DeleteStatement.class),
SQLStatementType.DELETE),
- Arguments.of("dml-other", mock(DMLStatement.class),
SQLStatementType.DML),
- Arguments.of("ddl", mock(DDLStatement.class),
SQLStatementType.DDL),
- Arguments.of("dcl", mock(DCLStatement.class),
SQLStatementType.DCL),
- Arguments.of("dal", mock(DALStatement.class),
SQLStatementType.DAL),
- Arguments.of("tcl", mock(TCLStatement.class),
SQLStatementType.TCL),
- Arguments.of("rql", mock(RQLStatement.class),
SQLStatementType.RQL),
- Arguments.of("rdl", mock(RDLStatement.class),
SQLStatementType.RDL),
- Arguments.of("ral", mock(RALStatement.class),
SQLStatementType.RAL),
- Arguments.of("rul", mock(RULStatement.class),
SQLStatementType.RUL),
- Arguments.of("distsql-other", mock(DistSQLStatement.class),
SQLStatementType.OTHER),
- Arguments.of("other", mock(SQLStatement.class),
SQLStatementType.OTHER));
+ Arguments.of(Named.named("null", null),
SQLStatementType.OTHER),
+ Arguments.of(Named.named("select",
mock(SelectStatement.class)), SQLStatementType.SELECT),
+ Arguments.of(Named.named("insert",
mock(InsertStatement.class)), SQLStatementType.INSERT),
+ Arguments.of(Named.named("update",
mock(UpdateStatement.class)), SQLStatementType.UPDATE),
+ Arguments.of(Named.named("delete",
mock(DeleteStatement.class)), SQLStatementType.DELETE),
+ Arguments.of(Named.named("dml-other",
mock(DMLStatement.class)), SQLStatementType.DML),
+ Arguments.of(Named.named("ddl", mock(DDLStatement.class)),
SQLStatementType.DDL),
+ Arguments.of(Named.named("dcl", mock(DCLStatement.class)),
SQLStatementType.DCL),
+ Arguments.of(Named.named("dal", mock(DALStatement.class)),
SQLStatementType.DAL),
+ Arguments.of(Named.named("tcl", mock(TCLStatement.class)),
SQLStatementType.TCL),
+ Arguments.of(Named.named("rql", mock(RQLStatement.class)),
SQLStatementType.RQL),
+ Arguments.of(Named.named("rdl", mock(RDLStatement.class)),
SQLStatementType.RDL),
+ Arguments.of(Named.named("ral", mock(RALStatement.class)),
SQLStatementType.RAL),
+ Arguments.of(Named.named("rul", mock(RULStatement.class)),
SQLStatementType.RUL),
+ Arguments.of(Named.named("distsql-other",
mock(DistSQLStatement.class)), SQLStatementType.OTHER),
+ Arguments.of(Named.named("other", mock(SQLStatement.class)),
SQLStatementType.OTHER));
}
}
diff --git
a/agent/plugins/metrics/core/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/core/advice/SQLParseCountAdviceTest.java
b/agent/plugins/metrics/core/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/core/advice/SQLParseCountAdviceTest.java
index e909a591f0f..d833f5c69ce 100644
---
a/agent/plugins/metrics/core/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/core/advice/SQLParseCountAdviceTest.java
+++
b/agent/plugins/metrics/core/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/core/advice/SQLParseCountAdviceTest.java
@@ -39,6 +39,7 @@ import
org.apache.shardingsphere.sql.parser.statement.core.statement.type.dml.Up
import
org.apache.shardingsphere.sql.parser.statement.core.statement.type.tcl.CommitStatement;
import
org.apache.shardingsphere.sql.parser.statement.mysql.dal.show.database.MySQLShowDatabasesStatement;
import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Named;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;
@@ -59,26 +60,26 @@ class SQLParseCountAdviceTest {
((MetricsCollectorFixture) MetricsCollectorRegistry.get(config,
"FIXTURE")).reset();
}
- @ParameterizedTest(name = "{index}: type={0}")
+ @ParameterizedTest(name = "{index}: {0}")
@MethodSource("sqlStatements")
- void assertParseSQL(final String type, final SQLStatement sqlStatement,
final String expected) {
+ void assertParseSQL(final SQLStatement sqlStatement, final String
expected) {
new SQLParseCountAdvice().afterMethod(new TargetAdviceObjectFixture(),
mock(TargetAdviceMethod.class), new Object[]{}, sqlStatement, "FIXTURE");
assertThat(MetricsCollectorRegistry.get(config, "FIXTURE").toString(),
is(expected));
}
private static Stream<Arguments> sqlStatements() {
return Stream.of(
- Arguments.of("INSERT", mock(InsertStatement.class),
"INSERT=1"),
- Arguments.of("UPDATE", mock(UpdateStatement.class),
"UPDATE=1"),
- Arguments.of("DELETE", mock(DeleteStatement.class),
"DELETE=1"),
- Arguments.of("SELECT", mock(SelectStatement.class),
"SELECT=1"),
- Arguments.of("DDL", mock(CreateDatabaseStatement.class),
"DDL=1"),
- Arguments.of("DCL", mock(CreateUserStatement.class), "DCL=1"),
- Arguments.of("DAL", mock(MySQLShowDatabasesStatement.class),
"DAL=1"),
- Arguments.of("TCL", mock(CommitStatement.class), "TCL=1"),
- Arguments.of("RQL", new ShowStorageUnitsStatement(new
FromDatabaseSegment(0, new DatabaseSegment(0, 0, null)), null), "RQL=1"),
- Arguments.of("RDL", new RegisterStorageUnitStatement(false,
Collections.emptyList(), Collections.emptySet()), "RDL=1"),
- Arguments.of("RAL", new ShowMigrationListStatement(), "RAL=1"),
- Arguments.of("RUL", new ParseStatement("SELECT * FROM tbl"),
"RUL=1"));
+ Arguments.of(Named.named("INSERT",
mock(InsertStatement.class)), "INSERT=1"),
+ Arguments.of(Named.named("UPDATE",
mock(UpdateStatement.class)), "UPDATE=1"),
+ Arguments.of(Named.named("DELETE",
mock(DeleteStatement.class)), "DELETE=1"),
+ Arguments.of(Named.named("SELECT",
mock(SelectStatement.class)), "SELECT=1"),
+ Arguments.of(Named.named("DDL",
mock(CreateDatabaseStatement.class)), "DDL=1"),
+ Arguments.of(Named.named("DCL",
mock(CreateUserStatement.class)), "DCL=1"),
+ Arguments.of(Named.named("DAL",
mock(MySQLShowDatabasesStatement.class)), "DAL=1"),
+ Arguments.of(Named.named("TCL", mock(CommitStatement.class)),
"TCL=1"),
+ Arguments.of(Named.named("RQL", new
ShowStorageUnitsStatement(new FromDatabaseSegment(0, new DatabaseSegment(0, 0,
null)), null)), "RQL=1"),
+ Arguments.of(Named.named("RDL", new
RegisterStorageUnitStatement(false, Collections.emptyList(),
Collections.emptySet())), "RDL=1"),
+ Arguments.of(Named.named("RAL", new
ShowMigrationListStatement()), "RAL=1"),
+ Arguments.of(Named.named("RUL", new ParseStatement("SELECT *
FROM tbl")), "RUL=1"));
}
}
