Skip to content

Commit 8a029d0

Browse files
rjeberhardrjeberhard
authored
Merge pull request #615 from oracle/introspect-test-update
Introspector mock/unit test update
2 parents 358e70a + f05080b commit 8a029d0

File tree

10 files changed

+253
-93
lines changed

10 files changed

+253
-93
lines changed

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,8 +138,7 @@ public void test1CreateFirstOperatorAndDomain() throws Exception {
138138
if (!SMOKETEST) domain1.testWlsLivenessProbe();
139139
testCompletedSuccessfully = true;
140140
} finally {
141-
142-
if (domain1 != null && (JENKINS || testCompletedSuccessfully))
141+
if (domain1 != null && !SMOKETEST && (JENKINS || testCompletedSuccessfully))
143142
domain1.shutdownUsingServerStartPolicy();
144143
}
145144

‎src/integration-tests/introspector/checkBeans.input‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎src/integration-tests/introspector/checkBeans.inputt‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
/Servers/${ADMIN_NAME},ListenAddress,,${DOMAIN_UID}-${ADMIN_NAME}
2+
/Servers/${ADMIN_NAME}/Log/${ADMIN_NAME},FileName,logs/${ADMIN_NAME}.log,/shared/logs/${ADMIN_NAME}.log
3+
4+
/Servers/${ADMIN_NAME}/NetworkAccessPoints/T3Channel1,ListenAddress,unresolvable-dns-name,${DOMAIN_UID}-${ADMIN_NAME}
5+
/Servers/${ADMIN_NAME}/NetworkAccessPoints/T3Channel2,ListenAddress,junk,${DOMAIN_UID}-${ADMIN_NAME}
6+
/Servers/${ADMIN_NAME}/NetworkAccessPoints/T3Channel3,ListenAddress,,${DOMAIN_UID}-${ADMIN_NAME}
7+
8+
/Servers/${ADMIN_NAME}/NetworkAccessPoints/T3Channel1,PublicAddress,unresolvable-dns-name,${TEST_HOST}
9+
/Servers/${ADMIN_NAME}/NetworkAccessPoints/T3Channel2,PublicAddress,junk,${TEST_HOST}
10+
/Servers/${ADMIN_NAME}/NetworkAccessPoints/T3Channel3,PublicAddress,,${TEST_HOST}
11+
12+
/Servers/${ADMIN_NAME}/NetworkAccessPoints/T3Channel1,PublicPort,22222,40012
13+
/Servers/${ADMIN_NAME}/NetworkAccessPoints/T3Channel2,PublicPort,22222,40013
14+
/Servers/${ADMIN_NAME}/NetworkAccessPoints/T3Channel3,PublicPort,30014,40014
15+
16+
/Servers/${ADMIN_NAME},MaxMessageSize,999999,78787878
17+
/Servers/standalone1,MaxMessageSize,7777777,1111111
18+
/Servers/standalone2,MaxMessageSize,10000000,2222222
19+
20+
/JDBCSystemResources/testDS/JDBCResource/testDS/JDBCDriverParams/testDS,Url,jdbc:oracle:thin:@myoriginalhostname:1521:myoriginalsid,jdbc:oracle:thin:@mynewhost:1521:mynewsid

‎src/integration-tests/introspector/checkBeans.py‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ def addError(err):
9595
overriddenExpected=words[3]
9696

