From fd8ff8a2e6bba1e9804b22643576a76be947dfae Mon Sep 17 00:00:00 2001 From: duke Date: Fri, 20 Sep 2024 11:41:40 +0000 Subject: [PATCH] Backport 9451677daaf1184f67759c87114af3f81fa74f23 --- .../util/zip/DeflaterDictionaryTests.java | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/test/jdk/java/util/zip/DeflaterDictionaryTests.java b/test/jdk/java/util/zip/DeflaterDictionaryTests.java index 17d2b735806..ebbe441e70d 100644 --- a/test/jdk/java/util/zip/DeflaterDictionaryTests.java +++ b/test/jdk/java/util/zip/DeflaterDictionaryTests.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2020, 2024 Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -95,9 +95,9 @@ public void testByteArray(int dictionary_offset) throws Exception { deflater.setInput(input); deflater.finish(); int compressedDataLength = deflater.deflate(output, 0, output.length, Deflater.NO_FLUSH); - System.out.printf("Deflater::getTotalOut:%s, Deflater::getAdler: %s," + - " compressed length: %s%n", deflater.getTotalOut(), - deflater.getTotalOut(), compressedDataLength); + System.out.printf("Deflater::getBytesWritten:%d, Deflater::getAdler: %d," + + " compressed length: %d%n", deflater.getBytesWritten(), + deflater.getAdler(), compressedDataLength); deflater.finished(); // Decompress the bytes @@ -112,7 +112,7 @@ public void testByteArray(int dictionary_offset) throws Exception { System.out.println("Did not need to use a Dictionary"); } inflater.finished(); - System.out.printf("Inflater::getAdler:%s, length: %s%n", + System.out.printf("Inflater::getAdler:%d, length: %d%n", inflater.getAdler(), resultLength); Assert.assertEquals(SRC_DATA.length(), resultLength); @@ -143,9 +143,9 @@ public void testHeapByteBuffer() throws Exception { deflater.setInput(input); deflater.finish(); int compressedDataLength = deflater.deflate(output, 0, output.length, Deflater.NO_FLUSH); - System.out.printf("Deflater::getTotalOut:%s, Deflater::getAdler: %s," + - " compressed length: %s%n", deflater.getTotalOut(), - deflater.getTotalOut(), compressedDataLength); + System.out.printf("Deflater::getBytesWritten:%d, Deflater::getAdler: %d," + + " compressed length: %d%n", deflater.getBytesWritten(), + deflater.getAdler(), compressedDataLength); deflater.finished(); // Decompress the bytes @@ -160,7 +160,7 @@ public void testHeapByteBuffer() throws Exception { System.out.println("Did not need to use a Dictionary"); } inflater.finished(); - System.out.printf("Inflater::getAdler:%s, length: %s%n", + System.out.printf("Inflater::getAdler:%d, length: %d%n", inflater.getAdler(), resultLength); Assert.assertEquals(SRC_DATA.length(), resultLength); @@ -197,9 +197,9 @@ public void testByteBufferDirect() throws Exception { deflater.setInput(input); deflater.finish(); int compressedDataLength = deflater.deflate(output, 0, output.length, Deflater.NO_FLUSH); - System.out.printf("Deflater::getTotalOut:%s, Deflater::getAdler: %s," + - " compressed length: %s%n", deflater.getTotalOut(), - deflater.getTotalOut(), compressedDataLength); + System.out.printf("Deflater::getBytesWritten:%d, Deflater::getAdler: %d," + + " compressed length: %d%n", deflater.getBytesWritten(), + deflater.getAdler(), compressedDataLength); deflater.finished(); // Decompress the bytes @@ -214,7 +214,7 @@ public void testByteBufferDirect() throws Exception { System.out.println("Did not need to use a Dictionary"); } inflater.finished(); - System.out.printf("Inflater::getAdler:%s, length: %s%n", + System.out.printf("Inflater::getAdler:%d, length: %d%n", inflater.getAdler(), resultLength); Assert.assertEquals(SRC_DATA.length(), resultLength);