Skip to content

Commit a8c7857

Browse files
DannemannDannemann
committed
Tweaks.
1 parent 1d919aa commit a8c7857

File tree

9 files changed

+43
-43
lines changed

9 files changed

+43
-43
lines changed

‎src/jmh/java/com/dannemann/stringcompressor/FiveBitAsciiCompressorBenchmark.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
@State(Scope.Benchmark)
1818
public class FiveBitAsciiCompressorBenchmark extends BaseBenchmark {
1919

20-
AsciiCompressor compressor;
20+
FiveBitAsciiCompressor compressor;
2121
byte[] toCompress;
2222
byte[] toDecompress;
2323

‎src/jmh/java/com/dannemann/stringcompressor/FourBitAsciiCompressorBenchmark.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
@State(Scope.Benchmark)
1818
public class FourBitAsciiCompressorBenchmark extends BaseBenchmark {
1919

20-
AsciiCompressor compressor;
20+
FourBitAsciiCompressor compressor;
2121
byte[] toCompress;
2222
byte[] toDecompress;
2323

‎src/jmh/java/com/dannemann/stringcompressor/SixBitAsciiCompressorBenchmark.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
@State(Scope.Benchmark)
1818
public class SixBitAsciiCompressorBenchmark extends BaseBenchmark {
1919

20-
AsciiCompressor compressor;
20+
SixBitAsciiCompressor compressor;
2121
byte[] toCompress;
2222
byte[] toDecompress;
2323

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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ void usageExample() {
2525
byte[] inputStr = AsciiCompressor.getBytes("HELLO-COMPRESSOR");
2626

2727
// Creates a compressor with the default supported character set (see FiveBitAsciiCompressor.DEFAULT_5BIT_CHARSET)
28-
AsciiCompressor compressor = new FiveBitAsciiCompressor();
29-
// AsciiCompressor customCompressor = new FiveBitAsciiCompressor(new byte[]{/* custom charset */}, true, true);
28+
FiveBitAsciiCompressor compressor = new FiveBitAsciiCompressor();
29+
// FiveBitAsciiCompressor customCompressor = new FiveBitAsciiCompressor(new byte[]{/* custom charset */}, true, true);
3030

3131
byte[] compressed = compressor.compress(inputStr);
3232
byte[] decompressed = compressor.decompress(compressed);
@@ -77,23 +77,23 @@ void invalidCustomCharsetTest() {
7777

7878
@Test
7979
void notAsciiCharCompressTest() {
80-
AsciiCompressor compressor = new FiveBitAsciiCompressor(true);
80+
FiveBitAsciiCompressor compressor = new FiveBitAsciiCompressor(true);
8181
CharacterNotSupportedException e = assertThrows(
8282
CharacterNotSupportedException.class, () -> compressor.compress(new byte[]{(byte) 'Ç'}));
8383
assertEquals("Only ASCII characters are supported. Invalid 'ￇ' with code point -57 in string (maybe incomplete): \"Ç\"", e.getMessage());
8484
}
8585

8686
@Test
8787
void invalidCharCompressTest() {
88-
AsciiCompressor compressor = new FiveBitAsciiCompressor(true);
88+
FiveBitAsciiCompressor compressor = new FiveBitAsciiCompressor(true);
8989
CharacterNotSupportedException e = assertThrows(
9090
CharacterNotSupportedException.class, () -> compressor.compress(new byte[]{'9'}));
9191
assertEquals("Character '9' with code point 57 is not defined in the supported characters array. Source string is (maybe incomplete): \"9\"", e.getMessage());
9292
}
9393

9494
@Test
9595
void compressDecompressSmallStringTest() {
96-
final AsciiCompressor compressor = new FiveBitAsciiCompressor(true, true);
96+
final FiveBitAsciiCompressor compressor = new FiveBitAsciiCompressor(true, true);
9797
for (int length = 0; length <= 100; length++)
9898
for (int i = 0; i <= 500000; i++) {
9999
final byte[] str = generateRandomStringBytes(length, DEFAULT_5BIT_CHARSET);
@@ -105,7 +105,7 @@ void compressDecompressSmallStringTest() {
105105

106106
@Test
107107
void compressDecompressBigStringTest() {
108-
final AsciiCompressor compressor = new FiveBitAsciiCompressor(true, true);
108+
final FiveBitAsciiCompressor compressor = new FiveBitAsciiCompressor(true, true);
109109
for (int length = 2000; length <= 3000; length++)
110110
for (int i = 0; i <= 10000; i++) {
111111
final byte[] str = generateRandomStringBytes(length, DEFAULT_5BIT_CHARSET);
@@ -117,7 +117,7 @@ void compressDecompressBigStringTest() {
117117

118118
@Test
119119
void compressDecompressSmallStringLowercaseTest() {
120-
final AsciiCompressor compressor = new FiveBitAsciiCompressor(DEFAULT_5BIT_CHARSET_LOWERCASE, true, true);
120+
final FiveBitAsciiCompressor compressor = new FiveBitAsciiCompressor(DEFAULT_5BIT_CHARSET_LOWERCASE, true, true);
121121
for (int length = 0; length <= 100; length++)
122122
for (int i = 0; i <= 50000; i++) {
123123
final byte[] str = generateRandomStringBytes(length, DEFAULT_5BIT_CHARSET_LOWERCASE);
@@ -129,7 +129,7 @@ void compressDecompressSmallStringLowercaseTest() {
129129

130130
@Test
131131
void compressDecompressBigStringLowercaseTest() {
132-
final AsciiCompressor compressor = new FiveBitAsciiCompressor(DEFAULT_5BIT_CHARSET_LOWERCASE, true, true);
132+
final FiveBitAsciiCompressor compressor = new FiveBitAsciiCompressor(DEFAULT_5BIT_CHARSET_LOWERCASE, true, true);
133133
for (int length = 2000; length <= 3000; length++)
134134
for (int i = 0; i <= 1000; i++) {
135135
final byte[] str = generateRandomStringBytes(length, DEFAULT_5BIT_CHARSET_LOWERCASE);
@@ -141,13 +141,13 @@ void compressDecompressBigStringLowercaseTest() {
141141

142142
@Test
143143
void edgeCasesTest() {
144-
AsciiCompressor compressor1 = new FiveBitAsciiCompressor(true, false);
144+
FiveBitAsciiCompressor compressor1 = new FiveBitAsciiCompressor(true, false);
145145
assertEquals(0, compressor1.compress(new byte[0]).length);
146146
assertEquals(0, compressor1.compress(new byte[]{}).length);
147147
assertEquals(0, compressor1.compress(getBytes("")).length);
148148
assertEquals(0, compressor1.compress("".getBytes(ISO_8859_1)).length);
149149
assertEquals(0, compressor1.compress("").length);
150-
AsciiCompressor compressor2 = new FiveBitAsciiCompressor(true, true);
150+
FiveBitAsciiCompressor compressor2 = new FiveBitAsciiCompressor(true, true);
151151
assertEquals(0, compressor2.compress(new byte[0]).length);
152152
assertEquals(0, compressor2.compress(new byte[]{}).length);
153153
assertEquals(0, compressor2.compress(getBytes("")).length);
@@ -160,15 +160,15 @@ void edgeCasesTest() {
160160

161161
@Test
162162
void ignoreInvalidCharTest() {
163-
AsciiCompressor compressor = new FiveBitAsciiCompressor();
163+
FiveBitAsciiCompressor compressor = new FiveBitAsciiCompressor();
164164
byte[] compressed = compressor.compress(new byte[]{'A', (byte) 'Ç', 'B', 'C'});
165165
byte[] decompressed = compressor.decompress(compressed);
166166
assertEquals("AGBC", getString(decompressed));
167167
}
168168

169169
@Test
170170
void ignoreInvalidCharsTest() {
171-
AsciiCompressor compressor = new FiveBitAsciiCompressor();
171+
FiveBitAsciiCompressor compressor = new FiveBitAsciiCompressor();
172172
for (int i = 0; i < 3000; i++)
173173
for (int asciiCode = 0; asciiCode < 128; asciiCode++) {
174174
byte[] input = new byte[]{'A', (byte) asciiCode, 'B', 'C', 'D', (byte) 'Ç'};
@@ -180,7 +180,7 @@ void ignoreInvalidCharsTest() {
180180

181181
@Test
182182
void compressionRateTest() {
183-
final AsciiCompressor compressor = new FiveBitAsciiCompressor(true);
183+
final FiveBitAsciiCompressor compressor = new FiveBitAsciiCompressor(true);
184184
final int hundredMb = 100 * 1024 * 1024;
185185
final byte[] input = new byte[hundredMb];
186186
Arrays.fill(input, (byte) 'A');

‎src/test/java/com/dannemann/stringcompressor/FiveBitBinarySearchTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class FiveBitBinarySearchTest extends BaseTest {
1919
// -----------------------------------------------------------------------------------------------------------------
2020
// Automated search tests:
2121

22-
private static final AsciiCompressor COMPRESSOR = new FiveBitAsciiCompressor(true, true);
22+
private static final FiveBitAsciiCompressor COMPRESSOR = new FiveBitAsciiCompressor(true, true);
2323

2424
@Test
2525
void searchSmallStringsTest() {

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ void usageExample() {
2424
byte[] inputStr = AsciiCompressor.getBytes("0123456789");
2525

2626
// Creates a compressor with the default supported character set (see FourBitAsciiCompressor.DEFAULT_4BIT_CHARSET).
27-
AsciiCompressor compressor = new FourBitAsciiCompressor();
28-
// AsciiCompressor customCompressor = new FourBitAsciiCompressor(new byte[]{/* custom charset */}, true, true);
27+
FourBitAsciiCompressor compressor = new FourBitAsciiCompressor();
28+
// FourBitAsciiCompressor customCompressor = new FourBitAsciiCompressor(new byte[]{/* custom charset */}, true, true);
2929

3030
byte[] compressed = compressor.compress(inputStr);
3131
byte[] decompressed = compressor.decompress(compressed);
@@ -68,23 +68,23 @@ void invalidCustomCharsetTest() {
6868

6969
@Test
7070
void notAsciiCharCompressTest() {
71-
AsciiCompressor compressor = new FourBitAsciiCompressor(true);
71+
FourBitAsciiCompressor compressor = new FourBitAsciiCompressor(true);
7272
CharacterNotSupportedException e = assertThrows(
7373
CharacterNotSupportedException.class, () -> compressor.compress(new byte[]{(byte) 'Ç'}));
7474
assertEquals("Only ASCII characters are supported. Invalid 'ￇ' with code point -57 in string (maybe incomplete): \"Ç\"", e.getMessage());
7575
}
7676

7777
@Test
7878
void invalidCharCompressTest() {
79-
AsciiCompressor compressor = new FourBitAsciiCompressor(true);
79+
FourBitAsciiCompressor compressor = new FourBitAsciiCompressor(true);
8080
CharacterNotSupportedException e = assertThrows(
8181
CharacterNotSupportedException.class, () -> compressor.compress(new byte[]{'Z'}));
8282
assertEquals("Character 'Z' with code point 90 is not defined in the supported characters array. Source string is (maybe incomplete): \"Z\"", e.getMessage());
8383
}
8484

8585
@Test
8686
void compressDecompressSmallStringTest() {
87-
final AsciiCompressor compressor = new FourBitAsciiCompressor(true, true);
87+
final FourBitAsciiCompressor compressor = new FourBitAsciiCompressor(true, true);
8888
for (int length = 0; length <= 100; length++)
8989
for (int i = 0; i <= 500000; i++) {
9090
final byte[] str = generateRandomStringBytes(length, DEFAULT_4BIT_CHARSET);
@@ -96,7 +96,7 @@ void compressDecompressSmallStringTest() {
9696

9797
@Test
9898
void compressDecompressBigStringTest() {
99-
final AsciiCompressor compressor = new FourBitAsciiCompressor(true, true);
99+
final FourBitAsciiCompressor compressor = new FourBitAsciiCompressor(true, true);
100100
for (int length = 2000; length <= 3000; length++)
101101
for (int i = 0; i <= 10000; i++) {
102102
final byte[] str = generateRandomStringBytes(length, DEFAULT_4BIT_CHARSET);
@@ -108,13 +108,13 @@ void compressDecompressBigStringTest() {
108108

109109
@Test
110110
void edgeCasesTest() {
111-
AsciiCompressor compressor1 = new FourBitAsciiCompressor(true, false);
111+
FourBitAsciiCompressor compressor1 = new FourBitAsciiCompressor(true, false);
112112
assertEquals(0, compressor1.compress(new byte[0]).length);
113113
assertEquals(0, compressor1.compress(new byte[]{}).length);
114114
assertEquals(0, compressor1.compress(getBytes("")).length);
115115
assertEquals(0, compressor1.compress("".getBytes(ISO_8859_1)).length);
116116
assertEquals(0, compressor1.compress("").length);
117-
AsciiCompressor compressor2 = new FourBitAsciiCompressor(true, true);
117+
FourBitAsciiCompressor compressor2 = new FourBitAsciiCompressor(true, true);
118118
assertEquals(0, compressor2.compress(new byte[0]).length);
119119
assertEquals(0, compressor2.compress(new byte[]{}).length);
120120
assertEquals(0, compressor2.compress(getBytes("")).length);
@@ -127,15 +127,15 @@ void edgeCasesTest() {
127127

128128
@Test
129129
void ignoreInvalidCharTest() {
130-
AsciiCompressor compressor = new FourBitAsciiCompressor();
130+
FourBitAsciiCompressor compressor = new FourBitAsciiCompressor();
131131
byte[] compressed = compressor.compress(new byte[]{'0', (byte) 'Ç', '2', '3'});
132132
byte[] decompressed = compressor.decompress(compressed);
133133
assertEquals(";;23", getString(decompressed));
134134
}
135135

136136
@Test
137137
void ignoreInvalidCharsTest() {
138-
AsciiCompressor compressor = new FourBitAsciiCompressor();
138+
FourBitAsciiCompressor compressor = new FourBitAsciiCompressor();
139139
for (int i = 0; i < 3000; i++)
140140
for (int asciiCode = 0; asciiCode < 128; asciiCode++) {
141141
byte[] input = new byte[]{'0', (byte) asciiCode, '2', '3', '4', (byte) 'Ç'};
@@ -147,7 +147,7 @@ void ignoreInvalidCharsTest() {
147147

148148
@Test
149149
void compressionRateTest() {
150-
final AsciiCompressor compressor = new FourBitAsciiCompressor(true);
150+
final FourBitAsciiCompressor compressor = new FourBitAsciiCompressor(true);
151151
final int hundredMb = 100 * 1024 * 1024;
152152
final byte[] input = new byte[hundredMb];
153153
Arrays.fill(input, (byte) '0');

‎src/test/java/com/dannemann/stringcompressor/FourBitBinarySearchTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class FourBitBinarySearchTest extends BaseTest {
1919
// -----------------------------------------------------------------------------------------------------------------
2020
// Automated search tests:
2121

22-
private static final AsciiCompressor COMPRESSOR = new FourBitAsciiCompressor(true, true);
22+
private static final FourBitAsciiCompressor COMPRESSOR = new FourBitAsciiCompressor(true, true);
2323

2424
@Test
2525
void searchSmallStringsTest() {

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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ void usageExample() {
2525
byte[] inputStr = AsciiCompressor.getBytes("HELLO, COMPRESSOR");
2626

2727
// Creates a compressor with the default supported character set (see SixBitAsciiCompressor.DEFAULT_6BIT_CHARSET).
28-
AsciiCompressor compressor = new SixBitAsciiCompressor();
29-
// AsciiCompressor customCompressor = new SixBitAsciiCompressor(new byte[]{/* custom charset */}, true, true);
28+
SixBitAsciiCompressor compressor = new SixBitAsciiCompressor();
29+
// SixBitAsciiCompressor customCompressor = new SixBitAsciiCompressor(new byte[]{/* custom charset */}, true, true);
3030

3131
byte[] compressed = compressor.compress(inputStr);
3232
byte[] decompressed = compressor.decompress(compressed);
@@ -77,23 +77,23 @@ void invalidCustomCharsetTest() {
7777

7878
@Test
7979
void notAsciiCharCompressTest() {
80-
AsciiCompressor compressor = new SixBitAsciiCompressor(true);
80+
SixBitAsciiCompressor compressor = new SixBitAsciiCompressor(true);
8181
CharacterNotSupportedException e = assertThrows(
8282
CharacterNotSupportedException.class, () -> compressor.compress(new byte[]{(byte) 'Ç'}));
8383
assertEquals("Only ASCII characters are supported. Invalid 'ￇ' with code point -57 in string (maybe incomplete): \"Ç\"", e.getMessage());
8484
}
8585

8686
@Test
8787
void invalidCharCompressTest() {
88-
AsciiCompressor compressor = new SixBitAsciiCompressor(true);
88+
SixBitAsciiCompressor compressor = new SixBitAsciiCompressor(true);
8989
CharacterNotSupportedException e = assertThrows(
9090
CharacterNotSupportedException.class, () -> compressor.compress(new byte[]{'|'}));
9191
assertEquals("Character '|' with code point 124 is not defined in the supported characters array. Source string is (maybe incomplete): \"|\"", e.getMessage());
9292
}
9393

9494
@Test
9595
void compressDecompressSmallStringTest() {
96-
final AsciiCompressor compressor = new SixBitAsciiCompressor(true, true);
96+
final SixBitAsciiCompressor compressor = new SixBitAsciiCompressor(true, true);
9797
for (int length = 0; length <= 100; length++)
9898
for (int i = 0; i <= 500000; i++) {
9999
final byte[] str = generateRandomStringBytes(length, DEFAULT_6BIT_CHARSET);
@@ -105,7 +105,7 @@ void compressDecompressSmallStringTest() {
105105

106106
@Test
107107
void compressDecompressBigStringTest() {
108-
final AsciiCompressor compressor = new SixBitAsciiCompressor(true, true);
108+
final SixBitAsciiCompressor compressor = new SixBitAsciiCompressor(true, true);
109109
for (int length = 2000; length <= 3000; length++)
110110
for (int i = 0; i <= 10000; i++) {
111111
final byte[] str = generateRandomStringBytes(length, DEFAULT_6BIT_CHARSET);
@@ -117,7 +117,7 @@ void compressDecompressBigStringTest() {
117117

118118
@Test
119119
void compressDecompressSmallStringLowercaseTest() {
120-
final AsciiCompressor compressor = new SixBitAsciiCompressor(DEFAULT_6BIT_CHARSET_LOWERCASE, true, true);
120+
final SixBitAsciiCompressor compressor = new SixBitAsciiCompressor(DEFAULT_6BIT_CHARSET_LOWERCASE, true, true);
121121
for (int length = 0; length <= 100; length++)
122122
for (int i = 0; i <= 50000; i++) {
123123
final byte[] str = generateRandomStringBytes(length, DEFAULT_6BIT_CHARSET_LOWERCASE);
@@ -129,7 +129,7 @@ void compressDecompressSmallStringLowercaseTest() {
129129

130130
@Test
131131
void compressDecompressBigStringLowercaseTest() {
132-
final AsciiCompressor compressor = new SixBitAsciiCompressor(DEFAULT_6BIT_CHARSET_LOWERCASE, true, true);
132+
final SixBitAsciiCompressor compressor = new SixBitAsciiCompressor(DEFAULT_6BIT_CHARSET_LOWERCASE, true, true);
133133
for (int length = 2000; length <= 3000; length++)
134134
for (int i = 0; i <= 1000; i++) {
135135
final byte[] str = generateRandomStringBytes(length, DEFAULT_6BIT_CHARSET_LOWERCASE);
@@ -141,13 +141,13 @@ void compressDecompressBigStringLowercaseTest() {
141141

142142
@Test
143143
void edgeCasesTest() {
144-
AsciiCompressor compressor1 = new SixBitAsciiCompressor(true, false);
144+
SixBitAsciiCompressor compressor1 = new SixBitAsciiCompressor(true, false);
145145
assertEquals(0, compressor1.compress(new byte[0]).length);
146146
assertEquals(0, compressor1.compress(new byte[]{}).length);
147147
assertEquals(0, compressor1.compress(getBytes("")).length);
148148
assertEquals(0, compressor1.compress("".getBytes(ISO_8859_1)).length);
149149
assertEquals(0, compressor1.compress("").length);
150-
AsciiCompressor compressor2 = new SixBitAsciiCompressor(true, true);
150+
SixBitAsciiCompressor compressor2 = new SixBitAsciiCompressor(true, true);
151151
assertEquals(0, compressor2.compress(new byte[0]).length);
152152
assertEquals(0, compressor2.compress(new byte[]{}).length);
153153
assertEquals(0, compressor2.compress(getBytes("")).length);
@@ -160,15 +160,15 @@ void edgeCasesTest() {
160160

161161
@Test
162162
void ignoreInvalidCharTest() {
163-
AsciiCompressor compressor = new SixBitAsciiCompressor();
163+
SixBitAsciiCompressor compressor = new SixBitAsciiCompressor();
164164
byte[] compressed = compressor.compress(new byte[]{'A', (byte) 'Ç', 'B', 'C'});
165165
byte[] decompressed = compressor.decompress(compressed);
166166
assertEquals("AGBC", getString(decompressed));
167167
}
168168

169169
@Test
170170
void ignoreInvalidCharsTest() {
171-
AsciiCompressor compressor = new SixBitAsciiCompressor();
171+
SixBitAsciiCompressor compressor = new SixBitAsciiCompressor();
172172
for (int i = 0; i < 3000; i++)
173173
for (int asciiCode = 0; asciiCode < 128; asciiCode++) {
174174
byte[] input = new byte[]{'A', (byte) asciiCode, 'B', 'C', 'D', (byte) 'Ç'};
@@ -180,7 +180,7 @@ void ignoreInvalidCharsTest() {
180180

181181
@Test
182182
void compressionRateTest() {
183-
final AsciiCompressor compressor = new SixBitAsciiCompressor(true);
183+
final SixBitAsciiCompressor compressor = new SixBitAsciiCompressor(true);
184184
final int hundredMb = 100 * 1024 * 1024;
185185
final byte[] input = new byte[hundredMb];
186186
Arrays.fill(input, (byte) 'A');

‎src/test/java/com/dannemann/stringcompressor/SixBitBinarySearchTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class SixBitBinarySearchTest extends BaseTest {
1919
// -----------------------------------------------------------------------------------------------------------------
2020
// Automated search tests:
2121

22-
private static final AsciiCompressor COMPRESSOR = new SixBitAsciiCompressor(true, true);
22+
private static final SixBitAsciiCompressor COMPRESSOR = new SixBitAsciiCompressor(true, true);
2323

2424
@Test
2525
void searchSmallStringsTest() {

0 commit comments

Comments
 (0)