Save work on new ipptool using IPP data file parser.

[thirdparty/cups.git] / test / 4.2-cups-printer-ops.test

diff --git a/test/4.2-cups-printer-ops.test b/test/4.2-cups-printer-ops.test
index 585807ed09ea434bcc7e9922338a9fe344608274..241238281c8509cfb69d7e0c6a5b5bb2d3d4a3b6 100644 (file)
--- a/test/4.2-cups-printer-ops.test
+++ b/test/4.2-cups-printer-ops.test
@@ -1,5 +1,5 @@
 #
-# "$Id: 4.2-cups-printer-ops.test 5831 2006-08-16 19:28:09Z mike $"
+# "$Id$"
 #
 #   Verify that the CUPS printer operations work.
 #
@@ -105,7 +105,7 @@
        ATTR name requesting-user-name $user
 
         GROUP subscription
-       ATTR uri notify-recipient testnotify://
+       ATTR uri notify-recipient-uri testnotify://
        ATTR keyword notify-events printer-added,printer-modified,printer-deleted
 
        # What statuses are OK?
@@ -204,6 +204,7 @@
        ATTR uri device-uri file:/tmp/Test1
        ATTR enum printer-state 3
        ATTR boolean printer-is-accepting-jobs true
+       ATTR text printer-info "Test Printer 1"
 
        FILE testps.ppd
 
@@ -235,6 +236,26 @@
        EXPECT attributes-charset
        EXPECT attributes-natural-language
 }
+{
+       # The name of the test...
+       NAME "Get Default Printer with no default set"
+
+       # The operation to use
+       OPERATION cups-get-default
+       RESOURCE /
+
+       # The attributes to send
+       GROUP operation
+       ATTR charset attributes-charset utf-8
+       ATTR language attributes-natural-language en
+
+       # What statuses are OK?
+       STATUS client-error-not-found
+
+       # What attributes do we expect?
+       EXPECT attributes-charset
+       EXPECT attributes-natural-language
+}
 {
        # The name of the test...
        NAME "Set Default Printer to Test1"
@@ -256,7 +277,52 @@
        EXPECT attributes-charset
        EXPECT attributes-natural-language
 }
+{
+       # The name of the test...
+       NAME "Get Default Printer"
+
+       # The operation to use
+       OPERATION cups-get-default
+       RESOURCE /
+
+       # The attributes to send
+       GROUP operation
+       ATTR charset attributes-charset utf-8
+       ATTR language attributes-natural-language en
+
+       # What statuses are OK?
+       STATUS successful-ok
+
+       # What attributes do we expect?
+       EXPECT attributes-charset
+       EXPECT attributes-natural-language
+       EXPECT printer-name
+       EXPECT printer-uri-supported
+}
+{
+       # The name of the test...
+       NAME "Get IPP/2.x Attributes for Printer Test1"
+
+       # The operation to use
+       OPERATION get-printer-attributes
+       RESOURCE /
+
+       # The IPP version to use
+       VERSION 2.0
+
+       # The attributes to send
+       GROUP operation
+       ATTR charset attributes-charset utf-8
+       ATTR language attributes-natural-language en
+       ATTR uri printer-uri $method://$hostname:$port/printers/Test1
+
+       # What statuses are OK?
+       STATUS successful-ok
+
+       # What attributes do we expect?
+       EXPECT media-col-default
+}
 
 #
-# End of "$Id: 4.2-cups-printer-ops.test 5831 2006-08-16 19:28:09Z mike $"
+# End of "$Id$"
 #