Skip to content

Commit 5d461de

Browse files
committed
test: change incorrect parameter
1 parent 651f59d commit 5d461de

File tree

2 files changed

+86
-22
lines changed

2 files changed

+86
-22
lines changed

tests/compress_args.phpt

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
--TEST--
2+
brotli_compress() functionality with arguments
3+
--FILE--
4+
<?php
5+
include(dirname(__FILE__) . '/data.inc');
6+
7+
function test($data, $quality = 0, $mode = 0) {
8+
echo "quality={$quality}, mode={$mode}\n";
9+
10+
$compressed = brotli_compress($data, $quality, $mode);
11+
if ($compressed === false) {
12+
echo "ERROR\n";
13+
return;
14+
}
15+
16+
if ($data === brotli_uncompress($compressed)) {
17+
echo "OK\n";
18+
} else {
19+
echo "Error: brotli_compress\n";
20+
}
21+
}
22+
23+
foreach ([0, 9, 11, 20, -1] as $quality) {
24+
test($data, $quality, BROTLI_GENERIC);
25+
}
26+
foreach ([0, 1, 2, 3, -1] as $mode) {
27+
test($data, BROTLI_COMPRESS_LEVEL_DEFAULT, $mode);
28+
}
29+
?>
30+
===DONE===
31+
--EXPECTF--
32+
quality=0, mode=0
33+
OK
34+
quality=9, mode=0
35+
OK
36+
quality=11, mode=0
37+
OK
38+
quality=20, mode=0
39+
40+
Warning: brotli_compress(): failed to compression quality (20): must be within 0..11 in %s on line %d
41+
ERROR
42+
quality=-1, mode=0
43+
44+
Warning: brotli_compress(): failed to compression quality (-1): must be within 0..11 in %s on line %d
45+
ERROR
46+
quality=11, mode=0
47+
OK
48+
quality=11, mode=1
49+
OK
50+
quality=11, mode=2
51+
OK
52+
quality=11, mode=3
53+
54+
Warning: brotli_compress(): failed to compression mode (3): must be BROTLI_GENERIC(0)|BROTLI_TEXT(1)|BROTLI_FONT(2) in %s on line %d
55+
ERROR
56+
quality=11, mode=-1
57+
58+
Warning: brotli_compress(): failed to compression mode (-1): must be BROTLI_GENERIC(0)|BROTLI_TEXT(1)|BROTLI_FONT(2) in %s on line %d
59+
ERROR
60+
===DONE===

tests/incremental_compress_add_args.phpt

Lines changed: 26 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,31 @@ if (!extension_loaded('brotli')) die('skip need ext/brotli');
66
?>
77
--FILE--
88
<?php
9-
function test($quality = 0, $mode = 0) {
9+
function test($quality = 0, $mode = 0, $types = []) {
1010
echo "quality={$quality}, mode={$mode}\n";
1111

12-
$modeTypes = [
12+
$modeTypes = array_merge([
1313
'BROTLI_PROCESS' => BROTLI_PROCESS,
1414
'BROTLI_FLUSH' => BROTLI_FLUSH,
15-
];
15+
], $types);
1616

1717
foreach ($modeTypes as $modeTypeKey => $modeType) {
1818

1919
$uncompressed = $compressed = '';
2020

2121
$resource = brotli_compress_init($quality, $mode);
22+
if ($resource === false) {
23+
echo "ERROR\n";
24+
return;
25+
}
2226
foreach (range('a', 'z') as $c) {
2327
$uncompressed .= $c;
24-
$compressed .= brotli_compress_add($resource, $c, $modeType);
28+
$result = brotli_compress_add($resource, $c, $modeType);
29+
if ($result === false) {
30+
echo "ERROR: brotli_compress_add | {$modeTypeKey}\n";
31+
return;
32+
}
33+
$compressed .= $result;
2534
}
2635
$compressed .= brotli_compress_add($resource, '', BROTLI_FINISH);
2736

@@ -39,6 +48,7 @@ foreach ([0, 9, 11, 20, -1] as $quality) {
3948
foreach ([0, 1, 2, 3, -1] as $mode) {
4049
test(0, $mode);
4150
}
51+
test(0, 0, ['INCORRECT' => -1]);
4252
?>
4353
===DONE===
4454
--EXPECTF--
@@ -53,18 +63,12 @@ OK
5363
OK
5464
quality=20, mode=0
5565

56-
Warning: brotli_compress_init(): brotli: compression level (20) must be within 0..11 in %s on line %d
57-
OK
58-
59-
Warning: brotli_compress_init(): brotli: compression level (20) must be within 0..11 in %s on line %d
60-
OK
66+
Warning: brotli_compress_init(): failed to compression quality (20): must be within 0..11 in %s on line %d
67+
ERROR
6168
quality=-1, mode=0
6269

63-
Warning: brotli_compress_init(): brotli: compression level (-1) must be within 0..11 in %s on line %d
64-
OK
65-
66-
Warning: brotli_compress_init(): brotli: compression level (-1) must be within 0..11 in %s on line %d
67-
OK
70+
Warning: brotli_compress_init(): failed to compression quality (-1): must be within 0..11 in %s on line %d
71+
ERROR
6872
quality=0, mode=0
6973
OK
7074
OK
@@ -76,16 +80,16 @@ OK
7680
OK
7781
quality=0, mode=3
7882

79-
Warning: brotli_compress_init(): brotli: compression mode (3) must be 0, 1, 2 in %s on line %d
80-
OK
81-
82-
Warning: brotli_compress_init(): brotli: compression mode (3) must be 0, 1, 2 in %s on line %d
83-
OK
83+
Warning: brotli_compress_init(): failed to compression mode (3): must be BROTLI_GENERIC(0)|BROTLI_TEXT(1)|BROTLI_FONT(2) in %s on line %d
84+
ERROR
8485
quality=0, mode=-1
8586

86-
Warning: brotli_compress_init(): brotli: compression mode (-1) must be 0, 1, 2 in %s on line %d
87+
Warning: brotli_compress_init(): failed to compression mode (-1): must be BROTLI_GENERIC(0)|BROTLI_TEXT(1)|BROTLI_FONT(2) in %s on line %d
88+
ERROR
89+
quality=0, mode=0
8790
OK
88-
89-
Warning: brotli_compress_init(): brotli: compression mode (-1) must be 0, 1, 2 in %s on line %d
9091
OK
92+
93+
Warning: brotli_compress_add(): failed to compression mode (-1): must be BROTLI_PROCESS(0)|BROTLI_FLUSH(1)|BROTLI_FINISH(2) in %s on line %d
94+
ERROR: brotli_compress_add | INCORRECT
9195
===DONE===

0 commit comments

Comments
 (0)