diff options
author | Dominik Stadler <centic@apache.org> | 2021-04-15 14:25:44 +0000 |
---|---|---|
committer | Dominik Stadler <centic@apache.org> | 2021-04-15 14:25:44 +0000 |
commit | 0484610a9cc9713e9689aea954c4b43667540d17 (patch) | |
tree | e5856b54483f34dc85d08c5d4616f67ff7d40984 /poi-scratchpad/src/test | |
parent | 930e57665998099e8a4af61a96b4338144088e6d (diff) | |
download | poi-0484610a9cc9713e9689aea954c4b43667540d17.tar.gz poi-0484610a9cc9713e9689aea954c4b43667540d17.zip |
Junit 5: Run some tests which change static BYTE_ARRAY_MAX_OVERRIDE in isolation
Otherwise many other tests can become flaky if the value is set very low
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1888792 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'poi-scratchpad/src/test')
-rw-r--r-- | poi-scratchpad/src/test/java/org/apache/poi/hslf/dev/BaseTestPPTIterating.java | 5 | ||||
-rw-r--r-- | poi-scratchpad/src/test/java/org/apache/poi/hslf/dev/TestSlideShowDumper.java | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/poi-scratchpad/src/test/java/org/apache/poi/hslf/dev/BaseTestPPTIterating.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/dev/BaseTestPPTIterating.java index 6722f00f41..980d6538e8 100644 --- a/poi-scratchpad/src/test/java/org/apache/poi/hslf/dev/BaseTestPPTIterating.java +++ b/poi-scratchpad/src/test/java/org/apache/poi/hslf/dev/BaseTestPPTIterating.java @@ -21,7 +21,6 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import java.io.File; import java.io.PrintStream; -import java.io.UnsupportedEncodingException; import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; @@ -38,10 +37,12 @@ import org.apache.poi.util.IOUtils; import org.apache.poi.util.NullPrintStream; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.parallel.Isolated; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; +@Isolated // this test changes global static BYTE_ARRAY_MAX_OVERRIDE public abstract class BaseTestPPTIterating { protected static final Set<String> OLD_FILES = new HashSet<>(); static { @@ -76,7 +77,7 @@ public abstract class BaseTestPPTIterating { private final PrintStream save = System.out; @BeforeEach - void setUpBase() throws UnsupportedEncodingException { + void setUpBase() { // set a higher max allocation limit as some test-files require more IOUtils.setByteArrayMaxOverride(5*1024*1024); diff --git a/poi-scratchpad/src/test/java/org/apache/poi/hslf/dev/TestSlideShowDumper.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/dev/TestSlideShowDumper.java index 51b9ee5d69..5eecf4370f 100644 --- a/poi-scratchpad/src/test/java/org/apache/poi/hslf/dev/TestSlideShowDumper.java +++ b/poi-scratchpad/src/test/java/org/apache/poi/hslf/dev/TestSlideShowDumper.java @@ -29,7 +29,9 @@ import org.apache.poi.EmptyFileException; import org.apache.poi.hslf.HSLFTestDataSamples; import org.apache.poi.util.IOUtils; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.parallel.Isolated; +@Isolated // this test changes global static BYTE_ARRAY_MAX_OVERRIDE public class TestSlideShowDumper extends BaseTestPPTIterating { private static final Set<String> FAILING = new HashSet<>(); static { |