Skip to content

Commit 2f0221d

Browse files
adamretteradamretter
committed
[refactor] Migrate from JUnit 4 to JUnit 5
1 parent edb82aa commit 2f0221d

110 files changed

Lines changed: 2220 additions & 2062 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Makefile‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2416,6 +2416,9 @@ jtest_run: rocksdbjavageneratepom
24162416
jtest: rocksdbjava
24172417
cd java;$(MAKE) sample test
24182418

2419+
jit_run: rocksdbjavageneratepom
2420+
cd java;$(MAKE) run_it
2421+
24192422
jpmd: rocksdbjavageneratepom
24202423
cd java;$(MAKE) java java_test pmd
24212424

‎java/Makefile‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,9 @@ test:
105105
run_test:
106106
$(MAVEN_CMD) test
107107

108+
run_it:
109+
$(MAVEN_CMD) integration-test
110+
108111
db_bench: java
109112
cd benchmark; $(MAVEN_CMD) package
110113
$(JAVA_CMD) $(JAVA_ARGS) -Djava.library.path=${JAVA_NATIVE_DIR} -cp target/rocksdbjni-$(ROCKSDB_JAVA_VERSION).jar:benchmark/target/rocksdbjni-benchmark-0.0.0-SNAPSHOT.jar org.rocksdb.benchmark.DbBenchmark

‎java/pom.xml.template‎

