Skip to content

Commit

Permalink
Fix IPP/2.x media-col tests.
Browse files Browse the repository at this point in the history
  • Loading branch information
@michaelrsweet
michaelrsweet committed Sep 20, 2024
1 parent 0eedd19 commit 17aa7d0
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 18 deletions.
12 changes: 6 additions & 6 deletions examples/ipp-2.0.test
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,16 +114,16 @@ INCLUDE "rfc3998.test"

EXPECT media-col-database OF-TYPE collection IN-GROUP printer-attributes-tag IF-DEFINED PRINTER_HAS_MEDIA_COL
EXPECT ?media-col-database/media-size OF-TYPE collection IF-DEFINED PRINTER_HAS_MEDIA_COL
EXPECT ?media-col-database/media-size-supported/x-dimension OF-TYPE integer(1:MAX)|rangeOfInteger(1:MAX) IF-DEFINED PRINTER_HAS_MEDIA_COL
EXPECT ?media-col-database/media-size-supported/y-dimension OF-TYPE integer(0:MAX)|rangeOfInteger(0:MAX) IF-DEFINED PRINTER_HAS_MEDIA_COL
EXPECT ?media-col-database/media-size/x-dimension OF-TYPE integer(1:MAX)|rangeOfInteger(1:MAX) IF-DEFINED PRINTER_HAS_MEDIA_COL
EXPECT ?media-col-database/media-size/y-dimension OF-TYPE integer(0:MAX)|rangeOfInteger(0:MAX) IF-DEFINED PRINTER_HAS_MEDIA_COL
EXPECT media-col-default OF-TYPE no-value|collection IN-GROUP printer-attributes-tag COUNT 1 IF-DEFINED PRINTER_HAS_MEDIA_COL
EXPECT media-col-default/media-size OF-TYPE collection IF-DEFINED PRINTER_HAS_MEDIA_COL
EXPECT media-col-default/media-size-supported/x-dimension OF-TYPE integer(1:MAX) IF-DEFINED PRINTER_HAS_MEDIA_COL
EXPECT media-col-default/media-size-supported/y-dimension OF-TYPE integer(1:MAX) IF-DEFINED PRINTER_HAS_MEDIA_COL
EXPECT media-col-default/media-size/x-dimension OF-TYPE integer(1:MAX) IF-DEFINED PRINTER_HAS_MEDIA_COL
EXPECT media-col-default/media-size/y-dimension OF-TYPE integer(1:MAX) IF-DEFINED PRINTER_HAS_MEDIA_COL
EXPECT media-col-ready OF-TYPE collection IN-GROUP printer-attributes-tag IF-DEFINED PRINTER_HAS_MEDIA_COL IF-DEFINED PRINTER_HAS_MEDIA_READY
EXPECT media-col-ready/media-size OF-TYPE collection IF-DEFINED PRINTER_HAS_MEDIA_COL IF-DEFINED PRINTER_HAS_MEDIA_READY
EXPECT media-col-ready/media-size-supported/x-dimension OF-TYPE integer(1:MAX) IF-DEFINED PRINTER_HAS_MEDIA_COL IF-DEFINED PRINTER_HAS_MEDIA_READY
EXPECT media-col-ready/media-size-supported/y-dimension OF-TYPE integer(1:MAX) IF-DEFINED PRINTER_HAS_MEDIA_COL IF-DEFINED PRINTER_HAS_MEDIA_READY
EXPECT media-col-ready/media-size/x-dimension OF-TYPE integer(1:MAX) IF-DEFINED PRINTER_HAS_MEDIA_COL IF-DEFINED PRINTER_HAS_MEDIA_READY
EXPECT media-col-ready/media-size/y-dimension OF-TYPE integer(0:MAX) IF-DEFINED PRINTER_HAS_MEDIA_COL IF-DEFINED PRINTER_HAS_MEDIA_READY
EXPECT media-col-supported OF-TYPE keyword IN-GROUP printer-attributes-tag WITH-VALUE media-size IF-DEFINED PRINTER_HAS_MEDIA_COL
EXPECT media-default OF-TYPE no-value|keyword|name IN-GROUP printer-attributes-tag COUNT 1 WITH-VALUE "$MEDIA_REGEX"
EXPECT ?media-ready OF-TYPE keyword|name IN-GROUP printer-attributes-tag WITH-ALL-VALUES "$MEDIA_REGEX"
Expand Down
12 changes: 6 additions & 6 deletions examples/ipp-2.1.test
View file
Original file line number Diff line number Diff line change
Expand Up @@ -148,16 +148,16 @@ INCLUDE "rfc3998.test"

