From aeb7f8cd9ad896eead3d3d7226d3df700dbf244f Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 7 Mar 2009 16:57:55 +0100 Subject: [PATCH] More tests for module uninorm/u8-normcmp. --- ChangeLog | 12 +++++ modules/uninorm/u8-normcmp-tests | 2 +- tests/uninorm/test-u8-normcmp.c | 109 +++++++++++++++++++++++---------------- tests/uninorm/test-u8-normcmp.h | 69 +++++++++++++++++++++++++ 4 files changed, 146 insertions(+), 46 deletions(-) create mode 100644 tests/uninorm/test-u8-normcmp.h diff --git a/ChangeLog b/ChangeLog index c6a7e87cd..846e3eaf7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,17 @@ 2009-03-07 Bruno Haible + * tests/uninorm/test-u8-normcmp.h: New file, extracted from + tests/uninorm/test-u8-normcmp.c. + * tests/uninorm/test-u8-normcmp.c: Include it. + (test_nonascii): New function, extracted from main. Add some more + tests. + (main): Invoke test_ascii and test_nonascii. + * modules/uninorm/u8-normcmp-tests (Files): Add + tests/uninorm/test-u8-normcmp.h. + (Depends-on): Remove uninorm/u8-normcmp. + +2009-03-07 Bruno Haible + New module 'uninorm/u32-normcoll'. * lib/uninorm/u32-normcoll.c: New file. * modules/uninorm/u32-normcoll: New file. diff --git a/modules/uninorm/u8-normcmp-tests b/modules/uninorm/u8-normcmp-tests index 0b9d509a8..eb83bcb2f 100644 --- a/modules/uninorm/u8-normcmp-tests +++ b/modules/uninorm/u8-normcmp-tests @@ -1,8 +1,8 @@ Files: tests/uninorm/test-u8-normcmp.c +tests/uninorm/test-u8-normcmp.h Depends-on: -uninorm/u8-normcmp uninorm/nfd configure.ac: diff --git a/tests/uninorm/test-u8-normcmp.c b/tests/uninorm/test-u8-normcmp.c index 683975041..ec4794727 100644 --- a/tests/uninorm/test-u8-normcmp.c +++ b/tests/uninorm/test-u8-normcmp.c @@ -1,4 +1,4 @@ -/* Test of normalization insensitive comparison of UTF-32 strings. +/* Test of normalization insensitive comparison of UTF-8 strings. Copyright (C) 2009 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify @@ -36,43 +36,11 @@ } \ while (0) -int -main () -{ - /* Empty string. */ - { - int cmp; - - ASSERT (u8_normcmp (NULL, 0, NULL, 0, UNINORM_NFD, &cmp) == 0); - ASSERT (cmp == 0); - } - { - static const uint8_t input[] = { 'x', 'y' }; - int cmp; - - ASSERT (u8_normcmp (input, SIZEOF (input), NULL, 0, UNINORM_NFD, &cmp) == 0); - ASSERT (cmp == 1); - - ASSERT (u8_normcmp (NULL, 0, input, SIZEOF (input), UNINORM_NFD, &cmp) == 0); - ASSERT (cmp == -1); - - ASSERT (u8_normcmp (input, SIZEOF (input), input, SIZEOF (input), UNINORM_NFD, &cmp) == 0); - ASSERT (cmp == 0); - } - - /* Shorter and longer strings. */ - { - static const uint8_t input1[] = { 'R', 'e', 'a', 'g', 'a', 'n' }; - static const uint8_t input2[] = { 'R', 'e', 'a', 'g', 'a', 'n', 'o', 'm', 'i', 'c', 's' }; - int cmp; - - ASSERT (u8_normcmp (input1, SIZEOF (input1), input2, SIZEOF (input2), UNINORM_NFD, &cmp) == 0); - ASSERT (cmp == -1); - - ASSERT (u8_normcmp (input2, SIZEOF (input2), input1, SIZEOF (input1), UNINORM_NFD, &cmp) == 0); - ASSERT (cmp == 1); - } +#include "test-u8-normcmp.h" +static void +test_nonascii (int (*my_normcmp) (const uint8_t *, size_t, const uint8_t *, size_t, uninorm_t, int *)) +{ /* Normalization effects. */ { static const uint8_t input1[] = { 'H', 0xC3, 0xB6, 'h', 'l', 'e' }; @@ -82,30 +50,81 @@ main () static const uint8_t input5[] = { 'H', 'u', 'r', 'z' }; int cmp; - ASSERT (u8_normcmp (input1, SIZEOF (input1), input2, SIZEOF (input2), UNINORM_NFD, &cmp) == 0); + ASSERT (my_normcmp (input1, SIZEOF (input1), input2, SIZEOF (input2), UNINORM_NFD, &cmp) == 0); ASSERT (cmp == 0); - ASSERT (u8_normcmp (input2, SIZEOF (input2), input1, SIZEOF (input1), UNINORM_NFD, &cmp) == 0); + ASSERT (my_normcmp (input2, SIZEOF (input2), input1, SIZEOF (input1), UNINORM_NFD, &cmp) == 0); ASSERT (cmp == 0); - ASSERT (u8_normcmp (input3, SIZEOF (input3), input4, SIZEOF (input4), UNINORM_NFD, &cmp) == 0); + ASSERT (my_normcmp (input3, SIZEOF (input3), input4, SIZEOF (input4), UNINORM_NFD, &cmp) == 0); ASSERT (cmp == 0); - ASSERT (u8_normcmp (input4, SIZEOF (input4), input3, SIZEOF (input3), UNINORM_NFD, &cmp) == 0); + ASSERT (my_normcmp (input4, SIZEOF (input4), input3, SIZEOF (input3), UNINORM_NFD, &cmp) == 0); ASSERT (cmp == 0); - ASSERT (u8_normcmp (input2, SIZEOF (input2), input3, SIZEOF (input3), UNINORM_NFD, &cmp) == 0); + ASSERT (my_normcmp (input2, SIZEOF (input2), input3, SIZEOF (input3), UNINORM_NFD, &cmp) == 0); ASSERT (cmp == -1); - ASSERT (u8_normcmp (input1, SIZEOF (input1), input4, SIZEOF (input4), UNINORM_NFD, &cmp) == 0); + ASSERT (my_normcmp (input1, SIZEOF (input1), input4, SIZEOF (input4), UNINORM_NFD, &cmp) == 0); ASSERT (cmp == -1); - ASSERT (u8_normcmp (input1, SIZEOF (input1), input5, SIZEOF (input5), UNINORM_NFD, &cmp) == 0); + ASSERT (my_normcmp (input1, SIZEOF (input1), input5, SIZEOF (input5), UNINORM_NFD, &cmp) == 0); ASSERT (cmp == -1); - ASSERT (u8_normcmp (input2, SIZEOF (input2), input5, SIZEOF (input5), UNINORM_NFD, &cmp) == 0); + ASSERT (my_normcmp (input2, SIZEOF (input2), input5, SIZEOF (input5), UNINORM_NFD, &cmp) == 0); ASSERT (cmp == -1); } + { /* LATIN CAPITAL LETTER A WITH DIAERESIS */ + static const uint8_t input1[] = { 0xC3, 0x84 }; + static const uint8_t input2[] = { 0x41, 0xCC, 0x88 }; + int cmp; + + ASSERT (my_normcmp (input1, SIZEOF (input1), input2, SIZEOF (input2), UNINORM_NFD, &cmp) == 0); + ASSERT (cmp == 0); + } + { /* LATIN CAPITAL LETTER A WITH DIAERESIS AND MACRON */ + static const uint8_t input1[] = { 0xC7, 0x9E }; + static const uint8_t input2[] = { 0x41, 0xCC, 0x88, 0xCC, 0x84 }; + int cmp; + + ASSERT (my_normcmp (input1, SIZEOF (input1), input2, SIZEOF (input2), UNINORM_NFD, &cmp) == 0); + ASSERT (cmp == 0); + } + { /* GREEK DIALYTIKA AND PERISPOMENI */ + static const uint8_t input1[] = { 0xE1, 0xBF, 0x81 }; + static const uint8_t input2[] = { 0xC2, 0xA8, 0xCD, 0x82 }; + int cmp; + + ASSERT (my_normcmp (input1, SIZEOF (input1), input2, SIZEOF (input2), UNINORM_NFD, &cmp) == 0); + ASSERT (cmp == 0); + } + { /* HANGUL SYLLABLE GEUL */ + static const uint8_t input1[] = { 0xEA, 0xB8, 0x80 }; + static const uint8_t input2[] = { 0xEA, 0xB7, 0xB8, 0xE1, 0x86, 0xAF }; + static const uint8_t input3[] = { 0xE1, 0x84, 0x80, 0xE1, 0x85, 0xB3, 0xE1, 0x86, 0xAF }; + int cmp; + + ASSERT (my_normcmp (input1, SIZEOF (input1), input2, SIZEOF (input2), UNINORM_NFD, &cmp) == 0); + ASSERT (cmp == 0); + + ASSERT (my_normcmp (input1, SIZEOF (input1), input3, SIZEOF (input3), UNINORM_NFD, &cmp) == 0); + ASSERT (cmp == 0); + } + { /* HANGUL SYLLABLE GEU */ + static const uint8_t input1[] = { 0xEA, 0xB7, 0xB8 }; + static const uint8_t input2[] = { 0xE1, 0x84, 0x80, 0xE1, 0x85, 0xB3 }; + int cmp; + + ASSERT (my_normcmp (input1, SIZEOF (input1), input2, SIZEOF (input2), UNINORM_NFD, &cmp) == 0); + ASSERT (cmp == 0); + } +} + +int +main () +{ + test_ascii (u8_normcmp, UNINORM_NFD); + test_nonascii (u8_normcmp); return 0; } diff --git a/tests/uninorm/test-u8-normcmp.h b/tests/uninorm/test-u8-normcmp.h new file mode 100644 index 000000000..78c887d2b --- /dev/null +++ b/tests/uninorm/test-u8-normcmp.h @@ -0,0 +1,69 @@ +/* Test of normalization insensitive comparison of UTF-8 strings. + Copyright (C) 2009 Free Software Foundation, Inc. + + This program 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 Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +/* Written by Bruno Haible , 2009. */ + +static void +test_ascii (int (*my_normcmp) (const uint8_t *, size_t, const uint8_t *, size_t, uninorm_t, int *), + uninorm_t nf) +{ + /* Empty string. */ + { + int cmp; + + ASSERT (my_normcmp (NULL, 0, NULL, 0, nf, &cmp) == 0); + ASSERT (cmp == 0); + } + { + static const uint8_t input[] = { 'x', 'y' }; + int cmp; + + ASSERT (my_normcmp (input, SIZEOF (input), NULL, 0, nf, &cmp) == 0); + ASSERT (cmp == 1); + + ASSERT (my_normcmp (NULL, 0, input, SIZEOF (input), nf, &cmp) == 0); + ASSERT (cmp == -1); + + ASSERT (my_normcmp (input, SIZEOF (input), input, SIZEOF (input), nf, &cmp) == 0); + ASSERT (cmp == 0); + } + + /* Normal lexicographic order. */ + { + static const uint8_t input1[] = { 'A', 'm', 'e', 'r', 'i', 'c', 'a' }; + static const uint8_t input2[] = { 'A', 'm', 'i', 'g', 'o' }; + int cmp; + + ASSERT (my_normcmp (input1, SIZEOF (input1), input2, SIZEOF (input2), nf, &cmp) == 0); + ASSERT (cmp == -1); + + ASSERT (my_normcmp (input2, SIZEOF (input2), input1, SIZEOF (input1), nf, &cmp) == 0); + ASSERT (cmp == 1); + } + + /* Shorter and longer strings. */ + { + static const uint8_t input1[] = { 'R', 'e', 'a', 'g', 'a', 'n' }; + static const uint8_t input2[] = { 'R', 'e', 'a', 'g', 'a', 'n', 'o', 'm', 'i', 'c', 's' }; + int cmp; + + ASSERT (my_normcmp (input1, SIZEOF (input1), input2, SIZEOF (input2), nf, &cmp) == 0); + ASSERT (cmp == -1); + + ASSERT (my_normcmp (input2, SIZEOF (input2), input1, SIZEOF (input1), nf, &cmp) == 0); + ASSERT (cmp == 1); + } +} -- 2.11.0