You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jira@kafka.apache.org by GitBox <gi...@apache.org> on 2021/07/06 08:18:33 UTC
[GitHub] [kafka] wycccccc opened a new pull request #10976: KAFKA-7438 Replace EasyMock and PowerMock with Mockito
wycccccc opened a new pull request #10976:
URL: https://github.com/apache/kafka/pull/10976
Development of EasyMock and PowerMock has stagnated while Mockito continues to be actively developed. With the new Java cadence, it's a problem to depend on libraries that do bytecode generation and are not actively maintained. In addition, Mockito is also easier to [use.KAFKA-7438](https://issues.apache.org/jira/browse/KAFKA-7438)
### Committer Checklist (excluded from commit message)
- [ ] Verify design and implementation
- [ ] Verify test coverage and CI build status
- [ ] Verify documentation (including upgrade notes)
--
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: jira-unsubscribe@kafka.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [kafka] wycccccc commented on a change in pull request #10976: KAFKA-13036 Replace EasyMock and PowerMock with Mockito for RocksDBMetricsRecorderTest
Posted by GitBox <gi...@apache.org>.
wycccccc commented on a change in pull request #10976:
URL: https://github.com/apache/kafka/pull/10976#discussion_r664391227
##########
File path: streams/src/test/java/org/apache/kafka/streams/state/internals/metrics/RocksDBMetricsRecorderTest.java
##########
@@ -70,99 +63,91 @@
private final Statistics statisticsToAdd2 = mock(Statistics.class);
private final Statistics statisticsToAdd3 = mock(Statistics.class);
- private final Sensor bytesWrittenToDatabaseSensor = createMock(Sensor.class);
- private final Sensor bytesReadFromDatabaseSensor = createMock(Sensor.class);
- private final Sensor memtableBytesFlushedSensor = createMock(Sensor.class);
- private final Sensor memtableHitRatioSensor = createMock(Sensor.class);
- private final Sensor writeStallDurationSensor = createMock(Sensor.class);
- private final Sensor blockCacheDataHitRatioSensor = createMock(Sensor.class);
- private final Sensor blockCacheIndexHitRatioSensor = createMock(Sensor.class);
- private final Sensor blockCacheFilterHitRatioSensor = createMock(Sensor.class);
- private final Sensor bytesReadDuringCompactionSensor = createMock(Sensor.class);
- private final Sensor bytesWrittenDuringCompactionSensor = createMock(Sensor.class);
- private final Sensor numberOfOpenFilesSensor = createMock(Sensor.class);
- private final Sensor numberOfFileErrorsSensor = createMock(Sensor.class);
-
- private final StreamsMetricsImpl streamsMetrics = niceMock(StreamsMetricsImpl.class);
+ private final Sensor bytesWrittenToDatabaseSensor = mock(Sensor.class);
+ private final Sensor bytesReadFromDatabaseSensor = mock(Sensor.class);
+ private final Sensor memtableBytesFlushedSensor = mock(Sensor.class);
+ private final Sensor memtableHitRatioSensor = mock(Sensor.class);
+ private final Sensor writeStallDurationSensor = mock(Sensor.class);
+ private final Sensor blockCacheDataHitRatioSensor = mock(Sensor.class);
+ private final Sensor blockCacheIndexHitRatioSensor = mock(Sensor.class);
+ private final Sensor blockCacheFilterHitRatioSensor = mock(Sensor.class);
+ private final Sensor bytesReadDuringCompactionSensor = mock(Sensor.class);
+ private final Sensor bytesWrittenDuringCompactionSensor = mock(Sensor.class);
+ private final Sensor numberOfOpenFilesSensor = mock(Sensor.class);
+ private final Sensor numberOfFileErrorsSensor = mock(Sensor.class);
+
+ private final StreamsMetricsImpl streamsMetrics = mock(StreamsMetricsImpl.class);
private final RocksDBMetricsRecordingTrigger recordingTrigger = mock(RocksDBMetricsRecordingTrigger.class);
private final RocksDBMetricsRecorder recorder = new RocksDBMetricsRecorder(METRICS_SCOPE, STORE_NAME);
+ private MockedStatic<RocksDBMetrics> rocksDBMetricsMockedStatic;
@Before
public void setUp() {
setUpMetricsStubMock();
- expect(streamsMetrics.rocksDBMetricsRecordingTrigger()).andStubReturn(recordingTrigger);
- replay(streamsMetrics);
+ when(streamsMetrics.rocksDBMetricsRecordingTrigger()).thenReturn(recordingTrigger);
recorder.init(streamsMetrics, TASK_ID1);
}
+ @After
+ public void tearDown() {
+ rocksDBMetricsMockedStatic.close();
+ }
+
@Test
public void shouldInitMetricsRecorder() {
setUpMetricsMock();
recorder.init(streamsMetrics, TASK_ID1);
- verify(RocksDBMetrics.class);
+// verify(RocksDBMetrics.class);
Review comment:
Thanks for reminding
--
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: jira-unsubscribe@kafka.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [kafka] ijuma commented on pull request #10976: KAFKA-13036 Replace EasyMock and PowerMock with Mockito for RocksDBMetricsRecorderTest
Posted by GitBox <gi...@apache.org>.
ijuma commented on pull request #10976:
URL: https://github.com/apache/kafka/pull/10976#issuecomment-913726974
@wycccccc Is this ready for another round of reviews from @chia7712 ?
--
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: jira-unsubscribe@kafka.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [kafka] showuon commented on pull request #10976: KAFKA-13036 Replace EasyMock and PowerMock with Mockito for RocksDBMetricsRecorderTest
Posted by GitBox <gi...@apache.org>.
showuon commented on pull request #10976:
URL: https://github.com/apache/kafka/pull/10976#issuecomment-1066731290
Ok, I'll take a look this week.
--
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: jira-unsubscribe@kafka.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [kafka] ijuma commented on pull request #10976: KAFKA-13036 Replace EasyMock and PowerMock with Mockito for RocksDBMetricsRecorderTest
Posted by GitBox <gi...@apache.org>.
ijuma commented on pull request #10976:
URL: https://github.com/apache/kafka/pull/10976#issuecomment-1066717748
@showuon maybe you can help review this?
--
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: jira-unsubscribe@kafka.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [kafka] showuon commented on a change in pull request #10976: KAFKA-13036 Replace EasyMock and PowerMock with Mockito for RocksDBMetricsRecorderTest
Posted by GitBox <gi...@apache.org>.
showuon commented on a change in pull request #10976:
URL: https://github.com/apache/kafka/pull/10976#discussion_r664368496
##########
File path: streams/src/test/java/org/apache/kafka/streams/state/internals/metrics/RocksDBMetricsRecorderTest.java
##########
@@ -70,99 +63,91 @@
private final Statistics statisticsToAdd2 = mock(Statistics.class);
private final Statistics statisticsToAdd3 = mock(Statistics.class);
- private final Sensor bytesWrittenToDatabaseSensor = createMock(Sensor.class);
- private final Sensor bytesReadFromDatabaseSensor = createMock(Sensor.class);
- private final Sensor memtableBytesFlushedSensor = createMock(Sensor.class);
- private final Sensor memtableHitRatioSensor = createMock(Sensor.class);
- private final Sensor writeStallDurationSensor = createMock(Sensor.class);
- private final Sensor blockCacheDataHitRatioSensor = createMock(Sensor.class);
- private final Sensor blockCacheIndexHitRatioSensor = createMock(Sensor.class);
- private final Sensor blockCacheFilterHitRatioSensor = createMock(Sensor.class);
- private final Sensor bytesReadDuringCompactionSensor = createMock(Sensor.class);
- private final Sensor bytesWrittenDuringCompactionSensor = createMock(Sensor.class);
- private final Sensor numberOfOpenFilesSensor = createMock(Sensor.class);
- private final Sensor numberOfFileErrorsSensor = createMock(Sensor.class);
-
- private final StreamsMetricsImpl streamsMetrics = niceMock(StreamsMetricsImpl.class);
+ private final Sensor bytesWrittenToDatabaseSensor = mock(Sensor.class);
+ private final Sensor bytesReadFromDatabaseSensor = mock(Sensor.class);
+ private final Sensor memtableBytesFlushedSensor = mock(Sensor.class);
+ private final Sensor memtableHitRatioSensor = mock(Sensor.class);
+ private final Sensor writeStallDurationSensor = mock(Sensor.class);
+ private final Sensor blockCacheDataHitRatioSensor = mock(Sensor.class);
+ private final Sensor blockCacheIndexHitRatioSensor = mock(Sensor.class);
+ private final Sensor blockCacheFilterHitRatioSensor = mock(Sensor.class);
+ private final Sensor bytesReadDuringCompactionSensor = mock(Sensor.class);
+ private final Sensor bytesWrittenDuringCompactionSensor = mock(Sensor.class);
+ private final Sensor numberOfOpenFilesSensor = mock(Sensor.class);
+ private final Sensor numberOfFileErrorsSensor = mock(Sensor.class);
+
+ private final StreamsMetricsImpl streamsMetrics = mock(StreamsMetricsImpl.class);
private final RocksDBMetricsRecordingTrigger recordingTrigger = mock(RocksDBMetricsRecordingTrigger.class);
private final RocksDBMetricsRecorder recorder = new RocksDBMetricsRecorder(METRICS_SCOPE, STORE_NAME);
+ private MockedStatic<RocksDBMetrics> rocksDBMetricsMockedStatic;
@Before
public void setUp() {
setUpMetricsStubMock();
- expect(streamsMetrics.rocksDBMetricsRecordingTrigger()).andStubReturn(recordingTrigger);
- replay(streamsMetrics);
+ when(streamsMetrics.rocksDBMetricsRecordingTrigger()).thenReturn(recordingTrigger);
recorder.init(streamsMetrics, TASK_ID1);
}
+ @After
+ public void tearDown() {
+ rocksDBMetricsMockedStatic.close();
+ }
+
@Test
public void shouldInitMetricsRecorder() {
setUpMetricsMock();
recorder.init(streamsMetrics, TASK_ID1);
- verify(RocksDBMetrics.class);
+// verify(RocksDBMetrics.class);
Review comment:
Should be removed?
--
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: jira-unsubscribe@kafka.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [kafka] chia7712 commented on a change in pull request #10976: KAFKA-13036 Replace EasyMock and PowerMock with Mockito for RocksDBMetricsRecorderTest
Posted by GitBox <gi...@apache.org>.
chia7712 commented on a change in pull request #10976:
URL: https://github.com/apache/kafka/pull/10976#discussion_r709761794
##########
File path: streams/src/test/java/org/apache/kafka/streams/state/internals/metrics/RocksDBMetricsRecorderTest.java
##########
@@ -300,65 +287,47 @@ public void shouldAddItselfToRecordingTriggerWhenFirstValueProvidersAreAddedAfte
recorder.removeValueProviders(SEGMENT_STORE_NAME_1);
reset(recordingTrigger);
recordingTrigger.addMetricsRecorder(recorder);
- replay(recordingTrigger);
recorder.addValueProviders(SEGMENT_STORE_NAME_2, dbToAdd2, cacheToAdd2, statisticsToAdd2);
-
- verify(recordingTrigger);
}
@Test
public void shouldNotAddItselfToRecordingTriggerWhenNotEmpty2() {
recorder.addValueProviders(SEGMENT_STORE_NAME_1, dbToAdd1, cacheToAdd1, statisticsToAdd1);
reset(recordingTrigger);
- replay(recordingTrigger);
recorder.addValueProviders(SEGMENT_STORE_NAME_2, dbToAdd2, cacheToAdd2, statisticsToAdd2);
-
- verify(recordingTrigger);
}
@Test
public void shouldCloseStatisticsWhenValueProvidersAreRemoved() {
recorder.addValueProviders(SEGMENT_STORE_NAME_1, dbToAdd1, cacheToAdd1, statisticsToAdd1);
reset(statisticsToAdd1);
statisticsToAdd1.close();
- replay(statisticsToAdd1);
recorder.removeValueProviders(SEGMENT_STORE_NAME_1);
-
- verify(statisticsToAdd1);
}
@Test
public void shouldNotCloseStatisticsWhenValueProvidersWithoutStatisticsAreRemoved() {
recorder.addValueProviders(SEGMENT_STORE_NAME_1, dbToAdd1, cacheToAdd1, null);
reset(statisticsToAdd1);
- replay(statisticsToAdd1);
recorder.removeValueProviders(SEGMENT_STORE_NAME_1);
-
- verify(statisticsToAdd1);
}
@Test
public void shouldRemoveItselfFromRecordingTriggerWhenLastValueProvidersAreRemoved() {
recorder.addValueProviders(SEGMENT_STORE_NAME_1, dbToAdd1, cacheToAdd1, statisticsToAdd1);
recorder.addValueProviders(SEGMENT_STORE_NAME_2, dbToAdd2, cacheToAdd2, statisticsToAdd2);
reset(recordingTrigger);
- replay(recordingTrigger);
recorder.removeValueProviders(SEGMENT_STORE_NAME_1);
- verify(recordingTrigger);
-
reset(recordingTrigger);
recordingTrigger.removeMetricsRecorder(recorder);
- replay(recordingTrigger);
recorder.removeValueProviders(SEGMENT_STORE_NAME_2);
Review comment:
for example:
```java
recorder.addValueProviders(SEGMENT_STORE_NAME_1, dbToAdd1, cacheToAdd1, statisticsToAdd1);
recorder.addValueProviders(SEGMENT_STORE_NAME_2, dbToAdd2, cacheToAdd2, statisticsToAdd2);
recorder.removeValueProviders(SEGMENT_STORE_NAME_1);
recorder.removeValueProviders(SEGMENT_STORE_NAME_2);
Mockito.verify(recordingTrigger, Mockito.times(1)).removeMetricsRecorder(recorder);
```
--
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: jira-unsubscribe@kafka.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [kafka] wycccccc commented on a change in pull request #10976: KAFKA-13036 Replace EasyMock and PowerMock with Mockito for RocksDBMetricsRecorderTest
Posted by GitBox <gi...@apache.org>.
wycccccc commented on a change in pull request #10976:
URL: https://github.com/apache/kafka/pull/10976#discussion_r664391227
##########
File path: streams/src/test/java/org/apache/kafka/streams/state/internals/metrics/RocksDBMetricsRecorderTest.java
##########
@@ -70,99 +63,91 @@
private final Statistics statisticsToAdd2 = mock(Statistics.class);
private final Statistics statisticsToAdd3 = mock(Statistics.class);
- private final Sensor bytesWrittenToDatabaseSensor = createMock(Sensor.class);
- private final Sensor bytesReadFromDatabaseSensor = createMock(Sensor.class);
- private final Sensor memtableBytesFlushedSensor = createMock(Sensor.class);
- private final Sensor memtableHitRatioSensor = createMock(Sensor.class);
- private final Sensor writeStallDurationSensor = createMock(Sensor.class);
- private final Sensor blockCacheDataHitRatioSensor = createMock(Sensor.class);
- private final Sensor blockCacheIndexHitRatioSensor = createMock(Sensor.class);
- private final Sensor blockCacheFilterHitRatioSensor = createMock(Sensor.class);
- private final Sensor bytesReadDuringCompactionSensor = createMock(Sensor.class);
- private final Sensor bytesWrittenDuringCompactionSensor = createMock(Sensor.class);
- private final Sensor numberOfOpenFilesSensor = createMock(Sensor.class);
- private final Sensor numberOfFileErrorsSensor = createMock(Sensor.class);
-
- private final StreamsMetricsImpl streamsMetrics = niceMock(StreamsMetricsImpl.class);
+ private final Sensor bytesWrittenToDatabaseSensor = mock(Sensor.class);
+ private final Sensor bytesReadFromDatabaseSensor = mock(Sensor.class);
+ private final Sensor memtableBytesFlushedSensor = mock(Sensor.class);
+ private final Sensor memtableHitRatioSensor = mock(Sensor.class);
+ private final Sensor writeStallDurationSensor = mock(Sensor.class);
+ private final Sensor blockCacheDataHitRatioSensor = mock(Sensor.class);
+ private final Sensor blockCacheIndexHitRatioSensor = mock(Sensor.class);
+ private final Sensor blockCacheFilterHitRatioSensor = mock(Sensor.class);
+ private final Sensor bytesReadDuringCompactionSensor = mock(Sensor.class);
+ private final Sensor bytesWrittenDuringCompactionSensor = mock(Sensor.class);
+ private final Sensor numberOfOpenFilesSensor = mock(Sensor.class);
+ private final Sensor numberOfFileErrorsSensor = mock(Sensor.class);
+
+ private final StreamsMetricsImpl streamsMetrics = mock(StreamsMetricsImpl.class);
private final RocksDBMetricsRecordingTrigger recordingTrigger = mock(RocksDBMetricsRecordingTrigger.class);
private final RocksDBMetricsRecorder recorder = new RocksDBMetricsRecorder(METRICS_SCOPE, STORE_NAME);
+ private MockedStatic<RocksDBMetrics> rocksDBMetricsMockedStatic;
@Before
public void setUp() {
setUpMetricsStubMock();
- expect(streamsMetrics.rocksDBMetricsRecordingTrigger()).andStubReturn(recordingTrigger);
- replay(streamsMetrics);
+ when(streamsMetrics.rocksDBMetricsRecordingTrigger()).thenReturn(recordingTrigger);
recorder.init(streamsMetrics, TASK_ID1);
}
+ @After
+ public void tearDown() {
+ rocksDBMetricsMockedStatic.close();
+ }
+
@Test
public void shouldInitMetricsRecorder() {
setUpMetricsMock();
recorder.init(streamsMetrics, TASK_ID1);
- verify(RocksDBMetrics.class);
+// verify(RocksDBMetrics.class);
Review comment:
Thanks for reminding
--
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: jira-unsubscribe@kafka.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [kafka] chia7712 commented on a change in pull request #10976: KAFKA-13036 Replace EasyMock and PowerMock with Mockito for RocksDBMetricsRecorderTest
Posted by GitBox <gi...@apache.org>.
chia7712 commented on a change in pull request #10976:
URL: https://github.com/apache/kafka/pull/10976#discussion_r702987181
##########
File path: streams/src/test/java/org/apache/kafka/streams/state/internals/metrics/RocksDBMetricsRecorderTest.java
##########
@@ -70,99 +63,90 @@
private final Statistics statisticsToAdd2 = mock(Statistics.class);
private final Statistics statisticsToAdd3 = mock(Statistics.class);
- private final Sensor bytesWrittenToDatabaseSensor = createMock(Sensor.class);
- private final Sensor bytesReadFromDatabaseSensor = createMock(Sensor.class);
- private final Sensor memtableBytesFlushedSensor = createMock(Sensor.class);
- private final Sensor memtableHitRatioSensor = createMock(Sensor.class);
- private final Sensor writeStallDurationSensor = createMock(Sensor.class);
- private final Sensor blockCacheDataHitRatioSensor = createMock(Sensor.class);
- private final Sensor blockCacheIndexHitRatioSensor = createMock(Sensor.class);
- private final Sensor blockCacheFilterHitRatioSensor = createMock(Sensor.class);
- private final Sensor bytesReadDuringCompactionSensor = createMock(Sensor.class);
- private final Sensor bytesWrittenDuringCompactionSensor = createMock(Sensor.class);
- private final Sensor numberOfOpenFilesSensor = createMock(Sensor.class);
- private final Sensor numberOfFileErrorsSensor = createMock(Sensor.class);
-
- private final StreamsMetricsImpl streamsMetrics = niceMock(StreamsMetricsImpl.class);
+ private final Sensor bytesWrittenToDatabaseSensor = mock(Sensor.class);
+ private final Sensor bytesReadFromDatabaseSensor = mock(Sensor.class);
+ private final Sensor memtableBytesFlushedSensor = mock(Sensor.class);
+ private final Sensor memtableHitRatioSensor = mock(Sensor.class);
+ private final Sensor writeStallDurationSensor = mock(Sensor.class);
+ private final Sensor blockCacheDataHitRatioSensor = mock(Sensor.class);
+ private final Sensor blockCacheIndexHitRatioSensor = mock(Sensor.class);
+ private final Sensor blockCacheFilterHitRatioSensor = mock(Sensor.class);
+ private final Sensor bytesReadDuringCompactionSensor = mock(Sensor.class);
+ private final Sensor bytesWrittenDuringCompactionSensor = mock(Sensor.class);
+ private final Sensor numberOfOpenFilesSensor = mock(Sensor.class);
+ private final Sensor numberOfFileErrorsSensor = mock(Sensor.class);
+
+ private final StreamsMetricsImpl streamsMetrics = mock(StreamsMetricsImpl.class);
private final RocksDBMetricsRecordingTrigger recordingTrigger = mock(RocksDBMetricsRecordingTrigger.class);
private final RocksDBMetricsRecorder recorder = new RocksDBMetricsRecorder(METRICS_SCOPE, STORE_NAME);
+ private MockedStatic<RocksDBMetrics> rocksDBMetricsMockedStatic;
@Before
public void setUp() {
setUpMetricsStubMock();
- expect(streamsMetrics.rocksDBMetricsRecordingTrigger()).andStubReturn(recordingTrigger);
- replay(streamsMetrics);
+ when(streamsMetrics.rocksDBMetricsRecordingTrigger()).thenReturn(recordingTrigger);
recorder.init(streamsMetrics, TASK_ID1);
}
+ @After
+ public void tearDown() {
+ rocksDBMetricsMockedStatic.close();
+ }
+
@Test
public void shouldInitMetricsRecorder() {
setUpMetricsMock();
recorder.init(streamsMetrics, TASK_ID1);
- verify(RocksDBMetrics.class);
assertThat(recorder.taskId(), is(TASK_ID1));
}
@Test
public void shouldThrowIfMetricRecorderIsReInitialisedWithDifferentTask() {
- setUpMetricsStubMock();
- recorder.init(streamsMetrics, TASK_ID1);
-
assertThrows(
- IllegalStateException.class,
- () -> recorder.init(streamsMetrics, TASK_ID2)
+ IllegalStateException.class,
Review comment:
There are many unnecessary indentation in this PR. Could you please remove them?
##########
File path: streams/src/test/java/org/apache/kafka/streams/state/internals/metrics/RocksDBMetricsRecorderTest.java
##########
@@ -70,99 +63,90 @@
private final Statistics statisticsToAdd2 = mock(Statistics.class);
private final Statistics statisticsToAdd3 = mock(Statistics.class);
- private final Sensor bytesWrittenToDatabaseSensor = createMock(Sensor.class);
- private final Sensor bytesReadFromDatabaseSensor = createMock(Sensor.class);
- private final Sensor memtableBytesFlushedSensor = createMock(Sensor.class);
- private final Sensor memtableHitRatioSensor = createMock(Sensor.class);
- private final Sensor writeStallDurationSensor = createMock(Sensor.class);
- private final Sensor blockCacheDataHitRatioSensor = createMock(Sensor.class);
- private final Sensor blockCacheIndexHitRatioSensor = createMock(Sensor.class);
- private final Sensor blockCacheFilterHitRatioSensor = createMock(Sensor.class);
- private final Sensor bytesReadDuringCompactionSensor = createMock(Sensor.class);
- private final Sensor bytesWrittenDuringCompactionSensor = createMock(Sensor.class);
- private final Sensor numberOfOpenFilesSensor = createMock(Sensor.class);
- private final Sensor numberOfFileErrorsSensor = createMock(Sensor.class);
-
- private final StreamsMetricsImpl streamsMetrics = niceMock(StreamsMetricsImpl.class);
+ private final Sensor bytesWrittenToDatabaseSensor = mock(Sensor.class);
+ private final Sensor bytesReadFromDatabaseSensor = mock(Sensor.class);
+ private final Sensor memtableBytesFlushedSensor = mock(Sensor.class);
+ private final Sensor memtableHitRatioSensor = mock(Sensor.class);
+ private final Sensor writeStallDurationSensor = mock(Sensor.class);
+ private final Sensor blockCacheDataHitRatioSensor = mock(Sensor.class);
+ private final Sensor blockCacheIndexHitRatioSensor = mock(Sensor.class);
+ private final Sensor blockCacheFilterHitRatioSensor = mock(Sensor.class);
+ private final Sensor bytesReadDuringCompactionSensor = mock(Sensor.class);
+ private final Sensor bytesWrittenDuringCompactionSensor = mock(Sensor.class);
+ private final Sensor numberOfOpenFilesSensor = mock(Sensor.class);
+ private final Sensor numberOfFileErrorsSensor = mock(Sensor.class);
+
+ private final StreamsMetricsImpl streamsMetrics = mock(StreamsMetricsImpl.class);
private final RocksDBMetricsRecordingTrigger recordingTrigger = mock(RocksDBMetricsRecordingTrigger.class);
private final RocksDBMetricsRecorder recorder = new RocksDBMetricsRecorder(METRICS_SCOPE, STORE_NAME);
+ private MockedStatic<RocksDBMetrics> rocksDBMetricsMockedStatic;
@Before
public void setUp() {
setUpMetricsStubMock();
- expect(streamsMetrics.rocksDBMetricsRecordingTrigger()).andStubReturn(recordingTrigger);
- replay(streamsMetrics);
+ when(streamsMetrics.rocksDBMetricsRecordingTrigger()).thenReturn(recordingTrigger);
recorder.init(streamsMetrics, TASK_ID1);
}
+ @After
+ public void tearDown() {
+ rocksDBMetricsMockedStatic.close();
+ }
+
@Test
public void shouldInitMetricsRecorder() {
setUpMetricsMock();
Review comment:
There is another setup-related method `setUpMetricsStubMock`. Could we merge them?
##########
File path: streams/src/test/java/org/apache/kafka/streams/state/internals/metrics/RocksDBMetricsRecorderTest.java
##########
@@ -70,99 +63,90 @@
private final Statistics statisticsToAdd2 = mock(Statistics.class);
private final Statistics statisticsToAdd3 = mock(Statistics.class);
- private final Sensor bytesWrittenToDatabaseSensor = createMock(Sensor.class);
- private final Sensor bytesReadFromDatabaseSensor = createMock(Sensor.class);
- private final Sensor memtableBytesFlushedSensor = createMock(Sensor.class);
- private final Sensor memtableHitRatioSensor = createMock(Sensor.class);
- private final Sensor writeStallDurationSensor = createMock(Sensor.class);
- private final Sensor blockCacheDataHitRatioSensor = createMock(Sensor.class);
- private final Sensor blockCacheIndexHitRatioSensor = createMock(Sensor.class);
- private final Sensor blockCacheFilterHitRatioSensor = createMock(Sensor.class);
- private final Sensor bytesReadDuringCompactionSensor = createMock(Sensor.class);
- private final Sensor bytesWrittenDuringCompactionSensor = createMock(Sensor.class);
- private final Sensor numberOfOpenFilesSensor = createMock(Sensor.class);
- private final Sensor numberOfFileErrorsSensor = createMock(Sensor.class);
-
- private final StreamsMetricsImpl streamsMetrics = niceMock(StreamsMetricsImpl.class);
+ private final Sensor bytesWrittenToDatabaseSensor = mock(Sensor.class);
+ private final Sensor bytesReadFromDatabaseSensor = mock(Sensor.class);
+ private final Sensor memtableBytesFlushedSensor = mock(Sensor.class);
+ private final Sensor memtableHitRatioSensor = mock(Sensor.class);
+ private final Sensor writeStallDurationSensor = mock(Sensor.class);
+ private final Sensor blockCacheDataHitRatioSensor = mock(Sensor.class);
+ private final Sensor blockCacheIndexHitRatioSensor = mock(Sensor.class);
+ private final Sensor blockCacheFilterHitRatioSensor = mock(Sensor.class);
+ private final Sensor bytesReadDuringCompactionSensor = mock(Sensor.class);
+ private final Sensor bytesWrittenDuringCompactionSensor = mock(Sensor.class);
+ private final Sensor numberOfOpenFilesSensor = mock(Sensor.class);
+ private final Sensor numberOfFileErrorsSensor = mock(Sensor.class);
+
+ private final StreamsMetricsImpl streamsMetrics = mock(StreamsMetricsImpl.class);
private final RocksDBMetricsRecordingTrigger recordingTrigger = mock(RocksDBMetricsRecordingTrigger.class);
private final RocksDBMetricsRecorder recorder = new RocksDBMetricsRecorder(METRICS_SCOPE, STORE_NAME);
+ private MockedStatic<RocksDBMetrics> rocksDBMetricsMockedStatic;
@Before
public void setUp() {
setUpMetricsStubMock();
- expect(streamsMetrics.rocksDBMetricsRecordingTrigger()).andStubReturn(recordingTrigger);
- replay(streamsMetrics);
+ when(streamsMetrics.rocksDBMetricsRecordingTrigger()).thenReturn(recordingTrigger);
recorder.init(streamsMetrics, TASK_ID1);
}
+ @After
+ public void tearDown() {
+ rocksDBMetricsMockedStatic.close();
+ }
+
@Test
public void shouldInitMetricsRecorder() {
setUpMetricsMock();
recorder.init(streamsMetrics, TASK_ID1);
- verify(RocksDBMetrics.class);
assertThat(recorder.taskId(), is(TASK_ID1));
}
@Test
public void shouldThrowIfMetricRecorderIsReInitialisedWithDifferentTask() {
- setUpMetricsStubMock();
- recorder.init(streamsMetrics, TASK_ID1);
-
assertThrows(
- IllegalStateException.class,
- () -> recorder.init(streamsMetrics, TASK_ID2)
+ IllegalStateException.class,
+ () -> recorder.init(streamsMetrics, TASK_ID2)
);
}
@Test
public void shouldThrowIfMetricRecorderIsReInitialisedWithDifferentStreamsMetrics() {
- setUpMetricsStubMock();
- recorder.init(streamsMetrics, TASK_ID1);
Review comment:
why removing this line? It is intentional to initialize the recorder with different metrics.
##########
File path: streams/src/test/java/org/apache/kafka/streams/state/internals/metrics/RocksDBMetricsRecorderTest.java
##########
@@ -70,99 +63,90 @@
private final Statistics statisticsToAdd2 = mock(Statistics.class);
private final Statistics statisticsToAdd3 = mock(Statistics.class);
- private final Sensor bytesWrittenToDatabaseSensor = createMock(Sensor.class);
- private final Sensor bytesReadFromDatabaseSensor = createMock(Sensor.class);
- private final Sensor memtableBytesFlushedSensor = createMock(Sensor.class);
- private final Sensor memtableHitRatioSensor = createMock(Sensor.class);
- private final Sensor writeStallDurationSensor = createMock(Sensor.class);
- private final Sensor blockCacheDataHitRatioSensor = createMock(Sensor.class);
- private final Sensor blockCacheIndexHitRatioSensor = createMock(Sensor.class);
- private final Sensor blockCacheFilterHitRatioSensor = createMock(Sensor.class);
- private final Sensor bytesReadDuringCompactionSensor = createMock(Sensor.class);
- private final Sensor bytesWrittenDuringCompactionSensor = createMock(Sensor.class);
- private final Sensor numberOfOpenFilesSensor = createMock(Sensor.class);
- private final Sensor numberOfFileErrorsSensor = createMock(Sensor.class);
-
- private final StreamsMetricsImpl streamsMetrics = niceMock(StreamsMetricsImpl.class);
+ private final Sensor bytesWrittenToDatabaseSensor = mock(Sensor.class);
+ private final Sensor bytesReadFromDatabaseSensor = mock(Sensor.class);
+ private final Sensor memtableBytesFlushedSensor = mock(Sensor.class);
+ private final Sensor memtableHitRatioSensor = mock(Sensor.class);
+ private final Sensor writeStallDurationSensor = mock(Sensor.class);
+ private final Sensor blockCacheDataHitRatioSensor = mock(Sensor.class);
+ private final Sensor blockCacheIndexHitRatioSensor = mock(Sensor.class);
+ private final Sensor blockCacheFilterHitRatioSensor = mock(Sensor.class);
+ private final Sensor bytesReadDuringCompactionSensor = mock(Sensor.class);
+ private final Sensor bytesWrittenDuringCompactionSensor = mock(Sensor.class);
+ private final Sensor numberOfOpenFilesSensor = mock(Sensor.class);
+ private final Sensor numberOfFileErrorsSensor = mock(Sensor.class);
+
+ private final StreamsMetricsImpl streamsMetrics = mock(StreamsMetricsImpl.class);
private final RocksDBMetricsRecordingTrigger recordingTrigger = mock(RocksDBMetricsRecordingTrigger.class);
private final RocksDBMetricsRecorder recorder = new RocksDBMetricsRecorder(METRICS_SCOPE, STORE_NAME);
+ private MockedStatic<RocksDBMetrics> rocksDBMetricsMockedStatic;
@Before
public void setUp() {
setUpMetricsStubMock();
- expect(streamsMetrics.rocksDBMetricsRecordingTrigger()).andStubReturn(recordingTrigger);
- replay(streamsMetrics);
+ when(streamsMetrics.rocksDBMetricsRecordingTrigger()).thenReturn(recordingTrigger);
recorder.init(streamsMetrics, TASK_ID1);
}
+ @After
+ public void tearDown() {
+ rocksDBMetricsMockedStatic.close();
+ }
+
@Test
public void shouldInitMetricsRecorder() {
setUpMetricsMock();
recorder.init(streamsMetrics, TASK_ID1);
- verify(RocksDBMetrics.class);
assertThat(recorder.taskId(), is(TASK_ID1));
}
@Test
public void shouldThrowIfMetricRecorderIsReInitialisedWithDifferentTask() {
- setUpMetricsStubMock();
- recorder.init(streamsMetrics, TASK_ID1);
-
assertThrows(
- IllegalStateException.class,
- () -> recorder.init(streamsMetrics, TASK_ID2)
+ IllegalStateException.class,
+ () -> recorder.init(streamsMetrics, TASK_ID2)
);
}
@Test
public void shouldThrowIfMetricRecorderIsReInitialisedWithDifferentStreamsMetrics() {
- setUpMetricsStubMock();
- recorder.init(streamsMetrics, TASK_ID1);
-
assertThrows(
- IllegalStateException.class,
- () -> recorder.init(
- new StreamsMetricsImpl(new Metrics(), "test-client", StreamsConfig.METRICS_LATEST, new MockTime()),
- TASK_ID1
- )
+ IllegalStateException.class,
+ () -> recorder.init(
+ new StreamsMetricsImpl(new Metrics(), "test-client", StreamsConfig.METRICS_LATEST, new MockTime()),
+ TASK_ID1
+ )
);
}
@Test
public void shouldSetStatsLevelToExceptDetailedTimersWhenValueProvidersWithStatisticsAreAdded() {
statisticsToAdd1.setStatsLevel(StatsLevel.EXCEPT_DETAILED_TIMERS);
Review comment:
It needs to make sure this code `statisticsToAdd1.setStatsLevel(StatsLevel.EXCEPT_DETAILED_TIMERS);` is invoked when executing `recorder.addValueProviders(SEGMENT_STORE_NAME_1, dbToAdd1, cacheToAdd1, statisticsToAdd1);`. Otherwise, this test is no-op.
##########
File path: streams/src/test/java/org/apache/kafka/streams/state/internals/metrics/RocksDBMetricsRecorderTest.java
##########
@@ -70,99 +63,90 @@
private final Statistics statisticsToAdd2 = mock(Statistics.class);
private final Statistics statisticsToAdd3 = mock(Statistics.class);
- private final Sensor bytesWrittenToDatabaseSensor = createMock(Sensor.class);
- private final Sensor bytesReadFromDatabaseSensor = createMock(Sensor.class);
- private final Sensor memtableBytesFlushedSensor = createMock(Sensor.class);
- private final Sensor memtableHitRatioSensor = createMock(Sensor.class);
- private final Sensor writeStallDurationSensor = createMock(Sensor.class);
- private final Sensor blockCacheDataHitRatioSensor = createMock(Sensor.class);
- private final Sensor blockCacheIndexHitRatioSensor = createMock(Sensor.class);
- private final Sensor blockCacheFilterHitRatioSensor = createMock(Sensor.class);
- private final Sensor bytesReadDuringCompactionSensor = createMock(Sensor.class);
- private final Sensor bytesWrittenDuringCompactionSensor = createMock(Sensor.class);
- private final Sensor numberOfOpenFilesSensor = createMock(Sensor.class);
- private final Sensor numberOfFileErrorsSensor = createMock(Sensor.class);
-
- private final StreamsMetricsImpl streamsMetrics = niceMock(StreamsMetricsImpl.class);
+ private final Sensor bytesWrittenToDatabaseSensor = mock(Sensor.class);
+ private final Sensor bytesReadFromDatabaseSensor = mock(Sensor.class);
+ private final Sensor memtableBytesFlushedSensor = mock(Sensor.class);
+ private final Sensor memtableHitRatioSensor = mock(Sensor.class);
+ private final Sensor writeStallDurationSensor = mock(Sensor.class);
+ private final Sensor blockCacheDataHitRatioSensor = mock(Sensor.class);
+ private final Sensor blockCacheIndexHitRatioSensor = mock(Sensor.class);
+ private final Sensor blockCacheFilterHitRatioSensor = mock(Sensor.class);
+ private final Sensor bytesReadDuringCompactionSensor = mock(Sensor.class);
+ private final Sensor bytesWrittenDuringCompactionSensor = mock(Sensor.class);
+ private final Sensor numberOfOpenFilesSensor = mock(Sensor.class);
+ private final Sensor numberOfFileErrorsSensor = mock(Sensor.class);
+
+ private final StreamsMetricsImpl streamsMetrics = mock(StreamsMetricsImpl.class);
private final RocksDBMetricsRecordingTrigger recordingTrigger = mock(RocksDBMetricsRecordingTrigger.class);
private final RocksDBMetricsRecorder recorder = new RocksDBMetricsRecorder(METRICS_SCOPE, STORE_NAME);
+ private MockedStatic<RocksDBMetrics> rocksDBMetricsMockedStatic;
@Before
public void setUp() {
setUpMetricsStubMock();
- expect(streamsMetrics.rocksDBMetricsRecordingTrigger()).andStubReturn(recordingTrigger);
- replay(streamsMetrics);
+ when(streamsMetrics.rocksDBMetricsRecordingTrigger()).thenReturn(recordingTrigger);
recorder.init(streamsMetrics, TASK_ID1);
}
+ @After
+ public void tearDown() {
+ rocksDBMetricsMockedStatic.close();
+ }
+
@Test
public void shouldInitMetricsRecorder() {
setUpMetricsMock();
recorder.init(streamsMetrics, TASK_ID1);
- verify(RocksDBMetrics.class);
assertThat(recorder.taskId(), is(TASK_ID1));
}
@Test
public void shouldThrowIfMetricRecorderIsReInitialisedWithDifferentTask() {
- setUpMetricsStubMock();
- recorder.init(streamsMetrics, TASK_ID1);
Review comment:
why removing this line? this test is used to make sure we can't initialize the `recorder` multiple times with different task id.
--
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: jira-unsubscribe@kafka.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [kafka] showuon commented on pull request #10976: KAFKA-13036 Replace EasyMock and PowerMock with Mockito for RocksDBMetricsRecorderTest
Posted by GitBox <gi...@apache.org>.
showuon commented on pull request #10976:
URL: https://github.com/apache/kafka/pull/10976#issuecomment-1066740223
@wycccccc , I saw there are conflict files with trunk branch, could you help fix them? Thanks.
--
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: jira-unsubscribe@kafka.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [kafka] wycccccc commented on pull request #10976: KAFKA-13036 Replace EasyMock and PowerMock with Mockito for RocksDBMetricsRecorderTest
Posted by GitBox <gi...@apache.org>.
wycccccc commented on pull request #10976:
URL: https://github.com/apache/kafka/pull/10976#issuecomment-916776585
@ijuma I think I survived this round of reviews.
--
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: jira-unsubscribe@kafka.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [kafka] chia7712 commented on a change in pull request #10976: KAFKA-13036 Replace EasyMock and PowerMock with Mockito for RocksDBMetricsRecorderTest
Posted by GitBox <gi...@apache.org>.
chia7712 commented on a change in pull request #10976:
URL: https://github.com/apache/kafka/pull/10976#discussion_r706140746
##########
File path: streams/src/test/java/org/apache/kafka/streams/state/internals/metrics/RocksDBMetricsRecorderTest.java
##########
@@ -378,261 +347,189 @@ public void shouldRecordStatisticsBasedMetrics() {
reset(statisticsToAdd1);
reset(statisticsToAdd2);
- expect(statisticsToAdd1.getAndResetTickerCount(TickerType.BYTES_WRITTEN)).andReturn(1L);
- expect(statisticsToAdd2.getAndResetTickerCount(TickerType.BYTES_WRITTEN)).andReturn(2L);
+ when(statisticsToAdd1.getAndResetTickerCount(TickerType.BYTES_WRITTEN)).thenReturn(1L);
+ when(statisticsToAdd2.getAndResetTickerCount(TickerType.BYTES_WRITTEN)).thenReturn(2L);
bytesWrittenToDatabaseSensor.record(1 + 2, 0L);
- replay(bytesWrittenToDatabaseSensor);
- expect(statisticsToAdd1.getAndResetTickerCount(TickerType.BYTES_READ)).andReturn(2L);
- expect(statisticsToAdd2.getAndResetTickerCount(TickerType.BYTES_READ)).andReturn(3L);
+ when(statisticsToAdd1.getAndResetTickerCount(TickerType.BYTES_READ)).thenReturn(2L);
+ when(statisticsToAdd2.getAndResetTickerCount(TickerType.BYTES_READ)).thenReturn(3L);
bytesReadFromDatabaseSensor.record(2 + 3, 0L);
- replay(bytesReadFromDatabaseSensor);
- expect(statisticsToAdd1.getAndResetTickerCount(TickerType.FLUSH_WRITE_BYTES)).andReturn(3L);
- expect(statisticsToAdd2.getAndResetTickerCount(TickerType.FLUSH_WRITE_BYTES)).andReturn(4L);
+ when(statisticsToAdd1.getAndResetTickerCount(TickerType.FLUSH_WRITE_BYTES)).thenReturn(3L);
+ when(statisticsToAdd2.getAndResetTickerCount(TickerType.FLUSH_WRITE_BYTES)).thenReturn(4L);
memtableBytesFlushedSensor.record(3 + 4, 0L);
- replay(memtableBytesFlushedSensor);
- expect(statisticsToAdd1.getAndResetTickerCount(TickerType.MEMTABLE_HIT)).andReturn(1L);
- expect(statisticsToAdd1.getAndResetTickerCount(TickerType.MEMTABLE_MISS)).andReturn(2L);
- expect(statisticsToAdd2.getAndResetTickerCount(TickerType.MEMTABLE_HIT)).andReturn(3L);
- expect(statisticsToAdd2.getAndResetTickerCount(TickerType.MEMTABLE_MISS)).andReturn(4L);
+ when(statisticsToAdd1.getAndResetTickerCount(TickerType.MEMTABLE_HIT)).thenReturn(1L);
+ when(statisticsToAdd1.getAndResetTickerCount(TickerType.MEMTABLE_MISS)).thenReturn(2L);
+ when(statisticsToAdd2.getAndResetTickerCount(TickerType.MEMTABLE_HIT)).thenReturn(3L);
+ when(statisticsToAdd2.getAndResetTickerCount(TickerType.MEMTABLE_MISS)).thenReturn(4L);
memtableHitRatioSensor.record((double) 4 / (4 + 6), 0L);
- replay(memtableHitRatioSensor);
- expect(statisticsToAdd1.getAndResetTickerCount(TickerType.STALL_MICROS)).andReturn(4L);
- expect(statisticsToAdd2.getAndResetTickerCount(TickerType.STALL_MICROS)).andReturn(5L);
+ when(statisticsToAdd1.getAndResetTickerCount(TickerType.STALL_MICROS)).thenReturn(4L);
+ when(statisticsToAdd2.getAndResetTickerCount(TickerType.STALL_MICROS)).thenReturn(5L);
writeStallDurationSensor.record(4 + 5, 0L);
- replay(writeStallDurationSensor);
- expect(statisticsToAdd1.getAndResetTickerCount(TickerType.BLOCK_CACHE_DATA_HIT)).andReturn(5L);
- expect(statisticsToAdd1.getAndResetTickerCount(TickerType.BLOCK_CACHE_DATA_MISS)).andReturn(4L);
- expect(statisticsToAdd2.getAndResetTickerCount(TickerType.BLOCK_CACHE_DATA_HIT)).andReturn(3L);
- expect(statisticsToAdd2.getAndResetTickerCount(TickerType.BLOCK_CACHE_DATA_MISS)).andReturn(2L);
+ when(statisticsToAdd1.getAndResetTickerCount(TickerType.BLOCK_CACHE_DATA_HIT)).thenReturn(5L);
+ when(statisticsToAdd1.getAndResetTickerCount(TickerType.BLOCK_CACHE_DATA_MISS)).thenReturn(4L);
+ when(statisticsToAdd2.getAndResetTickerCount(TickerType.BLOCK_CACHE_DATA_HIT)).thenReturn(3L);
+ when(statisticsToAdd2.getAndResetTickerCount(TickerType.BLOCK_CACHE_DATA_MISS)).thenReturn(2L);
blockCacheDataHitRatioSensor.record((double) 8 / (8 + 6), 0L);
- replay(blockCacheDataHitRatioSensor);
- expect(statisticsToAdd1.getAndResetTickerCount(TickerType.BLOCK_CACHE_INDEX_HIT)).andReturn(4L);
- expect(statisticsToAdd1.getAndResetTickerCount(TickerType.BLOCK_CACHE_INDEX_MISS)).andReturn(2L);
- expect(statisticsToAdd2.getAndResetTickerCount(TickerType.BLOCK_CACHE_INDEX_HIT)).andReturn(2L);
- expect(statisticsToAdd2.getAndResetTickerCount(TickerType.BLOCK_CACHE_INDEX_MISS)).andReturn(4L);
+ when(statisticsToAdd1.getAndResetTickerCount(TickerType.BLOCK_CACHE_INDEX_HIT)).thenReturn(4L);
+ when(statisticsToAdd1.getAndResetTickerCount(TickerType.BLOCK_CACHE_INDEX_MISS)).thenReturn(2L);
+ when(statisticsToAdd2.getAndResetTickerCount(TickerType.BLOCK_CACHE_INDEX_HIT)).thenReturn(2L);
+ when(statisticsToAdd2.getAndResetTickerCount(TickerType.BLOCK_CACHE_INDEX_MISS)).thenReturn(4L);
blockCacheIndexHitRatioSensor.record((double) 6 / (6 + 6), 0L);
- replay(blockCacheIndexHitRatioSensor);
- expect(statisticsToAdd1.getAndResetTickerCount(TickerType.BLOCK_CACHE_FILTER_HIT)).andReturn(2L);
- expect(statisticsToAdd1.getAndResetTickerCount(TickerType.BLOCK_CACHE_FILTER_MISS)).andReturn(4L);
- expect(statisticsToAdd2.getAndResetTickerCount(TickerType.BLOCK_CACHE_FILTER_HIT)).andReturn(3L);
- expect(statisticsToAdd2.getAndResetTickerCount(TickerType.BLOCK_CACHE_FILTER_MISS)).andReturn(5L);
+ when(statisticsToAdd1.getAndResetTickerCount(TickerType.BLOCK_CACHE_FILTER_HIT)).thenReturn(2L);
+ when(statisticsToAdd1.getAndResetTickerCount(TickerType.BLOCK_CACHE_FILTER_MISS)).thenReturn(4L);
+ when(statisticsToAdd2.getAndResetTickerCount(TickerType.BLOCK_CACHE_FILTER_HIT)).thenReturn(3L);
+ when(statisticsToAdd2.getAndResetTickerCount(TickerType.BLOCK_CACHE_FILTER_MISS)).thenReturn(5L);
blockCacheFilterHitRatioSensor.record((double) 5 / (5 + 9), 0L);
- replay(blockCacheFilterHitRatioSensor);
- expect(statisticsToAdd1.getAndResetTickerCount(TickerType.COMPACT_WRITE_BYTES)).andReturn(2L);
- expect(statisticsToAdd2.getAndResetTickerCount(TickerType.COMPACT_WRITE_BYTES)).andReturn(4L);
+ when(statisticsToAdd1.getAndResetTickerCount(TickerType.COMPACT_WRITE_BYTES)).thenReturn(2L);
+ when(statisticsToAdd2.getAndResetTickerCount(TickerType.COMPACT_WRITE_BYTES)).thenReturn(4L);
bytesWrittenDuringCompactionSensor.record(2 + 4, 0L);
- replay(bytesWrittenDuringCompactionSensor);
- expect(statisticsToAdd1.getAndResetTickerCount(TickerType.COMPACT_READ_BYTES)).andReturn(5L);
- expect(statisticsToAdd2.getAndResetTickerCount(TickerType.COMPACT_READ_BYTES)).andReturn(6L);
+ when(statisticsToAdd1.getAndResetTickerCount(TickerType.COMPACT_READ_BYTES)).thenReturn(5L);
+ when(statisticsToAdd2.getAndResetTickerCount(TickerType.COMPACT_READ_BYTES)).thenReturn(6L);
bytesReadDuringCompactionSensor.record(5 + 6, 0L);
- replay(bytesReadDuringCompactionSensor);
- expect(statisticsToAdd1.getAndResetTickerCount(TickerType.NO_FILE_OPENS)).andReturn(5L);
- expect(statisticsToAdd1.getAndResetTickerCount(TickerType.NO_FILE_CLOSES)).andReturn(3L);
- expect(statisticsToAdd2.getAndResetTickerCount(TickerType.NO_FILE_OPENS)).andReturn(7L);
- expect(statisticsToAdd2.getAndResetTickerCount(TickerType.NO_FILE_CLOSES)).andReturn(4L);
+ when(statisticsToAdd1.getAndResetTickerCount(TickerType.NO_FILE_OPENS)).thenReturn(5L);
+ when(statisticsToAdd1.getAndResetTickerCount(TickerType.NO_FILE_CLOSES)).thenReturn(3L);
+ when(statisticsToAdd2.getAndResetTickerCount(TickerType.NO_FILE_OPENS)).thenReturn(7L);
+ when(statisticsToAdd2.getAndResetTickerCount(TickerType.NO_FILE_CLOSES)).thenReturn(4L);
numberOfOpenFilesSensor.record((5 + 7) - (3 + 4), 0L);
- replay(numberOfOpenFilesSensor);
- expect(statisticsToAdd1.getAndResetTickerCount(TickerType.NO_FILE_ERRORS)).andReturn(34L);
- expect(statisticsToAdd2.getAndResetTickerCount(TickerType.NO_FILE_ERRORS)).andReturn(11L);
+ when(statisticsToAdd1.getAndResetTickerCount(TickerType.NO_FILE_ERRORS)).thenReturn(34L);
+ when(statisticsToAdd2.getAndResetTickerCount(TickerType.NO_FILE_ERRORS)).thenReturn(11L);
numberOfFileErrorsSensor.record(11 + 34, 0L);
- replay(numberOfFileErrorsSensor);
-
- replay(statisticsToAdd1);
- replay(statisticsToAdd2);
recorder.record(0L);
-
- verify(statisticsToAdd1);
- verify(statisticsToAdd2);
- verify(
- bytesWrittenToDatabaseSensor,
- bytesReadFromDatabaseSensor,
- memtableBytesFlushedSensor,
- memtableHitRatioSensor,
- writeStallDurationSensor,
- blockCacheDataHitRatioSensor,
- blockCacheIndexHitRatioSensor,
- blockCacheFilterHitRatioSensor,
- bytesWrittenDuringCompactionSensor,
- bytesReadDuringCompactionSensor,
- numberOfOpenFilesSensor,
- numberOfFileErrorsSensor
- );
}
@Test
public void shouldNotRecordStatisticsBasedMetricsIfStatisticsIsNull() {
recorder.addValueProviders(SEGMENT_STORE_NAME_1, dbToAdd1, cacheToAdd1, null);
- replay(
- bytesWrittenToDatabaseSensor,
- bytesReadFromDatabaseSensor,
- memtableBytesFlushedSensor,
- memtableHitRatioSensor,
- writeStallDurationSensor,
- blockCacheDataHitRatioSensor,
- blockCacheIndexHitRatioSensor,
- blockCacheFilterHitRatioSensor,
- bytesWrittenDuringCompactionSensor,
- bytesReadDuringCompactionSensor,
- numberOfOpenFilesSensor,
- numberOfFileErrorsSensor
- );
recorder.record(0L);
Review comment:
Please verify that no `sensor#record` is executed after `recorder.record(0L);`
##########
File path: streams/src/test/java/org/apache/kafka/streams/state/internals/metrics/RocksDBMetricsRecorderTest.java
##########
@@ -300,65 +287,47 @@ public void shouldAddItselfToRecordingTriggerWhenFirstValueProvidersAreAddedAfte
recorder.removeValueProviders(SEGMENT_STORE_NAME_1);
reset(recordingTrigger);
recordingTrigger.addMetricsRecorder(recorder);
- replay(recordingTrigger);
recorder.addValueProviders(SEGMENT_STORE_NAME_2, dbToAdd2, cacheToAdd2, statisticsToAdd2);
-
- verify(recordingTrigger);
}
@Test
public void shouldNotAddItselfToRecordingTriggerWhenNotEmpty2() {
recorder.addValueProviders(SEGMENT_STORE_NAME_1, dbToAdd1, cacheToAdd1, statisticsToAdd1);
reset(recordingTrigger);
- replay(recordingTrigger);
recorder.addValueProviders(SEGMENT_STORE_NAME_2, dbToAdd2, cacheToAdd2, statisticsToAdd2);
-
- verify(recordingTrigger);
}
@Test
public void shouldCloseStatisticsWhenValueProvidersAreRemoved() {
recorder.addValueProviders(SEGMENT_STORE_NAME_1, dbToAdd1, cacheToAdd1, statisticsToAdd1);
reset(statisticsToAdd1);
statisticsToAdd1.close();
- replay(statisticsToAdd1);
recorder.removeValueProviders(SEGMENT_STORE_NAME_1);
-
- verify(statisticsToAdd1);
}
@Test
public void shouldNotCloseStatisticsWhenValueProvidersWithoutStatisticsAreRemoved() {
recorder.addValueProviders(SEGMENT_STORE_NAME_1, dbToAdd1, cacheToAdd1, null);
reset(statisticsToAdd1);
- replay(statisticsToAdd1);
recorder.removeValueProviders(SEGMENT_STORE_NAME_1);
Review comment:
Please using Mockito.verify to make sure recorder.removeValueProviders(SEGMENT_STORE_NAME_2); is not executed when executing recorder.removeValueProviders(SEGMENT_STORE_NAME_2);
##########
File path: streams/src/test/java/org/apache/kafka/streams/state/internals/metrics/RocksDBMetricsRecorderTest.java
##########
@@ -300,65 +287,47 @@ public void shouldAddItselfToRecordingTriggerWhenFirstValueProvidersAreAddedAfte
recorder.removeValueProviders(SEGMENT_STORE_NAME_1);
reset(recordingTrigger);
recordingTrigger.addMetricsRecorder(recorder);
- replay(recordingTrigger);
recorder.addValueProviders(SEGMENT_STORE_NAME_2, dbToAdd2, cacheToAdd2, statisticsToAdd2);
-
- verify(recordingTrigger);
}
@Test
public void shouldNotAddItselfToRecordingTriggerWhenNotEmpty2() {
recorder.addValueProviders(SEGMENT_STORE_NAME_1, dbToAdd1, cacheToAdd1, statisticsToAdd1);
reset(recordingTrigger);
- replay(recordingTrigger);
recorder.addValueProviders(SEGMENT_STORE_NAME_2, dbToAdd2, cacheToAdd2, statisticsToAdd2);
-
- verify(recordingTrigger);
}
@Test
public void shouldCloseStatisticsWhenValueProvidersAreRemoved() {
recorder.addValueProviders(SEGMENT_STORE_NAME_1, dbToAdd1, cacheToAdd1, statisticsToAdd1);
reset(statisticsToAdd1);
statisticsToAdd1.close();
- replay(statisticsToAdd1);
recorder.removeValueProviders(SEGMENT_STORE_NAME_1);
-
- verify(statisticsToAdd1);
}
@Test
public void shouldNotCloseStatisticsWhenValueProvidersWithoutStatisticsAreRemoved() {
recorder.addValueProviders(SEGMENT_STORE_NAME_1, dbToAdd1, cacheToAdd1, null);
reset(statisticsToAdd1);
- replay(statisticsToAdd1);
recorder.removeValueProviders(SEGMENT_STORE_NAME_1);
-
- verify(statisticsToAdd1);
}
@Test
public void shouldRemoveItselfFromRecordingTriggerWhenLastValueProvidersAreRemoved() {
recorder.addValueProviders(SEGMENT_STORE_NAME_1, dbToAdd1, cacheToAdd1, statisticsToAdd1);
recorder.addValueProviders(SEGMENT_STORE_NAME_2, dbToAdd2, cacheToAdd2, statisticsToAdd2);
reset(recordingTrigger);
- replay(recordingTrigger);
recorder.removeValueProviders(SEGMENT_STORE_NAME_1);
- verify(recordingTrigger);
-
reset(recordingTrigger);
recordingTrigger.removeMetricsRecorder(recorder);
- replay(recordingTrigger);
recorder.removeValueProviders(SEGMENT_STORE_NAME_2);
Review comment:
Please using `Mockito.verify` to make sure `recorder.removeValueProviders(SEGMENT_STORE_NAME_2);` happens once when calling `recorder.removeValueProviders(SEGMENT_STORE_NAME_2);`
##########
File path: streams/src/test/java/org/apache/kafka/streams/state/internals/metrics/RocksDBMetricsRecorderTest.java
##########
@@ -378,261 +347,189 @@ public void shouldRecordStatisticsBasedMetrics() {
reset(statisticsToAdd1);
reset(statisticsToAdd2);
- expect(statisticsToAdd1.getAndResetTickerCount(TickerType.BYTES_WRITTEN)).andReturn(1L);
- expect(statisticsToAdd2.getAndResetTickerCount(TickerType.BYTES_WRITTEN)).andReturn(2L);
+ when(statisticsToAdd1.getAndResetTickerCount(TickerType.BYTES_WRITTEN)).thenReturn(1L);
+ when(statisticsToAdd2.getAndResetTickerCount(TickerType.BYTES_WRITTEN)).thenReturn(2L);
bytesWrittenToDatabaseSensor.record(1 + 2, 0L);
- replay(bytesWrittenToDatabaseSensor);
- expect(statisticsToAdd1.getAndResetTickerCount(TickerType.BYTES_READ)).andReturn(2L);
- expect(statisticsToAdd2.getAndResetTickerCount(TickerType.BYTES_READ)).andReturn(3L);
+ when(statisticsToAdd1.getAndResetTickerCount(TickerType.BYTES_READ)).thenReturn(2L);
+ when(statisticsToAdd2.getAndResetTickerCount(TickerType.BYTES_READ)).thenReturn(3L);
bytesReadFromDatabaseSensor.record(2 + 3, 0L);
- replay(bytesReadFromDatabaseSensor);
- expect(statisticsToAdd1.getAndResetTickerCount(TickerType.FLUSH_WRITE_BYTES)).andReturn(3L);
- expect(statisticsToAdd2.getAndResetTickerCount(TickerType.FLUSH_WRITE_BYTES)).andReturn(4L);
+ when(statisticsToAdd1.getAndResetTickerCount(TickerType.FLUSH_WRITE_BYTES)).thenReturn(3L);
+ when(statisticsToAdd2.getAndResetTickerCount(TickerType.FLUSH_WRITE_BYTES)).thenReturn(4L);
memtableBytesFlushedSensor.record(3 + 4, 0L);
- replay(memtableBytesFlushedSensor);
- expect(statisticsToAdd1.getAndResetTickerCount(TickerType.MEMTABLE_HIT)).andReturn(1L);
- expect(statisticsToAdd1.getAndResetTickerCount(TickerType.MEMTABLE_MISS)).andReturn(2L);
- expect(statisticsToAdd2.getAndResetTickerCount(TickerType.MEMTABLE_HIT)).andReturn(3L);
- expect(statisticsToAdd2.getAndResetTickerCount(TickerType.MEMTABLE_MISS)).andReturn(4L);
+ when(statisticsToAdd1.getAndResetTickerCount(TickerType.MEMTABLE_HIT)).thenReturn(1L);
+ when(statisticsToAdd1.getAndResetTickerCount(TickerType.MEMTABLE_MISS)).thenReturn(2L);
+ when(statisticsToAdd2.getAndResetTickerCount(TickerType.MEMTABLE_HIT)).thenReturn(3L);
+ when(statisticsToAdd2.getAndResetTickerCount(TickerType.MEMTABLE_MISS)).thenReturn(4L);
memtableHitRatioSensor.record((double) 4 / (4 + 6), 0L);
- replay(memtableHitRatioSensor);
- expect(statisticsToAdd1.getAndResetTickerCount(TickerType.STALL_MICROS)).andReturn(4L);
- expect(statisticsToAdd2.getAndResetTickerCount(TickerType.STALL_MICROS)).andReturn(5L);
+ when(statisticsToAdd1.getAndResetTickerCount(TickerType.STALL_MICROS)).thenReturn(4L);
+ when(statisticsToAdd2.getAndResetTickerCount(TickerType.STALL_MICROS)).thenReturn(5L);
writeStallDurationSensor.record(4 + 5, 0L);
- replay(writeStallDurationSensor);
- expect(statisticsToAdd1.getAndResetTickerCount(TickerType.BLOCK_CACHE_DATA_HIT)).andReturn(5L);
- expect(statisticsToAdd1.getAndResetTickerCount(TickerType.BLOCK_CACHE_DATA_MISS)).andReturn(4L);
- expect(statisticsToAdd2.getAndResetTickerCount(TickerType.BLOCK_CACHE_DATA_HIT)).andReturn(3L);
- expect(statisticsToAdd2.getAndResetTickerCount(TickerType.BLOCK_CACHE_DATA_MISS)).andReturn(2L);
+ when(statisticsToAdd1.getAndResetTickerCount(TickerType.BLOCK_CACHE_DATA_HIT)).thenReturn(5L);
+ when(statisticsToAdd1.getAndResetTickerCount(TickerType.BLOCK_CACHE_DATA_MISS)).thenReturn(4L);
+ when(statisticsToAdd2.getAndResetTickerCount(TickerType.BLOCK_CACHE_DATA_HIT)).thenReturn(3L);
+ when(statisticsToAdd2.getAndResetTickerCount(TickerType.BLOCK_CACHE_DATA_MISS)).thenReturn(2L);
blockCacheDataHitRatioSensor.record((double) 8 / (8 + 6), 0L);
- replay(blockCacheDataHitRatioSensor);
- expect(statisticsToAdd1.getAndResetTickerCount(TickerType.BLOCK_CACHE_INDEX_HIT)).andReturn(4L);
- expect(statisticsToAdd1.getAndResetTickerCount(TickerType.BLOCK_CACHE_INDEX_MISS)).andReturn(2L);
- expect(statisticsToAdd2.getAndResetTickerCount(TickerType.BLOCK_CACHE_INDEX_HIT)).andReturn(2L);
- expect(statisticsToAdd2.getAndResetTickerCount(TickerType.BLOCK_CACHE_INDEX_MISS)).andReturn(4L);
+ when(statisticsToAdd1.getAndResetTickerCount(TickerType.BLOCK_CACHE_INDEX_HIT)).thenReturn(4L);
+ when(statisticsToAdd1.getAndResetTickerCount(TickerType.BLOCK_CACHE_INDEX_MISS)).thenReturn(2L);
+ when(statisticsToAdd2.getAndResetTickerCount(TickerType.BLOCK_CACHE_INDEX_HIT)).thenReturn(2L);
+ when(statisticsToAdd2.getAndResetTickerCount(TickerType.BLOCK_CACHE_INDEX_MISS)).thenReturn(4L);
blockCacheIndexHitRatioSensor.record((double) 6 / (6 + 6), 0L);
- replay(blockCacheIndexHitRatioSensor);
- expect(statisticsToAdd1.getAndResetTickerCount(TickerType.BLOCK_CACHE_FILTER_HIT)).andReturn(2L);
- expect(statisticsToAdd1.getAndResetTickerCount(TickerType.BLOCK_CACHE_FILTER_MISS)).andReturn(4L);
- expect(statisticsToAdd2.getAndResetTickerCount(TickerType.BLOCK_CACHE_FILTER_HIT)).andReturn(3L);
- expect(statisticsToAdd2.getAndResetTickerCount(TickerType.BLOCK_CACHE_FILTER_MISS)).andReturn(5L);
+ when(statisticsToAdd1.getAndResetTickerCount(TickerType.BLOCK_CACHE_FILTER_HIT)).thenReturn(2L);
+ when(statisticsToAdd1.getAndResetTickerCount(TickerType.BLOCK_CACHE_FILTER_MISS)).thenReturn(4L);
+ when(statisticsToAdd2.getAndResetTickerCount(TickerType.BLOCK_CACHE_FILTER_HIT)).thenReturn(3L);
+ when(statisticsToAdd2.getAndResetTickerCount(TickerType.BLOCK_CACHE_FILTER_MISS)).thenReturn(5L);
blockCacheFilterHitRatioSensor.record((double) 5 / (5 + 9), 0L);
- replay(blockCacheFilterHitRatioSensor);
- expect(statisticsToAdd1.getAndResetTickerCount(TickerType.COMPACT_WRITE_BYTES)).andReturn(2L);
- expect(statisticsToAdd2.getAndResetTickerCount(TickerType.COMPACT_WRITE_BYTES)).andReturn(4L);
+ when(statisticsToAdd1.getAndResetTickerCount(TickerType.COMPACT_WRITE_BYTES)).thenReturn(2L);
+ when(statisticsToAdd2.getAndResetTickerCount(TickerType.COMPACT_WRITE_BYTES)).thenReturn(4L);
bytesWrittenDuringCompactionSensor.record(2 + 4, 0L);
- replay(bytesWrittenDuringCompactionSensor);
- expect(statisticsToAdd1.getAndResetTickerCount(TickerType.COMPACT_READ_BYTES)).andReturn(5L);
- expect(statisticsToAdd2.getAndResetTickerCount(TickerType.COMPACT_READ_BYTES)).andReturn(6L);
+ when(statisticsToAdd1.getAndResetTickerCount(TickerType.COMPACT_READ_BYTES)).thenReturn(5L);
+ when(statisticsToAdd2.getAndResetTickerCount(TickerType.COMPACT_READ_BYTES)).thenReturn(6L);
bytesReadDuringCompactionSensor.record(5 + 6, 0L);
- replay(bytesReadDuringCompactionSensor);
- expect(statisticsToAdd1.getAndResetTickerCount(TickerType.NO_FILE_OPENS)).andReturn(5L);
- expect(statisticsToAdd1.getAndResetTickerCount(TickerType.NO_FILE_CLOSES)).andReturn(3L);
- expect(statisticsToAdd2.getAndResetTickerCount(TickerType.NO_FILE_OPENS)).andReturn(7L);
- expect(statisticsToAdd2.getAndResetTickerCount(TickerType.NO_FILE_CLOSES)).andReturn(4L);
+ when(statisticsToAdd1.getAndResetTickerCount(TickerType.NO_FILE_OPENS)).thenReturn(5L);
+ when(statisticsToAdd1.getAndResetTickerCount(TickerType.NO_FILE_CLOSES)).thenReturn(3L);
+ when(statisticsToAdd2.getAndResetTickerCount(TickerType.NO_FILE_OPENS)).thenReturn(7L);
+ when(statisticsToAdd2.getAndResetTickerCount(TickerType.NO_FILE_CLOSES)).thenReturn(4L);
numberOfOpenFilesSensor.record((5 + 7) - (3 + 4), 0L);
- replay(numberOfOpenFilesSensor);
- expect(statisticsToAdd1.getAndResetTickerCount(TickerType.NO_FILE_ERRORS)).andReturn(34L);
- expect(statisticsToAdd2.getAndResetTickerCount(TickerType.NO_FILE_ERRORS)).andReturn(11L);
+ when(statisticsToAdd1.getAndResetTickerCount(TickerType.NO_FILE_ERRORS)).thenReturn(34L);
+ when(statisticsToAdd2.getAndResetTickerCount(TickerType.NO_FILE_ERRORS)).thenReturn(11L);
numberOfFileErrorsSensor.record(11 + 34, 0L);
- replay(numberOfFileErrorsSensor);
-
- replay(statisticsToAdd1);
- replay(statisticsToAdd2);
recorder.record(0L);
Review comment:
please make sure the value of sensor is equal to mocked value.
##########
File path: streams/src/test/java/org/apache/kafka/streams/state/internals/metrics/RocksDBMetricsRecorderTest.java
##########
@@ -378,261 +347,189 @@ public void shouldRecordStatisticsBasedMetrics() {
reset(statisticsToAdd1);
reset(statisticsToAdd2);
- expect(statisticsToAdd1.getAndResetTickerCount(TickerType.BYTES_WRITTEN)).andReturn(1L);
- expect(statisticsToAdd2.getAndResetTickerCount(TickerType.BYTES_WRITTEN)).andReturn(2L);
+ when(statisticsToAdd1.getAndResetTickerCount(TickerType.BYTES_WRITTEN)).thenReturn(1L);
+ when(statisticsToAdd2.getAndResetTickerCount(TickerType.BYTES_WRITTEN)).thenReturn(2L);
bytesWrittenToDatabaseSensor.record(1 + 2, 0L);
- replay(bytesWrittenToDatabaseSensor);
- expect(statisticsToAdd1.getAndResetTickerCount(TickerType.BYTES_READ)).andReturn(2L);
- expect(statisticsToAdd2.getAndResetTickerCount(TickerType.BYTES_READ)).andReturn(3L);
+ when(statisticsToAdd1.getAndResetTickerCount(TickerType.BYTES_READ)).thenReturn(2L);
+ when(statisticsToAdd2.getAndResetTickerCount(TickerType.BYTES_READ)).thenReturn(3L);
bytesReadFromDatabaseSensor.record(2 + 3, 0L);
- replay(bytesReadFromDatabaseSensor);
- expect(statisticsToAdd1.getAndResetTickerCount(TickerType.FLUSH_WRITE_BYTES)).andReturn(3L);
- expect(statisticsToAdd2.getAndResetTickerCount(TickerType.FLUSH_WRITE_BYTES)).andReturn(4L);
+ when(statisticsToAdd1.getAndResetTickerCount(TickerType.FLUSH_WRITE_BYTES)).thenReturn(3L);
+ when(statisticsToAdd2.getAndResetTickerCount(TickerType.FLUSH_WRITE_BYTES)).thenReturn(4L);
memtableBytesFlushedSensor.record(3 + 4, 0L);
- replay(memtableBytesFlushedSensor);
- expect(statisticsToAdd1.getAndResetTickerCount(TickerType.MEMTABLE_HIT)).andReturn(1L);
- expect(statisticsToAdd1.getAndResetTickerCount(TickerType.MEMTABLE_MISS)).andReturn(2L);
- expect(statisticsToAdd2.getAndResetTickerCount(TickerType.MEMTABLE_HIT)).andReturn(3L);
- expect(statisticsToAdd2.getAndResetTickerCount(TickerType.MEMTABLE_MISS)).andReturn(4L);
+ when(statisticsToAdd1.getAndResetTickerCount(TickerType.MEMTABLE_HIT)).thenReturn(1L);
+ when(statisticsToAdd1.getAndResetTickerCount(TickerType.MEMTABLE_MISS)).thenReturn(2L);
+ when(statisticsToAdd2.getAndResetTickerCount(TickerType.MEMTABLE_HIT)).thenReturn(3L);
+ when(statisticsToAdd2.getAndResetTickerCount(TickerType.MEMTABLE_MISS)).thenReturn(4L);
memtableHitRatioSensor.record((double) 4 / (4 + 6), 0L);
- replay(memtableHitRatioSensor);
- expect(statisticsToAdd1.getAndResetTickerCount(TickerType.STALL_MICROS)).andReturn(4L);
- expect(statisticsToAdd2.getAndResetTickerCount(TickerType.STALL_MICROS)).andReturn(5L);
+ when(statisticsToAdd1.getAndResetTickerCount(TickerType.STALL_MICROS)).thenReturn(4L);
+ when(statisticsToAdd2.getAndResetTickerCount(TickerType.STALL_MICROS)).thenReturn(5L);
writeStallDurationSensor.record(4 + 5, 0L);
- replay(writeStallDurationSensor);
- expect(statisticsToAdd1.getAndResetTickerCount(TickerType.BLOCK_CACHE_DATA_HIT)).andReturn(5L);
- expect(statisticsToAdd1.getAndResetTickerCount(TickerType.BLOCK_CACHE_DATA_MISS)).andReturn(4L);
- expect(statisticsToAdd2.getAndResetTickerCount(TickerType.BLOCK_CACHE_DATA_HIT)).andReturn(3L);
- expect(statisticsToAdd2.getAndResetTickerCount(TickerType.BLOCK_CACHE_DATA_MISS)).andReturn(2L);
+ when(statisticsToAdd1.getAndResetTickerCount(TickerType.BLOCK_CACHE_DATA_HIT)).thenReturn(5L);
+ when(statisticsToAdd1.getAndResetTickerCount(TickerType.BLOCK_CACHE_DATA_MISS)).thenReturn(4L);
+ when(statisticsToAdd2.getAndResetTickerCount(TickerType.BLOCK_CACHE_DATA_HIT)).thenReturn(3L);
+ when(statisticsToAdd2.getAndResetTickerCount(TickerType.BLOCK_CACHE_DATA_MISS)).thenReturn(2L);
blockCacheDataHitRatioSensor.record((double) 8 / (8 + 6), 0L);
- replay(blockCacheDataHitRatioSensor);
- expect(statisticsToAdd1.getAndResetTickerCount(TickerType.BLOCK_CACHE_INDEX_HIT)).andReturn(4L);
- expect(statisticsToAdd1.getAndResetTickerCount(TickerType.BLOCK_CACHE_INDEX_MISS)).andReturn(2L);
- expect(statisticsToAdd2.getAndResetTickerCount(TickerType.BLOCK_CACHE_INDEX_HIT)).andReturn(2L);
- expect(statisticsToAdd2.getAndResetTickerCount(TickerType.BLOCK_CACHE_INDEX_MISS)).andReturn(4L);
+ when(statisticsToAdd1.getAndResetTickerCount(TickerType.BLOCK_CACHE_INDEX_HIT)).thenReturn(4L);
+ when(statisticsToAdd1.getAndResetTickerCount(TickerType.BLOCK_CACHE_INDEX_MISS)).thenReturn(2L);
+ when(statisticsToAdd2.getAndResetTickerCount(TickerType.BLOCK_CACHE_INDEX_HIT)).thenReturn(2L);
+ when(statisticsToAdd2.getAndResetTickerCount(TickerType.BLOCK_CACHE_INDEX_MISS)).thenReturn(4L);
blockCacheIndexHitRatioSensor.record((double) 6 / (6 + 6), 0L);
- replay(blockCacheIndexHitRatioSensor);
- expect(statisticsToAdd1.getAndResetTickerCount(TickerType.BLOCK_CACHE_FILTER_HIT)).andReturn(2L);
- expect(statisticsToAdd1.getAndResetTickerCount(TickerType.BLOCK_CACHE_FILTER_MISS)).andReturn(4L);
- expect(statisticsToAdd2.getAndResetTickerCount(TickerType.BLOCK_CACHE_FILTER_HIT)).andReturn(3L);
- expect(statisticsToAdd2.getAndResetTickerCount(TickerType.BLOCK_CACHE_FILTER_MISS)).andReturn(5L);
+ when(statisticsToAdd1.getAndResetTickerCount(TickerType.BLOCK_CACHE_FILTER_HIT)).thenReturn(2L);
+ when(statisticsToAdd1.getAndResetTickerCount(TickerType.BLOCK_CACHE_FILTER_MISS)).thenReturn(4L);
+ when(statisticsToAdd2.getAndResetTickerCount(TickerType.BLOCK_CACHE_FILTER_HIT)).thenReturn(3L);
+ when(statisticsToAdd2.getAndResetTickerCount(TickerType.BLOCK_CACHE_FILTER_MISS)).thenReturn(5L);
blockCacheFilterHitRatioSensor.record((double) 5 / (5 + 9), 0L);
- replay(blockCacheFilterHitRatioSensor);
- expect(statisticsToAdd1.getAndResetTickerCount(TickerType.COMPACT_WRITE_BYTES)).andReturn(2L);
- expect(statisticsToAdd2.getAndResetTickerCount(TickerType.COMPACT_WRITE_BYTES)).andReturn(4L);
+ when(statisticsToAdd1.getAndResetTickerCount(TickerType.COMPACT_WRITE_BYTES)).thenReturn(2L);
+ when(statisticsToAdd2.getAndResetTickerCount(TickerType.COMPACT_WRITE_BYTES)).thenReturn(4L);
bytesWrittenDuringCompactionSensor.record(2 + 4, 0L);
- replay(bytesWrittenDuringCompactionSensor);
- expect(statisticsToAdd1.getAndResetTickerCount(TickerType.COMPACT_READ_BYTES)).andReturn(5L);
- expect(statisticsToAdd2.getAndResetTickerCount(TickerType.COMPACT_READ_BYTES)).andReturn(6L);
+ when(statisticsToAdd1.getAndResetTickerCount(TickerType.COMPACT_READ_BYTES)).thenReturn(5L);
+ when(statisticsToAdd2.getAndResetTickerCount(TickerType.COMPACT_READ_BYTES)).thenReturn(6L);
bytesReadDuringCompactionSensor.record(5 + 6, 0L);
- replay(bytesReadDuringCompactionSensor);
- expect(statisticsToAdd1.getAndResetTickerCount(TickerType.NO_FILE_OPENS)).andReturn(5L);
- expect(statisticsToAdd1.getAndResetTickerCount(TickerType.NO_FILE_CLOSES)).andReturn(3L);
- expect(statisticsToAdd2.getAndResetTickerCount(TickerType.NO_FILE_OPENS)).andReturn(7L);
- expect(statisticsToAdd2.getAndResetTickerCount(TickerType.NO_FILE_CLOSES)).andReturn(4L);
+ when(statisticsToAdd1.getAndResetTickerCount(TickerType.NO_FILE_OPENS)).thenReturn(5L);
+ when(statisticsToAdd1.getAndResetTickerCount(TickerType.NO_FILE_CLOSES)).thenReturn(3L);
+ when(statisticsToAdd2.getAndResetTickerCount(TickerType.NO_FILE_OPENS)).thenReturn(7L);
+ when(statisticsToAdd2.getAndResetTickerCount(TickerType.NO_FILE_CLOSES)).thenReturn(4L);
numberOfOpenFilesSensor.record((5 + 7) - (3 + 4), 0L);
- replay(numberOfOpenFilesSensor);
- expect(statisticsToAdd1.getAndResetTickerCount(TickerType.NO_FILE_ERRORS)).andReturn(34L);
- expect(statisticsToAdd2.getAndResetTickerCount(TickerType.NO_FILE_ERRORS)).andReturn(11L);
+ when(statisticsToAdd1.getAndResetTickerCount(TickerType.NO_FILE_ERRORS)).thenReturn(34L);
+ when(statisticsToAdd2.getAndResetTickerCount(TickerType.NO_FILE_ERRORS)).thenReturn(11L);
numberOfFileErrorsSensor.record(11 + 34, 0L);
- replay(numberOfFileErrorsSensor);
-
- replay(statisticsToAdd1);
- replay(statisticsToAdd2);
recorder.record(0L);
-
- verify(statisticsToAdd1);
- verify(statisticsToAdd2);
- verify(
- bytesWrittenToDatabaseSensor,
- bytesReadFromDatabaseSensor,
- memtableBytesFlushedSensor,
- memtableHitRatioSensor,
- writeStallDurationSensor,
- blockCacheDataHitRatioSensor,
- blockCacheIndexHitRatioSensor,
- blockCacheFilterHitRatioSensor,
- bytesWrittenDuringCompactionSensor,
- bytesReadDuringCompactionSensor,
- numberOfOpenFilesSensor,
- numberOfFileErrorsSensor
- );
}
@Test
public void shouldNotRecordStatisticsBasedMetricsIfStatisticsIsNull() {
recorder.addValueProviders(SEGMENT_STORE_NAME_1, dbToAdd1, cacheToAdd1, null);
- replay(
- bytesWrittenToDatabaseSensor,
- bytesReadFromDatabaseSensor,
- memtableBytesFlushedSensor,
- memtableHitRatioSensor,
- writeStallDurationSensor,
- blockCacheDataHitRatioSensor,
- blockCacheIndexHitRatioSensor,
- blockCacheFilterHitRatioSensor,
- bytesWrittenDuringCompactionSensor,
- bytesReadDuringCompactionSensor,
- numberOfOpenFilesSensor,
- numberOfFileErrorsSensor
- );
recorder.record(0L);
-
- verify(
- bytesWrittenToDatabaseSensor,
- bytesReadFromDatabaseSensor,
- memtableBytesFlushedSensor,
- memtableHitRatioSensor,
- writeStallDurationSensor,
- blockCacheDataHitRatioSensor,
- blockCacheIndexHitRatioSensor,
- blockCacheFilterHitRatioSensor,
- bytesWrittenDuringCompactionSensor,
- bytesReadDuringCompactionSensor,
- numberOfOpenFilesSensor,
- numberOfFileErrorsSensor
- );
}
@Test
public void shouldCorrectlyHandleHitRatioRecordingsWithZeroHitsAndMisses() {
- resetToNice(statisticsToAdd1);
+ reset(statisticsToAdd1);
recorder.addValueProviders(SEGMENT_STORE_NAME_1, dbToAdd1, cacheToAdd1, statisticsToAdd1);
- expect(statisticsToAdd1.getTickerCount(anyObject())).andStubReturn(0L);
- replay(statisticsToAdd1);
+ when(statisticsToAdd1.getTickerCount(anyObject())).thenReturn(0L);
memtableHitRatioSensor.record(0, 0L);
blockCacheDataHitRatioSensor.record(0, 0L);
blockCacheIndexHitRatioSensor.record(0, 0L);
blockCacheFilterHitRatioSensor.record(0, 0L);
- replay(memtableHitRatioSensor);
- replay(blockCacheDataHitRatioSensor);
- replay(blockCacheIndexHitRatioSensor);
- replay(blockCacheFilterHitRatioSensor);
recorder.record(0L);
-
- verify(memtableHitRatioSensor);
- verify(blockCacheDataHitRatioSensor);
- verify(blockCacheIndexHitRatioSensor);
- verify(blockCacheFilterHitRatioSensor);
}
private void setUpMetricsMock() {
- mockStatic(RocksDBMetrics.class);
+ rocksDBMetricsMockedStatic.close();
+ rocksDBMetricsMockedStatic = Mockito.mockStatic(RocksDBMetrics.class);
final RocksDBMetricContext metricsContext =
new RocksDBMetricContext(TASK_ID1.toString(), METRICS_SCOPE, STORE_NAME);
- expect(RocksDBMetrics.bytesWrittenToDatabaseSensor(eq(streamsMetrics), eq(metricsContext)))
- .andReturn(bytesWrittenToDatabaseSensor);
- expect(RocksDBMetrics.bytesReadFromDatabaseSensor(eq(streamsMetrics), eq(metricsContext)))
- .andReturn(bytesReadFromDatabaseSensor);
- expect(RocksDBMetrics.memtableBytesFlushedSensor(eq(streamsMetrics), eq(metricsContext)))
- .andReturn(memtableBytesFlushedSensor);
- expect(RocksDBMetrics.memtableHitRatioSensor(eq(streamsMetrics), eq(metricsContext)))
- .andReturn(memtableHitRatioSensor);
- expect(RocksDBMetrics.writeStallDurationSensor(eq(streamsMetrics), eq(metricsContext)))
- .andReturn(writeStallDurationSensor);
- expect(RocksDBMetrics.blockCacheDataHitRatioSensor(eq(streamsMetrics), eq(metricsContext)))
- .andReturn(blockCacheDataHitRatioSensor);
- expect(RocksDBMetrics.blockCacheIndexHitRatioSensor(eq(streamsMetrics), eq(metricsContext)))
- .andReturn(blockCacheIndexHitRatioSensor);
- expect(RocksDBMetrics.blockCacheFilterHitRatioSensor(eq(streamsMetrics), eq(metricsContext)))
- .andReturn(blockCacheFilterHitRatioSensor);
- expect(RocksDBMetrics.bytesWrittenDuringCompactionSensor(eq(streamsMetrics), eq(metricsContext)))
- .andReturn(bytesWrittenDuringCompactionSensor);
- expect(RocksDBMetrics.bytesReadDuringCompactionSensor(eq(streamsMetrics), eq(metricsContext)))
- .andReturn(bytesReadDuringCompactionSensor);
- expect(RocksDBMetrics.numberOfOpenFilesSensor(eq(streamsMetrics), eq(metricsContext)))
- .andReturn(numberOfOpenFilesSensor);
- expect(RocksDBMetrics.numberOfFileErrorsSensor(eq(streamsMetrics), eq(metricsContext)))
- .andReturn(numberOfFileErrorsSensor);
- RocksDBMetrics.addNumImmutableMemTableMetric(eq(streamsMetrics), eq(metricsContext), anyObject());
- RocksDBMetrics.addCurSizeActiveMemTable(eq(streamsMetrics), eq(metricsContext), anyObject());
- RocksDBMetrics.addCurSizeAllMemTables(eq(streamsMetrics), eq(metricsContext), anyObject());
- RocksDBMetrics.addSizeAllMemTables(eq(streamsMetrics), eq(metricsContext), anyObject());
- RocksDBMetrics.addNumEntriesActiveMemTableMetric(eq(streamsMetrics), eq(metricsContext), anyObject());
- RocksDBMetrics.addNumEntriesImmMemTablesMetric(eq(streamsMetrics), eq(metricsContext), anyObject());
- RocksDBMetrics.addNumDeletesActiveMemTableMetric(eq(streamsMetrics), eq(metricsContext), anyObject());
- RocksDBMetrics.addNumDeletesImmMemTablesMetric(eq(streamsMetrics), eq(metricsContext), anyObject());
- RocksDBMetrics.addMemTableFlushPending(eq(streamsMetrics), eq(metricsContext), anyObject());
- RocksDBMetrics.addNumRunningFlushesMetric(eq(streamsMetrics), eq(metricsContext), anyObject());
- RocksDBMetrics.addCompactionPendingMetric(eq(streamsMetrics), eq(metricsContext), anyObject());
- RocksDBMetrics.addNumRunningCompactionsMetric(eq(streamsMetrics), eq(metricsContext), anyObject());
- RocksDBMetrics.addEstimatePendingCompactionBytesMetric(eq(streamsMetrics), eq(metricsContext), anyObject());
- RocksDBMetrics.addTotalSstFilesSizeMetric(eq(streamsMetrics), eq(metricsContext), anyObject());
- RocksDBMetrics.addLiveSstFilesSizeMetric(eq(streamsMetrics), eq(metricsContext), anyObject());
- RocksDBMetrics.addNumLiveVersionMetric(eq(streamsMetrics), eq(metricsContext), anyObject());
- RocksDBMetrics.addBlockCacheCapacityMetric(eq(streamsMetrics), eq(metricsContext), anyObject());
- RocksDBMetrics.addBlockCacheUsageMetric(eq(streamsMetrics), eq(metricsContext), anyObject());
- RocksDBMetrics.addBlockCachePinnedUsageMetric(eq(streamsMetrics), eq(metricsContext), anyObject());
- RocksDBMetrics.addEstimateNumKeysMetric(eq(streamsMetrics), eq(metricsContext), anyObject());
- RocksDBMetrics.addEstimateTableReadersMemMetric(eq(streamsMetrics), eq(metricsContext), anyObject());
- RocksDBMetrics.addBackgroundErrorsMetric(eq(streamsMetrics), eq(metricsContext), anyObject());
- replay(RocksDBMetrics.class);
+ rocksDBMetricsMockedStatic.when(() -> RocksDBMetrics.bytesWrittenToDatabaseSensor(streamsMetrics, metricsContext))
+ .thenReturn(bytesWrittenToDatabaseSensor);
+ rocksDBMetricsMockedStatic.when(() -> RocksDBMetrics.bytesReadFromDatabaseSensor(streamsMetrics, metricsContext))
+ .thenReturn(bytesReadFromDatabaseSensor);
+ rocksDBMetricsMockedStatic.when(() -> RocksDBMetrics.memtableBytesFlushedSensor(streamsMetrics, metricsContext))
+ .thenReturn(memtableBytesFlushedSensor);
+ rocksDBMetricsMockedStatic.when(() -> RocksDBMetrics.memtableHitRatioSensor(streamsMetrics, metricsContext))
+ .thenReturn(memtableHitRatioSensor);
+ rocksDBMetricsMockedStatic.when(() -> RocksDBMetrics.writeStallDurationSensor(streamsMetrics, metricsContext))
+ .thenReturn(writeStallDurationSensor);
+ rocksDBMetricsMockedStatic.when(() -> RocksDBMetrics.blockCacheDataHitRatioSensor(streamsMetrics, metricsContext))
+ .thenReturn(blockCacheDataHitRatioSensor);
+ rocksDBMetricsMockedStatic.when(() -> RocksDBMetrics.blockCacheIndexHitRatioSensor(streamsMetrics, metricsContext))
+ .thenReturn(blockCacheIndexHitRatioSensor);
+ rocksDBMetricsMockedStatic.when(() -> RocksDBMetrics.blockCacheFilterHitRatioSensor(streamsMetrics, metricsContext))
+ .thenReturn(blockCacheFilterHitRatioSensor);
+ rocksDBMetricsMockedStatic.when(() -> RocksDBMetrics.bytesWrittenDuringCompactionSensor(streamsMetrics, metricsContext))
+ .thenReturn(bytesWrittenDuringCompactionSensor);
+ rocksDBMetricsMockedStatic.when(() -> RocksDBMetrics.bytesReadDuringCompactionSensor(streamsMetrics, metricsContext))
+ .thenReturn(bytesReadDuringCompactionSensor);
+ rocksDBMetricsMockedStatic.when(() -> RocksDBMetrics.numberOfOpenFilesSensor(streamsMetrics, metricsContext))
+ .thenReturn(numberOfOpenFilesSensor);
+ rocksDBMetricsMockedStatic.when(() -> RocksDBMetrics.numberOfFileErrorsSensor(streamsMetrics, metricsContext))
+ .thenReturn(numberOfFileErrorsSensor);
+ RocksDBMetrics.addNumImmutableMemTableMetric(eq(streamsMetrics), eq(metricsContext), any());
+ RocksDBMetrics.addCurSizeActiveMemTable(eq(streamsMetrics), eq(metricsContext), any());
+ RocksDBMetrics.addCurSizeAllMemTables(eq(streamsMetrics), eq(metricsContext), any());
+ RocksDBMetrics.addSizeAllMemTables(eq(streamsMetrics), eq(metricsContext), any());
+ RocksDBMetrics.addNumEntriesActiveMemTableMetric(eq(streamsMetrics), eq(metricsContext), any());
+ RocksDBMetrics.addNumEntriesImmMemTablesMetric(eq(streamsMetrics), eq(metricsContext), any());
+ RocksDBMetrics.addNumDeletesActiveMemTableMetric(eq(streamsMetrics), eq(metricsContext), any());
+ RocksDBMetrics.addNumDeletesImmMemTablesMetric(eq(streamsMetrics), eq(metricsContext), any());
+ RocksDBMetrics.addMemTableFlushPending(eq(streamsMetrics), eq(metricsContext), any());
+ RocksDBMetrics.addNumRunningFlushesMetric(eq(streamsMetrics), eq(metricsContext), any());
+ RocksDBMetrics.addCompactionPendingMetric(eq(streamsMetrics), eq(metricsContext), any());
+ RocksDBMetrics.addNumRunningCompactionsMetric(eq(streamsMetrics), eq(metricsContext), any());
+ RocksDBMetrics.addEstimatePendingCompactionBytesMetric(eq(streamsMetrics), eq(metricsContext), any());
+ RocksDBMetrics.addTotalSstFilesSizeMetric(eq(streamsMetrics), eq(metricsContext), any());
+ RocksDBMetrics.addLiveSstFilesSizeMetric(eq(streamsMetrics), eq(metricsContext), any());
+ RocksDBMetrics.addNumLiveVersionMetric(eq(streamsMetrics), eq(metricsContext), any());
+ RocksDBMetrics.addBlockCacheCapacityMetric(eq(streamsMetrics), eq(metricsContext), any());
+ RocksDBMetrics.addBlockCacheUsageMetric(eq(streamsMetrics), eq(metricsContext), any());
+ RocksDBMetrics.addBlockCachePinnedUsageMetric(eq(streamsMetrics), eq(metricsContext), any());
+ RocksDBMetrics.addEstimateNumKeysMetric(eq(streamsMetrics), eq(metricsContext), any());
+ RocksDBMetrics.addEstimateTableReadersMemMetric(eq(streamsMetrics), eq(metricsContext), any());
+ RocksDBMetrics.addBackgroundErrorsMetric(eq(streamsMetrics), eq(metricsContext), any());
}
private void setUpMetricsStubMock() {
Review comment:
What is the difference between `setUpMetricsStubMock` and `setUpMetricsMock`?
--
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: jira-unsubscribe@kafka.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [kafka] wycccccc commented on pull request #10976: KAFKA-13036 Replace EasyMock and PowerMock with Mockito for RocksDBMetricsRecorderTest
Posted by GitBox <gi...@apache.org>.
wycccccc commented on pull request #10976:
URL: https://github.com/apache/kafka/pull/10976#issuecomment-916775979
@chia7712 I think I have solved most of the problems, except merger `setUpMetricsStubMock`.
In order to avoid existing static mock registration problem caused by repeatedly calling `setUpMetricsStubMock` method.I put `mockStatic` in `@Before`.So I think It's not bad at the moment about `tearDown()`.
--
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: jira-unsubscribe@kafka.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [kafka] showuon commented on pull request #10976: KAFKA-13036 Replace EasyMock and PowerMock with Mockito for RocksDBMetricsRecorderTest
Posted by GitBox <gi...@apache.org>.
showuon commented on pull request #10976:
URL: https://github.com/apache/kafka/pull/10976#issuecomment-1078578578
@wycccccc , it's been a while since your last update, could you please rebase to the latest trunk before I start the review? Thank you!
--
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: jira-unsubscribe@kafka.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [kafka] showuon commented on a change in pull request #10976: KAFKA-13036 Replace EasyMock and PowerMock with Mockito for RocksDBMetricsRecorderTest
Posted by GitBox <gi...@apache.org>.
showuon commented on a change in pull request #10976:
URL: https://github.com/apache/kafka/pull/10976#discussion_r664368496
##########
File path: streams/src/test/java/org/apache/kafka/streams/state/internals/metrics/RocksDBMetricsRecorderTest.java
##########
@@ -70,99 +63,91 @@
private final Statistics statisticsToAdd2 = mock(Statistics.class);
private final Statistics statisticsToAdd3 = mock(Statistics.class);
- private final Sensor bytesWrittenToDatabaseSensor = createMock(Sensor.class);
- private final Sensor bytesReadFromDatabaseSensor = createMock(Sensor.class);
- private final Sensor memtableBytesFlushedSensor = createMock(Sensor.class);
- private final Sensor memtableHitRatioSensor = createMock(Sensor.class);
- private final Sensor writeStallDurationSensor = createMock(Sensor.class);
- private final Sensor blockCacheDataHitRatioSensor = createMock(Sensor.class);
- private final Sensor blockCacheIndexHitRatioSensor = createMock(Sensor.class);
- private final Sensor blockCacheFilterHitRatioSensor = createMock(Sensor.class);
- private final Sensor bytesReadDuringCompactionSensor = createMock(Sensor.class);
- private final Sensor bytesWrittenDuringCompactionSensor = createMock(Sensor.class);
- private final Sensor numberOfOpenFilesSensor = createMock(Sensor.class);
- private final Sensor numberOfFileErrorsSensor = createMock(Sensor.class);
-
- private final StreamsMetricsImpl streamsMetrics = niceMock(StreamsMetricsImpl.class);
+ private final Sensor bytesWrittenToDatabaseSensor = mock(Sensor.class);
+ private final Sensor bytesReadFromDatabaseSensor = mock(Sensor.class);
+ private final Sensor memtableBytesFlushedSensor = mock(Sensor.class);
+ private final Sensor memtableHitRatioSensor = mock(Sensor.class);
+ private final Sensor writeStallDurationSensor = mock(Sensor.class);
+ private final Sensor blockCacheDataHitRatioSensor = mock(Sensor.class);
+ private final Sensor blockCacheIndexHitRatioSensor = mock(Sensor.class);
+ private final Sensor blockCacheFilterHitRatioSensor = mock(Sensor.class);
+ private final Sensor bytesReadDuringCompactionSensor = mock(Sensor.class);
+ private final Sensor bytesWrittenDuringCompactionSensor = mock(Sensor.class);
+ private final Sensor numberOfOpenFilesSensor = mock(Sensor.class);
+ private final Sensor numberOfFileErrorsSensor = mock(Sensor.class);
+
+ private final StreamsMetricsImpl streamsMetrics = mock(StreamsMetricsImpl.class);
private final RocksDBMetricsRecordingTrigger recordingTrigger = mock(RocksDBMetricsRecordingTrigger.class);
private final RocksDBMetricsRecorder recorder = new RocksDBMetricsRecorder(METRICS_SCOPE, STORE_NAME);
+ private MockedStatic<RocksDBMetrics> rocksDBMetricsMockedStatic;
@Before
public void setUp() {
setUpMetricsStubMock();
- expect(streamsMetrics.rocksDBMetricsRecordingTrigger()).andStubReturn(recordingTrigger);
- replay(streamsMetrics);
+ when(streamsMetrics.rocksDBMetricsRecordingTrigger()).thenReturn(recordingTrigger);
recorder.init(streamsMetrics, TASK_ID1);
}
+ @After
+ public void tearDown() {
+ rocksDBMetricsMockedStatic.close();
+ }
+
@Test
public void shouldInitMetricsRecorder() {
setUpMetricsMock();
recorder.init(streamsMetrics, TASK_ID1);
- verify(RocksDBMetrics.class);
+// verify(RocksDBMetrics.class);
Review comment:
Should be removed?
--
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: jira-unsubscribe@kafka.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [kafka] wycccccc commented on pull request #10976: KAFKA-13036 Replace EasyMock and PowerMock with Mockito for RocksDBMetricsRecorderTest
Posted by GitBox <gi...@apache.org>.
wycccccc commented on pull request #10976:
URL: https://github.com/apache/kafka/pull/10976#issuecomment-920874355
@chia7712 I modified some code and it looks better now.
--
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: jira-unsubscribe@kafka.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org