Finish up document format tests.

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

diff --git a/everywhere/document-format-tests.test b/everywhere/document-format-tests.test
index b98264141cbd49b736816216e12852ff6f1a0add..fdf859d9d586f054214150897646aaba7da7b70e 100644 (file)
--- a/everywhere/document-format-tests.test
+++ b/everywhere/document-format-tests.test
@@ -385,10 +385,7 @@
        STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 30
 }
 
-
-
-
-
+#### JPEG Tests
 {
        NAME "2. JPEG Tests (mandatory)"
        OPERATION Get-Printer-Attributes
@@ -402,9 +399,93 @@
 
        EXPECT document-format-supported OF-TYPE mimeMediaType IN-GROUP printer-attributes-tag WITH-VALUE "image/jpeg"
 }
+{
+       NAME "2.1 Print color.jpg with defaults"
+       OPERATION Print-Job
+       GROUP operation-attributes-tag
+       ATTR charset attributes-charset utf-8
+       ATTR naturalLanguage attributes-natural-language en
+       ATTR uri printer-uri $uri
+       ATTR name requesting-user-name $user
+       ATTR name job-name "color.jpg with defaults"
+       ATTR mimeMediaType document-format "image/jpeg"
+       FILE "color.jpg"
+
+       STATUS successful-ok
+       STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 30
+}
+{
+       NAME "2.2 Print color.jpg with copies=2"
+       OPERATION Print-Job
+       GROUP operation-attributes-tag
+       ATTR charset attributes-charset utf-8
+       ATTR naturalLanguage attributes-natural-language en
+       ATTR uri printer-uri $uri
+       ATTR name requesting-user-name $user
+       ATTR name job-name "color.jpg with copies=2"
+       ATTR mimeMediaType document-format "image/jpeg"
+       GROUP job-attributes-tag
+       ATTR integer copies 2
+       FILE "color.jpg"
+
+       STATUS successful-ok
+       STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 30
+}
+{
+       NAME "2.3 Print color.jpg with print-color-mode=monochrome"
+       OPERATION Print-Job
+       GROUP operation-attributes-tag
+       ATTR charset attributes-charset utf-8
+       ATTR naturalLanguage attributes-natural-language en
+       ATTR uri printer-uri $uri
+       ATTR name requesting-user-name $user
+       ATTR name job-name "color.jpg with print-color-mode=monochrome"
+       ATTR mimeMediaType document-format "image/jpeg"
+       GROUP job-attributes-tag
+       ATTR keyword print-color-mode monochrome
+       FILE "color.jpg"
+
+       STATUS successful-ok
+       STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 30
+}
+{
+       NAME "2.4 Print color.jpg with media=na_letter_8.5x11in and ipp-attribute-fidelity=true"
+       OPERATION Print-Job
+       GROUP operation-attributes-tag
+       ATTR charset attributes-charset utf-8
+       ATTR naturalLanguage attributes-natural-language en
+       ATTR uri printer-uri $uri
+       ATTR name requesting-user-name $user
+       ATTR name job-name "color.jpg with media=na_letter_8.5x11in and ipp-attribute-fidelity=true"
+       ATTR mimeMediaType document-format "image/jpeg"
+       ATTR boolean ipp-attribute-fidelity true
+       GROUP job-attributes-tag
+       ATTR keyword media na_letter_8.5x11in
+       FILE "color.jpg"
 
+       STATUS successful-ok
+       STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 30
+}
+{
+       NAME "2.5 Print color.jpg with media=iso_a4_210x297mm and ipp-attribute-fidelity=true"
+       OPERATION Print-Job
+       GROUP operation-attributes-tag
+       ATTR charset attributes-charset utf-8
+       ATTR naturalLanguage attributes-natural-language en
+       ATTR uri printer-uri $uri
+       ATTR name requesting-user-name $user
+       ATTR name job-name "color.jpg with media=iso_a4_210x297mm and ipp-attribute-fidelity=true"
+       ATTR mimeMediaType document-format "image/jpeg"
+       ATTR boolean ipp-attribute-fidelity true
+       GROUP job-attributes-tag
+       ATTR keyword media iso_a4_210x297mm
+       FILE "color.jpg"
 
+       STATUS successful-ok
+       STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 30
+}
 
