Skip to content

Commit 6128211

Browse files
michaelrsweetmichaelrsweet
committed
Update tests.
1 parent 820c230 commit 6128211

4 files changed

Lines changed: 29 additions & 26 deletions

File tree

‎examples/ipp-1.1.test‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ DEFINE IPP_URI_REGEX "/^ipps?://.+$$/"
256256

257257
EXPECT finishings-supported DEFINE-MATCH PRINTER_HAS_FINISHINGS
258258
EXPECT finishings-default IF-DEFINED PRINTER_HAS_FINISHINGS
259-
EXPECT ?finishings-default OF-TYPE enum IN-GROUP printer-attributes-tag WITH-VALUES-FROM finishings-supported
259+
EXPECT ?finishings-default OF-TYPE enum IN-GROUP printer-attributes-tag WITH-ALL-VALUES-FROM finishings-supported
260260
EXPECT ?finishings-supported OF-TYPE enum IN-GROUP printer-attributes-tag WITH-VALUE 3
261261

262262
EXPECT job-hold-until-supported DEFINE-MATCH PRINTER_HAS_JOB_HOLD_UNTIL
@@ -330,7 +330,7 @@ DEFINE IPP_URI_REGEX "/^ipps?://.+$$/"
330330
EXPECT document-format-default OF-TYPE mimeMediaType IN-GROUP printer-attributes-tag COUNT 1 WITH-VALUE-FROM document-format-supported
331331
EXPECT document-format-supported OF-TYPE mimeMediaType IN-GROUP printer-attributes-tag
332332

333-
EXPECT generated-natural-language-supported OF-TYPE naturalLanguage IN-GROUP printer-attributes-tag WITH-VALUE-FROM natural-language-supported
333+
EXPECT generated-natural-language-supported OF-TYPE naturalLanguage IN-GROUP printer-attributes-tag
334334

335335
EXPECT ipp-versions-supported OF-TYPE keyword IN-GROUP printer-attributes-tag WITH-VALUE "1.1"
336336

@@ -344,7 +344,7 @@ DEFINE IPP_URI_REGEX "/^ipps?://.+$$/"
344344

345345
EXPECT ?multiple-operation-time-out OF-TYPE integer(1:MAX) IN-GROUP printer-attributes-tag COUNT 1
346346

347-
EXPECT natural-language-configured OF-TYPE naturalLanguage IN-GROUP printer-attributes-tag COUNT 1
347+
EXPECT natural-language-configured OF-TYPE naturalLanguage IN-GROUP printer-attributes-tag COUNT 1 WITH-VALUE-FROM generated-natural-language-supported
348348

349349
EXPECT ?pages-per-minute OF-TYPE integer IN-GROUP printer-attributes-tag COUNT 1
350350
EXPECT ?pages-per-minute-color OF-TYPE integer IN-GROUP printer-attributes-tag COUNT 1

‎examples/ipp-2.0.test‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,17 @@
1919

2020

2121
# (REQUIRED) PWG 5101.1-2023: Media Standardized Names v2.1 (MSN)
22-
DEFINE REQUIRE_MSN
22+
DEFINE REQUIRE_MSN 1
2323

2424
# (REQUIRED) IETF STD 92: Internet Printing Protocol/1.1
2525
INCLUDE "ipp-1.1.test"
2626

2727
# (REQUIRED) PWG 5100.1-2022: IPP Finishings v3.0 (MSN)
28-
DEFINE REQUIRE_FIN
28+
DEFINE REQUIRE_FIN 1
2929
INCLUDE "pwg5100.1.test"
3030

3131
# (REQUIRED) PWG 5100.2-2001: IPP "output-bin" Attribute
32-
DEFINE REQUIRE_OUTPUTBIN
32+
DEFINE REQUIRE_OUTPUTBIN 1
3333
INCLUDE "pwg5100.2.test"
3434

