dovecot-2.0-pigeonhole: Deprecated imapflags extension: added pr...

[pigeonhole at rename-it.nl]

details:   http://hg.rename-it.nl/dovecot-2.0-pigeonhole/rev/985f5212b6c6
changeset: 1226:985f5212b6c6
user:      Stephan Bosch <stephan at rename-it.nl>
date:      Wed Jan 27 19:59:34 2010 +0100
description:
Deprecated imapflags extension: added proper tests to the test suite.

diffstat:

 Makefile.am                                         |   3 +-
 tests/deprecated/imapflags/errors.svtest            |  14 +++
 tests/deprecated/imapflags/errors/imapflags.sieve   |   4 +
 tests/deprecated/imapflags/execute.svtest           |  92 +++++++++++++++++++++++
 tests/deprecated/imapflags/execute/flags.sieve      |  12 +++
 tests/deprecated/imapflags/execute/mark.sieve       |  11 ++
 tests/extensions/imap4flags/errors.svtest           |  14 ---
 tests/extensions/imap4flags/errors/imapflags.sieve  |   4 -
 tests/extensions/imap4flags/execute/imapflags.sieve |   7 -
 9 files changed, 135 insertions(+), 26 deletions(-)

diffs (210 lines):

diff -r c4bc236883d2 -r 985f5212b6c6 Makefile.am
--- a/Makefile.am	Wed Jan 27 19:02:12 2010 +0100
+++ b/Makefile.am	Wed Jan 27 19:59:34 2010 +0100
@@ -69,7 +69,6 @@
 	tests/extensions/include/execute.svtest \
 	tests/extensions/imap4flags/basic.svtest \
 	tests/extensions/imap4flags/hasflag.svtest \
-	tests/extensions/imap4flags/errors.svtest \
 	tests/extensions/imap4flags/execute.svtest \
 	tests/extensions/imap4flags/multiscript.svtest \
 	tests/extensions/imap4flags/flagstring.svtest \
@@ -114,6 +113,8 @@
 	tests/deprecated/notify/errors.svtest \
 	tests/deprecated/notify/execute.svtest \
 	tests/deprecated/notify/denotify.svtest \
+	tests/deprecated/imapflags/execute.svtest \
+	tests/deprecated/imapflags/errors.svtest \
 	tests/extensions/spamvirustest/spamtest.svtest \
 	tests/extensions/spamvirustest/virustest.svtest \
 	tests/extensions/spamvirustest/spamtestplus.svtest \
