You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@druid.apache.org by "FrankChen021 (via GitHub)" <gi...@apache.org> on 2026/08/04 14:08:36 UTC
[PR] test: migrate extension-core format and lookup tests to JUnit 5 (druid)
FrankChen021 opened a new pull request, #19876:
URL: https://github.com/apache/druid/pull/19876
Part of #13948.
Builds on [PR #19875](https://github.com/apache/druid/pull/19875).
### Description
This PR migrates the JUnit 4 tests in the second extension-core batch to JUnit 5:
- avro-extensions
- parquet-extensions
- hdfs-storage
- lookups-cached-single
- kinesis-indexing-service
The tests now use Jupiter assertions, lifecycle annotations, parameterized tests, nested tests, and temporary-directory support. Transitional JUnit 4 test dependencies remain only where migrated tests inherit shared JUnit 4 fixtures from indexing-service or use the shared TestDerbyConnector utility; those dependencies can be removed after the shared fixtures are migrated.
### Validation
Ran the complete changed-test set for all five modules with Maven. The reactor completed successfully with no failures, errors, or flakes.
### Related migration PR
- Previous batch: #19875
--
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: commits-unsubscribe@druid.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For additional commands, e-mail: commits-help@druid.apache.org
Re: [PR] test: migrate extension-core format and lookup tests to JUnit 5 (druid)
Posted by "FrankChen021 (via GitHub)" <gi...@apache.org>.
FrankChen021 commented on code in PR #19876:
URL: https://github.com/apache/druid/pull/19876#discussion_r3714755371
##########
extensions-core/hdfs-storage/src/test/java/org/apache/druid/storage/hdfs/HdfsDataSegmentKillerTest.java:
##########
@@ -354,87 +353,86 @@ public String getStorageDirectory()
Path taskDir = new Path(
testRoot.getAbsolutePath() + Path.SEPARATOR + onDiskRelativePath + Path.SEPARATOR + "leaf"
);
- Assert.assertTrue(fs.mkdirs(taskDir.getParent()));
+ Assertions.assertTrue(fs.mkdirs(taskDir.getParent()));
fs.createNewFile(taskDir);
killer.killRecursively(relativePathWithColons);
- Assert.assertFalse(fs.exists(new Path(testRoot.getAbsolutePath() + Path.SEPARATOR + onDiskRelativePath)));
- Assert.assertTrue(fs.exists(batchRoot));
- Assert.assertTrue(fs.delete(batchRoot, true));
+ Assertions.assertFalse(fs.exists(new Path(testRoot.getAbsolutePath() + Path.SEPARATOR + onDiskRelativePath)));
+ Assertions.assertTrue(fs.exists(batchRoot));
+ Assertions.assertTrue(fs.delete(batchRoot, true));
}
finally {
fs.delete(new Path(testRoot.getAbsolutePath()), true);
}
}
@Test
- public void testKillNonZipSegment() throws Exception
+ public void testKillNonZipSegment()
{
- Configuration config = new Configuration();
- HdfsDataSegmentKiller killer = new HdfsDataSegmentKiller(
- config,
- new HdfsDataSegmentPusherConfig()
- {
- @Override
- public String getStorageDirectory()
+ Throwable exception = assertThrows(SegmentLoadingException.class, () -> {
+ Configuration config = new Configuration();
+ HdfsDataSegmentKiller killer = new HdfsDataSegmentKiller(
+ config,
+ new HdfsDataSegmentPusherConfig()
{
- return "/tmp";
+ @Override
+ public String getStorageDirectory()
+ {
+ return "/tmp";
+ }
}
- }
- );
-
- expectedException.expect(SegmentLoadingException.class);
- expectedException.expectMessage("Unknown file type");
- killer.kill(getSegmentWithPath(new Path("/xxx/", "index.beep").toString()));
+ );
+ killer.kill(getSegmentWithPath(new Path("/xxx/", "index.beep").toString()));
+ });
+ assertTrue(exception.getMessage().contains("Unknown file type"));
}
@Test
- public void testNoStorageDirectory() throws Exception
+ public void testNoStorageDirectory()
{
- Configuration config = new Configuration();
- HdfsDataSegmentKiller killer = new HdfsDataSegmentKiller(
- config,
- new HdfsDataSegmentPusherConfig()
- {
- @Override
- public String getStorageDirectory()
+ Throwable exception = assertThrows(IllegalStateException.class, () -> {
Review Comment:
Fixed in cc8fcd7013. Filesystem setup, kill, assertions, and cleanup remain outside assertThrows; only killer.killAll() is asserted. HdfsDataSegmentKillerTest passed all 10 tests.
##########
extensions-core/kinesis-indexing-service/src/test/java/org/apache/druid/indexing/kinesis/KinesisIndexTaskTuningConfigTest.java:
##########
@@ -241,28 +235,28 @@
KinesisIndexTaskTuningConfig deserialized =
mapper.readValue(serialized, KinesisIndexTaskTuningConfig.class);
- Assert.assertEquals(base.getAppendableIndexSpec(), deserialized.getAppendableIndexSpec());
- Assert.assertEquals(base.getMaxRowsInMemory(), deserialized.getMaxRowsInMemory());
- Assert.assertEquals(base.getMaxBytesInMemory(), deserialized.getMaxBytesInMemory());
- Assert.assertEquals(base.getMaxRowsPerSegment(), deserialized.getMaxRowsPerSegment());
- Assert.assertEquals(base.getMaxTotalRows(), deserialized.getMaxTotalRows());
- Assert.assertEquals(base.getIntermediatePersistPeriod(), deserialized.getIntermediatePersistPeriod());
- Assert.assertNull(deserialized.getBasePersistDirectory());
- Assert.assertEquals(base.getMaxPendingPersists(), deserialized.getMaxPendingPersists());
- Assert.assertEquals(base.getIndexSpec(), deserialized.getIndexSpec());
- Assert.assertEquals(base.isReportParseExceptions(), deserialized.isReportParseExceptions());
- Assert.assertEquals(base.getHandoffConditionTimeout(), deserialized.getHandoffConditionTimeout());
- Assert.assertEquals(base.isResetOffsetAutomatically(), deserialized.isResetOffsetAutomatically());
- Assert.assertEquals(base.getSegmentWriteOutMediumFactory(), deserialized.getSegmentWriteOutMediumFactory());
- Assert.assertEquals(base.getIntermediateHandoffPeriod(), deserialized.getIntermediateHandoffPeriod());
- Assert.assertEquals(base.isLogParseExceptions(), deserialized.isLogParseExceptions());
- Assert.assertEquals(base.getMaxParseExceptions(), deserialized.getMaxParseExceptions());
- Assert.assertEquals(base.getMaxSavedParseExceptions(), deserialized.getMaxSavedParseExceptions());
- Assert.assertEquals(base.getRecordBufferFullWait(), deserialized.getRecordBufferFullWait());
- Assert.assertEquals(base.getRecordBufferOfferTimeout(), deserialized.getRecordBufferOfferTimeout());
- Assert.assertEquals(base.getRecordBufferSizeBytesConfigured(), deserialized.getRecordBufferSizeBytesConfigured());
- Assert.assertEquals(base.getMaxRecordsPerPollConfigured(), deserialized.getMaxRecordsPerPollConfigured());
- Assert.assertEquals(base.getMaxColumnsToMerge(), deserialized.getMaxColumnsToMerge());
+ Assertions.assertEquals(base.getAppendableIndexSpec(), deserialized.getAppendableIndexSpec());
+ Assertions.assertEquals(base.getMaxRowsInMemory(), deserialized.getMaxRowsInMemory());
+ Assertions.assertEquals(base.getMaxBytesInMemory(), deserialized.getMaxBytesInMemory());
+ Assertions.assertEquals(base.getMaxRowsPerSegment(), deserialized.getMaxRowsPerSegment());
+ Assertions.assertEquals(base.getMaxTotalRows(), deserialized.getMaxTotalRows());
+ Assertions.assertEquals(base.getIntermediatePersistPeriod(), deserialized.getIntermediatePersistPeriod());
+ Assertions.assertNull(deserialized.getBasePersistDirectory());
+ Assertions.assertEquals(base.getMaxPendingPersists(), deserialized.getMaxPendingPersists());
Review Comment:
Evaluated as baseline: this deprecated getMaxPendingPersists call already existed on master before this JUnit migration. This PR only changes test framework usage, so deprecated API cleanup is separate scope and is left unchanged.
##########
extensions-core/lookups-cached-single/src/test/java/org/apache/druid/server/lookup/cache/loading/LoadingCacheTest.java:
##########
@@ -50,42 +46,43 @@ public static Collection<Object[]> inputData()
});
}
- private final LoadingCache loadingCache;
+ private LoadingCache loadingCache;
- public LoadingCacheTest(LoadingCache loadingCache)
+ private void initLoadingCacheTest(LoadingCache loadingCache)
{
this.loadingCache = loadingCache;
- }
-
- @Before
- public void setUp()
- {
- Assert.assertFalse(loadingCache.isClosed());
+ Assertions.assertFalse(loadingCache.isClosed());
loadingCache.putAll(IMMUTABLE_MAP);
}
- @After
+ @AfterEach
Review Comment:
Fixed in cc8fcd7013. tearDown now calls close() after invalidateAll(), releasing each off-heap cache map. LoadingCacheTest passed all 18 tests.
##########
extensions-core/kinesis-indexing-service/src/test/java/org/apache/druid/indexing/kinesis/supervisor/KinesisSupervisorTuningConfigTest.java:
##########
@@ -55,20 +55,20 @@
TuningConfig.class
);
- Assert.assertNull(config.getBasePersistDirectory());
- Assert.assertEquals(new OnheapIncrementalIndex.Spec(), config.getAppendableIndexSpec());
- Assert.assertEquals(150000, config.getMaxRowsInMemory());
- Assert.assertEquals(5_000_000, config.getMaxRowsPerSegment().intValue());
- Assert.assertEquals(new Period("PT10M"), config.getIntermediatePersistPeriod());
- Assert.assertEquals(0, config.getMaxPendingPersists());
- Assert.assertEquals(IndexSpec.getDefault(), config.getIndexSpec());
- Assert.assertEquals(false, config.isReportParseExceptions());
- Assert.assertEquals(java.time.Duration.ofMinutes(15).toMillis(), config.getHandoffConditionTimeout());
- Assert.assertNull(config.getWorkerThreads());
- Assert.assertEquals(8L, (long) config.getChatRetries());
- Assert.assertEquals(Duration.standardSeconds(10), config.getHttpTimeout());
- Assert.assertEquals(Duration.standardSeconds(80), config.getShutdownTimeout());
- Assert.assertEquals(Duration.standardSeconds(120), config.getRepartitionTransitionDuration());
+ Assertions.assertNull(config.getBasePersistDirectory());
+ Assertions.assertEquals(new OnheapIncrementalIndex.Spec(), config.getAppendableIndexSpec());
+ Assertions.assertEquals(150000, config.getMaxRowsInMemory());
+ Assertions.assertEquals(5_000_000, config.getMaxRowsPerSegment().intValue());
+ Assertions.assertEquals(new Period("PT10M"), config.getIntermediatePersistPeriod());
+ Assertions.assertEquals(0, config.getMaxPendingPersists());
Review Comment:
Evaluated as baseline: this deprecated getMaxPendingPersists call already existed on master before this JUnit migration. This PR only changes test framework usage, so deprecated API cleanup is separate scope and is left unchanged.
##########
extensions-core/kinesis-indexing-service/src/test/java/org/apache/druid/indexing/kinesis/supervisor/KinesisSupervisorTuningConfigTest.java:
##########
@@ -101,18 +101,18 @@
TuningConfig.class
);
- Assert.assertNull(config.getBasePersistDirectory());
- Assert.assertEquals(new OnheapIncrementalIndex.Spec(), config.getAppendableIndexSpec());
- Assert.assertEquals(100, config.getMaxRowsInMemory());
- Assert.assertEquals(100, config.getMaxRowsPerSegment().intValue());
- Assert.assertEquals(new Period("PT1H"), config.getIntermediatePersistPeriod());
- Assert.assertEquals(100, config.getMaxPendingPersists());
- Assert.assertEquals(true, config.isReportParseExceptions());
- Assert.assertEquals(100, config.getHandoffConditionTimeout());
- Assert.assertEquals(12, (int) config.getWorkerThreads());
- Assert.assertEquals(14L, (long) config.getChatRetries());
- Assert.assertEquals(Duration.standardSeconds(15), config.getHttpTimeout());
- Assert.assertEquals(Duration.standardSeconds(95), config.getShutdownTimeout());
- Assert.assertEquals(Duration.standardSeconds(500), config.getRepartitionTransitionDuration());
+ Assertions.assertNull(config.getBasePersistDirectory());
+ Assertions.assertEquals(new OnheapIncrementalIndex.Spec(), config.getAppendableIndexSpec());
+ Assertions.assertEquals(100, config.getMaxRowsInMemory());
+ Assertions.assertEquals(100, config.getMaxRowsPerSegment().intValue());
+ Assertions.assertEquals(new Period("PT1H"), config.getIntermediatePersistPeriod());
+ Assertions.assertEquals(100, config.getMaxPendingPersists());
Review Comment:
Evaluated as baseline: this deprecated getMaxPendingPersists call already existed on master before this JUnit migration. This PR only changes test framework usage, so deprecated API cleanup is separate scope and is left unchanged.
##########
extensions-core/kinesis-indexing-service/src/test/java/org/apache/druid/indexing/kinesis/KinesisIndexTaskTuningConfigTest.java:
##########
@@ -241,28 +235,28 @@
KinesisIndexTaskTuningConfig deserialized =
mapper.readValue(serialized, KinesisIndexTaskTuningConfig.class);
- Assert.assertEquals(base.getAppendableIndexSpec(), deserialized.getAppendableIndexSpec());
- Assert.assertEquals(base.getMaxRowsInMemory(), deserialized.getMaxRowsInMemory());
- Assert.assertEquals(base.getMaxBytesInMemory(), deserialized.getMaxBytesInMemory());
- Assert.assertEquals(base.getMaxRowsPerSegment(), deserialized.getMaxRowsPerSegment());
- Assert.assertEquals(base.getMaxTotalRows(), deserialized.getMaxTotalRows());
- Assert.assertEquals(base.getIntermediatePersistPeriod(), deserialized.getIntermediatePersistPeriod());
- Assert.assertNull(deserialized.getBasePersistDirectory());
- Assert.assertEquals(base.getMaxPendingPersists(), deserialized.getMaxPendingPersists());
- Assert.assertEquals(base.getIndexSpec(), deserialized.getIndexSpec());
- Assert.assertEquals(base.isReportParseExceptions(), deserialized.isReportParseExceptions());
- Assert.assertEquals(base.getHandoffConditionTimeout(), deserialized.getHandoffConditionTimeout());
- Assert.assertEquals(base.isResetOffsetAutomatically(), deserialized.isResetOffsetAutomatically());
- Assert.assertEquals(base.getSegmentWriteOutMediumFactory(), deserialized.getSegmentWriteOutMediumFactory());
- Assert.assertEquals(base.getIntermediateHandoffPeriod(), deserialized.getIntermediateHandoffPeriod());
- Assert.assertEquals(base.isLogParseExceptions(), deserialized.isLogParseExceptions());
- Assert.assertEquals(base.getMaxParseExceptions(), deserialized.getMaxParseExceptions());
- Assert.assertEquals(base.getMaxSavedParseExceptions(), deserialized.getMaxSavedParseExceptions());
- Assert.assertEquals(base.getRecordBufferFullWait(), deserialized.getRecordBufferFullWait());
- Assert.assertEquals(base.getRecordBufferOfferTimeout(), deserialized.getRecordBufferOfferTimeout());
- Assert.assertEquals(base.getRecordBufferSizeBytesConfigured(), deserialized.getRecordBufferSizeBytesConfigured());
- Assert.assertEquals(base.getMaxRecordsPerPollConfigured(), deserialized.getMaxRecordsPerPollConfigured());
- Assert.assertEquals(base.getMaxColumnsToMerge(), deserialized.getMaxColumnsToMerge());
+ Assertions.assertEquals(base.getAppendableIndexSpec(), deserialized.getAppendableIndexSpec());
+ Assertions.assertEquals(base.getMaxRowsInMemory(), deserialized.getMaxRowsInMemory());
+ Assertions.assertEquals(base.getMaxBytesInMemory(), deserialized.getMaxBytesInMemory());
+ Assertions.assertEquals(base.getMaxRowsPerSegment(), deserialized.getMaxRowsPerSegment());
+ Assertions.assertEquals(base.getMaxTotalRows(), deserialized.getMaxTotalRows());
+ Assertions.assertEquals(base.getIntermediatePersistPeriod(), deserialized.getIntermediatePersistPeriod());
+ Assertions.assertNull(deserialized.getBasePersistDirectory());
+ Assertions.assertEquals(base.getMaxPendingPersists(), deserialized.getMaxPendingPersists());
Review Comment:
Evaluated as baseline: this deprecated getMaxPendingPersists call already existed on master before this JUnit migration. This PR only changes test framework usage, so deprecated API cleanup is separate scope and is left unchanged.
##########
extensions-core/kinesis-indexing-service/src/test/java/org/apache/druid/indexing/kinesis/KinesisIndexTaskTuningConfigTest.java:
##########
@@ -333,26 +332,26 @@
);
KinesisIndexTaskTuningConfig copy = original.convertToTaskTuningConfig();
- Assert.assertEquals(original.getAppendableIndexSpec(), copy.getAppendableIndexSpec());
- Assert.assertEquals(1, copy.getMaxRowsInMemory());
- Assert.assertEquals(3, copy.getMaxBytesInMemory());
- Assert.assertEquals(2, copy.getMaxRowsPerSegment().intValue());
- Assert.assertEquals(100L, (long) copy.getMaxTotalRows());
- Assert.assertEquals(new Period("PT3S"), copy.getIntermediatePersistPeriod());
- Assert.assertNull(copy.getBasePersistDirectory());
- Assert.assertEquals(4, copy.getMaxPendingPersists());
- Assert.assertEquals(IndexSpec.getDefault(), copy.getIndexSpec());
- Assert.assertTrue(copy.isReportParseExceptions());
- Assert.assertEquals(5L, copy.getHandoffConditionTimeout());
- Assert.assertEquals(1000, (int) copy.getRecordBufferSizeBytesConfigured());
- Assert.assertEquals(500, copy.getRecordBufferOfferTimeout());
- Assert.assertEquals(500, copy.getRecordBufferFullWait());
- Assert.assertEquals(2, (int) copy.getFetchThreads());
- Assert.assertFalse(copy.isSkipSequenceNumberAvailabilityCheck());
- Assert.assertTrue(copy.isResetOffsetAutomatically());
- Assert.assertEquals(10, (int) copy.getMaxRecordsPerPollConfigured());
- Assert.assertEquals(new Period().withDays(Integer.MAX_VALUE), copy.getIntermediateHandoffPeriod());
- Assert.assertEquals(-1, copy.getMaxColumnsToMerge());
+ Assertions.assertEquals(original.getAppendableIndexSpec(), copy.getAppendableIndexSpec());
+ Assertions.assertEquals(1, copy.getMaxRowsInMemory());
+ Assertions.assertEquals(3, copy.getMaxBytesInMemory());
+ Assertions.assertEquals(2, copy.getMaxRowsPerSegment().intValue());
+ Assertions.assertEquals(100L, (long) copy.getMaxTotalRows());
+ Assertions.assertEquals(new Period("PT3S"), copy.getIntermediatePersistPeriod());
+ Assertions.assertNull(copy.getBasePersistDirectory());
+ Assertions.assertEquals(4, copy.getMaxPendingPersists());
Review Comment:
Evaluated as baseline: this deprecated getMaxPendingPersists call already existed on master before this JUnit migration. This PR only changes test framework usage, so deprecated API cleanup is separate scope and is left unchanged.
##########
extensions-core/kinesis-indexing-service/src/test/java/org/apache/druid/indexing/kinesis/KinesisIndexTaskTuningConfigTest.java:
##########
@@ -119,22 +113,22 @@
TuningConfig.class
);
- Assert.assertNull(config.getBasePersistDirectory());
- Assert.assertEquals(new OnheapIncrementalIndex.Spec(), config.getAppendableIndexSpec());
- Assert.assertEquals(100, config.getMaxRowsInMemory());
- Assert.assertEquals(100, config.getMaxRowsPerSegment().intValue());
- Assert.assertEquals(new Period("PT1H"), config.getIntermediatePersistPeriod());
- Assert.assertEquals(100, config.getMaxPendingPersists());
- Assert.assertTrue(config.isReportParseExceptions());
- Assert.assertEquals(100, config.getHandoffConditionTimeout());
- Assert.assertEquals(1000, (int) config.getRecordBufferSizeBytesConfigured());
- Assert.assertEquals(1000, config.getRecordBufferSizeBytesOrDefault(1_000_000_000));
- Assert.assertEquals(500, config.getRecordBufferOfferTimeout());
- Assert.assertEquals(500, config.getRecordBufferFullWait());
- Assert.assertEquals(2, (int) config.getFetchThreads());
- Assert.assertTrue(config.isSkipSequenceNumberAvailabilityCheck());
- Assert.assertFalse(config.isResetOffsetAutomatically());
- Assert.assertEquals(-1, config.getMaxColumnsToMerge());
+ Assertions.assertNull(config.getBasePersistDirectory());
+ Assertions.assertEquals(new OnheapIncrementalIndex.Spec(), config.getAppendableIndexSpec());
+ Assertions.assertEquals(100, config.getMaxRowsInMemory());
+ Assertions.assertEquals(100, config.getMaxRowsPerSegment().intValue());
+ Assertions.assertEquals(new Period("PT1H"), config.getIntermediatePersistPeriod());
+ Assertions.assertEquals(100, config.getMaxPendingPersists());
Review Comment:
Evaluated as baseline: this deprecated getMaxPendingPersists call already existed on master before this JUnit migration. This PR only changes test framework usage, so deprecated API cleanup is separate scope and is left unchanged.
##########
extensions-core/kinesis-indexing-service/src/test/java/org/apache/druid/indexing/kinesis/KinesisIndexTaskTuningConfigTest.java:
##########
@@ -68,24 +62,24 @@
TuningConfig.class
);
- Assert.assertNull(config.getBasePersistDirectory());
- Assert.assertEquals(new OnheapIncrementalIndex.Spec(), config.getAppendableIndexSpec());
- Assert.assertEquals(150000, config.getMaxRowsInMemory());
- Assert.assertEquals(5_000_000, config.getMaxRowsPerSegment().intValue());
- Assert.assertEquals(new Period("PT10M"), config.getIntermediatePersistPeriod());
- Assert.assertEquals(0, config.getMaxPendingPersists());
- Assert.assertEquals(IndexSpec.getDefault(), config.getIndexSpec());
- Assert.assertFalse(config.isReportParseExceptions());
- Assert.assertEquals(Duration.ofMinutes(15).toMillis(), config.getHandoffConditionTimeout());
- Assert.assertNull(config.getRecordBufferSizeBytesConfigured());
- Assert.assertEquals(100_000_000, config.getRecordBufferSizeBytesOrDefault(2_000_000_000));
- Assert.assertEquals(100_000_000, config.getRecordBufferSizeBytesOrDefault(1_000_000_000));
- Assert.assertEquals(10_000_000, config.getRecordBufferSizeBytesOrDefault(100_000_000));
- Assert.assertEquals(5000, config.getRecordBufferOfferTimeout());
- Assert.assertEquals(5000, config.getRecordBufferFullWait());
- Assert.assertNull(config.getFetchThreads());
- Assert.assertFalse(config.isSkipSequenceNumberAvailabilityCheck());
- Assert.assertFalse(config.isResetOffsetAutomatically());
+ Assertions.assertNull(config.getBasePersistDirectory());
+ Assertions.assertEquals(new OnheapIncrementalIndex.Spec(), config.getAppendableIndexSpec());
+ Assertions.assertEquals(150000, config.getMaxRowsInMemory());
+ Assertions.assertEquals(5_000_000, config.getMaxRowsPerSegment().intValue());
+ Assertions.assertEquals(new Period("PT10M"), config.getIntermediatePersistPeriod());
+ Assertions.assertEquals(0, config.getMaxPendingPersists());
Review Comment:
Evaluated as baseline: this deprecated getMaxPendingPersists call already existed on master before this JUnit migration. This PR only changes test framework usage, so deprecated API cleanup is separate scope and is left unchanged.
##########
extensions-core/hdfs-storage/src/test/java/org/apache/druid/inputsource/hdfs/HdfsInputSourceTest.java:
##########
@@ -95,47 +97,46 @@ public class HdfsInputSourceTest extends InitializedNullHandlingTest
null
);
- public static class ConstructorTest
+ @Nested
+ public class ConstructorTest
{
- @Rule
- public ExpectedException expectedException = ExpectedException.none();
@Test
public void testConstructorAllowsOnlyDefaultProtocol()
{
- HdfsInputSource.builder()
- .paths(PATH + "*")
- .configuration(CONFIGURATION)
- .inputSourceConfig(DEFAULT_INPUT_SOURCE_CONFIG)
- .build();
-
- expectedException.expect(IllegalArgumentException.class);
- expectedException.expectMessage("Only [hdfs] protocols are allowed");
- HdfsInputSource.builder()
- .paths("file:/foo/bar*")
- .configuration(CONFIGURATION)
- .inputSourceConfig(DEFAULT_INPUT_SOURCE_CONFIG)
- .build();
+ Throwable exception = assertThrows(IllegalArgumentException.class, () -> {
Review Comment:
Fixed in cc8fcd7013. The valid hdfs source is built before assertThrows, and the lambda contains only the rejected file: source construction. HdfsInputSourceTest passed all 35 nested tests.
##########
extensions-core/kinesis-indexing-service/src/test/java/org/apache/druid/indexing/kinesis/KinesisIndexTaskTuningConfigTest.java:
##########
@@ -176,31 +170,31 @@
TestModifiedKinesisIndexTaskTuningConfig deserialized =
mapper.readValue(serialized, TestModifiedKinesisIndexTaskTuningConfig.class);
- Assert.assertEquals(null, deserialized.getExtra());
- Assert.assertEquals(base.getAppendableIndexSpec(), deserialized.getAppendableIndexSpec());
- Assert.assertEquals(base.getMaxRowsInMemory(), deserialized.getMaxRowsInMemory());
- Assert.assertEquals(base.getMaxBytesInMemory(), deserialized.getMaxBytesInMemory());
- Assert.assertEquals(base.getMaxRowsPerSegment(), deserialized.getMaxRowsPerSegment());
- Assert.assertEquals(base.getMaxTotalRows(), deserialized.getMaxTotalRows());
- Assert.assertEquals(base.getIntermediatePersistPeriod(), deserialized.getIntermediatePersistPeriod());
- Assert.assertNull(deserialized.getBasePersistDirectory());
- Assert.assertEquals(base.getMaxPendingPersists(), deserialized.getMaxPendingPersists());
- Assert.assertEquals(base.getIndexSpec(), deserialized.getIndexSpec());
- Assert.assertEquals(base.isReportParseExceptions(), deserialized.isReportParseExceptions());
- Assert.assertEquals(base.getHandoffConditionTimeout(), deserialized.getHandoffConditionTimeout());
- Assert.assertEquals(base.isResetOffsetAutomatically(), deserialized.isResetOffsetAutomatically());
- Assert.assertEquals(base.getSegmentWriteOutMediumFactory(), deserialized.getSegmentWriteOutMediumFactory());
- Assert.assertEquals(base.getIntermediateHandoffPeriod(), deserialized.getIntermediateHandoffPeriod());
- Assert.assertEquals(base.isLogParseExceptions(), deserialized.isLogParseExceptions());
- Assert.assertEquals(base.getMaxParseExceptions(), deserialized.getMaxParseExceptions());
- Assert.assertEquals(base.getMaxSavedParseExceptions(), deserialized.getMaxSavedParseExceptions());
- Assert.assertEquals(base.getRecordBufferFullWait(), deserialized.getRecordBufferFullWait());
- Assert.assertEquals(base.getRecordBufferOfferTimeout(), deserialized.getRecordBufferOfferTimeout());
- Assert.assertEquals(base.getRecordBufferSizeConfigured(), deserialized.getRecordBufferSizeConfigured());
- Assert.assertEquals(base.getRecordBufferSizeBytesConfigured(), deserialized.getRecordBufferSizeBytesConfigured());
- Assert.assertEquals(base.getMaxRecordsPerPollConfigured(), deserialized.getMaxRecordsPerPollConfigured());
- Assert.assertEquals(base.getMaxBytesPerPollConfigured(), deserialized.getMaxBytesPerPollConfigured());
- Assert.assertEquals(base.getMaxColumnsToMerge(), deserialized.getMaxColumnsToMerge());
+ Assertions.assertEquals(null, deserialized.getExtra());
+ Assertions.assertEquals(base.getAppendableIndexSpec(), deserialized.getAppendableIndexSpec());
+ Assertions.assertEquals(base.getMaxRowsInMemory(), deserialized.getMaxRowsInMemory());
+ Assertions.assertEquals(base.getMaxBytesInMemory(), deserialized.getMaxBytesInMemory());
+ Assertions.assertEquals(base.getMaxRowsPerSegment(), deserialized.getMaxRowsPerSegment());
+ Assertions.assertEquals(base.getMaxTotalRows(), deserialized.getMaxTotalRows());
+ Assertions.assertEquals(base.getIntermediatePersistPeriod(), deserialized.getIntermediatePersistPeriod());
+ Assertions.assertNull(deserialized.getBasePersistDirectory());
+ Assertions.assertEquals(base.getMaxPendingPersists(), deserialized.getMaxPendingPersists());
Review Comment:
Evaluated as baseline: this deprecated getMaxPendingPersists call already existed on master before this JUnit migration. This PR only changes test framework usage, so deprecated API cleanup is separate scope and is left unchanged.
##########
extensions-core/kinesis-indexing-service/src/test/java/org/apache/druid/indexing/kinesis/KinesisIndexTaskTuningConfigTest.java:
##########
@@ -176,31 +170,31 @@
TestModifiedKinesisIndexTaskTuningConfig deserialized =
mapper.readValue(serialized, TestModifiedKinesisIndexTaskTuningConfig.class);
- Assert.assertEquals(null, deserialized.getExtra());
- Assert.assertEquals(base.getAppendableIndexSpec(), deserialized.getAppendableIndexSpec());
- Assert.assertEquals(base.getMaxRowsInMemory(), deserialized.getMaxRowsInMemory());
- Assert.assertEquals(base.getMaxBytesInMemory(), deserialized.getMaxBytesInMemory());
- Assert.assertEquals(base.getMaxRowsPerSegment(), deserialized.getMaxRowsPerSegment());
- Assert.assertEquals(base.getMaxTotalRows(), deserialized.getMaxTotalRows());
- Assert.assertEquals(base.getIntermediatePersistPeriod(), deserialized.getIntermediatePersistPeriod());
- Assert.assertNull(deserialized.getBasePersistDirectory());
- Assert.assertEquals(base.getMaxPendingPersists(), deserialized.getMaxPendingPersists());
- Assert.assertEquals(base.getIndexSpec(), deserialized.getIndexSpec());
- Assert.assertEquals(base.isReportParseExceptions(), deserialized.isReportParseExceptions());
- Assert.assertEquals(base.getHandoffConditionTimeout(), deserialized.getHandoffConditionTimeout());
- Assert.assertEquals(base.isResetOffsetAutomatically(), deserialized.isResetOffsetAutomatically());
- Assert.assertEquals(base.getSegmentWriteOutMediumFactory(), deserialized.getSegmentWriteOutMediumFactory());
- Assert.assertEquals(base.getIntermediateHandoffPeriod(), deserialized.getIntermediateHandoffPeriod());
- Assert.assertEquals(base.isLogParseExceptions(), deserialized.isLogParseExceptions());
- Assert.assertEquals(base.getMaxParseExceptions(), deserialized.getMaxParseExceptions());
- Assert.assertEquals(base.getMaxSavedParseExceptions(), deserialized.getMaxSavedParseExceptions());
- Assert.assertEquals(base.getRecordBufferFullWait(), deserialized.getRecordBufferFullWait());
- Assert.assertEquals(base.getRecordBufferOfferTimeout(), deserialized.getRecordBufferOfferTimeout());
- Assert.assertEquals(base.getRecordBufferSizeConfigured(), deserialized.getRecordBufferSizeConfigured());
- Assert.assertEquals(base.getRecordBufferSizeBytesConfigured(), deserialized.getRecordBufferSizeBytesConfigured());
- Assert.assertEquals(base.getMaxRecordsPerPollConfigured(), deserialized.getMaxRecordsPerPollConfigured());
- Assert.assertEquals(base.getMaxBytesPerPollConfigured(), deserialized.getMaxBytesPerPollConfigured());
- Assert.assertEquals(base.getMaxColumnsToMerge(), deserialized.getMaxColumnsToMerge());
+ Assertions.assertEquals(null, deserialized.getExtra());
+ Assertions.assertEquals(base.getAppendableIndexSpec(), deserialized.getAppendableIndexSpec());
+ Assertions.assertEquals(base.getMaxRowsInMemory(), deserialized.getMaxRowsInMemory());
+ Assertions.assertEquals(base.getMaxBytesInMemory(), deserialized.getMaxBytesInMemory());
+ Assertions.assertEquals(base.getMaxRowsPerSegment(), deserialized.getMaxRowsPerSegment());
+ Assertions.assertEquals(base.getMaxTotalRows(), deserialized.getMaxTotalRows());
+ Assertions.assertEquals(base.getIntermediatePersistPeriod(), deserialized.getIntermediatePersistPeriod());
+ Assertions.assertNull(deserialized.getBasePersistDirectory());
+ Assertions.assertEquals(base.getMaxPendingPersists(), deserialized.getMaxPendingPersists());
Review Comment:
Evaluated as baseline: this deprecated getMaxPendingPersists call already existed on master before this JUnit migration. This PR only changes test framework usage, so deprecated API cleanup is separate scope and is left unchanged.
--
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: commits-unsubscribe@druid.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For additional commands, e-mail: commits-help@druid.apache.org
Re: [PR] test: migrate extension-core format and lookup tests to JUnit 5 (druid)
Posted by "FrankChen021 (via GitHub)" <gi...@apache.org>.
FrankChen021 merged PR #19876:
URL: https://github.com/apache/druid/pull/19876
--
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: commits-unsubscribe@druid.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For additional commands, e-mail: commits-help@druid.apache.org
Re: [PR] test: migrate extension-core format and lookup tests to JUnit 5 (druid)
Posted by "FrankChen021 (via GitHub)" <gi...@apache.org>.
FrankChen021 commented on code in PR #19876:
URL: https://github.com/apache/druid/pull/19876#discussion_r3714582907
##########
extensions-core/hdfs-storage/src/test/java/org/apache/druid/storage/hdfs/HdfsDataSegmentKillerTest.java:
##########
@@ -354,87 +353,86 @@ public String getStorageDirectory()
Path taskDir = new Path(
testRoot.getAbsolutePath() + Path.SEPARATOR + onDiskRelativePath + Path.SEPARATOR + "leaf"
);
- Assert.assertTrue(fs.mkdirs(taskDir.getParent()));
+ Assertions.assertTrue(fs.mkdirs(taskDir.getParent()));
fs.createNewFile(taskDir);
killer.killRecursively(relativePathWithColons);
- Assert.assertFalse(fs.exists(new Path(testRoot.getAbsolutePath() + Path.SEPARATOR + onDiskRelativePath)));
- Assert.assertTrue(fs.exists(batchRoot));
- Assert.assertTrue(fs.delete(batchRoot, true));
+ Assertions.assertFalse(fs.exists(new Path(testRoot.getAbsolutePath() + Path.SEPARATOR + onDiskRelativePath)));
+ Assertions.assertTrue(fs.exists(batchRoot));
+ Assertions.assertTrue(fs.delete(batchRoot, true));
}
finally {
fs.delete(new Path(testRoot.getAbsolutePath()), true);
}
}
@Test
- public void testKillNonZipSegment() throws Exception
+ public void testKillNonZipSegment()
{
- Configuration config = new Configuration();
- HdfsDataSegmentKiller killer = new HdfsDataSegmentKiller(
- config,
- new HdfsDataSegmentPusherConfig()
- {
- @Override
- public String getStorageDirectory()
+ Throwable exception = assertThrows(SegmentLoadingException.class, () -> {
+ Configuration config = new Configuration();
+ HdfsDataSegmentKiller killer = new HdfsDataSegmentKiller(
+ config,
+ new HdfsDataSegmentPusherConfig()
{
- return "/tmp";
+ @Override
+ public String getStorageDirectory()
+ {
+ return "/tmp";
+ }
}
- }
- );
-
- expectedException.expect(SegmentLoadingException.class);
- expectedException.expectMessage("Unknown file type");
- killer.kill(getSegmentWithPath(new Path("/xxx/", "index.beep").toString()));
+ );
+ killer.kill(getSegmentWithPath(new Path("/xxx/", "index.beep").toString()));
+ });
+ assertTrue(exception.getMessage().contains("Unknown file type"));
}
@Test
- public void testNoStorageDirectory() throws Exception
+ public void testNoStorageDirectory()
{
- Configuration config = new Configuration();
- HdfsDataSegmentKiller killer = new HdfsDataSegmentKiller(
- config,
- new HdfsDataSegmentPusherConfig()
- {
- @Override
- public String getStorageDirectory()
+ Throwable exception = assertThrows(IllegalStateException.class, () -> {
Review Comment:
[P2] Limit the exception assertion to killAll
The `assertThrows` lambda now includes filesystem setup, the successful `killer.kill(...)` path, its assertions, cleanup, and `killAll()`. If an earlier operation starts throwing the same `IllegalStateException`, this test passes early, skips the behavior it was meant to verify, and can leave `/tmp/dataSourceNew` behind. Keep setup, `kill`, assertions, and cleanup outside the lambda and wrap only `killer.killAll()`.
##########
extensions-core/hdfs-storage/src/test/java/org/apache/druid/inputsource/hdfs/HdfsInputSourceTest.java:
##########
@@ -95,47 +97,46 @@ public class HdfsInputSourceTest extends InitializedNullHandlingTest
null
);
- public static class ConstructorTest
+ @Nested
+ public class ConstructorTest
{
- @Rule
- public ExpectedException expectedException = ExpectedException.none();
@Test
public void testConstructorAllowsOnlyDefaultProtocol()
{
- HdfsInputSource.builder()
- .paths(PATH + "*")
- .configuration(CONFIGURATION)
- .inputSourceConfig(DEFAULT_INPUT_SOURCE_CONFIG)
- .build();
-
- expectedException.expect(IllegalArgumentException.class);
- expectedException.expectMessage("Only [hdfs] protocols are allowed");
- HdfsInputSource.builder()
- .paths("file:/foo/bar*")
- .configuration(CONFIGURATION)
- .inputSourceConfig(DEFAULT_INPUT_SOURCE_CONFIG)
- .build();
+ Throwable exception = assertThrows(IllegalArgumentException.class, () -> {
Review Comment:
[P2] Keep the valid HDFS case outside assertThrows
The lambda first builds a valid `hdfs` input source and then the invalid `file:` source. If the valid construction regresses and throws the expected `IllegalArgumentException`, the assertion succeeds before the invalid protocol is tested. Build the allowed source before `assertThrows` and put only the rejected `file:` construction inside it.
##########
extensions-core/lookups-cached-single/src/test/java/org/apache/druid/server/lookup/cache/loading/LoadingCacheTest.java:
##########
@@ -50,42 +46,43 @@ public static Collection<Object[]> inputData()
});
}
- private final LoadingCache loadingCache;
+ private LoadingCache loadingCache;
- public LoadingCacheTest(LoadingCache loadingCache)
+ private void initLoadingCacheTest(LoadingCache loadingCache)
{
this.loadingCache = loadingCache;
- }
-
- @Before
- public void setUp()
- {
- Assert.assertFalse(loadingCache.isClosed());
+ Assertions.assertFalse(loadingCache.isClosed());
loadingCache.putAll(IMMUTABLE_MAP);
}
- @After
+ @AfterEach
Review Comment:
[P3] Close each generated off-heap cache
Each parameterized method now invokes `inputData()` separately and creates a fresh `OffHeapLoadingCache`, but teardown only calls `invalidateAll()`. `close()` is what deletes the cache map from the static direct-memory MapDB, so this migration multiplies retained off-heap maps until JVM shutdown. Close the current cache in `@AfterEach`.
--
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: commits-unsubscribe@druid.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For additional commands, e-mail: commits-help@druid.apache.org
Re: [PR] test: migrate extension-core format and lookup tests to JUnit 5 (druid)
Posted by "Copilot (via GitHub)" <gi...@apache.org>.
Copilot commented on code in PR #19876:
URL: https://github.com/apache/druid/pull/19876#discussion_r3717412916
##########
extensions-core/lookups-cached-single/src/test/java/org/apache/druid/server/lookup/PollingLookupSerDeserTest.java:
##########
@@ -41,40 +40,40 @@
import java.util.Map;
-@RunWith(Parameterized.class)
public class PollingLookupSerDeserTest
{
- @Parameterized.Parameters
public static Collection<Object[]> inputData()
{
return Arrays.asList(new Object[][]{
{new OffHeapPollingCache.OffHeapPollingCacheProvider()}, {new OnHeapPollingCache.OnHeapPollingCacheProvider<>()}
});
}
- private final PollingCacheFactory cacheFactory;
+ private PollingCacheFactory cacheFactory;
private final DataFetcher dataFetcher = new MockDataFetcher();
- public PollingLookupSerDeserTest(PollingCacheFactory cacheFactory)
+ public void initPollingLookupSerDeserTest(PollingCacheFactory cacheFactory)
{
this.cacheFactory = cacheFactory;
}
- @Test
- public void testSerDeser() throws IOException
+ @MethodSource("inputData")
+ @ParameterizedTest
+ public void testSerDeser(PollingCacheFactory cacheFactory) throws IOException
{
+ initPollingLookupSerDeserTest(cacheFactory);
ObjectMapper mapper = new DefaultObjectMapper();
PollingLookupFactory pollingLookupFactory = new PollingLookupFactory(Period.ZERO, dataFetcher, cacheFactory);
mapper.registerSubtypes(MockDataFetcher.class);
mapper.registerSubtypes(PollingLookupFactory.class);
- Assert.assertEquals(pollingLookupFactory, mapper.readerFor(LookupExtractorFactory.class).readValue(mapper.writeValueAsString(pollingLookupFactory)));
+ Assertions.assertEquals(pollingLookupFactory, mapper.readerFor(LookupExtractorFactory.class).readValue(mapper.writeValueAsString(pollingLookupFactory)));
}
@JsonTypeName("mock")
private static class MockDataFetcher implements DataFetcher
{
@JsonCreator
- public MockDataFetcher()
+ public void initPollingLookupSerDeserTest()
{
}
Review Comment:
`@JsonCreator` is applied to an instance void method, which Jackson will not treat as a creator (creator must be a constructor or a static factory returning the type). This will break compilation/serde for `MockDataFetcher` subtype registration.
##########
extensions-core/hdfs-storage/pom.xml:
##########
@@ -106,9 +106,24 @@
</dependency>
<!-- Tests -->
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
+ <scope>test</scope>
+ </dependency>
Review Comment:
The newly added JUnit dependency block has inconsistent indentation compared to surrounding dependencies in this POM.
##########
extensions-core/parquet-extensions/pom.xml:
##########
@@ -127,10 +127,25 @@
<groupId>com.github.rvesse</groupId>
<artifactId>airline</artifactId>
<scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
+ <scope>test</scope>
+ </dependency>
Review Comment:
The newly added JUnit dependency block has inconsistent indentation compared to the rest of the POM, making the diff noisy and harder to read.
--
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: commits-unsubscribe@druid.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For additional commands, e-mail: commits-help@druid.apache.org
Re: [PR] test: migrate extension-core format and lookup tests to JUnit 5 (druid)
Posted by "github-advanced-security[bot] (via GitHub)" <gi...@apache.org>.
github-advanced-security[bot] commented on code in PR #19876:
URL: https://github.com/apache/druid/pull/19876#discussion_r3714578455
##########
extensions-core/kinesis-indexing-service/src/test/java/org/apache/druid/indexing/kinesis/KinesisIndexTaskTuningConfigTest.java:
##########
@@ -176,31 +170,31 @@
TestModifiedKinesisIndexTaskTuningConfig deserialized =
mapper.readValue(serialized, TestModifiedKinesisIndexTaskTuningConfig.class);
- Assert.assertEquals(null, deserialized.getExtra());
- Assert.assertEquals(base.getAppendableIndexSpec(), deserialized.getAppendableIndexSpec());
- Assert.assertEquals(base.getMaxRowsInMemory(), deserialized.getMaxRowsInMemory());
- Assert.assertEquals(base.getMaxBytesInMemory(), deserialized.getMaxBytesInMemory());
- Assert.assertEquals(base.getMaxRowsPerSegment(), deserialized.getMaxRowsPerSegment());
- Assert.assertEquals(base.getMaxTotalRows(), deserialized.getMaxTotalRows());
- Assert.assertEquals(base.getIntermediatePersistPeriod(), deserialized.getIntermediatePersistPeriod());
- Assert.assertNull(deserialized.getBasePersistDirectory());
- Assert.assertEquals(base.getMaxPendingPersists(), deserialized.getMaxPendingPersists());
- Assert.assertEquals(base.getIndexSpec(), deserialized.getIndexSpec());
- Assert.assertEquals(base.isReportParseExceptions(), deserialized.isReportParseExceptions());
- Assert.assertEquals(base.getHandoffConditionTimeout(), deserialized.getHandoffConditionTimeout());
- Assert.assertEquals(base.isResetOffsetAutomatically(), deserialized.isResetOffsetAutomatically());
- Assert.assertEquals(base.getSegmentWriteOutMediumFactory(), deserialized.getSegmentWriteOutMediumFactory());
- Assert.assertEquals(base.getIntermediateHandoffPeriod(), deserialized.getIntermediateHandoffPeriod());
- Assert.assertEquals(base.isLogParseExceptions(), deserialized.isLogParseExceptions());
- Assert.assertEquals(base.getMaxParseExceptions(), deserialized.getMaxParseExceptions());
- Assert.assertEquals(base.getMaxSavedParseExceptions(), deserialized.getMaxSavedParseExceptions());
- Assert.assertEquals(base.getRecordBufferFullWait(), deserialized.getRecordBufferFullWait());
- Assert.assertEquals(base.getRecordBufferOfferTimeout(), deserialized.getRecordBufferOfferTimeout());
- Assert.assertEquals(base.getRecordBufferSizeConfigured(), deserialized.getRecordBufferSizeConfigured());
- Assert.assertEquals(base.getRecordBufferSizeBytesConfigured(), deserialized.getRecordBufferSizeBytesConfigured());
- Assert.assertEquals(base.getMaxRecordsPerPollConfigured(), deserialized.getMaxRecordsPerPollConfigured());
- Assert.assertEquals(base.getMaxBytesPerPollConfigured(), deserialized.getMaxBytesPerPollConfigured());
- Assert.assertEquals(base.getMaxColumnsToMerge(), deserialized.getMaxColumnsToMerge());
+ Assertions.assertEquals(null, deserialized.getExtra());
+ Assertions.assertEquals(base.getAppendableIndexSpec(), deserialized.getAppendableIndexSpec());
+ Assertions.assertEquals(base.getMaxRowsInMemory(), deserialized.getMaxRowsInMemory());
+ Assertions.assertEquals(base.getMaxBytesInMemory(), deserialized.getMaxBytesInMemory());
+ Assertions.assertEquals(base.getMaxRowsPerSegment(), deserialized.getMaxRowsPerSegment());
+ Assertions.assertEquals(base.getMaxTotalRows(), deserialized.getMaxTotalRows());
+ Assertions.assertEquals(base.getIntermediatePersistPeriod(), deserialized.getIntermediatePersistPeriod());
+ Assertions.assertNull(deserialized.getBasePersistDirectory());
+ Assertions.assertEquals(base.getMaxPendingPersists(), deserialized.getMaxPendingPersists());
Review Comment:
## CodeQL / Deprecated method or constructor invocation
Invoking [SeekableStreamIndexTaskTuningConfig.getMaxPendingPersists](1) should be avoided because it has been deprecated.
[Show more details](https://github.com/apache/druid/security/code-scanning/11552)
##########
extensions-core/kinesis-indexing-service/src/test/java/org/apache/druid/indexing/kinesis/KinesisIndexTaskTuningConfigTest.java:
##########
@@ -68,24 +62,24 @@
TuningConfig.class
);
- Assert.assertNull(config.getBasePersistDirectory());
- Assert.assertEquals(new OnheapIncrementalIndex.Spec(), config.getAppendableIndexSpec());
- Assert.assertEquals(150000, config.getMaxRowsInMemory());
- Assert.assertEquals(5_000_000, config.getMaxRowsPerSegment().intValue());
- Assert.assertEquals(new Period("PT10M"), config.getIntermediatePersistPeriod());
- Assert.assertEquals(0, config.getMaxPendingPersists());
- Assert.assertEquals(IndexSpec.getDefault(), config.getIndexSpec());
- Assert.assertFalse(config.isReportParseExceptions());
- Assert.assertEquals(Duration.ofMinutes(15).toMillis(), config.getHandoffConditionTimeout());
- Assert.assertNull(config.getRecordBufferSizeBytesConfigured());
- Assert.assertEquals(100_000_000, config.getRecordBufferSizeBytesOrDefault(2_000_000_000));
- Assert.assertEquals(100_000_000, config.getRecordBufferSizeBytesOrDefault(1_000_000_000));
- Assert.assertEquals(10_000_000, config.getRecordBufferSizeBytesOrDefault(100_000_000));
- Assert.assertEquals(5000, config.getRecordBufferOfferTimeout());
- Assert.assertEquals(5000, config.getRecordBufferFullWait());
- Assert.assertNull(config.getFetchThreads());
- Assert.assertFalse(config.isSkipSequenceNumberAvailabilityCheck());
- Assert.assertFalse(config.isResetOffsetAutomatically());
+ Assertions.assertNull(config.getBasePersistDirectory());
+ Assertions.assertEquals(new OnheapIncrementalIndex.Spec(), config.getAppendableIndexSpec());
+ Assertions.assertEquals(150000, config.getMaxRowsInMemory());
+ Assertions.assertEquals(5_000_000, config.getMaxRowsPerSegment().intValue());
+ Assertions.assertEquals(new Period("PT10M"), config.getIntermediatePersistPeriod());
+ Assertions.assertEquals(0, config.getMaxPendingPersists());
Review Comment:
## CodeQL / Deprecated method or constructor invocation
Invoking [SeekableStreamIndexTaskTuningConfig.getMaxPendingPersists](1) should be avoided because it has been deprecated.
[Show more details](https://github.com/apache/druid/security/code-scanning/11549)
##########
extensions-core/kinesis-indexing-service/src/test/java/org/apache/druid/indexing/kinesis/KinesisIndexTaskTuningConfigTest.java:
##########
@@ -119,22 +113,22 @@
TuningConfig.class
);
- Assert.assertNull(config.getBasePersistDirectory());
- Assert.assertEquals(new OnheapIncrementalIndex.Spec(), config.getAppendableIndexSpec());
- Assert.assertEquals(100, config.getMaxRowsInMemory());
- Assert.assertEquals(100, config.getMaxRowsPerSegment().intValue());
- Assert.assertEquals(new Period("PT1H"), config.getIntermediatePersistPeriod());
- Assert.assertEquals(100, config.getMaxPendingPersists());
- Assert.assertTrue(config.isReportParseExceptions());
- Assert.assertEquals(100, config.getHandoffConditionTimeout());
- Assert.assertEquals(1000, (int) config.getRecordBufferSizeBytesConfigured());
- Assert.assertEquals(1000, config.getRecordBufferSizeBytesOrDefault(1_000_000_000));
- Assert.assertEquals(500, config.getRecordBufferOfferTimeout());
- Assert.assertEquals(500, config.getRecordBufferFullWait());
- Assert.assertEquals(2, (int) config.getFetchThreads());
- Assert.assertTrue(config.isSkipSequenceNumberAvailabilityCheck());
- Assert.assertFalse(config.isResetOffsetAutomatically());
- Assert.assertEquals(-1, config.getMaxColumnsToMerge());
+ Assertions.assertNull(config.getBasePersistDirectory());
+ Assertions.assertEquals(new OnheapIncrementalIndex.Spec(), config.getAppendableIndexSpec());
+ Assertions.assertEquals(100, config.getMaxRowsInMemory());
+ Assertions.assertEquals(100, config.getMaxRowsPerSegment().intValue());
+ Assertions.assertEquals(new Period("PT1H"), config.getIntermediatePersistPeriod());
+ Assertions.assertEquals(100, config.getMaxPendingPersists());
Review Comment:
## CodeQL / Deprecated method or constructor invocation
Invoking [SeekableStreamIndexTaskTuningConfig.getMaxPendingPersists](1) should be avoided because it has been deprecated.
[Show more details](https://github.com/apache/druid/security/code-scanning/11550)
##########
extensions-core/kinesis-indexing-service/src/test/java/org/apache/druid/indexing/kinesis/KinesisIndexTaskTuningConfigTest.java:
##########
@@ -241,28 +235,28 @@
KinesisIndexTaskTuningConfig deserialized =
mapper.readValue(serialized, KinesisIndexTaskTuningConfig.class);
- Assert.assertEquals(base.getAppendableIndexSpec(), deserialized.getAppendableIndexSpec());
- Assert.assertEquals(base.getMaxRowsInMemory(), deserialized.getMaxRowsInMemory());
- Assert.assertEquals(base.getMaxBytesInMemory(), deserialized.getMaxBytesInMemory());
- Assert.assertEquals(base.getMaxRowsPerSegment(), deserialized.getMaxRowsPerSegment());
- Assert.assertEquals(base.getMaxTotalRows(), deserialized.getMaxTotalRows());
- Assert.assertEquals(base.getIntermediatePersistPeriod(), deserialized.getIntermediatePersistPeriod());
- Assert.assertNull(deserialized.getBasePersistDirectory());
- Assert.assertEquals(base.getMaxPendingPersists(), deserialized.getMaxPendingPersists());
- Assert.assertEquals(base.getIndexSpec(), deserialized.getIndexSpec());
- Assert.assertEquals(base.isReportParseExceptions(), deserialized.isReportParseExceptions());
- Assert.assertEquals(base.getHandoffConditionTimeout(), deserialized.getHandoffConditionTimeout());
- Assert.assertEquals(base.isResetOffsetAutomatically(), deserialized.isResetOffsetAutomatically());
- Assert.assertEquals(base.getSegmentWriteOutMediumFactory(), deserialized.getSegmentWriteOutMediumFactory());
- Assert.assertEquals(base.getIntermediateHandoffPeriod(), deserialized.getIntermediateHandoffPeriod());
- Assert.assertEquals(base.isLogParseExceptions(), deserialized.isLogParseExceptions());
- Assert.assertEquals(base.getMaxParseExceptions(), deserialized.getMaxParseExceptions());
- Assert.assertEquals(base.getMaxSavedParseExceptions(), deserialized.getMaxSavedParseExceptions());
- Assert.assertEquals(base.getRecordBufferFullWait(), deserialized.getRecordBufferFullWait());
- Assert.assertEquals(base.getRecordBufferOfferTimeout(), deserialized.getRecordBufferOfferTimeout());
- Assert.assertEquals(base.getRecordBufferSizeBytesConfigured(), deserialized.getRecordBufferSizeBytesConfigured());
- Assert.assertEquals(base.getMaxRecordsPerPollConfigured(), deserialized.getMaxRecordsPerPollConfigured());
- Assert.assertEquals(base.getMaxColumnsToMerge(), deserialized.getMaxColumnsToMerge());
+ Assertions.assertEquals(base.getAppendableIndexSpec(), deserialized.getAppendableIndexSpec());
+ Assertions.assertEquals(base.getMaxRowsInMemory(), deserialized.getMaxRowsInMemory());
+ Assertions.assertEquals(base.getMaxBytesInMemory(), deserialized.getMaxBytesInMemory());
+ Assertions.assertEquals(base.getMaxRowsPerSegment(), deserialized.getMaxRowsPerSegment());
+ Assertions.assertEquals(base.getMaxTotalRows(), deserialized.getMaxTotalRows());
+ Assertions.assertEquals(base.getIntermediatePersistPeriod(), deserialized.getIntermediatePersistPeriod());
+ Assertions.assertNull(deserialized.getBasePersistDirectory());
+ Assertions.assertEquals(base.getMaxPendingPersists(), deserialized.getMaxPendingPersists());
Review Comment:
## CodeQL / Deprecated method or constructor invocation
Invoking [SeekableStreamIndexTaskTuningConfig.getMaxPendingPersists](1) should be avoided because it has been deprecated.
[Show more details](https://github.com/apache/druid/security/code-scanning/11553)
##########
extensions-core/kinesis-indexing-service/src/test/java/org/apache/druid/indexing/kinesis/KinesisIndexTaskTuningConfigTest.java:
##########
@@ -333,26 +332,26 @@
);
KinesisIndexTaskTuningConfig copy = original.convertToTaskTuningConfig();
- Assert.assertEquals(original.getAppendableIndexSpec(), copy.getAppendableIndexSpec());
- Assert.assertEquals(1, copy.getMaxRowsInMemory());
- Assert.assertEquals(3, copy.getMaxBytesInMemory());
- Assert.assertEquals(2, copy.getMaxRowsPerSegment().intValue());
- Assert.assertEquals(100L, (long) copy.getMaxTotalRows());
- Assert.assertEquals(new Period("PT3S"), copy.getIntermediatePersistPeriod());
- Assert.assertNull(copy.getBasePersistDirectory());
- Assert.assertEquals(4, copy.getMaxPendingPersists());
- Assert.assertEquals(IndexSpec.getDefault(), copy.getIndexSpec());
- Assert.assertTrue(copy.isReportParseExceptions());
- Assert.assertEquals(5L, copy.getHandoffConditionTimeout());
- Assert.assertEquals(1000, (int) copy.getRecordBufferSizeBytesConfigured());
- Assert.assertEquals(500, copy.getRecordBufferOfferTimeout());
- Assert.assertEquals(500, copy.getRecordBufferFullWait());
- Assert.assertEquals(2, (int) copy.getFetchThreads());
- Assert.assertFalse(copy.isSkipSequenceNumberAvailabilityCheck());
- Assert.assertTrue(copy.isResetOffsetAutomatically());
- Assert.assertEquals(10, (int) copy.getMaxRecordsPerPollConfigured());
- Assert.assertEquals(new Period().withDays(Integer.MAX_VALUE), copy.getIntermediateHandoffPeriod());
- Assert.assertEquals(-1, copy.getMaxColumnsToMerge());
+ Assertions.assertEquals(original.getAppendableIndexSpec(), copy.getAppendableIndexSpec());
+ Assertions.assertEquals(1, copy.getMaxRowsInMemory());
+ Assertions.assertEquals(3, copy.getMaxBytesInMemory());
+ Assertions.assertEquals(2, copy.getMaxRowsPerSegment().intValue());
+ Assertions.assertEquals(100L, (long) copy.getMaxTotalRows());
+ Assertions.assertEquals(new Period("PT3S"), copy.getIntermediatePersistPeriod());
+ Assertions.assertNull(copy.getBasePersistDirectory());
+ Assertions.assertEquals(4, copy.getMaxPendingPersists());
Review Comment:
## CodeQL / Deprecated method or constructor invocation
Invoking [SeekableStreamIndexTaskTuningConfig.getMaxPendingPersists](1) should be avoided because it has been deprecated.
[Show more details](https://github.com/apache/druid/security/code-scanning/11555)
##########
extensions-core/kinesis-indexing-service/src/test/java/org/apache/druid/indexing/kinesis/KinesisIndexTaskTuningConfigTest.java:
##########
@@ -176,31 +170,31 @@
TestModifiedKinesisIndexTaskTuningConfig deserialized =
mapper.readValue(serialized, TestModifiedKinesisIndexTaskTuningConfig.class);
- Assert.assertEquals(null, deserialized.getExtra());
- Assert.assertEquals(base.getAppendableIndexSpec(), deserialized.getAppendableIndexSpec());
- Assert.assertEquals(base.getMaxRowsInMemory(), deserialized.getMaxRowsInMemory());
- Assert.assertEquals(base.getMaxBytesInMemory(), deserialized.getMaxBytesInMemory());
- Assert.assertEquals(base.getMaxRowsPerSegment(), deserialized.getMaxRowsPerSegment());
- Assert.assertEquals(base.getMaxTotalRows(), deserialized.getMaxTotalRows());
- Assert.assertEquals(base.getIntermediatePersistPeriod(), deserialized.getIntermediatePersistPeriod());
- Assert.assertNull(deserialized.getBasePersistDirectory());
- Assert.assertEquals(base.getMaxPendingPersists(), deserialized.getMaxPendingPersists());
- Assert.assertEquals(base.getIndexSpec(), deserialized.getIndexSpec());
- Assert.assertEquals(base.isReportParseExceptions(), deserialized.isReportParseExceptions());
- Assert.assertEquals(base.getHandoffConditionTimeout(), deserialized.getHandoffConditionTimeout());
- Assert.assertEquals(base.isResetOffsetAutomatically(), deserialized.isResetOffsetAutomatically());
- Assert.assertEquals(base.getSegmentWriteOutMediumFactory(), deserialized.getSegmentWriteOutMediumFactory());
- Assert.assertEquals(base.getIntermediateHandoffPeriod(), deserialized.getIntermediateHandoffPeriod());
- Assert.assertEquals(base.isLogParseExceptions(), deserialized.isLogParseExceptions());
- Assert.assertEquals(base.getMaxParseExceptions(), deserialized.getMaxParseExceptions());
- Assert.assertEquals(base.getMaxSavedParseExceptions(), deserialized.getMaxSavedParseExceptions());
- Assert.assertEquals(base.getRecordBufferFullWait(), deserialized.getRecordBufferFullWait());
- Assert.assertEquals(base.getRecordBufferOfferTimeout(), deserialized.getRecordBufferOfferTimeout());
- Assert.assertEquals(base.getRecordBufferSizeConfigured(), deserialized.getRecordBufferSizeConfigured());
- Assert.assertEquals(base.getRecordBufferSizeBytesConfigured(), deserialized.getRecordBufferSizeBytesConfigured());
- Assert.assertEquals(base.getMaxRecordsPerPollConfigured(), deserialized.getMaxRecordsPerPollConfigured());
- Assert.assertEquals(base.getMaxBytesPerPollConfigured(), deserialized.getMaxBytesPerPollConfigured());
- Assert.assertEquals(base.getMaxColumnsToMerge(), deserialized.getMaxColumnsToMerge());
+ Assertions.assertEquals(null, deserialized.getExtra());
+ Assertions.assertEquals(base.getAppendableIndexSpec(), deserialized.getAppendableIndexSpec());
+ Assertions.assertEquals(base.getMaxRowsInMemory(), deserialized.getMaxRowsInMemory());
+ Assertions.assertEquals(base.getMaxBytesInMemory(), deserialized.getMaxBytesInMemory());
+ Assertions.assertEquals(base.getMaxRowsPerSegment(), deserialized.getMaxRowsPerSegment());
+ Assertions.assertEquals(base.getMaxTotalRows(), deserialized.getMaxTotalRows());
+ Assertions.assertEquals(base.getIntermediatePersistPeriod(), deserialized.getIntermediatePersistPeriod());
+ Assertions.assertNull(deserialized.getBasePersistDirectory());
+ Assertions.assertEquals(base.getMaxPendingPersists(), deserialized.getMaxPendingPersists());
Review Comment:
## CodeQL / Deprecated method or constructor invocation
Invoking [SeekableStreamIndexTaskTuningConfig.getMaxPendingPersists](1) should be avoided because it has been deprecated.
[Show more details](https://github.com/apache/druid/security/code-scanning/11551)
##########
extensions-core/kinesis-indexing-service/src/test/java/org/apache/druid/indexing/kinesis/supervisor/KinesisSupervisorTuningConfigTest.java:
##########
@@ -101,18 +101,18 @@
TuningConfig.class
);
- Assert.assertNull(config.getBasePersistDirectory());
- Assert.assertEquals(new OnheapIncrementalIndex.Spec(), config.getAppendableIndexSpec());
- Assert.assertEquals(100, config.getMaxRowsInMemory());
- Assert.assertEquals(100, config.getMaxRowsPerSegment().intValue());
- Assert.assertEquals(new Period("PT1H"), config.getIntermediatePersistPeriod());
- Assert.assertEquals(100, config.getMaxPendingPersists());
- Assert.assertEquals(true, config.isReportParseExceptions());
- Assert.assertEquals(100, config.getHandoffConditionTimeout());
- Assert.assertEquals(12, (int) config.getWorkerThreads());
- Assert.assertEquals(14L, (long) config.getChatRetries());
- Assert.assertEquals(Duration.standardSeconds(15), config.getHttpTimeout());
- Assert.assertEquals(Duration.standardSeconds(95), config.getShutdownTimeout());
- Assert.assertEquals(Duration.standardSeconds(500), config.getRepartitionTransitionDuration());
+ Assertions.assertNull(config.getBasePersistDirectory());
+ Assertions.assertEquals(new OnheapIncrementalIndex.Spec(), config.getAppendableIndexSpec());
+ Assertions.assertEquals(100, config.getMaxRowsInMemory());
+ Assertions.assertEquals(100, config.getMaxRowsPerSegment().intValue());
+ Assertions.assertEquals(new Period("PT1H"), config.getIntermediatePersistPeriod());
+ Assertions.assertEquals(100, config.getMaxPendingPersists());
Review Comment:
## CodeQL / Deprecated method or constructor invocation
Invoking [SeekableStreamIndexTaskTuningConfig.getMaxPendingPersists](1) should be avoided because it has been deprecated.
[Show more details](https://github.com/apache/druid/security/code-scanning/11557)
##########
extensions-core/kinesis-indexing-service/src/test/java/org/apache/druid/indexing/kinesis/supervisor/KinesisSupervisorTuningConfigTest.java:
##########
@@ -55,20 +55,20 @@
TuningConfig.class
);
- Assert.assertNull(config.getBasePersistDirectory());
- Assert.assertEquals(new OnheapIncrementalIndex.Spec(), config.getAppendableIndexSpec());
- Assert.assertEquals(150000, config.getMaxRowsInMemory());
- Assert.assertEquals(5_000_000, config.getMaxRowsPerSegment().intValue());
- Assert.assertEquals(new Period("PT10M"), config.getIntermediatePersistPeriod());
- Assert.assertEquals(0, config.getMaxPendingPersists());
- Assert.assertEquals(IndexSpec.getDefault(), config.getIndexSpec());
- Assert.assertEquals(false, config.isReportParseExceptions());
- Assert.assertEquals(java.time.Duration.ofMinutes(15).toMillis(), config.getHandoffConditionTimeout());
- Assert.assertNull(config.getWorkerThreads());
- Assert.assertEquals(8L, (long) config.getChatRetries());
- Assert.assertEquals(Duration.standardSeconds(10), config.getHttpTimeout());
- Assert.assertEquals(Duration.standardSeconds(80), config.getShutdownTimeout());
- Assert.assertEquals(Duration.standardSeconds(120), config.getRepartitionTransitionDuration());
+ Assertions.assertNull(config.getBasePersistDirectory());
+ Assertions.assertEquals(new OnheapIncrementalIndex.Spec(), config.getAppendableIndexSpec());
+ Assertions.assertEquals(150000, config.getMaxRowsInMemory());
+ Assertions.assertEquals(5_000_000, config.getMaxRowsPerSegment().intValue());
+ Assertions.assertEquals(new Period("PT10M"), config.getIntermediatePersistPeriod());
+ Assertions.assertEquals(0, config.getMaxPendingPersists());
Review Comment:
## CodeQL / Deprecated method or constructor invocation
Invoking [SeekableStreamIndexTaskTuningConfig.getMaxPendingPersists](1) should be avoided because it has been deprecated.
[Show more details](https://github.com/apache/druid/security/code-scanning/11556)
##########
extensions-core/kinesis-indexing-service/src/test/java/org/apache/druid/indexing/kinesis/KinesisIndexTaskTuningConfigTest.java:
##########
@@ -241,28 +235,28 @@
KinesisIndexTaskTuningConfig deserialized =
mapper.readValue(serialized, KinesisIndexTaskTuningConfig.class);
- Assert.assertEquals(base.getAppendableIndexSpec(), deserialized.getAppendableIndexSpec());
- Assert.assertEquals(base.getMaxRowsInMemory(), deserialized.getMaxRowsInMemory());
- Assert.assertEquals(base.getMaxBytesInMemory(), deserialized.getMaxBytesInMemory());
- Assert.assertEquals(base.getMaxRowsPerSegment(), deserialized.getMaxRowsPerSegment());
- Assert.assertEquals(base.getMaxTotalRows(), deserialized.getMaxTotalRows());
- Assert.assertEquals(base.getIntermediatePersistPeriod(), deserialized.getIntermediatePersistPeriod());
- Assert.assertNull(deserialized.getBasePersistDirectory());
- Assert.assertEquals(base.getMaxPendingPersists(), deserialized.getMaxPendingPersists());
- Assert.assertEquals(base.getIndexSpec(), deserialized.getIndexSpec());
- Assert.assertEquals(base.isReportParseExceptions(), deserialized.isReportParseExceptions());
- Assert.assertEquals(base.getHandoffConditionTimeout(), deserialized.getHandoffConditionTimeout());
- Assert.assertEquals(base.isResetOffsetAutomatically(), deserialized.isResetOffsetAutomatically());
- Assert.assertEquals(base.getSegmentWriteOutMediumFactory(), deserialized.getSegmentWriteOutMediumFactory());
- Assert.assertEquals(base.getIntermediateHandoffPeriod(), deserialized.getIntermediateHandoffPeriod());
- Assert.assertEquals(base.isLogParseExceptions(), deserialized.isLogParseExceptions());
- Assert.assertEquals(base.getMaxParseExceptions(), deserialized.getMaxParseExceptions());
- Assert.assertEquals(base.getMaxSavedParseExceptions(), deserialized.getMaxSavedParseExceptions());
- Assert.assertEquals(base.getRecordBufferFullWait(), deserialized.getRecordBufferFullWait());
- Assert.assertEquals(base.getRecordBufferOfferTimeout(), deserialized.getRecordBufferOfferTimeout());
- Assert.assertEquals(base.getRecordBufferSizeBytesConfigured(), deserialized.getRecordBufferSizeBytesConfigured());
- Assert.assertEquals(base.getMaxRecordsPerPollConfigured(), deserialized.getMaxRecordsPerPollConfigured());
- Assert.assertEquals(base.getMaxColumnsToMerge(), deserialized.getMaxColumnsToMerge());
+ Assertions.assertEquals(base.getAppendableIndexSpec(), deserialized.getAppendableIndexSpec());
+ Assertions.assertEquals(base.getMaxRowsInMemory(), deserialized.getMaxRowsInMemory());
+ Assertions.assertEquals(base.getMaxBytesInMemory(), deserialized.getMaxBytesInMemory());
+ Assertions.assertEquals(base.getMaxRowsPerSegment(), deserialized.getMaxRowsPerSegment());
+ Assertions.assertEquals(base.getMaxTotalRows(), deserialized.getMaxTotalRows());
+ Assertions.assertEquals(base.getIntermediatePersistPeriod(), deserialized.getIntermediatePersistPeriod());
+ Assertions.assertNull(deserialized.getBasePersistDirectory());
+ Assertions.assertEquals(base.getMaxPendingPersists(), deserialized.getMaxPendingPersists());
Review Comment:
## CodeQL / Deprecated method or constructor invocation
Invoking [SeekableStreamIndexTaskTuningConfig.getMaxPendingPersists](1) should be avoided because it has been deprecated.
[Show more details](https://github.com/apache/druid/security/code-scanning/11554)
--
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: commits-unsubscribe@druid.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For additional commands, e-mail: commits-help@druid.apache.org
Re: [PR] test: migrate extension-core format and lookup tests to JUnit 5 (druid)
Posted by "FrankChen021 (via GitHub)" <gi...@apache.org>.
FrankChen021 commented on code in PR #19876:
URL: https://github.com/apache/druid/pull/19876#discussion_r3717599161
##########
extensions-core/lookups-cached-single/src/test/java/org/apache/druid/server/lookup/PollingLookupSerDeserTest.java:
##########
@@ -41,40 +40,40 @@
import java.util.Map;
-@RunWith(Parameterized.class)
public class PollingLookupSerDeserTest
{
- @Parameterized.Parameters
public static Collection<Object[]> inputData()
{
return Arrays.asList(new Object[][]{
{new OffHeapPollingCache.OffHeapPollingCacheProvider()}, {new OnHeapPollingCache.OnHeapPollingCacheProvider<>()}
});
}
- private final PollingCacheFactory cacheFactory;
+ private PollingCacheFactory cacheFactory;
private final DataFetcher dataFetcher = new MockDataFetcher();
- public PollingLookupSerDeserTest(PollingCacheFactory cacheFactory)
+ public void initPollingLookupSerDeserTest(PollingCacheFactory cacheFactory)
{
this.cacheFactory = cacheFactory;
}
- @Test
- public void testSerDeser() throws IOException
+ @MethodSource("inputData")
+ @ParameterizedTest
+ public void testSerDeser(PollingCacheFactory cacheFactory) throws IOException
{
+ initPollingLookupSerDeserTest(cacheFactory);
ObjectMapper mapper = new DefaultObjectMapper();
PollingLookupFactory pollingLookupFactory = new PollingLookupFactory(Period.ZERO, dataFetcher, cacheFactory);
mapper.registerSubtypes(MockDataFetcher.class);
mapper.registerSubtypes(PollingLookupFactory.class);
- Assert.assertEquals(pollingLookupFactory, mapper.readerFor(LookupExtractorFactory.class).readValue(mapper.writeValueAsString(pollingLookupFactory)));
+ Assertions.assertEquals(pollingLookupFactory, mapper.readerFor(LookupExtractorFactory.class).readValue(mapper.writeValueAsString(pollingLookupFactory)));
}
@JsonTypeName("mock")
private static class MockDataFetcher implements DataFetcher
{
@JsonCreator
- public MockDataFetcher()
+ public void initPollingLookupSerDeserTest()
{
}
Review Comment:
Actionable. The JUnit migration had converted the original no-argument MockDataFetcher constructor into an instance void method while retaining @JsonCreator. I restored it as public MockDataFetcher(), so @JsonCreator now targets a valid constructor and the intended Jackson subtype behavior is preserved. PollingLookupSerDeserTest passed both parameterized cases (2 tests, 0 failures); Checkstyle and SpotBugs also passed.
##########
extensions-core/parquet-extensions/pom.xml:
##########
@@ -127,10 +127,25 @@
<groupId>com.github.rvesse</groupId>
<artifactId>airline</artifactId>
<scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
+ <scope>test</scope>
+ </dependency>
Review Comment:
Fixed in commit 4676b86270 by normalizing the newly added JUnit dependency block to the surrounding two-space POM indentation. Checkstyle passed with 0 violations, and the module-scoped SpotBugs check passed with 0 bugs/errors.
##########
extensions-core/hdfs-storage/pom.xml:
##########
@@ -106,9 +106,24 @@
</dependency>
<!-- Tests -->
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
+ <scope>test</scope>
+ </dependency>
Review Comment:
Fixed in commit 4676b86270 by normalizing the newly added JUnit dependency block to the surrounding four-space POM indentation. Checkstyle passed with 0 violations, and the module-scoped SpotBugs check passed with 0 bugs/errors.
--
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: commits-unsubscribe@druid.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For additional commands, e-mail: commits-help@druid.apache.org