bulk update of ATs to junit 5

.circleci/config.yml

@@ -28,7 +28,7 @@ executors:
     resource_class: xlarge
     working_directory: ~/project
     environment:
-      GRADLE_OPTS: -Dorg.gradle.daemon=false -Dorg.gradle.parallel=true -Dorg.gradle.workers.max=4
+      GRADLE_OPTS: -Dorg.gradle.daemon=false -Dorg.gradle.parallel=true -Dorg.gradle.workers.max=4 -XX:+HeapDumpOnOutOfMemoryError
 
   xl_machine_executor:
     machine: #https://circleci.com/developer/machine/image/ubuntu-2204
@@ -227,7 +227,8 @@ jobs:
               | sed 's/.\{5\}$//' \
               | circleci tests split --split-by=timings --timings-type=classname)
             # Format the arguments to "./gradlew test"
-            GRADLE_ARGS=$(echo $CLASSNAMES | awk '{for (i=1; i<=NF; i++) print "--tests",$i}')
+            GRADLE_ARGS=$(echo $CLASSNAMES | awk '{for (i=1; i<=NF; i++) print "--tests",$i}') \
+            echo "calling gradle w args $GRADLE_ARGS"\
             ./gradlew --no-daemon acceptanceTestMainnet $GRADLE_ARGS
       - capture_test_results
       - capture_test_logs
@@ -239,7 +240,7 @@ jobs:
       - attach_workspace:
           at: ~/project
       - run:
-          name: AcceptanceTests (Non-Mainnet)
+          name: AcceptanceTests (Clique + BFT)
           no_output_timeout: 20m
           command: |
             ./gradlew --no-daemon acceptanceTestCliqueBft
@@ -254,7 +255,7 @@ jobs:
       - attach_workspace:
           at: ~/project
       - run:
-          name: AcceptanceTests (Non-Mainnet)
+          name: AcceptanceTests (Privacy)
           no_output_timeout: 20m
           command: |
             CLASSNAMES=$(circleci tests glob "acceptance-tests/tests/src/test/java/**/*.java" \
@@ -263,7 +264,8 @@ jobs:
               | sed 's/.\{5\}$//' \
               | circleci tests split --split-by=timings --timings-type=classname)
             # Format the arguments to "./gradlew test"
-            GRADLE_ARGS=$(echo $CLASSNAMES | awk '{for (i=1; i<=NF; i++) print "--tests",$i}')
+            GRADLE_ARGS=$(echo $CLASSNAMES | awk '{for (i=1; i<=NF; i++) print "--tests",$i}') \
+            echo "calling gradle acceptanceTestPrivacy w args $GRADLE_ARGS"\
             ./gradlew --no-daemon acceptanceTestPrivacy $GRADLE_ARGS
       - capture_test_results
       - capture_test_logs
@@ -275,7 +277,7 @@ jobs:
       - attach_workspace:
           at: ~/project
       - run:
-          name: AcceptanceTests (Non-Mainnet)
+          name: AcceptanceTests (Permissioning)
           no_output_timeout: 20m
           command: |
             ./gradlew --no-daemon acceptanceTestPermissioning
@@ -409,12 +411,14 @@ workflows:
       - unitTests:
            requires:
             - assemble
+            - acceptanceTests
       - testWindows:
           requires:
             - assemble
       - referenceTests:
           requires:
             - assemble
+            - acceptanceTests
       - integrationTests:
           requires:
             - assemble
@@ -424,11 +428,11 @@ workflows:
       - acceptanceTestsCliqueBft:
           requires:
             - assemble
-            - acceptanceTests
+            - acceptanceTestsPermissioning
       - acceptanceTestsPermissioning:
           requires:
+            - acceptanceTests
             - assemble
-            - acceptanceTestsCliqueBft
       - buildDocker:
           requires:
             - assemble

acceptance-tests/dsl/build.gradle