EXPECT media-col-database OF-TYPE collection IN-GROUP printer-attributes-tag
EXPECT media-col-database/media-size OF-TYPE collection
EXPECT media-col-database/media-size-supported/x-dimension OF-TYPE integer(1:MAX)|rangeOfInteger(1:MAX)
EXPECT media-col-database/media-size-supported/y-dimension OF-TYPE integer(0:MAX)|rangeOfInteger(0:MAX)
EXPECT media-col-database/media-size/x-dimension OF-TYPE integer(1:MAX)|rangeOfInteger(1:MAX)
EXPECT media-col-database/media-size/y-dimension OF-TYPE integer(0:MAX)|rangeOfInteger(0:MAX)
EXPECT media-col-default OF-TYPE no-value|collection IN-GROUP printer-attributes-tag COUNT 1
EXPECT media-col-default/media-size OF-TYPE collection
EXPECT media-col-default/media-size-supported/x-dimension OF-TYPE integer(1:MAX)
EXPECT media-col-default/media-size-supported/y-dimension OF-TYPE integer(1:MAX)
EXPECT media-col-default/media-size/x-dimension OF-TYPE integer(1:MAX)
EXPECT media-col-default/media-size/y-dimension OF-TYPE integer(1:MAX)
EXPECT media-col-ready OF-TYPE collection IN-GROUP printer-attributes-tag IF-DEFINED PRINTER_HAS_MEDIA_READY
EXPECT media-col-ready/media-size OF-TYPE collection IF-DEFINED PRINTER_HAS_MEDIA_READY
EXPECT media-col-ready/media-size-supported/x-dimension OF-TYPE integer(1:MAX) IF-DEFINED PRINTER_HAS_MEDIA_READY
EXPECT media-col-ready/media-size-supported/y-dimension OF-TYPE integer(1:MAX) IF-DEFINED PRINTER_HAS_MEDIA_READY
EXPECT media-col-ready/media-size/x-dimension OF-TYPE integer(1:MAX) IF-DEFINED PRINTER_HAS_MEDIA_READY
EXPECT media-col-ready/media-size/y-dimension OF-TYPE integer(0:MAX) IF-DEFINED PRINTER_HAS_MEDIA_READY
EXPECT media-col-supported OF-TYPE keyword IN-GROUP printer-attributes-tag WITH-VALUE media-size
EXPECT media-default OF-TYPE no-value|keyword|name IN-GROUP printer-attributes-tag COUNT 1 WITH-VALUE "$MEDIA_REGEX"
EXPECT ?media-ready OF-TYPE keyword|name IN-GROUP printer-attributes-tag WITH-ALL-VALUES "$MEDIA_REGEX"
Expand Down
12 changes: 6 additions & 6 deletions examples/ipp-2.2.test
View file
Original file line number Diff line number Diff line change
Expand Up @@ -167,16 +167,16 @@ INCLUDE "rfc3998.test"

EXPECT media-col-database OF-TYPE collection IN-GROUP printer-attributes-tag
EXPECT media-col-database/media-size OF-TYPE collection
EXPECT media-col-database/media-size-supported/x-dimension OF-TYPE integer(1:MAX)|rangeOfInteger(1:MAX)
EXPECT media-col-database/media-size-supported/y-dimension OF-TYPE integer(0:MAX)|rangeOfInteger(0:MAX)
EXPECT media-col-database/media-size/x-dimension OF-TYPE integer(1:MAX)|rangeOfInteger(1:MAX)
EXPECT media-col-database/media-size/y-dimension OF-TYPE integer(0:MAX)|rangeOfInteger(0:MAX)
EXPECT media-col-default OF-TYPE no-value|collection IN-GROUP printer-attributes-tag COUNT 1
EXPECT media-col-default/media-size OF-TYPE collection
EXPECT media-col-default/media-size-supported/x-dimension OF-TYPE integer(1:MAX)
EXPECT media-col-default/media-size-supported/y-dimension OF-TYPE integer(1:MAX)
EXPECT media-col-default/media-size/x-dimension OF-TYPE integer(1:MAX)
EXPECT media-col-default/media-size/y-dimension OF-TYPE integer(1:MAX)
EXPECT media-col-ready OF-TYPE collection IN-GROUP printer-attributes-tag
EXPECT media-col-ready/media-size OF-TYPE collection
EXPECT media-col-ready/media-size-supported/x-dimension OF-TYPE integer(1:MAX)
EXPECT media-col-ready/media-size-supported/y-dimension OF-TYPE integer(1:MAX)
EXPECT media-col-ready/media-size/x-dimension OF-TYPE integer(1:MAX)
EXPECT media-col-ready/media-size/y-dimension OF-TYPE integer(0:MAX)
EXPECT media-col-supported OF-TYPE keyword IN-GROUP printer-attributes-tag WITH-VALUE media-size
EXPECT media-default OF-TYPE no-value|keyword|name IN-GROUP printer-attributes-tag COUNT 1 WITH-VALUE "$MEDIA_REGEX"
EXPECT media-ready OF-TYPE keyword|name IN-GROUP printer-attributes-tag WITH-ALL-VALUES "$MEDIA_REGEX"
Expand Down

0 comments on commit 17aa7d0

Please sign in to comment.