Update testdata/units/* to CLDR commit 19daf508 dated 2020-02-29.

diff --git a/icu4c/source/test/testdata/units/unitPreferencesTest.txt b/icu4c/source/test/testdata/units/unitPreferencesTest.txt
index dd7518789d62a0a07683cad32aded7d8a48db75b..49ee7c74ff686c6ed995d58839f84762f43ff0ad 100644 (file)
--- a/icu4c/source/test/testdata/units/unitPreferencesTest.txt
+++ b/icu4c/source/test/testdata/units/unitPreferencesTest.txt
@@ -1,7 +1,6 @@
-# This file is a copy of common/testData/units/unitPreferencesTest.txt from
-# CLDR.
-# TODO(hugovdm): determine a good update procedure and document it.
-#
+# This file is a copy of common/testData/units/unitPreferencesTest.txt from CLDR.
+# WIP/TODO(hugovdm): determine a good update procedure and document it.
+
 # Test data for unit preferences
 # Format:
 #   Quantity;   Usage;  Region; Input (r);  Input (d);  Input Unit; Output (r); Output (d); Output Unit
@@ -312,17 +311,17 @@ pressure;   baromtrc;   001;    110;    110.0;  kilogram-per-meter-square-second
 pressure;   baromtrc;   001;    100;    100.0;  kilogram-per-meter-square-second;   1;  1.0;    hectopascal
 pressure;   baromtrc;   001;    90; 90.0;   kilogram-per-meter-square-second;   9 / 10; 0.9;    hectopascal
 
-pressure;   baromtrc;   IN; 37250279 / 10000;   3725.0279;  kilogram-per-meter-square-second;   11 / 10;    1.1;    inch-hg
-pressure;   baromtrc;   IN; 3386389 / 1000; 3386.389;   kilogram-per-meter-square-second;   1;  1.0;    inch-hg
-pressure;   baromtrc;   IN; 30477501 / 10000;   3047.7501;  kilogram-per-meter-square-second;   9 / 10; 0.9;    inch-hg
+pressure;   baromtrc;   IN; 37250279 / 10000;   3725.0279;  kilogram-per-meter-square-second;   11 / 10;    1.1;    inch-ofhg
+pressure;   baromtrc;   IN; 3386389 / 1000; 3386.389;   kilogram-per-meter-square-second;   1;  1.0;    inch-ofhg
+pressure;   baromtrc;   IN; 30477501 / 10000;   3047.7501;  kilogram-per-meter-square-second;   9 / 10; 0.9;    inch-ofhg
 
 pressure;   baromtrc;   BR; 110;    110.0;  kilogram-per-meter-square-second;   11 / 10;    1.1;    millibar
 pressure;   baromtrc;   BR; 100;    100.0;  kilogram-per-meter-square-second;   1;  1.0;    millibar
 pressure;   baromtrc;   BR; 90; 90.0;   kilogram-per-meter-square-second;   9 / 10; 0.9;    millibar
 
-pressure;   baromtrc;   MX; 44583 / 3040;   14.66546052631579;  kilogram-per-meter-square-second;   11 / 10;    1.1;    millimeter-of-mercury
-pressure;   baromtrc;   MX; 4053 / 304; 13.33223684210526;  kilogram-per-meter-square-second;   1;  1.0;    millimeter-of-mercury
-pressure;   baromtrc;   MX; 36477 / 3040;   11.99901315789474;  kilogram-per-meter-square-second;   9 / 10; 0.9;    millimeter-of-mercury
+pressure;   baromtrc;   MX; 44583 / 3040;   14.66546052631579;  kilogram-per-meter-square-second;   11 / 10;    1.1;    millimeter-ofhg
+pressure;   baromtrc;   MX; 4053 / 304; 13.33223684210526;  kilogram-per-meter-square-second;   1;  1.0;    millimeter-ofhg
+pressure;   baromtrc;   MX; 36477 / 3040;   11.99901315789474;  kilogram-per-meter-square-second;   9 / 10; 0.9;    millimeter-ofhg
 
 pressure;   default;    001;    1100000;    1100000.0;  kilogram-per-meter-square-second;   11 / 10;    1.1;    megapascal
 pressure;   default;    001;    1000000;    1000000.0;  kilogram-per-meter-square-second;   1;  1.0;    megapascal

diff --git a/icu4c/source/test/testdata/units/unitsTest.txt b/icu4c/source/test/testdata/units/unitsTest.txt
index b648cc5f2a4a21376b1be4be1321e3a0befb9a6f..855834d4ab7b6493825229ec2ce28443d4fbb9c2 100644 (file)
--- a/icu4c/source/test/testdata/units/unitsTest.txt
+++ b/icu4c/source/test/testdata/units/unitsTest.txt
@@ -1,6 +1,6 @@
 # This file is a copy of common/testData/units/unitsTest.txt from CLDR.
-# TODO(hugovdm): determine a good update procedure and document it.
-#
+# WIP/TODO(hugovdm): determine a good update procedure and document it.
+
 # Test data for unit conversions
 # Format:
 #   Quantity    ;   x   ;   y   ;   conversion to y (rational)  ;   test: 1000 x ⟹ y
@@ -114,7 +114,7 @@ mass    ;   metric-ton  ;   kilogram    ;   1000 * x    ;   1000000.0
 mass    ;   earth-mass  ;   kilogram    ;   5972200000000000000000000 * x   ;   5.9722E27
 mass    ;   solar-mass  ;   kilogram    ;   1988470000000000000000000000000 * x ;   1.98847E33
 mass-density    ;   milligram-per-deciliter ;   kilogram-per-cubic-meter    ;   1 / 100 * x ;   10.0
-portion ;   part-per-million    ;   portion ;   1 / 1000000 * x ;   0.001
+portion ;   permillion  ;   portion ;   1 / 1000000 * x ;   0.001
 portion ;   permyriad   ;   portion ;   1 / 10000 * x   ;   0.1
 portion ;   permille    ;   portion ;   1 / 1000 * x    ;   1.0
 portion ;   percent ;   portion ;   1 / 100 * x ;   10.0
@@ -127,11 +127,11 @@ power   ;   megawatt    ;   kilogram-square-meter-per-cubic-second  ;   1000000
 power   ;   gigawatt    ;   kilogram-square-meter-per-cubic-second  ;   1000000000 * x  ;   1.0E12
 power   ;   solar-luminosity    ;   kilogram-square-meter-per-cubic-second  ;   382800000000000000000000000 * x ;   3.828E29
 pressure    ;   pascal  ;   kilogram-per-meter-square-second    ;   1 * x   ;   1000.0
-pressure    ;   millimeter-of-mercury   ;   kilogram-per-meter-square-second    ;   4053 / 304 * x  ;   13332.24
+pressure    ;   millimeter-ofhg   ;   kilogram-per-meter-square-second    ;   4053 / 304 * x  ;   13332.24
 pressure    ;   hectopascal ;   kilogram-per-meter-square-second    ;   100 * x ;   100000.0
 pressure    ;   millibar    ;   kilogram-per-meter-square-second    ;   100 * x ;   100000.0
 pressure    ;   kilopascal  ;   kilogram-per-meter-square-second    ;   1000 * x    ;   1000000.0
-pressure    ;   inch-hg ;   kilogram-per-meter-square-second    ;   3386389 / 1000 * x  ;   3386389.0
+pressure    ;   inch-ofhg   ;   kilogram-per-meter-square-second    ;   3386389 / 1000 * x  ;   338638.8
 pressure    ;   pound-force-per-square-inch ;   kilogram-meter-per-square-meter-square-second   ;   8896443230521 / 1290320000 * x  ;   6894757.0
 pressure    ;   bar ;   kilogram-per-meter-square-second    ;   100000 * x  ;   1.0E8
 pressure    ;   atmosphere  ;   kilogram-per-meter-square-second    ;   101325 * x  ;   1.01325E8