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

Commit 53a19de

Browse files
ankathuryaminikb
authored andcommitted
Ql fixes (#21742)
* changing name of test suite in order to remove conflict * added modified console summary in quicklook_summary.txt * added separate target for web distribution for quicklook_summary * called quicklook-summary_wd for web distribution targets
1 parent a64ae97 commit 53a19de

File tree

1 file changed

+44
-3
lines changed

1 file changed

+44
-3
lines changed

main/appserver/tests/quicklook/build.xml

Lines changed: 44 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989
<antcall target="runtest">
9090
<param name="testng.xml" value="testng/testng_wd.xml"/> </antcall>
9191
<antcall target="undeploy"/>
92-
<antcall target="quicklook-summary"/>
92+
<antcall target="quicklook-summary_wd"/>
9393
<antcall target="stop-server"/>
9494
<antcall target="stop-derby"/>
9595
<copy file="test-output/emailable-report.html" tofile="test-output/QL-WP-report.html"/>
@@ -109,7 +109,7 @@
109109
<antcall target="runtest">
110110
<param name="testng.xml" value="testng/testng_wd.xml"/> </antcall>
111111
<antcall target="undeploy"/>
112-
<antcall target="quicklook-summary"/>
112+
<antcall target="quicklook-summary_wd"/>
113113

114114
<antcall target="remove-quicklook-policy-grants" />
115115
<antcall target="stop_server_with_security_manager_enabled" />
@@ -505,7 +505,7 @@
505505
</loadfile>
506506
<echo message="${testng_output}"/>
507507
</target>
508-
508+
<!-- added few messages in order to show testng summary of wsit related tests along with final summary as wsit tests are ran seperately as a workaround for GLASSFISH-21672 -->
509509
<target name="quicklook-summary">
510510
<tstamp>
511511
<format property="end.timestamp" pattern="EE MM/dd/yyyy HH:mm:ss zz" />
@@ -518,13 +518,54 @@
518518
<replacestring from="[testng]" to=""/>
519519
</tokenfilter>
520520
</filterchain>
521+
</loadfile>
522+
<loadfile srcfile="wsit/JaxwsFromWsdl/wsit1run.output" property="testng1_output">
523+
<filterchain>
524+
<tailfilter lines="4" skip="1"/>
525+
<tokenfilter>
526+
<replacestring from="[testng]" to=""/>
527+
<replacestring from="QuickLookTests" to="JaxwsFromWsdl Tests"/>
528+
</tokenfilter>
529+
</filterchain>
530+
</loadfile>
531+
<loadfile srcfile="wsit/jsr109tester/wsit2run.output" property="testng2_output">
532+
<filterchain>
533+
<tailfilter lines="4" skip="1"/>
534+
<tokenfilter>
535+
<replacestring from="[testng]" to=""/>
536+
<replacestring from="QuickLookTests" to=" Jsr109tester Tests"/>
537+
</tokenfilter>
538+
</filterchain>
521539
</loadfile>
522540
<echo file="quicklook_summary.txt" append="true" message="${testng_output}"/>
541+
542+
<echo file="quicklook_summary.txt" append="true" message="${testng1_output}"/>
543+
544+
<echo file="quicklook_summary.txt" append="true" message="${testng2_output}"/>
523545
<antcall target="build-version"/>
524546
<available file="test-output/emailable-report.html" property="report.present"/>
525547
<antcall target="quicklook-report"/>
526548
<delete file="version.output"/>
527549
</target>
550+
<target name="quicklook-summary_wd">
551+
<tstamp>
552+
<format property="end.timestamp" pattern="EE MM/dd/yyyy HH:mm:ss zz" />
553+
</tstamp>
554+
<echo file="quicklook_summary.txt" message=" Test completed: ${end.timestamp} ${line.separator}" />
555+
<loadfile srcfile="runtestng.output" property="testng_output">
556+
<filterchain>
557+
<tailfilter lines="4" skip="1"/>
558+
<tokenfilter>
559+
<replacestring from="[testng]" to=""/>
560+
</tokenfilter>
561+
</filterchain>
562+
</loadfile>
563+
<echo file="quicklook_summary.txt" append="true" message="${testng_output}"/>
564+
<antcall target="build-version"/>
565+
<available file="test-output/emailable-report.html" property="report.present"/>
566+
<antcall target="quicklook-report"/>
567+
<delete file="version.output"/>
568+
</target>
528569

529570
<target name="quicklook-report" if="report.present">
530571
<loadfile srcfile="version.output" property="build_version">

0 commit comments

Comments
 (0)