Skip to content

Commit 568b0da

Browse files
committed
Allow to inherit ResoruceManager annotation
Signed-off-by: David Kornel <kornys@outlook.com>
1 parent f327c58 commit 568b0da

File tree

3 files changed

+12
-4
lines changed

3 files changed

+12
-4
lines changed

test-frame-common/src/main/java/io/skodjob/testframe/annotations/ResourceManager.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import org.junit.jupiter.api.extension.ExtendWith;
1010

1111
import java.lang.annotation.ElementType;
12+
import java.lang.annotation.Inherited;
1213
import java.lang.annotation.Retention;
1314
import java.lang.annotation.Target;
1415

@@ -23,6 +24,7 @@
2324
*/
2425
@Target(ElementType.TYPE)
2526
@Retention(RUNTIME)
27+
@Inherited
2628
@ExtendWith(ResourceManagerExtension.class)
2729
@ExtendWith(ResourceManagerCleanerExtension.class)
2830
public @interface ResourceManager {
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
package io.skodjob.testframe.test.integration;
2+
3+
import io.skodjob.testframe.annotations.ResourceManager;
4+
5+
@ResourceManager()
6+
public class AbstractIT {
7+
protected String nsName = "test";
8+
}

test-frame-test/src/test/java/io/skodjob/testframe/test/integration/KubeResourceManagerCleanerIT.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
import io.fabric8.kubernetes.api.model.Namespace;
88
import io.fabric8.kubernetes.api.model.NamespaceBuilder;
9-
import io.skodjob.testframe.annotations.ResourceManager;
109
import io.skodjob.testframe.annotations.TestVisualSeparator;
1110
import io.skodjob.testframe.clients.KubeClusterException;
1211
import io.skodjob.testframe.resources.KubeResourceManager;
@@ -20,15 +19,14 @@
2019
import static org.junit.jupiter.api.Assertions.assertNull;
2120
import static org.junit.jupiter.api.Assertions.assertThrows;
2221

23-
@ResourceManager
2422
@TestVisualSeparator
2523
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
26-
public class KubeResourceManagerCleanerIT {
24+
public class KubeResourceManagerCleanerIT extends AbstractIT {
2725

2826
@BeforeAll
2927
void setupAll() {
3028
KubeResourceManager.getInstance().createResourceWithWait(
31-
new NamespaceBuilder().withNewMetadata().withName("test").endMetadata().build());
29+
new NamespaceBuilder().withNewMetadata().withName(nsName).endMetadata().build());
3230
}
3331

3432
@BeforeEach

0 commit comments

Comments
 (0)