@@ -34,7 +34,6 @@ dependencies {
   implementation 'info.picocli:picocli'
   implementation 'io.reactivex.rxjava2:rxjava'
   implementation 'io.vertx:vertx-core'
-  implementation 'junit:junit'
   implementation 'io.opentelemetry:opentelemetry-api'
   implementation 'io.tmio:tuweni-bytes'
   implementation 'io.tmio:tuweni-io'
@@ -47,4 +46,5 @@ dependencies {
   implementation 'org.web3j:crypto'
 
   implementation 'org.testcontainers:testcontainers'
+  implementation 'org.junit.jupiter:junit-jupiter'
 }

acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/AcceptanceTestBase.java

@@ -49,23 +49,19 @@
 import org.hyperledger.besu.tests.acceptance.dsl.transaction.web3.Web3Transactions;
 
 import java.io.BufferedReader;
-import java.io.File;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.lang.ProcessBuilder.Redirect;
 import java.math.BigInteger;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
-import org.junit.After;
-import org.junit.Rule;
-import org.junit.rules.TestName;
-import org.junit.rules.TestWatcher;
-import org.junit.runner.Description;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.slf4j.MDC;
 
+@ExtendWith(AcceptanceTestBaseTestWatcher.class)
 public class AcceptanceTestBase {
 
   private static final Logger LOG = LoggerFactory.getLogger(AcceptanceTestBase.class);
@@ -131,9 +127,7 @@ protected AcceptanceTestBase() {
     exitedSuccessfully = new ExitedWithCode(0);
   }
 
-  @Rule public final TestName name = new TestName();
-
-  @After
+  @AfterEach
   public void tearDownAcceptanceTestBase() {
     reportMemory();
     cluster.close();
@@ -178,49 +172,6 @@ private void printOutput(final Process process) {
     }
   }
 
-  @Rule
-  public TestWatcher logEraser =
-      new TestWatcher() {
-
-        @Override
-        protected void starting(final Description description) {
-          MDC.put("test", description.getMethodName());
-          MDC.put("class", description.getClassName());
-
-          final String errorMessage = "Uncaught exception in thread \"{}\"";
-          Thread.currentThread()
-              .setUncaughtExceptionHandler(
-                  (thread, error) -> LOG.error(errorMessage, thread.getName(), error));
-          Thread.setDefaultUncaughtExceptionHandler(
-              (thread, error) -> LOG.error(errorMessage, thread.getName(), error));
-        }
-
-        @Override
-        protected void failed(final Throwable e, final Description description) {
-          // add the result at the end of the log so it is self-sufficient
-          LOG.error(
-              "==========================================================================================");
-          LOG.error("Test failed. Reported Throwable at the point of failure:", e);
-          LOG.error(e.getMessage());
-        }
-
-        @Override
-        protected void succeeded(final Description description) {
-          // if so configured, delete logs of successful tests
-          if (!Boolean.getBoolean("acctests.keepLogsOfPassingTests")) {
-            String pathname =
-                "build/acceptanceTestLogs/"
-                    + description.getClassName()
-                    + "."
-                    + description.getMethodName()
-                    + ".log";
-            LOG.info("Test successful, deleting log at {}", pathname);
-            File file = new File(pathname);
-            file.delete();
-          }
-        }
-      };
-
   protected void waitForBlockHeight(final Node node, final long blockchainHeight) {
     WaitUtils.waitFor(
         120,

acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/AcceptanceTestBaseTestWatcher.java

@@ -0,0 +1,61 @@
+/*
+ * Copyright contributors to Hyperledger Besu.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.hyperledger.besu.tests.acceptance.dsl;
+
+import java.io.File;
+import java.util.Optional;
+
+import org.junit.jupiter.api.extension.ExtensionContext;
+import org.junit.jupiter.api.extension.TestWatcher;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class AcceptanceTestBaseTestWatcher implements TestWatcher {
+  private static final Logger LOG = LoggerFactory.getLogger(AcceptanceTestBaseTestWatcher.class);
+
+  @Override
+  public void testAborted(final ExtensionContext extensionContext, final Throwable throwable) {
+    LOG.info("test aborted:" + extensionContext.getDisplayName());
+  }
+
+  @Override
+  public void testDisabled(
+      final ExtensionContext extensionContext, final Optional<String> optional) {
+    LOG.info("test disabled:" + extensionContext.getDisplayName());
+  }
+
+  @Override
+  public void testFailed(final ExtensionContext extensionContext, final Throwable e) {
+    // add the result at the end of the log, so it is self-sufficient
+    LOG.error(
+        "==========================================================================================");
+    LOG.error("Test failed. Reported Throwable at the point of failure:", e);
+    LOG.error(e.getMessage());
+  }
+
+  @Override
+  public void testSuccessful(final ExtensionContext extensionContext) {
+    // TODO where is the other side of this - what creates these log files?
+
+    // if so configured, delete logs of successful tests
+    if (!Boolean.getBoolean("acctests.keepLogsOfPassingTests")) {
+      String pathname = "build/acceptanceTestLogs/" + extensionContext.getDisplayName() + ".log";
+      LOG.info("Test successful, deleting log at {}", pathname);
+      File file = new File(pathname);
+      file.delete();
+    }
+  }
+}

acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/ParameterizedEnclaveTestBase.java

@@ -25,43 +25,26 @@
 import org.hyperledger.besu.tests.acceptance.dsl.privacy.transaction.RestrictedCreatePrivacyGroupTransaction;
 import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction;
 import org.hyperledger.enclave.testutil.EnclaveEncryptorType;
-import org.hyperledger.enclave.testutil.EnclaveType;
 
-import java.util.Arrays;
-import java.util.Collection;
+import java.util.stream.Stream;
 
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
+import org.junit.jupiter.params.provider.Arguments;
 import org.web3j.utils.Restriction;
 
-@RunWith(Parameterized.class)
 public abstract class ParameterizedEnclaveTestBase extends PrivacyAcceptanceTestBase {
-  protected final Restriction restriction;
-  protected final EnclaveType enclaveType;
-  protected final EnclaveEncryptorType enclaveEncryptorType;
 
-  protected ParameterizedEnclaveTestBase(
-      final Restriction restriction,
-      final EnclaveType enclaveType,
-      final EnclaveEncryptorType enclaveEncryptorType) {
-    this.restriction = restriction;
-    this.enclaveType = enclaveType;
-    this.enclaveEncryptorType = enclaveEncryptorType;
-  }
-
-  @Parameters(name = "{0} tx with {1} enclave and {2} encryptor type")
-  public static Collection<Object[]> params() {
-    return Arrays.asList(
-        new Object[][] {
-          {RESTRICTED, TESSERA, NACL},
-          {RESTRICTED, TESSERA, EC},
-          {UNRESTRICTED, NOOP, EnclaveEncryptorType.NOOP}
-        });
+  public static Stream<Arguments> params() {
+    return Stream.of(
+        Arguments.of(RESTRICTED, TESSERA, NACL),
+        Arguments.of(RESTRICTED, TESSERA, EC),
+        Arguments.of(UNRESTRICTED, NOOP, EnclaveEncryptorType.NOOP));
   }
 
   public Transaction<String> createPrivacyGroup(
-      final String name, final String description, final PrivacyNode... nodes) {
+      final Restriction restriction,
+      final String name,
+      final String description,
+      final PrivacyNode... nodes) {
 
     if (restriction == RESTRICTED) {
       return new RestrictedCreatePrivacyGroupTransaction(name, description, nodes);

acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/PrivacyAcceptanceTestBase.java

@@ -32,12 +32,9 @@
 import java.math.BigInteger;
 
 import io.vertx.core.Vertx;
-import org.junit.After;
-import org.junit.ClassRule;
-import org.junit.rules.TemporaryFolder;
+import org.junit.jupiter.api.AfterEach;
 
 public class PrivacyAcceptanceTestBase {
-  @ClassRule public static final TemporaryFolder privacy = new TemporaryFolder();
 
   protected final PrivacyTransactions privacyTransactions;
   protected final PrivateContractVerifier privateContractVerifier;
@@ -77,7 +74,7 @@ protected void waitForBlockHeight(final PrivacyNode node, final long blockchainH
                 .isGreaterThanOrEqualTo(BigInteger.valueOf(blockchainHeight)));
   }
 
-  @After
+  @AfterEach
   public void tearDownAcceptanceTestBase() {
     privacyCluster.close();
     vertx.close();

acceptance-tests/test-plugins/build.gradle

@@ -13,8 +13,6 @@ dependencies {
 
   testImplementation 'org.assertj:assertj-core'
   testImplementation 'org.junit.jupiter:junit-jupiter'
-
-  testRuntimeOnly 'org.junit.vintage:junit-vintage-engine'
 }
 
 task testPluginsJar(type: Jar) {