Fix IPP Everywhere tests I-16, I-22, and I-25 to allow media-col in the response

(STR #4630)

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@12690 a1ca3aef-8c08-0410-bb20-df032aa958be

diff --git a/everywhere/ipp-tests.test b/everywhere/ipp-tests.test
index df687522476bc163f231bc53e72bad5f8790d965..a94ce99aeaa486965de698a02b67629c11c75356 100644 (file)
--- a/everywhere/ipp-tests.test
+++ b/everywhere/ipp-tests.test
@@ -705,7 +705,7 @@ DEFINE SUPPLY_REGEX "/^(type\=[A-Za-z]+|(maxcapacity\=([0-9]|\-){0,1})(level\=([
        EXPECT ?job-account-id OF-TYPE name IN-GROUP job-attributes-tag COUNT 1
        EXPECT ?job-accounting-user-id OF-TYPE name IN-GROUP job-attributes-tag COUNT 1
        EXPECT media OF-TYPE keyword IN-GROUP job-attributes-tag COUNT 1 WITH-VALUE "$DEFAULT_MEDIA"
-       EXPECT !media-col
+       EXPECT ?media-col OF-TYPE collection IN-GROUP job-attributes-tag COUNT 1
        EXPECT ?multiple-document-handling OF-TYPE keyword IN-GROUP job-attributes-tag COUNT 1
        EXPECT ?orientation-requested OF-TYPE enum IN-GROUP job-attributes-tag COUNT 1
        EXPECT ?output-bin OF-TYPE keyword|name IN-GROUP job-attributes-tag COUNT 1 WITH-VALUE "$DEFAULT_OUTPUT_BIN"
@@ -929,7 +929,7 @@ DEFINE SUPPLY_REGEX "/^(type\=[A-Za-z]+|(maxcapacity\=([0-9]|\-){0,1})(level\=([
        EXPECT ?job-account-id OF-TYPE name IN-GROUP job-attributes-tag COUNT 1
        EXPECT ?job-accounting-user-id OF-TYPE name IN-GROUP job-attributes-tag COUNT 1
        EXPECT media OF-TYPE keyword IN-GROUP job-attributes-tag COUNT 1 WITH-VALUE "$DEFAULT_MEDIA"
-       EXPECT !media-col
+       EXPECT ?media-col OF-TYPE collection IN-GROUP job-attributes-tag COUNT 1
        EXPECT ?multiple-document-handling OF-TYPE keyword IN-GROUP job-attributes-tag COUNT 1
        EXPECT ?orientation-requested OF-TYPE enum IN-GROUP job-attributes-tag COUNT 1
        EXPECT ?output-bin OF-TYPE keyword|name IN-GROUP job-attributes-tag COUNT 1 WITH-VALUE "$DEFAULT_OUTPUT_BIN"
@@ -1053,7 +1053,7 @@ DEFINE SUPPLY_REGEX "/^(type\=[A-Za-z]+|(maxcapacity\=([0-9]|\-){0,1})(level\=([
        EXPECT ?job-account-id OF-TYPE name IN-GROUP job-attributes-tag COUNT 1
        EXPECT ?job-accounting-user-id OF-TYPE name IN-GROUP job-attributes-tag COUNT 1
        EXPECT media OF-TYPE keyword IN-GROUP job-attributes-tag COUNT 1 WITH-VALUE "$DEFAULT_MEDIA"
-       EXPECT !media-col
+       EXPECT ?media-col OF-TYPE collection IN-GROUP job-attributes-tag COUNT 1
        EXPECT ?multiple-document-handling OF-TYPE keyword IN-GROUP job-attributes-tag COUNT 1
        EXPECT ?orientation-requested OF-TYPE enum IN-GROUP job-attributes-tag COUNT 1
        EXPECT ?output-bin OF-TYPE keyword|name IN-GROUP job-attributes-tag COUNT 1 WITH-VALUE "$DEFAULT_OUTPUT_BIN"