3535
# (RECOMMENDED) PWG 5100.7-2023: IPP Job Extensions v2.1 (JOBEXT)
@@ -79,12 +79,14 @@ INCLUDE "rfc3998.test"
7979
EXPECT operations-supported WITH-VALUE 0x0008 # Cancel-Job
8080
EXPECT operations-supported WITH-VALUE 0x0005 DEFINE-MATCH PRINTER_HAS_CREATE_JOB # Create-Job
8181
EXPECT operations-supported WITH-VALUE 0x0006 IF-DEFINED PRINTER_HAS_CREATE_JOB # Send-Document
82+
EXPECT operations-supported WITH-VALUE 0x003B IF-DEFINED PRINTER_HAS_CREATE_JOB # Close-Job
8283
EXPECT operations-supported WITH-VALUE 0x0009 # Get-Job-Attributes
8384
EXPECT operations-supported WITH-VALUE 0x000A # Get-Jobs
8485
EXPECT operations-supported WITH-VALUE 0x000B # Get-Printer-Attributes
8586
EXPECT operations-supported WITH-VALUE 0x0002 # Print-Job
8687
EXPECT operations-supported WITH-VALUE 0x0006 DEFINE-MATCH PRINTER_HAS_SEND_DOCUMENT # Send-Document
8788
EXPECT operations-supported WITH-VALUE 0x0005 IF-DEFINED PRINTER_HAS_SEND_DOCUMENT # Create-Job
89+
EXPECT operations-supported WITH-VALUE 0x003B IF-DEFINED PRINTER_HAS_SEND_DOCUMENT # Close-Job
8890
EXPECT operations-supported WITH-VALUE 0x0004 # Validate-Job
8991

9092
# Table 5 - Updated IPP Printer Description Attributes (IPP/2.0)

‎examples/pwg5100.7.test‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,15 @@
2929

3030
# Required operations
3131
EXPECT operations-supported OF-TYPE enum IN-GROUP printer-attributes-tag
32+
EXPECT operations-supported WITH-VALUE 0x0005 DEFINE-MATCH PRINTER_HAS_CREATE_JOB # Create-Job
33+
EXPECT operations-supported WITH-VALUE 0x003B IF-DEFINED PRINTER_HAS_CREATE_JOB IF-DEFINED REQUIRE_JOBEXT # Close-Job
3234
EXPECT operations-supported WITH-VALUE 0x0038 IF-DEFINED REQUIRE_JOBEXT # Cancel-Jobs
3335
EXPECT operations-supported WITH-VALUE 0x0039 IF-DEFINED REQUIRE_JOBEXT # Cancel-My-Jobs
34-
EXPECT operations-supported WITH-VALUE 0x003A IF-DEFINED REQUIRE_JOBEXT # Close-Job
3536

3637
EXPECT operations-supported WITH-VALUE 0x0038 DEFINE-MATCH PRINTER_HAS_CANCEL_JOBS
3738
EXPECT operations-supported WITH-VALUE 0x0039 DEFINE-MATCH PRINTER_HAS_CANCEL_MY_JOBS
38-
EXPECT operations-supported WITH-VALUE 0x003A DEFINE-MATCH PRINTER_HAS_CLOSE_JOB
39-
EXPECT operations-supported WITH-VALUE 0x003B DEFINE-MATCH PRINTER_HAS_RESUBMIT_JOB
39+
EXPECT operations-supported WITH-VALUE 0x003A DEFINE-MATCH PRINTER_HAS_RESUBMIT_JOB
40+
EXPECT operations-supported WITH-VALUE 0x003B DEFINE-MATCH PRINTER_HAS_CLOSE_JOB
4041

4142
# Attributes and values
4243
EXPECT job-creation-attributes-supported WITH-VALUE client-info DEFINE-MATCH PRINTER_HAS_CLIENT_INFO
@@ -72,7 +73,7 @@
7273
EXPECT job-delay-output-until-time-supported OF-TYPE rangeOfInteger(0:MAX) IN-GROUP printer-attributes-tag COUNT 1 IF-DEFINED PRINTER_HAS_JOB_DELAY_OUTPUT_UNTIL
7374

