Merge pull request #48423 from geoand/junit-autocloseable

Replace the use of CloseableResource with AutoCloseable

Author: geoand

test-framework/junit5-internal/src/main/java/io/quarkus/test/QuarkusDevModeTest.java

@@ -264,7 +264,7 @@ public void beforeEach(ExtensionContext extensionContext) throws Exception {
             TestResourceManager tm = testResourceManager;
 
             store.put(TestResourceManager.class.getName(), testResourceManager);
-            store.put(TestResourceManager.CLOSEABLE_NAME, (ExtensionContext.Store.CloseableResource) tm::close);
+            store.put(TestResourceManager.CLOSEABLE_NAME, tm);
         }
         TestResourceManager tm = (TestResourceManager) store.get(TestResourceManager.class.getName());
         //dev mode tests just use system properties

test-framework/junit5-internal/src/main/java/io/quarkus/test/QuarkusProdModeTest.java

@@ -369,10 +369,10 @@ public void beforeAll(ExtensionContext extensionContext) throws Exception {
             manager.init(null);
             testResourceProperties = manager.start();
             store.put(TestResourceManager.class.getName(), manager);
-            store.put(TestResourceManager.CLOSEABLE_NAME, new ExtensionContext.Store.CloseableResource() {
+            store.put(TestResourceManager.CLOSEABLE_NAME, new AutoCloseable() {
 
                 @Override
-                public void close() throws Throwable {
+                public void close() throws Exception {
                     manager.close();
                 }
             });

test-framework/junit5-internal/src/main/java/io/quarkus/test/QuarkusUnitTest.java

@@ -591,10 +591,10 @@ public void run() {
             testResourceManager.start();
             TestResourceManager tm = testResourceManager;
             store.put(TestResourceManager.class.getName(), testResourceManager);
-            store.put(TestResourceManager.CLOSEABLE_NAME, new ExtensionContext.Store.CloseableResource() {
+            store.put(TestResourceManager.CLOSEABLE_NAME, new AutoCloseable() {
 
                 @Override
-                public void close() throws Throwable {
+                public void close() throws Exception {
                     tm.close();
                 }
             });

test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusIntegrationTestExtension.java

@@ -256,9 +256,9 @@ private QuarkusTestExtensionState doProcessStart(Properties quarkusArtifactPrope
             }
             context.getStore(ExtensionContext.Namespace.GLOBAL).put(
                     QuarkusIntegrationTestExtension.class.getName() + ".systemProps",
-                    new ExtensionContext.Store.CloseableResource() {
+                    new AutoCloseable() {
                         @Override
-                        public void close() throws Throwable {
+                        public void close() throws Exception {
                             for (Map.Entry<String, String> i : old.entrySet()) {
                                 old.put(i.getKey(), System.getProperty(i.getKey()));
                                 if (i.getValue() == null) {

test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusMainIntegrationTestExtension.java

@@ -38,7 +38,6 @@
 import io.quarkus.test.junit.main.Launch;
 import io.quarkus.test.junit.main.LaunchResult;
 import io.quarkus.test.junit.main.QuarkusMainLauncher;
-import io.quarkus.test.junit.util.CloseAdaptor;
 import io.smallrye.config.SmallRyeConfig;
 
 public class QuarkusMainIntegrationTestExtension extends AbstractQuarkusTestWithContextExtension
@@ -115,7 +114,7 @@ private void prepare(ExtensionContext extensionContext) throws Exception {
         devServicesProps = devServicesLaunchResult.properties();
 
         ExtensionContext root = extensionContext.getRoot();
-        root.getStore(NAMESPACE).put("devServicesLaunchResult", new CloseAdaptor(devServicesLaunchResult));
+        root.getStore(NAMESPACE).put("devServicesLaunchResult", devServicesLaunchResult);
     }
 
     private ArtifactLauncher.LaunchResult doProcessStart(ExtensionContext context, String[] args) {

test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusTestExtension.java

@@ -1190,7 +1190,7 @@ protected void doClose() {
         }
     }
 
-    class FailedCleanup implements ExtensionContext.Store.CloseableResource {
+    class FailedCleanup implements AutoCloseable {
         @Override
         public void close() {
             shutdownHangDetection();

test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusTestExtensionState.java

@@ -6,11 +6,9 @@
 import java.lang.reflect.Method;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import org.junit.jupiter.api.extension.ExtensionContext;
-
 import io.quarkus.test.common.TestResourceManager;
 
-public class QuarkusTestExtensionState implements ExtensionContext.Store.CloseableResource {
+public class QuarkusTestExtensionState implements AutoCloseable {
 
     private final AtomicBoolean closed = new AtomicBoolean();