From: Shane Carr Date: Mon, 8 Jan 2018 21:41:15 +0000 (+0000) Subject: ICU-13536 Moving the six test tree classes from public packages to "dev" packages. X-Git-Tag: release-61-rc~151 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a111b4ed9095ef650ddf5adbb6ee06f344fa4c6c;p=icu 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 3e89cdb3f3b..afc0c2ec4ea 100644 --- 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 pluralPatternIterator() { + @Deprecated + public Iterator 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 c968a0abc52..54f5cec9ad5 100644 --- 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 f0198109bff..7012e845253 100644 --- 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 e078020c3fb..d0da60bc304 100644 --- 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 6cd17dfe19e..e801f564e62 100644 --- 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 c7b7282acda..e4c79b7379d 100644 --- 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 d8ce44129bb..e9a60f2101d 100644 --- 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 14762749559..0fa9d8896ce 100644 --- 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 2174b1010e9..1d80c5b08a2 100644 --- 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; + /** * DigitList 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 d84a6a11e4d..ac2153065db 100644 --- 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;