7475
EXPECT job-history-attributes-configured IF-DEFINED REQUIRE_JOBEXT
75-
EXPECT ?job-history-attributes-configured OF-TYPE keyword IN-GROUP printer-attributes-tag WITH-VALUES-FROM job-history-attributes-supported
76+
EXPECT ?job-history-attributes-configured OF-TYPE keyword IN-GROUP printer-attributes-tag WITH-ALL-VALUES-FROM job-history-attributes-supported
7677
EXPECT job-history-attributes-supported IF-DEFINED REQUIRE_JOBEXT
7778
EXPECT ?job-history-attributes-supported OF-TYPE keyword IN-GROUP printer-attributes-tag
7879

‎examples/rfc3995-3996.test‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@
3030

3131
# Operations - all but Create-Job-Subscription are required...
3232
EXPECT operations-supported OF-TYPE enum IN-GROUP printer-attributes-tag
33-
EXPECT operations-supported WITH-VALUE 0x0016 DEFINE-MATCH PRINTER_HAS_NOTIFICATIONS # Create-Printer-Subscription
33+
EXPECT operations-supported WITH-VALUE 0x0016 DEFINE-MATCH PRINTER_HAS_NOTIFICATIONS # Create-Printer-Subscriptions
3434

3535
EXPECT operations-supported WITH-VALUE 0x0016 IF-DEFINED REQUIRE_RFC3995
3636
EXPECT operations-supported WITH-VALUE 0x0016 IF-DEFINED PRINTER_HAS_NOTIFICATIONS
37-
EXPECT operations-supported WITH-VALUE 0x0016 DEFINE-MATCH PRINTER_HAS_CREATE_PRINTER_SUBCRIPTION
37+
EXPECT operations-supported WITH-VALUE 0x0016 DEFINE-MATCH PRINTER_HAS_CREATE_PRINTER_SUBCRIPTIONS
3838

39-
EXPECT operations-supported WITH-VALUE 0x0017 DEFINE-MATCH PRINTER_HAS_CREATE_JOB_SUBCRIPTION
39+
EXPECT operations-supported WITH-VALUE 0x0017 DEFINE-MATCH PRINTER_HAS_CREATE_JOB_SUBCRIPTIONS
4040

4141
EXPECT operations-supported WITH-VALUE 0x0018 IF-DEFINED REQUIRE_RFC3995
4242
EXPECT operations-supported WITH-VALUE 0x0018 IF-DEFINED PRINTER_HAS_NOTIFICATIONS
@@ -56,28 +56,28 @@
5656

5757
# Subscription template attributes - defaults and supported values
5858
EXPECT notify-attributes-supported IF-DEFINED PRINTER_HAS_NOTIFICATIONS
59-
EXPECT notify-attributes-supported OF-TYPE keyword IN-GROUP printer-attributes-tag
59+
EXPECT ?notify-attributes-supported OF-TYPE keyword IN-GROUP printer-attributes-tag
6060

6161
EXPECT notify-events-default IF-DEFINED PRINTER_HAS_NOTIFICATIONS
62-
EXPECT notify-events-default OF-TYPE keyword IN-GROUP printer-attributes-tag
62+
EXPECT ?notify-events-default OF-TYPE keyword IN-GROUP printer-attributes-tag
6363

