mirror of https://github.com/OpenIdentityPlatform/OpenDJ.git

gary_williams
07.46.2007 1fb92e157d1f44d5201fbfa7322fa87ac558c55c
Show tests log directory in test report 
5 files modified
88 ■■■■■ changed files
opendj-sdk/opends/tests/functional-tests/shared/xsl/gen-alltests-report.xsl 45 ●●●●● patch | view | raw | blame | history
opendj-sdk/opends/tests/functional-tests/shared/xsl/gen-text-summary.xsl 8 ●●●●● patch | view | raw | blame | history
opendj-sdk/opends/tests/functional-tests/shared/xsl/my-report.xsl 27 ●●●●● patch | view | raw | blame | history
opendj-sdk/opends/tests/functional-tests/testcases/runFuncTests.xml 3 ●●●●● patch | view | raw | blame | history
opendj-sdk/opends/tests/functional-tests/testcases/runTestJob.xml 5 ●●●● patch | view | raw | blame | history
opendj-sdk/opends/tests/functional-tests/shared/xsl/gen-alltests-report.xsl
@@ -377,6 +377,51 @@
    </xsl:element>
  <!-- Shaded Line -->
  <xsl:element name="hr">
    <xsl:attribute name="noshade">
      <xsl:value-of select="'noshade'"/>
    </xsl:attribute>
    <xsl:attribute name="size">
      <xsl:value-of select="1"/>
    </xsl:attribute>
  </xsl:element>
  <!-- Additional Information -->
  <xsl:element name="h2">
    <xsl:value-of select="'Additional Information'"/>
  </xsl:element>
  <xsl:variable name="tests-dir" select="$identification/tests-dir"/>
  <xsl:element name="table">
    <xsl:element name="tr">
      <xsl:element name="td">
        <xsl:element name="b">
          <xsl:value-of select="'Test Archive: '"/>
        </xsl:element>
      </xsl:element>
      <xsl:element name="td">
        <xsl:attribute name="align">
          <xsl:value-of select="'center'"/>
        </xsl:attribute>
        <xsl:element name="b">
          <xsl:value-of select="$tests-dir"/>
        </xsl:element>
      </xsl:element>
    </xsl:element>
  </xsl:element>
  <!-- Shaded Line -->
  <xsl:element name="hr">
    <xsl:attribute name="noshade">
      <xsl:value-of select="'noshade'"/>
    </xsl:attribute>
    <xsl:attribute name="size">
      <xsl:value-of select="1"/>
    </xsl:attribute>
  </xsl:element>
  </xsl:element>
      
  </xsl:element>
opendj-sdk/opends/tests/functional-tests/shared/xsl/gen-text-summary.xsl
@@ -13,15 +13,13 @@
  <xsl:variable name="total"  select="count($testcase)"/>
  <xsl:variable name="pass"   select="count($testcase[@result='pass'])"/>
  <xsl:variable name="fail"   select="count($testcase[@result='fail'])"/>
  <xsl:variable name="inconc" select="count($testcase[@result='unknown'])"
/>
  <xsl:variable name="inconc" select="count($testcase[@result='unknown'])"/>
  <!-- Overall Test Percentage -->
  <xsl:variable name="percent">
    <xsl:choose>
      <xsl:when test="$total &gt; 0">
        <xsl:value-of select="round((($pass div $total) * 100) - 0.5
)"/>
        <xsl:value-of select="round((($pass div $total) * 100) - 0.5)"/>
      </xsl:when>
      <xsl:otherwise>
        <xsl:value-of select="0"/>
@@ -44,7 +42,7 @@
  <xsl:value-of select="concat('jvm-label: ', normalize-space($identification/jvm-label),'&#xa;')"/>
  <xsl:value-of select="concat('jvm-vendor: ', normalize-space($identification/jvm-vendor),'&#xa;')"/>
  <xsl:value-of select="concat('jvm-arch: ', normalize-space($identification/jvm-arch),'&#xa;')"/>
  <xsl:value-of select="concat('tests-dir: ', normalize-space($identification/tests-dir),'&#xa;')"/>
</xsl:template>
</xsl:stylesheet>
opendj-sdk/opends/tests/functional-tests/shared/xsl/my-report.xsl
@@ -585,5 +585,32 @@
        </p>
      </xsl:if>
    </xsl:for-each>
    <!-- Additional Information -->
    <xsl:element name="h2">
      <xsl:value-of select="'Additional Information'"/>
    </xsl:element>
    <xsl:variable name="tests-dir" select="$identification/tests-dir"/>
    <xsl:element name="table">
      <xsl:element name="tr">
        <xsl:element name="td">
          <xsl:element name="b">
            <xsl:value-of select="'Test Archive: '"/>
          </xsl:element>
        </xsl:element>
        <xsl:element name="td">
          <xsl:attribute name="align">
            <xsl:value-of select="'center'"/>
          </xsl:attribute>
          <xsl:element name="b">
            <xsl:value-of select="$tests-dir"/>
          </xsl:element>
        </xsl:element>
      </xsl:element>
    </xsl:element>
    <xsl:element name="br"/>
  </xsl:template>
</xsl:stylesheet>
opendj-sdk/opends/tests/functional-tests/testcases/runFuncTests.xml
@@ -341,6 +341,9 @@
        testlog.write('      &lt;jvm-vendor&gt;\n')
        testlog.write('        %s\n' % ServerJVMVendor)
        testlog.write('      &lt;/jvm-vendor&gt;\n')        
        testlog.write('      &lt;tests-dir&gt;\n')
        testlog.write('        %s\n' % logsDir)
        testlog.write('      &lt;/tests-dir&gt;\n')
        testlog.write('    &lt;/identification&gt;\n')
        testlog.write('  &lt;/functional-tests&gt;\n')
        testlog.write('&lt;/qa&gt;\n')
opendj-sdk/opends/tests/functional-tests/testcases/runTestJob.xml
@@ -89,7 +89,7 @@
      <import machine="STAF_LOCAL_HOSTNAME"
              file="'%s/stafcmd.xml' % TESTS_FUNCTIONS_DIR" />
      
      <!--
      <!-- FixMe
        dirty workaround because utils.xml now depends on environment.xml
        to avoid loading environment.xml I'll just set the required vars here
        allegedly ugly
@@ -406,6 +406,9 @@
        xmlfh.write('      &lt;os-label&gt;\n')
        xmlfh.write('        %s\n' % ServerOsString)
        xmlfh.write('      &lt;/os-label&gt;\n')                        
        xmlfh.write('      &lt;tests-dir&gt;\n')
        xmlfh.write('        %s\n' % logsDir)
        xmlfh.write('      &lt;/tests-dir&gt;\n')
        xmlfh.write('    &lt;/identification&gt;\n')
        xmlfh.write('    &lt;results&gt;\n')
      </script>