diff options
| -rw-r--r-- | src/testcases/org/apache/poi/ss/usermodel/BaseTestBugzillaIssues.java | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/src/testcases/org/apache/poi/ss/usermodel/BaseTestBugzillaIssues.java b/src/testcases/org/apache/poi/ss/usermodel/BaseTestBugzillaIssues.java index c79abea7dc..a82a2a8681 100644 --- a/src/testcases/org/apache/poi/ss/usermodel/BaseTestBugzillaIssues.java +++ b/src/testcases/org/apache/poi/ss/usermodel/BaseTestBugzillaIssues.java @@ -39,6 +39,7 @@ import java.util.List; import java.util.Map; import org.apache.poi.hssf.usermodel.HSSFWorkbook; +import org.apache.poi.poifs.filesystem.FileMagic; import org.apache.poi.ss.ITestDataProvider; import org.apache.poi.ss.SpreadsheetVersion; import org.apache.poi.ss.formula.FormulaParseException; @@ -1827,8 +1828,25 @@ public abstract class BaseTestBugzillaIssues { out1.flush(); out2.flush(); - assertArrayEquals(out1.toByteArray(), out2.toByteArray()); + // to avoid flaky tests if the documents are written at slightly different timestamps + // we clear some bytes which contain timestamps + assertArrayEquals( + removeTimestamp(out1.toByteArray()), + removeTimestamp(out2.toByteArray())); } } } -}
\ No newline at end of file + + private byte[] removeTimestamp(byte[] bytes) { + if (FileMagic.valueOf(bytes) == FileMagic.OOXML) { + // This removes the timestamp in the header of the ZIP-Format + // see "Local file header" at https://pkware.cachefly.net/webdocs/casestudies/APPNOTE.TXT + bytes[10] = 0; + bytes[11] = 0; + bytes[12] = 0; + bytes[13] = 0; + } + + return bytes; + } +} |