You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kafka.apache.org by mj...@apache.org on 2020/02/18 20:22:34 UTC
[kafka] branch 2.3 updated: KAFKA-8025: Fix flaky RocksDB test
(#8126)
This is an automated email from the ASF dual-hosted git repository.
mjsax pushed a commit to branch 2.3
in repository https://gitbox.apache.org/repos/asf/kafka.git
The following commit(s) were added to refs/heads/2.3 by this push:
new 2ed93d6 KAFKA-8025: Fix flaky RocksDB test (#8126)
2ed93d6 is described below
commit 2ed93d6b40fc62183b6b1a9b4d5b026fc92981fa
Author: Matthias J. Sax <ma...@confluent.io>
AuthorDate: Tue Feb 18 11:29:14 2020 -0800
KAFKA-8025: Fix flaky RocksDB test (#8126)
Reviewers: Bill Bejeck <bi...@confluent.io>
---
...nsToDbOptionsColumnFamilyOptionsAdapterTest.java | 21 +++++++++------------
1 file changed, 9 insertions(+), 12 deletions(-)
diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBGenericOptionsToDbOptionsColumnFamilyOptionsAdapterTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBGenericOptionsToDbOptionsColumnFamilyOptionsAdapterTest.java
index 62513a5..01c71e6 100644
--- a/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBGenericOptionsToDbOptionsColumnFamilyOptionsAdapterTest.java
+++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBGenericOptionsToDbOptionsColumnFamilyOptionsAdapterTest.java
@@ -17,7 +17,6 @@
package org.apache.kafka.streams.state.internals;
import org.easymock.EasyMockRunner;
-import org.easymock.Mock;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.rocksdb.AbstractCompactionFilter;
@@ -53,6 +52,7 @@ import java.util.ArrayList;
import java.util.LinkedList;
import java.util.List;
+import static org.easymock.EasyMock.mock;
import static org.easymock.EasyMock.replay;
import static org.easymock.EasyMock.reset;
import static org.easymock.EasyMock.verify;
@@ -82,11 +82,6 @@ public class RocksDBGenericOptionsToDbOptionsColumnFamilyOptionsAdapterTest {
}
};
- @Mock
- private DBOptions dbOptions;
- @Mock
- private ColumnFamilyOptions columnFamilyOptions;
-
@Test
public void shouldOverwriteAllOptionsMethods() throws Exception {
for (final Method method : Options.class.getMethods()) {
@@ -110,14 +105,15 @@ public class RocksDBGenericOptionsToDbOptionsColumnFamilyOptionsAdapterTest {
}
private void verifyDBOptionsMethodCall(final Method method) throws Exception {
+ final DBOptions mockedDbOptions = mock(DBOptions.class);
final RocksDBGenericOptionsToDbOptionsColumnFamilyOptionsAdapter optionsFacadeDbOptions
- = new RocksDBGenericOptionsToDbOptionsColumnFamilyOptionsAdapter(dbOptions, new ColumnFamilyOptions());
+ = new RocksDBGenericOptionsToDbOptionsColumnFamilyOptionsAdapter(mockedDbOptions, new ColumnFamilyOptions());
final Object[] parameters = getDBOptionsParameters(method.getParameterTypes());
try {
- reset(dbOptions);
- replay(dbOptions);
+ reset(mockedDbOptions);
+ replay(mockedDbOptions);
method.invoke(optionsFacadeDbOptions, parameters);
verify();
fail("Should have called DBOptions." + method.getName() + "()");
@@ -196,14 +192,15 @@ public class RocksDBGenericOptionsToDbOptionsColumnFamilyOptionsAdapterTest {
}
private void verifyColumnFamilyOptionsMethodCall(final Method method) throws Exception {
+ final ColumnFamilyOptions mockedColumnFamilyOptions = mock(ColumnFamilyOptions.class);
final RocksDBGenericOptionsToDbOptionsColumnFamilyOptionsAdapter optionsFacadeColumnFamilyOptions
- = new RocksDBGenericOptionsToDbOptionsColumnFamilyOptionsAdapter(new DBOptions(), columnFamilyOptions);
+ = new RocksDBGenericOptionsToDbOptionsColumnFamilyOptionsAdapter(new DBOptions(), mockedColumnFamilyOptions);
final Object[] parameters = getColumnFamilyOptionsParameters(method.getParameterTypes());
try {
- reset(columnFamilyOptions);
- replay(columnFamilyOptions);
+ reset(mockedColumnFamilyOptions);
+ replay(mockedColumnFamilyOptions);
method.invoke(optionsFacadeColumnFamilyOptions, parameters);
verify();
fail("Should have called ColumnFamilyOptions." + method.getName() + "()");