test: removed MockitoJUnitRunner references

teoincontatto · teoincontatto · commit b933bd7dd3f2 · 2025-02-27T09:54:33.000+01:00
diff --git a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/mutation/ClusterMutationResourceTest.java b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/mutation/ClusterMutationResourceTest.java
@@ -11,12 +11,9 @@
 import io.stackgres.operatorframework.admissionwebhook.mutating.AbstractMutationResource;
 import io.stackgres.testutil.JsonUtil;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.junit.runner.RunWith;
-import org.mockito.junit.MockitoJUnitRunner;
 import org.mockito.junit.jupiter.MockitoExtension;
 
 @ExtendWith(MockitoExtension.class)
-@RunWith(MockitoJUnitRunner.class)
 class ClusterMutationResourceTest
     extends MutationResourceTest<StackGresCluster, StackGresClusterReview> {
 
diff --git a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/mutation/DefaultStateMutatorTest.java b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/mutation/DefaultStateMutatorTest.java
diff --git a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/mutation/PgConfigMutationResourceTest.java b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/mutation/PgConfigMutationResourceTest.java
@@ -11,12 +11,9 @@
 import io.stackgres.operatorframework.admissionwebhook.mutating.AbstractMutationResource;
 import io.stackgres.testutil.JsonUtil;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.junit.runner.RunWith;
-import org.mockito.junit.MockitoJUnitRunner;
 import org.mockito.junit.jupiter.MockitoExtension;
 
 @ExtendWith(MockitoExtension.class)
-@RunWith(MockitoJUnitRunner.class)
 class PgConfigMutationResourceTest
     extends MutationResourceTest<StackGresPostgresConfig, StackGresPostgresConfigReview> {
 
diff --git a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/mutation/pgconfig/PgConfigDefaultValuesMutatorTest.java b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/mutation/pgconfig/PgConfigDefaultValuesMutatorTest.java
@@ -16,12 +16,9 @@
 import io.stackgres.operator.mutation.AbstractValuesMutator;
 import io.stackgres.operator.mutation.DefaultValuesMutatorTest;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.junit.runner.RunWith;
-import org.mockito.junit.MockitoJUnitRunner;
 import org.mockito.junit.jupiter.MockitoExtension;
 
 @ExtendWith(MockitoExtension.class)
-@RunWith(MockitoJUnitRunner.class)
 class PgConfigDefaultValuesMutatorTest
     extends DefaultValuesMutatorTest<StackGresPostgresConfig, StackGresPostgresConfigReview> {
 
diff --git a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/BackupValidationResourceTest.java b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/BackupValidationResourceTest.java
@@ -11,12 +11,9 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.junit.runner.RunWith;
-import org.mockito.junit.MockitoJUnitRunner;
 import org.mockito.junit.jupiter.MockitoExtension;
 
 @ExtendWith(MockitoExtension.class)
-@RunWith(MockitoJUnitRunner.class)
 class BackupValidationResourceTest extends ValidationResourceTest<StackGresBackupReview> {
 
   @BeforeEach
diff --git a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/ClusterValidationResourceTest.java b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/ClusterValidationResourceTest.java
@@ -11,12 +11,9 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.junit.runner.RunWith;
-import org.mockito.junit.MockitoJUnitRunner;
 import org.mockito.junit.jupiter.MockitoExtension;
 
 @ExtendWith(MockitoExtension.class)
-@RunWith(MockitoJUnitRunner.class)
 class ClusterValidationResourceTest extends ValidationResourceTest<StackGresClusterReview> {
 
   @BeforeEach
diff --git a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/ConfigValidationResourceTest.java b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/ConfigValidationResourceTest.java
@@ -11,12 +11,9 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.junit.runner.RunWith;
-import org.mockito.junit.MockitoJUnitRunner;
 import org.mockito.junit.jupiter.MockitoExtension;
 
 @ExtendWith(MockitoExtension.class)
-@RunWith(MockitoJUnitRunner.class)
 class ConfigValidationResourceTest extends ValidationResourceTest<StackGresConfigReview> {
 
   @BeforeEach
diff --git a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/DbOpsValidationResourceTest.java b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/DbOpsValidationResourceTest.java
@@ -11,12 +11,9 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.junit.runner.RunWith;
-import org.mockito.junit.MockitoJUnitRunner;
 import org.mockito.junit.jupiter.MockitoExtension;
 
 @ExtendWith(MockitoExtension.class)
-@RunWith(MockitoJUnitRunner.class)
 class DbOpsValidationResourceTest extends ValidationResourceTest<StackGresDbOpsReview> {
 
   @BeforeEach
diff --git a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/DistributedLogsValidationResourceTest.java b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/DistributedLogsValidationResourceTest.java
@@ -11,12 +11,9 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.junit.runner.RunWith;
-import org.mockito.junit.MockitoJUnitRunner;
 import org.mockito.junit.jupiter.MockitoExtension;
 
 @ExtendWith(MockitoExtension.class)
-@RunWith(MockitoJUnitRunner.class)
 class DistributedLogsValidationResourceTest
     extends ValidationResourceTest<StackGresDistributedLogsReview> {
 
diff --git a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/PgBouncerValidationResourceTest.java b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/PgBouncerValidationResourceTest.java
@@ -11,12 +11,9 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.junit.runner.RunWith;
-import org.mockito.junit.MockitoJUnitRunner;
 import org.mockito.junit.jupiter.MockitoExtension;
 
 @ExtendWith(MockitoExtension.class)
-@RunWith(MockitoJUnitRunner.class)
 class PgBouncerValidationResourceTest extends ValidationResourceTest<StackGresPoolingConfigReview> {
 
   @BeforeEach
diff --git a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/SgProfileValidationResourceTest.java b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/SgProfileValidationResourceTest.java
@@ -11,12 +11,9 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.junit.runner.RunWith;
-import org.mockito.junit.MockitoJUnitRunner;
 import org.mockito.junit.jupiter.MockitoExtension;
 
 @ExtendWith(MockitoExtension.class)
-@RunWith(MockitoJUnitRunner.class)
 class SgProfileValidationResourceTest extends ValidationResourceTest<StackGresInstanceProfileReview> {
 
   @BeforeEach
diff --git a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/ShardedBackupValidationResourceTest.java b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/ShardedBackupValidationResourceTest.java
@@ -11,12 +11,9 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.junit.runner.RunWith;
-import org.mockito.junit.MockitoJUnitRunner;
 import org.mockito.junit.jupiter.MockitoExtension;
 
 @ExtendWith(MockitoExtension.class)
-@RunWith(MockitoJUnitRunner.class)
 class ShardedBackupValidationResourceTest extends ValidationResourceTest<StackGresShardedBackupReview> {
 
   @BeforeEach
diff --git a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/ShardedClusterValidationResourceTest.java b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/ShardedClusterValidationResourceTest.java
@@ -11,12 +11,9 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.junit.runner.RunWith;
-import org.mockito.junit.MockitoJUnitRunner;
 import org.mockito.junit.jupiter.MockitoExtension;
 
 @ExtendWith(MockitoExtension.class)
-@RunWith(MockitoJUnitRunner.class)
 class ShardedClusterValidationResourceTest
     extends ValidationResourceTest<StackGresShardedClusterReview> {
 
diff --git a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/ShardedDbOpsValidationResourceTest.java b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/ShardedDbOpsValidationResourceTest.java
@@ -11,12 +11,9 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.junit.runner.RunWith;
-import org.mockito.junit.MockitoJUnitRunner;
 import org.mockito.junit.jupiter.MockitoExtension;
 
 @ExtendWith(MockitoExtension.class)
-@RunWith(MockitoJUnitRunner.class)
 class ShardedDbOpsValidationResourceTest extends ValidationResourceTest<StackGresShardedDbOpsReview> {
 
   @BeforeEach
diff --git a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/StreamValidationResourceTest.java b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/StreamValidationResourceTest.java
@@ -11,12 +11,9 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.junit.runner.RunWith;
-import org.mockito.junit.MockitoJUnitRunner;
 import org.mockito.junit.jupiter.MockitoExtension;
 
 @ExtendWith(MockitoExtension.class)
-@RunWith(MockitoJUnitRunner.class)
 class StreamValidationResourceTest extends ValidationResourceTest<StackGresStreamReview> {
 
   @BeforeEach
diff --git a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/backup/ClusterReferenceValidatorTest.java b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/backup/ClusterReferenceValidatorTest.java
@@ -30,13 +30,10 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
 import org.mockito.junit.jupiter.MockitoExtension;
 
 @ExtendWith(MockitoExtension.class)
-@RunWith(MockitoJUnitRunner.class)
 class ClusterReferenceValidatorTest {
 
   private ClusterValidator validator;
diff --git a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/cluster/PostgresVersionValidatorTest.java b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/cluster/PostgresVersionValidatorTest.java
@@ -33,12 +33,9 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.junit.runner.RunWith;
-import org.mockito.junit.MockitoJUnitRunner;
 import org.mockito.junit.jupiter.MockitoExtension;
 
 @ExtendWith(MockitoExtension.class)
-@RunWith(MockitoJUnitRunner.class)
 class PostgresVersionValidatorTest {
 
   private static final List<String> SUPPORTED_POSTGRES_VERSIONS =
diff --git a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/cluster/StorageClassValidatorTest.java b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/cluster/StorageClassValidatorTest.java
@@ -25,13 +25,10 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
 import org.mockito.junit.jupiter.MockitoExtension;
 
 @ExtendWith(MockitoExtension.class)
-@RunWith(MockitoJUnitRunner.class)
 class StorageClassValidatorTest {
 
   private static final StorageClass DEFAULT_STORAGE_CLASS = Fixtures.storageClass()
diff --git a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/dbops/DbOpsMajorVersionUpgradeValidatorTest.java b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/dbops/DbOpsMajorVersionUpgradeValidatorTest.java
@@ -35,13 +35,10 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
 import org.mockito.junit.jupiter.MockitoExtension;
 
 @ExtendWith(MockitoExtension.class)
-@RunWith(MockitoJUnitRunner.class)
 class DbOpsMajorVersionUpgradeValidatorTest {
 
   private static final List<String> SUPPORTED_POSTGRES_VERSIONS =
diff --git a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/dbops/DbOpsMinorVersionUpgradeValidatorTest.java b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/dbops/DbOpsMinorVersionUpgradeValidatorTest.java
@@ -30,13 +30,10 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
 import org.mockito.junit.jupiter.MockitoExtension;
 
 @ExtendWith(MockitoExtension.class)
-@RunWith(MockitoJUnitRunner.class)
 class DbOpsMinorVersionUpgradeValidatorTest {
 
   private static final List<String> SUPPORTED_POSTGRES_VERSIONS =
diff --git a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/dbops/DbOpsRepackExtensionValidatorTest.java b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/dbops/DbOpsRepackExtensionValidatorTest.java
@@ -30,13 +30,10 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
-import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
 import org.mockito.junit.jupiter.MockitoExtension;
 
 @ExtendWith(MockitoExtension.class)
-@RunWith(MockitoJUnitRunner.class)
 class DbOpsRepackExtensionValidatorTest {
 
   private static final String POSTGRES_VERSION =
diff --git a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/dbops/DbOpsSecurityUpgradeValidatorTest.java b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/dbops/DbOpsSecurityUpgradeValidatorTest.java
@@ -23,13 +23,10 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
 import org.mockito.junit.jupiter.MockitoExtension;
 
 @ExtendWith(MockitoExtension.class)
-@RunWith(MockitoJUnitRunner.class)
 class DbOpsSecurityUpgradeValidatorTest {
 
   private DbOpsSecurityUpgradeValidator validator;
diff --git a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/shardedbackup/ShardedClusterReferenceValidatorTest.java b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/shardedbackup/ShardedClusterReferenceValidatorTest.java
@@ -33,13 +33,10 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
 import org.mockito.junit.jupiter.MockitoExtension;
 
 @ExtendWith(MockitoExtension.class)
-@RunWith(MockitoJUnitRunner.class)
 class ShardedClusterReferenceValidatorTest {
 
   private ShardedClusterValidator validator;
diff --git a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/shardedcluster/PostgresVersionValidatorTest.java b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/shardedcluster/PostgresVersionValidatorTest.java
@@ -32,12 +32,9 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.junit.runner.RunWith;
-import org.mockito.junit.MockitoJUnitRunner;
 import org.mockito.junit.jupiter.MockitoExtension;
 
 @ExtendWith(MockitoExtension.class)
-@RunWith(MockitoJUnitRunner.class)
 class PostgresVersionValidatorTest {
 
   private static final List<String> SUPPORTED_POSTGRES_VERSIONS =
diff --git a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/shardedcluster/StorageClassValidatorTest.java b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/shardedcluster/StorageClassValidatorTest.java
@@ -27,13 +27,10 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
 import org.mockito.junit.jupiter.MockitoExtension;
 
 @ExtendWith(MockitoExtension.class)
-@RunWith(MockitoJUnitRunner.class)
 class StorageClassValidatorTest {
 
   private static final StorageClass DEFAULT_STORAGE_CLASS = Fixtures.storageClass()
diff --git a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/shardeddbops/ShardedDbOpsMajorVersionUpgradeValidatorTest.java b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/shardeddbops/ShardedDbOpsMajorVersionUpgradeValidatorTest.java
@@ -35,13 +35,10 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
 import org.mockito.junit.jupiter.MockitoExtension;
 
 @ExtendWith(MockitoExtension.class)
-@RunWith(MockitoJUnitRunner.class)
 class ShardedDbOpsMajorVersionUpgradeValidatorTest {
 
   private static final List<String> SUPPORTED_POSTGRES_VERSIONS =
diff --git a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/shardeddbops/ShardedDbOpsMinorVersionUpgradeValidatorTest.java b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/shardeddbops/ShardedDbOpsMinorVersionUpgradeValidatorTest.java
diff --git a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/shardeddbops/ShardedDbOpsSecurityUpgradeValidatorTest.java b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/shardeddbops/ShardedDbOpsSecurityUpgradeValidatorTest.java
