Mercurial > dovecot > core-2.2
changeset 18563:e1d2702eea84
lib-fts: Fixed test-fts-filter unit test to handle errors a bit better.
author | Timo Sirainen <tss@iki.fi> |
---|---|
date | Sat, 09 May 2015 11:57:40 +0300 |
parents | cfa35069876b |
children | 92ee245b1406 |
files | src/lib-fts/fts-filter.c src/lib-fts/test-fts-filter.c |
diffstat | 2 files changed, 18 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/src/lib-fts/fts-filter.c Sat May 09 11:46:09 2015 +0300 +++ b/src/lib-fts/fts-filter.c Sat May 09 11:57:40 2015 +0300 @@ -109,5 +109,7 @@ if (ret <= 0) *token = NULL; + else + i_assert(*token != NULL); return ret; }
--- a/src/lib-fts/test-fts-filter.c Sat May 09 11:46:09 2015 +0300 +++ b/src/lib-fts/test-fts-filter.c Sat May 09 11:57:40 2015 +0300 @@ -36,10 +36,10 @@ while (*ip != NULL) { token = *ip; ret = fts_filter_filter(filter, &token, &error); - test_assert(ret >= 0); - if (ret == 0) + if (ret <= 0) { + test_assert(ret == 0); test_assert(*op == NULL); - else { + } else { test_assert(*op != NULL); test_assert(strcmp(*ip, token) == 0); } @@ -80,10 +80,10 @@ while (*ip != NULL) { token = *ip; ret = fts_filter_filter(filter, &token, &error); - test_assert(ret >= 0); - if (ret == 0) + if (ret <= 0) { + test_assert(ret == 0); test_assert(*op == NULL); - else { + } else { test_assert(*op != NULL); test_assert(strcmp(*ip, token) == 0); } @@ -101,9 +101,10 @@ while (*ip != NULL) { token = *ip; ret = fts_filter_filter(filter, &token, &error); - if (ret == 0) + if (ret <= 0) { + test_assert(ret == 0); test_assert(*op == NULL); - else { + } else { test_assert(*op != NULL); test_assert(strcmp(*ip, token) == 0); } @@ -144,10 +145,10 @@ while (*ip != NULL) { token = *ip; ret = fts_filter_filter(filter, &token, &error); - test_assert(ret >= 0); - if (ret == 0) + if (ret <= 0) { + test_assert(ret == 0); test_assert(*op == NULL); - else { + } else { test_assert(*op != NULL); test_assert(strcmp(*ip, token) == 0); } @@ -292,6 +293,7 @@ for (tpp=tokens; *tpp != NULL; tpp++) { token = *tpp; ret = fts_filter_filter(stemmer, &token, &error); + test_assert(ret >= 0); if (ret == 0) test_assert(*bpp == NULL); else { @@ -520,9 +522,10 @@ for (tpp = tokens; *tpp != NULL; tpp++) { token = *tpp; ret = fts_filter_filter(stemmer, &token, &error); - if (ret == 0) + if (ret <= 0) { + test_assert(ret == 0); test_assert(*bpp == NULL); - else { + } else { test_assert(*bpp != NULL); test_assert(strcasecmp(*bpp, token) == 0); }