X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Ftest_normalize.c;h=8cd2b2a1a3c935cc0be9282933f1c3f952e033cd;hb=cca105c35464171daf2945161bf4f6a0a52a4d52;hp=2867706f337e4ee360c2677192c5165c41dbc962;hpb=2819110732a5e3cdc6de71333977ff39d7cf8bf3;p=pazpar2-moved-to-github.git diff --git a/src/test_normalize.c b/src/test_normalize.c index 2867706..8cd2b2a 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-2010 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 @@ -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); @@ -62,10 +62,8 @@ int main(int argc, char **argv) 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(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_TERM; } @@ -76,7 +74,9 @@ int main(int argc, char **argv) /* * Local variables: * c-basic-offset: 4 + * c-file-style: "Stroustrup" * indent-tabs-mode: nil * End: * vim: shiftwidth=4 tabstop=8 expandtab */ +