[jboss-cvs] JBossAS SVN: r78641 - in branches/JBPAPP_4_3_0_GA_CC/testsuite: src/resources/test-configs/cc-db and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Sep 17 07:55:59 EDT 2008
Author: pskopek at redhat.com
Date: 2008-09-17 07:55:59 -0400 (Wed, 17 Sep 2008)
New Revision: 78641
Modified:
branches/JBPAPP_4_3_0_GA_CC/testsuite/build.xml
branches/JBPAPP_4_3_0_GA_CC/testsuite/src/resources/test-configs/cc-db/
branches/JBPAPP_4_3_0_GA_CC/testsuite/src/resources/test-configs/cc-db/conf/login-config.xml
branches/JBPAPP_4_3_0_GA_CC/testsuite/src/stylesheets/junit-frames.xsl
Log:
DB login module added + reporting improvement
Modified: branches/JBPAPP_4_3_0_GA_CC/testsuite/build.xml
===================================================================
--- branches/JBPAPP_4_3_0_GA_CC/testsuite/build.xml 2008-09-17 11:00:35 UTC (rev 78640)
+++ branches/JBPAPP_4_3_0_GA_CC/testsuite/build.xml 2008-09-17 11:55:59 UTC (rev 78641)
@@ -873,18 +873,73 @@
</copy>
</target>
+
+ <!-- Calculates MD5 sums for all libraries used while testing.
+ This will be used as proof of testing for CC evaluation.
+ -->
+ <target name="calculate-md5">
+ <mkdir dir="${build.reports}/md5"/>
+
+ <checksum todir="${build.reports}/md5" algorithm="MD5">
+ <fileset dir="${jbosstest.dist}">
+ <include name="lib/**/*.jar"/>
+ <include name="server/cc/lib/**/*.jar"/>
+ </fileset>
+ </checksum>
+ <concat destfile="${build.reports}/html/allmd5sum.txt" fixlastline="true">
+ <fileset dir="${build.reports}/md5">
+ <include name="**/*.MD5"/>
+ </fileset>
+ </concat>
+
+ </target>
+
+ <!-- Common Criteria Evaluation Tests running with Java Security Manager turned on.
+ Using UsersRolesLoginModule login module.
+ -->
+ <target name="tests-cc-sm" description="Execute all Common Criteria Evaluation tests with Java Security Manager turned on. Using UsersRolesLoginModule login module.">
+ <antcall target="tests-cc-sm-generic">
+ <param name="alternate-config" value="cc-none"/>
+ <!-- This parameter controls junitreport to produce CC testify section. -->
+ <param name="cc-testify" value="true"/>
+ </antcall>
+ </target>
+
+ <!-- Common Criteria Evaluation Tests running with Java Security Manager turned on.
+ Using DatabaseServerLoginModule login module.
+ -->
+ <target name="tests-cc-sm-db" description="Execute all Common Criteria Evaluation tests with Java Security Manager turned on. Using DatabaseServerLoginModule login module.">
+ <antcall target="tests-cc-sm-generic">
+ <param name="alternate-config" value="cc-db"/>
+ <!-- This parameter controls junitreport to produce CC testify section. -->
+ <param name="cc-testify" value="true"/>
+ </antcall>
+ </target>
+
+ <!-- Common Criteria Evaluation Tests running with Java Security Manager turned on.
+ Using LdapLoginModule login module.
+ -->
+ <target name="tests-cc-sm-ldap" description="Execute all Common Criteria Evaluation tests with Java Security Manager turned on. Using LdapLoginModule login module.">
+ <antcall target="tests-cc-sm-generic">
+ <param name="alternate-config" value="cc-ldap"/>
+ <!-- This parameter controls junitreport to produce CC testify section. -->
+ <param name="cc-testify" value="true"/>
+ </antcall>
+ </target>
+
<!-- Common Criteria Evaluation Tests running with Java Security Manager turned on.
-->
- <target name="tests-cc-sm" description="Execute all Common Criteria Evaluation tests with Java Security Manager turned on."
+ <target name="tests-cc-sm-generic" description="Execute all Common Criteria Evaluation tests with Java Security Manager turned on."
depends="generate-cc-patternsets,maybejars">
<record name="${basedir}/build.log" append="no" action="start" loglevel="${buildlog.level}"/>
<antcall target="create-cc-config">
- <param name="alternate-config" value="cc-db"/>
+ <param name="alternate-config" value="${alternate-config}"/>
</antcall>
+ <antcall target="calculate-md5"/>
<property name="nojars" value="true"/>
<server:start name="cc-sm"/>
@@ -908,6 +963,8 @@
<target name="tests-cc" description="Execute all Common Criteria Evaluation tests with Java Security Manager turned off. Using UsersRolesLoginModule login module.">
<antcall target="tests-cc-generic">
<param name="alternate-config" value="cc-none"/>
+ <!-- This parameter controls junitreport to produce CC testify section. -->
+ <param name="cc-testify" value="true"/>
</antcall>
</target>
@@ -917,6 +974,8 @@
<target name="tests-cc-db" description="Execute all Common Criteria Evaluation tests with Java Security Manager turned off. Using DatabaseServerLoginModule login module.">
<antcall target="tests-cc-generic">
<param name="alternate-config" value="cc-db"/>
+ <!-- This parameter controls junitreport to produce CC testify section. -->
+ <param name="cc-testify" value="true"/>
</antcall>
</target>
@@ -926,6 +985,8 @@
<target name="tests-cc-ldap" description="Execute all Common Criteria Evaluation tests with Java Security Manager turned off. Using LdapLoginModule login module.">
<antcall target="tests-cc-generic">
<param name="alternate-config" value="cc-ldap"/>
+ <!-- This parameter controls junitreport to produce CC testify section. -->
+ <param name="cc-testify" value="true"/>
</antcall>
</target>
@@ -940,12 +1001,14 @@
<param name="alternate-config" value="${alternate-config}"/>
</antcall>
+ <antcall target="calculate-md5"/>
+
<property name="nojars" value="true"/>
<server:start name="cc"/>
<antcall target="run-cc-tests"/>
- <antcall target="tests-report"/>
+ <antcall target="tests-report"/>
<echo>Waiting for server to shutdown...</echo>
<server:stop name="cc"/>
Property changes on: branches/JBPAPP_4_3_0_GA_CC/testsuite/src/resources/test-configs/cc-db
___________________________________________________________________
Name: svn:ignore
+ lib
Modified: branches/JBPAPP_4_3_0_GA_CC/testsuite/src/resources/test-configs/cc-db/conf/login-config.xml
===================================================================
--- branches/JBPAPP_4_3_0_GA_CC/testsuite/src/resources/test-configs/cc-db/conf/login-config.xml 2008-09-17 11:00:35 UTC (rev 78640)
+++ branches/JBPAPP_4_3_0_GA_CC/testsuite/src/resources/test-configs/cc-db/conf/login-config.xml 2008-09-17 11:55:59 UTC (rev 78641)
@@ -164,7 +164,7 @@
</authentication>
</application-policy>
- <application-policy name="testDB">
+ <application-policy name="proxy-test">
<authentication>
<login-module code="org.jboss.security.auth.spi.DatabaseServerLoginModule"
flag="required">
@@ -177,6 +177,7 @@
</authentication>
</application-policy>
+
<!-- The default login configuration used by any security domain that
does not have a application-policy entry with a matching name
-->
Modified: branches/JBPAPP_4_3_0_GA_CC/testsuite/src/stylesheets/junit-frames.xsl
===================================================================
--- branches/JBPAPP_4_3_0_GA_CC/testsuite/src/stylesheets/junit-frames.xsl 2008-09-17 11:00:35 UTC (rev 78640)
+++ branches/JBPAPP_4_3_0_GA_CC/testsuite/src/stylesheets/junit-frames.xsl 2008-09-17 11:55:59 UTC (rev 78641)
@@ -534,6 +534,7 @@
</xsl:for-each>
</table>
<xsl:call-template name="pageFooter"/>
+ <xsl:call-template name="cc-testify"/>
</body>
</html>
</xsl:template>
@@ -638,8 +639,38 @@
<td>OS Arch</td><td><xsl:value-of select="$os.arch"/></td>
</tr>
</table>
+
</xsl:template>
+
+<!-- Common Criteria Testify -->
+<xsl:template name="cc-testify">
+ <xsl:if test="//property[@name='cc-testify']/@value">
+ <p/>
+ <hr size="1"/>
+ <p/>
+ <h2>Common Criteria Testify</h2>
+ <a href="allmd5sum.txt">MD5 sums of involved libraries</a>
+ <p/>
+ <table class="details">
+ <tr>
+ <td>Hudson Job Name</td><td><xsl:value-of select="//property[@name='JOB_NAME']/@value"/></td>
+ </tr><tr>
+ <td>Build ID</td><td><xsl:value-of select="//property[@name='BUILD_ID']/@value"/></td>
+ </tr><tr>
+ <td>Build Tag</td><td><xsl:value-of select="//property[@name='BUILD_TAG']/@value"/></td>
+ </tr><tr>
+ <td>Build Number</td><td><xsl:value-of select="//property[@name='BUILD_NUMBER']/@value"/></td>
+ </tr><tr>
+ <td>Date</td><td><xsl:value-of select="//property[@name='TODAY']/@value"/></td>
+ </tr><tr>
+ <td>Time</td><td><xsl:value-of select="//property[@name='TIMENOW']/@value"/></td>
+ </tr>
+ </table>
+ </xsl:if>
+</xsl:template>
+
+
<!-- class header -->
<xsl:template name="testsuite.test.header">
<tr bgcolor="#A6CAF0" valign="top">
More information about the jboss-cvs-commits
mailing list