Author: kiwiwings
Date: Fri Dec 25 01:42:10 2020
New Revision: 1884785
URL: http://svn.apache.org/viewvc?rev=1884785&view=rev
Log:
try to fix distsourcebuild error
Modified:
poi/trunk/build.xml
poi/trunk/src/excelant/poi-ant-contrib/Junit5Progress.java
Modified: poi/trunk/build.xml
URL:
http://svn.apache.org/viewvc/poi/trunk/build.xml?rev=1884785&r1=1884784&r2=1884785&view=diff
==============================================================================
--- poi/trunk/build.xml (original)
+++ poi/trunk/build.xml Fri Dec 25 01:42:10 2020
@@ -1239,7 +1239,7 @@ under the License.
<length string="@{module2}" when="greater" length="0"/>
</condition>
- <delete file="build/status-as-tests-run.txt" failonerror="false"/>
+ <delete file="@{outputDir}/status-as-tests-run.txt"
failonerror="false"/>
<!-- As of 2018, JaCoCo is managing expectations and stay on Java
5 and therefore don't support junitlauncher -->
<!-- https://github.com/jacoco/jacoco/issues/673 ... m( -->
@@ -1255,6 +1255,7 @@ under the License.
<testclasses outputDir="@{outputDir}">
<fork>
+ <sysproperty key="junit5.progress.file"
value="@{outputDir}/status-as-tests-run.txt"/>
<syspropertyset refid="junit.properties"/>
<sysproperty key="java.io.tmpdir" value="${tempdir}"/>
<jvmarg value="-Xmx@{heap}M"/>
@@ -1279,14 +1280,15 @@ under the License.
<jvmarg line="--add-modules org.apache.poi.@{module2}"
if:set="use_module2"/>
</fork>
+ <!-- can't use resultfile="status-as-tests-run.txt" here
... it's truncated with every test -->
+ <listener classname="Junit5Progress"
outputDir="@{outputDir}" />
<listener type="legacy-plain" sendSysOut="true"
outputDir="@{outputDir}"/>
<listener type="legacy-xml" sendSysOut="true"
sendSysErr="true" outputDir="@{outputDir}"/>
- <listener classname="Junit5Progress"/>
<elements/>
</testclasses>
</junitlauncher>
- <loadfile property="contents"
srcFile="build/status-as-tests-run.txt" />
+ <loadfile property="contents"
srcFile="@{outputDir}/status-as-tests-run.txt" />
<echo message="${contents}" />
</sequential>
</macrodef>
Modified: poi/trunk/src/excelant/poi-ant-contrib/Junit5Progress.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/excelant/poi-ant-contrib/Junit5Progress.java?rev=1884785&r1=1884784&r2=1884785&view=diff
==============================================================================
--- poi/trunk/src/excelant/poi-ant-contrib/Junit5Progress.java (original)
+++ poi/trunk/src/excelant/poi-ant-contrib/Junit5Progress.java Fri Dec 25
01:42:10 2020
@@ -36,7 +36,7 @@ import org.junit.platform.launcher.TestP
**/
public class Junit5Progress implements TestExecutionListener {
- private StringWriter inMemoryWriter = new StringWriter();
+ private final StringWriter inMemoryWriter = new StringWriter();
private int numSkippedInCurrentClass;
private int numAbortedInCurrentClass;
@@ -97,10 +97,14 @@ public class Junit5Progress implements T
}
/*
- * Append to file on disk since listener can't write to System.out
(becuase legacy listeners enabled)
+ * Append to file on disk since listener can't write to System.out
(because legacy listeners enabled)
+ *
+ * Implementing/using the TestResultFormatter - mentioned in the
junitlauncher ant manual -
+ * doesn't work currently, because the output is truncated/overwritten
with every test
*/
private void flushToDisk() {
- try (FileWriter writer = new
FileWriter("build/status-as-tests-run.txt", true)) {
+ String outFile = System.getProperty("junit5.progress.file",
"build/status-as-tests-run.txt");
+ try (FileWriter writer = new FileWriter(outFile, true)) {
writer.write(inMemoryWriter.toString());
} catch (IOException e) {
throw new UncheckedIOException(e);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@poi.apache.org
For additional commands, e-mail: commits-h...@poi.apache.org
