{@code
- * @RegisterExtension
- * static final TestDatabaseExtension dbExtension = new TestDatabaseExtension();
- * }
+ * + * @RegisterExtension + * static final TestDatabaseExtension dbExtension = new TestDatabaseExtension(); + ** *
* The user can then call {@link #getDatabase() dbExtension.getDatabase()} to get an actual FDB handle. diff --git a/fdb-extensions/src/testFixtures/java/com/apple/foundationdb/test/TestExecutors.java b/fdb-test-utils/src/main/java/com/apple/foundationdb/test/TestExecutors.java similarity index 96% rename from fdb-extensions/src/testFixtures/java/com/apple/foundationdb/test/TestExecutors.java rename to fdb-test-utils/src/main/java/com/apple/foundationdb/test/TestExecutors.java index 91e455e8d3..866ff646a1 100644 --- a/fdb-extensions/src/testFixtures/java/com/apple/foundationdb/test/TestExecutors.java +++ b/fdb-test-utils/src/main/java/com/apple/foundationdb/test/TestExecutors.java @@ -29,7 +29,13 @@ /** * Executors to use during testing. */ -public class TestExecutors { +public final class TestExecutors { + @Nonnull + private static final Executor DEFAULT_THREAD_POOL = newThreadPool("fdb-unit-test"); + + private TestExecutors() { + } + /** * Thread factory for creating threads used by test thread pools. */ @@ -51,9 +57,6 @@ public Thread newThread(final Runnable r) { } } - @Nonnull - private static final Executor DEFAULT_THREAD_POOL = newThreadPool("fdb-unit-test"); - public static Executor newThreadPool(@Nonnull String namePrefix) { return Executors.newCachedThreadPool(new TestThreadFactory(namePrefix)); } diff --git a/fdb-extensions/src/testFixtures/java/com/apple/foundationdb/test/TestMdcExtension.java b/fdb-test-utils/src/main/java/com/apple/foundationdb/test/TestMdcExtension.java similarity index 100% rename from fdb-extensions/src/testFixtures/java/com/apple/foundationdb/test/TestMdcExtension.java rename to fdb-test-utils/src/main/java/com/apple/foundationdb/test/TestMdcExtension.java diff --git a/fdb-extensions/src/testFixtures/java/com/apple/foundationdb/test/TestSubspaceExtension.java b/fdb-test-utils/src/main/java/com/apple/foundationdb/test/TestSubspaceExtension.java similarity index 88% rename from fdb-extensions/src/testFixtures/java/com/apple/foundationdb/test/TestSubspaceExtension.java rename to fdb-test-utils/src/main/java/com/apple/foundationdb/test/TestSubspaceExtension.java index 5165ee748d..f938d0ee89 100644 --- a/fdb-extensions/src/testFixtures/java/com/apple/foundationdb/test/TestSubspaceExtension.java +++ b/fdb-test-utils/src/main/java/com/apple/foundationdb/test/TestSubspaceExtension.java @@ -23,7 +23,6 @@ import com.apple.foundationdb.Range; import com.apple.foundationdb.directory.DirectoryLayer; import com.apple.foundationdb.subspace.Subspace; -import com.apple.foundationdb.tuple.ByteArrayUtil2; import com.apple.foundationdb.tuple.Tuple; import org.junit.jupiter.api.extension.AfterEachCallback; import org.junit.jupiter.api.extension.ExtensionContext; @@ -40,12 +39,12 @@ * will be cleared out during the {@link AfterEachCallback} for this extension. To use, create a member variable * of the test and register the extension: * - *
{@code
- * @RegisterExtension
- * static final TestDatabaseExtension dbExtension = new TestDatabaseExtension();
- * @RegisterExtension
- * TestSubspaceExtension subspaceExtension = new TestSubspaceExtension(dbExtension);
- * }
+ * + * @RegisterExtension + * static final TestDatabaseExtension dbExtension = new TestDatabaseExtension(); + * @RegisterExtension + * TestSubspaceExtension subspaceExtension = new TestSubspaceExtension(dbExtension); + ** *
* Within the test, call {@link #getSubspace()} to get the test's allocated exception. As long as all usage @@ -72,7 +71,7 @@ public Subspace getSubspace() { .thenApply(directorySubspace -> directorySubspace.subspace(Tuple.from(UUID.randomUUID()))) ).join(); if (LOGGER.isDebugEnabled()) { - LOGGER.debug("created test subspace subspace=\"{}\"", ByteArrayUtil2.loggable(subspace.getKey())); + LOGGER.debug("created test subspace subspace=\"{}\"", subspace); } } return subspace; @@ -82,7 +81,7 @@ public Subspace getSubspace() { public void afterEach(final ExtensionContext extensionContext) { if (subspace != null) { if (LOGGER.isDebugEnabled()) { - LOGGER.debug("clearing test subspace subspace=\"{}\"", ByteArrayUtil2.loggable(subspace.getKey())); + LOGGER.debug("clearing test subspace subspace=\"{}\"", subspace); } dbExtension.getDatabase().run(tx -> { tx.clear(Range.startsWith(subspace.pack())); diff --git a/fdb-extensions/src/testFixtures/java/com/apple/test/BooleanArgumentsProvider.java b/fdb-test-utils/src/main/java/com/apple/test/BooleanArgumentsProvider.java similarity index 100% rename from fdb-extensions/src/testFixtures/java/com/apple/test/BooleanArgumentsProvider.java rename to fdb-test-utils/src/main/java/com/apple/test/BooleanArgumentsProvider.java diff --git a/fdb-extensions/src/testFixtures/java/com/apple/test/BooleanSource.java b/fdb-test-utils/src/main/java/com/apple/test/BooleanSource.java similarity index 100% rename from fdb-extensions/src/testFixtures/java/com/apple/test/BooleanSource.java rename to fdb-test-utils/src/main/java/com/apple/test/BooleanSource.java diff --git a/fdb-extensions/src/testFixtures/java/com/apple/test/ParameterizedTestUtils.java b/fdb-test-utils/src/main/java/com/apple/test/ParameterizedTestUtils.java similarity index 97% rename from fdb-extensions/src/testFixtures/java/com/apple/test/ParameterizedTestUtils.java rename to fdb-test-utils/src/main/java/com/apple/test/ParameterizedTestUtils.java index 391974fcc0..a27e31137e 100644 --- a/fdb-extensions/src/testFixtures/java/com/apple/test/ParameterizedTestUtils.java +++ b/fdb-test-utils/src/main/java/com/apple/test/ParameterizedTestUtils.java @@ -30,7 +30,10 @@ /** * Helper utility class for interacting with {@link org.junit.jupiter.params.ParameterizedTest}s. */ -public class ParameterizedTestUtils { +public final class ParameterizedTestUtils { + + private ParameterizedTestUtils() { + } /** * Provides a stream of boolean, named arguments. diff --git a/fdb-extensions/src/testFixtures/java/com/apple/test/RandomSeedProvider.java b/fdb-test-utils/src/main/java/com/apple/test/RandomSeedProvider.java similarity index 100% rename from fdb-extensions/src/testFixtures/java/com/apple/test/RandomSeedProvider.java rename to fdb-test-utils/src/main/java/com/apple/test/RandomSeedProvider.java diff --git a/fdb-extensions/src/testFixtures/java/com/apple/test/RandomSeedSource.java b/fdb-test-utils/src/main/java/com/apple/test/RandomSeedSource.java similarity index 100% rename from fdb-extensions/src/testFixtures/java/com/apple/test/RandomSeedSource.java rename to fdb-test-utils/src/main/java/com/apple/test/RandomSeedSource.java diff --git a/fdb-extensions/src/testFixtures/java/com/apple/test/RandomizedTestUtils.java b/fdb-test-utils/src/main/java/com/apple/test/RandomizedTestUtils.java similarity index 100% rename from fdb-extensions/src/testFixtures/java/com/apple/test/RandomizedTestUtils.java rename to fdb-test-utils/src/main/java/com/apple/test/RandomizedTestUtils.java diff --git a/fdb-extensions/src/testFixtures/java/com/apple/test/SuperSlow.java b/fdb-test-utils/src/main/java/com/apple/test/SuperSlow.java similarity index 100% rename from fdb-extensions/src/testFixtures/java/com/apple/test/SuperSlow.java rename to fdb-test-utils/src/main/java/com/apple/test/SuperSlow.java diff --git a/fdb-extensions/src/testFixtures/java/com/apple/test/Tags.java b/fdb-test-utils/src/main/java/com/apple/test/Tags.java similarity index 94% rename from fdb-extensions/src/testFixtures/java/com/apple/test/Tags.java rename to fdb-test-utils/src/main/java/com/apple/test/Tags.java index e602e83745..22246779d8 100644 --- a/fdb-extensions/src/testFixtures/java/com/apple/test/Tags.java +++ b/fdb-test-utils/src/main/java/com/apple/test/Tags.java @@ -23,7 +23,8 @@ /** * Annotation {@link org.junit.jupiter.api.Tag}s for Record Layer tests. */ -public class Tags { +@SuppressWarnings("PMD.FieldNamingConventions") +public final class Tags { /** * Tests that require FoundationDB to be available. */ @@ -46,4 +47,8 @@ public class Tags { * Tests that wipe the entire FDB cluster during their run. */ public static final String WipesFDB = "WipesFDB"; + + private Tags() { + } + } diff --git a/fdb-extensions/src/testFixtures/java/com/apple/test/TestConfigurationUtils.java b/fdb-test-utils/src/main/java/com/apple/test/TestConfigurationUtils.java similarity index 100% rename from fdb-extensions/src/testFixtures/java/com/apple/test/TestConfigurationUtils.java rename to fdb-test-utils/src/main/java/com/apple/test/TestConfigurationUtils.java diff --git a/fdb-extensions/src/testFixtures/java/com/apple/test/ParameterizedTestUtilsTest.java b/fdb-test-utils/src/test/java/com/apple/test/ParameterizedTestUtilsTest.java similarity index 100% rename from fdb-extensions/src/testFixtures/java/com/apple/test/ParameterizedTestUtilsTest.java rename to fdb-test-utils/src/test/java/com/apple/test/ParameterizedTestUtilsTest.java diff --git a/settings.gradle b/settings.gradle index a86cd8a425..b6f1d24f3b 100644 --- a/settings.gradle +++ b/settings.gradle @@ -22,6 +22,7 @@ rootProject.name='fdb-record-layer' include 'fdb-java-annotations' include 'fdb-extensions' +include 'fdb-test-utils' include 'fdb-record-layer-core' include 'fdb-record-layer-core-shaded' include 'fdb-record-layer-icu'