Merge pull request #195 from ls1intum/dependabot/maven/net.jqwik-jqwi…

…k-1.6.5

Bump jqwik from 1.6.3 to 1.6.5

pom.xml

@@ -36,7 +36,7 @@
 		<maven.compiler.target>11</maven.compiler.target>
 		<junit-jupiter-version>5.8.2</junit-jupiter-version>
 		<junit-platform-version>1.8.2</junit-platform-version>
-		<jqwik-version>1.6.3</jqwik-version>
+		<jqwik-version>1.6.5</jqwik-version>
 		<spotless.version>2.21.0</spotless.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

src/main/java/de/tum/in/test/api/jqwik/JqwikStrictTimeoutExtension.java

@@ -5,14 +5,15 @@
 import org.apiguardian.api.API;
 import org.apiguardian.api.API.Status;
 import org.junit.jupiter.api.Assertions;
+import org.junit.platform.engine.TestDescriptor;
 
 import net.jqwik.api.domains.DomainContext;
 import net.jqwik.api.lifecycle.AroundPropertyHook;
 import net.jqwik.api.lifecycle.PropertyExecutionResult;
 import net.jqwik.api.lifecycle.PropertyExecutor;
 import net.jqwik.api.lifecycle.PropertyLifecycleContext;
+import net.jqwik.engine.execution.lifecycle.CurrentDomainContext;
 import net.jqwik.engine.execution.lifecycle.CurrentTestDescriptor;
-import net.jqwik.engine.facades.DomainContextFacadeImpl;
 
 import de.tum.in.test.api.StrictTimeout;
 import de.tum.in.test.api.internal.TimeoutUtils;
@@ -42,11 +43,11 @@ public int aroundPropertyProximity() {
 	@Override
 	public PropertyExecutionResult aroundProperty(PropertyLifecycleContext context, PropertyExecutor property)
 			throws Throwable {
-		DomainContext domainContext = DomainContextFacadeImpl.getCurrentContext();
-		var desc = CurrentTestDescriptor.get();
-		return TimeoutUtils.performTimeoutExecution(() -> {
-			DomainContextFacadeImpl.setCurrentContext(domainContext);
-			return CurrentTestDescriptor.runWithDescriptor(desc, property::execute);
-		}, JqwikContext.of(context));
+		DomainContext domainContext = CurrentDomainContext.get();
+		TestDescriptor desc = CurrentTestDescriptor.get();
+		return TimeoutUtils.performTimeoutExecution(
+				() -> CurrentDomainContext.runWithContext(domainContext,
+						() -> CurrentTestDescriptor.runWithDescriptor(desc, property::execute)),
+				JqwikContext.of(context));
 	}
 }

src/test/resources/build.gradle

@@ -13,8 +13,8 @@ repositories {
 
 dependencies {
     testImplementation "de.tum.in.ase:artemis-java-test-sandbox:+"
-    testImplementation "net.jqwik:jqwik:1.6.3"
-    testImplementation "net.jqwik:jqwik-engine:1.6.3"
+    testImplementation "net.jqwik:jqwik:1.6.5"
+    testImplementation "net.jqwik:jqwik-engine:1.6.5"
     testImplementation "org.junit.vintage:junit-vintage-engine:5.8.2"
     testImplementation "org.junit.platform:junit-platform-testkit:1.8.2"
 }