Mercurial > dovecot > core-2.2
changeset 18588:cd376c0ac132
lib-fts: test-fts-tokenizer cleanup - moved tokenizers_init/deinit() to be done globally
author | Timo Sirainen <tss@iki.fi> |
---|---|
date | Sat, 09 May 2015 14:53:46 +0300 |
parents | 055666aaba5a |
children | 5937f4d505c5 |
files | src/lib-fts/test-fts-tokenizer.c |
diffstat | 1 files changed, 5 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- 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; }