Skip to content

Commit ad23108

Browse files
marinakogmarinakog
authored
Refactoring CommonTestUtils class Part1 : OperatorUtils, ImageUtils, LoadBalancerUtils, LogginExporterUtils, MonitoringUtils (#2488)
* added operator, loggingexp, image , lb utils * fixed OKE failure
1 parent 06d0ef8 commit ad23108

File tree

75 files changed

+2665
-2585
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+2665
-2585
lines changed

‎integration-tests/src/test/java/oracle/weblogic/kubernetes/ItCoherenceTests.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,13 @@
4848
import static oracle.weblogic.kubernetes.assertions.TestAssertions.verifyRollingRestartOccurred;
4949
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.checkPodReady;
5050
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.checkServiceExists;
51-
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.createImageAndVerify;
52-
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.createOcirRepoSecret;
5351
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.createSecretWithUsernamePassword;
54-
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.dockerLoginAndPushImageToRegistry;
5552
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.getPodCreationTime;
56-
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.installAndVerifyOperator;
5753
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.setPodAntiAffinity;
54+
import static oracle.weblogic.kubernetes.utils.ImageUtils.createImageAndVerify;
55+
import static oracle.weblogic.kubernetes.utils.ImageUtils.createOcirRepoSecret;
56+
import static oracle.weblogic.kubernetes.utils.ImageUtils.dockerLoginAndPushImageToRegistry;
57+
import static oracle.weblogic.kubernetes.utils.OperatorUtils.installAndVerifyOperator;
5858
import static oracle.weblogic.kubernetes.utils.ThreadSafeLogger.getLogger;
5959
import static org.awaitility.Awaitility.with;
6060
import static org.junit.jupiter.api.Assertions.assertAll;

‎integration-tests/src/test/java/oracle/weblogic/kubernetes/ItConfigDistributionStrategy.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,15 +92,15 @@
9292
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.createDomainJob;
9393
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.createPV;
9494
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.createPVC;
95-
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.createSecretForBaseImages;
9695
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.createSecretWithUsernamePassword;
9796
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.getExternalServicePodName;
9897
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.getIntrospectJobName;
9998
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.getPodCreationTime;
100-
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.installAndVerifyOperator;
10199
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.setPodAntiAffinity;
102100
import static oracle.weblogic.kubernetes.utils.DeployUtil.deployUsingWlst;
101+
import static oracle.weblogic.kubernetes.utils.ImageUtils.createSecretForBaseImages;
103102
import static oracle.weblogic.kubernetes.utils.MySQLDBUtils.createMySQLDB;
103+
import static oracle.weblogic.kubernetes.utils.OperatorUtils.installAndVerifyOperator;
104104
import static oracle.weblogic.kubernetes.utils.TestUtils.getNextFreePort;
105105
import static oracle.weblogic.kubernetes.utils.ThreadSafeLogger.getLogger;
106106
import static oracle.weblogic.kubernetes.utils.WLSTUtils.executeWLSTScript;

‎integration-tests/src/test/java/oracle/weblogic/kubernetes/ItCrossDomainTransaction.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,19 +62,19 @@
6262
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.checkPodExists;
6363
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.checkPodReady;
6464
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.checkServiceExists;
65-
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.createImageAndVerify;
66-
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.createOcirRepoSecret;
67-
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.createSecretForBaseImages;
6865
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.createSecretWithUsernamePassword;
69-
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.dockerLoginAndPushImageToRegistry;
7066
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.getExternalServicePodName;
71-
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.installAndVerifyOperator;
7267
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.setPodAntiAffinity;
7368
import static oracle.weblogic.kubernetes.utils.DbUtils.getDBNodePort;
7469
import static oracle.weblogic.kubernetes.utils.DbUtils.startOracleDB;
7570
import static oracle.weblogic.kubernetes.utils.ExecCommand.exec;
7671
import static oracle.weblogic.kubernetes.utils.FileUtils.copyFolder;
7772
import static oracle.weblogic.kubernetes.utils.FileUtils.replaceStringInFile;
73+
import static oracle.weblogic.kubernetes.utils.ImageUtils.createImageAndVerify;
74+
import static oracle.weblogic.kubernetes.utils.ImageUtils.createOcirRepoSecret;
75+
import static oracle.weblogic.kubernetes.utils.ImageUtils.createSecretForBaseImages;
76+
import static oracle.weblogic.kubernetes.utils.ImageUtils.dockerLoginAndPushImageToRegistry;
77+
import static oracle.weblogic.kubernetes.utils.OperatorUtils.installAndVerifyOperator;
7878
import static oracle.weblogic.kubernetes.utils.TestUtils.getNextFreePort;
7979
import static oracle.weblogic.kubernetes.utils.ThreadSafeLogger.getLogger;
8080
import static org.awaitility.Awaitility.with;

‎integration-tests/src/test/java/oracle/weblogic/kubernetes/ItDedicatedMode.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@
4949
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.checkPodReadyAndServiceExists;
5050
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.createDomainAndVerify;
5151
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.createSecretWithUsernamePassword;
52-
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.installAndVerifyOperator;
5352
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.scaleAndVerifyCluster;
5453
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.setPodAntiAffinity;
54+
import static oracle.weblogic.kubernetes.utils.OperatorUtils.installAndVerifyOperator;
5555
import static oracle.weblogic.kubernetes.utils.ThreadSafeLogger.getLogger;
5656
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
5757
import static org.junit.jupiter.api.Assertions.assertNotNull;

‎integration-tests/src/test/java/oracle/weblogic/kubernetes/ItElasticLogging.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -58,18 +58,18 @@
5858
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.checkPodReady;
5959
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.checkServiceExists;
6060
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.createDomainAndVerify;
61-
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.createMiiImageAndVerify;
62-
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.createOcirRepoSecret;
6361
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.createSecretWithUsernamePassword;
64-
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.dockerLoginAndPushImageToRegistry;
65-
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.installAndVerifyElasticsearch;
66-
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.installAndVerifyKibana;
67-
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.installAndVerifyOperator;
68-
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.installAndVerifyWlsLoggingExporter;
6962
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.setPodAntiAffinity;
70-
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.uninstallAndVerifyElasticsearch;
71-
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.uninstallAndVerifyKibana;
72-
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.verifyLoggingExporterReady;
63+
import static oracle.weblogic.kubernetes.utils.ImageUtils.createMiiImageAndVerify;
64+
import static oracle.weblogic.kubernetes.utils.ImageUtils.createOcirRepoSecret;
65+
import static oracle.weblogic.kubernetes.utils.ImageUtils.dockerLoginAndPushImageToRegistry;
66+
import static oracle.weblogic.kubernetes.utils.LoggingExporterUtils.installAndVerifyElasticsearch;
67+
import static oracle.weblogic.kubernetes.utils.LoggingExporterUtils.installAndVerifyKibana;
68+
import static oracle.weblogic.kubernetes.utils.LoggingExporterUtils.installAndVerifyWlsLoggingExporter;
69+
import static oracle.weblogic.kubernetes.utils.LoggingExporterUtils.uninstallAndVerifyElasticsearch;
70+
import static oracle.weblogic.kubernetes.utils.LoggingExporterUtils.uninstallAndVerifyKibana;
71+
import static oracle.weblogic.kubernetes.utils.LoggingExporterUtils.verifyLoggingExporterReady;
72+
import static oracle.weblogic.kubernetes.utils.OperatorUtils.installAndVerifyOperator;
7373
import static oracle.weblogic.kubernetes.utils.ThreadSafeLogger.getLogger;
7474
import static org.awaitility.Awaitility.with;
7575
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;

‎integration-tests/src/test/java/oracle/weblogic/kubernetes/ItElasticLoggingFluentd.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -67,18 +67,18 @@
6767
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.checkPodReady;
6868
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.checkServiceExists;
6969
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.createDomainAndVerify;
70-
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.createMiiImageAndVerify;
71-
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.createOcirRepoSecret;
7270
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.createSecretWithUsernamePasswordElk;
73-
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.dockerLoginAndPushImageToRegistry;
74-
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.installAndVerifyElasticsearch;
75-
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.installAndVerifyKibana;
76-
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.installAndVerifyOperator;
7771
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.setPodAntiAffinity;
78-
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.uninstallAndVerifyElasticsearch;
79-
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.uninstallAndVerifyKibana;
80-
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.verifyLoggingExporterReady;
8172
import static oracle.weblogic.kubernetes.utils.FileUtils.replaceStringInFile;
73+
import static oracle.weblogic.kubernetes.utils.ImageUtils.createMiiImageAndVerify;
74+
import static oracle.weblogic.kubernetes.utils.ImageUtils.createOcirRepoSecret;
75+
import static oracle.weblogic.kubernetes.utils.ImageUtils.dockerLoginAndPushImageToRegistry;
76+
import static oracle.weblogic.kubernetes.utils.LoggingExporterUtils.installAndVerifyElasticsearch;
77+
import static oracle.weblogic.kubernetes.utils.LoggingExporterUtils.installAndVerifyKibana;
78+
import static oracle.weblogic.kubernetes.utils.LoggingExporterUtils.uninstallAndVerifyElasticsearch;
79+
import static oracle.weblogic.kubernetes.utils.LoggingExporterUtils.uninstallAndVerifyKibana;
80+
import static oracle.weblogic.kubernetes.utils.LoggingExporterUtils.verifyLoggingExporterReady;
81+
import static oracle.weblogic.kubernetes.utils.OperatorUtils.installAndVerifyOperator;
8282
import static oracle.weblogic.kubernetes.utils.ThreadSafeLogger.getLogger;
8383
import static org.awaitility.Awaitility.with;
8484
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;

‎integration-tests/src/test/java/oracle/weblogic/kubernetes/ItExternalLbTunneling.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,17 +67,17 @@
6767
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.checkPodReadyAndServiceExists;
6868
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.checkServiceExists;
6969
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.createConfigMapFromFiles;
70-
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.createOcirRepoSecret;
7170
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.createSecretWithUsernamePassword;
7271
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.generateFileFromTemplate;
73-
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.installAndVerifyNginx;
74-
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.installAndVerifyOperator;
75-
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.installAndVerifyTraefik;
76-
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.installAndVerifyVoyager;
7772
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.setPodAntiAffinity;
7873
import static oracle.weblogic.kubernetes.utils.ExecCommand.exec;
7974
import static oracle.weblogic.kubernetes.utils.FileUtils.copyFileFromPod;
8075
import static oracle.weblogic.kubernetes.utils.FileUtils.copyFileToPod;
76+
import static oracle.weblogic.kubernetes.utils.ImageUtils.createOcirRepoSecret;
77+
import static oracle.weblogic.kubernetes.utils.LoadBalancerUtils.installAndVerifyNginx;
78+
import static oracle.weblogic.kubernetes.utils.LoadBalancerUtils.installAndVerifyTraefik;
79+
import static oracle.weblogic.kubernetes.utils.LoadBalancerUtils.installAndVerifyVoyager;
80+
import static oracle.weblogic.kubernetes.utils.OperatorUtils.installAndVerifyOperator;
8181
import static oracle.weblogic.kubernetes.utils.ThreadSafeLogger.getLogger;
8282
import static org.assertj.core.api.Assertions.assertThat;
8383
import static org.awaitility.Awaitility.with;

‎integration-tests/src/test/java/oracle/weblogic/kubernetes/ItExternalNodePortService.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,14 +57,14 @@
5757
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.checkPodReadyAndServiceExists;
5858
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.checkServiceExists;
5959
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.createConfigMapFromFiles;
60-
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.createOcirRepoSecret;
6160
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.createSecretWithUsernamePassword;
6261
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.generateFileFromTemplate;
63-
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.installAndVerifyOperator;
6462
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.setPodAntiAffinity;
6563
import static oracle.weblogic.kubernetes.utils.ExecCommand.exec;
6664
import static oracle.weblogic.kubernetes.utils.FileUtils.copyFileFromPod;
6765
import static oracle.weblogic.kubernetes.utils.FileUtils.copyFileToPod;
66+
import static oracle.weblogic.kubernetes.utils.ImageUtils.createOcirRepoSecret;
67+
import static oracle.weblogic.kubernetes.utils.OperatorUtils.installAndVerifyOperator;
6868
import static oracle.weblogic.kubernetes.utils.TestUtils.getNextFreePort;
6969
import static oracle.weblogic.kubernetes.utils.ThreadSafeLogger.getLogger;
7070
import static org.awaitility.Awaitility.with;

‎integration-tests/src/test/java/oracle/weblogic/kubernetes/ItFmwBigCMMiiDomain.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,18 +35,18 @@
3535
import static oracle.weblogic.kubernetes.TestConstants.RESULTS_ROOT;
3636
import static oracle.weblogic.kubernetes.actions.ActionConstants.MODEL_DIR;
3737
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.createDomainAndVerify;
38-
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.createMiiImageAndVerify;
39-
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.createOcirRepoSecret;
4038
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.createOpsswalletpasswordSecret;
4139
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.createRcuAccessSecret;
4240
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.createSecretWithUsernamePassword;
43-
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.dockerLoginAndPushImageToRegistry;
44-
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.installAndVerifyOperator;
4541
import static oracle.weblogic.kubernetes.utils.DbUtils.getDBNodePort;
4642
import static oracle.weblogic.kubernetes.utils.DbUtils.setupDBandRCUschema;
4743
import static oracle.weblogic.kubernetes.utils.FileUtils.replaceStringInFile;
4844
import static oracle.weblogic.kubernetes.utils.FmwUtils.createDomainResource;
4945
import static oracle.weblogic.kubernetes.utils.FmwUtils.verifyDomainReady;
46+
import static oracle.weblogic.kubernetes.utils.ImageUtils.createMiiImageAndVerify;
47+
import static oracle.weblogic.kubernetes.utils.ImageUtils.createOcirRepoSecret;
48+
import static oracle.weblogic.kubernetes.utils.ImageUtils.dockerLoginAndPushImageToRegistry;
49+
import static oracle.weblogic.kubernetes.utils.OperatorUtils.installAndVerifyOperator;
5050
import static oracle.weblogic.kubernetes.utils.TestUtils.getNextFreePort;
5151
import static oracle.weblogic.kubernetes.utils.ThreadSafeLogger.getLogger;
5252
import static org.awaitility.Awaitility.with;

‎integration-tests/src/test/java/oracle/weblogic/kubernetes/ItFmwDiiSample.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,11 @@
4343
import static oracle.weblogic.kubernetes.assertions.TestAssertions.domainExists;
4444
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.checkPodReadyAndServiceExists;
4545
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.createRcuSecretWithUsernamePassword;
46-
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.createSecretForBaseImages;
4746
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.createSecretWithUsernamePassword;
4847
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.getExternalServicePodName;
49-
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.installAndVerifyOperator;
5048
import static oracle.weblogic.kubernetes.utils.FileUtils.replaceStringInFile;
49+
import static oracle.weblogic.kubernetes.utils.ImageUtils.createSecretForBaseImages;
50+
import static oracle.weblogic.kubernetes.utils.OperatorUtils.installAndVerifyOperator;
5151
import static oracle.weblogic.kubernetes.utils.TestUtils.callWebAppAndWaitTillReady;
5252
import static oracle.weblogic.kubernetes.utils.TestUtils.getNextFreePort;
5353
import static oracle.weblogic.kubernetes.utils.ThreadSafeLogger.getLogger;

0 commit comments

Comments
 (0)