organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-05 21:45:37 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 12

ICU-21038 Run ICU4J localespiCheck as a part of CI build

Browse source 
See #1797
This commit is contained in:
Yoshito Umaoka 2021-08-26 21:41:47 +00:00
parent 369357aaa7
commit 26c61c236c
10 changed files with 92 additions and 135 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.ci-builds/.azure-pipelines.yml
View file

@ -13,7 +13,7 @@ jobs:
lfs: true
fetchDepth: 10
- script: |
echo "Building ICU4J" && cd icu4j && ant init && ant check
echo "Building ICU4J" && cd icu4j && ant init && ant check && ant localespiCheck
displayName: 'Build and Test'
env:
BUILD: ICU4J

4
.github/workflows/icu_ci.yml vendored
View file

@ -69,6 +69,7 @@ jobs:
cd icu4j;
ant init;
ant check;
ant localespiCheck
- name: List failures (if any)
run: |
[ -d icu4j/out/junit-results ] && cd icu4j && cat `find out/junit-results -name "*.txt" -exec grep -l FAILED {} \;`;
@ -93,6 +94,7 @@ jobs:
cd icu4j;
ant init;
ant check;
ant localespiCheck
- name: List failures (if any)
run: |
[ -d icu4j/out/junit-results ] && cd icu4j && cat `find out/junit-results -name "*.txt" -exec grep -l FAILED {} \;`;
@ -116,6 +118,7 @@ jobs:
cd icu4j;
ant init;
ant check;
ant localespiCheck
- name: List failures (if any)
run: |
[ -d icu4j/out/junit-results ] && cd icu4j && cat `find out/junit-results -name "*.txt" -exec grep -l FAILED {} \;`;
@ -146,6 +149,7 @@ jobs:
cd icu4j;
ant init;
ant check;
ant localespiCheck
- name: List failures (if any)
run: |
[ -d icu4j/out/junit-results ] && cd icu4j && cat `find out/junit-results -name "*.txt" -exec grep -l FAILED {} \;`;

64
icu4j/build.xml
View file

