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

Remove workarounds for IBM JDK and JDK patchlevel 21.0.1

Browse Source 
IBM JDK 11 seems to be fixed and we do not expect to run
tests with JDK 21.0.1 anymore
This commit is contained in:
Dominik Stadler 2025-11-16 14:17:22 +01:00
parent cd22293975
commit 73b904f16d
1 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
poi-ooxml/src/test/java/org/apache/poi/poifs/crypt/dsig/TestSignatureInfo.java
View File

@ -253,14 +253,7 @@ class TestSignatureInfo {
SignatureInfo si = new SignatureInfo();
si.setOpcPackage(pkg);
si.setSignatureConfig(sic);
boolean isValid = si.verifySignature();
// We reported https://bugs.openjdk.org/browse/JDK-8320597 because of this, it will be fixed in JDK 22
// and maybe in newer JDK 21 patch-levels
assumeTrue(isValid && !"21.0.1".equals(System.getProperty("java.version")),
"This fails on JDK 21.0.1, see https://bugs.openjdk.org/browse/JDK-8320597");
assertTrue(isValid,
assertTrue(si.verifySignature(),
// add some details to find out why "verifySignature()" returns false sometimes
"Failed for " + System.getProperty("java.version") +
": Verifying signature failed, hasNext: " + si.getSignatureParts().iterator().hasNext() + ": " +
@ -638,8 +631,6 @@ class TestSignatureInfo {
@Test
void testCertChain() throws Exception {
final boolean isIBM = System.getProperty("java.vendor").contains("IBM");
DummyKeystore ks = new DummyKeystore(testdata.getFile("chaintest.pfx"), STORE_PASS);
KeyCertPair certPair = ks.getKeyPair("poitest", "test");
@ -664,10 +655,7 @@ class TestSignatureInfo {
X509Certificate signer = sp.getSigner();
assertNotNull(signer, "signer undefined?!");
List<X509Certificate> certChainRes = sp.getCertChain();
// IBM JDK is still buggy, even after fix for APAR IJ21985
int exp = isIBM ? 1 : 3;
assertEquals(exp, certChainRes.size());
assertEquals(3, certChainRes.size());
}
}