jdk-sandbox: comparison jdk/test/java/util/zip/InflateIn

equal deleted inserted replaced

-:63aa4b61c0a8
+:f01eda72e178
 * have any questions.
 */
 /**
 * @test
-* @bug 4206909
+* @bug 4206909 4813885
-* @summary Test basic functionality of DeflaterOutputStream and InflaterInputStream including flush
+* @summary Test basic functionality of DeflaterOutputStream/InflaterInputStream and GZIPOutputStream/GZIPInputStream, including flush
 */
 import java.io.*;
 import java.util.*;
 import java.util.zip.*;
 buf = newbuf;
 }
 }
 private static class PairedOutputStream extends ByteArrayOutputStream {
 private PairedInputStream pairedStream = null;
 public PairedOutputStream(PairedInputStream inputPair) {
 super();
 this.pairedStream = inputPair;
 }
 public void flush() {
 if (count > 0) {
 pairedStream.addBytes(buf, count);
 reset();
 }
 }
 public void close() {
 flush();
 }
 }
 private static boolean readFully(InputStream in, byte[] buf, int length)
 throws IOException {
 int pos = 0;
 dos.close();
 check(readFully(iis, buf, buf.length));
 check(Arrays.equals(data, buf));
 }
-/** Check that written, flushed and read */
+private static void check(InputStream is, OutputStream os)
-private static void WriteFlushRead() throws Throwable {
+throws Throwable
+{
 Random random = new Random(new Date().getTime());
+// Large writes
-PairedInputStream pis = new PairedInputStream();
-InflaterInputStream iis = new InflaterInputStream(pis);
-PairedOutputStream pos = new PairedOutputStream(pis);
-pis.setPairedOutputStream(pos);
-DeflaterOutputStream dos = new DeflaterOutputStream(pos, true);
-// Large writes
 for (int x = 0; x < 200 ; x++) {
 // byte[] data = new byte[random.nextInt(1024 * 1024)];
 byte[] data = new byte[1024];
 byte[] buf = new byte[data.length];
 random.nextBytes(data);
-dos.write(data);
+os.write(data);
-dos.flush();
+os.flush();
-check(readFully(iis, buf, buf.length));
+check(readFully(is, buf, buf.length));
 check(Arrays.equals(data, buf));
 }
 // Small writes
 for (int x = 0; x < 2000 ; x++) {
 byte[] data = new byte[random.nextInt(20) + 10];
 byte[] buf = new byte[data.length];
 random.nextBytes(data);
-dos.write(data);
+os.write(data);
-dos.flush();
+os.flush();
-if (!readFully(iis, buf, buf.length)) {
+if (!readFully(is, buf, buf.length)) {
 fail("Didn't read full buffer of " + buf.length);
 }
 check(Arrays.equals(data, buf));
 }
 String quit = "QUIT\r\n";
 // Close it out
-dos.write(quit.getBytes());
+os.write(quit.getBytes());
-dos.close();
+os.close();
 StringBuilder sb = new StringBuilder();
-check(readLineIfAvailable(iis, sb));
+check(readLineIfAvailable(is, sb));
 equal(sb.toString(), quit);
 }
-/** Validate that we need to use flush at least once on a line
+/** Check that written, flushed and read */
-* oriented protocol */
+private static void WriteFlushRead() throws Throwable {
-private static void LineOrientedProtocol() throws Throwable {
 PairedInputStream pis = new PairedInputStream();
 InflaterInputStream iis = new InflaterInputStream(pis);
 PairedOutputStream pos = new PairedOutputStream(pis);
 pis.setPairedOutputStream(pos);
 DeflaterOutputStream dos = new DeflaterOutputStream(pos, true);
+check(iis, dos);
+}
+private static void GZWriteFlushRead() throws Throwable {
+PairedInputStream pis = new PairedInputStream();
+PairedOutputStream pos = new PairedOutputStream(pis);
+pis.setPairedOutputStream(pos);
+GZIPOutputStream gos = new GZIPOutputStream(pos, true);
+gos.flush();  // flush the head out, so gis can read
+GZIPInputStream gis = new GZIPInputStream(pis);
+check(gis, gos);
+}
+private static void checkLOP(InputStream is, OutputStream os)
+throws Throwable
+{
 boolean flushed = false;
 int count = 0;
 // Do at least a certain number of lines, but too many without a
 // flush means this test isn't testing anything
 while ((count < 10 && flushed) || (count < 1000 && !flushed)) {
 String command = "PING " + count + "\r\n";
-dos.write(command.getBytes());
+os.write(command.getBytes());
 StringBuilder buf = new StringBuilder();
-if (!readLineIfAvailable(iis, buf)) {
+if (!readLineIfAvailable(is, buf)) {
 flushed = true;
-dos.flush();
+os.flush();
-check(readLineIfAvailable(iis, buf));
+check(readLineIfAvailable(is, buf));
 }
 equal(buf.toString(), command);
 count++;
 }
 check(flushed);
 }
+/** Validate that we need to use flush at least once on a line
+* oriented protocol */
+private static void LineOrientedProtocol() throws Throwable {
+PairedInputStream pis = new PairedInputStream();
+InflaterInputStream iis = new InflaterInputStream(pis);
+PairedOutputStream pos = new PairedOutputStream(pis);
+pis.setPairedOutputStream(pos);
+DeflaterOutputStream dos = new DeflaterOutputStream(pos, true);
+checkLOP(iis, dos);
+}
+private static void GZLineOrientedProtocol() throws Throwable {
+PairedInputStream pis = new PairedInputStream();
+PairedOutputStream pos = new PairedOutputStream(pis);
+pis.setPairedOutputStream(pos);
+GZIPOutputStream gos = new GZIPOutputStream(pos, true);
+gos.flush();  // flush the head out, so gis can read
+GZIPInputStream gis = new GZIPInputStream(pis);
+checkLOP(gis, gos);
+}
 public static void realMain(String[] args) throws Throwable {
 WriteCloseRead();
 WriteFlushRead();
 LineOrientedProtocol();
+GZWriteFlushRead();
+GZLineOrientedProtocol();
 }
 //--------------------- Infrastructure ---------------------------
 static volatile int passed = 0, failed = 0;
 static void pass() {passed++;}

changeset 5607	f01eda72e178
parent 4162	425328b81201
child 5627	e636ac7a63a4