+#### PDF Tests
 {
        NAME "3. PDF Tests (if PDF is supported)"
        OPERATION Get-Printer-Attributes
@@ -417,6 +498,117 @@
        STATUS successful-ok
 
        EXPECT document-format-supported OF-TYPE mimeMediaType IN-GROUP printer-attributes-tag WITH-VALUE "application/pdf" DEFINE-MATCH HAVE_PDF
+       EXPECT sides-supported OF-TYPE keyword IN-GROUP printer-attributes-tag WITH-VALUE "two-sided-long-edge" DEFINE-MATCH HAVE_DUPLEX
+}
+{
+       SKIP-IF-NOT-DEFINED HAVE_PDF
+       NAME "3.1 Print document-letter.pdf with defaults"
+       OPERATION Print-Job
+       GROUP operation-attributes-tag
+       ATTR charset attributes-charset utf-8
+       ATTR naturalLanguage attributes-natural-language en
+       ATTR uri printer-uri $uri
+       ATTR name requesting-user-name $user
+       ATTR name job-name "document-letter.pdf with defaults"
+       ATTR mimeMediaType document-format "application/pdf"
+       FILE "document-letter.pdf"
+
+       STATUS successful-ok
+       STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 30
+}
+{
+       SKIP-IF-NOT-DEFINED HAVE_PDF
+       NAME "3.2 Print document-letter.pdf with copies=2"
+       OPERATION Print-Job
+       GROUP operation-attributes-tag
+       ATTR charset attributes-charset utf-8
+       ATTR naturalLanguage attributes-natural-language en
+       ATTR uri printer-uri $uri
+       ATTR name requesting-user-name $user
+       ATTR name job-name "document-letter.pdf with copies=2"
+       ATTR mimeMediaType document-format "application/pdf"
+       GROUP job-attributes-tag
+       ATTR integer copies 2
+       FILE "document-letter.pdf"
+
+       STATUS successful-ok
+       STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 30
+}
+{
+       SKIP-IF-NOT-DEFINED HAVE_PDF
+       NAME "3.3 Print document-letter.pdf with page-ranges=3-3 and print-color-mode=monochrome"
+       OPERATION Print-Job
+       GROUP operation-attributes-tag
+       ATTR charset attributes-charset utf-8
+       ATTR naturalLanguage attributes-natural-language en
+       ATTR uri printer-uri $uri
+       ATTR name requesting-user-name $user
+       ATTR name job-name "document-letter.pdf with page-ranges=3-3 and print-color-mode=monochrome"
+       ATTR mimeMediaType document-format "application/pdf"
+       GROUP job-attributes-tag
+       ATTR rangeOfInteger page-ranges 3-3
+       ATTR keyword print-color-mode monochrome
+       FILE "document-letter.pdf"
+
+       STATUS successful-ok
+       STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 30
+}
+{
+       SKIP-IF-NOT-DEFINED HAVE_PDF
+       SKIP-IF-NOT-DEFINED HAVE_DUPLEX
+       NAME "3.4 Print document-letter.pdf with sides=two-sided-long-edge"
+       OPERATION Print-Job
+       GROUP operation-attributes-tag
+       ATTR charset attributes-charset utf-8
+       ATTR naturalLanguage attributes-natural-language en
+       ATTR uri printer-uri $uri
+       ATTR name requesting-user-name $user
+       ATTR name job-name "document-letter.pdf with sides=two-sided-long-edge"
+       ATTR mimeMediaType document-format "application/pdf"
+       GROUP job-attributes-tag
+       ATTR keyword sides two-sided-long-edge
+       FILE "document-letter.pdf"
+
+       STATUS successful-ok
+       STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 30
+}
+{
+       SKIP-IF-NOT-DEFINED HAVE_PDF
+       NAME "3.5 Print document-letter.pdf with media=iso_a4_210x297mm and ipp-attribute-fidelity=true"
+       OPERATION Print-Job
+       GROUP operation-attributes-tag
+       ATTR charset attributes-charset utf-8
+       ATTR naturalLanguage attributes-natural-language en
+       ATTR uri printer-uri $uri
+       ATTR name requesting-user-name $user
+       ATTR name job-name "document-letter.pdf with media=iso_a4_210x297mm and ipp-attribute-fidelity=true"
+       ATTR mimeMediaType document-format "application/pdf"
+       ATTR boolean ipp-attribute-fidelity true
+       GROUP job-attributes-tag
+       ATTR keyword media iso_a4_210x297mm
+       FILE "document-letter.pdf"
+
+       STATUS successful-ok
+       STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 30
+}
+{
+       SKIP-IF-NOT-DEFINED HAVE_PDF
+       NAME "3.6 Print document-a4.pdf with media=na_letter_8.5x11in and ipp-attribute-fidelity=true"
+       OPERATION Print-Job
+       GROUP operation-attributes-tag
+       ATTR charset attributes-charset utf-8
+       ATTR naturalLanguage attributes-natural-language en
+       ATTR uri printer-uri $uri
+       ATTR name requesting-user-name $user
+       ATTR name job-name "document-a4.pdf with media=na_letter_8.5x11in and ipp-attribute-fidelity=true"
+       ATTR mimeMediaType document-format "application/pdf"
+       ATTR boolean ipp-attribute-fidelity true
+       GROUP job-attributes-tag
+       ATTR keyword media na_letter_8.5x11in
+       FILE "document-a4.pdf"
+
+       STATUS successful-ok
+       STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 30
 }
 
 #