aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYuhong Yin2012-10-23 15:49:43 (EDT)
committerYuhong Yin2012-10-23 15:49:43 (EDT)
commit16d79667923cc0c71f1f491b10fc33fd3e6151be (patch)
tree172588c13eb2d0df9ebe1dbc32c05ef81b00997d
parent9310c0e71edfd90b0dc17a24a66fe6b6c58bc824 (diff)
downloadorg.eclipse.lyo.testsuite-16d79667923cc0c71f1f491b10fc33fd3e6151be.zip
org.eclipse.lyo.testsuite-16d79667923cc0c71f1f491b10fc33fd3e6151be.tar.gz
org.eclipse.lyo.testsuite-16d79667923cc0c71f1f491b10fc33fd3e6151be.tar.bz2
Bug 391586 - ServiceProviderXmlTests test optionalrefs/changes/55/8355/1
serviceProviderHasValidDetails capability as a MUST
-rw-r--r--org.eclipse.lyo.testsuite.server/assessment/cm/assessment.props6
-rw-r--r--org.eclipse.lyo.testsuite.server/assessment/cm/oslc-spec-mapping/oslc-cm-v2.xml2
-rw-r--r--org.eclipse.lyo.testsuite.server/assessment/cm/reportstyle/barchartSVG.xsl4
-rw-r--r--org.eclipse.lyo.testsuite.server/assessment/cm/reportstyle/junit-noframes.xsl10
-rw-r--r--org.eclipse.lyo.testsuite.server/assessment/qm/assessment.props3
-rw-r--r--org.eclipse.lyo.testsuite.server/assessment/qm/oslc-spec-mapping/oslc-qm-v2.xml2
-rw-r--r--org.eclipse.lyo.testsuite.server/assessment/qm/reportstyle/barchartSVG.xsl4
-rw-r--r--org.eclipse.lyo.testsuite.server/assessment/qm/reportstyle/junit-noframes.xsl4
-rw-r--r--org.eclipse.lyo.testsuite.server/assessment/qm/rqm-assessment-test.xml205
9 files changed, 224 insertions, 16 deletions
diff --git a/org.eclipse.lyo.testsuite.server/assessment/cm/assessment.props b/org.eclipse.lyo.testsuite.server/assessment/cm/assessment.props
index 8269650..2bb7551 100644
--- a/org.eclipse.lyo.testsuite.server/assessment/cm/assessment.props
+++ b/org.eclipse.lyo.testsuite.server/assessment/cm/assessment.props
@@ -1,3 +1,3 @@
-eclipse_home=/Users/mffiedler/work/eclipse42
-top=/Users/mffiedler
-provider=CQ8004 \ No newline at end of file
+eclipse_home=C:/Eclipse36/eclipse
+top=C:/Documents and Settings/yyin
+provider=RTC4.0 \ No newline at end of file
diff --git a/org.eclipse.lyo.testsuite.server/assessment/cm/oslc-spec-mapping/oslc-cm-v2.xml b/org.eclipse.lyo.testsuite.server/assessment/cm/oslc-spec-mapping/oslc-cm-v2.xml
index 73a755d..d8791b4 100644
--- a/org.eclipse.lyo.testsuite.server/assessment/cm/oslc-spec-mapping/oslc-cm-v2.xml
+++ b/org.eclipse.lyo.testsuite.server/assessment/cm/oslc-spec-mapping/oslc-cm-v2.xml
@@ -142,7 +142,7 @@
<testcase level="MUST">serviceProviderHasAtMostOnePublisher</testcase>
<testcase level="MUST">publisherElementsAreValid</testcase>
<testcase level="MUST">serviceProviderHasService</testcase>
- <testcase level="MUST">serviceProviderHasValidDetails</testcase>
+ <testcase level="MAY">serviceProviderHasValidDetails</testcase>
<testcase level="MUST">prefixDefinitionsAreValid</testcase>
<testcase level="MUST">serviceProviderHasAtMostOneOAuthElement</testcase>
<testcase level="MUST">oAuthElementsAreValid</testcase>
diff --git a/org.eclipse.lyo.testsuite.server/assessment/cm/reportstyle/barchartSVG.xsl b/org.eclipse.lyo.testsuite.server/assessment/cm/reportstyle/barchartSVG.xsl
index 6756005..2b21bb9 100644
--- a/org.eclipse.lyo.testsuite.server/assessment/cm/reportstyle/barchartSVG.xsl
+++ b/org.eclipse.lyo.testsuite.server/assessment/cm/reportstyle/barchartSVG.xsl
@@ -216,10 +216,10 @@
</svg:g>
</svg:svg>
<!-- Object Container to render the SVG User Load Preview Graph within the HTML
- <object type="image/svg+xml" name="SVGContainer" data="{concat(@name,'.svg')}" codebase="http://www.adobe.com/svg/viewer/install/" width="450" height="200">
+ <object type="image/svg+xml" name="SVGContainer" data="{concat(@name,'.svg')}" width="450" height="200">
<param name="src" value="{concat(@name,'.svg')}" />
<param name="wmode" value="transparent" />
- <embed src="{concat(@name,'.svg')}" type="image/svg+xml" width="450" height="200" wmode="transparent" pluginspage="http://www.adobe.com/svg/viewer/install/" />
+ <embed src="{concat(@name,'.svg')}" type="image/svg+xml" width="450" height="200" wmode="transparent" />
</object> -->
</xsl:template>
diff --git a/org.eclipse.lyo.testsuite.server/assessment/cm/reportstyle/junit-noframes.xsl b/org.eclipse.lyo.testsuite.server/assessment/cm/reportstyle/junit-noframes.xsl
index 1776c90..1de0fb0 100644
--- a/org.eclipse.lyo.testsuite.server/assessment/cm/reportstyle/junit-noframes.xsl
+++ b/org.eclipse.lyo.testsuite.server/assessment/cm/reportstyle/junit-noframes.xsl
@@ -382,10 +382,10 @@
<!-- Object Container to render the SVG User Load Preview Graph within the HTML -->
- <span style="text-align:center;display:block;margin: 0 auto;"><object id="svgid" type="image/svg+xml" name="SVGContainer" data="barchartSVG.svg" codebase="http://www.adobe.com/svg/viewer/install/" width="1100" height="350">
+ <span style="text-align:center;display:block;margin: 0 auto;"><object id="svgid" type="image/svg+xml" name="SVGContainer" data="barchartSVG.svg" width="1100" height="350">
<param name="src" value="barchartSVG.svg" />
<param name="wmode" value="transparent" />
- <embed id="svgid" src="barchartSVG.svg" type="image/svg+xml" width="1100" height="350" wmode="transparent" pluginspage="http://www.adobe.com/svg/viewer/install/" />
+ <embed id="svgid" src="barchartSVG.svg" type="image/svg+xml" width="1100" height="350" wmode="transparent"/>
</object></span>
<!-- <a href="#" onclick="SVGscale(0.1);">x-small</a>&#160;&#160;<a href="#" onclick="SVGscale(0.25);">small</a>&#160;&#160;<a href="#" onclick="SVGscale(0.5);">medium</a>&#160;&#160;
@@ -394,9 +394,9 @@
<h2>OSLC Assessment</h2>
- <xsl:variable name="mustCount" select="'185'"/>
- <xsl:variable name="junitMustCount" select="'137'"/>
- <xsl:variable name="junitUniqueReqMustCount" select="'122'"/>
+ <xsl:variable name="mustCount" select="'181'"/>
+ <xsl:variable name="junitMustCount" select="'136'"/>
+ <xsl:variable name="junitUniqueReqMustCount" select="'121'"/>
<xsl:variable name="testsuiteMustCount" select="count($spec//testcase[@level='MUST'])" />
<xsl:variable name="passedMustCount" select="count(/testsuites/testsuite/testcase[@assessment='passedMust'])"/>
<xsl:variable name="failedMustCount" select="count(/testsuites/testsuite/testcase[@assessment='failedMust'])"/>
diff --git a/org.eclipse.lyo.testsuite.server/assessment/qm/assessment.props b/org.eclipse.lyo.testsuite.server/assessment/qm/assessment.props
new file mode 100644
index 0000000..0c82ee1
--- /dev/null
+++ b/org.eclipse.lyo.testsuite.server/assessment/qm/assessment.props
@@ -0,0 +1,3 @@
+eclipse_home=C:/Eclipse36/eclipse
+top=C:/Documents and Settings/yyin
+provider=RQM4.0 \ No newline at end of file
diff --git a/org.eclipse.lyo.testsuite.server/assessment/qm/oslc-spec-mapping/oslc-qm-v2.xml b/org.eclipse.lyo.testsuite.server/assessment/qm/oslc-spec-mapping/oslc-qm-v2.xml
index 0c1d996..b8c94d0 100644
--- a/org.eclipse.lyo.testsuite.server/assessment/qm/oslc-spec-mapping/oslc-qm-v2.xml
+++ b/org.eclipse.lyo.testsuite.server/assessment/qm/oslc-spec-mapping/oslc-qm-v2.xml
@@ -220,7 +220,7 @@
<testcase level="MUST">serviceProviderHasAtMostOnePublisher</testcase>
<testcase level="MUST">publisherElementsAreValid</testcase>
<testcase level="MUST">serviceProviderHasService</testcase>
- <testcase level="MUST">serviceProviderHasValidDetails</testcase>
+ <testcase level="MAY">serviceProviderHasValidDetails</testcase>
<testcase level="MUST">prefixDefinitionsAreValid</testcase>
<testcase level="MUST">serviceProviderHasAtMostOneOAuthElement</testcase>
<testcase level="MUST">oAuthElementsAreValid</testcase>
diff --git a/org.eclipse.lyo.testsuite.server/assessment/qm/reportstyle/barchartSVG.xsl b/org.eclipse.lyo.testsuite.server/assessment/qm/reportstyle/barchartSVG.xsl
index 84a3ec0..e9cb746 100644
--- a/org.eclipse.lyo.testsuite.server/assessment/qm/reportstyle/barchartSVG.xsl
+++ b/org.eclipse.lyo.testsuite.server/assessment/qm/reportstyle/barchartSVG.xsl
@@ -161,10 +161,10 @@
</svg:g>
</svg:svg>
<!-- Object Container to render the SVG User Load Preview Graph within the HTML
- <object type="image/svg+xml" name="SVGContainer" data="{concat(@name,'.svg')}" codebase="http://www.adobe.com/svg/viewer/install/" width="450" height="200">
+ <object type="image/svg+xml" name="SVGContainer" data="{concat(@name,'.svg')}" width="600" height="300">
<param name="src" value="{concat(@name,'.svg')}" />
<param name="wmode" value="transparent" />
- <embed src="{concat(@name,'.svg')}" type="image/svg+xml" width="450" height="200" wmode="transparent" pluginspage="http://www.adobe.com/svg/viewer/install/" />
+ <embed src="{concat(@name,'.svg')}" type="image/svg+xml" width="450" height="300" wmode="transparent" />
</object> -->
</xsl:template>
diff --git a/org.eclipse.lyo.testsuite.server/assessment/qm/reportstyle/junit-noframes.xsl b/org.eclipse.lyo.testsuite.server/assessment/qm/reportstyle/junit-noframes.xsl
index a2917e1..eeac2ad 100644
--- a/org.eclipse.lyo.testsuite.server/assessment/qm/reportstyle/junit-noframes.xsl
+++ b/org.eclipse.lyo.testsuite.server/assessment/qm/reportstyle/junit-noframes.xsl
@@ -381,10 +381,10 @@
<xsl:template name="compliancepart">
<!-- Object Container to render the SVG User Load Preview Graph within the HTML -->
- <span style="text-align:center;display:block;margin: 0 auto;"><object id="svgid" type="image/svg+xml" name="SVGContainer" data="barchartSVG.svg" codebase="http://www.adobe.com/svg/viewer/install/" width="1100" height="350">
+ <span style="text-align:center;display:block;margin: 0 auto;"><object id="svgid" type="image/svg+xml" name="SVGContainer" data="barchartSVG.svg" width="1100" height="450">
<param name="src" value="barchartSVG.svg" />
<param name="wmode" value="transparent" />
- <embed id="svgid" src="barchartSVG.svg" type="image/svg+xml" width="1100" height="450" wmode="transparent" pluginspage="http://www.adobe.com/svg/viewer/install/" />
+ <embed id="svgid" src="barchartSVG.svg" type="image/svg+xml" width="1100" height="600" wmode="transparent" />
</object></span>
<h2>OSLC Assessment</h2>
diff --git a/org.eclipse.lyo.testsuite.server/assessment/qm/rqm-assessment-test.xml b/org.eclipse.lyo.testsuite.server/assessment/qm/rqm-assessment-test.xml
new file mode 100644
index 0000000..6cfa524
--- /dev/null
+++ b/org.eclipse.lyo.testsuite.server/assessment/qm/rqm-assessment-test.xml
@@ -0,0 +1,205 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- WARNING: Eclipse auto-generated file.
+ Any modifications will be overwritten.
+ To include a user specific buildfile here, simply create one in the same
+ directory with the processing instruction <?eclipse.ant.import?>
+ as the first entry and export the buildfile again. -->
+
+<project basedir="." default="build" name="org.eclipse.lyo.testsuite.server">
+
+ <echo message="basedir = ${basedir}"/>
+ <property name="assessment.props" value="${basedir}/assessment.props"/>
+ <property file="${assessment.props}"/>
+ <echo message="top = ${top}"/>
+ <echo message="eclipse_home = ${eclipse_home}"/>
+
+ <taskdef resource="net/sf/antcontrib/antcontrib.properties"/>
+ <property environment="env"/>
+ <property name="ECLIPSE_HOME" value="${eclipse_home}"/>
+ <property name="junit.output.dir" value="junit"/>
+ <property name="debuglevel" value="source,lines,vars"/>
+ <property name="target" value="1.6"/>
+ <property name="source" value="1.6"/>
+ <path id="Maven Dependencies.libraryclasspath">
+ <pathelement location="${top}/.m2/repository/junit/junit/4.8.1/junit-4.8.1.jar"/>
+ <pathelement location="${top}/.m2/repository/com/hp/hpl/jena/jena/2.6.3/jena-2.6.3.jar"/>
+ <pathelement location="${top}/.m2/repository/com/hp/hpl/jena/arq/2.6.0/arq-2.6.0.jar"/>
+ <pathelement location="${top}/.m2/repository/org/apache/lucene/lucene-core/2.3.1/lucene-core-2.3.1.jar"/>
+ <pathelement location="${top}/.m2/repository/stax/stax-api/1.0/stax-api-1.0.jar"/>
+ <pathelement location="${top}/.m2/repository/woodstox/wstx-asl/3.0.0/wstx-asl-3.0.0.jar"/>
+ <pathelement location="${top}/.m2/repository/com/hp/hpl/jena/json-jena/1.0/json-jena-1.0.jar"/>
+ <pathelement location="${top}/.m2/repository/com/hp/hpl/jena/iri/0.5/iri-0.5.jar"/>
+ <pathelement location="${top}/.m2/repository/antlr/antlr/2.7.5/antlr-2.7.5.jar"/>
+ <pathelement location="${top}/.m2/repository/com/hp/hpl/jena/concurrent-jena/1.3.2/concurrent-jena-1.3.2.jar"/>
+ <pathelement location="${top}/.m2/repository/com/ibm/icu/icu4j/3.4.4/icu4j-3.4.4.jar"/>
+ <pathelement location="${top}/.m2/repository/xerces/xercesImpl/2.7.1/xercesImpl-2.7.1.jar"/>
+ <pathelement location="${top}/.m2/repository/xerces/xmlParserAPIs/2.0.2/xmlParserAPIs-2.0.2.jar"/>
+ <pathelement location="${top}/.m2/repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar"/>
+ <pathelement location="${top}/.m2/repository/org/apache/httpcomponents/httpclient/4.1.2/httpclient-4.1.2.jar"/>
+ <pathelement location="${top}/.m2/repository/org/apache/httpcomponents/httpcore/4.1.2/httpcore-4.1.2.jar"/>
+ <pathelement location="${top}/.m2/repository/commons-codec/commons-codec/1.4/commons-codec-1.4.jar"/>
+ <pathelement location="${top}/.m2/repository/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar"/>
+ <pathelement location="${top}/.m2/repository/net/oauth/core/oauth/20090617/oauth-20090617.jar"/>
+ <pathelement location="${top}/.m2/repository/net/oauth/core/oauth-consumer/20090617/oauth-consumer-20090617.jar"/>
+ <pathelement location="${top}/.m2/repository/net/oauth/core/oauth-httpclient3/20090617/oauth-httpclient3-20090617.jar"/>
+ <pathelement location="${top}/.m2/repository/org/apache/wink/wink-json4j/1.1.2-incubating/wink-json4j-1.1.2-incubating.jar"/>
+ <pathelement location="${top}/.m2/repository/org/slf4j/slf4j-simple/1.5.10/slf4j-simple-1.5.10.jar"/>
+ <pathelement location="${top}/.m2/repository/org/slf4j/slf4j-api/1.5.10/slf4j-api-1.5.10.jar"/>
+ <pathelement location="${top}/.m2/repository/org/apache/abdera/abdera-parser/1.1/abdera-parser-1.1.jar"/>
+ <pathelement location="${top}/.m2/repository/org/apache/abdera/abdera-bundle/1.1.2/abdera-bundle-1.1.2.jar"/>
+ </path>
+ <taskdef resource="net/sf/antcontrib/antcontrib.properties">
+ <classpath>
+ <pathelement location="${top}/.m2/repository/ant-contrib/ant-contrib/1.0b3/ant-contrib-1.0b3.jar"/>
+ </classpath>
+ </taskdef>
+ <path id="org.eclipse.lyo.testsuite.server.classpath">
+ <pathelement location="../../target/classes"/>
+ <path refid="Maven Dependencies.libraryclasspath"/>
+ </path>
+ <path id="run.org.eclipse.lyo.testsuite.server.classpath">
+ <path refid="org.eclipse.lyo.testsuite.server.classpath"/>
+ <path refid="Maven Dependencies.libraryclasspath"/>
+ </path>
+
+ <target name="init">
+ <mkdir dir="../../target/classes"/>
+ <copy includeemptydirs="false" todir="../../target/classes">
+ <fileset dir="../../src/main/java">
+ <exclude name="**/*.launch"/>
+ <exclude name="**/*.java"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <target name="clean">
+ <delete dir="../../target/classes"/>
+ </target>
+
+ <target depends="clean" name="cleanall"/>
+
+ <target depends="build-subprojects,build-project" name="build"/>
+
+ <target name="build-subprojects"/>
+
+ <target depends="init" name="build-project">
+ <echo message="${ant.project.name}: ${ant.file}"/>
+ <javac debug="true" debuglevel="${debuglevel}" destdir="../../target/classes" source="${source}" target="${target}">
+ <src path="../../src/main/java"/>
+ <classpath refid="org.eclipse.lyo.testsuite.server.classpath"/>
+ </javac>
+ </target>
+
+ <target description="Build all projects which reference this project. Useful to propagate changes." name="build-refprojects"/>
+
+ <target description="copy Eclipse compiler jars to ant lib directory" name="init-eclipse-compiler">
+ <copy todir="${ant.library.dir}">
+ <fileset dir="${ECLIPSE_HOME}/plugins" includes="org.eclipse.jdt.core_*.jar"/>
+ </copy>
+ <unzip dest="${ant.library.dir}">
+ <patternset includes="jdtCompilerAdapter.jar"/>
+ <fileset dir="${ECLIPSE_HOME}/plugins" includes="org.eclipse.jdt.core_*.jar"/>
+ </unzip>
+ </target>
+
+ <target description="compile project with Eclipse compiler" name="build-eclipse-compiler">
+ <property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
+ <antcall target="build"/>
+ </target>
+
+ <property name="todir" value="${junit.output.dir}/${provider}"/>
+ <mkdir dir="${junit.output.dir}"/>
+ <mkdir dir="${junit.output.dir}/${provider}"/>
+
+ <target name="provider-test">
+ <mkdir dir="${junit.output.dir}"/>
+ <junit fork="no" printsummary="withOutAndErr">
+ <formatter type="xml"/>
+ <test name="org.eclipse.lyo.testsuite.oslcv2.ServiceProviderCatalogRdfXmlTests" todir="${junit.output.dir}"/>
+ <test name="org.eclipse.lyo.testsuite.oslcv2.ServiceProviderCatalogXmlTests" todir="${junit.output.dir}"/>
+ <test name="org.eclipse.lyo.testsuite.oslcv2.ServiceProviderRdfXmlTests" todir="${junit.output.dir}"/>
+ <test name="org.eclipse.lyo.testsuite.oslcv2.ServiceProviderXmlTests" todir="${junit.output.dir}"/>
+
+ <test name="org.eclipse.lyo.testsuite.oslcv2.SimplifiedQueryXmlTests" todir="${junit.output.dir}"/>
+ <test name="org.eclipse.lyo.testsuite.oslcv2.SimplifiedQueryRdfXmlTests" todir="${junit.output.dir}"/>
+ <test name="org.eclipse.lyo.testsuite.oslcv2.CreationAndUpdateRdfXmlTests" todir="${junit.output.dir}"/>
+ <test name="org.eclipse.lyo.testsuite.oslcv2.CreationAndUpdateXmlTests" todir="${junit.output.dir}"/>
+
+ <test name="org.eclipse.lyo.testsuite.oslcv2.qm.TestPlanXmlTests" todir="${junit.output.dir}"/>
+ <test name="org.eclipse.lyo.testsuite.oslcv2.qm.TestCaseXmlTests" todir="${junit.output.dir}"/>
+ <test name="org.eclipse.lyo.testsuite.oslcv2.qm.TestScriptXmlTests" todir="${junit.output.dir}"/>
+ <test name="org.eclipse.lyo.testsuite.oslcv2.qm.TestExecutionRecordXmlTests" todir="${junit.output.dir}"/>
+ <test name="org.eclipse.lyo.testsuite.oslcv2.qm.TestResultXmlTests" todir="${junit.output.dir}"/>
+
+ <test name="org.eclipse.lyo.testsuite.oslcv2.qm.TestPlanRdfXmlTests" todir="${junit.output.dir}"/>
+ <test name="org.eclipse.lyo.testsuite.oslcv2.qm.TestCaseRdfXmlTests" todir="${junit.output.dir}"/>
+ <test name="org.eclipse.lyo.testsuite.oslcv2.qm.TestScriptRdfXmlTests" todir="${junit.output.dir}"/>
+ <test name="org.eclipse.lyo.testsuite.oslcv2.qm.TestExecutionRecordRdfXmlTests" todir="${junit.output.dir}"/>
+ <test name="org.eclipse.lyo.testsuite.oslcv2.qm.TestResultRdfXmlTests" todir="${junit.output.dir}"/>
+
+ <jvmarg line="-Dprops=../../config/rqm/rqm-setupv2.properties"/>
+ <classpath refid="run.org.eclipse.lyo.testsuite.server.classpath"/>
+ </junit>
+ </target>
+
+ <target name="merge-results">
+ <echo message="Detecting Previous TESTS-TestSuites.xml Result File ..."/>
+ <if>
+ <available file="${junit.output.dir}/TESTS-TestSuites.xml"/>
+ <then>
+ <echo message="A Previous TESTS-TestSuites.xml Result File Detected ..."/>
+ <echo message="Deleting TESTS-TestSuites.xml Result File ..."/>
+ <delete file="${junit.output.dir}/TESTS-TestSuites.xml" failonerror="true"/>
+ </then>
+ <else>
+ <echo message="NO TESTS-TestSuites.xml Result File Detected ..."/>
+ </else>
+ </if>
+ <echo message="Merging Results of Individual JUnit xml into TESTS-TestSuites.xml"/>
+ <xslt in="./oslc-spec-mapping/oslc-qm-v2.xml" out="${junit.output.dir}/TESTS-TestSuites.xml" style="./reportstyle/merge-results.xsl"/>
+ </target>
+
+ <target name="append-oslc-spec-info" depends="merge-results">
+ <echo message="Detecting A Previous TESTS-TestSuitesOSLC.xml Result File ..."/>
+ <if>
+ <available file="${junit.output.dir}/TESTS-TestSuitesOSLC.xml"/>
+ <then>
+ <echo message="A Previous TESTS-TestSuitesOSLC.xml Result File Detected ..."/>
+ <echo message="Deleting TESTS-TestSuitesOSLC.xml Result File ..."/>
+ <delete file="${junit.output.dir}/TESTS-TestSuitesOSLC.xml" failonerror="true"/>
+ </then>
+ <else>
+ <echo message="NO TESTS-TestSuitesOSLC.xml Result File Detected ..."/>
+ </else>
+ </if>
+ <echo message="Converting TESTS-TestSuites.xml into TESTS-TestSuitesOSLC.xml to include OSLC specification data"/>
+ <xslt in="${junit.output.dir}/TESTS-TestSuites.xml" out="${junit.output.dir}/TESTS-TestSuitesOSLC.xml" style="./reportstyle/append-oslc-spec-info.xsl"/>
+ <copy todir="${todir}">
+ <fileset dir="${junit.output.dir}" includes="*.xml"/>
+ </copy>
+ </target>
+
+ <target name="junitreport" depends="append-oslc-spec-info">
+ <property name="reportdir" value="./report/${provider}"/>
+ <echo message="Detecting A Previous OSLCAssessmentReport.html file within the report directory ..."/>
+ <if>
+ <available file="${reportdir}/OSLCAssessmentReport.html"/>
+ <then>
+ <echo message="A Previous OSLCAssessmentReport.html file within the report directory was detected ..."/>
+ <echo message="Deleting the OSLCAssessmentReport.html file within the report directory ..."/>
+ <delete file="${reportdir}/OSLCAssessmentReport.html" failonerror="true"/>
+ <delete file="${reportdir}/barchartSVG.svg" failonerror="true"/>
+ </then>
+ <else>
+ <echo message="NO OSLCAssessmentReport.html file within the report directory was detected ..."/>
+ </else>
+ </if>
+ <echo message="Converting TESTS-TestSuitesOSLC.xml into a HTML report"/>
+ <xslt in="${todir}/TESTS-TestSuitesOSLC.xml" out="${reportdir}/barchartSVG.svg" style="./reportstyle/barchartSVG.xsl"/>
+ <xslt in="${todir}/TESTS-TestSuitesOSLC.xml" out="${reportdir}/OSLCAssessmentReport.html" style="./reportstyle/junit-noframes.xsl"/>
+
+ <copy todir="${reportdir}">
+ <fileset dir="./reportstyle" includes="*.png, *.gif"/>
+ </copy>
+ </target>
+</project>