X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Ftst_icu_I18N.c;h=ef3cdc53ad047685bc19d8717e12c7c49ef2f794;hb=30be9a32fd26a2d08aa4413942408500c93ad4a3;hp=c58ac85b15dfa4376e3973ff6ce58f418c4fe80a;hpb=e089d89f38b4fc61fce16eb03150776844b053f8;p=yaz-moved-to-github.git

diff --git a/test/tst_icu_I18N.c b/test/tst_icu_I18N.c
index c58ac85..ef3cdc5 100644
--- 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.
- *
- * $Id: tst_icu_I18N.c,v 1.14 2007-11-08 13:35:14 adam Exp $
- *
  */
 
 /* 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_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_normalizer_normalize(normalizer, dest16, src16, &status);
+    icu_transform_trans(transform, dest16, src16, &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);
@@ -481,9 +478,9 @@ void test_icu_I18N_chain(int argc, char **argv)
     
 
     const char * xml_str = "<icu locale=\"en\">"
-        "<normalize rule=\"[:Control:] Any-Remove\"/>"
+        "<transform rule=\"[:Control:] Any-Remove\"/>"
         "<tokenize rule=\"l\"/>"
-        "<normalize rule=\"[[:WhiteSpace:][:Punctuation:]] Remove\"/>"
+        "<transform rule=\"[[:WhiteSpace:][:Punctuation:]] Remove\"/>"
         "<display/>"
         "<casemap rule=\"l\"/>"
         "</icu>";
@@ -537,10 +534,10 @@ void test_bug_1140(void)
 
         /* 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\"/>"
-        "<normalize rule=\"[[:WhiteSpace:][:Punctuation:]] Remove\"/>"
+        "<transform rule=\"[[:WhiteSpace:][:Punctuation:]] Remove\"/>"
         "<display/>"
         "<casemap rule=\"l\"/>"
         "</icu>";
@@ -596,7 +593,7 @@ void test_chain_empty_token(void)
 
     const char * xml_str = "<icu locale=\"en\">"
         "<tokenize rule=\"w\"/>"
-        "<normalize rule=\"[[:WhiteSpace:][:Punctuation:]] Remove\"/>"
+        "<transform rule=\"[[:WhiteSpace:][:Punctuation:]] Remove\"/>"
         "</icu>";
     
     xmlDoc *doc = xmlParseMemory(xml_str, strlen(xml_str));
@@ -706,7 +703,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
  */
+