Skip to content
This repository was archived by the owner on Nov 15, 2022. It is now read-only.

Commit cd28c3b

Browse files
naman223yaminikb
naman223
authored and
yaminikb
committed
NoBug: Enabling disabled test after adding the flag -Ddeployment.resource.va… (#22146)
1 parent 63b01f7 commit cd28c3b

11 files changed

Lines changed: 130 additions & 73 deletions

File tree

‎appserver/tests/appserv-tests/devtests/connector/resultCount.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@
4242
FILE=$APS_HOME/test_resultsValid.xml
4343
echo "input file=$FILE"
4444

45-
TOTAL=380
46-
TOTAL_LITE=380
45+
TOTAL=376
46+
TOTAL_LITE=376
4747

4848
if [ $# -eq 1 ] && [ $1 = "lite" ]
4949
then TOTAL=$TOTAL_LITE

‎appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/build.xml‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
6363
<target name="run-test" depends="build,deploy-war, run-war, undeploy-war, deploy-ear, run-ear, undeploy-ear"/>
6464
-->
65-
<target name="all" depends="build, deploy-ear, setup, run-ear, unsetup, undeploy-ear"/>
65+
<target name="all" depends="build, disable-resource-validation, deploy-ear, setup, run-ear, unsetup, undeploy-ear, enable-resource-validation"/>
6666

6767
<!--
6868
<antcall target="build"/>
@@ -103,7 +103,22 @@
103103
<param name="conpool.name" value="embedded-ra-pool"/>
104104
</antcall>
105105
</target>
106-
<target name="create-resource">
106+
107+
<target name="disable-resource-validation">
108+
<antcall target="create-jvm-options">
109+
<param name="option" value="-Ddeployment.resource.validation=false"/>
110+
</antcall>
111+
<antcall target="restart-server"/>
112+
</target>
113+
114+
<target name="enable-resource-validation">
115+
<antcall target="delete-jvm-options">
116+
<param name="option" value="-Ddeployment.resource.validation=false"/>
117+
</antcall>
118+
<antcall target="restart-server"/>
119+
</target>
120+
121+
<target name="create-resource">
107122
<antcall target="create-connector-resource-common">
108123
<param name="connector.conpool.name" value="embedded-ra-pool"/>
109124
<param name="connector.jndi.name" value="jdbc/ejb-annotation-subclassing"/>

‎appserver/tests/appserv-tests/devtests/connector/v3/build.xml‎

Lines changed: 31 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -244,9 +244,8 @@
244244
<echo message="@@## embeddedConnector1.5 ##@@"/>
245245
<ant dir="../embeddedConnector1.5" target="${connector-target}"/>
246246

247-
<!--Due to Deepak deployment fix -->
248-
<!--echo message="@@## embeddedweb ##@@"/>
249-
<ant dir="embeddedweb" target="${connector-target}"/-->
247+
<echo message="@@## embeddedweb ##@@"/>
248+
<ant dir="embeddedweb" target="${connector-target}"/>
250249

251250
<echo message="@@## mq ##@@"/>
252251
<ant dir="../mq" target="${connector-target}"/>
@@ -260,9 +259,8 @@
260259
<echo message="@@## web2connector (second time) ##@@"/>
261260
<ant dir="../web2connector" target="${connector-target}" />
262261

263-
<!--Due to Deepak deployment fix -->
264-
<!--echo message="@@## nonstringmcfproperties ##@@"/>
265-
<ant dir="nonstringmcfproperties" target="${connector-target}"/-->
262+
<echo message="@@## nonstringmcfproperties ##@@"/>
263+
<ant dir="nonstringmcfproperties" target="${connector-target}"/>
266264

267265
<echo message="@@## nonstringraproperties ##@@"/>
268266
<ant dir="../nonstringraproperties" target="${connector-target}" />
@@ -290,18 +288,23 @@
290288

291289
<echo message="@@## redeployRar ##@@"/>
292290
<ant dir="redeployRar" target="${connector-target}"/>
293-
</target>
291+
292+
<echo message="@@## annotation-embeddedweb ##@@"/>
293+
<ant dir="annotation-embeddedweb" target="${connector-target}"/>
294+
295+
<echo message="@@## installed libraries embedded rar EXTENSION_LIST ##@@"/>
296+
<ant dir="installed-libraries-embedded" target="all-ext"/>
297+
298+
<echo message="@@## defaultConnectorResource ##@@"/>
299+
<ant dir="defaultConnectorResource" target="${connector-target}"/>
300+
</target>
294301

295302
<target name="connector_group_2">
296303
<echo message="************ Starting connector_group_2 ************"/>
297304
<echo message="@@## force-deploy-rar ##@@"/>
298305
<ant dir="force-deploy-rar" target="${connector-target}"/>
299306

300-
<!--Due to Deepak deployment fix -->
301-
<!--echo message="@@## annotation-embeddedweb ##@@"/>
302-
<ant dir="annotation-embeddedweb" target="${connector-target}"/-->
303-
304-
<echo message="@@## built-in-custom-resources ##@@"/>
307+
<echo message="@@## built-in-custom-resources ##@@"/>
305308
<ant dir="built-in-custom-resources" target="${connector-target}"/>
306309

307310
<echo message="@@## datasource-definition##@@"/>
@@ -338,12 +341,7 @@
338341
<echo message="@@## installed libraries (--libraries) ##@@"/>
339342
<ant dir="installed-libraries" target="all--libraries"/>
340343

341-
<!--Due to Deepak deployment fix -->
342-
<!--echo message="@@## installed libraries embedded rar EXTENSION_LIST ##@@"/>
343-
<ant dir="installed-libraries-embedded" target="all-ext"/-->
344-
345-
<echo message="************ Starting connector_group_8 ************"/>
346-
<echo message="@@## security-map-web#@@"/>
344+
<echo message="@@## security-map-web#@@"/>
347345
<ant dir="securitymapweb" target="all"/>
348346

349347
<echo message="@@## rar-accessibility ##@@"/>
@@ -355,20 +353,12 @@
355353
<echo message="@@## osgi-resources-test ##@@"/>
356354
<ant dir="osgi-resources-test" target="all"/>
357355

358-
<echo message="************ Starting connector_group_9 ************"/>
359-
<!--echo message="@@## installed libraries embedded rar (-libraries) ##@@"/>
360-
<ant dir="installed-libraries-embedded" target="all"/-->
361-
362-
<echo message="@@## beanvalidation-simple ##@@"/>
356+
<echo message="@@## beanvalidation-simple ##@@"/>
363357
<ant dir="beanvalidation-simple" target="all"/>
364358

365359
<echo message="@@## beanvalidation-simple ##@@"/>
366360
<ant dir="beanvalidation-simple" target="embedded-all"/>
367361

368-
<!--Due to Deepak deployment fix -->
369-
<!--echo message="@@## defaultConnectorResource ##@@"/>
370-
<ant dir="defaultConnectorResource" target="${connector-target}"/-->
371-
372362
<!--echo message="@@## defaultConnectorResource-standalone-rar ##@@"/>
373363
<ant dir="defaultConnectorResource-standalone-rar" target="${connector-target}"/-->
374364

@@ -459,7 +449,7 @@
459449
<ant dir="redeployRar" target="${connector-target}"/>
460450

461451
<echo message="@@## connector1.6 - with mappings ##@@"/>
462-
<ant dir="connector1.6" target="all-with-mappings"/>
452+
<ant dir="connector1.6" target="${connector-target}"/>
463453

464454
<echo message="@@## Annotated Connector1.5 ##@@"/>
465455
<ant dir="annotation-connector1.5" target="${connector-target}"/>
@@ -498,34 +488,31 @@
498488
<ant dir="jms-destination-definition" target="${connector-target}"/>
499489

500490
<echo message="@@## installed libraries EXTENSION_LIST ##@@"/>
501-
<ant dir="installed-libraries" target="all-ext"/>
491+
<ant dir="installed-libraries" target="${connector-target}"/>
502492

503493
<echo message="@@## installed libraries (--libraries) ##@@"/>
504-
<ant dir="installed-libraries" target="all--libraries"/>
494+
<ant dir="installed-libraries" target="${connector-target}"/>
505495

506496
<echo message="@@## installed libraries embedded rar (--libraries) ##@@"/>
507-
<ant dir="installed-libraries-embedded" target="all"/>
497+
<ant dir="installed-libraries-embedded" target="${connector-target}"/>
508498

509499
<echo message="@@## installed libraries embedded rar EXTENSION_LIST ##@@"/>
510-
<ant dir="installed-libraries-embedded" target="all-ext"/>
500+
<ant dir="installed-libraries-embedded" target="${connector-target}"/>
511501

512502
<echo message="@@## beanvalidation-simple ##@@"/>
513-
<ant dir="beanvalidation-simple" target="all"/>
503+
<ant dir="beanvalidation-simple" target="${connector-target}"/>
514504

515505
<echo message="@@## beanvalidation-simple ##@@"/>
516-
<ant dir="beanvalidation-simple" target="embedded-all"/>
506+
<ant dir="beanvalidation-simple" target="${connector-target}"/>
517507

518508
<echo message="@@## security-map-web#@@"/>
519-
<ant dir="securitymapweb" target="all"/>
509+
<ant dir="securitymapweb" target="${connector-target}"/>
520510

521511
<echo message="@@## rar-accessibility ##@@"/>
522-
<ant dir="rar-accessibility" target="all"/>
523-
524-
<echo message="@@## glassfish-resources-xml tests ##@@"/>
525-
<antcall target="glassfish-resources-xml-tests"/>
512+
<ant dir="rar-accessibility" target="${connector-target}"/>
526513

527514
<echo message="@@## osgi-resources-test ##@@"/>
528-
<ant dir="osgi-resources-test" target="all"/>
515+
<ant dir="osgi-resources-test" target="${connector-target}"/>
529516

530517
<antcall target="report"/>
531518
<record name="connector.output" action="stop"/>
@@ -569,21 +556,18 @@
569556
<echo message="@@## multiple-resources.xml ##@@"/>
570557
<ant dir="multiple-resources.xml" target="all-with-mappings"/>
571558

572-
<!--Due to Deepak deployment fix -->
573-
<!--echo message="@@## multiple-resources.xml-1 ##@@"/>
574-
<ant dir="multiple-resources-app-module-scoped" target="all-with-mappings"/-->
559+
<echo message="@@## multiple-resources.xml-1 ##@@"/>
560+
<ant dir="multiple-resources-app-module-scoped" target="all-with-mappings"/>
575561

576-
<!--Due to Deepak deployment fix -->
577-
<!--echo message="@@## connector1.5-resourcesxml-module-scope ##@@"/>
578-
<ant dir="../connector1.5-resourcesxml-module-scope" target="all"/-->
562+
<echo message="@@## connector1.5-resourcesxml-module-scope ##@@"/>
563+
<ant dir="../connector1.5-resourcesxml-module-scope" target="all"/>
579564

580565
<echo message="jpa-tx_propagation-resources-xml##@@"/>
581566
<ant dir="jpa-tx-propagation-gf-resources-xml" target="all"/>
582567

583568
<echo message="@@## ejb30mdb-resources-xml ##@@"/>
584569
<ant dir="./../mq/ejb30mdb-resources-xml" target="all"/>
585570

586-
<!--Due to Deepak deployment fix -->
587571
<!--echo message="@@## markconnectionasbad.xa.resources-xml ##@@"/>
588572
<ant dir="./../markconnectionasbad.xa.resources-xml" target="all"/-->
589573

‎appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/app/build.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,8 @@
140140

141141
<target name="undeploy" depends="init-common">
142142
<antcall target="undeploy-common">
143-
<param name="deployedapp.name" value="generic-embeddedApp"/>
143+
<param name="extra-params" value="--cascade=true"/>
144+
<param name="deployedapp.name" value="generic-embeddedApp"/>
144145
</antcall>
145146
</target>
146147

‎appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/build.xml‎

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
&testcommon;
5656
&testproperties;
5757

58-
<target name="all" depends="init-common, build, setup, runtest, unset"/>
58+
<target name="all" depends="init-common, build, disable-resource-validation, setup, runtest, unset, enable-resource-validation"/>
5959
<target name="build" depends="init-common">
6060
<ant dir="ra" inheritAll="false" target="all"/>
6161
<ant dir="app" inheritAll="false" target="all"/>
@@ -72,13 +72,28 @@
7272
<ant dir="." inheritAll="false" target="restart"/>
7373
</target>
7474

75-
<!--
76-
<target name="runtest" depends="init-common">
77-
<antcall target="runclient-common">
78-
<param name="appname" value="generic-embedded" />
75+
<target name="disable-resource-validation">
76+
<antcall target="create-jvm-options">
77+
<param name="option" value="-Ddeployment.resource.validation=false"/>
7978
</antcall>
79+
<antcall target="restart-server"/>
8080
</target>
81-
-->
81+
82+
<target name="enable-resource-validation">
83+
<antcall target="delete-jvm-options">
84+
<param name="option" value="-Ddeployment.resource.validation=false"/>
85+
</antcall>
86+
<antcall target="restart-server"/>
87+
</target>
88+
89+
90+
<!--
91+
<target name="runtest" depends="init-common">
92+
<antcall target="runclient-common">
93+
<param name="appname" value="generic-embedded" />
94+
</antcall>
95+
</target>
96+
-->
8297

8398
<target name="runtest" depends="init-common">
8499

‎appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/build.xml‎

Lines changed: 25 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
6363
<target name="run-test" depends="build,deploy-war, run-war, undeploy-war, deploy-ear, run-ear, undeploy-ear"/>
6464
-->
65-
<target name="all" depends="build, deploy-ear, setup, run-ear, unsetup, undeploy-ear"/>
65+
<target name="all" depends="build, disable-resource-validation, deploy-ear, setup, run-ear, unsetup, undeploy-ear, enable-resource-validation"/>
6666

6767
<!--
6868
<antcall target="build"/>
@@ -83,22 +83,36 @@
8383
</target>
8484

8585
<target name="setup">
86-
<antcall target="execute-sql-connector">
87-
<param name="sql.file" value="sql/simpleBank.sql"/>
88-
</antcall>
89-
<antcall target="create-pool"/>
90-
<antcall target="create-resource"/>
91-
<antcall target="create-admin-object"/>
92-
86+
<antcall target="execute-sql-connector">
87+
<param name="sql.file" value="sql/simpleBank.sql"/>
88+
</antcall>
89+
<antcall target="create-pool"/>
90+
<antcall target="create-resource"/>
91+
<antcall target="create-admin-object"/>
9392
</target>
93+
94+
<target name="disable-resource-validation">
95+
<antcall target="create-jvm-options">
96+
<param name="option" value="-Ddeployment.resource.validation=false"/>
97+
</antcall>
98+
<antcall target="restart-server"/>
99+
</target>
100+
101+
<target name="enable-resource-validation">
102+
<antcall target="delete-jvm-options">
103+
<param name="option" value="-Ddeployment.resource.validation=false"/>
104+
</antcall>
105+
<antcall target="restart-server"/>
106+
</target>
107+
94108
<target name="create-pool">
95-
<antcall target="create-connector-connpool-common">
109+
<antcall target="create-connector-connpool-common">
96110
<param name="ra.name" value="${appname}App#jdbcra"/>
97111
<param name="extra-params" value="--matchconnections=false"/>
98112
<param name="connection.defname" value="javax.sql.DataSource"/>
99113
<param name="connector.conpool.name" value="embedded-ra-pool"/>
100-
</antcall>
101-
<antcall target="set-oracle-props">
114+
</antcall>
115+
<antcall target="set-oracle-props">
102116
<param name="pool.type" value="connector"/>
103117
<param name="conpool.name" value="embedded-ra-pool"/>
104118
</antcall>

‎appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/build.xml‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@
6262
6363
<target name="run-test" depends="build,deploy-war, run-war, undeploy-war, deploy-ear, run-ear, undeploy-ear"/>
6464
-->
65-
<target name="all" depends="clean, build-ra, build, deploy-ear, setup, unsetup, undeploy-ear"/>
66-
<target name="all-ext" depends="clean, build-ra-with-extension, build, deploy-ear, setup, unsetup, undeploy-ear"/>
65+
<target name="all" depends="clean, disable-resource-validation, build-ra, build, deploy-ear, setup, run-ear, unsetup, undeploy-ear, enable-resource-validation"/>
66+
<target name="all-ext" depends="clean, disable-resource-validation, build-ra-with-extension, build, deploy-ear, setup, run-ear, unsetup, undeploy-ear, enable-resource-validation"/>
6767

6868
<!--
6969
<antcall target="build"/>
@@ -110,6 +110,20 @@
110110
</antcall>
111111
</target>
112112

113+
<target name="disable-resource-validation">
114+
<antcall target="create-jvm-options">
115+
<param name="option" value="-Ddeployment.resource.validation=false"/>
116+
</antcall>
117+
<antcall target="restart-server"/>
118+
</target>
119+
120+
<target name="enable-resource-validation">
121+
<antcall target="delete-jvm-options">
122+
<param name="option" value="-Ddeployment.resource.validation=false"/>
123+
</antcall>
124+
<antcall target="restart-server"/>
125+
</target>
126+
113127

114128
<target name="create-admin-object" depends="init-common">
115129
<antcall target="asadmin-common">

‎appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/publish/lib/jdbc.jar‎

-29.8 KB
Binary file not shown.

‎appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/publish/lib/jdbcra.rar‎

-4.17 KB
Binary file not shown.

‎appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/build.xml‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
6262
<target name="run-test" depends="build,deploy-war, run-war, undeploy-war, deploy-ear, run-ear, undeploy-ear"/>
6363
-->
64-
<target name="all" depends="build, deploy-ear, setup, run-ear, unsetup, undeploy-ear"/>
64+
<target name="all" depends="build, disable-resource-validation, deploy-ear, setup, run-ear, unsetup, undeploy-ear, enable-resource-validation"/>
6565

6666
<!--
6767
<antcall target="build"/>
@@ -108,6 +108,20 @@
108108
</antcall>
109109
</target>
110110

111+
<target name="disable-resource-validation">
112+
<antcall target="create-jvm-options">
113+
<param name="option" value="-Ddeployment.resource.validation=false"/>
114+
</antcall>
115+
<antcall target="restart-server"/>
116+
</target>
117+
118+
<target name="enable-resource-validation">
119+
<antcall target="delete-jvm-options">
120+
<param name="option" value="-Ddeployment.resource.validation=false"/>
121+
</antcall>
122+
<antcall target="restart-server"/>
123+
</target>
124+
111125

112126
<target name="create-admin-object" depends="init-common">
113127
<!--<property file="../config/oracle.properties"/>-->

0 commit comments

Comments
 (0)