Skip to content

Commit c6486f6

Browse files
psawant19psawant19
committed
Fix for formatter Taiwanese in AIX and Linux
Timezone format has been modified from TST to CST Signed-off-by: Pratiksha Sawant <[email protected]>
1 parent 583f188 commit c6486f6

File tree

4 files changed

+134
-20
lines changed

4 files changed

+134
-20
lines changed

‎functional/MBCS_Tests/formatter/data/expected_AIX_ZH_TW.UTF-8_22.txt‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
invoking FormatterTest2
2+
3+
numeric format:
4+
123456.789 = 123,456.789
5+
PI = +3.14159265
6+
65535(hex) = 0xffff
7+
65535(oct) = 0177777
8+
9+
string format:
10+
test string: abc株表噂十豹竹敷～椄＊＠ＡＢＣ１８９２１壹捌玖貳壹貳參肆伍陸柒捌玖拾一丁七／＼
11+
upper case : ABC株表噂十豹竹敷～椄＊＠ＡＢＣ１８９２１壹捌玖貳壹貳參肆伍陸柒捌玖拾一丁七／＼
12+
13+
date/time format:
14+
test for 2007/01/01
15+
current date: 2007/01/01 (週一) CST
16+
current time: 上午 12:00:00 GMT+0800
17+
month(full) : 1月
18+
month(short): 1月
19+
day of week : 星期一
20+
21+
date/time format:
22+
test for 2007/08/01
23+
current date: 2007/08/01 (週三) CST
24+
current time: 上午 12:00:00 GMT+0800
25+
month(full) : 8月
26+
month(short): 8月
27+
day of week : 星期三
28+
29+
date/time format:
30+
test for 2007/02/29 which does not exist
31+
current date: 2007/03/01 (週四) CST
32+
current time: 上午 12:00:00 GMT+0800
33+
month(full) : 3月
34+
month(short): 3月
35+
day of week : 星期四
36+
37+
date/time format:
38+
test for 2008/02/29
39+
current date: 2008/02/29 (週五) CST
40+
current time: 上午 12:00:00 GMT+0800
41+
month(full) : 2月
42+
month(short): 2月
43+
day of week : 星期五
44+
45+
date/time format:
46+
test for 2007/04/31 which does not exist
47+
current date: 2007/05/01 (週二) CST
48+
current time: 上午 12:00:00 GMT+0800
49+
month(full) : 5月
50+
month(short): 5月
51+
day of week : 星期二
52+
53+
date/time format:
54+
test for 2007/12/32 which does not exist
55+
current date: 2008/01/01 (週二) CST
56+
current time: 上午 12:00:00 GMT+0800
57+
month(full) : 1月
58+
month(short): 1月
59+
day of week : 星期二

‎functional/MBCS_Tests/formatter/data/expected_Linux_zh_TW.UTF-8_22.txt‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
invoking FormatterTest2
2+
3+
numeric format:
4+
123456.789 = 123,456.789
5+
PI = +3.14159265
6+
65535(hex) = 0xffff
7+
65535(oct) = 0177777
8+
9+
string format:
10+
test string: abc株表噂十豹竹敷～椄＊＠ＡＢＣ１８９２１壹捌玖貳壹貳參肆伍陸柒捌玖拾一丁七／＼
11+
upper case : ABC株表噂十豹竹敷～椄＊＠ＡＢＣ１８９２１壹捌玖貳壹貳參肆伍陸柒捌玖拾一丁七／＼
12+
13+
date/time format:
14+
test for 2007/01/01
15+
current date: 2007/01/01 (週一) CST
16+
current time: 上午 12:00:00 GMT+0800
17+
month(full) : 1月
18+
month(short): 1月
19+
day of week : 星期一
20+
21+
date/time format:
22+
test for 2007/08/01
23+
current date: 2007/08/01 (週三) CST
24+
current time: 上午 12:00:00 GMT+0800
25+
month(full) : 8月
26+
month(short): 8月
27+
day of week : 星期三
28+
29+
date/time format:
30+
test for 2007/02/29 which does not exist
31+
current date: 2007/03/01 (週四) CST
32+
current time: 上午 12:00:00 GMT+0800
33+
month(full) : 3月
34+
month(short): 3月
35+
day of week : 星期四
36+
37+
date/time format:
38+
test for 2008/02/29
39+
current date: 2008/02/29 (週五) CST
40+
current time: 上午 12:00:00 GMT+0800
41+
month(full) : 2月
42+
month(short): 2月
43+
day of week : 星期五
44+
45+
date/time format:
46+
test for 2007/04/31 which does not exist
47+
current date: 2007/05/01 (週二) CST
48+
current time: 上午 12:00:00 GMT+0800
49+
month(full) : 5月
50+
month(short): 5月
51+
day of week : 星期二
52+
53+
date/time format:
54+
test for 2007/12/32 which does not exist
55+
current date: 2008/01/01 (週二) CST
56+
current time: 上午 12:00:00 GMT+0800
57+
month(full) : 1月
58+
month(short): 1月
59+
day of week : 星期二

