Read annotation value from all superclasses to set resoruce manager c…

…leaner (#50) Signed-off-by: David Kornel <[email protected]>
skodjob · May 6, 2024 · 5ecfe2f · 5ecfe2f
1 parent 7146063
commit 5ecfe2f
Showing 1 changed file with 13 additions and 7 deletions.
diff --git a/...-common/src/main/java/io/skodjob/testframe/listeners/ResourceManagerCleanerExtension.java b/...-common/src/main/java/io/skodjob/testframe/listeners/ResourceManagerCleanerExtension.java
@@ -10,20 +10,25 @@
 import org.junit.jupiter.api.extension.AfterEachCallback;
 import org.junit.jupiter.api.extension.ExtensionContext;
 
+import java.util.Optional;
+
+import static org.junit.platform.commons.support.AnnotationSupport.findAnnotation;
+
 /**
  * Enables cleaner extension based on cleanResources value
  */
 public class ResourceManagerCleanerExtension implements AfterAllCallback, AfterEachCallback {
 
     /**
-     * Enables ResourceManagerCleanerExtension for afterAll callback
+     * Enables ResourceManagerCleanerExtension for after All callback
      * @param extensionContext context
      */
     @Override
     public void afterAll(ExtensionContext extensionContext) {
-        Class<?> testClass = extensionContext.getRequiredTestClass();
-        ResourceManager annotation = testClass.getAnnotation(ResourceManager.class);
-        if (annotation != null && annotation.cleanResources()) {
+        Optional<ResourceManager> annotation =
+                findAnnotation(extensionContext.getRequiredTestClass(), ResourceManager.class);
+
+        if (annotation.isPresent() && annotation.get().cleanResources()) {
             KubeResourceManager.setTestContext(extensionContext);
             KubeResourceManager.getInstance().deleteResources();
         }
@@ -35,9 +40,10 @@ public void afterAll(ExtensionContext extensionContext) {
      */
     @Override
     public void afterEach(ExtensionContext extensionContext) {
-        Class<?> testClass = extensionContext.getRequiredTestClass();
-        ResourceManager annotation = testClass.getAnnotation(ResourceManager.class);
-        if (annotation != null && annotation.cleanResources()) {
+        Optional<ResourceManager> annotation =
+                findAnnotation(extensionContext.getRequiredTestClass(), ResourceManager.class);
+
+        if (annotation.isPresent() && annotation.get().cleanResources()) {
             KubeResourceManager.setTestContext(extensionContext);
             KubeResourceManager.getInstance().deleteResources();
         }