(shardingsphere) branch master updated: Clean unused scenarioFiles and scenario in pipeline E2E (#37898)

[zhonghongsheng]

This is an automated email from the ASF dual-hosted git repository.

zhonghongsheng 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 312a9b38bac Clean unused scenarioFiles and scenario in pipeline E2E 
(#37898)
312a9b38bac is described below

commit 312a9b38bacd2c7454dfe4391a9f25182c45c771
Author: Hongsheng Zhong <zhonghongsh...@apache.org>
AuthorDate: Fri Jan 30 13:51:38 2026 +0800

    Clean unused scenarioFiles and scenario in pipeline E2E (#37898)
    
    * Delete PipelineTestParameter.scenario
    
    * Delete PipelineE2EDatabaseSettings.scenarioFiles
---
 .../pipeline/framework/param/PipelineE2ESettings.java        |  7 -------
 .../param/PipelineE2ETestCaseArgumentsProvider.java          | 12 ++++--------
 .../pipeline/framework/param/PipelineTestParameter.java      |  3 ---
 3 files changed, 4 insertions(+), 18 deletions(-)

diff --git 
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/framework/param/PipelineE2ESettings.java
 
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/framework/param/PipelineE2ESettings.java
index b06a00f869c..035b40a16eb 100644
--- 
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/framework/param/PipelineE2ESettings.java
+++ 
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/framework/param/PipelineE2ESettings.java
@@ -57,13 +57,6 @@ public @interface PipelineE2ESettings {
          */
         String type();
         
-        /**
-         * Get scenario files.
-         * 
-         * @return scenario files
-         */
-        String[] scenarioFiles() default {};
-        
         /**
          * Get table structures.
          *
diff --git 
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/framework/param/PipelineE2ETestCaseArgumentsProvider.java
 
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/framework/param/PipelineE2ETestCaseArgumentsProvider.java
index 8041de4ce06..d26931f1b40 100644
--- 
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/framework/param/PipelineE2ETestCaseArgumentsProvider.java
+++ 
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/framework/param/PipelineE2ETestCaseArgumentsProvider.java
@@ -52,16 +52,12 @@ public final class PipelineE2ETestCaseArgumentsProvider 
implements ArgumentsProv
         DatabaseType databaseType = 
TypedSPILoader.getService(DatabaseType.class, databaseSettings.type());
         Collection<String> databaseImages = 
E2ETestEnvironment.getInstance().getDockerEnvironment().getDatabaseImages(databaseType);
         return settings.fetchSingle() && !databaseImages.isEmpty()
-                ? provideArguments(databaseType, 
databaseImages.iterator().next(), databaseSettings.scenarioFiles(), 
databaseSettings.tableStructures(), databaseSettings.storageContainerCount())
-                : databaseImages.stream().flatMap(each -> 
provideArguments(databaseType, each, databaseSettings.scenarioFiles(),
-                        databaseSettings.tableStructures(), 
databaseSettings.storageContainerCount()).stream()).toList();
+                ? provideArguments(databaseType, 
databaseImages.iterator().next(), databaseSettings.tableStructures(), 
databaseSettings.storageContainerCount())
+                : databaseImages.stream().flatMap(each -> 
provideArguments(databaseType, each, databaseSettings.tableStructures(), 
databaseSettings.storageContainerCount()).stream()).toList();
     }
     
     private Collection<Arguments> provideArguments(final DatabaseType 
databaseType, final String databaseContainerImage,
-                                                   final String[] 
scenarioFiles, final String[] tableStructures, final int storageContainerCount) 
{
-        if (scenarioFiles.length > 0) {
-            return Arrays.stream(scenarioFiles).map(each -> Arguments.of(new 
PipelineTestParameter(databaseType, databaseContainerImage, each, null, 
storageContainerCount))).toList();
-        }
-        return Arrays.stream(tableStructures).map(each -> Arguments.of(new 
PipelineTestParameter(databaseType, databaseContainerImage, null, each, 
storageContainerCount))).toList();
+                                                   final String[] 
tableStructures, final int storageContainerCount) {
+        return Arrays.stream(tableStructures).map(each -> Arguments.of(new 
PipelineTestParameter(databaseType, databaseContainerImage, each, 
storageContainerCount))).toList();
     }
 }
diff --git 
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/framework/param/PipelineTestParameter.java
 
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/framework/param/PipelineTestParameter.java
index 0f8e28456ac..00817183d45 100644
--- 
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/framework/param/PipelineTestParameter.java
+++ 
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/framework/param/PipelineTestParameter.java
@@ -31,9 +31,6 @@ public final class PipelineTestParameter {
     
     private final String databaseContainerImage;
     
-    // TODO It's not scenario. Remove it later
-    private final String scenario;
-    
     private final String tableStructure;
     
     private final int storageContainerCount;