Skip to content

Commit 2f729d1

Browse files
authored
Update JUnit classes and test methods to be non-public (#2492)
1 parent 00deb88 commit 2f729d1

File tree

181 files changed

+2477
-2481
lines changed

Some content is hidden

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

181 files changed

+2477
-2481
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ public static void init(@Namespaces(2) List<String> namespaces) {
132132
*/
133133
@Test
134134
@DisplayName("Create domain with a Coherence cluster using WDT and test rolling restart")
135-
public void testCoherenceServerRollingRestart() {
135+
void testCoherenceServerRollingRestart() {
136136
final String successMarker = "CACHE-SUCCESS";
137137

138138
// create a DomainHomeInImage image using WebLogic Image Tool

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@
118118
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
119119
@DisplayName("Verify the overrideDistributionStrategy applies the overrides accordingly to the value set")
120120
@IntegrationTest
121-
public class ItConfigDistributionStrategy {
121+
class ItConfigDistributionStrategy {
122122

123123
private static String opNamespace = null;
124124
private static String domainNamespace = null;
@@ -269,7 +269,7 @@ public void afterEach() {
269269
@Order(1)
270270
@Test
271271
@DisplayName("Test overrideDistributionStrategy set to DEFAULT")
272-
public void testDefaultOverride() {
272+
void testDefaultOverride() {
273273

274274
//store the pod creation timestamps
275275
storePodCreationTimestamps();
@@ -325,7 +325,7 @@ public void testDefaultOverride() {
325325
@Order(2)
326326
@Test
327327
@DisplayName("Test new overrides are applied as per the files in recreated configmap")
328-
public void testModifiedOverrideContent() {
328+
void testModifiedOverrideContent() {
329329

330330
//store the pod creation timestamps
331331
storePodCreationTimestamps();
@@ -434,7 +434,7 @@ public void testModifiedOverrideContent() {
434434
@Order(3)
435435
@Test
436436
@DisplayName("Test overrideDistributionStrategy value DYNAMIC")
437-
public void testDynamicOverride() {
437+
void testDynamicOverride() {
438438

439439
//patching the domain with /spec/configuration/overrideDistributionStrategy: DYNAMIC
440440
String patchStr = "["
@@ -512,7 +512,7 @@ public void testDynamicOverride() {
512512
@Order(4)
513513
@Test
514514
@DisplayName("Test overrideDistributionStrategy value ON_RESTART")
515-
public void testOnRestartOverride() {
515+
void testOnRestartOverride() {
516516

517517
//patching the domain with /spec/configuration/overrideDistributionStrategy: ON_RESTART
518518
String patchStr = "["
@@ -616,7 +616,7 @@ public void testOnRestartOverride() {
616616
@Order(5)
617617
@Test
618618
@DisplayName("Test invalid overrideDistributionStrategy value RESTART")
619-
public void testOverrideNegative() {
619+
void testOverrideNegative() {
620620

621621
//patching the domain with /spec/configuration/overrideDistributionStrategy: RESTART
622622
String patchStr = "["

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
8787
@DisplayName("Verify cross domain transaction is successful")
8888
@IntegrationTest
89-
public class ItCrossDomainTransaction {
89+
class ItCrossDomainTransaction {
9090

9191
private static final String WDT_MODEL_FILE_DOMAIN1 = "model-crossdomaintransaction-domain1.yaml";
9292
private static final String WDT_MODEL_FILE_DOMAIN2 = "model-crossdomaintransaction-domain2.yaml";
@@ -346,7 +346,7 @@ private static void buildApplicationsAndDomains() {
346346
@Order(1)
347347
@Test
348348
@DisplayName("Check cross domain transaction works")
349-
public void testCrossDomainTransaction() {
349+
void testCrossDomainTransaction() {
350350

351351
String curlRequest = String.format("curl -v --show-error --noproxy '*' "
352352
+ "http://%s:%s/TxForward/TxForward?urls=t3://%s.%s:7001,t3://%s1.%s:8001,t3://%s1.%s:8001,t3://%s2.%s:8001",
@@ -381,7 +381,7 @@ public void testCrossDomainTransaction() {
381381
@Order(2)
382382
@Test
383383
@DisplayName("Check cross domain transaction with TMAfterTLogBeforeCommitExit property commits")
384-
public void testCrossDomainTransactionWithFailInjection() {
384+
void testCrossDomainTransactionWithFailInjection() {
385385

386386
String curlRequest = String.format("curl -v --show-error --noproxy '*' "
387387
+ "http://%s:%s/cdttxservlet/cdttxservlet?namespaces=%s,%s",
@@ -418,7 +418,7 @@ public void testCrossDomainTransactionWithFailInjection() {
418418
@Order(3)
419419
@Test
420420
@DisplayName("Check cross domain transcated MDB communication ")
421-
public void testCrossDomainTranscatedMDB() {
421+
void testCrossDomainTranscatedMDB() {
422422

423423
// No extra header info
424424
assertTrue(checkAppIsActive(K8S_NODEPORT_HOST,domain1AdminServiceNodePort,

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ public void tearDownAll() {
152152
@Order(1)
153153
@DisplayName("Set domainNamespaceSelectionStrategy to Dedicated for the Operator Helm Chart and "
154154
+ "verify that a domain not deployed in operator's namespace doesn't come up")
155-
public void testDedicatedModeDiffNamespace() {
155+
void testDedicatedModeDiffNamespace() {
156156
// install and verify operator
157157
logger.info("Installing and verifying operator");
158158
installAndVerifyOperator(opNamespace, opNamespace + "-sa",
@@ -177,7 +177,7 @@ public void testDedicatedModeDiffNamespace() {
177177
@Order(2)
178178
@DisplayName("Set domainNamespaceSelectionStrategy to Dedicated for the Operator Helm Chart and "
179179
+ "verify that the domain deployed in the operator's namespace comes up")
180-
public void testDedicatedModeSameNamespace() {
180+
void testDedicatedModeSameNamespace() {
181181
// create and verify the domain
182182
logger.info("Creating and verifying model in image domain");
183183
createDomain(domain1Namespace);
@@ -191,7 +191,7 @@ public void testDedicatedModeSameNamespace() {
191191
@Test
192192
@Order(3)
193193
@DisplayName("Scale up cluster-1 in domain1Namespace and verify it succeeds")
194-
public void testDedicatedModeSameNamespaceScale() {
194+
void testDedicatedModeSameNamespaceScale() {
195195
// scale the cluster and check domain can be managed from the operator
196196
int externalRestHttpsPort = getServiceNodePort(opNamespace, "external-weblogic-operator-svc");
197197
logger.info("externalRestHttpsPort {0}", externalRestHttpsPort);
@@ -213,7 +213,7 @@ public void testDedicatedModeSameNamespaceScale() {
213213
@Order(4)
214214
@Disabled("Disable the test because the Operator has permission to overwrite the CRD")
215215
@DisplayName("Create a CRD with a lower than expected version and verify that Operator fails with error")
216-
public void testDedicatedModeNlowerVersionCrd() {
216+
void testDedicatedModeNlowerVersionCrd() {
217217
// delete existing CRD
218218
new Command()
219219
.withParams(new CommandParams()
@@ -251,7 +251,7 @@ public void testDedicatedModeNlowerVersionCrd() {
251251
@Order(5)
252252
@Disabled("Disable the test because the Operator has permission to create the CRD")
253253
@DisplayName("Delete the CRD and verify that Operator fails with error")
254-
public void testDedicatedModeNoCrd() {
254+
void testDedicatedModeNoCrd() {
255255
// delete existing CRD
256256
logger.info("Delete existing CRD");
257257
new Command()

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ void tearDown() {
229229
*/
230230
@Test
231231
@DisplayName("Use Elasticsearch Count API to query logs of level=INFO and verify")
232-
public void testLogLevelSearch() {
232+
void testLogLevelSearch() {
233233
// Verify that number of logs is not zero and failed count is zero
234234
String regex = ".*count\":(\\d+),.*failed\":(\\d+)";
235235
String queryCriteria = "/_count?q=level:INFO";
@@ -245,7 +245,7 @@ public void testLogLevelSearch() {
245245
*/
246246
@Test
247247
@DisplayName("Use Elasticsearch Search APIs to query Operator log info and verify")
248-
public void testOperatorLogSearch() {
248+
void testOperatorLogSearch() {
249249
// Verify that log occurrence for Operator are not empty
250250
String regex = ".*took\":(\\d+),.*hits\":\\{(.+)\\}";
251251
String queryCriteria = "/_search?q=type:weblogic-operator";
@@ -262,7 +262,7 @@ public void testOperatorLogSearch() {
262262
@Disabled("Disabled the test due to JIRA OWLS-83899")
263263
@Test
264264
@DisplayName("Use Elasticsearch Search APIs to query Operator log info and verify")
265-
public void testWebLogicLogSearch() {
265+
void testWebLogicLogSearch() {
266266
// Verify that the admin status of "RUNNING" is found in query return from Elasticsearch repository
267267
verifyServerRunningInSearchResults(adminServerPodName);
268268

@@ -278,7 +278,7 @@ public void testWebLogicLogSearch() {
278278
*/
279279
@Test
280280
@DisplayName("Use Elasticsearch Search APIs to query WebLogic log info in WLS server pod and verify")
281-
public void testWlsLoggingExporter() throws Exception {
281+
void testWlsLoggingExporter() throws Exception {
282282
Map<String, String> wlsMap = verifyLoggingExporterReady(opNamespace, null, WEBLOGIC_INDEX_KEY);
283283
// merge testVarMap and wlsMap
284284
testVarMap.putAll(wlsMap);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ void tearDown() {
228228
*/
229229
@Test
230230
@DisplayName("Use Fluentd to send log information to Elasticsearch and verify")
231-
public void testFluentdQuery() {
231+
void testFluentdQuery() {
232232
// Verify that number of logs is not zero and failed if count is zero
233233
String regex = ".*count\":(\\d+),.*failed\":(\\d+)";
234234
String queryCriteria = "/_count?q=serverName:" + adminServerPodName;

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ public void beforeEach() {
265265
@Order(1)
266266
@Test
267267
@DisplayName("Verify RMI access to WLS through Voyager LoadBalancer")
268-
public void testExternalRmiAccessThruVoyager() {
268+
void testExternalRmiAccessThruVoyager() {
269269

270270
assumeFalse(WEBLOGIC_SLIM, "Skipping RMI Tunnelling Test for slim image");
271271
// Build the standalone JMS Client to send and receive messages
@@ -315,7 +315,7 @@ public void testExternalRmiAccessThruVoyager() {
315315
@Order(2)
316316
@Test
317317
@DisplayName("Verify RMI access to WLS through Traefik LoadBalancer")
318-
public void testExternalRmiAccessThruTraefik() {
318+
void testExternalRmiAccessThruTraefik() {
319319

320320
assumeFalse(WEBLOGIC_SLIM, "Skipping RMI Tunnelling Test for slim image");
321321
// Build the standalone JMS Client to send and receive messages
@@ -371,7 +371,7 @@ public void testExternalRmiAccessThruTraefik() {
371371
@Order(3)
372372
@Test
373373
@DisplayName("Verify RMI access WLS through NGINX LoadBalancer")
374-
public void testExternalRmiAccessThruNginx() {
374+
void testExternalRmiAccessThruNginx() {
375375

376376
assumeFalse(WEBLOGIC_SLIM, "Skipping RMI Tunnelling Test for slim image");
377377
logger.info("Installing Nginx controller using helm");
@@ -435,7 +435,7 @@ public void testExternalRmiAccessThruNginx() {
435435
@Order(4)
436436
@Test
437437
@DisplayName("Verify tls RMI access WLS through Voyager loadBalancer")
438-
public void testExternalRmiAccessThruVoyagerHttpsTunneling() {
438+
void testExternalRmiAccessThruVoyagerHttpsTunneling() {
439439
assumeFalse(WEBLOGIC_SLIM, "Skipping RMI Tunnelling Test for slim image");
440440
// Build the standalone JMS Client to send and receive messages
441441
buildClient();
@@ -479,7 +479,7 @@ public void testExternalRmiAccessThruVoyagerHttpsTunneling() {
479479
@Order(5)
480480
@Test
481481
@DisplayName("Verify tls RMI access WLS through Traefik loadBalancer")
482-
public void testExternalRmiAccessThruTraefikHttpsTunneling() {
482+
void testExternalRmiAccessThruTraefikHttpsTunneling() {
483483

484484
assumeFalse(WEBLOGIC_SLIM, "Skipping RMI Tunnelling Test for slim image");
485485

@@ -530,7 +530,7 @@ public void testExternalRmiAccessThruTraefikHttpsTunneling() {
530530
@Order(6)
531531
@Test
532532
@DisplayName("Verify tls RMI access WLS through NGNIX loadBalancer")
533-
public void testExternalRmiAccessThruNginxHttpsTunneling() {
533+
void testExternalRmiAccessThruNginxHttpsTunneling() {
534534

535535
assumeFalse(WEBLOGIC_SLIM, "Skipping RMI Tunnelling Test for slim image");
536536
logger.info("Installing Nginx controller using helm");

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ public void beforeEach() {
211211
*/
212212
@Test
213213
@DisplayName("Verify RMI access to WLS through NodePort Service")
214-
public void testExternalRmiAccessThruNodePortService() {
214+
void testExternalRmiAccessThruNodePortService() {
215215

216216
assumeFalse(WEBLOGIC_SLIM, "Skipping RMI Tunnelling Test for slim image");
217217
// Build the standalone JMS Client to send and receive messages

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
@DisplayName("Test to a create FMW model in image domain "
6363
+ "with introspect Config Map bigger then 1 Mb and start the domain")
6464
@IntegrationTest
65-
public class ItFmwBigCMMiiDomain {
65+
class ItFmwBigCMMiiDomain {
6666

6767
private static String dbNamespace = null;
6868
private static String opNamespace = null;
@@ -150,7 +150,7 @@ RCUSCHEMAPREFIX, dbNamespace, getNextFreePort(), dbUrl),
150150
*/
151151
@Test
152152
@DisplayName("Create FMW Domain model in image with big introspector CM")
153-
public void testFmwBigCMModelInImage() {
153+
void testFmwBigCMModelInImage() {
154154

155155
// Create the repo secret to pull the image
156156
// this secret is used only for non-kind cluster

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ public static void initAll(@Namespaces(3) List<String> namespaces) {
156156
@ParameterizedTest
157157
@MethodSource("paramProvider")
158158
@DisplayName("Test FMW domain in image sample")
159-
public void testFmwDomainInImageSample(String model) {
159+
void testFmwDomainInImageSample(String model) {
160160
String domainUid = model.split(":")[1];
161161
String script = model.split(":")[0]; // wlst | wdt way of creating domain
162162

0 commit comments

Comments
 (0)