Skip to content

Commit 2ee2ff4

Browse files
committed
Fix the ITSitCOnfigTests
1 parent 8a73003 commit 2ee2ff4

File tree

2 files changed

+38
-3
lines changed

2 files changed

+38
-3
lines changed

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

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,38 @@ public void testCustomSitConfigOverridesForDomain() throws Exception {
135135
+ " "
136136
+ T3CHANNELPORT
137137
+ " weblogic welcome1 "
138+
+ domain.getAdminServerName()
139+
+ testMethod
140+
+ "'");
141+
assertResult(result);
142+
testCompletedSuccessfully = true;
143+
logger.log(Level.INFO, "SUCCESS - {0}", testMethod);
144+
}
145+
146+
/**
147+
* This test covers custom configuration override use cases for config.xml.
148+
*
149+
* <p>The test checks the overridden config.xml attributes connect-timeout, max-message-size,
150+
* restart-max, JMXCore and ServerLifeCycle debug flags, the T3Channel public address. The
151+
* overridden are verified against the ServerConfig MBean tree. It does not verifies whether the
152+
* overridden values are applied to the runtime.
153+
*
154+
* @throws Exception when the assertion fails due to unmatched values
155+
*/
156+
@Test
157+
public void testCustomSitConfigOverridesForDomainMS() throws Exception {
158+
Assume.assumeFalse(QUICKTEST);
159+
boolean testCompletedSuccessfully = false;
160+
String testMethod = new Object() {}.getClass().getEnclosingMethod().getName();
161+
logTestBegin(testMethod);
162+
ExecResult result =
163+
TestUtils.exec(
164+
KUBE_EXEC_CMD
165+
+ " 'sh runSitConfigTests.sh "
166+
+ fqdn
167+
+ " "
168+
+ T3CHANNELPORT
169+
+ " weblogic welcome1 managed-server1"
138170
+ testMethod
139171
+ "'");
140172
assertResult(result);
@@ -170,6 +202,7 @@ public void testCustomSitConfigOverridesForJdbc() throws Exception {
170202
+ " "
171203
+ T3CHANNELPORT
172204
+ " weblogic welcome1 "
205+
+ domain.getAdminServerName()
173206
+ testMethod
174207
+ " "
175208
+ JDBC_URL
@@ -203,6 +236,7 @@ public void testCustomSitConfigOverridesForJms() throws Exception {
203236
+ " "
204237
+ T3CHANNELPORT
205238
+ " weblogic welcome1 "
239+
+ domain.getAdminServerName()
206240
+ testMethod
207241
+ "'");
208242
assertResult(result);
@@ -236,6 +270,7 @@ public void testCustomSitConfigOverridesForWldf() throws Exception {
236270
+ " "
237271
+ T3CHANNELPORT
238272
+ " weblogic welcome1 "
273+
+ domain.getAdminServerName()
239274
+ testMethod
240275
+ "'");
241276
assertResult(result);

integration-tests/src/test/resources/sitconfig/java/SitConfigTests.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,9 @@ public static void main(String args[]) throws Exception {
9393
String adminHost = args[0];
9494
String adminPort = args[1];
9595
String adminUser = args[2];
96-
String adminPassword = args[3];
97-
String testName = args[4];
98-
String serverName = args[5];
96+
String adminPassword = args[3];
97+
String serverName = args[4];
98+
String testName = args[5];
9999

100100
SitConfigTests test =
101101
new SitConfigTests(adminHost, adminPort, adminUser, adminPassword, serverName);

0 commit comments

Comments
 (0)