diff -r c4bc236883d2 -r 985f5212b6c6 tests/deprecated/imapflags/errors.svtest
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/deprecated/imapflags/errors.svtest	Wed Jan 27 19:59:34 2010 +0100
@@ -0,0 +1,14 @@
+require "vnd.dovecot.testsuite";
+
+require "comparator-i;ascii-numeric";
+require "relational";
+
+test "Depricated imapflags extension used with imap4flags" {
+	if test_script_compile "errors/imapflags.sieve" {
+		test_fail "compile should have failed";
+	}
+
+	if not test_error :count "eq" :comparator "i;ascii-numeric" "2" {
+		test_fail "wrong number of errors reported";
+	}
+}
diff -r c4bc236883d2 -r 985f5212b6c6 tests/deprecated/imapflags/errors/imapflags.sieve
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/deprecated/imapflags/errors/imapflags.sieve	Wed Jan 27 19:59:34 2010 +0100
@@ -0,0 +1,4 @@
+require "imapflags";
+require "imap4flags";
+
+addflag "\\flagged";
diff -r c4bc236883d2 -r 985f5212b6c6 tests/deprecated/imapflags/execute.svtest
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/deprecated/imapflags/execute.svtest	Wed Jan 27 19:59:34 2010 +0100
@@ -0,0 +1,92 @@
+require "vnd.dovecot.testsuite";
+require "fileinto";
+require "imap4flags";
+require "relational";
+require "comparator-i;ascii-numeric";
+require "mailbox";
+
+test_set "message" text:
+From: Henry von Flockenstoffen <henry at example.com>
+To: Dieter von Ausburg <dieter at example.com>
+Subject: Test message.
+
+Test message.
+.
+;
+
+test "Mark / Unmark" {
+    if not test_script_compile "execute/mark.sieve" {
+        test_fail "script compile failed";
+    }
+
+    if not test_script_run {
+        test_fail "script execute failed";
+    }
+
+    if not test_result_execute {
+        test_fail "failed to execute first result";
+    }
+
+    test_result_reset;
+
+    test_message :folder "Marked" 0;
+
+	if not hasflag "\\flagged" {
+		test_fail "message not marked";
+	}
+
+    test_result_reset;
+
+    test_message :folder "Unmarked" 0;
+
+	if hasflag "\\flagged" {
+		test_fail "message not unmarked";
+	}
+}
+
+test_result_reset;
+test "Setflag / Addflag / Removeflag" {
+    if not test_script_compile "execute/flags.sieve" {
+        test_fail "script compile failed";
+    }
+
+    if not test_script_run {
+        test_fail "script execute failed";
+    }
+
+    if not test_result_execute {
+        test_fail "failed to execute first result";
+    }
+
+    test_result_reset;
+
+    test_message :folder "Set" 0;
+
+	if not hasflag "\\draft" {
+		test_fail "flag not set";
+	}
+
+    test_result_reset;
+
+    test_message :folder "Add" 0;
+
+	if not hasflag "\\draft" {
+		test_fail "flag not retained";
+	}
+
+	if not hasflag "\\flagged" {
+		test_fail "flag not added";
+	}
+
+    test_result_reset;
+
+    test_message :folder "Remove" 0;
+
+	if not hasflag "\\flagged" {
+		test_fail "flag not retained";
+	}
+
+	if hasflag "\\draft" {
+		test_fail "flag not removed";
+	}
+}
diff -r c4bc236883d2 -r 985f5212b6c6 tests/deprecated/imapflags/execute/flags.sieve
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/deprecated/imapflags/execute/flags.sieve	Wed Jan 27 19:59:34 2010 +0100
@@ -0,0 +1,12 @@
+require "imapflags";
+require "fileinto";
+require "mailbox";
+
+setflag "\\draft";
+fileinto :create "Set";
+
+addflag "\\flagged";
+fileinto :create "Add";
+
+removeflag "\\draft";
+fileinto :create "Remove";
diff -r c4bc236883d2 -r 985f5212b6c6 tests/deprecated/imapflags/execute/mark.sieve
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/deprecated/imapflags/execute/mark.sieve	Wed Jan 27 19:59:34 2010 +0100
@@ -0,0 +1,11 @@
+require "imapflags";
+require "fileinto";
+require "mailbox";
+
+mark;
+
+fileinto :create "Marked";
+
+unmark;
+
+fileinto :create "Unmarked";
diff -r c4bc236883d2 -r 985f5212b6c6 tests/extensions/imap4flags/errors.svtest
--- a/tests/extensions/imap4flags/errors.svtest	Wed Jan 27 19:02:12 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-require "vnd.dovecot.testsuite";
-
-require "comparator-i;ascii-numeric";
-require "relational";
-
-test "Depricated imapflags extension used with imap4flags" {
-	if test_script_compile "errors/imapflags.sieve" {
-		test_fail "compile should have failed";
-	}
-
-	if not test_error :count "eq" :comparator "i;ascii-numeric" "2" {
-		test_fail "wrong number of errors reported";
-	}
-}
diff -r c4bc236883d2 -r 985f5212b6c6 tests/extensions/imap4flags/errors/imapflags.sieve
--- a/tests/extensions/imap4flags/errors/imapflags.sieve	Wed Jan 27 19:02:12 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-require "imapflags";
-require "imap4flags";
-
-addflag "\\flagged";
diff -r c4bc236883d2 -r 985f5212b6c6 tests/extensions/imap4flags/execute/imapflags.sieve
--- a/tests/extensions/imap4flags/execute/imapflags.sieve	Wed Jan 27 19:02:12 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-require "imapflags";
-
-mark;
-unmark;
-mark;
-
-addflag "$label1";