77
88package org .elasticsearch .xpack .esql .ccq ;
99
10- import com .carrotsearch .randomizedtesting .annotations .ParametersFactory ;
1110import com .carrotsearch .randomizedtesting .annotations .ThreadLeakFilters ;
1211
1312import org .apache .http .HttpEntity ;
2221import org .elasticsearch .xpack .esql .qa .rest .EsqlSpecTestCase ;
2322import org .elasticsearch .xpack .ql .CsvSpecReader ;
2423import org .elasticsearch .xpack .ql .CsvSpecReader .CsvTestCase ;
25- import org .elasticsearch .xpack .ql .SpecReader ;
2624import org .junit .Before ;
2725import org .junit .ClassRule ;
2826import org .junit .rules .RuleChain ;
2927import org .junit .rules .TestRule ;
3028
3129import java .io .ByteArrayInputStream ;
3230import java .io .IOException ;
33- import java .net .URL ;
34- import java .util .ArrayList ;
3531import java .util .Arrays ;
36- import java .util .List ;
3732import java .util .Locale ;
3833import java .util .regex .Matcher ;
3934import java .util .regex .Pattern ;
4338import static org .elasticsearch .xpack .esql .CsvTestsDataLoader .CSV_DATASET_MAP ;
4439import static org .elasticsearch .xpack .esql .CsvTestsDataLoader .ENRICH_SOURCE_INDICES ;
4540import static org .elasticsearch .xpack .esql .CsvTestsDataLoader .loadDataSetIntoEs ;
46- import static org .elasticsearch .xpack .esql .qa .rest .EsqlSpecTestCase .Mode .SYNC ;
47- import static org .elasticsearch .xpack .ql .CsvSpecReader .specParser ;
48- import static org .elasticsearch .xpack .ql .TestUtils .classpathResources ;
4941import static org .mockito .ArgumentMatchers .any ;
5042import static org .mockito .Mockito .doAnswer ;
5143import static org .mockito .Mockito .mock ;
@@ -72,25 +64,6 @@ public void setup() throws IOException {
7264 }
7365 }
7466
75- @ ParametersFactory (argumentFormatting = "%2$s.%3$s" )
76- public static List <Object []> readScriptSpec () throws Exception {
77- List <URL > urls = classpathResources ("/*.csv-spec" );
78- assertTrue ("Not enough specs found " + urls , urls .size () > 0 );
79- List <Object []> specs = SpecReader .readScriptSpec (urls , specParser ());
80-
81- int len = specs .get (0 ).length ;
82- List <Object []> testcases = new ArrayList <>();
83- for (var spec : specs ) {
84- for (Mode mode : List .of (SYNC )) { // No async, for now
85- Object [] obj = new Object [len + 1 ];
86- System .arraycopy (spec , 0 , obj , 0 , len );
87- obj [len ] = mode ;
88- testcases .add (obj );
89- }
90- }
91- return testcases ;
92- }
93-
9467 public MultiClusterSpecIT (String fileName , String groupName , String testName , Integer lineNumber , CsvTestCase testCase , Mode mode ) {
9568 super (fileName , groupName , testName , lineNumber , convertToRemoteIndices (testCase ), mode );
9669 }
0 commit comments