Skip to content

Commit f35b9b1

Browse files
DannemannDannemann
committed
Tweaks.
1 parent 6f92cdc commit f35b9b1

File tree

3 files changed

+48
-48
lines changed

3 files changed

+48
-48
lines changed

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

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -73,24 +73,24 @@ public void invalidCharCompressTest() {
7373

7474
@Test
7575
public void compressDecompressSmallStringTest() {
76-
AsciiCompressor compressor = new FiveBitAsciiCompressor();
76+
final AsciiCompressor compressor = new FiveBitAsciiCompressor(true);
7777
for (int length = 0; length <= 100; length++)
7878
for (int i = 0; i <= 3000000; i++) {
79-
byte[] str = generateRandomString(length, DEFAULT_5BIT_CHARSET);
80-
byte[] compressed = compressor.compress(str);
81-
byte[] decompressed = compressor.decompress(compressed);
79+
final byte[] str = generateRandomString(length, DEFAULT_5BIT_CHARSET);
80+
final byte[] compressed = compressor.compress(str);
81+
final byte[] decompressed = compressor.decompress(compressed);
8282
assertArrayEquals(str, decompressed);
8383
}
8484
}
8585

8686
@Test
8787
public void compressDecompressBigStringTest() {
88-
AsciiCompressor compressor = new FiveBitAsciiCompressor();
88+
final AsciiCompressor compressor = new FiveBitAsciiCompressor(true);
8989
for (int length = 2000; length <= 3000; length++)
9090
for (int i = 0; i <= 1000000; i++) {
91-
byte[] str = generateRandomString(length, DEFAULT_5BIT_CHARSET);
92-
byte[] compressed = compressor.compress(str);
93-
byte[] decompressed = compressor.decompress(compressed);
91+
final byte[] str = generateRandomString(length, DEFAULT_5BIT_CHARSET);
92+
final byte[] compressed = compressor.compress(str);
93+
final byte[] decompressed = compressor.decompress(compressed);
9494
assertArrayEquals(str, decompressed);
9595
}
9696
}
@@ -105,23 +105,23 @@ public void ignoreInvalidCharTest() {
105105

106106
@Test
107107
public void ignoreInvalidCharsTest() {
108-
AsciiCompressor compressor = new FiveBitAsciiCompressor();
108+
final AsciiCompressor compressor = new FiveBitAsciiCompressor();
109109
for (int i = 0; i < 3000; i++)
110110
for (int asciiCode = 0; asciiCode < 128; asciiCode++) {
111-
byte[] input = new byte[]{'A', (byte) asciiCode, 'B', 'C', 'D', (byte) 'Ç'};
112-
byte[] compressed = compressor.compress(input);
113-
byte[] decompressed = compressor.decompress(compressed);
111+
final byte[] input = new byte[]{'A', (byte) asciiCode, 'B', 'C', 'D', (byte) 'Ç'};
112+
final byte[] compressed = compressor.compress(input);
113+
final byte[] decompressed = compressor.decompress(compressed);
114114
assertEquals(input.length, decompressed.length);
115115
}
116116
}
117117

118118
@Test
119119
public void compressionRateTest() {
120-
AsciiCompressor compressor = new FiveBitAsciiCompressor();
121-
int hundredMb = 100 * 1024 * 1024;
122-
byte[] input = new byte[hundredMb];
120+
final AsciiCompressor compressor = new FiveBitAsciiCompressor(true);
121+
final int hundredMb = 100 * 1024 * 1024;
122+
final byte[] input = new byte[hundredMb];
123123
Arrays.fill(input, (byte) 'A');
124-
byte[] compressed = compressor.compress(input);
124+
final byte[] compressed = compressor.compress(input);
125125
Assertions.assertEquals(62, compressed.length / 1024 / 1024); // 38% compression rate.
126126
}
127127

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

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -65,24 +65,24 @@ public void invalidCharCompressTest() {
6565

6666
@Test
6767
public void compressDecompressSmallStringTest() {
68-
AsciiCompressor compressor = new FourBitAsciiCompressor();
68+
final AsciiCompressor compressor = new FourBitAsciiCompressor(true);
6969
for (int length = 0; length <= 100; length++)
7070
for (int i = 0; i <= 3000000; i++) {
71-
byte[] str = generateRandomString(length, DEFAULT_4BIT_CHARSET);
72-
byte[] compressed = compressor.compress(str);
73-
byte[] decompressed = compressor.decompress(compressed);
71+
final byte[] str = generateRandomString(length, DEFAULT_4BIT_CHARSET);
72+
final byte[] compressed = compressor.compress(str);
73+
final byte[] decompressed = compressor.decompress(compressed);
7474
assertArrayEquals(str, decompressed);
7575
}
7676
}
7777

7878
@Test
7979
public void compressDecompressBigStringTest() {
80-
AsciiCompressor compressor = new FourBitAsciiCompressor();
80+
final AsciiCompressor compressor = new FourBitAsciiCompressor(true);
8181
for (int length = 2000; length <= 3000; length++)
8282
for (int i = 0; i <= 1000000; i++) {
83-
byte[] str = generateRandomString(length, DEFAULT_4BIT_CHARSET);
84-
byte[] compressed = compressor.compress(str);
85-
byte[] decompressed = compressor.decompress(compressed);
83+
final byte[] str = generateRandomString(length, DEFAULT_4BIT_CHARSET);
84+
final byte[] compressed = compressor.compress(str);
85+
final byte[] decompressed = compressor.decompress(compressed);
8686
assertArrayEquals(str, decompressed);
8787
}
8888
}
@@ -97,23 +97,23 @@ public void ignoreInvalidCharTest() {
9797

9898
@Test
9999
public void ignoreInvalidCharsTest() {
100-
AsciiCompressor compressor = new FourBitAsciiCompressor();
100+
final AsciiCompressor compressor = new FourBitAsciiCompressor();
101101
for (int i = 0; i < 3000; i++)
102102
for (int asciiCode = 0; asciiCode < 128; asciiCode++) {
103-
byte[] input = new byte[]{'0', (byte) asciiCode, '2', '3', '4', (byte) 'Ç'};
104-
byte[] compressed = compressor.compress(input);
105-
byte[] decompressed = compressor.decompress(compressed);
103+
final byte[] input = new byte[]{'0', (byte) asciiCode, '2', '3', '4', (byte) 'Ç'};
104+
final byte[] compressed = compressor.compress(input);
105+
final byte[] decompressed = compressor.decompress(compressed);
106106
assertEquals(input.length, decompressed.length);
107107
}
108108
}
109109

110110
@Test
111111
public void compressionRateTest() {
112-
AsciiCompressor compressor = new FourBitAsciiCompressor();
113-
int hundredMb = 100 * 1024 * 1024;
114-
byte[] input = new byte[hundredMb];
112+
final AsciiCompressor compressor = new FourBitAsciiCompressor(true);
113+
final int hundredMb = 100 * 1024 * 1024;
114+
final byte[] input = new byte[hundredMb];
115115
Arrays.fill(input, (byte) '0');
116-
byte[] compressed = compressor.compress(input);
116+
final byte[] compressed = compressor.compress(input);
117117
Assertions.assertEquals(50, compressed.length / 1024 / 1024); // 50% compression rate.
118118
}
119119

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

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -73,24 +73,24 @@ public void invalidCharCompressTest() {
7373

7474
@Test
7575
public void compressDecompressSmallStringTest() {
76-
AsciiCompressor compressor = new SixBitAsciiCompressor();
76+
final AsciiCompressor compressor = new SixBitAsciiCompressor(true);
7777
for (int length = 0; length <= 100; length++)
7878
for (int i = 0; i <= 3000000; i++) {
79-
byte[] str = generateRandomString(length, DEFAULT_6BIT_CHARSET);
80-
byte[] compressed = compressor.compress(str);
81-
byte[] decompressed = compressor.decompress(compressed);
79+
final byte[] str = generateRandomString(length, DEFAULT_6BIT_CHARSET);
80+
final byte[] compressed = compressor.compress(str);
81+
final byte[] decompressed = compressor.decompress(compressed);
8282
assertArrayEquals(str, decompressed);
8383
}
8484
}
8585

8686
@Test
8787
public void compressDecompressBigStringTest() {
88-
AsciiCompressor compressor = new SixBitAsciiCompressor();
88+
final AsciiCompressor compressor = new SixBitAsciiCompressor(true);
8989
for (int length = 2000; length <= 3000; length++)
9090
for (int i = 0; i <= 1000000; i++) {
91-
byte[] str = generateRandomString(length, DEFAULT_6BIT_CHARSET);
92-
byte[] compressed = compressor.compress(str);
93-
byte[] decompressed = compressor.decompress(compressed);
91+
final byte[] str = generateRandomString(length, DEFAULT_6BIT_CHARSET);
92+
final byte[] compressed = compressor.compress(str);
93+
final byte[] decompressed = compressor.decompress(compressed);
9494
assertArrayEquals(str, decompressed);
9595
}
9696
}
@@ -105,23 +105,23 @@ public void ignoreInvalidCharTest() {
105105

106106
@Test
107107
public void ignoreInvalidCharsTest() {
108-
AsciiCompressor compressor = new SixBitAsciiCompressor();
108+
final AsciiCompressor compressor = new SixBitAsciiCompressor();
109109
for (int i = 0; i < 3000; i++)
110110
for (int asciiCode = 0; asciiCode < 128; asciiCode++) {
111-
byte[] input = new byte[]{'A', (byte) asciiCode, 'B', 'C', 'D', (byte) 'Ç'};
112-
byte[] compressed = compressor.compress(input);
113-
byte[] decompressed = compressor.decompress(compressed);
111+
final byte[] input = new byte[]{'A', (byte) asciiCode, 'B', 'C', 'D', (byte) 'Ç'};
112+
final byte[] compressed = compressor.compress(input);
113+
final byte[] decompressed = compressor.decompress(compressed);
114114
assertEquals(input.length, decompressed.length);
115115
}
116116
}
117117

118118
@Test
119119
public void compressionRateTest() {
120-
AsciiCompressor compressor = new SixBitAsciiCompressor();
121-
int hundredMb = 100 * 1024 * 1024;
122-
byte[] input = new byte[hundredMb];
120+
final AsciiCompressor compressor = new SixBitAsciiCompressor(true);
121+
final int hundredMb = 100 * 1024 * 1024;
122+
final byte[] input = new byte[hundredMb];
123123
Arrays.fill(input, (byte) 'A');
124-
byte[] compressed = compressor.compress(input);
124+
final byte[] compressed = compressor.compress(input);
125125
Assertions.assertEquals(75, compressed.length / 1024 / 1024); // 25% compression rate.
126126
}
127127

0 commit comments

Comments
 (0)