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