Skip to content

Commit b00afef

Browse files
kjdevkjdev
committed
test: rename quality -> level
1 parent d9ee203 commit b00afef

File tree

4 files changed

+69
-69
lines changed

4 files changed

+69
-69
lines changed

‎tests/compatibility.phpt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ foreach ($files as $filename) {
2020

2121
$split = explode('.compressed', $filename);
2222
$expected = $split[0];
23-
$quality = -1;
23+
$level = -1;
2424

2525
if (isset($split[1])) {
26-
$quality = (int)$split[1];
26+
$level = (int)$split[1];
2727
}
2828

2929
if (file_exists($expected)) {
@@ -38,7 +38,7 @@ foreach ($files as $filename) {
3838
echo " read uncompressed .. OK\n";
3939
}
4040

41-
$expected_data = brotli_compress($data, $quality);
41+
$expected_data = brotli_compress($data, $level);
4242
if (!$expected_data) {
4343
echo " compressed .. NG\n";
4444
exit(1);

‎tests/compress_args.phpt

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ brotli_compress() functionality with arguments
44
<?php
55
include(dirname(__FILE__) . '/data.inc');
66

7-
function test($data, $quality = 0, $mode = 0) {
8-
echo "quality={$quality}, mode={$mode}\n";
7+
function test($data, $level = 0, $mode = 0) {
8+
echo "level={$level}, mode={$mode}\n";
99

10-
$compressed = brotli_compress($data, $quality, $mode);
10+
$compressed = brotli_compress($data, $level, $mode);
1111
if ($compressed === false) {
1212
echo "ERROR\n";
1313
return;
@@ -20,40 +20,40 @@ function test($data, $quality = 0, $mode = 0) {
2020
}
2121
}
2222

23-
foreach ([0, 9, 11, 20, -1] as $quality) {
24-
test($data, $quality, BROTLI_GENERIC);
23+
foreach ([0, 9, 11, 20, -1] as $level) {
24+
test($data, $level, BROTLI_GENERIC);
2525
}
2626
foreach ([0, 1, 2, 3, -1] as $mode) {
2727
test($data, BROTLI_COMPRESS_LEVEL_DEFAULT, $mode);
2828
}
2929
?>
3030
===DONE===
3131
--EXPECTF--
32-
quality=0, mode=0
32+
level=0, mode=0
3333
OK
34-
quality=9, mode=0
34+
level=9, mode=0
3535
OK
36-
quality=11, mode=0
36+
level=11, mode=0
3737
OK
38-
quality=20, mode=0
38+
level=20, mode=0
3939

40-
Warning: brotli_compress(): failed to compression quality (20): must be within 0..11 in %s on line %d
40+
Warning: brotli_compress(): failed to compression level (20): must be within 0..11 in %s on line %d
4141
ERROR
42-
quality=-1, mode=0
42+
level=-1, mode=0
4343

44-
Warning: brotli_compress(): failed to compression quality (-1): must be within 0..11 in %s on line %d
44+
Warning: brotli_compress(): failed to compression level (-1): must be within 0..11 in %s on line %d
4545
ERROR
46-
quality=11, mode=0
46+
level=11, mode=0
4747
OK
48-
quality=11, mode=1
48+
level=11, mode=1
4949
OK
50-
quality=11, mode=2
50+
level=11, mode=2
5151
OK
52-
quality=11, mode=3
52+
level=11, mode=3
5353

5454
Warning: brotli_compress(): failed to compression mode (3): must be BROTLI_GENERIC(0)|BROTLI_TEXT(1)|BROTLI_FONT(2) in %s on line %d
5555
ERROR
56-
quality=11, mode=-1
56+
level=11, mode=-1
5757

5858
Warning: brotli_compress(): failed to compression mode (-1): must be BROTLI_GENERIC(0)|BROTLI_TEXT(1)|BROTLI_FONT(2) in %s on line %d
5959
ERROR

‎tests/incremental_compress_add_args.phpt

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

1212
$modeTypes = array_merge([
1313
'BROTLI_PROCESS' => BROTLI_PROCESS,
@@ -18,7 +18,7 @@ function test($quality = 0, $mode = 0, $types = []) {
1818

1919
$uncompressed = $compressed = '';
2020

21-
$resource = brotli_compress_init($quality, $mode);
21+
$resource = brotli_compress_init($level, $mode);
2222
if ($resource === false) {
2323
echo "ERROR\n";
2424
return;
@@ -42,8 +42,8 @@ function test($quality = 0, $mode = 0, $types = []) {
4242
}
4343
}
4444

45-
foreach ([0, 9, 11, 20, -1] as $quality) {
46-
test($quality, 0);
45+
foreach ([0, 9, 11, 20, -1] as $level) {
46+
test($level, 0);
4747
}
4848
foreach ([0, 1, 2, 3, -1] as $mode) {
4949
test(0, $mode);
@@ -52,41 +52,41 @@ test(0, 0, ['INCORRECT' => -1]);
5252
?>
5353
===DONE===
5454
--EXPECTF--
55-
quality=0, mode=0
55+
level=0, mode=0
5656
OK
5757
OK
58-
quality=9, mode=0
58+
level=9, mode=0
5959
OK
6060
OK
61-
quality=11, mode=0
61+
level=11, mode=0
6262
OK
6363
OK
64-
quality=20, mode=0
64+
level=20, mode=0
6565

66-
Warning: brotli_compress_init(): failed to compression quality (20): must be within 0..11 in %s on line %d
66+
Warning: brotli_compress_init(): failed to compression level (20): must be within 0..11 in %s on line %d
6767
ERROR
68-
quality=-1, mode=0
68+
level=-1, mode=0
6969

70-
Warning: brotli_compress_init(): failed to compression quality (-1): must be within 0..11 in %s on line %d
70+
Warning: brotli_compress_init(): failed to compression level (-1): must be within 0..11 in %s on line %d
7171
ERROR
72-
quality=0, mode=0
72+
level=0, mode=0
7373
OK
7474
OK
75-
quality=0, mode=1
75+
level=0, mode=1
7676
OK
7777
OK
78-
quality=0, mode=2
78+
level=0, mode=2
7979
OK
8080
OK
81-
quality=0, mode=3
81+
level=0, mode=3
8282

8383
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
8484
ERROR
85-
quality=0, mode=-1
85+
level=0, mode=-1
8686

8787
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
8888
ERROR
89-
quality=0, mode=0
89+
level=0, mode=0
9090
OK
9191
OK
9292

‎tests/roundtrip.phpt

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@ $files = roundtrip_files();
1818
$qualities = array(BROTLI_COMPRESS_LEVEL_MIN, 6, 9, BROTLI_COMPRESS_LEVEL_MAX);
1919

2020
foreach ($files as $filename) {
21-
foreach ($qualities as $quality) {
22-
echo 'Roundtrip testing file ', basename($filename), ' at quality ', $quality, PHP_EOL;
21+
foreach ($qualities as $level) {
22+
echo 'Roundtrip testing file ', basename($filename), ' at level ', $level, PHP_EOL;
2323

2424
$expected = $filename;
2525

2626
if (file_exists($expected)) {
2727
$data = file_get_contents($expected);
28-
$expected_data = brotli_uncompress(brotli_compress($data, $quality));
28+
$expected_data = brotli_uncompress(brotli_compress($data, $level));
2929
if ($data !== $expected_data) {
3030
echo " NG\n";
3131
exit(1);
@@ -37,59 +37,59 @@ foreach ($files as $filename) {
3737
}
3838

3939
--EXPECTF--
40-
Roundtrip testing file alice29.txt at quality 0
40+
Roundtrip testing file alice29.txt at level 0
4141
OK
42-
Roundtrip testing file alice29.txt at quality 6
42+
Roundtrip testing file alice29.txt at level 6
4343
OK
44-
Roundtrip testing file alice29.txt at quality 9
44+
Roundtrip testing file alice29.txt at level 9
4545
OK
46-
Roundtrip testing file alice29.txt at quality 11
46+
Roundtrip testing file alice29.txt at level 11
4747
OK
48-
Roundtrip testing file asyoulik.txt at quality 0
48+
Roundtrip testing file asyoulik.txt at level 0
4949
OK
50-
Roundtrip testing file asyoulik.txt at quality 6
50+
Roundtrip testing file asyoulik.txt at level 6
5151
OK
52-
Roundtrip testing file asyoulik.txt at quality 9
52+
Roundtrip testing file asyoulik.txt at level 9
5353
OK
54-
Roundtrip testing file asyoulik.txt at quality 11
54+
Roundtrip testing file asyoulik.txt at level 11
5555
OK
56-
Roundtrip testing file lcet10.txt at quality 0
56+
Roundtrip testing file lcet10.txt at level 0
5757
OK
58-
Roundtrip testing file lcet10.txt at quality 6
58+
Roundtrip testing file lcet10.txt at level 6
5959
OK
60-
Roundtrip testing file lcet10.txt at quality 9
60+
Roundtrip testing file lcet10.txt at level 9
6161
OK
62-
Roundtrip testing file lcet10.txt at quality 11
62+
Roundtrip testing file lcet10.txt at level 11
6363
OK
64-
Roundtrip testing file plrabn12.txt at quality 0
64+
Roundtrip testing file plrabn12.txt at level 0
6565
OK
66-
Roundtrip testing file plrabn12.txt at quality 6
66+
Roundtrip testing file plrabn12.txt at level 6
6767
OK
68-
Roundtrip testing file plrabn12.txt at quality 9
68+
Roundtrip testing file plrabn12.txt at level 9
6969
OK
70-
Roundtrip testing file plrabn12.txt at quality 11
70+
Roundtrip testing file plrabn12.txt at level 11
7171
OK
72-
Roundtrip testing file encode.c at quality 0
72+
Roundtrip testing file encode.c at level 0
7373
OK
74-
Roundtrip testing file encode.c at quality 6
74+
Roundtrip testing file encode.c at level 6
7575
OK
76-
Roundtrip testing file encode.c at quality 9
76+
Roundtrip testing file encode.c at level 9
7777
OK
78-
Roundtrip testing file encode.c at quality 11
78+
Roundtrip testing file encode.c at level 11
7979
OK
80-
Roundtrip testing file dictionary.h at quality 0
80+
Roundtrip testing file dictionary.h at level 0
8181
OK
82-
Roundtrip testing file dictionary.h at quality 6
82+
Roundtrip testing file dictionary.h at level 6
8383
OK
84-
Roundtrip testing file dictionary.h at quality 9
84+
Roundtrip testing file dictionary.h at level 9
8585
OK
86-
Roundtrip testing file dictionary.h at quality 11
86+
Roundtrip testing file dictionary.h at level 11
8787
OK
88-
Roundtrip testing file decode.c at quality 0
88+
Roundtrip testing file decode.c at level 0
8989
OK
90-
Roundtrip testing file decode.c at quality 6
90+
Roundtrip testing file decode.c at level 6
9191
OK
92-
Roundtrip testing file decode.c at quality 9
92+
Roundtrip testing file decode.c at level 9
9393
OK
94-
Roundtrip testing file decode.c at quality 11
94+
Roundtrip testing file decode.c at level 11
9595
OK

0 commit comments

Comments
 (0)