From e90af48d8974cc946e6994f58bd05a49339bb1d7 Mon Sep 17 00:00:00 2001 From: Anthony Vanelverdinghe Date: Thu, 23 Feb 2023 17:53:04 +0100 Subject: [PATCH] Make Base64Test independent of JDK --- .../java/org/java_websocket/util/Base64Test.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/test/java/org/java_websocket/util/Base64Test.java b/src/test/java/org/java_websocket/util/Base64Test.java index 41122d77..4382aab6 100644 --- a/src/test/java/org/java_websocket/util/Base64Test.java +++ b/src/test/java/org/java_websocket/util/Base64Test.java @@ -41,16 +41,22 @@ public void testEncodeBytes() throws IOException { Assert.assertEquals("", Base64.encodeBytes(new byte[0])); Assert.assertEquals("QHE=", Base64.encodeBytes(new byte[]{49, 121, 64, 113, -63, 43, -24, 62, 4, 48}, 2, 2, 0)); - Assert.assertEquals("H4sIAAAAAAAAADMEALfv3IMBAAAA", + assertGzipEncodedBytes("H4sIAAAAAAAA", "MEALfv3IMBAAAA", Base64.encodeBytes(new byte[]{49, 121, 64, 113, -63, 43, -24, 62, 4, 48}, 0, 1, 6)); - Assert.assertEquals("H4sIAAAAAAAAAHMoBABQHKKWAgAAAA==", + assertGzipEncodedBytes("H4sIAAAAAAAA", "MoBABQHKKWAgAAAA==", Base64.encodeBytes(new byte[]{49, 121, 64, 113, -63, 43, -24, 62, 4, 48}, 2, 2, 18)); Assert.assertEquals("F63=", Base64.encodeBytes(new byte[]{49, 121, 64, 113, 63, 43, -24, 62, 4, 48}, 2, 2, 32)); - Assert.assertEquals("6sg7---------6Bc0-0F699L-V----==", + assertGzipEncodedBytes("6sg7--------", "Bc0-0F699L-V----==", Base64.encodeBytes(new byte[]{49, 121, 64, 113, 63, 43, -24, 62, 4, 48}, 2, 2, 34)); } + // see https://bugs.openjdk.org/browse/JDK-8253142 + private void assertGzipEncodedBytes(String expectedPrefix, String expectedSuffix, String actual) { + Assert.assertTrue(actual.startsWith(expectedPrefix)); + Assert.assertTrue(actual.endsWith(expectedSuffix)); + } + @Test public void testEncodeBytes2() throws IOException { thrown.expect(IllegalArgumentException.class);