Adding upstream version 1:2.3.21+dfsg1.upstream/1%2.3.21+dfsg1

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 416 insertions, 0 deletions

diff --git a/src/lib-storage/test-mail-search-args-simplify.c b/src/lib-storage/test-mail-search-args-simplify.c
new file mode 100644
index 0000000..a480392
--- /dev/null
+++ b/src/lib-storage/test-mail-search-args-simplify.c
@@ -0,0 +1,416 @@
+/* Copyright (c) 2015-2018 Dovecot authors, see the included COPYING file */
+
+#include "lib.h"
+#include "str.h"
+#include "test-common.h"
+#include "mail-storage-private.h"
+#include "mail-search-build.h"
+#include "mail-search-parser.h"
+#include "mail-search.h"
+
+static const struct {
+	const char *input;
+	const char *output;
+} tests[] = {
+	{ "ALL", "ALL" },
+	{ "NOT ALL", "NOT ALL" },
+	{ "ALL NOT ALL", "NOT ALL" },
+	{ "ALL NOT ALL TEXT foo", "NOT ALL" },
+	{ "OR ALL NOT ALL", "ALL" },
+	{ "OR ALL OR NOT ALL TEXT foo", "ALL" },
+	{ "OR ALL OR TEXT foo TEXT bar", "ALL" },
+	{ "OR TEXT FOO ( ALL NOT ALL )", "TEXT FOO" },
+	{ "TEXT FOO OR ALL NOT ALL", "TEXT FOO" },
+
+	{ "TEXT foo", "TEXT foo" },
+	{ "( TEXT foo )", "TEXT foo" },
+	{ "( ( TEXT foo ) )", "TEXT foo" },
+	{ "( ( TEXT foo ) ( TEXT bar ) )", "TEXT foo TEXT bar" },
+
+	{ "OR ( TEXT foo ) ( TEXT bar )", "OR TEXT foo TEXT bar" },
+	{ "OR ( TEXT foo ) OR ( TEXT bar ) ( TEXT baz )",
+	  "OR TEXT foo OR TEXT bar TEXT baz" },
+	{ "OR ( ( TEXT foo TEXT foo2 ) ) ( ( TEXT bar ( TEXT baz ) ) )",
+	  "OR (TEXT foo TEXT foo2) (TEXT bar TEXT baz)" },
+
+	{ "NOT ( TEXT foo )", "NOT TEXT foo" },
+	{ "NOT ( NOT ( TEXT foo ) )", "TEXT foo" },
+	{ "NOT OR ( TEXT foo ) ( TEXT bar )", "NOT TEXT foo NOT TEXT bar" },
+	{ "NOT ( OR ( TEXT foo ) ( TEXT bar ) )", "NOT TEXT foo NOT TEXT bar" },
+	{ "NOT ( TEXT foo TEXT bar )", "OR NOT TEXT foo NOT TEXT bar" },
+
+	{ "ANSWERED FLAGGED SEEN", "(ANSWERED FLAGGED SEEN)" },
+	{ "OR ( ANSWERED FLAGGED SEEN ) DRAFT", "OR (ANSWERED FLAGGED SEEN) DRAFT" },
+	{ "ANSWERED TEXT foo FLAGGED SEEN", "(ANSWERED FLAGGED SEEN) TEXT foo" },
+	{ "NOT ( ANSWERED FLAGGED SEEN )", "NOT (ANSWERED FLAGGED SEEN)" },
+	{ "OR NOT ANSWERED OR NOT FLAGGED NOT SEEN", "NOT (ANSWERED FLAGGED SEEN)" },
+	{ "OR NOT ANSWERED OR NOT FLAGGED SEEN", "OR NOT (ANSWERED FLAGGED) SEEN" },
+	{ "OR NOT ANSWERED OR FLAGGED NOT SEEN", "OR NOT (ANSWERED SEEN) FLAGGED" },
+	{ "NOT ANSWERED OR FLAGGED NOT SEEN", "NOT ANSWERED OR FLAGGED NOT SEEN" },
+	{ "NOT ANSWERED OR NOT FLAGGED NOT SEEN", "NOT ANSWERED NOT (FLAGGED SEEN)" },
+	{ "ANSWERED NOT FLAGGED SEEN NOT DRAFT", "(ANSWERED SEEN) NOT FLAGGED NOT DRAFT" },
+	{ "OR NOT ANSWERED NOT SEEN", "NOT (ANSWERED SEEN)" },
+	{ "OR NOT ANSWERED OR NOT SEEN TEXT foo", "OR NOT (ANSWERED SEEN) TEXT foo" },
+
+	{ "ANSWERED ANSWERED", "ANSWERED" },
+	{ "ANSWERED NOT ANSWERED", "NOT ALL" },
+	{ "ANSWERED ANSWERED NOT ANSWERED", "NOT ALL" },
+	{ "ANSWERED NOT ANSWERED ANSWERED NOT ANSWERED", "NOT ALL" },
+	{ "NOT ANSWERED NOT ANSWERED", "NOT ANSWERED" },
+	{ "NOT SEEN NOT ANSWERED NOT ANSWERED", "NOT SEEN NOT ANSWERED" },
+	{ "OR NOT SEEN OR NOT ANSWERED NOT ANSWERED", "NOT (ANSWERED SEEN)" },
+
+	{ "KEYWORD foo", "KEYWORD foo" },
+	{ "KEYWORD foo KEYWORD bar", "KEYWORD foo KEYWORD bar" },
+	{ "NOT KEYWORD foo", "NOT KEYWORD foo" },
+	{ "NOT KEYWORD foo NOT KEYWORD bar", "NOT KEYWORD foo NOT KEYWORD bar" },
+	{ "OR KEYWORD foo KEYWORD bar", "OR KEYWORD foo KEYWORD bar" },
+	{ "OR NOT KEYWORD foo NOT KEYWORD bar", "OR NOT KEYWORD foo NOT KEYWORD bar" },
+
+	{ "KEYWORD foo KEYWORD foo", "KEYWORD foo" },
+	{ "KEYWORD foo NOT KEYWORD foo", "NOT ALL" },
+	{ "OR KEYWORD foo NOT KEYWORD foo", "ALL" },
+	{ "OR KEYWORD foo KEYWORD foo", "KEYWORD foo" },
+	{ "NOT KEYWORD foo NOT KEYWORD foo", "NOT KEYWORD foo" },
+
+	{ "1:* 1:*", "ALL" },
+	{ "OR 1:5 6:*", "ALL" },
+
+	{ "UID 1:* UID 1:*", "ALL" },
+	{ "OR UID 1:5 UID 6:*", "ALL" },
+
+	{ "2:* 2:*", "2:4294967295" },
+	{ "OR 2:* 2:*", "2:4294967295" },
+
+	{ "UID 2:* UID 2:*", "UID 2:4294967295" },
+	{ "OR UID 2:* UID 2:*", "UID 2:4294967295" },
+
+	{ "1:5 6:7", "NOT ALL" },
+	{ "1:5 3:7", "3:5" },
+	{ "1:5 3:7 4:9", "4:5" },
+	{ "1:5 OR 3:4 4:6", "3:5" },
+	{ "OR 1 2", "1:2" },
+	{ "NOT 1,3:5", "2,6:4294967294" },
+	{ "NOT 1:100 NOT 50:200", "201:4294967294" },
+	{ "OR NOT 1:100 NOT 50:200", "1:49,101:4294967294" },
+
+	{ "UID 1:5 UID 6:7", "NOT ALL" },
+	{ "UID 1:5 UID 3:7", "UID 3:5" },
+	{ "OR UID 1 UID 2", "UID 1:2" },
+	{ "NOT UID 1,3:5", "UID 2,6:4294967294" },
+
+	{ "1:5 UID 10:20", "1:5 UID 10:20" },
+	{ "1:5 NOT UID 10:20", "1:5 UID 1:9,21:4294967294" },
+
+	{ "ALL NOT UID 3:*", "NOT UID 3:4294967295" },
+	{ "NOT 1:10 NOT *", "11:4294967294 NOT 4294967295" },
+
+	{ "BEFORE 03-Aug-2014 BEFORE 01-Aug-2014 BEFORE 02-Aug-2014", "BEFORE \"01-Aug-2014\"" },
+	{ "OR BEFORE 01-Aug-2014 BEFORE 02-Aug-2014", "BEFORE \"02-Aug-2014\"" },
+	{ "OR BEFORE 01-Aug-2014 OR BEFORE 03-Aug-2014 BEFORE 02-Aug-2014", "BEFORE \"03-Aug-2014\"" },
+	{ "BEFORE 03-Aug-2014 NOT BEFORE 01-Aug-2014 BEFORE 02-Aug-2014", "BEFORE \"02-Aug-2014\" NOT BEFORE \"01-Aug-2014\"" },
+	{ "SENTBEFORE 03-Aug-2014 SENTBEFORE 01-Aug-2014 SENTBEFORE 02-Aug-2014", "SENTBEFORE \"01-Aug-2014\"" },
+	{ "SENTBEFORE 03-Aug-2014 BEFORE 01-Aug-2014 SENTBEFORE 02-Aug-2014", "SENTBEFORE \"02-Aug-2014\" BEFORE \"01-Aug-2014\"" },
+
+	{ "ON 03-Aug-2014 ON 03-Aug-2014", "ON \"03-Aug-2014\"" },
+	{ "ON 03-Aug-2014 ON 04-Aug-2014", "ON \"03-Aug-2014\" ON \"04-Aug-2014\"" }, /* this could be replaced with e.g. NOT ALL */
+	{ "OR ON 03-Aug-2014 ON 04-Aug-2014", "OR ON \"03-Aug-2014\" ON \"04-Aug-2014\"" },
+
+	{ "SINCE 03-Aug-2014 SINCE 01-Aug-2014 SINCE 02-Aug-2014", "SINCE \"03-Aug-2014\"" },
+	{ "OR SINCE 01-Aug-2014 SINCE 02-Aug-2014", "SINCE \"01-Aug-2014\"" },
+	{ "OR SINCE 01-Aug-2014 OR SINCE 03-Aug-2014 SINCE 02-Aug-2014", "SINCE \"01-Aug-2014\"" },
+	{ "SINCE 03-Aug-2014 NOT SINCE 01-Aug-2014 SINCE 02-Aug-2014", "SINCE \"03-Aug-2014\" NOT SINCE \"01-Aug-2014\"" },
+	{ "SENTSINCE 03-Aug-2014 SENTSINCE 01-Aug-2014 SENTSINCE 02-Aug-2014", "SENTSINCE \"03-Aug-2014\"" },
+	{ "SENTSINCE 03-Aug-2014 SINCE 01-Aug-2014 SENTSINCE 02-Aug-2014", "SENTSINCE \"03-Aug-2014\" SINCE \"01-Aug-2014\"" },
+
+	{ "SMALLER 1 SMALLER 2", "SMALLER 1" },
+	{ "OR SMALLER 1 SMALLER 2", "SMALLER 2" },
+	{ "OR SMALLER 1 OR SMALLER 3 SMALLER 2", "SMALLER 3" },
+	{ "SMALLER 3 NOT SMALLER 1 SMALLER 2", "SMALLER 2 NOT SMALLER 1" },
+	{ "SMALLER 3 LARGER 5", "SMALLER 3 LARGER 5" }, /* this could be replaced with e.g. NOT ALL */
+	{ "OR SMALLER 3 LARGER 5", "OR SMALLER 3 LARGER 5" },
+
+	{ "LARGER 3 LARGER 1 LARGER 2", "LARGER 3" },
+	{ "OR LARGER 1 LARGER 2", "LARGER 1" },
+	{ "OR LARGER 1 OR LARGER 3 LARGER 2", "LARGER 1" },
+	{ "LARGER 3 NOT LARGER 1 LARGER 2", "LARGER 3 NOT LARGER 1" },
+
+	{ "SUBJECT foo SUBJECT foo", "SUBJECT foo" },
+	{ "SUBJECT foo NOT SUBJECT foo", "NOT ALL" },
+	{ "OR SUBJECT foo NOT SUBJECT foo", "ALL" },
+	{ "SUBJECT foo SUBJECT foob", "SUBJECT foo SUBJECT foob" },
+	{ "OR SUBJECT foo SUBJECT foo", "SUBJECT foo" },
+	{ "FROM foo FROM foo", "FROM foo" },
+	{ "FROM foo NOT FROM foo", "NOT ALL" },
+	{ "OR FROM foo NOT FROM foo", "ALL" },
+	{ "FROM foo FROM bar", "FROM foo FROM bar" },
+	{ "FROM foo TO foo", "FROM foo TO foo" },
+
+	{ "TEXT foo TEXT foo", "TEXT foo" },
+	{ "TEXT foo TEXT foob", "TEXT foo TEXT foob" },
+	{ "OR TEXT foo TEXT foo", "TEXT foo" },
+	{ "OR NOT TEXT foo TEXT foo", "ALL" },
+	{ "OR TEXT foo NOT TEXT foo", "ALL" },
+	{ "TEXT foo NOT TEXT foo", "NOT ALL" },
+	{ "NOT TEXT foo TEXT foo", "NOT ALL" },
+	{ "BODY foo BODY foo", "BODY foo" },
+	{ "BODY foo NOT BODY foo", "NOT ALL" },
+	{ "OR BODY foo NOT BODY foo", "ALL" },
+	{ "OR BODY foo BODY foo", "BODY foo" },
+	{ "TEXT foo BODY foo", "TEXT foo BODY foo" },
+	{ "OR ( TEXT foo OR TEXT foo TEXT foo ) ( TEXT foo ( TEXT foo ) )", "TEXT foo" },
+
+	/* value="" tests */
+	{ "HEADER foo ", "HEADER FOO \"\"" },
+	{ "SUBJECT ", "SUBJECT \"\"" },
+	{ "BODY ", "ALL" },
+	{ "TEXT ", "ALL" },
+	{ "HEADER foo .", "HEADER FOO ." },
+	{ "SUBJECT .", "SUBJECT ." },
+	{ "BODY .", "BODY ." },
+	{ "TEXT .", "TEXT ." },
+
+	/* OR: drop redundant args */
+	{ "OR ( TEXT common1 TEXT unique1 ) TEXT common1", "TEXT common1" },
+	{ "OR ( TEXT unique1 TEXT common1 ) TEXT common1", "TEXT common1" },
+	{ "OR TEXT common1 ( TEXT common1 TEXT unique1 )", "TEXT common1" },
+	{ "OR TEXT common1 ( TEXT unique1 TEXT common1 )", "TEXT common1" },
+	{ "OR ( TEXT common1 TEXT common2 ) ( TEXT common1 TEXT common2 TEXT unique1 )", "TEXT common1 TEXT common2" },
+	{ "OR TEXT common1 OR ( TEXT unique1 TEXT common1 ) ( TEXT unique3 TEXT common1 )", "TEXT common1" },
+
+	/* OR: extract common AND */
+	{ "OR ( TEXT common1 TEXT unique1 ) ( TEXT common1 TEXT unique2 )", "OR TEXT unique1 TEXT unique2 TEXT common1" },
+	{ "OR ( TEXT unique1 TEXT common1 ) ( TEXT unique2 TEXT common1 )", "OR TEXT unique1 TEXT unique2 TEXT common1" },
+	{ "OR ( TEXT common1 TEXT unique1 ) ( TEXT unique2 TEXT common1 )", "OR TEXT unique1 TEXT unique2 TEXT common1" },
+	{ "OR ( TEXT unique1 TEXT common1 ) ( TEXT common1 TEXT unique2 )", "OR TEXT unique1 TEXT unique2 TEXT common1" },
+
+	{ "OR ( TEXT unique1 TEXT common1 ) ( TEXT common1 TEXT unique2 TEXT unique3 )", "OR TEXT unique1 (TEXT unique2 TEXT unique3) TEXT common1" },
+	{ "OR ( TEXT common1 TEXT common2 TEXT unique1 ) ( TEXT common1 TEXT common2 TEXT unique2 )", "OR TEXT unique1 TEXT unique2 TEXT common2 TEXT common1" },
+	{ "OR ( TEXT common1 TEXT common2 TEXT unique1 TEXT unique2 ) ( TEXT common1 TEXT common2 TEXT unique3 TEXT unique4 )", "OR (TEXT unique1 TEXT unique2) (TEXT unique3 TEXT unique4) TEXT common2 TEXT common1" },
+
+	/* non-matching cases */
+	{ "OR ( TEXT unique1 TEXT unique2 ) TEXT unique3", "OR (TEXT unique1 TEXT unique2) TEXT unique3" },
+	{ "OR ( TEXT unique1 TEXT unique2 ) ( TEXT unique3 TEXT unique4 )", "OR (TEXT unique1 TEXT unique2) (TEXT unique3 TEXT unique4)" },
+	{ "OR ( TEXT common1 TEXT unique1 ) OR ( TEXT common1 TEXT unique2 ) TEXT unique3", "OR (TEXT common1 TEXT unique1) OR (TEXT common1 TEXT unique2) TEXT unique3" },
+	{ "OR ( TEXT common1 TEXT unique1 ) OR ( TEXT common1 TEXT common2 ) ( TEXT common2 TEXT unique2 )", "OR (TEXT common1 TEXT unique1) OR (TEXT common1 TEXT common2) (TEXT common2 TEXT unique2)" },
+
+	/* SUB: drop redundant args */
+	{ "( OR TEXT common1 TEXT unique1 ) TEXT common1", "TEXT common1" },
+	{ "( OR TEXT unique1 TEXT common1 ) TEXT common1", "TEXT common1" },
+	{ "TEXT common1 ( OR TEXT common1 TEXT unique1 )", "TEXT common1" },
+	{ "TEXT common1 ( OR TEXT unique1 TEXT common1 )", "TEXT common1" },
+	{ "( OR TEXT common1 TEXT common2 ) ( OR TEXT common1 OR TEXT common2 TEXT unique1 )", "OR TEXT common1 TEXT common2" },
+	{ "TEXT common1 ( OR TEXT unique1 TEXT common1 ) ( OR TEXT unique3 TEXT common1 )", "TEXT common1" },
+	{ "OR ( TEXT common1 ( OR TEXT unique1 TEXT common1 ) ) TEXT unique1", "OR TEXT common1 TEXT unique1" },
+
+	/* SUB: extract common OR */
+	{ "( OR TEXT common1 TEXT unique1 ) ( OR TEXT common1 TEXT unique2 )", "OR (TEXT unique1 TEXT unique2) TEXT common1" },
+	{ "( OR TEXT unique1 TEXT common1 ) ( OR TEXT unique2 TEXT common1 )", "OR (TEXT unique1 TEXT unique2) TEXT common1" },
+	{ "( OR TEXT common1 TEXT unique1 ) ( OR TEXT unique2 TEXT common1 )", "OR (TEXT unique1 TEXT unique2) TEXT common1" },
+	{ "( OR TEXT unique1 TEXT common1 ) ( OR TEXT common1 TEXT unique2 )", "OR (TEXT unique1 TEXT unique2) TEXT common1" },
+
+	{ "( OR TEXT unique1 TEXT common1 ) ( OR TEXT common1 OR TEXT unique2 TEXT unique3 )", "OR (TEXT unique1 OR TEXT unique2 TEXT unique3) TEXT common1" },
+	{ "( OR TEXT common1 OR TEXT common2 TEXT unique1 ) ( OR TEXT common1 OR TEXT common2 TEXT unique2 )", "OR (TEXT unique1 TEXT unique2) OR TEXT common2 TEXT common1" },
+	{ "( OR TEXT common1 OR TEXT common2 OR TEXT unique1 TEXT unique2 ) ( OR TEXT common1 OR TEXT common2 OR TEXT unique3 TEXT unique4 )", "OR (OR TEXT unique1 TEXT unique2 OR TEXT unique3 TEXT unique4) OR TEXT common2 TEXT common1" },
+
+	/* non-matching cases */
+	{ "( OR TEXT unique1 TEXT unique2 ) TEXT unique3", "OR TEXT unique1 TEXT unique2 TEXT unique3" },
+	{ "( OR TEXT unique1 TEXT unique2 ) ( OR TEXT unique3 TEXT unique4 )", "OR TEXT unique1 TEXT unique2 OR TEXT unique3 TEXT unique4" },
+	{ "( OR TEXT common1 TEXT unique1 ) ( OR TEXT common1 TEXT unique2 ) TEXT unique3", "OR TEXT common1 TEXT unique1 OR TEXT common1 TEXT unique2 TEXT unique3" },
+	{ "( OR TEXT common1 TEXT unique1 ) ( OR TEXT common1 TEXT common2 ) ( OR TEXT common2 TEXT unique2 )", "OR TEXT common1 TEXT unique1 OR TEXT common1 TEXT common2 OR TEXT common2 TEXT unique2" },
+
+	/* extra for simplifications on 2nd and later terms */
+	{ "( OR BODY z BODY x ) BODY x BODY y",  "BODY x BODY y" },
+	{ "( OR BODY x BODY y ) ( OR BODY x BODY z )",  "OR (BODY y BODY z) BODY x" },
+	{ "( OR BODY z BODY x ) BODY x BODY y",  "BODY x BODY y" },
+	{ "( OR BODY z NOT BODY x ) BODY x BODY y",  "OR BODY z NOT BODY x BODY x BODY y" },
+
+	{ "( OR BODY z BODY y ) BODY x BODY y",  "BODY x BODY y" },
+	{ "( OR BODY z BODY y ) ( OR BODY z BODY w ) BODY x BODY y BODY w",  "BODY x BODY y BODY w" },
+
+	{ "subject y", "SUBJECT y"},
+
+	/* NIL cases */
+	{ "NIL", ""},
+	{ "NOT NIL", ""},
+	{ "( ( NIL ) )", ""},
+	{ "( ( NOT NIL ) )", ""},
+
+	{ "NIL NIL", "" },
+	{ "( ( NIL NIL ) )", "" },
+	{ "OR NIL NIL", "" },
+
+	{ "OR ( NIL NIL ) OR NIL NIL", "" },
+	{ "( NIL NIL ) OR NIL NIL", "" },
+
+	{ "NIL LARGER 0", "NOT ALL"},
+	{ "NOT NIL LARGER 0", "NOT ALL"},
+	{ "NIL NOT LARGER 0", "NOT ALL"},
+	{ "NOT NIL NOT LARGER 0", "NOT ALL"},
+
+	{ "( NIL NIL ) TEXT uno", "TEXT uno" },
+	{ "OR NIL NIL TEXT uno", "TEXT uno" },
+
+	{ "TEXT foo NIL", "TEXT foo"},
+	{ "NIL TEXT foo", "TEXT foo"},
+
+	{ "NOT ( TEXT foo NIL )", "NOT TEXT foo"},
+	{ "NOT ( NIL TEXT foo )", "NOT TEXT foo"},
+
+	{ "TEXT foo NOT NIL", "TEXT foo"},
+	{ "NOT NIL TEXT foo", "TEXT foo"},
+
+	{ "NOT TEXT foo NIL", "NOT TEXT foo"},
+	{ "NIL NOT TEXT foo", "NOT TEXT foo"},
+
+	{ "OR TEXT foo NIL", "TEXT foo"},
+	{ "OR NIL TEXT foo", "TEXT foo"},
+
+	{ "NOT OR TEXT foo NIL", "NOT TEXT foo"},
+	{ "NOT OR NIL TEXT foo", "NOT TEXT foo"},
+
+	{ "OR TEXT foo NOT NIL", "TEXT foo"},
+	{ "OR NOT NIL TEXT foo", "TEXT foo"},
+
+	{ "OR NOT TEXT foo NIL", "NOT TEXT foo"},
+	{ "OR NIL NOT TEXT foo", "NOT TEXT foo"},
+
+	// avec & and & uno & due
+	// -> {en}(avec & NIL & uno & due) | {fr}(NIL & and & uno & (du | due)
+	{ "OR ( TEXT avec NIL TEXT uno TEXT due ) ( NIL TEXT and TEXT uno OR TEXT du TEXT due )",
+	  "OR (TEXT avec TEXT due) (TEXT and OR TEXT du TEXT due) TEXT uno" },
+
+	// avec | and | uno | due
+	// -> {en}(avec | NIL | uno | due) | {fr}(NIL | and | uno | (du | due)
+	{ "OR ( OR TEXT avec OR NIL OR TEXT uno TEXT due ) ( OR NIL OR TEXT and OR TEXT uno OR TEXT du TEXT due )",
+	  "OR TEXT avec OR TEXT uno OR TEXT due OR TEXT and TEXT du" },
+
+	// (avec | and) & (uno | due)
+	// -> {en}((avec | NIL) & (uno | due)) | {fr}((NIL | and) & (uno | (du | due)))
+	{ "OR ( OR TEXT avec NIL OR TEXT uno TEXT due ) ( OR NIL TEXT and OR TEXT uno ( OR TEXT du TEXT due ) )",
+	  "OR (TEXT avec OR TEXT uno TEXT due) (TEXT and OR TEXT uno OR TEXT du TEXT due)" },
+
+	// (avec | uno) & (and | due)
+	// -> {en}((avec | uno) & (NIL | due)) | {fr}((NIL | uno) & (and | (du | due)))
+	{ "OR ( OR TEXT avec TEXT uno OR NIL TEXT due ) ( OR NIL TEXT uno OR TEXT and OR TEXT du TEXT due )",
+	  "OR (OR TEXT avec TEXT uno TEXT due) (TEXT uno OR TEXT and OR TEXT du TEXT due)"},
+
+	// (uno | due) & ( tre | NIL)
+	{ "OR TEXT uno TEXT due OR TEXT tre NIL",
+	  "OR TEXT uno TEXT due TEXT tre" },
+
+	// (uno & due) | ( tre & NIL)
+	{ "OR ( TEXT uno TEXT due ) ( TEXT tre NIL )",
+	  "OR (TEXT uno TEXT due) TEXT tre" },
+
+	// (uno | due) & ( uno | NIL)
+	{ "OR TEXT uno TEXT due OR TEXT uno NIL",
+	  "TEXT uno" },
+
+	// (uno & due) | ( uno & NIL)
+	{ "OR ( TEXT uno TEXT due ) ( TEXT uno NIL )",
+	  "TEXT uno" },
+};
+
+static struct mail_search_args *
+test_build_search_args(const char *args)
+{
+	struct mail_search_parser *parser;
+	struct mail_search_args *sargs;
+	const char *error, *charset = "UTF-8";
+
+	parser = mail_search_parser_init_cmdline(t_strsplit(args, " "));
+	if (mail_search_build(mail_search_register_get_imap(),
+			      parser, &charset, &sargs, &error) < 0)
+		i_panic("%s", error);
+	mail_search_parser_deinit(&parser);
+	return sargs;
+}
+
+static bool test_search_args_are_initialized(struct mail_search_arg *arg)
+{
+	for (; arg != NULL; arg = arg->next) {
+		switch (arg->type) {
+		case SEARCH_MODSEQ:
+			if (arg->value.str != NULL &&
+			    arg->initialized.keywords == NULL)
+				return FALSE;
+			break;
+		case SEARCH_KEYWORDS:
+			if (arg->initialized.keywords == NULL)
+				return FALSE;
+			break;
+		case SEARCH_MAILBOX_GLOB:
+			if (arg->initialized.mailbox_glob == NULL)
+				return FALSE;
+			break;
+		case SEARCH_INTHREAD:
+		case SEARCH_SUB:
+		case SEARCH_OR:
+			if (!test_search_args_are_initialized(arg->value.subargs))
+				return FALSE;
+			break;
+		default:
+			break;
+		}
+	}
+	return TRUE;
+}
+
+static void test_mail_search_args_simplify(void)
+{
+	struct mail_search_args *args;
+	struct mail_storage_settings set = { .mail_max_keyword_length = 100 };
+	struct mail_storage storage = { .set = &set };
+	struct mailbox box = { .opened = TRUE, .storage = &storage };
+	string_t *str = t_str_new(256);
+	const char *error;
+	unsigned int i;
+
+	test_begin("mail search args simplify");
+	box.index = mail_index_alloc(NULL, NULL, "dovecot.index.");
+	for (i = 0; i < N_ELEMENTS(tests); i++) {
+		args = test_build_search_args(tests[i].input);
+		/* delay simplification until after init. that way we can test
+		   that the simplification works correctly when working on
+		   already-initialized args. */
+		args->simplified = TRUE;
+		mail_search_args_init(args, &box, FALSE, NULL);
+		mail_search_args_simplify(args);
+
+		str_truncate(str, 0);
+		test_assert(mail_search_args_to_imap(str, args->args, &error));
+		test_assert_idx(strcmp(str_c(str), tests[i].output) == 0, i);
+
+		test_assert_idx(test_search_args_are_initialized(args->args), i);
+		mail_search_args_unref(&args);
+	}
+	mail_index_free(&box.index);
+	test_end();
+}
+
+static void test_mail_search_args_simplify_empty_lists(void)
+{
+	struct mail_search_args *args;
+
+	test_begin("mail search args simplify empty args");
+
+	args = mail_search_build_init();
+	mail_search_args_simplify(args);
+	mail_search_args_unref(&args);
+
+	test_end();
+}
+
+int main(void)
+{
+	static void (*const test_functions[])(void) = {
+		mail_storage_init,
+		test_mail_search_args_simplify,
+		test_mail_search_args_simplify_empty_lists,
+		mail_storage_deinit,
+		NULL
+	};
+
+	return test_run(test_functions);
+}