Skip to content

Commit febfb13

Browse files
committed
uncommented all the tests
1 parent 09c3f96 commit febfb13

File tree

2 files changed

+10
-15
lines changed

2 files changed

+10
-15
lines changed

integration-tests/src/test/java/oracle/kubernetes/operator/BaseTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// Copyright 2018, Oracle Corporation and/or its affiliates. All rights reserved.
22
// Licensed under the Universal Permissive License v 1.0 as shown at
33
// http://oss.oracle.com/licenses/upl.
4+
45
package oracle.kubernetes.operator;
56

67
import java.nio.file.Files;
@@ -24,7 +25,6 @@
2425
* extend this class.
2526
*/
2627
public class BaseTest {
27-
2828
public static final Logger logger = Logger.getLogger("OperatorIT", "OperatorIT");
2929
public static final String TESTWEBAPP = "testwebapp";
3030

@@ -230,7 +230,6 @@ public void testAdminT3Channel(Domain domain) throws Exception {
230230
if (domainMap.containsKey("domainHomeImageBase")) {
231231
if (domainMap.get("initialManagedServerReplicas") != null
232232
&& ((Integer) domainMap.get("initialManagedServerReplicas")).intValue() >= 1) {
233-
234233
result =
235234
ExecCommand.exec(
236235
"kubectl logs "

integration-tests/src/test/java/oracle/kubernetes/operator/ITOperator.java

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,7 @@ public static void staticUnPrepare() throws Exception {
9090
logger.info("+++++++++++++++++++++++++++++++++---------------------------------+");
9191
logger.info("BEGIN");
9292
logger.info("Run once, release cluster lease");
93-
9493
tearDown();
95-
9694
logger.info("SUCCESS");
9795
}
9896

@@ -125,9 +123,7 @@ public void testDomainOnPVUsingWLST() throws Exception {
125123
domain.verifyDomainCreated();
126124
testBasicUseCases(domain);
127125
testAdvancedUseCasesForADomain(operator1, domain);
128-
129126
if (!SMOKETEST) domain.testWlsLivenessProbe();
130-
131127
testCompletedSuccessfully = true;
132128
} finally {
133129
if (domain != null && !SMOKETEST && (JENKINS || testCompletedSuccessfully))
@@ -147,7 +143,7 @@ public void testDomainOnPVUsingWLST() throws Exception {
147143
*
148144
* @throws Exception
149145
*/
150-
// @Test
146+
@Test
151147
public void testDomainOnPVUsingWDT() throws Exception {
152148
Assume.assumeFalse(QUICKTEST);
153149
String testMethodName = new Object() {}.getClass().getEnclosingMethod().getName();
@@ -191,7 +187,7 @@ public void testDomainOnPVUsingWDT() throws Exception {
191187
*
192188
* @throws Exception
193189
*/
194-
// @Test
190+
@Test
195191
public void testTwoDomainsManagedByTwoOperators() throws Exception {
196192
Assume.assumeFalse(QUICKTEST);
197193
String testMethodName = new Object() {}.getClass().getEnclosingMethod().getName();
@@ -272,7 +268,7 @@ public void testTwoDomainsManagedByTwoOperators() throws Exception {
272268
*
273269
* @throws Exception
274270
*/
275-
// @Test
271+
@Test
276272
public void testCreateDomainWithStartPolicyAdminOnly() throws Exception {
277273
Assume.assumeFalse(QUICKTEST);
278274
String testMethodName = new Object() {}.getClass().getEnclosingMethod().getName();
@@ -305,7 +301,7 @@ public void testCreateDomainWithStartPolicyAdminOnly() throws Exception {
305301
*
306302
* @throws Exception
307303
*/
308-
// @Test
304+
@Test
309305
public void testCreateDomainPVReclaimPolicyRecycle() throws Exception {
310306
Assume.assumeFalse(QUICKTEST);
311307
String testMethodName = new Object() {}.getClass().getEnclosingMethod().getName();
@@ -338,7 +334,7 @@ public void testCreateDomainPVReclaimPolicyRecycle() throws Exception {
338334
*
339335
* @throws Exception
340336
*/
341-
// @Test
337+
@Test
342338
public void testCreateDomainWithDefaultValuesInSampleInputs() throws Exception {
343339
Assume.assumeFalse(QUICKTEST);
344340
String testMethodName = new Object() {}.getClass().getEnclosingMethod().getName();
@@ -429,7 +425,7 @@ public void testAutoAndCustomSitConfigOverrides() throws Exception {
429425
*
430426
* @throws Exception
431427
*/
432-
// @Test
428+
@Test
433429
public void testOperatorRESTIdentityBackwardCompatibility() throws Exception {
434430
Assume.assumeFalse(QUICKTEST);
435431
String testMethodName = new Object() {}.getClass().getEnclosingMethod().getName();
@@ -451,7 +447,7 @@ public void testOperatorRESTIdentityBackwardCompatibility() throws Exception {
451447
*
452448
* @throws Exception
453449
*/
454-
// @Test
450+
@Test
455451
public void testOperatorRESTUsingCertificateChain() throws Exception {
456452
Assume.assumeFalse(QUICKTEST);
457453

@@ -471,7 +467,7 @@ public void testOperatorRESTUsingCertificateChain() throws Exception {
471467
*
472468
* @throws Exception
473469
*/
474-
// @Test
470+
@Test
475471
public void testDomainInImageUsingWLST() throws Exception {
476472
Assume.assumeFalse(QUICKTEST);
477473
String testMethodName = new Object() {}.getClass().getEnclosingMethod().getName();
@@ -503,7 +499,7 @@ public void testDomainInImageUsingWLST() throws Exception {
503499
*
504500
* @throws Exception
505501
*/
506-
// @Test
502+
@Test
507503
public void testDomainInImageUsingWDT() throws Exception {
508504
Assume.assumeFalse(QUICKTEST);
509505
String testMethodName = new Object() {}.getClass().getEnclosingMethod().getName();

0 commit comments

Comments
 (0)