From 191be31cf1e2c3eefff63e03d89a4116a2020a4e Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Wed, 14 Feb 2018 16:34:51 -0500 Subject: [PATCH] Update copyright/license info on test files, and remove old SVN keywords. --- test/4.1-requests.test | 14 +++++++++----- test/4.2-cups-printer-ops.test | 12 ++++++------ test/4.3-job-ops.test | 12 ++++++------ test/4.4-subscription-ops.test | 12 ++++++------ test/cancel-current-job.test | 22 +--------------------- test/create-printer-subscription.test | 19 ------------------- test/get-completed-jobs.test | 22 +--------------------- test/get-jobs.test | 22 +--------------------- test/ipp-1.1.test | 11 ++++------- test/ipp-2.0.test | 11 ++++------- test/ipp-2.1.test | 11 ++++------- test/ipp-2.2.test | 11 ++++------- 12 files changed, 46 insertions(+), 133 deletions(-) diff --git a/test/4.1-requests.test b/test/4.1-requests.test index 097d0fcd8..8ff798f91 100644 --- a/test/4.1-requests.test +++ b/test/4.1-requests.test @@ -1,11 +1,15 @@ # -# "$Id$" +# Verify that the server requires the following attributes: # -# Verify that the server requires the following attributes: +# attributes-charset +# attributes-natural-language +# printer-uri/job-uri # -# attributes-charset -# attributes-natural-language -# printer-uri/job-uri +# Copyright © 2007-2013 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... diff --git a/test/4.2-cups-printer-ops.test b/test/4.2-cups-printer-ops.test index 241238281..3fa2960d4 100644 --- a/test/4.2-cups-printer-ops.test +++ b/test/4.2-cups-printer-ops.test @@ -1,7 +1,11 @@ # -# "$Id$" +# Verify that the CUPS printer operations work. # -# Verify that the CUPS printer operations work. +# Copyright © 2007-2014 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... @@ -322,7 +326,3 @@ # What attributes do we expect? EXPECT media-col-default } - -# -# End of "$Id$" -# diff --git a/test/4.3-job-ops.test b/test/4.3-job-ops.test index 1e372ccbc..37a5e1041 100644 --- a/test/4.3-job-ops.test +++ b/test/4.3-job-ops.test @@ -1,7 +1,11 @@ # -# "$Id$" +# Verify that the IPP job operations work. # -# Verify that the IPP job operations work. +# Copyright © 2007-2013 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... @@ -324,7 +328,3 @@ EXPECT job-state EXPECT job-printer-uri } - -# -# End of "$Id$" -# diff --git a/test/4.4-subscription-ops.test b/test/4.4-subscription-ops.test index 57a767ac5..80c888424 100644 --- a/test/4.4-subscription-ops.test +++ b/test/4.4-subscription-ops.test @@ -1,7 +1,11 @@ # -# "$Id$" +# Verify that the CUPS subscription operations work. # -# Verify that the CUPS subscription operations work. +# Copyright © 2007-2013 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... @@ -147,7 +151,3 @@ EXPECT attributes-charset EXPECT attributes-natural-language } - -# -# End of "$Id$" -# diff --git a/test/cancel-current-job.test b/test/cancel-current-job.test index be621b2ec..630023174 100644 --- a/test/cancel-current-job.test +++ b/test/cancel-current-job.test @@ -1,23 +1,8 @@ -# -# "$Id$" -# -# Cancel the currently printing job. -# -# Copyright 2007-2012 by Apple Inc. -# Copyright 2001-2006 by Easy Software Products. All rights reserved. -# -# These coded instructions, statements, and computer programs are the -# property of Apple Inc. and are protected by Federal copyright -# law. Distribution and use rights are outlined in the file "LICENSE.txt" -# which should have been included with this file. If this file is -# file is missing or damaged, see the license at "http://www.cups.org/". +# Cancel the currently printing job. # # Usage: # # ./ipptool printer-uri cancel-current-jobs.test -# - - { # The name of the test... NAME "Get current job" @@ -58,8 +43,3 @@ # What statuses are OK? STATUS successful-ok } - - -# -# End of "$Id$". -# diff --git a/test/create-printer-subscription.test b/test/create-printer-subscription.test index 2482af884..8f8d3e9ae 100644 --- a/test/create-printer-subscription.test +++ b/test/create-printer-subscription.test @@ -1,22 +1,8 @@ -# -# "$Id$" -# # Create a printer subscription. # -# Copyright 2007-2014 by Apple Inc. -# Copyright 2001-2006 by Easy Software Products. All rights reserved. -# -# These coded instructions, statements, and computer programs are the -# property of Apple Inc. and are protected by Federal copyright -# law. Distribution and use rights are outlined in the file "LICENSE.txt" -# which should have been included with this file. If this file is -# file is missing or damaged, see the license at "http://www.cups.org/". -# # Usage: # # ./ipptool [-d recipient=uri] printer-uri create-printer-subscription.test -# - { # The name of the test... NAME "Create a push printer subscription" @@ -68,8 +54,3 @@ EXPECT notify-subscription-id OF-TYPE integer WITH-VALUE >0 DISPLAY notify-subscription-id } - - -# -# End of "$Id$" -# diff --git a/test/get-completed-jobs.test b/test/get-completed-jobs.test index 51ef0719c..22079ed47 100644 --- a/test/get-completed-jobs.test +++ b/test/get-completed-jobs.test @@ -1,23 +1,8 @@ -# -# "$Id$" -# -# Get list of completed jobs. -# -# Copyright 2007-2014 by Apple Inc. -# Copyright 2001-2006 by Easy Software Products. All rights reserved. -# -# These coded instructions, statements, and computer programs are the -# property of Apple Inc. and are protected by Federal copyright -# law. Distribution and use rights are outlined in the file "LICENSE.txt" -# which should have been included with this file. If this file is -# file is missing or damaged, see the license at "http://www.cups.org/". +# Get list of completed jobs. # # Usage: # # ./ipptool printer-uri get-completed-jobs.test -# - - { # The name of the test... NAME "Get completed jobs" @@ -44,8 +29,3 @@ DISPLAY job-originating-user-name DISPLAY job-media-sheets-completed } - - -# -# End of "$Id$". -# diff --git a/test/get-jobs.test b/test/get-jobs.test index 19fb65fa3..6dbfc74ea 100644 --- a/test/get-jobs.test +++ b/test/get-jobs.test @@ -1,23 +1,8 @@ -# -# "$Id$" -# -# Get list of not-completed jobs. -# -# Copyright 2007-2014 by Apple Inc. -# Copyright 2001-2006 by Easy Software Products. All rights reserved. -# -# These coded instructions, statements, and computer programs are the -# property of Apple Inc. and are protected by Federal copyright -# law. Distribution and use rights are outlined in the file "LICENSE.txt" -# which should have been included with this file. If this file is -# file is missing or damaged, see the license at "http://www.cups.org/". +# Get list of not-completed jobs. # # Usage: # # ./ipptool printer-uri get-jobs.test -# - - { # The name of the test... NAME "Get pending jobs" @@ -46,8 +31,3 @@ DISPLAY job-media-sheets DISPLAY job-media-sheets-completed } - - -# -# End of "$Id$". -# diff --git a/test/ipp-1.1.test b/test/ipp-1.1.test index f7d8b82ba..e406d0ecc 100644 --- a/test/ipp-1.1.test +++ b/test/ipp-1.1.test @@ -1,14 +1,11 @@ # # IPP/1.1 test suite. # -# Copyright 2007-2017 by Apple Inc. -# Copyright 2001-2006 by Easy Software Products. All rights reserved. +# Copyright © 2007-2017 by Apple Inc. +# Copyright © 2001-2006 by Easy Software Products. All rights reserved. # -# These coded instructions, statements, and computer programs are the -# property of Apple Inc. and are protected by Federal copyright -# law. Distribution and use rights are outlined in the file "LICENSE.txt" -# which should have been included with this file. If this file is -# file is missing or damaged, see the license at "http://www.cups.org/". +# Licensed under Apache License v2.0. See the file "LICENSE" for more +# information. # # Usage: # diff --git a/test/ipp-2.0.test b/test/ipp-2.0.test index 28ab4be34..3746663eb 100644 --- a/test/ipp-2.0.test +++ b/test/ipp-2.0.test @@ -1,14 +1,11 @@ # # IPP/2.0 test suite. # -# Copyright 2007-2017 by Apple Inc. -# Copyright 2001-2006 by Easy Software Products. All rights reserved. +# Copyright © 2007-2017 by Apple Inc. +# Copyright © 2001-2006 by Easy Software Products. All rights reserved. # -# These coded instructions, statements, and computer programs are the -# property of Apple Inc. and are protected by Federal copyright -# law. Distribution and use rights are outlined in the file "LICENSE.txt" -# which should have been included with this file. If this file is -# file is missing or damaged, see the license at "http://www.cups.org/". +# Licensed under Apache License v2.0. See the file "LICENSE" for more +# information. # # Usage: # diff --git a/test/ipp-2.1.test b/test/ipp-2.1.test index 526555645..ca66e057a 100644 --- a/test/ipp-2.1.test +++ b/test/ipp-2.1.test @@ -1,14 +1,11 @@ # # IPP/2.1 test suite. # -# Copyright 2007-2017 by Apple Inc. -# Copyright 2001-2006 by Easy Software Products. All rights reserved. +# Copyright © 2007-2017 by Apple Inc. +# Copyright © 2001-2006 by Easy Software Products. All rights reserved. # -# These coded instructions, statements, and computer programs are the -# property of Apple Inc. and are protected by Federal copyright -# law. Distribution and use rights are outlined in the file "LICENSE.txt" -# which should have been included with this file. If this file is -# file is missing or damaged, see the license at "http://www.cups.org/". +# Licensed under Apache License v2.0. See the file "LICENSE" for more +# information. # # Usage: # diff --git a/test/ipp-2.2.test b/test/ipp-2.2.test index a8cbc1953..f83cc1fab 100644 --- a/test/ipp-2.2.test +++ b/test/ipp-2.2.test @@ -1,14 +1,11 @@ # # IPP/2.2 test suite. # -# Copyright 2007-2017 by Apple Inc. -# Copyright 2001-2006 by Easy Software Products. All rights reserved. +# Copyright © 2007-2017 by Apple Inc. +# Copyright © 2001-2006 by Easy Software Products. All rights reserved. # -# These coded instructions, statements, and computer programs are the -# property of Apple Inc. and are protected by Federal copyright -# law. Distribution and use rights are outlined in the file "LICENSE.txt" -# which should have been included with this file. If this file is -# file is missing or damaged, see the license at "http://www.cups.org/". +# Licensed under Apache License v2.0. See the file "LICENSE" for more +# information. # # Usage: # -- 2.39.2