INTEGRATION: CWS sb17 (1.2.26); FILE MERGED

2004/06/11 08:57:14 sb 1.2.26.1: #i25672# Merged in sal/test/testtextenc.cxx 1.30.20.1.

1 files changed, 133 insertions, 5 deletions

diff --git a/sal/qa/rtl/textenc/rtl_textcvt.cxx b/sal/qa/rtl/textenc/rtl_textcvt.cxx
index 0f605562b64f..05e8a6d6f53c 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.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: rt $ $Date: 2004-05-03 09:16:53 $
+ *  last change: $Author: rt $ $Date: 2004-06-17 11:38:50 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -1302,7 +1302,73 @@ void enc::test_textenc()
                 0x0946,0x0947,0x0948,0x0945,0x094A,0x094B,0x094C,0x0949,
                 0x094D,0x093C,0x0964,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,
                 0xFFFF,0x0966,0x0967,0x0968,0x0969,0x096A,0x096B,0x096C,
-                0x096D,0x096E,0x096F,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF } } };
+                0x096D,0x096E,0x096F,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF } },
+            { RTL_TEXTENCODING_ADOBE_STANDARD,
+              { 0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,
+                0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,
+                0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,
+                0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,
+                0x0020,0x0021,0x0022,0x0023,0x0024,0x0025,0x0026,0x2019,
+                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,
+                0x2018,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,0xFFFF,
+                0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,
+                0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,
+                0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,
+                0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,
+                0xFFFF,0x00A1,0x00A2,0x00A3,0x2215,0x00A5,0x0192,0x00A7,
+                0x00A4,0x0027,0x201C,0x00AB,0x2039,0x203A,0xFB01,0xFB02,
+                0xFFFF,0x2013,0x2020,0x2021,0x00B7,0xFFFF,0x00B6,0x2022,
+                0x201A,0x201E,0x201D,0x00BB,0x2026,0x2030,0xFFFF,0x00BF,
+                0xFFFF,0x0060,0x00B4,0x02C6,0x02DC,0x00AF,0x02D8,0x02D9,
+                0x00A8,0xFFFF,0x02DA,0x00B8,0xFFFF,0x02DD,0x02DB,0x02C7,
+                0x2014,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,
+                0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,
+                0xFFFF,0x00C6,0xFFFF,0x00AA,0xFFFF,0xFFFF,0xFFFF,0xFFFF,
+                0x0141,0x00D8,0x0152,0x00BA,0xFFFF,0xFFFF,0xFFFF,0xFFFF,
+                0xFFFF,0x00E6,0xFFFF,0xFFFF,0xFFFF,0x0131,0xFFFF,0xFFFF,
+                0x0142,0x00F8,0x0153,0x00DF,0xFFFF,0xFFFF,0xFFFF,0xFFFF } },
+            { RTL_TEXTENCODING_ADOBE_SYMBOL,
+              { 0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,
+                0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,
+                0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,
+                0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,
+                0x0020,0x0021,0x2200,0x0023,0x2203,0x0025,0x0026,0x220B,
+                0x0028,0x0029,0x2217,0x002B,0x002C,0x2212,0x002E,0x002F,
+                0x0030,0x0031,0x0032,0x0033,0x0034,0x0035,0x0036,0x0037,
+                0x0038,0x0039,0x003A,0x003B,0x003C,0x003D,0x003E,0x003F,
+                0x2245,0x0391,0x0392,0x03A7,0x0394,0x0395,0x03A6,0x0393,
+                0x0397,0x0399,0x03D1,0x039A,0x039B,0x039C,0x039D,0x039F,
+                0x03A0,0x0398,0x03A1,0x03A3,0x03A4,0x03A5,0x03C2,0x03A9,
+                0x039E,0x03A8,0x0396,0x005B,0x2234,0x005D,0x22A5,0x005F,
+                0xF8E5,0x03B1,0x03B2,0x03C7,0x03B4,0x03B5,0x03C6,0x03B3,
+                0x03B7,0x03B9,0x03D5,0x03BA,0x03BB,0x03BC,0x03BD,0x03BF,
+                0x03C0,0x03B8,0x03C1,0x03C3,0x03C4,0x03C5,0x03D6,0x03C9,
+                0x03BE,0x03C8,0x03B6,0x007B,0x007C,0x007D,0x223C,0xFFFF,
+                0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,
+                0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,
+                0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,
+                0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,
+                0x20AC,0x03D2,0x2032,0x2264,0x2215,0x221E,0x0192,0x2663,
+                0x2666,0x2665,0x2660,0x2194,0x2190,0x2191,0x2192,0x2193,
+                0x00B0,0x00B1,0x2033,0x2265,0x00D7,0x221D,0x2202,0x2022,
+                0x00F7,0x2260,0x2261,0x2248,0x2026,0x23AF,0x23D0,0x21B5,
+                0x2135,0x2111,0x211C,0x2118,0x2297,0x2295,0x2205,0x2229,
+                0x222A,0x2283,0x2287,0x2284,0x2282,0x2286,0x2208,0x2209,
+                0x2220,0x2207,0xF6DA,0xF6D9,0xF6DB,0x220F,0x221A,0x22C5,
+                0x00AC,0x2227,0x2228,0x21D4,0x21D0,0x21D1,0x21D2,0x21D3,
+                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 } } };
     {
         int nCount = sizeof aSingleByteCharSet / sizeof aSingleByteCharSet[0];
         for (int i = 0; i < nCount; ++i)
@@ -2456,6 +2522,44 @@ void enc::test_textenc()
               true,
               false,
               false,
+              RTL_UNICODETOTEXT_FLAGS_UNDEFINED_ERROR },
+
+            { RTL_TEXTENCODING_ADOBE_STANDARD,
+              RTL_CONSTASCII_STRINGPARAM("\x20\x2D\xA4\xB4\xC5"),
+              { 0x0020, 0x002D, 0x2215, 0x00B7, 0x00AF },
+              5,
+              false,
+              true,
+              true,
+              false,
+              RTL_UNICODETOTEXT_FLAGS_UNDEFINED_ERROR },
+            { RTL_TEXTENCODING_ADOBE_STANDARD,
+              RTL_CONSTASCII_STRINGPARAM("\x20\x2D\xA4\xB4\xC5"),
+              { 0x00A0, 0x00AD, 0x2044, 0x2219, 0x02C9 },
+              5,
+              false,
+              false,
+              true,
+              false,
+              RTL_UNICODETOTEXT_FLAGS_UNDEFINED_ERROR },
+
+            { RTL_TEXTENCODING_ADOBE_SYMBOL,
+              RTL_CONSTASCII_STRINGPARAM("\x20\x44\x57\x6D\xA4"),
+              { 0x0020, 0x0394, 0x03A9, 0x03BC, 0x2215 },
+              5,
+              false,
+              true,
+              true,
+              false,
+              RTL_UNICODETOTEXT_FLAGS_UNDEFINED_ERROR },
+            { RTL_TEXTENCODING_ADOBE_SYMBOL,
+              RTL_CONSTASCII_STRINGPARAM("\x20\x44\x57\x6D\xA4"),
+              { 0x00A0, 0x2206, 0x2126, 0x00B5, 0x2044 },
+              5,
+              false,
+              false,
+              true,
+              false,
               RTL_UNICODETOTEXT_FLAGS_UNDEFINED_ERROR }
         };
     {
@@ -2809,6 +2913,19 @@ void enc::test_textenc()
                     == RTL_TEXTENCODING_MS_949,
                 "Detecting MIME charset name csKSC56011987");
 
