ICU-13536 Moving the six test tree classes from public packages to "dev" packages.

X-SVN-Rev: 40765

diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/CurrencyPluralInfo.java b/icu4j/main/classes/core/src/com/ibm/icu/text/CurrencyPluralInfo.java
index 3e89cdb3f3b75d6e7a7f9330a0728ac21f1c74df..afc0c2ec4ea97e210a63e157513cf8e890e79bc7 100644 (file)
--- a/icu4j/main/classes/core/src/com/ibm/icu/text/CurrencyPluralInfo.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/text/CurrencyPluralInfo.java
@@ -260,7 +260,7 @@ public class CurrencyPluralInfo implements Cloneable, Serializable {
      * @deprecated This API is ICU internal only.
      */
     @Deprecated
-    String select(PluralRules.FixedDecimal numberInfo) {
+    public String select(PluralRules.FixedDecimal numberInfo) {
         return pluralRules.select(numberInfo);
     }
 
@@ -268,8 +268,11 @@ public class CurrencyPluralInfo implements Cloneable, Serializable {
      * Currency plural pattern iterator.
      *
      * @return a iterator on the currency plural pattern key set.
+     * @internal
+     * @deprecated This API is ICU internal only.
      */
-    Iterator<String> pluralPatternIterator() {
+    @Deprecated
+    public Iterator<String> pluralPatternIterator() {
         return pluralCountToCurrencyUnitPattern.keySet().iterator();
     }
 

diff --git a/icu4j/main/tests/core/src/com/ibm/icu/impl/number/DecimalQuantity_64BitBCD.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/impl/number/DecimalQuantity_64BitBCD.java
similarity index 96%
rename from icu4j/main/tests/core/src/com/ibm/icu/impl/number/DecimalQuantity_64BitBCD.java
rename to icu4j/main/tests/core/src/com/ibm/icu/dev/impl/number/DecimalQuantity_64BitBCD.java
index c968a0abc52da1f62b09c32e23750512e025abdc..54f5cec9ad52ca223703e1aa4103ad0c04cff330 100644 (file)
--- a/icu4j/main/tests/core/src/com/ibm/icu/impl/number/DecimalQuantity_64BitBCD.java
+++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/impl/number/DecimalQuantity_64BitBCD.java
@@ -1,10 +1,13 @@
 // © 2017 and later: Unicode, Inc. and others.
 // License & terms of use: http://www.unicode.org/copyright.html#License
-package com.ibm.icu.impl.number;
+package com.ibm.icu.dev.impl.number;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
 
+import com.ibm.icu.impl.number.DecimalQuantity;
+import com.ibm.icu.impl.number.DecimalQuantity_AbstractBCD;
+
 public final class DecimalQuantity_64BitBCD extends DecimalQuantity_AbstractBCD {
 
   /**

diff --git a/icu4j/main/tests/core/src/com/ibm/icu/impl/number/DecimalQuantity_ByteArrayBCD.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/impl/number/DecimalQuantity_ByteArrayBCD.java
similarity index 97%
rename from icu4j/main/tests/core/src/com/ibm/icu/impl/number/DecimalQuantity_ByteArrayBCD.java
rename to icu4j/main/tests/core/src/com/ibm/icu/dev/impl/number/DecimalQuantity_ByteArrayBCD.java
index f0198109bffee3d3a11c957cd88cb565957f8763..7012e845253fd867e62f2b21953950310e7c13bf 100644 (file)
--- a/icu4j/main/tests/core/src/com/ibm/icu/impl/number/DecimalQuantity_ByteArrayBCD.java
+++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/impl/number/DecimalQuantity_ByteArrayBCD.java
@@ -1,10 +1,13 @@
 // © 2017 and later: Unicode, Inc. and others.
 // License & terms of use: http://www.unicode.org/copyright.html#License
-package com.ibm.icu.impl.number;
+package com.ibm.icu.dev.impl.number;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
 
+import com.ibm.icu.impl.number.DecimalQuantity;
+import com.ibm.icu.impl.number.DecimalQuantity_AbstractBCD;
+
 public final class DecimalQuantity_ByteArrayBCD extends DecimalQuantity_AbstractBCD {
 
   /**

diff --git a/icu4j/main/tests/core/src/com/ibm/icu/impl/number/DecimalQuantity_SimpleStorage.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/impl/number/DecimalQuantity_SimpleStorage.java
similarity index 99%
rename from icu4j/main/tests/core/src/com/ibm/icu/impl/number/DecimalQuantity_SimpleStorage.java
rename to icu4j/main/tests/core/src/com/ibm/icu/dev/impl/number/DecimalQuantity_SimpleStorage.java
index e078020c3fbf46c87cbe2d71da133e1ac99374c6..d0da60bc3041551ea1c7e729af8d0316464f5c4a 100644 (file)
--- a/icu4j/main/tests/core/src/com/ibm/icu/impl/number/DecimalQuantity_SimpleStorage.java
+++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/impl/number/DecimalQuantity_SimpleStorage.java
@@ -1,6 +1,6 @@
 // © 2017 and later: Unicode, Inc. and others.
 // License & terms of use: http://www.unicode.org/copyright.html#License
-package com.ibm.icu.impl.number;
+package com.ibm.icu.dev.impl.number;
 
 import java.math.BigDecimal;
 import java.math.MathContext;
@@ -8,6 +8,7 @@ import java.math.RoundingMode;
 import java.text.FieldPosition;
 
 import com.ibm.icu.impl.StandardPlural;
+import com.ibm.icu.impl.number.DecimalQuantity;
 import com.ibm.icu.text.PluralRules;
 import com.ibm.icu.text.PluralRules.Operand;
 import com.ibm.icu.text.UFieldPosition;

diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/NumberFormatDataDrivenTest.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/NumberFormatDataDrivenTest.java
index 6cd17dfe19e317e582b98d87c9d953d42304b1f3..e801f564e62b1ef343fcd4444e31e14d4fd3da34 100644 (file)
--- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/NumberFormatDataDrivenTest.java
+++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/NumberFormatDataDrivenTest.java
@@ -10,6 +10,7 @@ import java.text.ParsePosition;
 import org.junit.Test;
 
 import com.ibm.icu.dev.test.TestUtil;
+import com.ibm.icu.dev.text.DecimalFormat_ICU58;
 import com.ibm.icu.impl.number.DecimalFormatProperties;
 import com.ibm.icu.impl.number.Padder.PadPosition;
 import com.ibm.icu.impl.number.Parse;
@@ -21,7 +22,6 @@ import com.ibm.icu.number.NumberFormatter;
 import com.ibm.icu.text.DecimalFormat;
 import com.ibm.icu.text.DecimalFormat.PropertySetter;
 import com.ibm.icu.text.DecimalFormatSymbols;
-import com.ibm.icu.text.DecimalFormat_ICU58;
 import com.ibm.icu.util.CurrencyAmount;
 import com.ibm.icu.util.ULocale;
 

diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/NumberFormatTest.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/NumberFormatTest.java
index c7b7282acdad3eb3bfcbb4f6be5999b4ee0ae8a3..e4c79b7379dfdd858fb09693d6dd67b7de3e639d 100644 (file)
--- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/NumberFormatTest.java
+++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/NumberFormatTest.java
@@ -42,6 +42,7 @@ import org.junit.runners.JUnit4;
 import com.ibm.icu.dev.test.TestFmwk;
 import com.ibm.icu.dev.test.TestUtil;
 import com.ibm.icu.dev.test.format.IntlTestDecimalFormatAPIC.FieldContainer;
+import com.ibm.icu.dev.text.DecimalFormat_ICU58;
 import com.ibm.icu.impl.ICUConfig;
 import com.ibm.icu.impl.LocaleUtility;
 import com.ibm.icu.impl.data.ResourceReader;
@@ -54,7 +55,6 @@ import com.ibm.icu.text.CurrencyPluralInfo;
 import com.ibm.icu.text.DecimalFormat;
 import com.ibm.icu.text.DecimalFormat.PropertySetter;
 import com.ibm.icu.text.DecimalFormatSymbols;
-import com.ibm.icu.text.DecimalFormat_ICU58;
 import com.ibm.icu.text.DisplayContext;
 import com.ibm.icu.text.MeasureFormat;
 import com.ibm.icu.text.NumberFormat;

diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/number/DecimalQuantityTest.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/number/DecimalQuantityTest.java
index d8ce44129bb23c019776351a7cc8151281824682..e9a60f2101d8ac8e4ab2390fa45522d9fdb6e85d 100644 (file)
--- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/number/DecimalQuantityTest.java
+++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/number/DecimalQuantityTest.java
@@ -15,13 +15,13 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
+import com.ibm.icu.dev.impl.number.DecimalQuantity_64BitBCD;
+import com.ibm.icu.dev.impl.number.DecimalQuantity_ByteArrayBCD;
+import com.ibm.icu.dev.impl.number.DecimalQuantity_SimpleStorage;
 import com.ibm.icu.dev.test.TestFmwk;
 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;

diff --git a/icu4j/main/tests/core/src/com/ibm/icu/text/DecimalFormat_ICU58.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/text/DecimalFormat_ICU58.java
similarity index 99%
rename from icu4j/main/tests/core/src/com/ibm/icu/text/DecimalFormat_ICU58.java
rename to icu4j/main/tests/core/src/com/ibm/icu/dev/text/DecimalFormat_ICU58.java
index 147627495593515fab754ad564f5e99496fff162..0fa9d8896ce0d08f5908fd3f2fff2a903691d29d 100644 (file)
--- a/icu4j/main/tests/core/src/com/ibm/icu/text/DecimalFormat_ICU58.java
+++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/text/DecimalFormat_ICU58.java
@@ -6,7 +6,7 @@
  * others. All Rights Reserved.
  *******************************************************************************
  */
-package com.ibm.icu.text;
+package com.ibm.icu.dev.text;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;
@@ -29,7 +29,13 @@ import com.ibm.icu.impl.Utility;
 import com.ibm.icu.lang.UCharacter;
 import com.ibm.icu.math.BigDecimal;
 import com.ibm.icu.math.MathContext;
+import com.ibm.icu.text.CurrencyPluralInfo;
+import com.ibm.icu.text.DecimalFormatSymbols;
+import com.ibm.icu.text.NumberFormat;
 import com.ibm.icu.text.PluralRules.FixedDecimal;
+import com.ibm.icu.text.UFieldPosition;
+import com.ibm.icu.text.UTF16;
+import com.ibm.icu.text.UnicodeSet;
 import com.ibm.icu.util.Currency;
 import com.ibm.icu.util.Currency.CurrencyUsage;
 import com.ibm.icu.util.CurrencyAmount;
@@ -5217,7 +5223,10 @@ public class DecimalFormat_ICU58 extends NumberFormat {
             negSuffixPattern = posSuffixPattern;
             negPrefixPattern = PATTERN_MINUS_SIGN + posPrefixPattern;
         }
-        setLocale(null, null);
+
+        // Can't call setLocale when not in the right package:
+        //setLocale(null, null);
+
         // save the pattern
         formatPattern = pattern;
 

diff --git a/icu4j/main/tests/core/src/com/ibm/icu/text/DigitList.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/text/DigitList.java
similarity index 99%
rename from icu4j/main/tests/core/src/com/ibm/icu/text/DigitList.java
rename to icu4j/main/tests/core/src/com/ibm/icu/dev/text/DigitList.java
index 2174b1010e9efb36175815bbdd6c30115d6beeb9..1d80c5b08a2fa70eac3841b42b0dea00cf0c2e13 100644 (file)
--- a/icu4j/main/tests/core/src/com/ibm/icu/text/DigitList.java
+++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/text/DigitList.java
@@ -6,10 +6,13 @@
  * others. All Rights Reserved.                                                *
  *******************************************************************************
  */
-package com.ibm.icu.text;
+package com.ibm.icu.dev.text;
 
 import java.math.BigInteger;
 
+import com.ibm.icu.text.DecimalFormat;
+import com.ibm.icu.text.NumberFormat;
+
 /**
  * <code>DigitList</code> handles the transcoding between numeric values and
  * strings of characters.  It only represents non-negative numbers.  The

diff --git a/icu4j/main/tests/core/src/com/ibm/icu/text/DigitListTest.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/text/DigitListTest.java
similarity index 97%
rename from icu4j/main/tests/core/src/com/ibm/icu/text/DigitListTest.java
rename to icu4j/main/tests/core/src/com/ibm/icu/dev/text/DigitListTest.java
index d84a6a11e4d3fd0462fd11c179f7faf7407b5b6c..ac2153065db61421626d6e95feed980b98e30e61 100644 (file)
--- a/icu4j/main/tests/core/src/com/ibm/icu/text/DigitListTest.java
+++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/text/DigitListTest.java
@@ -1,7 +1,7 @@
 // © 2016 and later: Unicode, Inc. and others.
 // License & terms of use: http://www.unicode.org/copyright.html#License
 
-package com.ibm.icu.text;
+package com.ibm.icu.dev.text;
 
 import org.junit.Before;
 import org.junit.Test;