From: msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Date: Thu, 6 Jun 2013 23:11:13 +0000 (+0000)
Subject: Don't clean HTML man pages.
X-Git-Tag: release-1.7rc1~37
X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fcups.git;a=commitdiff_plain;h=4875b2f3f60bad2b5251c90ca615e7d180989fcf

Don't clean HTML man pages.

Add some other print-job tests.


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

diff --git a/man/Makefile b/man/Makefile
index 37c51a478..1987acbb0 100644
--- a/man/Makefile
+++ b/man/Makefile
@@ -97,22 +97,6 @@ unittests:
 clean:
 	$(RM) mantohtml mantohtml.o
 	$(RM) $(MAN1) $(MAN5) $(MAN7) $(MAN8)
-	for file in $(MAN1); do \
-		if test $$file != ipptool.$(MAN1EXT); then \
-			$(RM) ../doc/help/man-`basename $$file .$(MAN1EXT)`.html; \
-		fi \
-	done
-	for file in $(MAN5); do \
-		if test $$file != ipptoolfile.$(MAN5EXT); then \
-			$(RM) ../doc/help/man-`basename $$file .$(MAN5EXT)`.html; \
-		fi \
-	done
-	for file in $(MAN7); do \
-		$(RM) ../doc/help/man-`basename $$file .$(MAN7EXT)`.html; \
-	done
-	for file in $(MAN8); do \
-		$(RM) ../doc/help/man-`basename $$file .$(MAN8EXT)`.html; \
-	done
 
 
 #
diff --git a/test/print-job-and-wait.test b/test/print-job-and-wait.test
new file mode 100644
index 000000000..f6acccaef
--- /dev/null
+++ b/test/print-job-and-wait.test
@@ -0,0 +1,45 @@
+# Print a test page using print-job
+{
+	# The name of the test...
+	NAME "Print file using Print-Job"
+
+	# The operation to use
+	OPERATION Print-Job
+
+	# Attributes, starting in the operation group...
+	GROUP operation-attributes-tag
+	ATTR charset attributes-charset utf-8
+	ATTR language attributes-natural-language en
+	ATTR uri printer-uri $uri
+	ATTR name requesting-user-name $user
+	ATTR mimeMediaType document-format $filetype
+
+	GROUP job-attributes-tag
+	ATTR integer copies 1
+
+	FILE $filename
+
+	# What statuses are OK?
+	STATUS successful-ok
+	STATUS successful-ok-ignored-or-substituted-attributes
+
+	# What attributes do we expect?
+	EXPECT job-id
+	EXPECT job-uri
+}
+{
+	NAME "Wait for job to complete..."
+	OPERATION Get-Job-Attributes
+	GROUP operation-attributes-tag
+	ATTR charset attributes-charset utf-8
+	ATTR language attributes-natural-language en
+	ATTR uri printer-uri $uri
+	ATTR integer job-id $job-id
+	ATTR name requesting-user-name $user
+
+	STATUS successful-ok
+	EXPECT job-id
+	EXPECT job-state WITH-VALUE >5 REPEAT-NO-MATCH
+	DISPLAY job-state
+	DISPLAY job-state-reasons
+}
diff --git a/test/print-job-password.test b/test/print-job-password.test
new file mode 100644
index 000000000..36e6a0a3a
--- /dev/null
+++ b/test/print-job-password.test
@@ -0,0 +1,31 @@
+# Print a test page using print-job
+{
+	# The name of the test...
+	NAME "Print file using Print-Job"
+
+	# The operation to use
+	OPERATION Print-Job
+
+	# Attributes, starting in the operation group...
+	GROUP operation-attributes-tag
+	ATTR charset attributes-charset utf-8
+	ATTR language attributes-natural-language en
+	ATTR uri printer-uri $uri
+	ATTR name requesting-user-name $user
+	ATTR mimeMediaType document-format $filetype
+	ATTR octetString job-password 1234
+	ATTR keyword job-password-encryption none
+
+	GROUP job-attributes-tag
+	ATTR integer copies 1
+
+	FILE $filename
+
+	# What statuses are OK?
+	STATUS successful-ok
+	STATUS successful-ok-ignored-or-substituted-attributes
+
+	# What attributes do we expect?
+	EXPECT job-id
+	EXPECT job-uri
+}