From: Javen O'Neal <onealj@apache.org>
Date: Wed, 25 Oct 2017 18:59:54 +0000 (+0000)
Subject: remove test-ss and test-ooxml-ss ant targets, as these were causing problems with... 
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=52dfce033c05ee424ac45e7a1df018f28fc00ff1;p=poi.git

remove test-ss and test-ooxml-ss ant targets, as these were causing problems with the build/ooxml-testokfile.txt being written, requiring test-ooxml to be rerun on subsequent ant calls even if had previously completed successfully and not modifications to the ooxml source had been made.

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1813342 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/build.xml b/build.xml
index b132fe0661..97c1735d8d 100644
--- a/build.xml
+++ b/build.xml
@@ -134,9 +134,6 @@ under the License.
     <property name="ooxml.lite.output.dir" location="build/ooxml-lite-classes"/>
     <property name="ooxml.lite.testokfile" location="build/ooxml-lite-testokfile.txt"/>
 
-    <!-- XSSF/SXSSF subset of OOXML: -->
-    <property name="ooxml.ss.testokfile" location="build/ooxml-ss-testokfile.txt"/>
-
     <!-- Integration testing: -->
     <property name="integration.src.test" location="src/integrationtest"/>
     <property name="integration.reports.test" location="build/integration-test-results"/>
@@ -1080,50 +1077,6 @@ under the License.
         </copy>
     </target>
 
-    <target name="compile-ooxml-ss" depends="compile-main,compile-scratchpad,compile-ooxml-xsds">
-        <!-- depends: compile-scratchpad needed for extractor -->
-        <!-- compile the sources -->
-        <javac target="${jdk.version.class}"
-               source="${jdk.version.source}"
-               destdir="${ooxml.output.dir}"
-               srcdir="${ooxml.src}"
-               debug="${compile.debug}"
-               encoding="${java.source.encoding}"
-               fork="yes"
-               includeantruntime="false">
-            <classpath>
-                <path refid="ooxml.classpath"/>
-                <path refid="ooxml.xmlsec.classpath"/>
-            </classpath>
-            <include name="org/apache/poi/ss/**/*.java"/>
-            <include name="org/apache/poi/xssf/**/*.java"/>
-            <include name="org/apache/poi/extractor/**/*.java"/>
-            <include name="org/apache/poi/poifs/crypt/**/*.java"/>
-        </javac>
-        <!-- compile the tests -->
-        <javac target="${jdk.version.class}"
-               source="${jdk.version.source}"
-               destdir="${ooxml.output.test.dir}"
-               srcdir="${ooxml.src.test}"
-               debug="${compile.debug}"
-               encoding="${java.source.encoding}"
-               fork="yes"
-               includeantruntime="false">
-            <classpath>
-                <path refid="ooxml.classpath"/>
-                <path refid="ooxml.xmlsec.classpath"/>
-                <path refid="test.ooxml.classpath"/>
-                <pathelement path="${ooxml.output.dir}"/>
-                <pathelement path="${main.output.test.dir}"/>
-            </classpath>
-            <include name="org/apache/poi/ss/**/*.java"/>
-            <include name="org/apache/poi/xssf/**/*.java"/>
-        </javac>
-        <copy todir="${ooxml.output.dir}">
-            <fileset dir="${ooxml.resource1.dir}"/>
-        </copy>
-    </target>
-
     <target name="compile-excelant" depends="compile-main,compile-ooxml">
         <!-- compile the sources -->
         <javac target="${jdk.version.class}"
@@ -1217,8 +1170,6 @@ under the License.
             description="Tests main, scratchpad and ooxml"/>
     <target name="test-all" depends="test,test-ooxml-lite,testcoveragereport"
             description="Tests main, scratchpad, ooxml, ooxml-lite, and coveragereport"/>
-    <target name="test-ss" depends="test-hssf, test-ooxml-ss"
-            description="Test POI Spreadsheet classes (SS, HSSF, XSSF, SXSSF)"/>
 
     <target name="testcoveragereport" depends="jacocotask" description="create test-report" xmlns:jacoco="antlib:org.jacoco.ant" if="coverage.enabled">
         <delete dir="${coverage.dir}"/>
@@ -1552,62 +1503,6 @@ under the License.
         <echo file="${ooxml.testokfile}" append="false" message="testok"/>
     </target>
 
-    <!-- Section: test-ooxml-ss -->
-    <target name="-test-ooxml-ss-check">
-        <uptodate property="ooxml.ss.test.notRequired" targetfile="${ooxml.ss.testokfile}">
-            <srcfiles dir="${ooxml.src}"/>
-            <srcfiles dir="${ooxml.src.test}"/>
-        </uptodate>
-    </target>
-
-    <macrodef name="ooxml-ss-test-runner" xmlns:jacoco="antlib:org.jacoco.ant">
-        <attribute name="classpath"/>
-        <attribute name="type"/>
-        <sequential>
-            <jacoco:coverage enabled="${coverage.enabled}" excludes="${coverage.excludes}" destfile="build/jacoco-@{type}-ss.exec">
-              <junit printsummary="yes" fork="yes" forkmode="once" haltonfailure="${halt.on.test.failure}"
-                     failureproperty="ooxml.ss.test.failed">
-                  <classpath refid="@{classpath}"/>
-                  <syspropertyset refid="junit.properties"/>
-                    <jvmarg value="-Xmx768M"/>
-                  <jvmarg value="-ea"/>
-                  <jvmarg value="${java9addmods}" />
-                  <jvmarg value="${java9addmodsvalue}" />
-                  <jvmarg value="${java9addopens1}" />
-                  <jvmarg value="${java9addopens2}" />
-                  <jvmarg value="${java9addopens3}" />
-                  <jvmarg value="${java9addopens4}" />
-                  <jvmarg value="${java9addopens5}" />
-                  <!-- jvmarg value="-Duser.timezone=UTC"/ -->
-                  <formatter type="plain"/>
-                  <formatter type="xml"/>
-                  <batchtest todir="${ooxml.reports.test}">
-                      <fileset dir="${ooxml.src.test}">
-                          <include name="**/org/apache/poi/ss/**/${testpattern}.java"/>
-                          <include name="**/org/apache/poi/xssf/**/${testpattern}.java"/>
-                          <exclude name="**/TestUnfixedBugs.java"/>
-                          <exclude name="**/All*Tests.java"/>
-                          <exclude name="**/${testexcludepattern}.java"/>
-                          <patternset refid="exclude-scratchpad-test" if:true="${scratchpad.ignore}"/>
-                      </fileset>
-                  </batchtest>
-              </junit>
-            </jacoco:coverage>
-        </sequential>
-    </macrodef>
-
-    <!-- XSSF and SXSSF subset of test-ooxml -->
-    <target name="test-ooxml-ss" depends="compile-main,compile-ooxml-ss,-test-ooxml-ss-check,jacocotask" unless="ooxml.ss.test.notRequired"
-            description="test XSSF and SXSSF classes">
-        <ooxml-ss-test-runner classpath="test.ooxml.classpath" type="ooxml"/>
-        <delete file="${ooxml.ss.testokfile}"/>
-        <antcall target="-test-ooxml-ss-write-testfile"/>
-    </target>
-
-    <target name="-test-ooxml-ss-write-testfile" unless="ooxml.ss.test.failed">
-        <echo file="${ooxml.ss.testokfile}" append="false" message="testok"/>
-    </target>
-
     <!-- Section: test-integration -->
     <target name="-test-integration-check">
         <uptodate property="integration.test.notRequired" targetfile="${integration.testokfile}">