@ -87,60 +87,59 @@
<!-- Java version check -->
<condition property="is.java7">
<matches string="${java.version}" pattern="1\.7\.\d.*"/>
<matches string="${java.version}" pattern="^1\.7\.\d.*"/>
</condition>
<condition property="is.java8">
<matches string="${java.version}" pattern="1\.8\.\d.*"/>
<matches string="${java.version}" pattern="^1\.8\.\d.*"/>
</condition>
<condition property="is.java9">
<matches string="${java.version}" pattern="9((-.|\.\d).*)?"/>
<matches string="${java.version}" pattern="^9((-.|\.\d).*)?"/>
</condition>
<condition property="is.java10">
<matches string="${java.version}" pattern="10((-.|\.\d).*)?"/>
<matches string="${java.version}" pattern="^10((-.|\.\d).*)?"/>
</condition>
<condition property="is.java11">
<matches string="${java.version}" pattern="11((-.|\.\d).*)?"/>
<matches string="${java.version}" pattern="^11((-.|\.\d).*)?"/>
</condition>
<condition property="is.java12">
<matches string="${java.version}" pattern="12((-.|\.\d).*)?"/>
<matches string="${java.version}" pattern="^12((-.|\.\d).*)?"/>
</condition>
<condition property="is.java13">
<matches string="${java.version}" pattern="13((-.|\.\d).*)?"/>
<matches string="${java.version}" pattern="^13((-.|\.\d).*)?"/>
</condition>
<condition property="is.java14">
<matches string="${java.version}" pattern="14((-.|\.\d).*)?"/>
<matches string="${java.version}" pattern="^14((-.|\.\d).*)?"/>
</condition>
<condition property="is.java15">
<matches string="${java.version}" pattern="15((-.|\.\d).*)?"/>
<matches string="${java.version}" pattern="^15((-.|\.\d).*)?"/>
</condition>
<condition property="is.java16">
<matches string="${java.version}" pattern="16((-.|\.\d).*)?"/>
<matches string="${java.version}" pattern="^16((-.|\.\d).*)?"/>
</condition>
<condition property="is.java17">
<matches string="${java.version}" pattern="17((-.|\.\d).*)?"/>
<matches string="${java.version}" pattern="^17((-.|\.\d).*)?"/>
</condition>
<condition property="is.java18">
<matches string="${java.version}" pattern="18((-.|\.\d).*)?"/>
<matches string="${java.version}" pattern="^18((-.|\.\d).*)?"/>
</condition>
<condition property="is.java19">
<matches string="${java.version}" pattern="19((-.|\.\d).*)?"/>
<matches string="${java.version}" pattern="^19((-.|\.\d).*)?"/>
</condition>
<condition property="is.java8.plus">
<condition property="is.java9.plus">
<or>
<isset property="is.java8"/>
<isset property="is.java9"/>
<isset property="is.java10"/>
<isset property="is.java11"/>
@ -153,6 +152,13 @@
<isset property="is.java18"/>
<isset property="is.java19"/>
</or>
</condition>
<condition property="is.java8.plus">
<or>
<isset property="is.java8"/>
<isset property="is.java9.plus"/>
</or>
</condition>
<condition property="is.java7.plus">
@ -170,7 +176,6 @@
</condition>
</fail>
<!-- Build environment info -->
<property name="env.COMPUTERNAME" value="${env.HOSTNAME}"/>
<target name="info" description="Display the build environment information">
@ -420,6 +425,17 @@
<pathelement location="${icu4j.localespi-tests.jar}"/>
</path>
<path id="junit.icu.localespi-tests.java9.jars">
<pathelement location="${icu4j.test-framework.jar}"/>
<pathelement location="${icu4j.localespi-tests.jar}"/>
<pathelement location="${icu4j.localespi.jar}"/>
<pathelement location="${icu4j.core.jar}"/>
<pathelement location="${icu4j.collate.jar}"/>
<pathelement location="${icu4j.currdata.jar}"/>
<pathelement location="${icu4j.langdata.jar}"/>
<pathelement location="${icu4j.regiondata.jar}"/>
</path>
<!--Class names that will be included/excluded as tests-->
<patternset id="test-classes-patternset">
<include name="**/*Test*"/>
@ -669,7 +685,7 @@
<fail message="test failed" if="icu-junit-failure" />
</target>
<target name="_localespiCheck">
<target name="_localespiCheck" unless="is.java9.plus">
<icu-junit test-name="localespi"
classpath="junit.icu.localespi-tests.jars"
jvm-options="-Djava.ext.dirs=${icu4j.core.dir}/${jar.dir}${path.separator}${icu4j.localespi.dir}/${jar.dir}${path.separator}${icu4j.collate.dir}/${jar.dir}${path.separator}${icu4j.currdata.dir}/${jar.dir}${path.separator}${icu4j.langdata.dir}/${jar.dir}${path.separator}${icu4j.regiondata.dir}/${jar.dir}${path.separator}${java.ext.dirs}"
@ -682,8 +698,22 @@
</icu-junit>
</target>
<target name="_localespiCheckJava9Plus" if="is.java9.plus">
<icu-junit test-name="localespi"
classpath="junit.icu.localespi-tests.java9.jars"
jvm-options="-Djava.locale.providers=CLDR,COMPAT,SPI"
failure-status="icu-junit-failure">
<junit-fileset>
<fileset dir="${icu4j.localespi-tests.dir}/${bin.dir}">
<patternset refid="localespiCheck-patternset"/>
</fileset>
</junit-fileset>
</icu-junit>
</target>
<target name="localespiCheck" depends="info, localespi, localespi-tests" description="Run the ICU4J Locale SPI test suite">
<antcall target="_localespiCheck"/>
<antcall target="_localespiCheckJava9Plus"/>
<fail message="test failed" if="icu-junit-failure" />
</target>

9
icu4j/main/tests/localespi/.classpath
View file

@ -1,7 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry excluding="**/.svn/" kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
<attributes>
<attribute name="module" value="true"/>
</attributes>
</classpathentry>
<classpathentry combineaccessrules="false" kind="src" path="/icu4j-core"/>
<classpathentry combineaccessrules="false" kind="src" path="/icu4j-localespi"/>
<classpathentry combineaccessrules="false" kind="src" path="/icu4j-test-framework"/>
@ -17,5 +21,8 @@
<attribute name="javadoc_location" value="jar:platform:/resource/external-libraries/JUnitParams-1.0.5-javadoc.jar!/"/>
</attributes>
</classpathentry>
<classpathentry combineaccessrules="false" kind="src" path="/icu4j-currdata"/>
<classpathentry combineaccessrules="false" kind="src" path="/icu4j-langdata"/>
<classpathentry combineaccessrules="false" kind="src" path="/icu4j-regiondata"/>
<classpathentry kind="output" path="out/bin"/>
</classpath>

19
icu4j/main/tests/localespi/src/com/ibm/icu/dev/test/localespi/DateFormatSymbolsTest.java
View file

