Skip to content

Commit 06c78fb

Browse files
sankarpnsankarpn
committed
Cleanup the debug code and correct the docs
1 parent 0b3144f commit 06c78fb

File tree

5 files changed

+98
-85
lines changed

5 files changed

+98
-85
lines changed

‎integration-tests/src/test/java/oracle/kubernetes/operator/ItSitConfigDomainInImage.java‎

Lines changed: 34 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,16 @@
44

55
package oracle.kubernetes.operator;
66

7+
import static oracle.kubernetes.operator.BaseTest.QUICKTEST;
8+
import static oracle.kubernetes.operator.BaseTest.logger;
9+
10+
import java.util.logging.Level;
711
import org.junit.AfterClass;
12+
import org.junit.Assume;
813
import org.junit.BeforeClass;
914
import org.junit.Test;
1015

11-
/** JUnit test class used for testing configuration override use cases. */
16+
/** JUnit test class used for testing configuration override use cases for Domain In Image. */
1217
public class ItSitConfigDomainInImage extends SitConfig {
1318

1419
/**
@@ -38,7 +43,7 @@ public static void staticUnPrepare() throws Exception {
3843

3944
/**
4045
* This test covers custom configuration override use cases for config.xml for administration
41-
* server.
46+
* server for domain in image WLS servers.
4247
*
4348
* <p>The test checks the overridden config.xml attributes connect-timeout, max-message-size,
4449
* restart-max, JMXCore and ServerLifeCycle debug flags, the T3Channel public address. The
@@ -49,11 +54,16 @@ public static void staticUnPrepare() throws Exception {
4954
*/
5055
@Test
5156
public void testCustomSitConfigOverridesForDomainInImage() throws Exception {
52-
testCustomSitConfigOverridesForDomain();
57+
Assume.assumeFalse(QUICKTEST);
58+
String testMethod = new Object() {}.getClass().getEnclosingMethod().getName();
59+
logTestBegin(testMethod);
60+
testCustomSitConfigOverridesForDomain(testMethod);
61+
logger.log(Level.INFO, "SUCCESS - {0}", testMethod);
5362
}
5463

5564
/**
56-
* This test covers custom configuration override use cases for config.xml for managed server.
65+
* This test covers custom configuration override use cases for config.xml for managed server for
66+
* domain in image WLS servers
5767
*
5868
* <p>The test checks the overridden config.xml server template attribute max-message-size. The
5969
* overridden values are verified against the ServerConfig MBean tree. It does not verifies
@@ -63,7 +73,11 @@ public void testCustomSitConfigOverridesForDomainInImage() throws Exception {
6373
*/
6474
@Test
6575
public void testCustomSitConfigOverridesForDomainMSInImage() throws Exception {
66-
testCustomSitConfigOverridesForDomainMS();
76+
Assume.assumeFalse(QUICKTEST);
77+
String testMethod = new Object() {}.getClass().getEnclosingMethod().getName();
78+
logTestBegin(testMethod);
79+
testCustomSitConfigOverridesForDomainMS(testMethod);
80+
logger.log(Level.INFO, "SUCCESS - {0}", testMethod);
6781
}
6882

6983
/**
@@ -82,7 +96,11 @@ public void testCustomSitConfigOverridesForDomainMSInImage() throws Exception {
8296
*/
8397
@Test
8498
public void testCustomSitConfigOverridesForJdbcInImage() throws Exception {
85-
testCustomSitConfigOverridesForJdbc();
99+
Assume.assumeFalse(QUICKTEST);
100+
String testMethod = new Object() {}.getClass().getEnclosingMethod().getName();
101+
logTestBegin(testMethod);
102+
testCustomSitConfigOverridesForJdbc(testMethod);
103+
logger.log(Level.INFO, "SUCCESS - {0}", testMethod);
86104
}
87105

88106
/**
@@ -97,7 +115,11 @@ public void testCustomSitConfigOverridesForJdbcInImage() throws Exception {
97115
*/
98116
@Test
99117
public void testCustomSitConfigOverridesForJmsInImage() throws Exception {
100-
testCustomSitConfigOverridesForJms();
118+
Assume.assumeFalse(QUICKTEST);
119+
String testMethod = new Object() {}.getClass().getEnclosingMethod().getName();
120+
logTestBegin(testMethod);
121+
testCustomSitConfigOverridesForJms(testMethod);
122+
logger.log(Level.INFO, "SUCCESS - {0}", testMethod);
101123
}
102124

103125
/**
@@ -114,6 +136,10 @@ public void testCustomSitConfigOverridesForJmsInImage() throws Exception {
114136
*/
115137
@Test
116138
public void testCustomSitConfigOverridesForWldfInImage() throws Exception {
117-
testCustomSitConfigOverridesForWldf();
139+
Assume.assumeFalse(QUICKTEST);
140+
String testMethod = new Object() {}.getClass().getEnclosingMethod().getName();
141+
logTestBegin(testMethod);
142+
testCustomSitConfigOverridesForWldf(testMethod);
143+
logger.log(Level.INFO, "SUCCESS - {0}", testMethod);
118144
}
119145
}

‎integration-tests/src/test/java/oracle/kubernetes/operator/ItSitConfigDomainInPV.java‎

Lines changed: 46 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,16 @@
33
// http://oss.oracle.com/licenses/upl.
44
package oracle.kubernetes.operator;
55

6+
import static oracle.kubernetes.operator.BaseTest.QUICKTEST;
7+
import static oracle.kubernetes.operator.BaseTest.logger;
8+
9+
import java.util.logging.Level;
610
import org.junit.AfterClass;
11+
import org.junit.Assume;
712
import org.junit.BeforeClass;
813
import org.junit.Test;
914

