Skip to content

Commit 6103235

Browse files
committed
Tweaks.
1 parent e4ae56b commit 6103235

File tree

3 files changed

+21
-18
lines changed

3 files changed

+21
-18
lines changed

src/test/java/com/stringcompressor/FiveBitAsciiCompressorTest.java

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
import static com.stringcompressor.FiveBitAsciiCompressor.DEFAULT_5BIT_CHARSET;
1010
import static java.nio.charset.StandardCharsets.US_ASCII;
11+
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
1112
import static org.junit.jupiter.api.Assertions.assertEquals;
1213
import static org.junit.jupiter.api.Assertions.assertThrows;
1314

@@ -75,10 +76,10 @@ public void compressDecompressSmallStringTest() {
7576
AsciiCompressor compressor = new FiveBitAsciiCompressor();
7677
for (int length = 0; length <= 100; length++)
7778
for (int i = 0; i <= 3000000; i++) {
78-
String str = createRandomString(length, DEFAULT_5BIT_CHARSET);
79-
byte[] compressed = compressor.compress(str.getBytes(US_ASCII));
79+
byte[] str = generateRandomString(length, DEFAULT_5BIT_CHARSET);
80+
byte[] compressed = compressor.compress(str);
8081
byte[] decompressed = compressor.decompress(compressed);
81-
assertEquals(str, new String(decompressed, US_ASCII));
82+
assertArrayEquals(str, decompressed);
8283
}
8384
}
8485

@@ -87,10 +88,10 @@ public void compressDecompressBigStringTest() {
8788
AsciiCompressor compressor = new FiveBitAsciiCompressor();
8889
for (int length = 2000; length <= 3000; length++)
8990
for (int i = 0; i <= 1000000; i++) {
90-
String str = createRandomString(length, DEFAULT_5BIT_CHARSET);
91-
byte[] compressed = compressor.compress(str.getBytes(US_ASCII));
91+
byte[] str = generateRandomString(length, DEFAULT_5BIT_CHARSET);
92+
byte[] compressed = compressor.compress(str);
9293
byte[] decompressed = compressor.decompress(compressed);
93-
assertEquals(str, new String(decompressed, US_ASCII));
94+
assertArrayEquals(str, decompressed);
9495
}
9596
}
9697

src/test/java/com/stringcompressor/FourBitAsciiCompressorTest.java

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
import static com.stringcompressor.FourBitAsciiCompressor.DEFAULT_4BIT_CHARSET;
1010
import static java.nio.charset.StandardCharsets.US_ASCII;
11+
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
1112
import static org.junit.jupiter.api.Assertions.assertEquals;
1213
import static org.junit.jupiter.api.Assertions.assertThrows;
1314

@@ -67,10 +68,10 @@ public void compressDecompressSmallStringTest() {
6768
AsciiCompressor compressor = new FourBitAsciiCompressor();
6869
for (int length = 0; length <= 100; length++)
6970
for (int i = 0; i <= 3000000; i++) {
70-
String str = createRandomString(length, DEFAULT_4BIT_CHARSET);
71-
byte[] compressed = compressor.compress(str.getBytes(US_ASCII));
71+
byte[] str = generateRandomString(length, DEFAULT_4BIT_CHARSET);
72+
byte[] compressed = compressor.compress(str);
7273
byte[] decompressed = compressor.decompress(compressed);
73-
assertEquals(str, new String(decompressed, US_ASCII));
74+
assertArrayEquals(str, decompressed);
7475
}
7576
}
7677

@@ -79,10 +80,10 @@ public void compressDecompressBigStringTest() {
7980
AsciiCompressor compressor = new FourBitAsciiCompressor();
8081
for (int length = 2000; length <= 3000; length++)
8182
for (int i = 0; i <= 1000000; i++) {
82-
String str = createRandomString(length, DEFAULT_4BIT_CHARSET);
83-
byte[] compressed = compressor.compress(str.getBytes(US_ASCII));
83+
byte[] str = generateRandomString(length, DEFAULT_4BIT_CHARSET);
84+
byte[] compressed = compressor.compress(str);
8485
byte[] decompressed = compressor.decompress(compressed);
85-
assertEquals(str, new String(decompressed, US_ASCII));
86+
assertArrayEquals(str, decompressed);
8687
}
8788
}
8889

src/test/java/com/stringcompressor/SixBitAsciiCompressorTest.java

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
import static com.stringcompressor.SixBitAsciiCompressor.DEFAULT_6BIT_CHARSET;
1010
import static java.nio.charset.StandardCharsets.US_ASCII;
11+
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
1112
import static org.junit.jupiter.api.Assertions.assertEquals;
1213
import static org.junit.jupiter.api.Assertions.assertThrows;
1314

@@ -75,10 +76,10 @@ public void compressDecompressSmallStringTest() {
7576
AsciiCompressor compressor = new SixBitAsciiCompressor();
7677
for (int length = 0; length <= 100; length++)
7778
for (int i = 0; i <= 3000000; i++) {
78-
String str = createRandomString(length, DEFAULT_6BIT_CHARSET);
79-
byte[] compressed = compressor.compress(str.getBytes(US_ASCII));
79+
byte[] str = generateRandomString(length, DEFAULT_6BIT_CHARSET);
80+
byte[] compressed = compressor.compress(str);
8081
byte[] decompressed = compressor.decompress(compressed);
81-
assertEquals(str, new String(decompressed, US_ASCII));
82+
assertArrayEquals(str, decompressed);
8283
}
8384
}
8485

@@ -87,10 +88,10 @@ public void compressDecompressBigStringTest() {
8788
AsciiCompressor compressor = new SixBitAsciiCompressor();
8889
for (int length = 2000; length <= 3000; length++)
8990
for (int i = 0; i <= 1000000; i++) {
90-
String str = createRandomString(length, DEFAULT_6BIT_CHARSET);
91-
byte[] compressed = compressor.compress(str.getBytes(US_ASCII));
91+
byte[] str = generateRandomString(length, DEFAULT_6BIT_CHARSET);
92+
byte[] compressed = compressor.compress(str);
9293
byte[] decompressed = compressor.decompress(compressed);
93-
assertEquals(str, new String(decompressed, US_ASCII));
94+
assertArrayEquals(str, decompressed);
9495
}
9596
}
9697

0 commit comments

Comments
 (0)