github-advanced-security[bot] commented on code in PR #19877:
URL: https://github.com/apache/druid/pull/19877#discussion_r3717702007


##########
extensions-core/stats/src/test/java/org/apache/druid/query/aggregation/variance/VarianceGroupByQueryTest.java:
##########
@@ -150,13 +135,23 @@
         .add("2011-04-02", "travel", 0d, 0d)
         .build(query);
 
-    Iterable<ResultRow> results = 
GroupByQueryRunnerTestHelper.runQuery(factory, runner, query);
+    Iterable<ResultRow> results = 
GroupByQueryRunnerTestHelper.runQuery(factory, mergedRunner, query);
     TestHelper.assertExpectedObjects(expectedResults, results, "variance");
   }
 
-  @Test
-  public void testGroupBy()
+  @MethodSource("constructorFeeder")
+  @ParameterizedTest(name = "{0}")
+  public void testGroupBy(
+      String testName,

Review Comment:
   ## CodeQL / Useless parameter
   
   The parameter 'testName' is never used.
   
   [Show more 
details](https://github.com/apache/druid/security/code-scanning/11619)



##########
extensions-core/stats/src/test/java/org/apache/druid/query/aggregation/variance/VarianceGroupByQueryTest.java:
##########
@@ -90,32 +80,27 @@
     return constructors;
   }
 
-  @BeforeClass
+  @BeforeAll
   public static void setUpClass()
   {
     if (BUFFER_POOLS == null) {
       BUFFER_POOLS = TestGroupByBuffers.createDefault();
     }
   }
 
-  public VarianceGroupByQueryTest(
+  @MethodSource("constructorFeeder")
+  @ParameterizedTest(name = "{0}")
+  public void testGroupByVarianceOnly(
       String testName,
       GroupByQueryConfig config,
       GroupByQueryRunnerFactory factory,
-      QueryRunner runner
+      QueryRunner<ResultRow> runner
   )
   {
-    this.testName = testName;
-    this.config = config;
-    this.factory = factory;
-    this.runner = factory.mergeRunners(Execs.directExecutor(), 
ImmutableList.of(runner));
-    this.queryBuilder = GroupByQuery.builder()
-                                    .setContext(ImmutableMap.of("vectorize", 
config.isVectorize()));
-  }
-
-  @Test
-  public void testGroupByVarianceOnly()
-  {
+    final QueryRunner<ResultRow> mergedRunner =
+        factory.mergeRunners(Execs.directExecutor(), ImmutableList.of(runner));

Review Comment:
   ## CodeQL / Deprecated method or constructor invocation
   
   Invoking [QueryRunnerFactory.mergeRunners](1) should be avoided because it 
has been deprecated.
   
   [Show more 
details](https://github.com/apache/druid/security/code-scanning/11622)



##########
extensions-core/stats/src/test/java/org/apache/druid/query/aggregation/variance/VarianceGroupByQueryTest.java:
##########
@@ -195,13 +190,23 @@
         .add("2011-04-02", "travel", 1L, 126L, 0d, 0d)
         .build(query);
 
-    Iterable<ResultRow> results = 
GroupByQueryRunnerTestHelper.runQuery(factory, runner, query);
+    Iterable<ResultRow> results = 
GroupByQueryRunnerTestHelper.runQuery(factory, mergedRunner, query);
     TestHelper.assertExpectedObjects(expectedResults, results, "groupBy");
   }
 
-  @Test
-  public void testPostAggHavingSpec()
+  @MethodSource("constructorFeeder")
+  @ParameterizedTest(name = "{0}")
+  public void testPostAggHavingSpec(
+      String testName,

Review Comment:
   ## CodeQL / Useless parameter
   
   The parameter 'testName' is never used.
   
   [Show more 
details](https://github.com/apache/druid/security/code-scanning/11618)



##########
extensions-core/stats/src/test/java/org/apache/druid/query/aggregation/variance/VarianceGroupByQueryTest.java:
##########
@@ -195,13 +190,23 @@
         .add("2011-04-02", "travel", 1L, 126L, 0d, 0d)
         .build(query);
 
-    Iterable<ResultRow> results = 
GroupByQueryRunnerTestHelper.runQuery(factory, runner, query);
+    Iterable<ResultRow> results = 
GroupByQueryRunnerTestHelper.runQuery(factory, mergedRunner, query);
     TestHelper.assertExpectedObjects(expectedResults, results, "groupBy");
   }
 
-  @Test
-  public void testPostAggHavingSpec()
+  @MethodSource("constructorFeeder")
+  @ParameterizedTest(name = "{0}")
+  public void testPostAggHavingSpec(
+      String testName,
+      GroupByQueryConfig config,
+      GroupByQueryRunnerFactory factory,
+      QueryRunner<ResultRow> runner
+  )
   {
+    final QueryRunner<ResultRow> mergedRunner =
+        factory.mergeRunners(Execs.directExecutor(), ImmutableList.of(runner));

Review Comment:
   ## CodeQL / Deprecated method or constructor invocation
   
   Invoking [QueryRunnerFactory.mergeRunners](1) should be avoided because it 
has been deprecated.
   
   [Show more 
details](https://github.com/apache/druid/security/code-scanning/11624)



##########
extensions-core/stats/src/test/java/org/apache/druid/query/aggregation/variance/VarianceGroupByQueryTest.java:
##########
@@ -250,13 +255,23 @@
         .add("2011-04-01", "premium", 6L, 4416L, 252279.2020389339, 
502.27403082275106)
         .build(query);
 
-    results = GroupByQueryRunnerTestHelper.runQuery(factory, runner, query);
+    results = GroupByQueryRunnerTestHelper.runQuery(factory, mergedRunner, 
query);
     TestHelper.assertExpectedObjects(expectedResults, results, "limitSpec");
   }
 
-  @Test
-  public void testGroupByZtestPostAgg()
+  @MethodSource("constructorFeeder")
+  @ParameterizedTest(name = "{0}")
+  public void testGroupByZtestPostAgg(
+      String testName,
+      GroupByQueryConfig config,
+      GroupByQueryRunnerFactory factory,
+      QueryRunner<ResultRow> runner
+  )
   {
+    final QueryRunner<ResultRow> mergedRunner =
+        factory.mergeRunners(Execs.directExecutor(), ImmutableList.of(runner));

Review Comment:
   ## CodeQL / Deprecated method or constructor invocation
   
   Invoking [QueryRunnerFactory.mergeRunners](1) should be avoided because it 
has been deprecated.
   
   [Show more 
details](https://github.com/apache/druid/security/code-scanning/11625)



##########
extensions-core/stats/src/test/java/org/apache/druid/query/aggregation/variance/VarianceGroupByQueryTest.java:
##########
@@ -150,13 +135,23 @@
         .add("2011-04-02", "travel", 0d, 0d)
         .build(query);
 
-    Iterable<ResultRow> results = 
GroupByQueryRunnerTestHelper.runQuery(factory, runner, query);
+    Iterable<ResultRow> results = 
GroupByQueryRunnerTestHelper.runQuery(factory, mergedRunner, query);
     TestHelper.assertExpectedObjects(expectedResults, results, "variance");
   }
 
-  @Test
-  public void testGroupBy()
+  @MethodSource("constructorFeeder")
+  @ParameterizedTest(name = "{0}")
+  public void testGroupBy(
+      String testName,
+      GroupByQueryConfig config,
+      GroupByQueryRunnerFactory factory,
+      QueryRunner<ResultRow> runner
+  )
   {
+    final QueryRunner<ResultRow> mergedRunner =
+        factory.mergeRunners(Execs.directExecutor(), ImmutableList.of(runner));

Review Comment:
   ## CodeQL / Deprecated method or constructor invocation
   
   Invoking [QueryRunnerFactory.mergeRunners](1) should be avoided because it 
has been deprecated.
   
   [Show more 
details](https://github.com/apache/druid/security/code-scanning/11623)



##########
extensions-core/stats/src/test/java/org/apache/druid/query/aggregation/variance/VarianceTimeseriesQueryTest.java:
##########
@@ -45,37 +44,38 @@
 import java.util.stream.Collectors;
 import java.util.stream.StreamSupport;
 
-@RunWith(Parameterized.class)
 public class VarianceTimeseriesQueryTest extends InitializedNullHandlingTest
 {
-  @Parameterized.Parameters(name = "{0}:descending={1}")
   public static Iterable<Object[]> constructorFeeder()
   {
     return 
StreamSupport.stream(TimeseriesQueryRunnerTest.constructorFeeder().spliterator(),
 false)
                         .map(constructor -> new Object[]{constructor[0], 
constructor[1], constructor[2], constructor[3]})
                         .collect(Collectors.toList());
   }
 
-  private final QueryRunner runner;
-  private final boolean descending;
-  private final Druids.TimeseriesQueryBuilder queryBuilder;
+  private boolean descending;
+  private Druids.TimeseriesQueryBuilder queryBuilder;
 
-  public VarianceTimeseriesQueryTest(
-      QueryRunner runner,
+  public void initVarianceTimeseriesQueryTest(
       boolean descending,
-      boolean vectorize,
-      List<AggregatorFactory> aggregatorFactories
+      boolean vectorize
   )
   {
-    this.runner = runner;
     this.descending = descending;
     this.queryBuilder = Druids.newTimeseriesQueryBuilder()
                               .context(ImmutableMap.of("vectorize", vectorize 
? "force" : "false"));
   }
 
-  @Test
-  public void testTimeseriesWithNullFilterOnNonExistentDimension()
+  @MethodSource("constructorFeeder")
+  @ParameterizedTest(name = "{0}:descending={1}")
+  public void testTimeseriesWithNullFilterOnNonExistentDimension(
+      QueryRunner runner,
+      boolean descending,
+      boolean vectorize,
+      List<AggregatorFactory> aggregatorFactories

Review Comment:
   ## CodeQL / Useless parameter
   
   The parameter 'aggregatorFactories' is never used.
   
   [Show more 
details](https://github.com/apache/druid/security/code-scanning/11621)



##########
extensions-core/stats/src/test/java/org/apache/druid/query/aggregation/variance/VarianceGroupByQueryTest.java:
##########
@@ -291,13 +306,23 @@
         .add("2011-04-01", "premium", 3L, 2900.0, 726.632270328514, 
527994.4562827706, 36.54266309285626)
         .build(query);
 
-    Iterable<ResultRow> results = 
GroupByQueryRunnerTestHelper.runQuery(factory, runner, query);
+    Iterable<ResultRow> results = 
GroupByQueryRunnerTestHelper.runQuery(factory, mergedRunner, query);
     TestHelper.assertExpectedObjects(expectedResults, results, "groupBy");
   }
 
-  @Test
-  public void testGroupByTestPvalueZscorePostAgg()
+  @MethodSource("constructorFeeder")
+  @ParameterizedTest(name = "{0}")
+  public void testGroupByTestPvalueZscorePostAgg(
+      String testName,

Review Comment:
   ## CodeQL / Useless parameter
   
   The parameter 'testName' is never used.
   
   [Show more 
details](https://github.com/apache/druid/security/code-scanning/11616)



##########
extensions-core/stats/src/test/java/org/apache/druid/query/aggregation/variance/VarianceGroupByQueryTest.java:
##########
@@ -250,13 +255,23 @@
         .add("2011-04-01", "premium", 6L, 4416L, 252279.2020389339, 
502.27403082275106)
         .build(query);
 
-    results = GroupByQueryRunnerTestHelper.runQuery(factory, runner, query);
+    results = GroupByQueryRunnerTestHelper.runQuery(factory, mergedRunner, 
query);
     TestHelper.assertExpectedObjects(expectedResults, results, "limitSpec");
   }
 
-  @Test
-  public void testGroupByZtestPostAgg()
+  @MethodSource("constructorFeeder")
+  @ParameterizedTest(name = "{0}")
+  public void testGroupByZtestPostAgg(
+      String testName,

Review Comment:
   ## CodeQL / Useless parameter
   
   The parameter 'testName' is never used.
   
   [Show more 
details](https://github.com/apache/druid/security/code-scanning/11617)



##########
extensions-core/stats/src/test/java/org/apache/druid/query/aggregation/variance/VarianceGroupByQueryTest.java:
##########
@@ -291,13 +306,23 @@
         .add("2011-04-01", "premium", 3L, 2900.0, 726.632270328514, 
527994.4562827706, 36.54266309285626)
         .build(query);
 
-    Iterable<ResultRow> results = 
GroupByQueryRunnerTestHelper.runQuery(factory, runner, query);
+    Iterable<ResultRow> results = 
GroupByQueryRunnerTestHelper.runQuery(factory, mergedRunner, query);
     TestHelper.assertExpectedObjects(expectedResults, results, "groupBy");
   }
 
-  @Test
-  public void testGroupByTestPvalueZscorePostAgg()
+  @MethodSource("constructorFeeder")
+  @ParameterizedTest(name = "{0}")
+  public void testGroupByTestPvalueZscorePostAgg(
+      String testName,
+      GroupByQueryConfig config,
+      GroupByQueryRunnerFactory factory,
+      QueryRunner<ResultRow> runner
+  )
   {
+    final QueryRunner<ResultRow> mergedRunner =
+        factory.mergeRunners(Execs.directExecutor(), ImmutableList.of(runner));

Review Comment:
   ## CodeQL / Deprecated method or constructor invocation
   
   Invoking [QueryRunnerFactory.mergeRunners](1) should be avoided because it 
has been deprecated.
   
   [Show more 
details](https://github.com/apache/druid/security/code-scanning/11626)



##########
extensions-core/stats/src/test/java/org/apache/druid/query/aggregation/variance/VarianceTimeseriesQueryTest.java:
##########
@@ -122,9 +122,16 @@
     assertExpectedResults(expectedResults, results);
   }
 
-  @Test
-  public void testEmptyTimeseries()
+  @MethodSource("constructorFeeder")
+  @ParameterizedTest(name = "{0}:descending={1}")
+  public void testEmptyTimeseries(
+      QueryRunner runner,
+      boolean descending,
+      boolean vectorize,
+      List<AggregatorFactory> aggregatorFactories

Review Comment:
   ## CodeQL / Useless parameter
   
   The parameter 'aggregatorFactories' is never used.
   
   [Show more 
details](https://github.com/apache/druid/security/code-scanning/11620)



-- 
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]

Reply via email to