9797
print(
98-
"Info: Checking bean_path='" + bean_path + "'"
98+
"Info: Checking line#=" + str(line_no) + " bean_path='" + bean_path + "'"
9999
+ " attr='" + attr + "'"
100100
+ " originalExpected='" + originalExpected + "'"
101101
+ " overriddenExpected='" + overriddenExpected + "'"
@@ -107,11 +107,10 @@ def addError(err):
107107
serverConfig()
108108
cd(bean_path)
109109
overriddenActual=str(get(attr))
110-
111-
print("Info: originalActual='" + originalActual + "'")
112-
print("Info: overriddenActual='" + overriddenActual + "'")
110+
checkStatus='SUCCESS'
113111

114112
if originalExpected != '*' and originalActual != originalExpected:
113+
checkStatus='FAILED'
115114
addError(
116115
"Error: got '" + originalActual + "'"
117116
+ " but expected value '" + originalExpected + "'"
@@ -120,12 +119,20 @@ def addError(err):
120119
)
121120

122121
if overriddenActual != overriddenExpected:
122+
checkStatus='FAILED'
123123
addError(
124124
"Error: got '" + overriddenActual + "'"
125125
+ " but expected value '" + overriddenExpected + "'"
126126
+ " for bean_path=serverConfig/" + bean_path
127127
+ " attr='" + attr + "'. "
128128
)
129+
130+
print(
131+
"Info: Checked line#=" + str(line_no) + " status=" + checkStatus + " bean_path='" + bean_path + "'"
132+
+ " attr='" + attr + "'"
133+
+ " originalExpected/Actual='" + originalExpected + "'/'" + originalActual + "'"
134+
+ " overriddenExpected/Actual='" + overriddenExpected + "'/'" + overriddenActual + "'"
135+
)
129136
file.close()
130137

131138
if len(errors) > 0:

‎src/integration-tests/introspector/createDomain.pyt‎

Lines changed: 50 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -41,31 +41,70 @@ setOption('DomainName', '${DOMAIN_NAME}')
4141
# Configure the Administration Server
4242
# ===================================
4343
cd('/Servers/AdminServer')
44-
#set('ListenAddress', '${DOMAIN_UID}-${ADMIN_NAME}')
45-
#set('ListenAddress', 'invalid-${DOMAIN_UID}-${ADMIN_NAME}')
44+
#set('ListenAddress', '${DOMAIN_UID}-${ADMIN_NAME}') # what override should set the value too
45+
#set('ListenAddress', 'unresolvable-dns-name') # an invalid value, unesolvable as a DNS name
46+
#set('ListenAddress', 'junk') # an invalid value, unesolvable as a DNS name
4647
set('ListenPort', ${ADMIN_PORT})
4748
set('Name', '${ADMIN_NAME}')
4849

49-
create('T3Channel', 'NetworkAccessPoint')
50-
cd('/Servers/${ADMIN_NAME}/NetworkAccessPoints/T3Channel')
51-
set('PublicPort', ${T3_CHANNEL_PORT})
52-
set('PublicAddress', '${T3_PUBLIC_ADDRESS}')
53-
#set('ListenAddress', '${DOMAIN_UID}-${ADMIN_NAME}')
54-
#set('ListenAddress', 'invalid-${DOMAIN_UID}-${ADMIN_NAME}')
55-
set('ListenPort', ${T3_CHANNEL_PORT})
50+
cd('/Servers/${ADMIN_NAME}')
51+
set('MaxMessageSize',999999)
52+
create('T3Channel1', 'NetworkAccessPoint')
53+
cd('/Servers/${ADMIN_NAME}/NetworkAccessPoints/T3Channel1')
54+
set('ListenAddress', 'unresolvable-dns-name') #an invalid value, and an unresolvable DNS name
55+
set('ListenPort', ${T3CHANNEL1_PORT})
56+
set('PublicPort', 22222)
57+
set('PublicAddress', 'unresolvable-dns-name') #an invalid value, and an unresolvable DNS name
58+
59+
cd('/Servers/${ADMIN_NAME}')
60+
create('T3Channel2', 'NetworkAccessPoint')
61+
cd('/Servers/${ADMIN_NAME}/NetworkAccessPoints/T3Channel2')
62+
set('ListenAddress', 'junk') #an invalid value, but a resolvable DNS name
63+
set('ListenPort', ${T3CHANNEL2_PORT})
64+
set('PublicPort', 22222)
65+
set('PublicAddress', 'junk') #an invalid value, but a resolvable DNS name
66+
67+
cd('/Servers/${ADMIN_NAME}')
68+
create('T3Channel3', 'NetworkAccessPoint')
69+
cd('/Servers/${ADMIN_NAME}/NetworkAccessPoints/T3Channel3')
70+
#set('ListenAddress', 'junk') #not setting this value at all, commented out on purpose
71+
set('ListenPort', ${T3CHANNEL3_PORT})
72+
#set('PublicPort', 40014) #not setting this value at all, commented out on purpose
73+
#set('PublicAddress', 'junk') #not setting this value at all, commented out on purpose
5674

5775
#cd('/Servers/${ADMIN_NAME}')
5876
#create('${ADMIN_NAME}', 'Log')
5977
#cd('/Servers/${ADMIN_NAME}/Log/${ADMIN_NAME}')
6078
#set('FileName', '${LOG_HOME}/${ADMIN_NAME}.log')
6179

80+
6281
# Set the admin user's username and password
6382
# ==========================================
6483
# Password required - otherwise script will fail.
6584
cd('/Security/${DOMAIN_NAME}/User/weblogic')
6685
cmo.setName(admin_username)
6786
cmo.setPassword(admin_password)
6887

88+
89+
# Configure a couple of non-clustered managed servers
90+
# ==========================================
91+
cd('/')
92+
mname='standalone1'
93+
create(mname, 'Server')
94+
cd('/Servers/%s/' % mname )
95+
# set('ListenAddress', '${DOMAIN_UID}-%s' % mname)
96+
set('ListenPort', 6123)
97+
set('MaxMessageSize', 7777777)
98+
99+
cd('/')
100+
mname='standalone2'
101+
create(mname, 'Server')
102+
cd('/Servers/%s/' % mname )
103+
# set('ListenAddress', '${DOMAIN_UID}-%s' % mname)
104+
set('ListenPort', 6124)
105+
# set('MaxMessageSize', 7777777) # deliberately unset, so should be at the default of 10000000
106+
107+
69108
# Write the domain and close the domain template
70109
# ==============================================
71110
setOption('OverwriteDomain', 'true')
@@ -110,6 +149,8 @@ def createDataSource(dsName,dsJNDI,dsHost,dsSID,dsTarget):
110149
create('testJdbcConnectionPoolParams','JDBCConnectionPoolParams')
111150
cd('JDBCConnectionPoolParams/NO_NAME_0')
112151
set('TestTableName','SQL SELECT 1 FROM DUAL')
152+
set('InitialCapacity', 0)
153+
set('MinCapacity', 0)
113154

114155
createDataSource('testDS','testDS','myoriginalhostname','myoriginalsid','${ADMIN_NAME}')
115156

0 commit comments

Comments
 (0)