[refactor] Improve test code..

Author: dizzzz

exist-core/src/main/java/org/exist/test/DiffMatcher.java

@@ -66,7 +66,7 @@ private DiffMatcher(final Source expectedSource, final boolean identical) {
 
     /**
      * Compares that the XML sources are similar.
-     *
+     * <p>
      * In this context "similar" is defined by {@link DiffBuilder#checkForSimilar()}.
      *
      * @param expectedSource the expected XML
@@ -79,7 +79,7 @@ public static DiffMatcher hasSimilarXml(final Source expectedSource) {
 
     /**
      * Compares that the XML sources are identical.
-     *
+     * <p>
      * In this context "similar" is defined by {@link DiffBuilder#checkForIdentical()} ()}.
      *
      * @param expectedSource the expected XML
@@ -101,7 +101,7 @@ public boolean matches(final Object item, final Description mismatch) {
         if (item instanceof NodeValue) {
             actualItem = (NodeValue) item;
 
-        } else if (item instanceof Sequence actual) {
+        } else if (item instanceof final Sequence actual) {
 
             if (actual.getItemCount() != 1) {
                 mismatch.appendText("Sequence does not contain 1 item");

exist-core/src/main/java/org/exist/test/ExistEmbeddedServer.java

@@ -142,7 +142,7 @@ public void startDb() throws DatabaseConfigurationException, EXistException, IOE
             });
 
             if (useTemporaryStorage) {
-                if (!temporaryStorage.isPresent()) {
+                if (temporaryStorage.isEmpty()) {
                     this.temporaryStorage = Optional.of(Files.createTempDirectory("org.exist.test.ExistEmbeddedServer"));
                 }
                 config.setProperty(BrokerPool.PROPERTY_DATA_DIR, temporaryStorage.get());

exist-core/src/main/java/org/exist/test/ExistXmldbEmbeddedServer.java

@@ -42,7 +42,6 @@
 import java.io.IOException;
 import java.nio.file.Path;
 import java.util.Map;
-import java.util.Properties;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;

exist-core/src/main/java/org/exist/test/TransactionTestDSL.java

@@ -58,13 +58,13 @@
 /**
  * A DSL for describing a schedule of
  * transaction operations upon the database.
- *
+ * <p>
  * A type-safe builder pattern is provided
  * for constructing the schedule. Once
  * the schedule is build a scheduler
  * can execute it upon the database
  * and return the results.
- *
+ * <p>
  * The DSL uses recursive types
  * in a similar way to a typed heterogeneous
  * list (such as Shapeless's HList) to ensure
@@ -74,10 +74,10 @@
  * At the cost of complexity in implementing
  * the DSL, the recursive typing makes use of
  * the DSL by the user much simpler and safer.
- *
+ * <p>
  * The recursive type implementation was
  * inspired by <a href="https://apocalisp.wordpress.com/2008/10/23/heterogeneous-lists-and-the-limits-of-the-java-type-system/">https://apocalisp.wordpress.com/2008/10/23/heterogeneous-lists-and-the-limits-of-the-java-type-system/</a>.
- *
+ * <p>
  * Example usage for creating a schedule of
  * two transactions, where each will execute in
  * its own thread but operationally linear
@@ -116,7 +116,7 @@ public interface TransactionTestDSL {
 
     /**
      * A Transaction Schedule builder.
-     *
+     * <p>
      * Enables us to build a schedule of operations to be executed
      * within one or more transactions.
      *
@@ -146,7 +146,7 @@ static BiTransactionScheduleBuilderFactory biSchedule() {
 
     /**
      * A schedule builder factory for two transactions T1 and T2.
-     *
+     * <p>
      * Responsible for creating a Schedule Builder which is initialized
      * to the first transaction state.
      */
@@ -462,7 +462,7 @@ U execute(final BrokerPool brokerPool, final ExecutionListener executionListener
 
     /**
      * A schedule of two transactions T1 and T2.
-     *
+     * <p>
      * Which are executed concurrently, each in their
      * own thread, but linearly according to the schedule.
      *
@@ -551,7 +551,7 @@ public Tuple2<U1, U2> execute(final BrokerPool brokerPool, final ExecutionListen
 
     /**
      * A function which describes an operation on the database with a Transaction.
-     *
+     * <p>
      * You can think of this as a function <pre>f(T) -&gt; U</pre>
      * where the database and transaction are available to the
      * function <pre>f</pre>.
@@ -691,7 +691,7 @@ static <T> TransactionOperation<T, T> abort() {
          * Executes this, and then the other Transaction Operation
          * on the input type {@code <T>} and returns
          * the results as a tuple.
-         *
+         * <p>
          * e.g. <pre>Tuple2(f(T) -&gt; U, other(T) -&gt; U2)</pre>
          *
          * @param <U2> thr result of the other operation.
@@ -707,7 +707,7 @@ default <U2> TransactionOperation<T, Tuple2<U, U2>> with(final TransactionOperat
         /**
          * Returns a composed function that first applies this function to
          * its input, and then applies the {@code after} function to the result.
-         *
+         * <p>
          * See {@link Function#andThen(Function)}
          *
          * @param <V> the result of the after operation.
@@ -723,7 +723,7 @@ default <V> TransactionOperation<T, V> andThen(final TransactionOperation<? supe
         /**
          * Returns a composed function that first applies the {@code before}
          * function to its input, and then applies this function to the result.
-         *
+         * <p>
          * See {@link Function#compose(Function)}
          *
          * @param <V> the input type of the before operation.
@@ -739,7 +739,7 @@ default <V> TransactionOperation<V, U> compose(final TransactionOperation<? supe
 
         /**
          * Returns a function that always returns its input argument.
-         *
+         * <p>
          * See {@link Function#identity()}
          *
          * @param <T> the result of the identity operation.
@@ -754,7 +754,7 @@ static <T> TransactionOperation<T, T> identity() {
     /**
      * A simple extension of {@link CountDownLatch}
      * which also provides a name for the latch.
-     *
+     * <p>
      * Useful for debugging latching ordering in
      * transaction schedules.
      */

exist-core/src/main/java/org/exist/test/runner/XSuite.java

@@ -41,7 +41,6 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 /**