From: msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Date: Thu, 4 Jun 2015 16:34:20 +0000 (+0000)
Subject: Fix IPP Everywhere tests I-16, I-22, and I-25 to allow media-col in the response
X-Git-Tag: v2.2b1~271
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=42dccd42726eab4c2f24ab5e0f9bd3759fcd015f;p=thirdparty%2Fcups.git

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 df68752247..a94ce99aea 100644
--- 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"