6464
EXPECT notify-events-supported IF-DEFINED PRINTER_HAS_NOTIFICATIONS
65-
EXPECT notify-events-supported OF-TYPE keyword IN-GROUP printer-attributes-tag
66-
EXPECT notify-events-supported WITH-VALUE job-completed IF-DEFINED PRINTER_HAS_NOTIFICATIONS
67-
EXPECT notify-events-supported WITH-VALUE job-created IF-DEFINED PRINTER_HAS_NOTIFICATIONS
68-
EXPECT notify-events-supported WITH-VALUE job-state-changed IF-DEFINED PRINTER_HAS_NOTIFICATIONS
69-
EXPECT notify-events-supported WITH-VALUE none IF-DEFINED PRINTER_HAS_NOTIFICATIONS
70-
EXPECT notify-events-supported WITH-VALUE printer-state-changed IF-DEFINED PRINTER_HAS_NOTIFICATIONS
71-
EXPECT notify-events-supported WITH-VALUE printer-stopped IF-DEFINED PRINTER_HAS_NOTIFICATIONS
65+
EXPECT ?notify-events-supported OF-TYPE keyword IN-GROUP printer-attributes-tag
66+
EXPECT ?notify-events-supported WITH-VALUE job-completed IF-DEFINED PRINTER_HAS_NOTIFICATIONS
67+
EXPECT ?notify-events-supported WITH-VALUE job-created IF-DEFINED PRINTER_HAS_NOTIFICATIONS
68+
EXPECT ?notify-events-supported WITH-VALUE job-state-changed IF-DEFINED PRINTER_HAS_NOTIFICATIONS
69+
EXPECT ?notify-events-supported WITH-VALUE none IF-DEFINED PRINTER_HAS_NOTIFICATIONS
70+
EXPECT ?notify-events-supported WITH-VALUE printer-state-changed IF-DEFINED PRINTER_HAS_NOTIFICATIONS
71+
EXPECT ?notify-events-supported WITH-VALUE printer-stopped IF-DEFINED PRINTER_HAS_NOTIFICATIONS
7272

7373
EXPECT notify-lease-duration-default IF-DEFINED PRINTER_HAS_NOTIFICATIONS
74-
EXPECT notify-lease-duration-default OF-TYPE integer(0:67108863) IN-GROUP printer-attributes-tag COUNT 1
74+
EXPECT ?notify-lease-duration-default OF-TYPE integer(0:67108863) IN-GROUP printer-attributes-tag COUNT 1
7575

7676
EXPECT notify-lease-duration-supported IF-DEFINED PRINTER_HAS_NOTIFICATIONS
77-
EXPECT notify-lease-duration-supported OF-TYPE integer(0:67108863)|rangeOfInteger(0:67108863) IN-GROUP printer-attributes-tag
77+
EXPECT ?notify-lease-duration-supported OF-TYPE integer(0:67108863)|rangeOfInteger(0:67108863) IN-GROUP printer-attributes-tag
7878

7979
EXPECT notify-max-events-supported IF-DEFINED PRINTER_HAS_NOTIFICATIONS
80-
EXPECT notify-max-events-supported OF-TYPE integer(2:MAX) IN-GROUP printer-attributes-tag COUNT 1
80+
EXPECT ?notify-max-events-supported OF-TYPE integer(2:MAX) IN-GROUP printer-attributes-tag COUNT 1
8181

8282
EXPECT ?notify-pull-method-supported OF-TYPE keyword IN-GROUP printer-attributes-tag
8383

@@ -103,7 +103,7 @@
103103
# Attributes and values
104104
EXPECT ippget-event-life IF-DEFINED REQUIRE_RFC3996
105105
EXPECT ippget-event-life IF-DEFINED PRINTER_HAS_GET_NOTIFICATIONS
106-
EXPECT ippget-event-life OF-TYPE integer(15:MAX) IN-GROUP printer-attributes-tag COUNT 1
106+
EXPECT ?ippget-event-life OF-TYPE integer(15:MAX) IN-GROUP printer-attributes-tag COUNT 1
107107

108108
EXPECT notify-pull-method-supported IF-DEFINED REQUIRE_RFC3996
109109
EXPECT notify-pull-method-supported WITH-VALUE ippget IF-DEFINED REQUIRE_RFC3996

0 commit comments

Comments
 (0)