X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Ftest_normalize.c;h=892131959573fb8a67c8b580df1d8b526215adca;hb=9db0457fa07df43928fc8fbade13593eb6c9b534;hp=e0dd7df171c9f90c4f3c6f44a78545eb8091fedd;hpb=9267d02c3601122f74bdf3a9d21f30080a4a1a9a;p=pazpar2-moved-to-github.git diff --git a/src/test_normalize.c b/src/test_normalize.c index e0dd7df..8921319 100644 --- a/src/test_normalize.c +++ b/src/test_normalize.c @@ -1,5 +1,5 @@ /* This file is part of Pazpar2. - Copyright (C) 2006-2009 Index Data + Copyright (C) 2006-2013 Index Data Pazpar2 is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free @@ -27,7 +27,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include "normalize7bit.h" -int test_normalize7bit_generic(const char *rm_chars, const char *input, +int test_normalize7bit_generic(const char *rm_chars, const char *input, const char *expect_output) { int ret = 0; @@ -39,13 +39,13 @@ int test_normalize7bit_generic(const char *rm_chars, const char *input, return ret; } -int test_normalize7bit_mergekey(int skiparticle, const char *input, +int test_normalize7bit_mergekey(const char *input, const char *expect_output) { int ret = 0; char *tmp = xstrdup(input); - char *output = normalize7bit_mergekey(tmp, skiparticle); + char *output = normalize7bit_mergekey(tmp); if (!strcmp(expect_output, output)) ret = 1; xfree(tmp); @@ -54,19 +54,17 @@ int test_normalize7bit_mergekey(int skiparticle, const char *input, int main(int argc, char **argv) { - YAZ_CHECK_INIT(argc, argv); + YAZ_CHECK_INIT(argc, argv); YAZ_CHECK_LOG(); YAZ_CHECK(test_normalize7bit_generic("/; ", " how are you; ", "how are you")); YAZ_CHECK(!test_normalize7bit_generic("/; ", " how are you; ", "how are youx")); - + YAZ_CHECK(test_normalize7bit_generic("/; "," ", "")); - YAZ_CHECK(test_normalize7bit_mergekey(0, "the art of computer", "the art of computer")); - YAZ_CHECK(test_normalize7bit_mergekey(1, "the art of computer", "art of computer")); + YAZ_CHECK(test_normalize7bit_mergekey("the art of computer", "the art of computer")); + YAZ_CHECK(test_normalize7bit_mergekey("The Art Of Computer", "the art of computer")); - YAZ_CHECK(test_normalize7bit_mergekey(1, "The Art Of Computer", "art of computer")); - YAZ_CHECK_TERM; }