@ -32,28 +32,19 @@ public class DateFormatSymbolsTest extends TestFmwk {
}
DateFormatSymbols dfs = DateFormatSymbols.getInstance(loc);
boolean isIcuImpl = (dfs instanceof com.ibm.icu.impl.jdkadapter.DateFormatSymbolsICU);
if (TestUtil.isICUExtendedLocale(loc)) {
if (!isIcuImpl) {
errln("FAIL: getInstance returned JDK DateFormatSymbols for locale " + loc);
}
} else {
if (isIcuImpl) {
logln("INFO: getInstance returned ICU DateFormatSymbols for locale " + loc);
}
} else if (isIcuImpl) {
logln("INFO: getInstance returned ICU DateFormatSymbols for locale " + loc);
Locale iculoc = TestUtil.toICUExtendedLocale(loc);
DateFormatSymbols dfsIcu = DateFormatSymbols.getInstance(iculoc);
if (isIcuImpl) {
if (!dfs.equals(dfsIcu)) {
errln("FAIL: getInstance returned ICU DateFormatSymbols for locale " + loc
+ ", but different from the one for locale " + iculoc);
}
} else {
if (!(dfsIcu instanceof com.ibm.icu.impl.jdkadapter.DateFormatSymbolsICU)) {
errln("FAIL: getInstance returned JDK DateFormatSymbols for locale " + iculoc);
}
if (!dfs.equals(dfsIcu)) {
errln("FAIL: getInstance returned ICU DateFormatSymbols for locale " + loc
+ ", but different from the one for locale " + iculoc);
}
}
}

18
icu4j/main/tests/localespi/src/com/ibm/icu/dev/test/localespi/DateFormatTest.java
View file

@ -50,21 +50,13 @@ public class DateFormatTest extends TestFmwk {
if (!isIcuImpl) {
errln("FAIL: " + method[0] + " returned JDK DateFormat for locale " + loc);
}
} else {
if (isIcuImpl) {
logln("INFO: " + method[0] + " returned ICU DateFormat for locale " + loc);
}
} else if (isIcuImpl) {
logln("INFO: " + method[0] + " returned ICU DateFormat for locale " + loc);
Locale iculoc = TestUtil.toICUExtendedLocale(loc);
DateFormat dfIcu = getJDKInstance(dstyle, tstyle, iculoc, null);
if (isIcuImpl) {
if (!df.equals(dfIcu)) {
errln("FAIL: " + method[0] + " returned ICU DateFormat for locale " + loc
+ ", but different from the one for locale " + iculoc);
}
} else {
if (!(dfIcu instanceof com.ibm.icu.impl.jdkadapter.SimpleDateFormatICU)) {
errln("FAIL: " + method[0] + " returned JDK DateFormat for locale " + iculoc);
}
if (!df.equals(dfIcu)) {
errln("FAIL: " + method[0] + " returned ICU DateFormat for locale " + loc
+ ", but different from the one for locale " + iculoc);
}
}
}

18
icu4j/main/tests/localespi/src/com/ibm/icu/dev/test/localespi/DecimalFormatSymbolsTest.java
View file

@ -40,21 +40,13 @@ public class DecimalFormatSymbolsTest extends TestFmwk {
if (!isIcuImpl) {
errln("FAIL: getInstance returned JDK DecimalFormatSymbols for locale " + loc);
}
} else {
if (isIcuImpl) {
logln("INFO: getInstance returned ICU DecimalFormatSymbols for locale " + loc);
}
} else if (isIcuImpl) {
logln("INFO: getInstance returned ICU DecimalFormatSymbols for locale " + loc);
Locale iculoc = TestUtil.toICUExtendedLocale(loc);
DecimalFormatSymbols decfsIcu = DecimalFormatSymbols.getInstance(iculoc);
if (isIcuImpl) {
if (!decfs.equals(decfsIcu)) {
errln("FAIL: getInstance returned ICU DecimalFormatSymbols for locale " + loc
+ ", but different from the one for locale " + iculoc);
}
} else {
if (!(decfsIcu instanceof com.ibm.icu.impl.jdkadapter.DecimalFormatSymbolsICU)) {
errln("FAIL: getInstance returned JDK DecimalFormatSymbols for locale " + iculoc);
}
if (!decfs.equals(decfsIcu)) {
errln("FAIL: getInstance returned ICU DecimalFormatSymbols for locale " + loc
+ ", but different from the one for locale " + iculoc);
}
}
}

19
icu4j/main/tests/localespi/src/com/ibm/icu/dev/test/localespi/NumberFormatTest.java
View file

