From: mike Date: Wed, 20 Feb 2013 01:39:36 +0000 (+0000) Subject: Tweak IPP/1.1 and fix IPP Everywhere tests. X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e7044a9a9026596b3d887d6b285766c601181362;p=thirdparty%2Fcups.git Tweak IPP/1.1 and fix IPP Everywhere tests. git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@10870 7a7537e8-13f0-0310-91df-b6672ffda945 --- diff --git a/test/ipp-1.1.test b/test/ipp-1.1.test index 4fd0ad7e19..2d109a6fed 100644 --- a/test/ipp-1.1.test +++ b/test/ipp-1.1.test @@ -3,7 +3,7 @@ # # IPP/1.1 test suite. # -# Copyright 2007-2012 by Apple Inc. +# Copyright 2007-2013 by Apple Inc. # Copyright 2001-2006 by Easy Software Products. All rights reserved. # # These coded instructions, statements, and computer programs are the @@ -156,7 +156,7 @@ DEFINE IPP_URI_SCHEME "/^ipps?://.+$$/" STATUS successful-ok STATUS client-error-document-format-not-supported STATUS server-error-job-canceled - STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 10 + STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 30 EXPECT job-uri OF-TYPE uri COUNT 1 IN-GROUP job-attributes-tag WITH-VALUE "$IPP_URI_SCHEME" EXPECT job-id OF-TYPE integer COUNT 1 IN-GROUP job-attributes-tag @@ -833,7 +833,7 @@ DEFINE IPP_URI_SCHEME "/^ipps?://.+$$/" STATUS successful-ok STATUS client-error-document-format-not-supported STATUS server-error-job-canceled - STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 10 + STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 30 EXPECT job-uri OF-TYPE uri COUNT 1 IN-GROUP job-attributes-tag WITH-VALUE "$IPP_URI_SCHEME" EXPECT job-id OF-TYPE integer COUNT 1 IN-GROUP job-attributes-tag @@ -945,7 +945,7 @@ DEFINE IPP_URI_SCHEME "/^ipps?://.+$$/" STATUS successful-ok STATUS server-error-job-canceled - STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 10 + STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 30 EXPECT job-uri OF-TYPE uri COUNT 1 IN-GROUP job-attributes-tag WITH-VALUE "$IPP_URI_SCHEME" EXPECT job-id OF-TYPE integer COUNT 1 IN-GROUP job-attributes-tag @@ -1262,7 +1262,7 @@ DEFINE IPP_URI_SCHEME "/^ipps?://.+$$/" STATUS successful-ok STATUS client-error-document-format-not-supported STATUS server-error-job-canceled - STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 10 + STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 30 EXPECT job-uri OF-TYPE uri COUNT 1 IN-GROUP job-attributes-tag WITH-VALUE "$IPP_URI_SCHEME" EXPECT job-id OF-TYPE integer COUNT 1 IN-GROUP job-attributes-tag @@ -1300,7 +1300,7 @@ DEFINE IPP_URI_SCHEME "/^ipps?://.+$$/" STATUS successful-ok STATUS server-error-job-canceled - STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 10 + STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 30 EXPECT job-uri OF-TYPE uri COUNT 1 IN-GROUP job-attributes-tag WITH-VALUE "$IPP_URI_SCHEME" EXPECT job-id OF-TYPE integer COUNT 1 IN-GROUP job-attributes-tag @@ -1338,7 +1338,7 @@ DEFINE IPP_URI_SCHEME "/^ipps?://.+$$/" STATUS successful-ok STATUS server-error-job-canceled - STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 10 + STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 30 EXPECT job-uri OF-TYPE uri COUNT 1 IN-GROUP job-attributes-tag WITH-VALUE "$IPP_URI_SCHEME" EXPECT job-id OF-TYPE integer COUNT 1 IN-GROUP job-attributes-tag @@ -1374,7 +1374,7 @@ DEFINE IPP_URI_SCHEME "/^ipps?://.+$$/" STATUS successful-ok STATUS server-error-job-canceled - STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 10 + STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 30 EXPECT job-uri OF-TYPE uri COUNT 1 IN-GROUP job-attributes-tag WITH-VALUE "$IPP_URI_SCHEME" EXPECT job-id OF-TYPE integer COUNT 1 IN-GROUP job-attributes-tag @@ -1412,7 +1412,7 @@ DEFINE IPP_URI_SCHEME "/^ipps?://.+$$/" STATUS successful-ok STATUS server-error-job-canceled - STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 10 + STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 30 EXPECT job-uri OF-TYPE uri COUNT 1 IN-GROUP job-attributes-tag WITH-VALUE "$IPP_URI_SCHEME" EXPECT job-id OF-TYPE integer COUNT 1 IN-GROUP job-attributes-tag @@ -1450,7 +1450,7 @@ DEFINE IPP_URI_SCHEME "/^ipps?://.+$$/" STATUS successful-ok STATUS server-error-job-canceled - STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 10 + STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 30 EXPECT job-uri OF-TYPE uri COUNT 1 IN-GROUP job-attributes-tag WITH-VALUE "$IPP_URI_SCHEME" EXPECT job-id OF-TYPE integer COUNT 1 IN-GROUP job-attributes-tag @@ -1488,7 +1488,7 @@ DEFINE IPP_URI_SCHEME "/^ipps?://.+$$/" STATUS successful-ok STATUS server-error-job-canceled - STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 10 + STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 30 EXPECT job-uri OF-TYPE uri COUNT 1 IN-GROUP job-attributes-tag WITH-VALUE "$IPP_URI_SCHEME" EXPECT job-id OF-TYPE integer COUNT 1 IN-GROUP job-attributes-tag @@ -1524,7 +1524,7 @@ DEFINE IPP_URI_SCHEME "/^ipps?://.+$$/" STATUS successful-ok STATUS server-error-job-canceled - STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 10 + STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 30 EXPECT job-uri OF-TYPE uri COUNT 1 IN-GROUP job-attributes-tag WITH-VALUE "$IPP_URI_SCHEME" EXPECT job-id OF-TYPE integer COUNT 1 IN-GROUP job-attributes-tag @@ -1562,7 +1562,7 @@ DEFINE IPP_URI_SCHEME "/^ipps?://.+$$/" STATUS successful-ok STATUS server-error-job-canceled - STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 10 + STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 30 EXPECT job-uri OF-TYPE uri COUNT 1 IN-GROUP job-attributes-tag WITH-VALUE "$IPP_URI_SCHEME" EXPECT job-id OF-TYPE integer COUNT 1 IN-GROUP job-attributes-tag @@ -1600,7 +1600,7 @@ DEFINE IPP_URI_SCHEME "/^ipps?://.+$$/" STATUS successful-ok STATUS server-error-job-canceled - STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 10 + STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 30 EXPECT job-uri OF-TYPE uri COUNT 1 IN-GROUP job-attributes-tag WITH-VALUE "$IPP_URI_SCHEME" EXPECT job-id OF-TYPE integer COUNT 1 IN-GROUP job-attributes-tag @@ -1636,7 +1636,7 @@ DEFINE IPP_URI_SCHEME "/^ipps?://.+$$/" STATUS successful-ok STATUS server-error-job-canceled - STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 10 + STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 30 EXPECT job-uri OF-TYPE uri COUNT 1 IN-GROUP job-attributes-tag WITH-VALUE "$IPP_URI_SCHEME" EXPECT job-id OF-TYPE integer COUNT 1 IN-GROUP job-attributes-tag @@ -1672,7 +1672,7 @@ DEFINE IPP_URI_SCHEME "/^ipps?://.+$$/" STATUS successful-ok STATUS server-error-job-canceled - STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 10 + STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 30 EXPECT job-uri OF-TYPE uri COUNT 1 IN-GROUP job-attributes-tag WITH-VALUE "$IPP_URI_SCHEME" EXPECT job-id OF-TYPE integer COUNT 1 IN-GROUP job-attributes-tag @@ -1708,7 +1708,7 @@ DEFINE IPP_URI_SCHEME "/^ipps?://.+$$/" STATUS successful-ok STATUS server-error-job-canceled - STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 10 + STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 30 EXPECT job-uri OF-TYPE uri COUNT 1 IN-GROUP job-attributes-tag WITH-VALUE "$IPP_URI_SCHEME" EXPECT job-id OF-TYPE integer COUNT 1 IN-GROUP job-attributes-tag @@ -1744,7 +1744,7 @@ DEFINE IPP_URI_SCHEME "/^ipps?://.+$$/" STATUS successful-ok STATUS server-error-job-canceled - STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 10 + STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 30 EXPECT job-uri OF-TYPE uri COUNT 1 IN-GROUP job-attributes-tag WITH-VALUE "$IPP_URI_SCHEME" EXPECT job-id OF-TYPE integer COUNT 1 IN-GROUP job-attributes-tag @@ -1780,7 +1780,7 @@ DEFINE IPP_URI_SCHEME "/^ipps?://.+$$/" STATUS successful-ok STATUS server-error-job-canceled - STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 10 + STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 30 EXPECT job-uri OF-TYPE uri COUNT 1 IN-GROUP job-attributes-tag WITH-VALUE "$IPP_URI_SCHEME" EXPECT job-id OF-TYPE integer COUNT 1 IN-GROUP job-attributes-tag @@ -1820,7 +1820,7 @@ DEFINE IPP_URI_SCHEME "/^ipps?://.+$$/" STATUS successful-ok STATUS server-error-job-canceled - STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 10 + STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 30 EXPECT job-uri OF-TYPE uri COUNT 1 IN-GROUP job-attributes-tag WITH-VALUE "$IPP_URI_SCHEME" EXPECT job-id OF-TYPE integer COUNT 1 IN-GROUP job-attributes-tag @@ -1858,7 +1858,7 @@ DEFINE IPP_URI_SCHEME "/^ipps?://.+$$/" STATUS successful-ok STATUS server-error-job-canceled - STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 10 + STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 30 EXPECT job-uri OF-TYPE uri COUNT 1 IN-GROUP job-attributes-tag WITH-VALUE "$IPP_URI_SCHEME" EXPECT job-id OF-TYPE integer COUNT 1 IN-GROUP job-attributes-tag @@ -1896,7 +1896,7 @@ DEFINE IPP_URI_SCHEME "/^ipps?://.+$$/" STATUS successful-ok STATUS server-error-job-canceled - STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 10 + STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 30 EXPECT job-uri OF-TYPE uri COUNT 1 IN-GROUP job-attributes-tag WITH-VALUE "$IPP_URI_SCHEME" EXPECT job-id OF-TYPE integer COUNT 1 IN-GROUP job-attributes-tag @@ -1934,7 +1934,7 @@ DEFINE IPP_URI_SCHEME "/^ipps?://.+$$/" STATUS successful-ok STATUS server-error-job-canceled - STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 10 + STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 30 EXPECT job-uri OF-TYPE uri COUNT 1 IN-GROUP job-attributes-tag WITH-VALUE "$IPP_URI_SCHEME" EXPECT job-id OF-TYPE integer COUNT 1 IN-GROUP job-attributes-tag @@ -1974,7 +1974,7 @@ DEFINE IPP_URI_SCHEME "/^ipps?://.+$$/" STATUS successful-ok STATUS server-error-job-canceled - STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 10 + STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 30 EXPECT job-uri OF-TYPE uri COUNT 1 IN-GROUP job-attributes-tag WITH-VALUE "$IPP_URI_SCHEME" EXPECT job-id OF-TYPE integer COUNT 1 IN-GROUP job-attributes-tag @@ -2012,7 +2012,7 @@ DEFINE IPP_URI_SCHEME "/^ipps?://.+$$/" STATUS successful-ok STATUS server-error-job-canceled - STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 10 + STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 30 EXPECT job-uri OF-TYPE uri COUNT 1 IN-GROUP job-attributes-tag WITH-VALUE "$IPP_URI_SCHEME" EXPECT job-id OF-TYPE integer COUNT 1 IN-GROUP job-attributes-tag @@ -2050,7 +2050,7 @@ DEFINE IPP_URI_SCHEME "/^ipps?://.+$$/" STATUS successful-ok STATUS server-error-job-canceled - STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 10 + STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 30 EXPECT job-uri OF-TYPE uri COUNT 1 IN-GROUP job-attributes-tag WITH-VALUE "$IPP_URI_SCHEME" EXPECT job-id OF-TYPE integer COUNT 1 IN-GROUP job-attributes-tag @@ -2088,7 +2088,7 @@ DEFINE IPP_URI_SCHEME "/^ipps?://.+$$/" STATUS successful-ok STATUS server-error-job-canceled - STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 10 + STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 30 EXPECT job-uri OF-TYPE uri COUNT 1 IN-GROUP job-attributes-tag WITH-VALUE "$IPP_URI_SCHEME" EXPECT job-id OF-TYPE integer COUNT 1 IN-GROUP job-attributes-tag @@ -2128,7 +2128,7 @@ DEFINE IPP_URI_SCHEME "/^ipps?://.+$$/" STATUS successful-ok STATUS server-error-job-canceled - STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 10 + STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 30 EXPECT job-uri OF-TYPE uri COUNT 1 IN-GROUP job-attributes-tag WITH-VALUE "$IPP_URI_SCHEME" EXPECT job-id OF-TYPE integer COUNT 1 IN-GROUP job-attributes-tag @@ -2166,7 +2166,7 @@ DEFINE IPP_URI_SCHEME "/^ipps?://.+$$/" STATUS successful-ok STATUS server-error-job-canceled - STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 10 + STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 30 EXPECT job-uri OF-TYPE uri COUNT 1 IN-GROUP job-attributes-tag WITH-VALUE "$IPP_URI_SCHEME" EXPECT job-id OF-TYPE integer COUNT 1 IN-GROUP job-attributes-tag @@ -2204,7 +2204,7 @@ DEFINE IPP_URI_SCHEME "/^ipps?://.+$$/" STATUS successful-ok STATUS server-error-job-canceled - STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 10 + STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 30 EXPECT job-uri OF-TYPE uri COUNT 1 IN-GROUP job-attributes-tag WITH-VALUE "$IPP_URI_SCHEME" EXPECT job-id OF-TYPE integer COUNT 1 IN-GROUP job-attributes-tag @@ -2242,7 +2242,7 @@ DEFINE IPP_URI_SCHEME "/^ipps?://.+$$/" STATUS successful-ok STATUS server-error-job-canceled - STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 10 + STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 30 EXPECT job-uri OF-TYPE uri COUNT 1 IN-GROUP job-attributes-tag WITH-VALUE "$IPP_URI_SCHEME" EXPECT job-id OF-TYPE integer COUNT 1 IN-GROUP job-attributes-tag @@ -2280,7 +2280,7 @@ DEFINE IPP_URI_SCHEME "/^ipps?://.+$$/" STATUS successful-ok STATUS server-error-job-canceled - STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 10 + STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 30 EXPECT job-uri OF-TYPE uri COUNT 1 IN-GROUP job-attributes-tag WITH-VALUE "$IPP_URI_SCHEME" EXPECT job-id OF-TYPE integer COUNT 1 IN-GROUP job-attributes-tag @@ -2315,7 +2315,7 @@ DEFINE IPP_URI_SCHEME "/^ipps?://.+$$/" STATUS successful-ok STATUS server-error-job-canceled - STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 10 + STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 30 EXPECT job-uri OF-TYPE uri COUNT 1 IN-GROUP job-attributes-tag WITH-VALUE "$IPP_URI_SCHEME" EXPECT job-id OF-TYPE integer COUNT 1 IN-GROUP job-attributes-tag diff --git a/test/ipp-everywhere.test b/test/ipp-everywhere.test index 4260cd815b..d1e5b2ce37 100644 --- a/test/ipp-everywhere.test +++ b/test/ipp-everywhere.test @@ -69,10 +69,10 @@ INCLUDE "ipp-2.0.test" EXPECT ipp-features-supported OF-TYPE keyword IN-GROUP printer-attributes-tag WITH-VALUE "ipp-everywhere" - EXPECT job-account-id-supported OF-TYPE boolean IN-GROUP printer-attributes-tag WITH-VALUE 1 COUNT 1 DEFINE-MATCH JOB_ACCOUNT_ID_SUPPORTED + EXPECT job-account-id-supported OF-TYPE boolean IN-GROUP printer-attributes-tag WITH-VALUE true COUNT 1 DEFINE-MATCH JOB_ACCOUNT_ID_SUPPORTED EXPECT job-account-id-default OF-TYPE name|no-value IN-GROUP printer-attributes-tag COUNT 1 IF-DEFINED JOB_ACCOUNT_ID_SUPPORTED - EXPECT job-accounting-user-id-supported OF-TYPE boolean IN-GROUP printer-attributes-tag WITH-VALUE 1 COUNT 1 DEFINE-MATCH JOB_ACCOUNTING_USER_ID_SUPPORTED + EXPECT job-accounting-user-id-supported OF-TYPE boolean IN-GROUP printer-attributes-tag WITH-VALUE true COUNT 1 DEFINE-MATCH JOB_ACCOUNTING_USER_ID_SUPPORTED EXPECT job-accounting-user-id-default OF-TYPE name|no-value IN-GROUP printer-attributes-tag COUNT 1 IF-DEFINED JOB_ACCOUNTING_USER_ID_SUPPORTED EXPECT job-constraints-supported OF-TYPE collection IN-GROUP printer-attributes-tag DEFINE-MATCH JOB_CONSTRAINTS_SUPPORTED @@ -80,9 +80,9 @@ INCLUDE "ipp-2.0.test" 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 job-preferred-attributes-supported OF-TYPE boolean IN-GROUP printer-attributes-tag COUNT 1 WITH-VALUE 1 + EXPECT preferred-attributes-supported OF-TYPE boolean IN-GROUP printer-attributes-tag COUNT 1 EXPECT media-bottom-margin-supported OF-TYPE integer IN-GROUP printer-attributes-tag WITH-ALL-VALUES >-1 EXPECT media-left-margin-supported OF-TYPE integer IN-GROUP printer-attributes-tag WITH-ALL-VALUES >-1 @@ -103,14 +103,14 @@ INCLUDE "ipp-2.0.test" EXPECT multiple-document-jobs-supported OF-TYPE boolean IN-GROUP printer-attributes-tag COUNT 1 - EXPECT multiple-operation-timeout OF-TYPE integer IN-GROUP printer-attributes-tag COUNT 1 WITH-VALUE >0 + EXPECT multiple-operation-time-out OF-TYPE integer IN-GROUP printer-attributes-tag COUNT 1 WITH-VALUE >0 - EXPECT multiple-operation-timeout-action OF-TYPE keyword IN-GROUP printer-attributes-tag COUNT 1 WITH-VALUE "/^(abort-job|hold-job|process-job)$/" + EXPECT multiple-operation-time-out-action OF-TYPE keyword IN-GROUP printer-attributes-tag COUNT 1 WITH-VALUE "/^(abort-job|hold-job|process-job)$/" EXPECT overrides-supported OF-TYPE keyword IN-GROUP printer-attributes-tag WITH-VALUE "document-number" 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 IF-DEFINED PDF_OR_OPENXPS + EXPECT page-ranges-supported OF-TYPE boolean IN-GROUP printer-attributes-tag COUNT 1 WITH-VALUE true IF-DEFINED PDF_OR_OPENXPS EXPECT print-color-mode-default OF-TYPE keyword IN-GROUP printer-attributes-tag COUNT 1 WITH-VALUE "/^(auto|auto-monochrome|bi-level|color|highlight|monochrome|process-bi-level|process-monochrome)$/" EXPECT print-color-mode-supported OF-TYPE keyword IN-GROUP printer-attributes-tag WITH-ALL-VALUES "/^(auto|auto-monochrome|bi-level|color|highlight|monochrome|process-bi-level|process-monochrome)$/" @@ -144,8 +144,8 @@ INCLUDE "ipp-2.0.test" EXPECT ?printer-mandatory-job-attributes OF-TYPE keyword IN-GROUP printer-attributes-tag - EXPECT printer-organization OF-TYPE keyword IN-GROUP printer-attributes-tag - EXPECT printer-organizational-unit OF-TYPE keyword IN-GROUP printer-attributes-tag + EXPECT printer-organization OF-TYPE text IN-GROUP printer-attributes-tag + EXPECT printer-organizational-unit OF-TYPE text IN-GROUP printer-attributes-tag EXPECT printer-state-change-date-time OF-TYPE dateTime IN-GROUP printer-attributes-tag COUNT 1 EXPECT printer-state-change-time OF-TYPE integer IN-GROUP printer-attributes-tag COUNT 1 WITH-VALUE >-1 @@ -153,9 +153,9 @@ INCLUDE "ipp-2.0.test" EXPECT printer-supply OF-TYPE octetString IN-GROUP printer-attributes-tag SAME-COUNT-AS printer-supply-description EXPECT printer-supply-description OF-TYPE text IN-GROUP printer-attributes-tag SAME-COUNT-AS printer-supply - EXPECT printer-supply-uri OF-TYPE uri IN-GROUP printer-attributes-tag COUNT 1 + EXPECT printer-supply-info-uri OF-TYPE uri IN-GROUP printer-attributes-tag COUNT 1 - EXPECT printer-uuid OF-TYPE uri IN-GROUP printer-attributes-tag COUNT 1 WITH-VALUE "/^urn:uuid:[0-9A-F]{8,8}-[0-9A-F]{4,4}-[0-9A-F]{4,4}-[0-9A-F]{4,4}-[0-9A-F]{12,12}/" + EXPECT printer-uuid OF-TYPE uri IN-GROUP printer-attributes-tag COUNT 1 WITH-VALUE "/^urn:uuid:[0-9A-Fa-f]{8,8}-[0-9A-Fa-f]{4,4}-[0-9A-Fa-f]{4,4}-[0-9A-Fa-f]{4,4}-[0-9A-Fa-f]{12,12}/" EXPECT pwg-raster-document-resolution-supported OF-TYPE resolution IN-GROUP printer-attributes-tag EXPECT pwg-raster-document-resolution-supported WITH-VALUE 150dpi DEFINE-MATCH HAVE_150DPI @@ -168,11 +168,11 @@ INCLUDE "ipp-2.0.test" EXPECT pwg-raster-document-sheet-back OF-TYPE keyword IN-GROUP printer-attributes-tag COUNT 1 EXPECT pwg-raster-document-type-supported OF-TYPE keyword IN-GROUP printer-attributes-tag - EXPECT pwg-raster-document-type-supported WITH-VALUE "black-1" DEFINE-MATCH HAVE_BLACK_1 - EXPECT pwg-raster-document-type-supported WITH-VALUE "cmyk-8" DEFINE-MATCH HAVE_CMYK_8 - EXPECT pwg-raster-document-type-supported WITH-VALUE "sgray-8" DEFINE-MATCH HAVE_SGRAY_8 - EXPECT pwg-raster-document-type-supported WITH-VALUE "srgb-8" DEFINE-MATCH HAVE_SRGB_8 - EXPECT pwg-raster-document-type-supported WITH-VALUE "srgb-16" DEFINE-MATCH HAVE_SRGB_16 + EXPECT pwg-raster-document-type-supported WITH-VALUE "black_1" DEFINE-MATCH HAVE_BLACK_1 + EXPECT pwg-raster-document-type-supported WITH-VALUE "cmyk_8" DEFINE-MATCH HAVE_CMYK_8 + EXPECT pwg-raster-document-type-supported WITH-VALUE "sgray_8" DEFINE-MATCH HAVE_SGRAY_8 + EXPECT pwg-raster-document-type-supported WITH-VALUE "srgb_8" DEFINE-MATCH HAVE_SRGB_8 + EXPECT pwg-raster-document-type-supported WITH-VALUE "srgb_16" DEFINE-MATCH HAVE_SRGB_16 EXPECT which-jobs-supported OF-TYPE keyword IN-GROUP printer-attributes-tag }