Changelog.

[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 4126c11d7d972b61620942c532cc8d58d681b50e..45c3ce12b91fb515159c452b96d39ecc0101e036 100644 (file)
--- a/test/4.4-subscription-ops.test
+++ b/test/4.4-subscription-ops.test
@@ -1,7 +1,11 @@
 #
-# "$Id: 4.4-subscription-ops.test 5833 2006-08-16 20:05:58Z mike $"
+# Verify that the CUPS subscription operations work.
 #
-#   Verify that the CUPS subscription operations work.
+# Copyright © 2007-2019 by Apple Inc.
+# Copyright © 2001-2006 by Easy Software Products. All rights reserved.
+#
+# Licensed under Apache License v2.0.  See the file "LICENSE" for more
+# information.
 #
 {
        # The name of the test...
@@ -15,10 +19,11 @@
        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 testnotify://
+       ATTR uri notify-recipient-uri testnotify://
        ATTR keyword notify-events printer-state-changed
        ATTR integer notify-lease-duration 5
 
@@ -35,8 +40,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 +51,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,15 +74,16 @@
        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 testnotify://
+       ATTR uri notify-recipient-uri testnotify://
        ATTR keyword notify-events printer-state-changed
        ATTR integer notify-lease-duration 5
 
         GROUP subscription
-       ATTR uri notify-recipient testnotify://
+       ATTR uri notify-recipient-uri testnotify://
        ATTR keyword notify-events printer-config-changed
        ATTR integer notify-lease-duration 5
 
@@ -101,7 +108,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 +124,30 @@
        EXPECT notify-events
        DISPLAY notify-events
 }
+{
+       # The name of the test...
+       NAME "Check MaxSubscriptions limits"
 
-#
-# End of "$Id: 4.4-subscription-ops.test 5833 2006-08-16 20:05:58Z mike $"
-#
+       # 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
+}