10-
/** JUnit test class used for testing configuration override use cases. */
15+
/** JUnit test class used for testing configuration override use cases for domain in pv WLS. */
1116
public class ItSitConfigDomainInPV extends SitConfig {
1217

1318
/**
@@ -48,7 +53,11 @@ public static void staticUnPrepare() throws Exception {
4853
*/
4954
@Test
5055
public void testCustomSitConfigOverridesForDomainInPV() throws Exception {
51-
testCustomSitConfigOverridesForDomain();
56+
Assume.assumeFalse(QUICKTEST);
57+
String testMethod = new Object() {}.getClass().getEnclosingMethod().getName();
58+
logTestBegin(testMethod);
59+
testCustomSitConfigOverridesForDomain(testMethod);
60+
logger.log(Level.INFO, "SUCCESS - {0}", testMethod);
5261
}
5362

5463
/**
@@ -62,7 +71,11 @@ public void testCustomSitConfigOverridesForDomainInPV() throws Exception {
6271
*/
6372
@Test
6473
public void testCustomSitConfigOverridesForDomainMSInPV() throws Exception {
65-
testCustomSitConfigOverridesForDomainMS();
74+
Assume.assumeFalse(QUICKTEST);
75+
String testMethod = new Object() {}.getClass().getEnclosingMethod().getName();
76+
logTestBegin(testMethod);
77+
testCustomSitConfigOverridesForDomainMS(testMethod);
78+
logger.log(Level.INFO, "SUCCESS - {0}", testMethod);
6679
}
6780

6881
/**
@@ -81,7 +94,11 @@ public void testCustomSitConfigOverridesForDomainMSInPV() throws Exception {
8194
*/
8295
@Test
8396
public void testCustomSitConfigOverridesForJdbcInPV() throws Exception {
84-
testCustomSitConfigOverridesForJdbc();
97+
Assume.assumeFalse(QUICKTEST);
98+
String testMethod = new Object() {}.getClass().getEnclosingMethod().getName();
99+
logTestBegin(testMethod);
100+
testCustomSitConfigOverridesForJdbc(testMethod);
101+
logger.log(Level.INFO, "SUCCESS - {0}", testMethod);
85102
}
86103

87104
/**
@@ -96,7 +113,11 @@ public void testCustomSitConfigOverridesForJdbcInPV() throws Exception {
96113
*/
97114
@Test
98115
public void testCustomSitConfigOverridesForJmsInPV() throws Exception {
99-
testCustomSitConfigOverridesForJms();
116+
Assume.assumeFalse(QUICKTEST);
117+
String testMethod = new Object() {}.getClass().getEnclosingMethod().getName();
118+
logTestBegin(testMethod);
119+
testCustomSitConfigOverridesForJms(testMethod);
120+
logger.log(Level.INFO, "SUCCESS - {0}", testMethod);
100121
}
101122

102123
/**
@@ -113,7 +134,11 @@ public void testCustomSitConfigOverridesForJmsInPV() throws Exception {
113134
*/
114135
@Test
115136
public void testCustomSitConfigOverridesForWldfInPV() throws Exception {
116-
testCustomSitConfigOverridesForWldf();
137+
Assume.assumeFalse(QUICKTEST);
138+
String testMethod = new Object() {}.getClass().getEnclosingMethod().getName();
139+
logTestBegin(testMethod);
140+
testCustomSitConfigOverridesForWldf(testMethod);
141+
logger.log(Level.INFO, "SUCCESS - {0}", testMethod);
117142
}
118143

119144
/**
@@ -125,7 +150,11 @@ public void testCustomSitConfigOverridesForWldfInPV() throws Exception {
125150
*/
126151
@Test
127152
public void testConfigOverrideAfterDomainStartupInPV() throws Exception {
128-
testConfigOverrideAfterDomainStartup();
153+
Assume.assumeFalse(QUICKTEST);
154+
String testMethod = new Object() {}.getClass().getEnclosingMethod().getName();
155+
logTestBegin(testMethod);
156+
testConfigOverrideAfterDomainStartup(testMethod);
157+
logger.log(Level.INFO, "SUCCESS - {0}", testMethod);
129158
}
130159

131160
/**
@@ -137,7 +166,11 @@ public void testConfigOverrideAfterDomainStartupInPV() throws Exception {
137166
*/
138167
@Test
139168
public void testOverrideJdbcResourceAfterDomainStartInPV() throws Exception {
140-
testOverrideJdbcResourceAfterDomainStart();
169+
Assume.assumeFalse(QUICKTEST);
170+
String testMethod = new Object() {}.getClass().getEnclosingMethod().getName();
171+
logTestBegin(testMethod);
172+
testOverrideJdbcResourceAfterDomainStart(testMethod);
173+
logger.log(Level.INFO, "SUCCESS - {0}", testMethod);
141174
}
142175

143176
/**
@@ -148,6 +181,10 @@ public void testOverrideJdbcResourceAfterDomainStartInPV() throws Exception {
148181
*/
149182
@Test
150183
public void testOverrideJdbcResourceWithNewSecretInPV() throws Exception {
151-
testOverrideJdbcResourceWithNewSecret();
184+
Assume.assumeFalse(QUICKTEST);
185+
String testMethod = new Object() {}.getClass().getEnclosingMethod().getName();
186+
logTestBegin(testMethod);
187+
testOverrideJdbcResourceWithNewSecret(testMethod);
188+
logger.log(Level.INFO, "SUCCESS - {0}", testMethod);
152189
}
153190
}

0 commit comments

Comments
 (0)