dovecot-2.2: lib-fts: test-fts-tokenizer cleanup - moved tokeniz...
dovecot at dovecot.org
dovecot at dovecot.org
Sat May 9 11:55:41 UTC 2015
details: http://hg.dovecot.org/dovecot-2.2/rev/cd376c0ac132
changeset: 18588:cd376c0ac132
user: Timo Sirainen <tss at iki.fi>
date: Sat May 09 14:53:46 2015 +0300
description:
lib-fts: test-fts-tokenizer cleanup - moved tokenizers_init/deinit() to be done globally
diffstat:
src/lib-fts/test-fts-tokenizer.c | 14 +++++---------
1 files changed, 5 insertions(+), 9 deletions(-)
diffs (79 lines):
diff -r 055666aaba5a -r cd376c0ac132 src/lib-fts/test-fts-tokenizer.c
--- a/src/lib-fts/test-fts-tokenizer.c Sat May 09 14:50:10 2015 +0300
+++ b/src/lib-fts/test-fts-tokenizer.c Sat May 09 14:53:46 2015 +0300
@@ -28,7 +28,6 @@
const char *token, *error;
test_begin("fts tokenizer generic simple");
- fts_tokenizers_init();
tok_class = fts_tokenizer_find(FTS_TOKENIZER_GENERIC_NAME);
test_assert(fts_tokenizer_create(tok_class, NULL, NULL, &tok, &error) == 0);
/*TODO: Uncomment when fts-tokenizer-generic-private.h inclusion is fixed */
@@ -43,7 +42,6 @@
}
test_assert(*eopp == NULL);
fts_tokenizer_unref(&tok);
- fts_tokenizers_deinit();
test_end();
}
@@ -400,7 +398,6 @@
int ret;
test_begin("fts tokenizer email address + parent, input one character at a time");
- fts_tokenizers_init();
test_assert(fts_tokenizer_create(fts_tokenizer_generic, NULL, NULL, &gen_tok, &error) == 0);
test_assert(fts_tokenizer_create(fts_tokenizer_email_address, gen_tok, NULL, &tok, &error) == 0);
@@ -420,7 +417,6 @@
test_assert(*eopp == NULL);
fts_tokenizer_unref(&tok);
fts_tokenizer_unref(&gen_tok);
- fts_tokenizers_deinit();
test_end();
}
@@ -446,7 +442,6 @@
int ret;
test_begin("fts tokenizer email address + parent, input one line at a time");
- fts_tokenizers_init();
test_assert(fts_tokenizer_create(fts_tokenizer_generic, NULL, NULL, &gen_tok, &error) == 0);
test_assert(fts_tokenizer_create(fts_tokenizer_email_address, gen_tok, NULL, &tok, &error) == 0);
@@ -466,7 +461,6 @@
test_assert(*eopp == NULL);
fts_tokenizer_unref(&tok);
fts_tokenizer_unref(&gen_tok);
- fts_tokenizers_deinit();
test_end();
}
@@ -536,7 +530,6 @@
int ret;
test_begin("fts tokenizer search email address + parent, input one character at a time");
- fts_tokenizers_init();
test_assert(fts_tokenizer_create(fts_tokenizer_generic, NULL, NULL, &gen_tok, &error) == 0);
test_assert(fts_tokenizer_create(fts_tokenizer_email_address, gen_tok, settings, &tok, &error) == 0);
@@ -582,7 +575,6 @@
fts_tokenizer_unref(&tok);
fts_tokenizer_unref(&gen_tok);
- fts_tokenizers_deinit();
test_end();
}
@@ -605,6 +597,10 @@
test_fts_tokenizer_address_search,
NULL
};
+ int ret;
- return test_run(test_functions);
+ fts_tokenizers_init();
+ ret = test_run(test_functions);
+ fts_tokenizers_deinit();
+ return ret;
}
More information about the dovecot-cvs
mailing list