projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bump major so version lib to 4
[yaz-moved-to-github.git]
/
test
/
tst_icu_I18N.c
diff --git
a/test/tst_icu_I18N.c
b/test/tst_icu_I18N.c
index
17c5a69
..
ef3cdc5
100644
(file)
--- a/
test/tst_icu_I18N.c
+++ b/
test/tst_icu_I18N.c
@@
-1,9
+1,6
@@
-/*
- * Copyright (C) 2005-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2009 Index Data
* See the file LICENSE for details.
* See the file LICENSE for details.
- *
- * $Id: tst_icu_I18N.c,v 1.13 2007-11-08 09:03:11 adam Exp $
- *
*/
/* DO NOT EDIT THIS FILE IF YOUR EDITOR DOES NOT SUPPORT UTF-8 */
*/
/* DO NOT EDIT THIS FILE IF YOUR EDITOR DOES NOT SUPPORT UTF-8 */
@@
-315,14
+312,14
@@
int test_icu_normalizer(const char * rules8cstr,
struct icu_buf_utf16 * src16 = icu_buf_utf16_create(0);
struct icu_buf_utf16 * dest16 = icu_buf_utf16_create(0);
struct icu_buf_utf8 * dest8 = icu_buf_utf8_create(0);
struct icu_buf_utf16 * src16 = icu_buf_utf16_create(0);
struct icu_buf_utf16 * dest16 = icu_buf_utf16_create(0);
struct icu_buf_utf8 * dest8 = icu_buf_utf8_create(0);
- struct icu_normalizer * normalizer
- = icu_normalizer_create(rules8cstr, 'f', &status);
+ struct icu_transform * transform
+ = icu_transform_create(rules8cstr, 'f', 0, &status);
icu_check_status(status);
icu_utf16_from_utf8_cstr(src16, src8cstr, &status);
icu_check_status(status);
icu_check_status(status);
icu_utf16_from_utf8_cstr(src16, src8cstr, &status);
icu_check_status(status);
- icu_normalizer_normalize(normalizer, dest16, src16, &status);
+ icu_transform_trans(transform, dest16, src16, &status);
icu_check_status(status);
icu_utf16_to_utf8(dest8, dest16, &status);
icu_check_status(status);
icu_utf16_to_utf8(dest8, dest16, &status);
@@
-342,7
+339,7
@@
int test_icu_normalizer(const char * rules8cstr,
}
}
- icu_normalizer_destroy(normalizer);
+ icu_transform_destroy(transform);
icu_buf_utf16_destroy(src16);
icu_buf_utf16_destroy(dest16);
icu_buf_utf8_destroy(dest8);
icu_buf_utf16_destroy(src16);
icu_buf_utf16_destroy(dest16);
icu_buf_utf8_destroy(dest8);
@@
-480,10
+477,10
@@
void test_icu_I18N_chain(int argc, char **argv)
struct icu_chain * chain = 0;
struct icu_chain * chain = 0;
- const char * xml_str = "<icu>"
- "<normalize rule=\"[:Control:] Any-Remove\"/>"
+ const char * xml_str = "<icu locale=\"en\">"
+ "<transform rule=\"[:Control:] Any-Remove\"/>"
"<tokenize rule=\"l\"/>"
"<tokenize rule=\"l\"/>"
- "<normalize rule=\"[[:WhiteSpace:][:Punctuation:]] Remove\"/>"
+ "<transform rule=\"[[:WhiteSpace:][:Punctuation:]] Remove\"/>"
"<display/>"
"<casemap rule=\"l\"/>"
"</icu>";
"<display/>"
"<casemap rule=\"l\"/>"
"</icu>";
@@
-493,8
+490,7
@@
void test_icu_I18N_chain(int argc, char **argv)
xmlNode *xml_node = xmlDocGetRootElement(doc);
YAZ_CHECK(xml_node);
xmlNode *xml_node = xmlDocGetRootElement(doc);
YAZ_CHECK(xml_node);
-
- chain = icu_chain_xml_config(xml_node, (uint8_t *) "en", 0, &status);
+ chain = icu_chain_xml_config(xml_node, 0, &status);
xmlFreeDoc(doc);
YAZ_CHECK(chain);
xmlFreeDoc(doc);
YAZ_CHECK(chain);
@@
-534,14
+530,14
@@
void test_bug_1140(void)
UErrorCode status = U_ZERO_ERROR;
struct icu_chain * chain = 0;
UErrorCode status = U_ZERO_ERROR;
struct icu_chain * chain = 0;
- const char * xml_str = "<icu>"
+ const char * xml_str = "<icu locale=\"en\">"
/* if the first rule is normalize instead. Then it works */
#if 0
/* if the first rule is normalize instead. Then it works */
#if 0
- "<normalize rule=\"[:Control:] Any-Remove\"/>"
+ "<transform rule=\"[:Control:] Any-Remove\"/>"
#endif
"<tokenize rule=\"l\"/>"
#endif
"<tokenize rule=\"l\"/>"
- "<normalize rule=\"[[:WhiteSpace:][:Punctuation:]] Remove\"/>"
+ "<transform rule=\"[[:WhiteSpace:][:Punctuation:]] Remove\"/>"
"<display/>"
"<casemap rule=\"l\"/>"
"</icu>";
"<display/>"
"<casemap rule=\"l\"/>"
"</icu>";
@@
-551,7
+547,7
@@
void test_bug_1140(void)
xmlNode *xml_node = xmlDocGetRootElement(doc);
YAZ_CHECK(xml_node);
xmlNode *xml_node = xmlDocGetRootElement(doc);
YAZ_CHECK(xml_node);
- chain = icu_chain_xml_config(xml_node, (uint8_t *) "en", 0, &status);
+ chain = icu_chain_xml_config(xml_node, 0, &status);
xmlFreeDoc(doc);
YAZ_CHECK(chain);
xmlFreeDoc(doc);
YAZ_CHECK(chain);
@@
-595,16
+591,16
@@
void test_chain_empty_token(void)
UErrorCode status = U_ZERO_ERROR;
struct icu_chain * chain = 0;
UErrorCode status = U_ZERO_ERROR;
struct icu_chain * chain = 0;
- const char * xml_str = "<icu>"
+ const char * xml_str = "<icu locale=\"en\">"
"<tokenize rule=\"w\"/>"
"<tokenize rule=\"w\"/>"
- "<normalize rule=\"[[:WhiteSpace:][:Punctuation:]] Remove\"/>"
+ "<transform rule=\"[[:WhiteSpace:][:Punctuation:]] Remove\"/>"
"</icu>";
xmlDoc *doc = xmlParseMemory(xml_str, strlen(xml_str));
xmlNode *xml_node = xmlDocGetRootElement(doc);
YAZ_CHECK(xml_node);
"</icu>";
xmlDoc *doc = xmlParseMemory(xml_str, strlen(xml_str));
xmlNode *xml_node = xmlDocGetRootElement(doc);
YAZ_CHECK(xml_node);
- chain = icu_chain_xml_config(xml_node, (uint8_t *) "en", 0, &status);
+ chain = icu_chain_xml_config(xml_node, 0, &status);
xmlFreeDoc(doc);
YAZ_CHECK(chain);
xmlFreeDoc(doc);
YAZ_CHECK(chain);
@@
-631,7
+627,7
@@
void test_chain_empty_chain(void)
UErrorCode status = U_ZERO_ERROR;
struct icu_chain * chain = 0;
UErrorCode status = U_ZERO_ERROR;
struct icu_chain * chain = 0;
- const char * xml_str = "<icu>"
+ const char * xml_str = "<icu locale=\"en\">"
"</icu>";
const char * src8 = "some 5487 weired !¤%&(/& sTuFf";
"</icu>";
const char * src8 = "some 5487 weired !¤%&(/& sTuFf";
@@
-641,7
+637,7
@@
void test_chain_empty_chain(void)
xmlNode *xml_node = xmlDocGetRootElement(doc);
YAZ_CHECK(xml_node);
xmlNode *xml_node = xmlDocGetRootElement(doc);
YAZ_CHECK(xml_node);
- chain = icu_chain_xml_config(xml_node, (uint8_t *) "en", 0, &status);
+ chain = icu_chain_xml_config(xml_node, 0, &status);
xmlFreeDoc(doc);
YAZ_CHECK(chain);
xmlFreeDoc(doc);
YAZ_CHECK(chain);
@@
-707,7
+703,9
@@
int main(int argc, char **argv)
/*
* Local variables:
* c-basic-offset: 4
/*
* Local variables:
* c-basic-offset: 4
+ * c-file-style: "Stroustrup"
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab
*/
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab
*/
+