Support TestLifecycleAware-ness of containers started by the JUnit Jupiter integration

modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/TestcontainersExtension.java

@@ -16,6 +16,7 @@
 import org.testcontainers.lifecycle.TestLifecycleAware;
 
 import java.lang.reflect.Field;
+import java.lang.reflect.Method;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Optional;
@@ -99,17 +100,16 @@ private void signalAfterTestToContainersFor(String storeKey, ExtensionContext co
     }
 
     private TestDescription testDescriptionFrom(ExtensionContext context) {
-        return new TestDescription() {
-            @Override
-            public String getTestId() {
-                return context.getUniqueId();
-            }
+        return new TestcontainersTestDescription(
+            context.getUniqueId(),
+            filesystemFriendlyNameOf(context)
+        );
+    }
 
-            @Override
-            public String getFilesystemFriendlyName() {
-                return context.getDisplayName();
-            }
-        };
+    private String filesystemFriendlyNameOf(ExtensionContext context) {
+        return context.getRequiredTestClass().getName()
+            + "-"
+            + context.getTestMethod().map(Method::getName).orElse("static");
     }
 
     private boolean isTestLifecycleAware(StoreAdapter adapter) {

modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/TestcontainersTestDescription.java

@@ -0,0 +1,20 @@
+package org.testcontainers.junit.jupiter;
+
+import lombok.RequiredArgsConstructor;
+import org.testcontainers.lifecycle.TestDescription;
+
+@RequiredArgsConstructor
+public class TestcontainersTestDescription implements TestDescription {
+    private final String testId;
+    private final String filesystemFriendlyName;
+
+    @Override
+    public String getTestId() {
+        return testId;
+    }
+
+    @Override
+    public String getFilesystemFriendlyName() {
+        return filesystemFriendlyName;
+    }
+}

modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/TestLifecycleAwareContainerMock.java

@@ -14,12 +14,14 @@ public class TestLifecycleAwareContainerMock implements Startable, TestLifecycle
     static final String AFTER_TEST = "afterTest";
 
     private final List<String> lifecycleMethodCalls = new ArrayList<>();
+    private final List<String> lifecycleFilesystemFriendlyNames = new ArrayList<>();
 
     private Throwable capturedThrowable;
 
     @Override
     public void beforeTest(TestDescription description) {
         lifecycleMethodCalls.add(BEFORE_TEST);
+        lifecycleFilesystemFriendlyNames.add(description.getFilesystemFriendlyName());
     }
 
     @Override
@@ -36,6 +38,10 @@ Throwable getCapturedThrowable() {
         return capturedThrowable;
     }
 
+    public List<String> getLifecycleFilesystemFriendlyNames() {
+        return lifecycleFilesystemFriendlyNames;
+    }
+
     @Override
     public void start() {
 

modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/TestLifecycleAwareMethodTest.java

@@ -41,15 +41,27 @@ void should_prepare_before_and_after_test() {
 
     @Test
     @Order(2)
-    void should_call_beforeTest_first_afterTest_later() {
-        assertThat(startedTestContainer.getLifecycleMethodCalls()).containsExactly(BEFORE_TEST, AFTER_TEST);
+    void should_call_beforeTest_first_afterTest_later_with_filesystem_friendly_name() {
+        assertThat(startedTestContainer.getLifecycleMethodCalls())
+            .containsExactly(BEFORE_TEST, AFTER_TEST);
+        // Usually this would be a separate test, but due to the complex setup this is done here as well
+        assertThat(startedTestContainer.getLifecycleFilesystemFriendlyNames())
+            .containsExactly(
+                "org.testcontainers.junit.jupiter.TestLifecycleAwareMethodTest-should_prepare_before_and_after_test"
+            );
     }
 
     static class SharedContainerAfterAllTestExtension implements AfterAllCallback {
         // Unfortunately it's not possible to write a @Test that is run after all tests
         @Override
         public void afterAll(ExtensionContext context) {
-            assertThat(SHARED_CONTAINER.getLifecycleMethodCalls()).containsExactly(BEFORE_TEST, AFTER_TEST);
+            assertThat(SHARED_CONTAINER.getLifecycleMethodCalls())
+                .containsExactly(BEFORE_TEST, AFTER_TEST);
+            // Usually this would be a separate test, but due to the complex setup this is done here as well
+            assertThat(SHARED_CONTAINER.getLifecycleFilesystemFriendlyNames())
+                .containsExactly(
+                    "org.testcontainers.junit.jupiter.TestLifecycleAwareMethodTest-static"
+                );
         }
     }
 }