From 64ab661687261c2f0e466c4024ecd6e90601e2de Mon Sep 17 00:00:00 2001
From: Stephan Bosch <stephan@rename-it.nl>
Date: Sat, 16 Aug 2008 12:49:35 +0200
Subject: [PATCH] Testsuite: restructured regex tests.
---
Makefile.am | 3 ++-
.../regex.svtest => extensions/regex/basic.svtest} | 0
tests/extensions/regex/errors.svtest | 14 ++++++++++++++
.../extensions/regex/errors/compile.sieve | 0
4 files changed, 16 insertions(+), 1 deletion(-)
rename tests/{match-types/regex.svtest => extensions/regex/basic.svtest} (100%)
create mode 100644 tests/extensions/regex/errors.svtest
rename src/lib-sieve/plugins/regex/regex-errors.sieve => tests/extensions/regex/errors/compile.sieve (100%)
diff --git a/Makefile.am b/Makefile.am
index 6d9e511fa..c4ce4b972 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,7 +27,6 @@ test_cases = \
tests/match-types/contains.svtest \
tests/match-types/matches.svtest \
tests/match-types/relational.svtest \
- tests/match-types/regex.svtest \
tests/address-parts/subaddress.svtest \
tests/extensions/encoded-character.svtest \
tests/extensions/envelope.svtest \
@@ -43,6 +42,8 @@ test_cases = \
tests/extensions/imapflags/basic.svtest \
tests/extensions/imapflags/hasflag.svtest \
tests/extensions/body/basic.svtest \
+ tests/extensions/regex/basic.svtest \
+ tests/extensions/regex/errors.svtest \
tests/compile/compile.svtest \
tests/compile/compile-examples.svtest \
tests/compile/errors.svtest
diff --git a/tests/match-types/regex.svtest b/tests/extensions/regex/basic.svtest
similarity index 100%
rename from tests/match-types/regex.svtest
rename to tests/extensions/regex/basic.svtest
diff --git a/tests/extensions/regex/errors.svtest b/tests/extensions/regex/errors.svtest
new file mode 100644
index 000000000..0946a6fe0
--- /dev/null
+++ b/tests/extensions/regex/errors.svtest
@@ -0,0 +1,14 @@
+require "vnd.dovecot.testsuite";
+
+require "relational";
+require "comparator-i;ascii-numeric";
+
+test "Compile errors" {
+ if test_compile "errors/compile.sieve" {
+ test_fail "compile should have failed";
+ }
+
+ if not test_error :count "eq" :comparator "i;ascii-numeric" "5" {
+ test_fail "wrong number of errors reported";
+ }
+}
diff --git a/src/lib-sieve/plugins/regex/regex-errors.sieve b/tests/extensions/regex/errors/compile.sieve
similarity index 100%
rename from src/lib-sieve/plugins/regex/regex-errors.sieve
rename to tests/extensions/regex/errors/compile.sieve
--
GitLab