Author: centic
Date: Fri Jul 29 17:07:05 2022
New Revision: 1903103
URL: http://svn.apache.org/viewvc?rev=1903103&view=rev
Log:
Also look for test-data in parent-directory
When using the IDE to run tests in one of the
sub-modules uses the poi-* sub-directory, so
looking for the test-data in ../test-data is
useful to make executing tests work out-of-the-box
Modified:
poi/trunk/poi-integration/src/test/java/org/apache/poi/stress/TestAllFiles.java
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/ooxml/TestTriggerCoverage.java
poi/trunk/poi/src/test/java/org/apache/poi/hssf/dev/BaseTestIteratingXLS.java
poi/trunk/poi/src/test/java/org/apache/poi/hssf/model/TestDrawingAggregate.java
Modified:
poi/trunk/poi-integration/src/test/java/org/apache/poi/stress/TestAllFiles.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-integration/src/test/java/org/apache/poi/stress/TestAllFiles.java?rev=1903103&r1=1903102&r2=1903103&view=diff
==============================================================================
---
poi/trunk/poi-integration/src/test/java/org/apache/poi/stress/TestAllFiles.java
(original)
+++
poi/trunk/poi-integration/src/test/java/org/apache/poi/stress/TestAllFiles.java
Fri Jul 29 17:07:05 2022
@@ -33,6 +33,7 @@ import java.util.List;
import java.util.Set;
import java.util.stream.Stream;
+import org.apache.poi.POIDataSamples;
import org.apache.poi.hssf.record.crypto.Biff8EncryptionKey;
import org.apache.tools.ant.DirectoryScanner;
import org.junit.jupiter.api.function.Executable;
@@ -71,7 +72,15 @@ import org.opentest4j.AssertionFailedErr
@Execution(ExecutionMode.CONCURRENT)
public class TestAllFiles {
private static final String DEFAULT_TEST_DATA_PATH = "test-data";
- public static final File ROOT_DIR = new
File(System.getProperty("POI.testdata.path", DEFAULT_TEST_DATA_PATH));
+ public static final File ROOT_DIR;
+ static {
+ File dir = new
File(System.getProperty(POIDataSamples.TEST_PROPERTY, DEFAULT_TEST_DATA_PATH));
+ if (!dir.exists()) {
+ dir = new
File(System.getProperty(POIDataSamples.TEST_PROPERTY, "../" +
DEFAULT_TEST_DATA_PATH));
+ }
+
+ ROOT_DIR = dir;
+ }
public static final String[] SCAN_EXCLUDES = {
"**/.svn/**",
Modified:
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/ooxml/TestTriggerCoverage.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/test/java/org/apache/poi/ooxml/TestTriggerCoverage.java?rev=1903103&r1=1903102&r2=1903103&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/ooxml/TestTriggerCoverage.java
(original)
+++
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/ooxml/TestTriggerCoverage.java
Fri Jul 29 17:07:05 2022
@@ -70,6 +70,10 @@ class TestTriggerCoverage {
dataDirName = "test-data";
}
+ if (!new File(dataDirName).exists()) {
+ dataDirName = "../test-data";
+ }
+
List<Arguments> files = new ArrayList<>();
findFile(files, dataDirName + "/integration");
Modified:
poi/trunk/poi/src/test/java/org/apache/poi/hssf/dev/BaseTestIteratingXLS.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi/src/test/java/org/apache/poi/hssf/dev/BaseTestIteratingXLS.java?rev=1903103&r1=1903102&r2=1903103&view=diff
==============================================================================
---
poi/trunk/poi/src/test/java/org/apache/poi/hssf/dev/BaseTestIteratingXLS.java
(original)
+++
poi/trunk/poi/src/test/java/org/apache/poi/hssf/dev/BaseTestIteratingXLS.java
Fri Jul 29 17:07:05 2022
@@ -50,7 +50,8 @@ public abstract class BaseTestIteratingX
};
public Stream<Arguments> files() {
- String dataDirName = System.getProperty(POIDataSamples.TEST_PROPERTY,
"test-data");
+ String dataDirName = System.getProperty(POIDataSamples.TEST_PROPERTY,
+ new File("test-data").exists() ? "test-data" : "../test-data");
DirectoryScanner scanner = new DirectoryScanner();
scanner.setBasedir(dataDirName);
Modified:
poi/trunk/poi/src/test/java/org/apache/poi/hssf/model/TestDrawingAggregate.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi/src/test/java/org/apache/poi/hssf/model/TestDrawingAggregate.java?rev=1903103&r1=1903102&r2=1903103&view=diff
==============================================================================
---
poi/trunk/poi/src/test/java/org/apache/poi/hssf/model/TestDrawingAggregate.java
(original)
+++
poi/trunk/poi/src/test/java/org/apache/poi/hssf/model/TestDrawingAggregate.java
Fri Jul 29 17:07:05 2022
@@ -33,6 +33,7 @@ import java.util.Map;
import java.util.stream.Stream;
import org.apache.commons.io.output.UnsynchronizedByteArrayOutputStream;
+import org.apache.poi.POIDataSamples;
import org.apache.poi.ddf.DefaultEscherRecordFactory;
import org.apache.poi.ddf.EscherContainerRecord;
import org.apache.poi.ddf.EscherDggRecord;
@@ -127,7 +128,12 @@ class TestDrawingAggregate {
}
public static Stream<Arguments> samples() {
- File testData = new File(System.getProperty("POI.testdata.path"),
"spreadsheet");
+ String property = System.getProperty(POIDataSamples.TEST_PROPERTY,
"test-data");
+ File testData = new File(property, "spreadsheet");
+ if (!testData.exists()) {
+ testData = new File("../" + property, "spreadsheet");
+ }
+
File[] files = testData.listFiles((dir, name) ->
name.endsWith(".xls"));
assertNotNull(files, "Need to find files in test-data path, had path:
" + testData);
return Stream.of(files).map(Arguments::of);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