Lines changed: 33 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -173,10 +173,8 @@
173173
<configuration>
174174
<argLine>${argLine} -ea -Xcheck:jni -Djava.library.path=${project.basedir}/target-native</argLine>
175175
<useManifestOnlyJar>false</useManifestOnlyJar>
176-
<useSystemClassLoader>false</useSystemClassLoader>
177-
<additionalClasspathElements>
178-
<additionalClasspathElement>${project.build.directory}/*</additionalClasspathElement>
179-
</additionalClasspathElements>
176+
<redirectTestOutputToFile>true</redirectTestOutputToFile>
177+
<!-- forkNode implementation="org.apache.maven.plugin.surefire.extensions.SurefireForkNodeFactory"/ -->
180178
</configuration>
181179
</plugin>
182180
<plugin>
@@ -228,18 +226,27 @@
228226
</build>
229227

230228
<dependencies>
229+
<!-- JUnit 5 (Jupiter) -->
231230
<dependency>
232-
<groupId>junit</groupId>
233-
<artifactId>junit</artifactId>
234-
<version>4.13.2</version>
231+
<groupId>org.junit.jupiter</groupId>
232+
<artifactId>junit-jupiter-api</artifactId>
233+
<version>5.11.4</version>
235234
<scope>test</scope>
236235
</dependency>
237236
<dependency>
238-
<groupId>org.hamcrest</groupId>
239-
<artifactId>hamcrest</artifactId>
240-
<version>2.2</version>
237+
<groupId>org.junit.jupiter</groupId>
238+
<artifactId>junit-jupiter-engine</artifactId>
239+
<version>5.11.4</version>
241240
<scope>test</scope>
242241
</dependency>
242+
<dependency>
243+
<groupId>org.junit.jupiter</groupId>
244+
<artifactId>junit-jupiter-params</artifactId>
245+
<version>5.11.4</version>
246+
<scope>test</scope>
247+
</dependency>
248+
249+
<!-- Test utilities -->
243250
<dependency>
244251
<groupId>cglib</groupId>
245252
<artifactId>cglib</artifactId>
@@ -254,8 +261,8 @@
254261
</dependency>
255262
<dependency>
256263
<groupId>org.mockito</groupId>
257-
<artifactId>mockito-all</artifactId>
258-
<version>1.10.19</version>
264+
<artifactId>mockito-core</artifactId>
265+
<version>4.11.0</version>
259266
<scope>test</scope>
260267
</dependency>
261268
</dependencies>
@@ -412,6 +419,20 @@
412419
</execution>
413420
</executions>
414421
</plugin>
422+
<plugin>
423+
<groupId>org.apache.maven.plugins</groupId>
424+
<artifactId>maven-failsafe-plugin</artifactId>
425+
<version>3.5.5</version>
426+
<executions>
427+
<execution>
428+
<id>main-jar-it</id>
429+
<goals>
430+
<goal>integration-test</goal>
431+
<goal>verify</goal>
432+
</goals>
433+
</execution>
434+
</executions>
435+
</plugin>
415436
</plugins>
416437
</build>
417438
</profile>

‎java/src/test/java/org/rocksdb/AbstractTransactionTest.java‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55

66
package org.rocksdb;
77

8+
import java.io.File;
9+
810
import static java.nio.charset.StandardCharsets.UTF_8;
911
import static org.assertj.core.api.Assertions.assertThat;
1012

@@ -14,9 +16,8 @@
1416
import java.util.List;
1517
import java.util.Random;
1618
import java.util.function.Function;
17-
import org.junit.Rule;
18-
import org.junit.Test;
19-
import org.junit.rules.TemporaryFolder;
19+
import org.junit.jupiter.api.io.TempDir;
20+
import org.junit.jupiter.api.Test;
2021

2122
/**
2223
* Base class of {@link TransactionTest} and {@link OptimisticTransactionTest}
@@ -27,8 +28,8 @@ public abstract class AbstractTransactionTest {
2728
protected static final Random rand = PlatformRandomHelper.
2829
getPlatformSpecificRandomFactory();
2930

30-
@Rule
31-
public TemporaryFolder dbFolder = new TemporaryFolder();
31+
@TempDir
32+
public File dbFolder;
3233

3334
public abstract DBContainer startDb()
3435
throws RocksDBException;

‎java/src/test/java/org/rocksdb/BackupEngineOptionsTest.java‎

Lines changed: 86 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -6,24 +6,21 @@
66
package org.rocksdb;
77

88
import static org.assertj.core.api.Assertions.assertThat;
9+
import static org.junit.jupiter.api.Assertions.assertThrows;
910

1011
import java.util.Random;
1112

12-
import org.junit.ClassRule;
13-
import org.junit.Rule;
14-
import org.junit.Test;
15-
import org.junit.rules.ExpectedException;
13+
import org.junit.jupiter.api.extension.RegisterExtension;
14+
import org.junit.jupiter.api.io.TempDir;
15+
import org.junit.jupiter.api.Test;
1616

1717
public class BackupEngineOptionsTest {
1818
private static final String ARBITRARY_PATH = System.getProperty("java.io.tmpdir");
1919

20-
@ClassRule
20+
@RegisterExtension
2121
public static final RocksNativeLibraryResource ROCKS_NATIVE_LIBRARY_RESOURCE =
2222
new RocksNativeLibraryResource();
2323

24-
@Rule
25-
public ExpectedException exception = ExpectedException.none();
26-
2724
public static final Random rand = PlatformRandomHelper.
2825
getPlatformSpecificRandomFactory();
2926

@@ -176,122 +173,151 @@ public void callbackTriggerIntervalSize() {
176173

177174
@Test
178175
public void failBackupDirIsNull() {
179-
exception.expect(IllegalArgumentException.class);
180-
try (final BackupEngineOptions ignored = new BackupEngineOptions(null)) {
181-
//no-op
182-
}
176+
assertThrows(IllegalArgumentException.class, () -> {
177+
try (final BackupEngineOptions ignored = new BackupEngineOptions(null)) {
178+
//no-op
179+
}
180+
});
183181
}
184182

185183
@Test
186184
public void failBackupDirIfDisposed() {
187-
try (final BackupEngineOptions options = setupUninitializedBackupEngineOptions(exception)) {
188-
options.backupDir();
189-
}
185+
assertThrows(AssertionError.class, () -> {
186+
try (final BackupEngineOptions options = setupUninitializedBackupEngineOptions()) {
187+
options.backupDir();
188+
}
189+
});
190190
}
191191

192192
@Test
193193
public void failSetShareTableFilesIfDisposed() {
194-
try (final BackupEngineOptions options = setupUninitializedBackupEngineOptions(exception)) {
195-
options.setShareTableFiles(true);
196-
}
194+
assertThrows(AssertionError.class, () -> {
195+
try (final BackupEngineOptions options = setupUninitializedBackupEngineOptions()) {
196+
options.setShareTableFiles(true);
197+
}
198+
});
197199
}
198200

199201
@Test
200202
public void failShareTableFilesIfDisposed() {
201-
try (final BackupEngineOptions options = setupUninitializedBackupEngineOptions(exception)) {
202-
options.shareTableFiles();
203-
}
203+
assertThrows(AssertionError.class, () -> {
204+
try (final BackupEngineOptions options = setupUninitializedBackupEngineOptions()) {
205+
options.shareTableFiles();
206+
}
207+
});
204208
}
205209

206210
@Test
207211
public void failSetSyncIfDisposed() {
208-
try (final BackupEngineOptions options = setupUninitializedBackupEngineOptions(exception)) {
209-
options.setSync(true);
210-
}
212+
assertThrows(AssertionError.class, () -> {
213+
try (final BackupEngineOptions options = setupUninitializedBackupEngineOptions()) {
214+
options.setSync(true);
215+
}
216+
});
211217
}
212218

213219
@Test
214220
public void failSyncIfDisposed() {
215-
try (final BackupEngineOptions options = setupUninitializedBackupEngineOptions(exception)) {
216-
options.sync();
217-
}
221+
assertThrows(AssertionError.class, () -> {
222+
try (final BackupEngineOptions options = setupUninitializedBackupEngineOptions()) {
223+
options.sync();
224+
}
225+
});
218226
}
219227

220228
@Test
221229
public void failSetDestroyOldDataIfDisposed() {
222-
try (final BackupEngineOptions options = setupUninitializedBackupEngineOptions(exception)) {
223-
options.setDestroyOldData(true);
224-
}
230+
assertThrows(AssertionError.class, () -> {
231+
try (final BackupEngineOptions options = setupUninitializedBackupEngineOptions()) {
232+
options.setDestroyOldData(true);
233+
}
234+
});
225235
}
226236

227237
@Test
228238
public void failDestroyOldDataIfDisposed() {
229-
try (final BackupEngineOptions options = setupUninitializedBackupEngineOptions(exception)) {
230-
options.destroyOldData();
231-
}
239+
assertThrows(AssertionError.class, () -> {
240+
try (final BackupEngineOptions options = setupUninitializedBackupEngineOptions()) {
241+
options.destroyOldData();
242+
}
243+
});
232244
}
233245

234246
@Test
235247
public void failSetBackupLogFilesIfDisposed() {
236-
try (final BackupEngineOptions options = setupUninitializedBackupEngineOptions(exception)) {
237-
options.setBackupLogFiles(true);
238-
}
248+
assertThrows(AssertionError.class, () -> {
249+
try (final BackupEngineOptions options = setupUninitializedBackupEngineOptions()) {
250+
options.setBackupLogFiles(true);
251+
}
252+
});
239253
}
240254

241255
@Test
242256
public void failBackupLogFilesIfDisposed() {
243-
try (final BackupEngineOptions options = setupUninitializedBackupEngineOptions(exception)) {
244-
options.backupLogFiles();
245-
}
257+
assertThrows(AssertionError.class, () -> {
258+
try (final BackupEngineOptions options = setupUninitializedBackupEngineOptions()) {
259+
options.backupLogFiles();
260+
}
261+
});
246262
}
247263

248264
@Test
249265
public void failSetBackupRateLimitIfDisposed() {
250-
try (final BackupEngineOptions options = setupUninitializedBackupEngineOptions(exception)) {
251-
options.setBackupRateLimit(1);
252-
}
266+
assertThrows(AssertionError.class, () -> {
267+
try (final BackupEngineOptions options = setupUninitializedBackupEngineOptions()) {
268+
options.setBackupRateLimit(1);
269+
}
270+
});
253271
}
254272

255273
@Test
256274
public void failBackupRateLimitIfDisposed() {
257-
try (final BackupEngineOptions options = setupUninitializedBackupEngineOptions(exception)) {
258-
options.backupRateLimit();
259-
}
275+
assertThrows(AssertionError.class, () -> {
276+
try (final BackupEngineOptions options = setupUninitializedBackupEngineOptions()) {
277+
options.backupRateLimit();
278+
}
279+
});
260280
}
261281

262282
@Test
263283
public void failSetRestoreRateLimitIfDisposed() {
264-
try (final BackupEngineOptions options = setupUninitializedBackupEngineOptions(exception)) {
265-
options.setRestoreRateLimit(1);
266-
}
284+
assertThrows(AssertionError.class, () -> {
285+
try (final BackupEngineOptions options = setupUninitializedBackupEngineOptions()) {
286+
options.setRestoreRateLimit(1);
287+
}
288+
});
267289
}
268290

269291
@Test
270292
public void failRestoreRateLimitIfDisposed() {
271-
try (final BackupEngineOptions options = setupUninitializedBackupEngineOptions(exception)) {
272-
options.restoreRateLimit();
273-
}
293+
assertThrows(AssertionError.class, () -> {
294+
try (final BackupEngineOptions options = setupUninitializedBackupEngineOptions()) {
295+
options.restoreRateLimit();
296+
}
297+
});
274298
}
275299

276300
@Test
277301
public void failSetShareFilesWithChecksumIfDisposed() {
278-
try (final BackupEngineOptions options = setupUninitializedBackupEngineOptions(exception)) {
279-
options.setShareFilesWithChecksum(true);
280-
}
302+
assertThrows(AssertionError.class, () -> {
303+
try (final BackupEngineOptions options = setupUninitializedBackupEngineOptions()) {
304+
options.setShareFilesWithChecksum(true);
305+
}
306+
});
281307
}
282308

283309
@Test
284310
public void failShareFilesWithChecksumIfDisposed() {
285-
try (final BackupEngineOptions options = setupUninitializedBackupEngineOptions(exception)) {
286-
options.shareFilesWithChecksum();
287-
}
311+
assertThrows(AssertionError.class, () -> {
312+
try (final BackupEngineOptions options = setupUninitializedBackupEngineOptions()) {
313+
options.shareFilesWithChecksum();
314+
}
315+
});
288316
}
289317

290-
private BackupEngineOptions setupUninitializedBackupEngineOptions(
291-
final ExpectedException exception) {
318+
private BackupEngineOptions setupUninitializedBackupEngineOptions() {
292319
final BackupEngineOptions backupEngineOptions = new BackupEngineOptions(ARBITRARY_PATH);
293320
backupEngineOptions.close();
294-
exception.expect(AssertionError.class);
295321
return backupEngineOptions;
296322
}
297323
}

0 commit comments

Comments
 (0)