You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kafka.apache.org by ca...@apache.org on 2023/10/20 08:47:54 UTC
[kafka] branch 3.5 updated: KAFKA-7438: Replace Easymock & Powermock with Mockito in RocksDBMetricsRecorderGaugesTest (#14190)
This is an automated email from the ASF dual-hosted git repository.
cadonna pushed a commit to branch 3.5
in repository https://gitbox.apache.org/repos/asf/kafka.git
The following commit(s) were added to refs/heads/3.5 by this push:
new 0c90b6557ea KAFKA-7438: Replace Easymock & Powermock with Mockito in RocksDBMetricsRecorderGaugesTest (#14190)
0c90b6557ea is described below
commit 0c90b6557eaae0b8036263ab907e2a6213ea82ea
Author: bachmanity1 <81...@users.noreply.github.com>
AuthorDate: Tue Aug 15 18:48:13 2023 +0900
KAFKA-7438: Replace Easymock & Powermock with Mockito in RocksDBMetricsRecorderGaugesTest (#14190)
Reviewers: Christo Lolov <ch...@gmail.com>, Divij Vaidya <di...@amazon.com>
---
.../metrics/RocksDBMetricsRecorderGaugesTest.java | 19 ++++++-------------
1 file changed, 6 insertions(+), 13 deletions(-)
diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/metrics/RocksDBMetricsRecorderGaugesTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/metrics/RocksDBMetricsRecorderGaugesTest.java
index 2695b8654f4..9c21d1dba9e 100644
--- a/streams/src/test/java/org/apache/kafka/streams/state/internals/metrics/RocksDBMetricsRecorderGaugesTest.java
+++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/metrics/RocksDBMetricsRecorderGaugesTest.java
@@ -59,12 +59,11 @@ import static org.apache.kafka.streams.state.internals.metrics.RocksDBMetrics.SI
import static org.apache.kafka.streams.state.internals.metrics.RocksDBMetrics.NUMBER_OF_BACKGROUND_ERRORS;
import static org.apache.kafka.streams.state.internals.metrics.RocksDBMetrics.TOTAL_SST_FILES_SIZE;
import static org.apache.kafka.streams.state.internals.metrics.RocksDBMetrics.USAGE_OF_BLOCK_CACHE;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.mock;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.notNullValue;
import static org.hamcrest.MatcherAssert.assertThat;
-import static org.powermock.api.easymock.PowerMock.replay;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
public class RocksDBMetricsRecorderGaugesTest {
private static final String METRICS_SCOPE = "metrics-scope";
@@ -212,11 +211,8 @@ public class RocksDBMetricsRecorderGaugesTest {
final long recordedValue1 = 5L;
final long recordedValue2 = 3L;
- expect(dbToAdd1.getAggregatedLongProperty(ROCKSDB_PROPERTIES_PREFIX + propertyName))
- .andStubReturn(recordedValue1);
- expect(dbToAdd2.getAggregatedLongProperty(ROCKSDB_PROPERTIES_PREFIX + propertyName))
- .andStubReturn(recordedValue2);
- replay(dbToAdd1, dbToAdd2);
+ when(dbToAdd1.getAggregatedLongProperty(ROCKSDB_PROPERTIES_PREFIX + propertyName)).thenReturn(recordedValue1);
+ when(dbToAdd2.getAggregatedLongProperty(ROCKSDB_PROPERTIES_PREFIX + propertyName)).thenReturn(recordedValue2);
verifyMetrics(streamsMetrics, propertyName, recordedValue1 + recordedValue2);
}
@@ -235,11 +231,8 @@ public class RocksDBMetricsRecorderGaugesTest {
recorder.addValueProviders(SEGMENT_STORE_NAME_2, dbToAdd2, cacheToAdd1, statisticsToAdd2);
final long recordedValue = 5L;
- expect(dbToAdd1.getAggregatedLongProperty(ROCKSDB_PROPERTIES_PREFIX + propertyName))
- .andStubReturn(recordedValue);
- expect(dbToAdd2.getAggregatedLongProperty(ROCKSDB_PROPERTIES_PREFIX + propertyName))
- .andStubReturn(recordedValue);
- replay(dbToAdd1, dbToAdd2);
+ when(dbToAdd1.getAggregatedLongProperty(ROCKSDB_PROPERTIES_PREFIX + propertyName)).thenReturn(recordedValue);
+ when(dbToAdd2.getAggregatedLongProperty(ROCKSDB_PROPERTIES_PREFIX + propertyName)).thenReturn(recordedValue);
verifyMetrics(streamsMetrics, propertyName, recordedValue);
}