moparisthebest/poi
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

use woodstox property on all junit calls

Browse Source 
move test system properties to junit propertyset

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1694751 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Andreas Beeker 2015-08-07 23:33:30 +00:00
parent 7c8f544b9f
commit 8635ec311c
1 changed files with 293 additions and 297 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
build.xml
View File

@ -73,20 +73,28 @@ under the License.
<!-- issue warnings if source code contains unmappable characters for encoding ASCII -->
<property name="java.source.encoding" value="ASCII"/>
<scriptdef name="propertyreset" language="javascript"
description="Allows to assign @{property} new value">
<attribute name="name"/>
<attribute name="value"/>
project.setProperty(attributes.get("name"), attributes.get("value"));
</scriptdef>
<!--
JVM system properties for running tests,
user.language and user.country are required as we have locale-sensitive formatters
-->
<property name="testpattern" value="Test*"/>
<property name="poi.test.locale" value="-Duser.language=en -Duser.country=US"/>
<property name="POI.testdata.path" value="test-data"/>
<property name="java.awt.headless" value="true"/>
<property name="additionaljar" value=""/>
<condition property="http_proxy"
value="${env.http_proxy}"
else="">
<propertyreset name="user.language" value="en"/>
<propertyreset name="user.country" value="US"/>
<condition property="http_proxy" value="${env.http_proxy}" else="">
<isset property="env.http_proxy"/>
</condition>
<!-- Fix for strange woodstox references in gump build -->
<property name="javax.xml.stream.XMLInputFactory" value="com.sun.xml.internal.stream.XMLInputFactoryImpl"/>
<!-- Main: -->
<property name="main.resource1.dir" value="src/resources/main"/>
@ -111,7 +119,6 @@ under the License.
<property name="geometry.pkg" value="org.apache.poi.sl.draw.binding"/>
<property name="geometry.output.tmpdir" value="build/geometry-java"/>
<!-- Examples: -->
<property name="examples.src" location="src/examples/src"/>
<property name="examples.output.dir" location="build/examples-classes"/>
@ -239,6 +246,10 @@ under the License.
<propertyref name="java.awt.headless"/>
<propertyref name="org.apache.poi.util.POILogger"/>
<propertyref name="http_proxy"/>
<propertyref name="additionaljar"/>
<propertyref name="user.language"/>
<propertyref name="user.country"/>
<propertyref name="javax.xml.stream.XMLInputFactory"/>
</propertyset>
<path id="main.classpath">
@ -329,6 +340,7 @@ under the License.
<pathelement location="${main.ant.jar}"/>
<pathelement location="${ooxml.output.dir}"/>
</path>
<path id="test.excelant.classpath">
<path refid="ooxml.classpath"/>
<pathelement location="${ooxml.output.dir}"/>
@ -1004,10 +1016,8 @@ under the License.
failureproperty="main.test.failed" showoutput="true">
<classpath refid="test.classpath"/>
<syspropertyset refid="junit.properties"/>
<jvmarg value="${poi.test.locale}"/>
<jvmarg value="-ea"/>
<jvmarg value="-Xmx256m"/>
<jvmarg value="-Dadditionaljar=${additionaljar}"/>
<formatter type="plain"/>
<formatter type="xml"/>
<batchtest todir="${main.reports.test}">
@ -1047,9 +1057,7 @@ under the License.
failureproperty="scratchpad.test.failed">
<classpath refid="test.scratchpad.classpath"/>
<syspropertyset refid="junit.properties"/>
<jvmarg value="${poi.test.locale}"/>
<jvmarg value="-ea"/>
<jvmarg value="-Dadditionaljar=${additionaljar}"/>
<!--
YK: ensure that JUnit has enough memory to run tests.
Without the line below tests fail on Mac OS X with jdk-1.6.26
@ -1090,9 +1098,7 @@ under the License.
failureproperty="ooxml.test.failed">
<classpath refid="@{classpath}"/>
<syspropertyset refid="junit.properties"/>
<jvmarg value="${poi.test.locale}"/>
<jvmarg value="-ea"/>
<jvmarg value="-Dadditionaljar=${additionaljar}"/>
<formatter type="plain"/>
<formatter type="xml"/>
<batchtest todir="${ooxml.reports.test}">
@ -1113,9 +1119,7 @@ under the License.
<path refid="ooxml.xmlsec.classpath"/>
</classpath>
<syspropertyset refid="junit.properties"/>
<jvmarg value="${poi.test.locale}"/>
<jvmarg value="-ea"/>
<jvmarg value="-Dadditionaljar=${additionaljar}"/>
<formatter type="plain"/>
<formatter type="xml"/>
<batchtest todir="${ooxml.reports.test}">
@ -1151,7 +1155,6 @@ under the License.
failureproperty="integration.test.failed" showoutput="true">
<classpath refid="test.integration.classpath"/>
<syspropertyset refid="junit.properties"/>
<jvmarg value="${poi.test.locale}"/>
<jvmarg value="-ea"/>
<!--
YK: ensure that JUnit has enough memory to run tests.
@ -1159,7 +1162,6 @@ under the License.
and on Windows with jdk-1.5.22
-->
<jvmarg value="-Xmx1512M"/>
<jvmarg value="-Dadditionaljar=${additionaljar}"/>
<formatter type="plain"/>
<formatter type="xml"/>
<batchtest todir="${integration.reports.test}">
@ -1194,10 +1196,6 @@ under the License.
<classpath refid="test.ooxml.classpath"/>
<classpath refid="ooxml.xmlsec.classpath"/>
<syspropertyset refid="junit.properties"/>
<jvmarg value="${poi.test.locale}"/>
<jvmarg value="-Dadditionaljar=${additionaljar}"/>
<!-- Fix for strange woodstox references in gump build -->
<jvmarg value="-Djavax.xml.stream.XMLInputFactory=com.sun.xml.internal.stream.XMLInputFactoryImpl"/>
<arg value="-ooxml"/>
<arg value="${ooxml.lite-merged.dir}/ooxml-lite-merged.jar"/>
<arg value="-test"/>
@ -1231,9 +1229,7 @@ under the License.
failureproperty="excelant.test.failed">
<classpath refid="test.excelant.classpath"/>
<syspropertyset refid="junit.properties"/>
<jvmarg value="${poi.test.locale}"/>
<jvmarg value="-ea"/>
<jvmarg value="-Dadditionaljar=${additionaljar}"/>
<formatter type="plain"/>
<formatter type="xml"/>
<batchtest todir="${excelant.reports.test}">