pashko/apache-poi
1
0
Fork 0
mirror of https://github.com/apache/poi.git synced 2026-02-27 20:40:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Also look for test-data in parent-directory

Browse Source 
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

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1903103 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Dominik Stadler 2022-07-29 17:07:05 +00:00
parent 5c78170f5d
commit 92b8cf9984
4 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
poi-integration/src/test/java/org/apache/poi/stress/TestAllFiles.java
View File

@ -33,6 +33,7 @@ import java.util.List;
import java.util.Set; import java.util.Set;
import java.util.stream.Stream; import java.util.stream.Stream;
import org.apache.poi.POIDataSamples;
import org.apache.poi.hssf.record.crypto.Biff8EncryptionKey; import org.apache.poi.hssf.record.crypto.Biff8EncryptionKey;
import org.apache.tools.ant.DirectoryScanner; import org.apache.tools.ant.DirectoryScanner;
import org.junit.jupiter.api.function.Executable; import org.junit.jupiter.api.function.Executable;
@ -71,7 +72,15 @@ import org.opentest4j.AssertionFailedError;
@Execution(ExecutionMode.CONCURRENT) @Execution(ExecutionMode.CONCURRENT)
public class TestAllFiles { public class TestAllFiles {
private static final String DEFAULT_TEST_DATA_PATH = "test-data"; 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 = { public static final String[] SCAN_EXCLUDES = {
"**/.svn/**", "**/.svn/**",

4
poi-ooxml/src/test/java/org/apache/poi/ooxml/TestTriggerCoverage.java
View File

@ -70,6 +70,10 @@ class TestTriggerCoverage {
dataDirName = "test-data"; dataDirName = "test-data";
} }
if (!new File(dataDirName).exists()) {
dataDirName = "../test-data";
}
List<Arguments> files = new ArrayList<>(); List<Arguments> files = new ArrayList<>();
findFile(files, dataDirName + "/integration"); findFile(files, dataDirName + "/integration");

3
poi/src/test/java/org/apache/poi/hssf/dev/BaseTestIteratingXLS.java
View File

@ -50,7 +50,8 @@ public abstract class BaseTestIteratingXLS {
}; };
public Stream<Arguments> files() { 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(); DirectoryScanner scanner = new DirectoryScanner();
scanner.setBasedir(dataDirName); scanner.setBasedir(dataDirName);

8
poi/src/test/java/org/apache/poi/hssf/model/TestDrawingAggregate.java
View File

@ -33,6 +33,7 @@ import java.util.Map;
import java.util.stream.Stream; import java.util.stream.Stream;
import org.apache.commons.io.output.UnsynchronizedByteArrayOutputStream; import org.apache.commons.io.output.UnsynchronizedByteArrayOutputStream;
import org.apache.poi.POIDataSamples;
import org.apache.poi.ddf.DefaultEscherRecordFactory; import org.apache.poi.ddf.DefaultEscherRecordFactory;
import org.apache.poi.ddf.EscherContainerRecord; import org.apache.poi.ddf.EscherContainerRecord;
import org.apache.poi.ddf.EscherDggRecord; import org.apache.poi.ddf.EscherDggRecord;
@ -127,7 +128,12 @@ class TestDrawingAggregate {
} }
public static Stream<Arguments> samples() { 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")); File[] files = testData.listFiles((dir, name) -> name.endsWith(".xls"));
assertNotNull(files, "Need to find files in test-data path, had path: " + testData); assertNotNull(files, "Need to find files in test-data path, had path: " + testData);
return Stream.of(files).map(Arguments::of); return Stream.of(files).map(Arguments::of);