Merge changes from CUPS 1.5svn-r9352.

[thirdparty/cups.git] / test / 4.4-subscription-ops.test

diff --git a/test/4.4-subscription-ops.test b/test/4.4-subscription-ops.test
index de0585dd70ffa0e1b4bf1aa79352e58c2473f860..f6cf820f1a7b6b843d6e17d059d9841975401cce 100644 (file)
--- a/test/4.4-subscription-ops.test
+++ b/test/4.4-subscription-ops.test
@@ -1,5 +1,5 @@
 #
-# "$Id: 4.4-subscription-ops.test 6379 2007-03-21 14:57:22Z mike $"
+# "$Id: 4.4-subscription-ops.test 6635 2007-07-09 20:34:48Z mike $"
 #
 #   Verify that the CUPS subscription operations work.
 #
@@ -15,7 +15,8 @@
        GROUP operation
        ATTR charset attributes-charset utf-8
        ATTR language attributes-natural-language en
-       ATTR uri printer-uri $method://$hostname:$port/printers/Test1
+       ATTR uri printer-uri $scheme://$hostname:$port/printers/Test1
+       ATTR name requesting-user-name $user
 
         GROUP subscription
        ATTR uri notify-recipient-uri testnotify://
@@ -35,8 +36,8 @@
        # The name of the test...
        NAME "Verify Subscription Expiration"
 
-       # Delay test for 6 seconds to allow lease to expire...
-       DELAY 6
+       # Delay test for 7 seconds to allow lease to expire...
+       DELAY 7
 
        # The operation to use
        OPERATION Get-Subscription-Attributes
@@ -46,8 +47,9 @@
        GROUP operation
        ATTR charset attributes-charset utf-8
        ATTR language attributes-natural-language en
-       ATTR uri printer-uri $method://$hostname:$port/printers/Test1
+       ATTR uri printer-uri $scheme://$hostname:$port/printers/Test1
        ATTR integer notify-subscription-id $notify-subscription-id
+       ATTR name requesting-user-name $user
 
        # What statuses are OK?
        STATUS client-error-not-found
@@ -68,7 +70,8 @@
        GROUP operation
        ATTR charset attributes-charset utf-8
        ATTR language attributes-natural-language en
-       ATTR uri printer-uri $method://$hostname:$port/printers/Test1
+       ATTR uri printer-uri $scheme://$hostname:$port/printers/Test1
+       ATTR name requesting-user-name $user
 
         GROUP subscription
        ATTR uri notify-recipient-uri testnotify://
@@ -101,7 +104,8 @@
        GROUP operation
        ATTR charset attributes-charset utf-8
        ATTR language attributes-natural-language en
-       ATTR uri printer-uri $method://$hostname:$port/printers/Test1
+       ATTR uri printer-uri $scheme://$hostname:$port/printers/Test1
+       ATTR name requesting-user-name $user
 
        # What statuses are OK?
        STATUS successful-ok
@@ -116,7 +120,34 @@
        EXPECT notify-events
        DISPLAY notify-events
 }
+{
+       # The name of the test...
+       NAME "Check MaxSubscriptions limits"
+
+       # The operation to use
+       OPERATION Create-Printer-Subscription
+       RESOURCE /
+
+       # The attributes to send
+       GROUP operation
+       ATTR charset attributes-charset utf-8
+       ATTR language attributes-natural-language en
+       ATTR uri printer-uri $scheme://$hostname:$port/printers/Test1
+       ATTR name requesting-user-name $user
+
+        GROUP subscription
+       ATTR uri notify-recipient-uri testnotify://
+       ATTR keyword notify-events printer-state-changed
+       ATTR integer notify-lease-duration 5
+
+       # What statuses are OK?
+       STATUS client-error-too-many-subscriptions
+
+       # What attributes do we expect?
+       EXPECT attributes-charset
+       EXPECT attributes-natural-language
+}
 
 #
-# End of "$Id: 4.4-subscription-ops.test 6379 2007-03-21 14:57:22Z mike $"
+# End of "$Id: 4.4-subscription-ops.test 6635 2007-07-09 20:34:48Z mike $"
 #