From 7311cf33b7e9bb0306220552f13a3dfb80d2aaf8 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Thu, 19 Jan 2017 13:25:56 +0000
Subject: [PATCH] Utils: Gzip test code refresh
---
.../net/i2p/util/ReusableGZIPInputStream.java | 26 +++++++++----------
.../i2p/util/ReusableGZIPOutputStream.java | 10 +++----
2 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/core/java/src/net/i2p/util/ReusableGZIPInputStream.java b/core/java/src/net/i2p/util/ReusableGZIPInputStream.java
index a7f50542e6..1c16bea2da 100644
--- a/core/java/src/net/i2p/util/ReusableGZIPInputStream.java
+++ b/core/java/src/net/i2p/util/ReusableGZIPInputStream.java
@@ -63,18 +63,18 @@ public class ReusableGZIPInputStream extends ResettableGZIPInputStream {
private static void test() {
byte b[] = "hi, how are you today?".getBytes();
try {
- ByteArrayOutputStream baos = new ByteArrayOutputStream(64);
- GZIPOutputStream o = new GZIPOutputStream(baos);
+ java.io.ByteArrayOutputStream baos = new java.io.ByteArrayOutputStream(64);
+ ResettableGZIPOutputStream o = new ResettableGZIPOutputStream(baos);
o.write(b);
o.finish();
o.flush();
byte compressed[] = baos.toByteArray();
ReusableGZIPInputStream in = ReusableGZIPInputStream.acquire();
- in.initialize(new ByteArrayInputStream(compressed));
+ in.initialize(new java.io.ByteArrayInputStream(compressed));
byte rv[] = new byte[128];
int read = in.read(rv);
- if (!DataHelper.eq(rv, 0, b, 0, b.length))
+ if (!net.i2p.data.DataHelper.eq(rv, 0, b, 0, b.length))
throw new RuntimeException("foo, read=" + read);
else
System.out.println("match, w00t");
@@ -84,18 +84,18 @@ public class ReusableGZIPInputStream extends ResettableGZIPInputStream {
private static boolean test(int size) {
byte b[] = new byte[size];
- new java.util.Random().nextBytes(b);
+ RandomSource.getInstance().nextBytes(b);
try {
- ByteArrayOutputStream baos = new ByteArrayOutputStream(size);
- GZIPOutputStream o = new GZIPOutputStream(baos);
+ java.io.ByteArrayOutputStream baos = new java.io.ByteArrayOutputStream(size);
+ ResettableGZIPOutputStream o = new ResettableGZIPOutputStream(baos);
o.write(b);
o.finish();
o.flush();
byte compressed[] = baos.toByteArray();
ReusableGZIPInputStream in = ReusableGZIPInputStream.acquire();
- in.initialize(new ByteArrayInputStream(compressed));
- ByteArrayOutputStream baos2 = new ByteArrayOutputStream(size);
+ in.initialize(new java.io.ByteArrayInputStream(compressed));
+ java.io.ByteArrayOutputStream baos2 = new java.io.ByteArrayOutputStream(size);
byte rbuf[] = new byte[128];
try {
while (true) {
@@ -104,9 +104,9 @@ public class ReusableGZIPInputStream extends ResettableGZIPInputStream {
break;
baos2.write(rbuf, 0, read);
}
- } catch (IOException ioe) {
+ } catch (java.io.IOException ioe) {
ioe.printStackTrace();
- long crcVal = in.getCurrentCRCVal();
+ //long crcVal = in.getCurrentCRCVal();
//try { in.verifyFooter(); } catch (IOException ioee) {
// ioee.printStackTrace();
//}
@@ -120,10 +120,10 @@ public class ReusableGZIPInputStream extends ResettableGZIPInputStream {
if (rv.length != b.length)
throw new RuntimeException("read length: " + rv.length + " expected: " + b.length);
- if (!DataHelper.eq(rv, 0, b, 0, b.length)) {
+ if (!net.i2p.data.DataHelper.eq(rv, 0, b, 0, b.length)) {
throw new RuntimeException("foo, read=" + rv.length);
} else {
- System.out.println("match, w00t");
+ System.out.println("match, w00t @ " + size);
return true;
}
} catch (Exception e) {
diff --git a/core/java/src/net/i2p/util/ReusableGZIPOutputStream.java b/core/java/src/net/i2p/util/ReusableGZIPOutputStream.java
index aa670a9ef6..2771c72090 100644
--- a/core/java/src/net/i2p/util/ReusableGZIPOutputStream.java
+++ b/core/java/src/net/i2p/util/ReusableGZIPOutputStream.java
@@ -89,7 +89,7 @@ public class ReusableGZIPOutputStream extends ResettableGZIPOutputStream {
try {
for (int i = 0; i < 2; i++)
test();
- for (int i = 500; i < 64*1024; i++) {
+ for (int i = 0; i < 64*1024; i++) {
if (!test(i)) break;
}
} catch (Exception e) { e.printStackTrace(); }
@@ -106,7 +106,7 @@ public class ReusableGZIPOutputStream extends ResettableGZIPOutputStream {
byte compressed[] = o.getData();
ReusableGZIPOutputStream.release(o);
- GZIPInputStream in = new GZIPInputStream(new ByteArrayInputStream(compressed));
+ ResettableGZIPInputStream in = new ResettableGZIPInputStream(new java.io.ByteArrayInputStream(compressed));
byte rv[] = new byte[128];
int read = in.read(rv);
if (!DataHelper.eq(rv, 0, b, 0, b.length))
@@ -118,7 +118,7 @@ public class ReusableGZIPOutputStream extends ResettableGZIPOutputStream {
private static boolean test(int size) {
byte b[] = new byte[size];
- new java.util.Random().nextBytes(b);
+ RandomSource.getInstance().nextBytes(b);
try {
ReusableGZIPOutputStream o = ReusableGZIPOutputStream.acquire();
o.write(b);
@@ -127,8 +127,8 @@ public class ReusableGZIPOutputStream extends ResettableGZIPOutputStream {
byte compressed[] = o.getData();
ReusableGZIPOutputStream.release(o);
- GZIPInputStream in = new GZIPInputStream(new ByteArrayInputStream(compressed));
- ByteArrayOutputStream baos2 = new ByteArrayOutputStream(256*1024);
+ ResettableGZIPInputStream in = new ResettableGZIPInputStream(new java.io.ByteArrayInputStream(compressed));
+ ByteArrayOutputStream baos2 = new ByteArrayOutputStream(size);
byte rbuf[] = new byte[128];
while (true) {
int read = in.read(rbuf);
--
GitLab