INTEGRATION: CWS os40 (1.3.44); FILE MERGED

2004/10/13 14:16:45 sb 1.3.44.1: #i34641# Added RTL_TEXTENCODING_PT154 (patch supplied by ibr).

1 files changed, 59 insertions, 4 deletions

diff --git a/sal/qa/rtl/textenc/rtl_textcvt.cxx b/sal/qa/rtl/textenc/rtl_textcvt.cxx
index 05e8a6d6f53c..6831212f4033 100644
--- a/sal/qa/rtl/textenc/rtl_textcvt.cxx
+++ b/sal/qa/rtl/textenc/rtl_textcvt.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: rtl_textcvt.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: rt $ $Date: 2004-06-17 11:38:50 $
+ *  last change: $Author: pjunck $ $Date: 2004-10-22 14:13:27 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -1368,7 +1368,40 @@ void enc::test_textenc()
                 0x25CA,0x2329,0xF8E8,0xF8E9,0xF8EA,0x2211,0x239B,0x239C,
                 0x239D,0x23A1,0x23A2,0x23A3,0x23A7,0x23A8,0x23A9,0x23AA,
                 0xFFFF,0x232A,0x222B,0x2320,0x23AE,0x2321,0x239E,0x239F,
-                0x23A0,0x23A4,0x23A5,0x23A6,0x23AB,0x23AC,0x23AD,0xFFFF } } };
+                0x23A0,0x23A4,0x23A5,0x23A6,0x23AB,0x23AC,0x23AD,0xFFFF } },
+            { RTL_TEXTENCODING_PT154,
+              { 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
+                0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F,
+                0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017,
+                0x0018,0x0019,0x001A,0x001B,0x001C,0x001D,0x001E,0x001F,
+                0x0020,0x0021,0x0022,0x0023,0x0024,0x0025,0x0026,0x0027,
+                0x0028,0x0029,0x002A,0x002B,0x002C,0x002D,0x002E,0x002F,
+                0x0030,0x0031,0x0032,0x0033,0x0034,0x0035,0x0036,0x0037,
+                0x0038,0x0039,0x003A,0x003B,0x003C,0x003D,0x003E,0x003F,
+                0x0040,0x0041,0x0042,0x0043,0x0044,0x0045,0x0046,0x0047,
+                0x0048,0x0049,0x004A,0x004B,0x004C,0x004D,0x004E,0x004F,
+                0x0050,0x0051,0x0052,0x0053,0x0054,0x0055,0x0056,0x0057,
+                0x0058,0x0059,0x005A,0x005B,0x005C,0x005D,0x005E,0x005F,
+                0x0060,0x0061,0x0062,0x0063,0x0064,0x0065,0x0066,0x0067,
+                0x0068,0x0069,0x006A,0x006B,0x006C,0x006D,0x006E,0x006F,
+                0x0070,0x0071,0x0072,0x0073,0x0074,0x0075,0x0076,0x0077,
+                0x0078,0x0079,0x007A,0x007B,0x007C,0x007D,0x007E,0x007F,
+                0x0496,0x0492,0x04EE,0x0493,0x201E,0x2026,0x04B6,0x04AE,
+                0x04B2,0x04AF,0x04A0,0x04E2,0x04A2,0x049A,0x04BA,0x04B8,
+                0x0497,0x2018,0x2019,0x201C,0x201D,0x2022,0x2013,0x2014,
+                0x04B3,0x04B7,0x04A1,0x04E3,0x04A3,0x049B,0x04BB,0x04B9,
+                0x00A0,0x040E,0x045E,0x0408,0x04E8,0x0498,0x04B0,0x00A7,
+                0x0401,0x00A9,0x04D8,0x00AB,0x00AC,0x04EF,0x00AE,0x049C,
+                0x00B0,0x04B1,0x0406,0x0456,0x0499,0x04E9,0x00B6,0x00B7,
+                0x0451,0x2116,0x04D9,0x00BB,0x0458,0x04AA,0x04AB,0x049D,
+                0x0410,0x0411,0x0412,0x0413,0x0414,0x0415,0x0416,0x0417,
+                0x0418,0x0419,0x041A,0x041B,0x041C,0x041D,0x041E,0x041F,
+                0x0420,0x0421,0x0422,0x0423,0x0424,0x0425,0x0426,0x0427,
+                0x0428,0x0429,0x042A,0x042B,0x042C,0x042D,0x042E,0x042F,
+                0x0430,0x0431,0x0432,0x0433,0x0434,0x0435,0x0436,0x0437,
+                0x0438,0x0439,0x043A,0x043B,0x043C,0x043D,0x043E,0x043F,
+                0x0440,0x0441,0x0442,0x0443,0x0444,0x0445,0x0446,0x0447,
+                0x0448,0x0449,0x044A,0x044B,0x044C,0x044D,0x044E,0x044F } } };
     {
         int nCount = sizeof aSingleByteCharSet / sizeof aSingleByteCharSet[0];
         for (int i = 0; i < nCount; ++i)
@@ -2926,6 +2959,26 @@ void enc::test_textenc()
                     == RTL_TEXTENCODING_ADOBE_SYMBOL,
                 "Detecting MIME charset name csHPPSMath");
 
+    TEST_ENSURE(strcmp(rtl_getMimeCharsetFromTextEncoding(
+                           RTL_TEXTENCODING_PT154),
+                       "PTCP154") == 0,
+                "Returning MIME charset name PTCP154");
+    TEST_ENSURE(rtl_getTextEncodingFromMimeCharset("PTCP154")
+                    == RTL_TEXTENCODING_PT154,
+                "Detecting MIME charset name PTCP154");
+    TEST_ENSURE(rtl_getTextEncodingFromMimeCharset("csPTCP154")
+                    == RTL_TEXTENCODING_PT154,
+                "Detecting MIME charset name csPTCP154");
+    TEST_ENSURE(rtl_getTextEncodingFromMimeCharset("PT154")
+                    == RTL_TEXTENCODING_PT154,
+                "Detecting MIME charset name PT154");
+    TEST_ENSURE(rtl_getTextEncodingFromMimeCharset("CP154")
+                    == RTL_TEXTENCODING_PT154,
+                "Detecting MIME charset name CP154");
+    TEST_ENSURE(rtl_getTextEncodingFromMimeCharset("Cyrillic-Asian")
+                    == RTL_TEXTENCODING_PT154,
+                "Detecting MIME charset name Cyrillic-Asian");
+
     {
         struct Test
         {
@@ -3011,7 +3064,9 @@ void enc::test_textenc()
                 { RTL_TEXTENCODING_ADOBE_SYMBOL,
                   RTL_TEXTENCODING_INFO_MIME, true },
                 { RTL_TEXTENCODING_ADOBE_SYMBOL,
-                  RTL_TEXTENCODING_INFO_SYMBOL, true } };
+                  RTL_TEXTENCODING_INFO_SYMBOL, true },
+                { RTL_TEXTENCODING_PT154, RTL_TEXTENCODING_INFO_ASCII, true },
+                { RTL_TEXTENCODING_PT154, RTL_TEXTENCODING_INFO_MIME, true } };
         for (size_t i = 0; i < sizeof aTests / sizeof aTests[0]; ++i)
         {
             rtl_TextEncodingInfo aInfo;