ICU-13177 Merging trunk to branch

X-SVN-Rev: 40460

diff --cc icu4c/LICENSE
index c5295daeefff12bd181de967bc0665a6cab9f9f6,c84076cd072b806782999d6f4672df93cac1d3c6..749c642306ee83393a7a1cddabf721f6687ba488
--- 1/icu4c/LICENSE
--- 2/icu4c/LICENSE
+++ b/icu4c/LICENSE
@@@ -1,3 -1,3 +1,6 @@@
++// © 2016 and later: Unicode, Inc. and others.
++// License & terms of use: http://www.unicode.org/copyright.html
++
  COPYRIGHT AND PERMISSION NOTICE (ICU 58 and later)
  
  Copyright © 1991-2017 Unicode, Inc. All rights reserved.

diff --cc icu4c/source/test/intltest/numfmtst.cpp
Simple merge

diff --cc icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/CompactDecimalFormatTest.java
index 6f6140fdc6723c227dab79067c6e0a55a8fbf303,cdc2694c39b1a949e83d750c559ec5083da45792..ee7c55a37ab9627236ad50a5bfe5854244fbf50a
--- 1/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/CompactDecimalFormatTest.java
--- 2/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/CompactDecimalFormatTest.java
+++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/CompactDecimalFormatTest.java
@@@ -25,9 -25,11 +25,11 @@@ import java.util.Locale
  import java.util.Map;
  
  import org.junit.Test;
+ import org.junit.runner.RunWith;
+ import org.junit.runners.JUnit4;
  
  import com.ibm.icu.dev.test.TestFmwk;
 -import com.ibm.icu.impl.number.Properties;
 +import com.ibm.icu.impl.number.DecimalFormatProperties;
  import com.ibm.icu.text.CompactDecimalFormat;
  import com.ibm.icu.text.CompactDecimalFormat.CompactStyle;
  import com.ibm.icu.text.DecimalFormat;

diff --cc icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/IntlTestDecimalFormatAPI.java
Simple merge

diff --cc icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/IntlTestDecimalFormatAPIC.java
Simple merge

diff --cc icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/IntlTestDecimalFormatSymbols.java
Simple merge

diff --cc icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/IntlTestDecimalFormatSymbolsC.java
Simple merge

diff --cc icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/MeasureUnitTest.java
Simple merge

diff --cc icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/NumberFormatRegressionTest.java
Simple merge

diff --cc icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/NumberFormatTest.java
Simple merge

diff --cc icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/NumberRegressionTests.java
Simple merge

diff --cc icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/PluralRulesTest.java
Simple merge

diff --cc icu4j/main/tests/core/src/com/ibm/icu/dev/test/number/DecimalQuantityTest.java
index 7bda67cc99832a0b288791898a857374bf4759e7,4ff797f7e6684782a77b877fd1e446a95d79a7fb..411ec3935a0022ba6710c4cf3d273dd3e09e4021
--- 1/icu4j/main/tests/core/src/com/ibm/icu/dev/test/number/DecimalQuantityTest.java
--- 2/icu4j/main/tests/core/src/com/ibm/icu/dev/test/number/FormatQuantityTest.java
+++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/number/DecimalQuantityTest.java
@@@ -10,26 -10,25 +10,28 @@@ import java.util.ArrayList
  import java.util.List;
  import java.util.Random;
  
 +import org.junit.Ignore;
  import org.junit.Test;
+ import org.junit.runner.RunWith;
+ import org.junit.runners.JUnit4;
  
  import com.ibm.icu.dev.test.TestFmwk;
 -import com.ibm.icu.impl.number.Endpoint;
 -import com.ibm.icu.impl.number.Format;
 -import com.ibm.icu.impl.number.FormatQuantity;
 -import com.ibm.icu.impl.number.FormatQuantity1;
 -import com.ibm.icu.impl.number.FormatQuantity2;
 -import com.ibm.icu.impl.number.FormatQuantity3;
 -import com.ibm.icu.impl.number.FormatQuantity4;
 -import com.ibm.icu.impl.number.Properties;
 +import com.ibm.icu.impl.number.DecimalFormatProperties;
 +import com.ibm.icu.impl.number.DecimalQuantity;
 +import com.ibm.icu.impl.number.DecimalQuantity_64BitBCD;
 +import com.ibm.icu.impl.number.DecimalQuantity_ByteArrayBCD;
 +import com.ibm.icu.impl.number.DecimalQuantity_DualStorageBCD;
 +import com.ibm.icu.impl.number.DecimalQuantity_SimpleStorage;
 +import com.ibm.icu.number.LocalizedNumberFormatter;
 +import com.ibm.icu.number.NumberFormatter;
  import com.ibm.icu.text.CompactDecimalFormat.CompactStyle;
 +import com.ibm.icu.text.DecimalFormatSymbols;
 +import com.ibm.icu.util.ULocale;
  
--/** TODO: This is a temporary name for this class. Suggestions for a better name? */
+ @RunWith(JUnit4.class)
 -public class FormatQuantityTest extends TestFmwk {
 +public class DecimalQuantityTest extends TestFmwk {
  
 +  @Ignore
    @Test
    public void testBehavior() throws ParseException {