Skip to content

Commit 8f5f8f3

Browse files
committed
8326100: DeflaterDictionaryTests should use Deflater.getBytesWritten instead of Deflater.getTotalOut
Backport-of: 9451677daaf1184f67759c87114af3f81fa74f23
1 parent 1dcecb3 commit 8f5f8f3

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

test/jdk/java/util/zip/DeflaterDictionaryTests.java

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2020, 2024 Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* 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 {
9595
deflater.setInput(input);
9696
deflater.finish();
9797
int compressedDataLength = deflater.deflate(output, 0, output.length, Deflater.NO_FLUSH);
98-
System.out.printf("Deflater::getTotalOut:%s, Deflater::getAdler: %s," +
99-
" compressed length: %s%n", deflater.getTotalOut(),
100-
deflater.getTotalOut(), compressedDataLength);
98+
System.out.printf("Deflater::getBytesWritten:%d, Deflater::getAdler: %d," +
99+
" compressed length: %d%n", deflater.getBytesWritten(),
100+
deflater.getAdler(), compressedDataLength);
101101
deflater.finished();
102102

103103
// Decompress the bytes
@@ -112,7 +112,7 @@ public void testByteArray(int dictionary_offset) throws Exception {
112112
System.out.println("Did not need to use a Dictionary");
113113
}
114114
inflater.finished();
115-
System.out.printf("Inflater::getAdler:%s, length: %s%n",
115+
System.out.printf("Inflater::getAdler:%d, length: %d%n",
116116
inflater.getAdler(), resultLength);
117117

118118
Assert.assertEquals(SRC_DATA.length(), resultLength);
@@ -143,9 +143,9 @@ public void testHeapByteBuffer() throws Exception {
143143
deflater.setInput(input);
144144
deflater.finish();
145145
int compressedDataLength = deflater.deflate(output, 0, output.length, Deflater.NO_FLUSH);
146-
System.out.printf("Deflater::getTotalOut:%s, Deflater::getAdler: %s," +
147-
" compressed length: %s%n", deflater.getTotalOut(),
148-
deflater.getTotalOut(), compressedDataLength);
146+
System.out.printf("Deflater::getBytesWritten:%d, Deflater::getAdler: %d," +
147+
" compressed length: %d%n", deflater.getBytesWritten(),
148+
deflater.getAdler(), compressedDataLength);
149149
deflater.finished();
150150

151151
// Decompress the bytes
@@ -160,7 +160,7 @@ public void testHeapByteBuffer() throws Exception {
160160
System.out.println("Did not need to use a Dictionary");
161161
}
162162
inflater.finished();
163-
System.out.printf("Inflater::getAdler:%s, length: %s%n",
163+
System.out.printf("Inflater::getAdler:%d, length: %d%n",
164164
inflater.getAdler(), resultLength);
165165

166166
Assert.assertEquals(SRC_DATA.length(), resultLength);
@@ -197,9 +197,9 @@ public void testByteBufferDirect() throws Exception {
197197
deflater.setInput(input);
198198
deflater.finish();
199199
int compressedDataLength = deflater.deflate(output, 0, output.length, Deflater.NO_FLUSH);
200-
System.out.printf("Deflater::getTotalOut:%s, Deflater::getAdler: %s," +
201-
" compressed length: %s%n", deflater.getTotalOut(),
202-
deflater.getTotalOut(), compressedDataLength);
200+
System.out.printf("Deflater::getBytesWritten:%d, Deflater::getAdler: %d," +
201+
" compressed length: %d%n", deflater.getBytesWritten(),
202+
deflater.getAdler(), compressedDataLength);
203203
deflater.finished();
204204

205205
// Decompress the bytes
@@ -214,7 +214,7 @@ public void testByteBufferDirect() throws Exception {
214214
System.out.println("Did not need to use a Dictionary");
215215
}
216216
inflater.finished();
217-
System.out.printf("Inflater::getAdler:%s, length: %s%n",
217+
System.out.printf("Inflater::getAdler:%d, length: %d%n",
218218
inflater.getAdler(), resultLength);
219219

220220
Assert.assertEquals(SRC_DATA.length(), resultLength);

0 commit comments

Comments
 (0)