diff --git a/.gitignore b/.gitignore index b7ccf2c..f2ca890 100644 --- a/.gitignore +++ b/.gitignore @@ -10,4 +10,5 @@ gradle-app.setting # Cache of project .gradletasknamecache -.idea/ \ No newline at end of file +.idea/ +*.iml \ No newline at end of file diff --git a/src/main/groovy/com/groovycoder/spockdockerextension/TestcontainersMethodInterceptor.groovy b/src/main/groovy/com/groovycoder/spockdockerextension/TestcontainersMethodInterceptor.groovy index 2944418..bb6bf4c 100644 --- a/src/main/groovy/com/groovycoder/spockdockerextension/TestcontainersMethodInterceptor.groovy +++ b/src/main/groovy/com/groovycoder/spockdockerextension/TestcontainersMethodInterceptor.groovy @@ -26,6 +26,7 @@ class TestcontainersMethodInterceptor extends AbstractMethodInterceptor { invocation.proceed() } + @Override void interceptCleanupSpecMethod(IMethodInvocation invocation) throws Throwable { def containers = findAllContainers(true) stopContainers(containers, invocation) @@ -74,7 +75,7 @@ class TestcontainersMethodInterceptor extends AbstractMethodInterceptor { private static void startContainers(List containers, IMethodInvocation invocation) { containers.each { FieldInfo f -> GenericContainer container = readContainerFromField(f, invocation) - if(!container.isRunning()){ + if (!container.isRunning()) { container.start() } } @@ -101,7 +102,6 @@ class TestcontainersMethodInterceptor extends AbstractMethodInterceptor { } } - private static GenericContainer readContainerFromField(FieldInfo f, IMethodInvocation invocation) { f.readValue(invocation.instance) as GenericContainer }