Print this page
rev 5856 : [mq]: 7196799
| Split |
Close |
| Expand all |
| Collapse all |
--- old/test/java/util/Locale/LocaleProviders.sh
+++ new/test/java/util/Locale/LocaleProviders.sh
1 1 #
2 2 # Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
3 3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4 4 #
5 5 # This code is free software; you can redistribute it and/or modify it
6 6 # under the terms of the GNU General Public License version 2 only, as
7 7 # published by the Free Software Foundation.
8 8 #
9 9 # This code is distributed in the hope that it will be useful, but WITHOUT
10 10 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
11 11 # FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
12 12 # version 2 for more details (a copy is included in the LICENSE file that
13 13 # accompanied this code).
14 14 #
15 15 # You should have received a copy of the GNU General Public License version
|
↓ open down ↓ |
15 lines elided |
↑ open up ↑ |
16 16 # 2 along with this work; if not, write to the Free Software Foundation,
17 17 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
18 18 #
19 19 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
20 20 # or visit www.oracle.com if you need additional information or have any
21 21 # questions.
22 22 #
23 23 #!/bin/sh
24 24 #
25 25 # @test
26 -# @bug 6336885
26 +# @bug 6336885 7196799 7197573
27 27 # @summary tests for "java.locale.providers" system property
28 28 # @compile -XDignore.symbol.file LocaleProviders.java
29 29 # @run shell/timeout=600 LocaleProviders.sh
30 30
31 31 if [ "${TESTSRC}" = "" ]
32 32 then
33 33 echo "TESTSRC not set. Test cannot execute. Failed."
34 34 exit 1
35 35 fi
36 36 echo "TESTSRC=${TESTSRC}"
37 37 if [ "${TESTJAVA}" = "" ]
38 38 then
39 39 echo "TESTJAVA not set. Test cannot execute. Failed."
40 40 exit 1
41 41 fi
42 42 echo "TESTJAVA=${TESTJAVA}"
43 43 if [ "${TESTCLASSES}" = "" ]
44 44 then
45 45 echo "TESTCLASSES not set. Test cannot execute. Failed."
46 46 exit 1
47 47 fi
48 48 echo "TESTCLASSES=${TESTCLASSES}"
49 49 echo "CLASSPATH=${CLASSPATH}"
50 50
51 51 # set platform-dependent variables
52 52 OS=`uname -s`
53 53 case "$OS" in
54 54 SunOS | Linux | *BSD | Darwin )
55 55 PS=":"
56 56 FS="/"
57 57 ;;
|
↓ open down ↓ |
21 lines elided |
↑ open up ↑ |
58 58 Windows* | CYGWIN* )
59 59 PS=";"
60 60 FS="\\"
61 61 ;;
62 62 * )
63 63 echo "Unrecognized system!"
64 64 exit 1;
65 65 ;;
66 66 esac
67 67
68 +# get the platform default locale
69 +PLATDEF=`${TESTJAVA}${FS}bin${FS}java -classpath ${TESTCLASSES} LocaleProviders`
70 +DEFLANG=`echo ${PLATDEF} | sed -e "s/,.*//"`
71 +DEFCTRY=`echo ${PLATDEF} | sed -e "s/.*,//"`
72 +echo "DEFLANG=${DEFLANG}"
73 +echo "DEFCTRY=${DEFCTRY}"
74 +
68 75 runTest()
69 76 {
70 - RUNCMD="${TESTJAVA}${FS}bin${FS}java -classpath ${TESTCLASSES} -Duser.language=$DEFLANG -Duser.country=$DEFCTRY -Djava.locale.providers=$PREFLIST LocaleProviders $EXPECTED $TESTLANG $TESTCTRY"
77 + RUNCMD="${TESTJAVA}${FS}bin${FS}java -classpath ${TESTCLASSES} -Djava.locale.providers=$PREFLIST LocaleProviders $EXPECTED $TESTLANG $TESTCTRY"
71 78 echo ${RUNCMD}
72 79 ${RUNCMD}
73 80 result=$?
74 81 if [ $result -eq 0 ]
75 82 then
76 83 echo "Execution successful"
77 84 else
78 85 echo "Execution of the test case failed."
79 86 exit $result
80 87 fi
81 88 }
82 89
83 90 # testing HOST is selected for the default locale, if specified on Windows or MacOSX
84 -DEFLANG=en
85 -DEFCTRY=US
86 -PREFLIST=HOST
91 +PREFLIST=HOST,JRE
87 92 case "$OS" in
88 93 Windows_NT* )
89 94 WINVER=`uname -r`
90 95 if [ "${WINVER}" = "5" ]
91 96 then
92 97 EXPECTED=JRE
93 98 else
94 99 EXPECTED=HOST
95 100 fi
96 101 ;;
97 102 CYGWIN_NT-6* | Darwin )
98 103 EXPECTED=HOST
99 104 ;;
100 105 * )
101 106 EXPECTED=JRE
102 107 ;;
103 108 esac
104 -TESTLANG=en
105 -TESTCTRY=US
109 +TESTLANG=${DEFLANG}
110 +TESTCTRY=${DEFCTRY}
106 111 runTest
107 112
108 113 # testing HOST is NOT selected for the non-default locale, if specified
109 -DEFLANG=en
110 -DEFCTRY=US
111 -PREFLIST=HOST
114 +PREFLIST=HOST,JRE
112 115 EXPECTED=JRE
113 -TESTLANG=en
114 -TESTCTRY=GB
116 +if [ "${DEFLANG}" = "en" ]
117 +then
118 + TESTLANG=ja
119 + TESTCTRY=JP
120 +else
121 + TESTLANG=en
122 + TESTCTRY=US
123 +fi
115 124 runTest
116 125
117 126 # testing SPI is NOT selected, as there is none.
118 -PREFLIST=SPI
127 +PREFLIST=SPI,JRE
119 128 EXPECTED=JRE
120 129 TESTLANG=en
121 130 TESTCTRY=US
122 131 runTest
123 132
124 133 # testing the order, variaton #1. This assumes en_GB DateFormat data are available both in JRE & CLDR
125 -PREFLIST=CLDR
134 +PREFLIST=CLDR,JRE
126 135 EXPECTED=CLDR
127 136 TESTLANG=en
128 137 TESTCTRY=GB
129 138 runTest
130 139
131 140 # testing the order, variaton #2. This assumes en_GB DateFormat data are available both in JRE & CLDR
132 141 PREFLIST=JRE,CLDR
133 142 EXPECTED=JRE
134 143 TESTLANG=en
135 144 TESTCTRY=GB
136 145 runTest
137 146
138 147 # testing the order, variaton #3 for non-existent locale in JRE assuming "haw" is not in JRE.
139 148 PREFLIST=JRE,CLDR
140 149 EXPECTED=CLDR
141 150 TESTLANG=haw
142 151 TESTCTRY=GB
143 152 runTest
144 153
154 +# testing the order, variaton #4 for the bug 7196799. CLDR's "zh" data should be used in "zh_CN"
155 +PREFLIST=CLDR
156 +EXPECTED=CLDR
157 +TESTLANG=zh
158 +TESTCTRY=CN
159 +runTest
160 +
161 +# testing FALLBACK provider. SPI and invalid one cases.
162 +PREFLIST=SPI
163 +EXPECTED=FALLBACK
164 +TESTLANG=en
165 +TESTCTRY=US
166 +runTest
167 +PREFLIST=FOO
168 +EXPECTED=FALLBACK
169 +TESTLANG=en
170 +TESTCTRY=US
171 +runTest
172 +
145 173 exit $result
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX