fixup! fixup! fixup! [refactor] Migrate from JUnit 4 to JUnit 5

Author: adamretter

java/src/test/java/org/rocksdb/MergeVariantsTest.java

@@ -11,23 +11,21 @@
 
 import java.nio.ByteBuffer;
 import java.nio.charset.StandardCharsets;
-import java.util.Arrays;
-import java.util.List;
 import org.junit.jupiter.api.extension.RegisterExtension;
-import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
-import org.junit.jupiter.params.provider.Arguments;
 import java.util.stream.Stream;
 import org.junit.jupiter.api.io.TempDir;
 import java.io.File;
+
 public class MergeVariantsTest {
+
   @FunctionalInterface
   interface FunctionMerge<PDatabase, PLeft, PRight> {
-    public void apply(PDatabase db, PLeft two, PRight three) throws RocksDBException;
+    void apply(PDatabase db, PLeft two, PRight three) throws RocksDBException;
   }
 
-    static Stream<MergeVariantsTest.FunctionMerge<RocksDB, byte[], byte[]>> data() {
+  static Stream<MergeVariantsTest.FunctionMerge<RocksDB, byte[], byte[]>> parameters() {
     return Stream.of(RocksDB::merge,
         (db, left, right)
             -> db.merge(new WriteOptions(), left, right),
@@ -64,7 +62,7 @@ static Stream<MergeVariantsTest.FunctionMerge<RocksDB, byte[], byte[]>> data() {
         });
   }
 
-    @RegisterExtension
+  @RegisterExtension
   public static final RocksNativeLibraryResource ROCKS_NATIVE_LIBRARY_RESOURCE =
       new RocksNativeLibraryResource();
 
@@ -73,7 +71,7 @@ static Stream<MergeVariantsTest.FunctionMerge<RocksDB, byte[], byte[]>> data() {
 
   @ParameterizedTest
   @MethodSource("parameters")
-  public void uint64AddOperatorOption(final MergeVariantsTest.FunctionMerge<RocksDB, byte[], byte[]> mergeFunction) throws InterruptedException, RocksDBException {
+  public void uint64AddOperatorOption(final MergeVariantsTest.FunctionMerge<RocksDB, byte[], byte[]> mergeFunction) throws RocksDBException {
     try (final UInt64AddOperator uint64AddOperator = new UInt64AddOperator();
          final Options opt =
              new Options().setCreateIfMissing(true).setMergeOperator(uint64AddOperator);

java/src/test/java/org/rocksdb/PutMultiplePartsTest.java

@@ -10,31 +10,26 @@
 
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
-import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
-import org.junit.jupiter.params.provider.Arguments;
-import java.util.stream.Stream;
+
+import java.util.stream.IntStream;
 import org.junit.jupiter.api.io.TempDir;
 import java.io.File;
+
 public class PutMultiplePartsTest {
-    static Stream<Integer> data() {
-    return Stream.of(2, 3, 250, 20000);
+
+  static IntStream parameters() {
+    return IntStream.of(2, 3, 250, 20000);
   }
 
   @TempDir
   File dbFolder;
 
-  private final int numParts;
-
-  public PutMultiplePartsTest(final Integer numParts) {
-    this.numParts = numParts;
-  }
-
-  @Test
-  public void putUntracked() throws RocksDBException {
+  @ParameterizedTest
+  @MethodSource("parameters")
+  public void putUntracked(final int numParts) throws RocksDBException {
     try (final Options options = new Options().setCreateIfMissing(true);
          final TransactionDBOptions txnDbOptions = new TransactionDBOptions();
          final TransactionDB txnDB =
@@ -48,11 +43,12 @@ public void putUntracked() throws RocksDBException {
       txnDB.syncWal();
     }
 
-    validateResults();
+    validateResults(numParts);
   }
 
-  @Test
-  public void put() throws RocksDBException {
+  @ParameterizedTest
+  @MethodSource("parameters")
+  public void put(final int numParts) throws RocksDBException {
     try (final Options options = new Options().setCreateIfMissing(true);
          final TransactionDBOptions txnDbOptions = new TransactionDBOptions();
          final TransactionDB txnDB =
@@ -66,11 +62,12 @@ public void put() throws RocksDBException {
       txnDB.syncWal();
     }
 
-    validateResults();
+    validateResults(numParts);
   }
 
-  @Test
-  public void putUntrackedCF() throws RocksDBException {
+  @ParameterizedTest
+  @MethodSource("parameters")
+  public void putUntrackedCF(final int numParts) throws RocksDBException {
     try (final Options options = new Options().setCreateIfMissing(true);
          final TransactionDBOptions txnDbOptions = new TransactionDBOptions();
          final TransactionDB txnDB =
@@ -86,10 +83,12 @@ public void putUntrackedCF() throws RocksDBException {
       txnDB.syncWal();
     }
 
-    validateResultsCF();
+    validateResultsCF(numParts);
   }
-  @Test
-  public void putCF() throws RocksDBException {
+
+  @ParameterizedTest
+  @MethodSource("parameters")
+  public void putCF(final int numParts) throws RocksDBException {
     try (final Options options = new Options().setCreateIfMissing(true);
          final TransactionDBOptions txnDbOptions = new TransactionDBOptions();
          final TransactionDB txnDB =
@@ -105,10 +104,10 @@ public void putCF() throws RocksDBException {
       txnDB.syncWal();
     }
 
-    validateResultsCF();
+    validateResultsCF(numParts);
   }
 
-  private void validateResults() throws RocksDBException {
+  private void validateResults(final int numParts) throws RocksDBException {
     try (final RocksDB db = RocksDB.open(new Options(), dbFolder.getAbsolutePath())) {
       final List<byte[]> keys = generateItemsAsList("key", ":", numParts);
       final byte[][] values = generateItems("value", "", numParts);
@@ -126,7 +125,7 @@ private void validateResults() throws RocksDBException {
     }
   }
 
-  private void validateResultsCF() throws RocksDBException {
+  private void validateResultsCF(final int numParts) throws RocksDBException {
     final List<ColumnFamilyDescriptor> columnFamilyDescriptors = new ArrayList<>();
     columnFamilyDescriptors.add(new ColumnFamilyDescriptor("cfTest".getBytes()));
     columnFamilyDescriptors.add(new ColumnFamilyDescriptor("default".getBytes()));