diff options
| author | tushar <tusharrai282@gmail.com> | 2021-03-15 22:17:46 +0530 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2021-05-01 13:12:22 +0200 |
| commit | 6fecdeac5d81a60a479195a62cdc174b919f763b (patch) | |
| tree | 534b93496faa541ec7c27aa7890aa785928a63b6 /basic/qa/vba_tests | |
| parent | 746016f9ab2cd72a49484c25ab18dad3f9c39a90 (diff) | |
tdf#124184 Fixing StrConv VBA Function
* vbUnicode/vbFromUnicode considers optional third LCID argument.
* LCID is also used for other conversions.
* The encoding is decided based on the language defined in LCID,
or on program locale when LCID is omitted, using MS default
ACP mapping for languages.
* Unit testis for vbWide / vbNarrow are changed and enabled.
* Unit tests for vbKatakana / vbHiragana are changed and enabled.
* Unit test for vbFromUnicode / vbUnicode is changed to rely on
en-US locale used in testing, and is enabled.
Change-Id: Iabd4153db311cd02c3f3e7247f9fc71ad9f5f682
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112539
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'basic/qa/vba_tests')
| -rw-r--r-- | basic/qa/vba_tests/strconv.vb | 28 |
1 files changed, 19 insertions, 9 deletions
diff --git a/basic/qa/vba_tests/strconv.vb b/basic/qa/vba_tests/strconv.vb index 9bb6f9649a1d..b0295df428b2 100644 --- a/basic/qa/vba_tests/strconv.vb +++ b/basic/qa/vba_tests/strconv.vb @@ -23,21 +23,31 @@ Sub verify_testStrConv() TestUtil.AssertEqual(StrConv("abc EFG hij", vbProperCase), "Abc Efg Hij", "StrConv(""abc EFG hij"", vbProperCase)") ' Converts narrow (single-byte) characters in string to wide - 'TestUtil.AssertEqual(StrConv("ABCDEVB¥ì¥¹¥¥å©`", vbWide), "£Á£Â£Ã£Ä£ÅVB¥ì¥¹¥¥å©`", "StrConv(""ABCDEVB¥ì¥¹¥¥å©`"", vbWide)") + TestUtil.AssertEqual(StrConv("ABCDEVB¥ì¥¹¥¥å©", vbWide), "ＡＢＣＤＥＶＢ￥ì￥¹￥￥å©", "StrConv(""ABCDEVB¥ì¥¹¥¥å©"", vbWide)") ' Converts wide (double-byte) characters in string to narrow (single-byte) characters - 'TestUtil.AssertEqual(StrConv("£Á£Â£Ã£Ä£ÅVB¥ì¥¹¥¥å©`", vbNarrow), "ABCDEVB¥ì¥¹¥¥å©`", "StrConv(""£Á£Â£Ã£Ä£ÅVB¥ì¥¹¥¥å©`"", vbNarrow)") + TestUtil.AssertEqual(StrConv("ＡＢＣＤ＠＄％２３＇？ＥＧ", vbNarrow), "ABCD@$%23'?EG", "StrConv(""ＡＢＣＤ＠＄％２３＇？ＥＧ"", vbNarrow)") ' Converts Hiragana characters in string to Katakana characters - 'TestUtil.AssertEqual(StrConv("¤Ï¤Ê¤Á¤ã¤ó", vbKatakana), "¥Ï¥Ê¥Á¥ã¥ó", "StrConv(""¤Ï¤Ê¤Á¤ã¤ó"", vbKatakana)") + TestUtil.AssertEqual(StrConv("かたかな", vbKatakana), "カタカナ", "StrConv(""かたかな"", vbKatakana)") ' Converts Katakana characters in string to Hiragana characters - 'TestUtil.AssertEqual(StrConv("¥Ï¥Ê¥Á¥ã¥ó", vbHiragana), "¤Ï¤Ê¤Á¤ã¤ó", "StrConv(""¥Ï¥Ê¥Á¥ã¥ó"", vbHiragana)") - - 'Dim x() As Byte - 'x = StrConv("ÉϺ£ÊÐABC", vbFromUnicode) - 'TestUtil.AssertEqual(UBound(x), 8, "UBound(x)") - 'TestUtil.AssertEqual(StrConv(x, vbUnicode), "ÉϺ£ÊÐABC", "StrConv(x, vbUnicode)") + TestUtil.AssertEqual(StrConv("カタカナ", vbHiragana), "かたかな", "StrConv(""カタカナ"", vbHiragana)") + + ' Assumes CP-1252 encoding associated with en-US locale used in unit tests. + Dim x() As Byte + x = StrConv("ÉϺ£ÊÐABC", vbFromUnicode) + TestUtil.AssertEqual(UBound(x), 8, "UBound(x)") + TestUtil.AssertEqual(x(0), 201, "x(0)") + TestUtil.AssertEqual(x(1), 207, "x(1)") + TestUtil.AssertEqual(x(2), 186, "x(2)") + TestUtil.AssertEqual(x(3), 163, "x(3)") + TestUtil.AssertEqual(x(4), 202, "x(4)") + TestUtil.AssertEqual(x(5), 208, "x(5)") + TestUtil.AssertEqual(x(6), 65, "x(6)") + TestUtil.AssertEqual(x(7), 66, "x(7)") + TestUtil.AssertEqual(x(8), 67, "x(8)") + TestUtil.AssertEqual(StrConv(x, vbUnicode), "ÉϺ£ÊÐABC", "StrConv(x, vbUnicode)") Exit Sub errorHandler: |