dovecot-2.2: lib-fts: Fixed test-fts-filter to work again after ...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/782594d44002
changeset: 18441:782594d44002
user:      Timo Sirainen <tss at iki.fi>
date:      Tue Apr 21 19:40:42 2015 +0300
description:
lib-fts: Fixed test-fts-filter to work again after previous normalizer changes.

diffstat:

 src/lib-fts/test-fts-filter.c |  14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diffs (66 lines):

diff -r 41abc9c7eca2 -r 782594d44002 src/lib-fts/test-fts-filter.c
--- a/src/lib-fts/test-fts-filter.c	Tue Apr 21 19:36:27 2015 +0300
+++ b/src/lib-fts/test-fts-filter.c	Tue Apr 21 19:40:42 2015 +0300
@@ -296,7 +296,7 @@
 }
 #endif
 
-#ifdef HAVE_FTS_NORMALIZER
+#ifdef HAVE_LIBICU
 static void test_fts_filter_normalizer_swedish_short(void)
 {
 	const struct fts_filter *filter_class;
@@ -328,7 +328,7 @@
 	test_begin("fts filter normalizer Swedish short text");
 
 	T_BEGIN {
-		filter_class = fts_filter_find(NORMALIZER_FILTER_NAME);
+		filter_class = fts_filter_find(ICU_NORMALIZER_FILTER_NAME);
 		ret = fts_filter_create(filter_class, NULL, NULL, settings, &norm, &error);
 		test_assert(ret == 0);
 		for (i = 0; i < N_ELEMENTS(input); i++) {
@@ -372,7 +372,7 @@
 	test_begin("fts filter normalizer Swedish short text using default ID");
 
 	T_BEGIN {
-		filter_class = fts_filter_find(NORMALIZER_FILTER_NAME);
+		filter_class = fts_filter_find(ICU_NORMALIZER_FILTER_NAME);
 		ret = fts_filter_create(filter_class, NULL, NULL, NULL, &norm, &error);
 		test_assert(ret == 0);
 		for (i = 0; i < N_ELEMENTS(input); i++) {
@@ -417,7 +417,7 @@
 
 	T_BEGIN {
 		udhr_path = t_strconcat(UDHRDIR, UDHR_FRA_NAME, NULL);
-		filter_class = fts_filter_find(NORMALIZER_FILTER_NAME);
+		filter_class = fts_filter_find(ICU_NORMALIZER_FILTER_NAME);
 		ret = fts_filter_create(filter_class, NULL, NULL, settings, &norm, &error);
 		test_assert(ret == 0);
 		input = fopen(udhr_path, "r");
@@ -451,7 +451,7 @@
 	int ret;
 
 	test_begin("fts filter normalizer invalid id");
-	filter_class = fts_filter_find(NORMALIZER_FILTER_NAME);
+	filter_class = fts_filter_find(ICU_NORMALIZER_FILTER_NAME);
 	ret = fts_filter_create(filter_class, NULL, NULL, settings, &norm, &error);
 	test_assert(ret < 0 && error != NULL);
 	test_assert(norm == NULL);
@@ -489,7 +489,7 @@
 
 	test_begin("fts filters normalizer, stopwords and stemming chained, English");
 
-	filter_class = fts_filter_find(NORMALIZER_FILTER_NAME);
+	filter_class = fts_filter_find(ICU_NORMALIZER_FILTER_NAME);
 	ret = fts_filter_create(filter_class, NULL, NULL, id_settings, &normalizer, &error);
 	test_assert(ret == 0);
 
@@ -537,7 +537,7 @@
 		test_fts_filter_stemmer_snowball_stem_french,
 		test_fts_filter_stopwords_stemmer_eng,
 #endif
-#ifdef HAVE_FTS_NORMALIZER
+#ifdef HAVE_LIBICU
 		test_fts_filter_normalizer_swedish_short,
 		test_fts_filter_normalizer_swedish_short_default_id,
 		test_fts_filter_normalizer_french,