Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_jdk
提交
7d5c6f62
D
dragonwell8_jdk
项目概览
openanolis
/
dragonwell8_jdk
通知
4
Star
2
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
dragonwell8_jdk
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
7d5c6f62
编写于
11月 23, 2017
作者:
N
nishjain
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
8191404: Upgrading JDK with latest available LSR data from IANA.
Reviewed-by: naoto Contributed-by: nishit.jain@oracle.com
上级
8a33a5da
变更
2
展开全部
显示空白变更内容
内联
并排
Showing
2 changed file
with
473 addition
and
29 deletion
+473
-29
make/data/lsrdata/language-subtag-registry.txt
make/data/lsrdata/language-subtag-registry.txt
+455
-17
test/java/util/Locale/Bug8040211.java
test/java/util/Locale/Bug8040211.java
+18
-12
未找到文件。
make/data/lsrdata/language-subtag-registry.txt
浏览文件 @
7d5c6f62
此差异已折叠。
点击以展开。
test/java/util/Locale/Bug8040211.java
浏览文件 @
7d5c6f62
/*
* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016,
2017,
Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
...
...
@@ -23,9 +23,9 @@
/*
* @test
* @bug 8040211
* @bug 8040211
8191404
* @summary Checks the IANA language subtag registry data updation
* (LSR Revision: 201
6-02-10
) with Locale and Locale.LanguageRange
* (LSR Revision: 201
7-08-15
) with Locale and Locale.LanguageRange
* class methods.
* @run main Bug8040211
*/
...
...
@@ -66,9 +66,9 @@ public class Bug8040211 {
private
static
void
test_parse
()
{
boolean
error
=
false
;
String
str
=
"Accept-Language: aam, adp, aue,
ema, en-gb-oed
,"
+
"
gti, koj, kwq, kxe, lii, lmm, mtm, ngv, oyb, phr, pub
,"
+
" suj, taj;q=0.9, yug;q=0.5, gfx;q=0.4"
;
String
str
=
"Accept-Language: aam, adp, aue,
bcg, cqu, ema
,"
+
"
en-gb-oed, gti, koj, kwq, kxe, lii, lmm, mtm, ngv
,"
+
"
oyb, phr, pub,
suj, taj;q=0.9, yug;q=0.5, gfx;q=0.4"
;
ArrayList
<
LanguageRange
>
expected
=
new
ArrayList
<>();
expected
.
add
(
new
LanguageRange
(
"aam"
,
1.0
));
expected
.
add
(
new
LanguageRange
(
"aas"
,
1.0
));
...
...
@@ -76,6 +76,10 @@ public class Bug8040211 {
expected
.
add
(
new
LanguageRange
(
"dz"
,
1.0
));
expected
.
add
(
new
LanguageRange
(
"aue"
,
1.0
));
expected
.
add
(
new
LanguageRange
(
"ktz"
,
1.0
));
expected
.
add
(
new
LanguageRange
(
"bcg"
,
1.0
));
expected
.
add
(
new
LanguageRange
(
"bgm"
,
1.0
));
expected
.
add
(
new
LanguageRange
(
"cqu"
,
1.0
));
expected
.
add
(
new
LanguageRange
(
"quh"
,
1.0
));
expected
.
add
(
new
LanguageRange
(
"ema"
,
1.0
));
expected
.
add
(
new
LanguageRange
(
"uok"
,
1.0
));
expected
.
add
(
new
LanguageRange
(
"en-gb-oed"
,
1.0
));
...
...
@@ -98,6 +102,8 @@ public class Bug8040211 {
expected
.
add
(
new
LanguageRange
(
"nnx"
,
1.0
));
expected
.
add
(
new
LanguageRange
(
"oyb"
,
1.0
));
expected
.
add
(
new
LanguageRange
(
"thx"
,
1.0
));
expected
.
add
(
new
LanguageRange
(
"skk"
,
1.0
));
expected
.
add
(
new
LanguageRange
(
"jeg"
,
1.0
));
expected
.
add
(
new
LanguageRange
(
"phr"
,
1.0
));
expected
.
add
(
new
LanguageRange
(
"pmu"
,
1.0
));
expected
.
add
(
new
LanguageRange
(
"pub"
,
1.0
));
...
...
@@ -170,15 +176,15 @@ public class Bug8040211 {
private
static
void
test_filter
()
{
boolean
error
=
false
;
String
ranges
=
"mtm-RU, en-gb-oed"
;
String
tags
=
"de-DE, en, mtm-RU, ymt-RU, en-gb-oxendict, ja-JP"
;
String
ranges
=
"mtm-RU, en-gb-oed
, coy
"
;
String
tags
=
"de-DE, en, mtm-RU, ymt-RU, en-gb-oxendict, ja-JP
, pij, nts
"
;
FilteringMode
mode
=
EXTENDED_FILTERING
;
List
<
LanguageRange
>
priorityList
=
LanguageRange
.
parse
(
ranges
);
List
<
Locale
>
tagList
=
generateLocales
(
tags
);
String
actualLocales
=
showLocales
(
Locale
.
filter
(
priorityList
,
tagList
,
mode
));
String
expectedLocales
=
"mtm-RU, ymt-RU, en-GB-oxendict"
;
String
expectedLocales
=
"mtm-RU, ymt-RU, en-GB-oxendict
, nts, pij
"
;
if
(!
expectedLocales
.
equals
(
actualLocales
))
{
error
=
true
;
...
...
@@ -212,14 +218,14 @@ public class Bug8040211 {
private
static
void
test_filterTags
()
{
boolean
error
=
false
;
String
ranges
=
"gti;q=0.2, gfx"
;
String
tags
=
"de-DE, gti, he, nyc, mwj, vaj"
;
String
ranges
=
"gti;q=0.2, gfx
, kzj
"
;
String
tags
=
"de-DE, gti, he, nyc, mwj, vaj
, ktr, dtp
"
;
List
<
LanguageRange
>
priorityList
=
LanguageRange
.
parse
(
ranges
);
List
<
String
>
tagList
=
generateLanguageTags
(
tags
);
String
actualTags
=
showLanguageTags
(
Locale
.
filterTags
(
priorityList
,
tagList
));
String
expectedTags
=
"mwj, vaj, gti, nyc"
;
String
expectedTags
=
"mwj, vaj,
ktr, dtp,
gti, nyc"
;
if
(!
expectedTags
.
equals
(
actualTags
))
{
error
=
true
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录