@ -58,23 +58,14 @@ public class NumberFormatTest extends TestFmwk {
if (!isIcuImpl) {
errln("FAIL: " + method[0] + " returned JDK NumberFormat for locale " + loc);
}
} else {
if (isIcuImpl) {
logln("INFO: " + method[0] + " returned ICU NumberFormat for locale " + loc);
}
} else if (isIcuImpl) {
logln("INFO: " + method[0] + " returned ICU NumberFormat for locale " + loc);
Locale iculoc = TestUtil.toICUExtendedLocale(loc);
NumberFormat nfIcu = null;
nfIcu = getJDKInstance(type, iculoc, null);
if (isIcuImpl) {
if (!nf.equals(nfIcu)) {
errln("FAIL: " + method[0] + " returned ICU NumberFormat for locale " + loc
+ ", but different from the one for locale " + iculoc);
}
} else {
if (!(nfIcu instanceof com.ibm.icu.impl.jdkadapter.DecimalFormatICU)
&& !(nfIcu instanceof com.ibm.icu.impl.jdkadapter.NumberFormatICU)) {
errln("FAIL: " + method[0] + " returned JDK NumberFormat for locale " + iculoc);
}
if (!nf.equals(nfIcu)) {
errln("FAIL: " + method[0] + " returned ICU NumberFormat for locale " + loc
+ ", but different from the one for locale " + iculoc);
}
}
}

72
icu4j/main/tests/localespi/src/com/ibm/icu/dev/test/localespi/TestUtil.java
View file

@ -70,80 +70,30 @@ public class TestUtil {
return o1.equals(o2);
}
private static final boolean SUNJRE;
private static final boolean IBMJRE;
private static final Set<Locale> ICU_LOCALES = new HashSet<>();
static {
String javaVendor = System.getProperty("java.vendor");
if (javaVendor != null) {
if (javaVendor.indexOf("Sun") >= 0) {
SUNJRE = true;
IBMJRE = false;
} else if (javaVendor.indexOf("IBM") >= 0) {
SUNJRE = false;
IBMJRE = true;
} else {
SUNJRE = false;
IBMJRE = false;
ULocale[] icuULocales = ULocale.getAvailableLocales();
for (ULocale icuULoc : icuULocales) {
Locale jdkLoc = icuULoc.toLocale();
// Make sure nothing lost
ULocale uloc = ULocale.forLocale(jdkLoc);
if (icuULoc.equals(uloc)) {
ICU_LOCALES.add(jdkLoc);
}
} else {
SUNJRE = false;
IBMJRE = false;
}
}
public static boolean isSUNJRE() {
return SUNJRE;
}
public static boolean isIBMJRE() {
return IBMJRE;
}
private static final Set<Locale> EXCLUDED_LOCALES = new HashSet<Locale>();
static {
EXCLUDED_LOCALES.add(Locale.ROOT);
// de-GR is supported by Java 8, but not supported by CLDR / ICU
EXCLUDED_LOCALES.add(new Locale("de", "GR"));
}
/*
* Checks if the given locale is excluded from locale SPI test
*/
public static boolean isExcluded(Locale loc) {
if (EXCLUDED_LOCALES.contains(loc)) {
if (Locale.ROOT.equals(loc)) {
return true;
}
return isProblematicIBMLocale(loc);
}
/*
* Ticket#6368
*
* The ICU4J locale spi test cases reports many errors on IBM Java 6. There are two kinds
* of problems observed and both of them look like implementation problems in IBM Java 6.
*
* - When a locale has variant field (for example, sr_RS_Cyrl, de_DE_PREEURO), adding ICU
* suffix in the variant field (for example, sr_RS_Cyrl_ICU, de_DE_PREEURO_ICU) has no effects.
* For these locales, IBM JRE 6 ignores installed Locale providers.
*
* - For "sh" sublocales with "ICU" variant (for example, sh__ICU, sh_CS_ICU), IBM JRE 6 also
* ignores installed ICU locale providers. Probably, "sh" is internally mapped to "sr_RS_Cyrl"
* internally before locale look up.
*
* For now, we exclude these problematic locales from locale spi test cases on IBM Java 6.
*/
public static boolean isProblematicIBMLocale(Locale loc) {
if (!isIBMJRE()) {
if (isICUExtendedLocale(loc)) {
return false;
}
if (loc.getLanguage().equals("sh")) {
return true;
}
String variant = loc.getVariant();
if (variant.startsWith("EURO") || variant.startsWith("PREEURO")
|| variant.startsWith("Cyrl") || variant.startsWith("Latn")) {
return true;
}
return false;
return !ICU_LOCALES.contains(loc);
}
}

2
icu4j/main/tests/localespi/src/com/ibm/icu/dev/test/localespi/TimeZoneNameTest.java
View file

@ -26,7 +26,7 @@ import com.ibm.icu.util.ULocale;
@RunWith(JUnit4.class)
public class TimeZoneNameTest extends TestFmwk {
private static final Set<String> ProblematicZones = new HashSet<String>();
private static final Set<String> ProblematicZones = new HashSet<>();
static {
// Since tzdata2013e, Pacific/Johnston is defined as below:
//