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

Undo changes to file in assertCloseDoesNotModifyFile to not have dirty files after running tests

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1722756 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Dominik Stadler 2016-01-03 21:37:52 +00:00
parent f54452a0e7
commit 0fe35af294
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/testcases/org/apache/poi/sl/usermodel/BaseTestSlideShowFactory.java
View File

@ -21,21 +21,18 @@ import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.fail; import static org.junit.Assert.fail;
import java.io.ByteArrayOutputStream;
import java.io.File; import java.io.File;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.ByteArrayOutputStream;
import org.apache.poi.POIDataSamples; import org.apache.poi.POIDataSamples;
import org.apache.poi.poifs.filesystem.NPOIFSFileSystem; import org.apache.poi.poifs.filesystem.NPOIFSFileSystem;
import org.apache.poi.util.POILogFactory;
import org.apache.poi.util.POILogger;
public class BaseTestSlideShowFactory { public class BaseTestSlideShowFactory {
private static final POIDataSamples _slTests = POIDataSamples.getSlideShowInstance(); private static final POIDataSamples _slTests = POIDataSamples.getSlideShowInstance();
private static final POILogger LOGGER = POILogFactory.getLogger(BaseTestSlideShowFactory.class);
protected static void testFactoryFromFile(String file) throws Exception { protected static void testFactoryFromFile(String file) throws Exception {
SlideShow<?,?> ss; SlideShow<?,?> ss;
@ -167,8 +164,23 @@ public class BaseTestSlideShowFactory {
final byte[] before = readFile(filename); final byte[] before = readFile(filename);
ss.close(); ss.close();
final byte[] after = readFile(filename); final byte[] after = readFile(filename);
assertArrayEquals(filename + " sample file was modified as a result of closing the slideshow",
before, after); try {
assertArrayEquals(filename + " sample file was modified as a result of closing the slideshow",
before, after);
} catch (AssertionError e) {
// if the file after closing is different, then re-set
// the file to the state before in order to not have a dirty SCM
// working tree when running this test
FileOutputStream str = new FileOutputStream(_slTests.getFile(filename));
try {
str.write(before);
} finally {
str.close();
}
throw e;
}
} }
private static File fromFile(String file) { private static File fromFile(String file) {