+    TEST_ENSURE(rtl_getTextEncodingFromMimeCharset("Adobe-Standard-Encoding")
+                    == RTL_TEXTENCODING_ADOBE_STANDARD,
+                "Detecting MIME charset name Adobe-Standard-Encoding");
+    TEST_ENSURE(rtl_getTextEncodingFromMimeCharset("csAdobeStandardEncoding")
+                    == RTL_TEXTENCODING_ADOBE_STANDARD,
+                "Detecting MIME charset name csAdobeStandardEncoding");
+    TEST_ENSURE(rtl_getTextEncodingFromMimeCharset("Adobe-Symbol-Encoding")
+                    == RTL_TEXTENCODING_ADOBE_SYMBOL,
+                "Detecting MIME charset name Adobe-Symbol-Encoding");
+    TEST_ENSURE(rtl_getTextEncodingFromMimeCharset("csHPPSMath")
+                    == RTL_TEXTENCODING_ADOBE_SYMBOL,
+                "Detecting MIME charset name csHPPSMath");
+
     {
         struct Test
         {
@@ -2882,8 +2999,19 @@ void enc::test_textenc()
                 { RTL_TEXTENCODING_ISCII_DEVANAGARI,
                   RTL_TEXTENCODING_INFO_ASCII, true },
                 { RTL_TEXTENCODING_ISCII_DEVANAGARI,
-                  RTL_TEXTENCODING_INFO_MIME, false }
-            };
+                  RTL_TEXTENCODING_INFO_MIME, false },
+                { RTL_TEXTENCODING_ADOBE_STANDARD,
+                  RTL_TEXTENCODING_INFO_ASCII, false },
+                { RTL_TEXTENCODING_ADOBE_STANDARD,
+                  RTL_TEXTENCODING_INFO_MIME, true },
+                { RTL_TEXTENCODING_ADOBE_STANDARD,
+                  RTL_TEXTENCODING_INFO_SYMBOL, false },
+                { RTL_TEXTENCODING_ADOBE_SYMBOL,
+                  RTL_TEXTENCODING_INFO_ASCII, false },
+                { RTL_TEXTENCODING_ADOBE_SYMBOL,
+                  RTL_TEXTENCODING_INFO_MIME, true },
+                { RTL_TEXTENCODING_ADOBE_SYMBOL,
+                  RTL_TEXTENCODING_INFO_SYMBOL, true } };
         for (size_t i = 0; i < sizeof aTests / sizeof aTests[0]; ++i)
         {
             rtl_TextEncodingInfo aInfo;