Skip to content

Commit 17aa7d0

Browse files
michaelrsweetmichaelrsweet
committed
Fix IPP/2.x media-col tests.
1 parent 0eedd19 commit 17aa7d0

3 files changed

Lines changed: 18 additions & 18 deletions

File tree

‎examples/ipp-2.0.test‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -114,16 +114,16 @@ INCLUDE "rfc3998.test"
114114

115115
EXPECT media-col-database OF-TYPE collection IN-GROUP printer-attributes-tag IF-DEFINED PRINTER_HAS_MEDIA_COL
116116
EXPECT ?media-col-database/media-size OF-TYPE collection IF-DEFINED PRINTER_HAS_MEDIA_COL
117-
EXPECT ?media-col-database/media-size-supported/x-dimension OF-TYPE integer(1:MAX)|rangeOfInteger(1:MAX) IF-DEFINED PRINTER_HAS_MEDIA_COL
118-
EXPECT ?media-col-database/media-size-supported/y-dimension OF-TYPE integer(0:MAX)|rangeOfInteger(0:MAX) IF-DEFINED PRINTER_HAS_MEDIA_COL
117+
EXPECT ?media-col-database/media-size/x-dimension OF-TYPE integer(1:MAX)|rangeOfInteger(1:MAX) IF-DEFINED PRINTER_HAS_MEDIA_COL
118+
EXPECT ?media-col-database/media-size/y-dimension OF-TYPE integer(0:MAX)|rangeOfInteger(0:MAX) IF-DEFINED PRINTER_HAS_MEDIA_COL
119119
EXPECT media-col-default OF-TYPE no-value|collection IN-GROUP printer-attributes-tag COUNT 1 IF-DEFINED PRINTER_HAS_MEDIA_COL
120120
EXPECT media-col-default/media-size OF-TYPE collection IF-DEFINED PRINTER_HAS_MEDIA_COL
121-
EXPECT media-col-default/media-size-supported/x-dimension OF-TYPE integer(1:MAX) IF-DEFINED PRINTER_HAS_MEDIA_COL
122-
EXPECT media-col-default/media-size-supported/y-dimension OF-TYPE integer(1:MAX) IF-DEFINED PRINTER_HAS_MEDIA_COL
121+
EXPECT media-col-default/media-size/x-dimension OF-TYPE integer(1:MAX) IF-DEFINED PRINTER_HAS_MEDIA_COL
122+
EXPECT media-col-default/media-size/y-dimension OF-TYPE integer(1:MAX) IF-DEFINED PRINTER_HAS_MEDIA_COL
123123
EXPECT media-col-ready OF-TYPE collection IN-GROUP printer-attributes-tag IF-DEFINED PRINTER_HAS_MEDIA_COL IF-DEFINED PRINTER_HAS_MEDIA_READY
124124
EXPECT media-col-ready/media-size OF-TYPE collection IF-DEFINED PRINTER_HAS_MEDIA_COL IF-DEFINED PRINTER_HAS_MEDIA_READY
125-
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
126-
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
125+
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
126+
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
127127
EXPECT media-col-supported OF-TYPE keyword IN-GROUP printer-attributes-tag WITH-VALUE media-size IF-DEFINED PRINTER_HAS_MEDIA_COL
128128
EXPECT media-default OF-TYPE no-value|keyword|name IN-GROUP printer-attributes-tag COUNT 1 WITH-VALUE "$MEDIA_REGEX"
129129
EXPECT ?media-ready OF-TYPE keyword|name IN-GROUP printer-attributes-tag WITH-ALL-VALUES "$MEDIA_REGEX"

‎examples/ipp-2.1.test‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -148,16 +148,16 @@ INCLUDE "rfc3998.test"
148148

