This is an automated email from the ASF dual-hosted git repository.
kgyrtkirk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/druid.git
The following commit(s) were added to refs/heads/master by this push:
new 40057cab309 Update surefire to 3.5.4 ; upgrade NestedDataScanQueryTest
to use junit5 (#18847)
40057cab309 is described below
commit 40057cab30938367b39d3c8bd294dd32244c70cc
Author: Zoltan Haindrich <[email protected]>
AuthorDate: Thu Feb 5 09:10:45 2026 +0100
Update surefire to 3.5.4 ; upgrade NestedDataScanQueryTest to use junit5
(#18847)
---
pom.xml | 2 +-
processing/pom.xml | 5 ++
.../druid/query/scan/NestedDataScanQueryTest.java | 77 ++++++++++------------
3 files changed, 40 insertions(+), 44 deletions(-)
diff --git a/pom.xml b/pom.xml
index ac2e1dfed1b..b03aadb8ca8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1888,7 +1888,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>3.2.5</version>
+ <version>3.5.4</version>
<configuration>
<!-- locale settings must be set on the command line
before startup -->
<!-- set default options -->
diff --git a/processing/pom.xml b/processing/pom.xml
index eb74e83d060..dcc9da8a5de 100644
--- a/processing/pom.xml
+++ b/processing/pom.xml
@@ -448,6 +448,11 @@
<artifactId>junit-jupiter-params</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-migrationsupport</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
diff --git
a/processing/src/test/java/org/apache/druid/query/scan/NestedDataScanQueryTest.java
b/processing/src/test/java/org/apache/druid/query/scan/NestedDataScanQueryTest.java
index bb225eb06a1..8d5e66589c3 100644
---
a/processing/src/test/java/org/apache/druid/query/scan/NestedDataScanQueryTest.java
+++
b/processing/src/test/java/org/apache/druid/query/scan/NestedDataScanQueryTest.java
@@ -22,9 +22,6 @@ package org.apache.druid.query.scan;
import com.fasterxml.jackson.databind.Module;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
-import junitparams.JUnitParamsRunner;
-import junitparams.Parameters;
-import junitparams.naming.TestCaseName;
import org.apache.druid.data.input.impl.DimensionSchema;
import org.apache.druid.data.input.impl.DimensionsSpec;
import org.apache.druid.data.input.impl.LongDimensionSchema;
@@ -57,13 +54,16 @@ import
org.apache.druid.segment.nested.ObjectStorageEncoding;
import org.apache.druid.segment.nested.StructuredData;
import org.apache.druid.segment.virtual.NestedFieldVirtualColumn;
import org.apache.druid.testing.InitializedNullHandlingTest;
-import org.junit.After;
import org.junit.Assert;
-import org.junit.Assume;
import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Assumptions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.migrationsupport.EnableJUnit4MigrationSupport;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.junit.jupiter.params.provider.ValueSource;
import org.junit.rules.TemporaryFolder;
-import org.junit.runner.RunWith;
import java.io.IOException;
import java.util.ArrayList;
@@ -71,19 +71,19 @@ import java.util.List;
import java.util.stream.Collectors;
import java.util.stream.Stream;
-@RunWith(JUnitParamsRunner.class)
+@EnableJUnit4MigrationSupport
public class NestedDataScanQueryTest extends InitializedNullHandlingTest
{
private static final Logger LOG = new Logger(NestedDataScanQueryTest.class);
DefaultColumnFormatConfig DEFAULT_FORMAT = new
DefaultColumnFormatConfig(null, null, null);
- private final AggregationTestHelper helper;
- private final Closer closer;
-
@Rule
public final TemporaryFolder tempFolder = new TemporaryFolder();
+ private final AggregationTestHelper helper;
+ private final Closer closer;
+
public static Object[] getNestedColumnFormatSpec()
{
List<Object> specs = new ArrayList<>();
@@ -113,7 +113,7 @@ public class NestedDataScanQueryTest extends
InitializedNullHandlingTest
return specs.toArray();
}
- @After
+ @AfterEach
public void teardown() throws IOException
{
closer.close();
@@ -147,9 +147,8 @@ public class NestedDataScanQueryTest extends
InitializedNullHandlingTest
logResults(results);
}
- @Test
- @Parameters(method = "getNestedColumnFormatSpec")
- @TestCaseName("{0}")
+ @ParameterizedTest(name = "{0}")
+ @MethodSource("getNestedColumnFormatSpec")
public void testIngestAndScanSegmentsWithSpec(String name, boolean auto,
NestedCommonFormatColumnFormatSpec spec)
throws Exception
{
@@ -180,9 +179,8 @@ public class NestedDataScanQueryTest extends
InitializedNullHandlingTest
logResults(results);
}
- @Test
- @Parameters(method = "getNestedColumnFormatSpec")
- @TestCaseName("{0}")
+ @ParameterizedTest(name = "{0}")
+ @MethodSource("getNestedColumnFormatSpec")
public void testIngestAndScanSegmentsNumericWithSpec(
String name,
boolean auto,
@@ -233,9 +231,9 @@ public class NestedDataScanQueryTest extends
InitializedNullHandlingTest
}
}
- @Test
- @Parameters({"true", "false"})
- public void testIngestAndScanSegmentsNumericRollup(boolean rollup) throws
Exception
+ @ParameterizedTest
+ @ValueSource(booleans = {true, false})
+ public void testIngestAndScanSegmentsNumericRollup(Boolean rollup) throws
Exception
{
Query<ScanResultValue> scanQuery = queryBuilder()
.virtualColumns(new NestedFieldVirtualColumn("nest", "$.long", "long"))
@@ -326,9 +324,8 @@ public class NestedDataScanQueryTest extends
InitializedNullHandlingTest
Assert.assertEquals(resultsRealtime.get(0).getEvents().toString(),
resultsSegments.get(0).getEvents().toString());
}
- @Test
- @Parameters(method = "getNestedColumnFormatSpec")
- @TestCaseName("{0}")
+ @ParameterizedTest(name = "{0}")
+ @MethodSource("getNestedColumnFormatSpec")
public void testIngestAndScanSegmentsTsv(String name, boolean auto,
NestedCommonFormatColumnFormatSpec spec)
throws Exception
{
@@ -403,9 +400,8 @@ public class NestedDataScanQueryTest extends
InitializedNullHandlingTest
logResults(results);
}
- @Test
- @Parameters(method = "getNestedColumnFormatSpec")
- @TestCaseName("{0}")
+ @ParameterizedTest(name = "{0}")
+ @MethodSource("getNestedColumnFormatSpec")
public void testIngestAndScanSegmentsAndFilter(String name, boolean auto,
NestedCommonFormatColumnFormatSpec spec)
throws Exception
{
@@ -432,9 +428,8 @@ public class NestedDataScanQueryTest extends
InitializedNullHandlingTest
Assert.assertEquals(1, ((List) results.get(0).getEvents()).size());
}
- @Test
- @Parameters(method = "getNestedColumnFormatSpec")
- @TestCaseName("{0}")
+ @ParameterizedTest(name = "{0}")
+ @MethodSource("getNestedColumnFormatSpec")
public void testIngestAndScanSegmentsAndRangeFilter(
String name,
boolean auto,
@@ -488,9 +483,8 @@ public class NestedDataScanQueryTest extends
InitializedNullHandlingTest
Assert.assertEquals(resultsRealtime.get(0).getEvents().toString(),
resultsSegments.get(0).getEvents().toString());
}
- @Test
- @Parameters(method = "getNestedColumnFormatSpec")
- @TestCaseName("{0}")
+ @ParameterizedTest(name = "{0}")
+ @MethodSource("getNestedColumnFormatSpec")
public void testIngestAndScanSegmentsRealtimeAutoExplicit(
String name,
boolean auto,
@@ -498,7 +492,7 @@ public class NestedDataScanQueryTest extends
InitializedNullHandlingTest
) throws Exception
{
// Test with different column format spec
- Assume.assumeTrue(auto);
+ Assumptions.assumeTrue(auto);
DimensionsSpec dimensionsSpec = DimensionsSpec.builder()
.setDimensions(
List.of(
@@ -612,9 +606,8 @@ public class NestedDataScanQueryTest extends
InitializedNullHandlingTest
Assert.assertEquals(resultsRealtime.get(0).getEvents().toString(),
resultsSegments.get(0).getEvents().toString());
}
- @Test
- @Parameters(method = "getNestedColumnFormatSpec")
- @TestCaseName("{0}")
+ @ParameterizedTest(name = "{0}")
+ @MethodSource("getNestedColumnFormatSpec")
public void testIngestAndScanSegmentsAndFilterPartialPathArrayIndex(
String name,
boolean auto,
@@ -658,9 +651,8 @@ public class NestedDataScanQueryTest extends
InitializedNullHandlingTest
Assert.assertEquals(results.get(0).getEvents().toString(),
resultsRealtime.get(0).getEvents().toString());
}
- @Test
- @Parameters(method = "getNestedColumnFormatSpec")
- @TestCaseName("{0}")
+ @ParameterizedTest(name = "{0}")
+ @MethodSource("getNestedColumnFormatSpec")
public void testIngestAndScanSegmentsAndFilterPartialPath(
String name,
boolean auto,
@@ -701,9 +693,8 @@ public class NestedDataScanQueryTest extends
InitializedNullHandlingTest
Assert.assertEquals(results.get(0).getEvents().toString(),
resultsRealtime.get(0).getEvents().toString());
}
- @Test
- @Parameters(method = "getNestedColumnFormatSpec")
- @TestCaseName("{0}")
+ @ParameterizedTest(name = "{0}")
+ @MethodSource("getNestedColumnFormatSpec")
public void testIngestAndScanSegmentsNestedColumnNotNullFilter(
String name,
boolean auto,
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
