dovecot-2.2: lib-fts: Fixed test-fts-filter unit test to handle ...
dovecot at dovecot.org
dovecot at dovecot.org
Sat May 9 09:30:41 UTC 2015
details: http://hg.dovecot.org/dovecot-2.2/rev/e1d2702eea84
changeset: 18563:e1d2702eea84
user: Timo Sirainen <tss at iki.fi>
date: Sat May 09 11:57:40 2015 +0300
description:
lib-fts: Fixed test-fts-filter unit test to handle errors a bit better.
diffstat:
src/lib-fts/fts-filter.c | 2 ++
src/lib-fts/test-fts-filter.c | 29 ++++++++++++++++-------------
2 files changed, 18 insertions(+), 13 deletions(-)
diffs (90 lines):
diff -r cfa35069876b -r e1d2702eea84 src/lib-fts/fts-filter.c
--- 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;
}
diff -r cfa35069876b -r e1d2702eea84 src/lib-fts/test-fts-filter.c
--- 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);
}
More information about the dovecot-cvs
mailing list