Have std/bzip2 check the number of sections

Updates #79
This commit is contained in:
Nigel Tao committed 2022-06-08 16:41:46 +10:00
1 parent e1b43cd767
commit 9256fe5e54
8 files changed
+81 -10

No files matched your search

+19
View File
@@ -74,6 +74,11 @@ golden_test g_bzip2_256_bytes_gt = {
.src_filename = "test/data/256.bytes.bz2",
};
golden_test g_bzip2_bad_number_of_sections_gt = {
.want_filename = "test/data/0.bytes",
.src_filename = "test/data/artificial-bzip2/bad-number-of-sections.bz2",
};
golden_test g_bzip2_midsummer_gt = {
.want_filename = "test/data/midsummer.txt",
.src_filename = "test/data/midsummer.txt.bz2",
@@ -137,6 +142,19 @@ test_wuffs_bzip2_decode_256_bytes() {
UINT64_MAX, UINT64_MAX);
}
const char* //
test_wuffs_bzip2_decode_bad_number_of_sections() {
CHECK_FOCUS(__func__);
const char* have =
do_test_io_buffers(wuffs_bzip2_decode, &g_bzip2_bad_number_of_sections_gt,
UINT64_MAX, UINT64_MAX);
const char* want = wuffs_bzip2__error__bad_number_of_sections;
if (have != want) {
RETURN_FAIL("have \"%s\", want \"%s\"", have, want);
}
return NULL;
}
const char* //
test_wuffs_bzip2_decode_midsummer() {
CHECK_FOCUS(__func__);
@@ -227,6 +245,7 @@ bench_mimic_bzip2_decode_100k() {
proc g_tests[] = {
test_wuffs_bzip2_decode_256_bytes,
test_wuffs_bzip2_decode_bad_number_of_sections,
test_wuffs_bzip2_decode_interface,
test_wuffs_bzip2_decode_midsummer,
test_wuffs_bzip2_decode_pi,
@@ -1,7 +1,7 @@
# Feed this file to script/make-artificial.go
# This script generates test/data/abraca.txt.bz2 exactly, following the
# description in std/bzip2/README.md and its sections (a) ..= (s).
# description in std/bzip2/README.md and its bitslices (a) ..= (s).
#
# By itself, this isn't a very interesting foo.make-artificial.txt file, in
# that it doesn't make *artificial* bzip2 test data (as opposed to test data
@@ -10,7 +10,7 @@
make bzip2
# Sections (a) ..= (g)
# Bitslices (a) ..= (g)
bits 16 0x425A
bits 8 0x68
bits 8 0x39
@@ -19,21 +19,21 @@ bits 32 0x76A70995
bits 1 0x0
bits 24 0x000001
# Sections (h) ..= (j)
# Bitslices (h) ..= (j)
bits 16 0x0300
bits 16 0x7000
bits 16 0x2000
# Sections (k) ..= (m)
# Bitslices (k) ..= (m)
bits 3 0x2
bits 15 0x0001
bits 1 0x0
# Sections (n) ..= (o)
# Bitslices (n) ..= (o)
bits 19 0x0CD34
bits 19 0x0CD34
# Section (p)
# Bitslice (p)
bits 3 0x6
bits 2 0x0
bits 2 0x1
@@ -42,7 +42,7 @@ bits 3 0x4
bits 2 0x1
bits 3 0x7
# Sections (q) ..= (s)
# Bitslices (q) ..= (s)
bits 48 0x177245385090
bits 32 0x76A70995
bits 5 0x00
@@ -0,0 +1,41 @@
# Feed this file to script/make-artificial.go
# This modifies abraca.txt.bz2.make-artificial.txt to have 51 Huffman-coded
# symbols (bitslice (p)) but only 1 section (bitslice (l)). At 50 symbols per
# section, this should be invalid.
make bzip2
# Bitslices (a) ..= (g)
bits 16 0x425A
bits 8 0x68
bits 8 0x39
bits 48 0x314159265359
bits 32 0x76A70995
bits 1 0x0
bits 24 0x000001
# Bitslices (h) ..= (j)
bits 16 0x0300
bits 16 0x7000
bits 16 0x2000
# Bitslices (k) ..= (m)
bits 3 0x2
bits 15 0x0001
bits 1 0x0
# Bitslices (n) ..= (o)
bits 19 0x0CD34
bits 19 0x0CD34
# Bitslice (p)
repeat 50 [
bits 2 0x0
]
bits 3 0x7
# Bitslices (q) ..= (s)
bits 48 0x177245385090
bits 32 0x76A70995
bits 5 0x00