149149
EXPECT media-col-database OF-TYPE collection IN-GROUP printer-attributes-tag
150150
EXPECT media-col-database/media-size OF-TYPE collection
151-
EXPECT media-col-database/media-size-supported/x-dimension OF-TYPE integer(1:MAX)|rangeOfInteger(1:MAX)
152-
EXPECT media-col-database/media-size-supported/y-dimension OF-TYPE integer(0:MAX)|rangeOfInteger(0:MAX)
151+
EXPECT media-col-database/media-size/x-dimension OF-TYPE integer(1:MAX)|rangeOfInteger(1:MAX)
152+
EXPECT media-col-database/media-size/y-dimension OF-TYPE integer(0:MAX)|rangeOfInteger(0:MAX)
153153
EXPECT media-col-default OF-TYPE no-value|collection IN-GROUP printer-attributes-tag COUNT 1
154154
EXPECT media-col-default/media-size OF-TYPE collection
155-
EXPECT media-col-default/media-size-supported/x-dimension OF-TYPE integer(1:MAX)
156-
EXPECT media-col-default/media-size-supported/y-dimension OF-TYPE integer(1:MAX)
155+
EXPECT media-col-default/media-size/x-dimension OF-TYPE integer(1:MAX)
156+
EXPECT media-col-default/media-size/y-dimension OF-TYPE integer(1:MAX)
157157
EXPECT media-col-ready OF-TYPE collection IN-GROUP printer-attributes-tag IF-DEFINED PRINTER_HAS_MEDIA_READY
158158
EXPECT media-col-ready/media-size OF-TYPE collection IF-DEFINED PRINTER_HAS_MEDIA_READY
159-
EXPECT media-col-ready/media-size-supported/x-dimension OF-TYPE integer(1:MAX) IF-DEFINED PRINTER_HAS_MEDIA_READY
160-
EXPECT media-col-ready/media-size-supported/y-dimension OF-TYPE integer(1:MAX) IF-DEFINED PRINTER_HAS_MEDIA_READY
159+
EXPECT media-col-ready/media-size/x-dimension OF-TYPE integer(1:MAX) IF-DEFINED PRINTER_HAS_MEDIA_READY
160+
EXPECT media-col-ready/media-size/y-dimension OF-TYPE integer(0:MAX) IF-DEFINED PRINTER_HAS_MEDIA_READY
161161
EXPECT media-col-supported OF-TYPE keyword IN-GROUP printer-attributes-tag WITH-VALUE media-size
162162
EXPECT media-default OF-TYPE no-value|keyword|name IN-GROUP printer-attributes-tag COUNT 1 WITH-VALUE "$MEDIA_REGEX"
163163
EXPECT ?media-ready OF-TYPE keyword|name IN-GROUP printer-attributes-tag WITH-ALL-VALUES "$MEDIA_REGEX"

‎examples/ipp-2.2.test‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -167,16 +167,16 @@ INCLUDE "rfc3998.test"
167167

168168
EXPECT media-col-database OF-TYPE collection IN-GROUP printer-attributes-tag
169169
EXPECT media-col-database/media-size OF-TYPE collection
170-
EXPECT media-col-database/media-size-supported/x-dimension OF-TYPE integer(1:MAX)|rangeOfInteger(1:MAX)
171-
EXPECT media-col-database/media-size-supported/y-dimension OF-TYPE integer(0:MAX)|rangeOfInteger(0:MAX)
170+
EXPECT media-col-database/media-size/x-dimension OF-TYPE integer(1:MAX)|rangeOfInteger(1:MAX)
171+
EXPECT media-col-database/media-size/y-dimension OF-TYPE integer(0:MAX)|rangeOfInteger(0:MAX)
172172
EXPECT media-col-default OF-TYPE no-value|collection IN-GROUP printer-attributes-tag COUNT 1
173173
EXPECT media-col-default/media-size OF-TYPE collection
174-
EXPECT media-col-default/media-size-supported/x-dimension OF-TYPE integer(1:MAX)
175-
EXPECT media-col-default/media-size-supported/y-dimension OF-TYPE integer(1:MAX)
174+
EXPECT media-col-default/media-size/x-dimension OF-TYPE integer(1:MAX)
175+
EXPECT media-col-default/media-size/y-dimension OF-TYPE integer(1:MAX)
176176
EXPECT media-col-ready OF-TYPE collection IN-GROUP printer-attributes-tag
177177
EXPECT media-col-ready/media-size OF-TYPE collection
178-
EXPECT media-col-ready/media-size-supported/x-dimension OF-TYPE integer(1:MAX)
179-
EXPECT media-col-ready/media-size-supported/y-dimension OF-TYPE integer(1:MAX)
178+
EXPECT media-col-ready/media-size/x-dimension OF-TYPE integer(1:MAX)
179+
EXPECT media-col-ready/media-size/y-dimension OF-TYPE integer(0:MAX)
180180
EXPECT media-col-supported OF-TYPE keyword IN-GROUP printer-attributes-tag WITH-VALUE media-size
181181
EXPECT media-default OF-TYPE no-value|keyword|name IN-GROUP printer-attributes-tag COUNT 1 WITH-VALUE "$MEDIA_REGEX"
182182
EXPECT media-ready OF-TYPE keyword|name IN-GROUP printer-attributes-tag WITH-ALL-VALUES "$MEDIA_REGEX"

0 commit comments

Comments
 (0)