From 6d23487ad67bc6237547bdffc7380981102368b0 Mon Sep 17 00:00:00 2001 From: Ashley <73482956+ascopes@users.noreply.github.com> Date: Mon, 21 Nov 2022 08:39:38 +0000 Subject: [PATCH 1/2] Add opentest4j dependency --- java-compiler-testing/src/main/java/module-info.java | 1 + 1 file changed, 1 insertion(+) diff --git a/java-compiler-testing/src/main/java/module-info.java b/java-compiler-testing/src/main/java/module-info.java index f1d97af25..7c493fcbd 100644 --- a/java-compiler-testing/src/main/java/module-info.java +++ b/java-compiler-testing/src/main/java/module-info.java @@ -103,6 +103,7 @@ requires static transitive org.apiguardian.api; requires org.assertj.core; requires static transitive org.junit.jupiter.params; + requires static org.opentest4j; requires org.slf4j; // Annotations is internal, but we export it for documentation purposes. From e1ec029d51831c227bd08b57211381e70cb2ff8a Mon Sep 17 00:00:00 2001 From: Ashley <73482956+ascopes@users.noreply.github.com> Date: Mon, 21 Nov 2022 08:40:51 +0000 Subject: [PATCH 2/2] Rethrow org.opentest4j.TestAbortedException --- .../io/github/ascopes/jct/junit/AbstractCompilersProvider.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/java-compiler-testing/src/main/java/io/github/ascopes/jct/junit/AbstractCompilersProvider.java b/java-compiler-testing/src/main/java/io/github/ascopes/jct/junit/AbstractCompilersProvider.java index b164313a6..7b02d4eb9 100644 --- a/java-compiler-testing/src/main/java/io/github/ascopes/jct/junit/AbstractCompilersProvider.java +++ b/java-compiler-testing/src/main/java/io/github/ascopes/jct/junit/AbstractCompilersProvider.java @@ -29,6 +29,7 @@ import org.junit.jupiter.api.extension.ExtensionContext; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.ArgumentsProvider; +import org.opentest4j.TestAbortedException; /** * Base for defining a compiler-supplying arguments provider for Junit Jupiter parameterised test @@ -124,7 +125,7 @@ private void applyConfigurers(JctCompiler compiler) { for (var configurerClass : configurerClasses) { try { initialiseConfigurer(configurerClass).configure(compiler); - } catch (AssertionError ex) { + } catch (TestAbortedException ex) { throw ex; } catch (Exception ex) { throw new JctJunitConfigurerException(