diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2019-04-15 12:11:36 -0400 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2019-04-15 12:11:36 -0400 |
| commit | cebb2dcc2366501b5a25fcf084da7c7cecd16c09 (patch) | |
| tree | 37880dde2cb20ff5415bb7e8be618d97dc6fe64b /test | |
| parent | 87854afe611575c0f12ff800e2bf5a2715081182 (diff) | |
| download | cups-cebb2dcc2366501b5a25fcf084da7c7cecd16c09.tar.gz | |
The IPP/2.2 test file tested booleans against value "1" instead of "true", but
ipptool was updated a while back to look for "true".
test/ipp-2.2.test:
- Change WITH-VALUE for booleans from '1' to 'true'
test/ipptool.c:
- Update with_value() to support both "true" and "1" for boolean true values.
Diffstat (limited to 'test')
| -rw-r--r-- | test/ipp-2.2.test | 6 | ||||
| -rw-r--r-- | test/ipptool.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/test/ipp-2.2.test b/test/ipp-2.2.test index f83cc1fab..bd4fecda2 100644 --- a/test/ipp-2.2.test +++ b/test/ipp-2.2.test @@ -36,14 +36,14 @@ INCLUDE "ipp-2.1.test" EXPECT number-up-supported OF-TYPE integer|rangeOfInteger IN-GROUP printer-attributes-tag WITH-VALUE >0 EXPECT overrides-supported OF-TYPE keyword IN-GROUP printer-attributes-tag WITH-VALUE "document-numbers" EXPECT overrides-supported OF-TYPE keyword IN-GROUP printer-attributes-tag WITH-VALUE "pages" - EXPECT page-ranges-supported OF-TYPE boolean IN-GROUP printer-attributes-tag COUNT 1 WITH-VALUE 1 + EXPECT page-ranges-supported OF-TYPE boolean IN-GROUP printer-attributes-tag COUNT 1 WITH-VALUE true # Printer description attributes EXPECT job-creation-attributes-supported OF-TYPE keyword IN-GROUP printer-attributes-tag - EXPECT job-ids-supported OF-TYPE boolean IN-GROUP printer-attributes-tag COUNT 1 WITH-VALUE 1 + EXPECT job-ids-supported OF-TYPE boolean IN-GROUP printer-attributes-tag COUNT 1 WITH-VALUE true EXPECT media-col-ready EXPECT media-ready - EXPECT multiple-document-jobs-supported OF-TYPE boolean IN-GROUP printer-attributes-tag COUNT 1 WITH-VALUE 1 + EXPECT multiple-document-jobs-supported OF-TYPE boolean IN-GROUP printer-attributes-tag COUNT 1 WITH-VALUE true EXPECT printer-alert OF-TYPE octetString IN-GROUP printer-attributes-tag EXPECT printer-alert-description OF-TYPE text IN-GROUP printer-attributes-tag SAME-COUNT-AS printer-alert EXPECT printer-device-id OF-TYPE text IN-GROUP printer-attributes-tag COUNT 1 diff --git a/test/ipptool.c b/test/ipptool.c index 7d92e960f..aa225085e 100644 --- a/test/ipptool.c +++ b/test/ipptool.c @@ -4540,7 +4540,7 @@ with_value(_cups_testdata_t *data, /* I - Test data */ case IPP_TAG_BOOLEAN : for (i = 0; i < count; i ++) { - if ((!strcmp(value, "true")) == ippGetBoolean(attr, i)) + if ((!strcmp(value, "true") || !strcmp(value, "1")) == ippGetBoolean(attr, i)) { if (!matchbuf[0]) strlcpy(matchbuf, value, matchlen); |