‎functional/MBCS_Tests/formatter/playlist.xml‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -62,18 +62,6 @@ limitations under the License.
6262
<testCaseName>MBCS_Tests_formatter_zh_TW_linux</testCaseName>
6363
<command>LANG=zh_TW.UTF-8 bash $(TEST_RESROOT)$(D)test.sh; \
6464
$(TEST_STATUS)</command>
65-
<disables>
66-
<disable>
67-
<comment>https://github.com/eclipse-openj9/openj9/issues/19083</comment>
68-
<version>22+</version>
69-
<impl>openj9</impl>
70-
</disable>
71-
<disable>
72-
<comment>https://github.com/adoptium/aqa-tests/issues/5148</comment>
73-
<version>22+</version>
74-
<impl>hotspot</impl>
75-
</disable>
76-
</disables>
7765
<platformRequirements>os.linux</platformRequirements>
7866
<levels>
7967
<level>special</level>
@@ -249,12 +237,6 @@ limitations under the License.
249237
</test>
250238
<test>
251239
<testCaseName>MBCS_Tests_formatter_ZH_TW_aix</testCaseName>
252-
<disables>
253-
<disable>
254-
<comment>https://github.com/adoptium/aqa-tests/issues/5148</comment>
255-
<version>22+</version>
256-
</disable>
257-
</disables>
258240
<command>LANG=ZH_TW ksh $(TEST_RESROOT)$(D)test.sh; \
259241
$(TEST_STATUS)</command>
260242
<platformRequirements>os.aix</platformRequirements>

‎functional/MBCS_Tests/formatter/test.sh‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,23 @@ OUTPUT=output.txt
2323

2424
. ${BASE}/check_env_unix.sh
2525
CHARMAP=${FULLLANG}
26-
SOURCE="${CHARMAP}.txt"
26+
27+
# Get Java major version
28+
FULL_VERSION=$(java -version 2>&1 | grep 'version' | cut -d '"' -f2)
29+
JAVA_VERSION=${FULL_VERSION%%.*}
30+
31+
#_22 file is only applicable for taiwanese in AIX and Linux else it should fall back to default
32+
if { [ "$CHARMAP" = "Linux_zh_TW.UTF-8" ] || [ "$CHARMAP" = "AIX_ZH_TW.UTF-8" ]; } && [ "$JAVA_VERSION" -ge 22 ]; then
33+
SOURCE="${CHARMAP}_22.txt"
34+
else
35+
SOURCE="${CHARMAP}.txt"
36+
fi
37+
38+
# Create the expected file name
39+
EXP_FILE=expected_${SOURCE}
40+
2741
echo "invoking FormatterTest2" > ${OUTPUT}
2842
${JAVA_BIN}/java FormatterTest2 abc${TEST_STRING} >> ${OUTPUT}
29-
diff ${BASE}/expected_${SOURCE} ${OUTPUT} > /dev/null 2>&1
43+
diff ${BASE}/${EXP_FILE} ${OUTPUT} > /dev/null 2>&1
3044
RESULT=$?
3145
exit ${RESULT}

0 commit comments

Comments
 (0)