From 4f75c627675b426938f569003ee9dc0ea43490bb Mon Sep 17 00:00:00 2001 From: yumaoka Date: Mon, 25 Mar 2024 12:30:54 -0400 Subject: [PATCH] ICU-22534 BRS75 clean up import statements --- .../icu/dev/test/message2/Mf2FeaturesTest.java | 14 ++++++++------ .../com/ibm/icu/impl/CalendarAstronomer.java | 1 - .../main/java/com/ibm/icu/impl/ZoneMeta.java | 2 -- .../icu/message2/DateTimeFormatterFactory.java | 3 ++- .../com/ibm/icu/message2/FormattedMessage.java | 3 ++- .../ibm/icu/message2/MFDataModelFormatter.java | 14 +++++++------- .../ibm/icu/message2/MFDataModelValidator.java | 9 +++++---- .../com/ibm/icu/message2/MFSerializer.java | 7 ++++--- .../icu/message2/NumberFormatterFactory.java | 13 +++++++------ .../message2/PlainStringFormattedValue.java | 5 +++-- .../icu/number/NumberRangeFormatterImpl.java | 2 -- .../ibm/icu/text/RuleBasedBreakIterator.java | 2 +- .../ibm/icu/dev/test/calendar/AstroTest.java | 2 -- .../com/ibm/icu/dev/test/message2/Args.java | 3 ++- .../ibm/icu/dev/test/message2/CoreTest.java | 4 +++- .../CustomFormatterGrammarCaseTest.java | 12 +++++++----- .../test/message2/CustomFormatterListTest.java | 16 +++++++++------- .../CustomFormatterMessageRefTest.java | 18 ++++++++++-------- .../message2/CustomFormatterPersonTest.java | 14 ++++++++------ .../dev/test/message2/DataModelErrorsTest.java | 10 +++++----- .../dev/test/message2/FirstReleaseTests.java | 4 +++- .../icu/dev/test/message2/FunctionsTest.java | 6 ++++-- .../dev/test/message2/IcuFunctionsTest.java | 6 ++++-- .../dev/test/message2/MessageFormat2Test.java | 18 ++++++++++-------- .../ibm/icu/dev/test/message2/Mf2IcuTest.java | 14 ++++++++------ .../icu/dev/test/message2/ParserSmokeTest.java | 8 +++++--- .../SelectorsWithVariousArgumentsTest.java | 4 +++- .../dev/test/message2/SerializationTest.java | 7 ++++--- .../dev/test/message2/SyntaxErrorsTest.java | 8 ++++---- .../ibm/icu/dev/test/message2/TestUtils.java | 10 ++++++---- .../ibm/icu/dev/test/perf/UnicodeSetPerf.java | 1 - 31 files changed, 134 insertions(+), 106 deletions(-) diff --git a/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/message2/Mf2FeaturesTest.java b/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/message2/Mf2FeaturesTest.java index dab8398e4e8..4bd787416b2 100644 --- a/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/message2/Mf2FeaturesTest.java +++ b/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/message2/Mf2FeaturesTest.java @@ -3,16 +3,18 @@ package com.ibm.icu.dev.test.message2; +import java.util.Date; +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.CoreTestFmwk; import com.ibm.icu.math.BigDecimal; import com.ibm.icu.util.Currency; import com.ibm.icu.util.CurrencyAmount; -import java.util.Date; -import java.util.Locale; -import java.util.Map; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.JUnit4; /** * Trying to show off most of the features in one place. diff --git a/icu4j/main/core/src/main/java/com/ibm/icu/impl/CalendarAstronomer.java b/icu4j/main/core/src/main/java/com/ibm/icu/impl/CalendarAstronomer.java index b15ea979cde..a6d98e297e0 100644 --- a/icu4j/main/core/src/main/java/com/ibm/icu/impl/CalendarAstronomer.java +++ b/icu4j/main/core/src/main/java/com/ibm/icu/impl/CalendarAstronomer.java @@ -10,7 +10,6 @@ package com.ibm.icu.impl; import java.util.Date; -import java.util.TimeZone; /** * CalendarAstronomer is a class that can perform the calculations to diff --git a/icu4j/main/core/src/main/java/com/ibm/icu/impl/ZoneMeta.java b/icu4j/main/core/src/main/java/com/ibm/icu/impl/ZoneMeta.java index 3b72fdb48fa..643887529fb 100644 --- a/icu4j/main/core/src/main/java/com/ibm/icu/impl/ZoneMeta.java +++ b/icu4j/main/core/src/main/java/com/ibm/icu/impl/ZoneMeta.java @@ -13,14 +13,12 @@ package com.ibm.icu.impl; import java.lang.ref.SoftReference; -import java.text.ParsePosition; import java.util.Collections; import java.util.Locale; import java.util.MissingResourceException; import java.util.Set; import java.util.TreeSet; -import com.ibm.icu.impl.Utility; import com.ibm.icu.util.Output; import com.ibm.icu.util.SimpleTimeZone; import com.ibm.icu.util.TimeZone; diff --git a/icu4j/main/core/src/main/java/com/ibm/icu/message2/DateTimeFormatterFactory.java b/icu4j/main/core/src/main/java/com/ibm/icu/message2/DateTimeFormatterFactory.java index a7381852522..0bed658128b 100644 --- a/icu4j/main/core/src/main/java/com/ibm/icu/message2/DateTimeFormatterFactory.java +++ b/icu4j/main/core/src/main/java/com/ibm/icu/message2/DateTimeFormatterFactory.java @@ -3,7 +3,6 @@ package com.ibm.icu.message2; -import com.ibm.icu.text.DateFormat; import java.util.Calendar; import java.util.Locale; import java.util.Map; @@ -11,6 +10,8 @@ import java.util.TimeZone; import java.util.regex.Matcher; import java.util.regex.Pattern; +import com.ibm.icu.text.DateFormat; + /** * Creates a {@link Formatter} doing formatting of date / time, similar to * {exp, date} and {exp, time} in {@link com.ibm.icu.text.MessageFormat}. diff --git a/icu4j/main/core/src/main/java/com/ibm/icu/message2/FormattedMessage.java b/icu4j/main/core/src/main/java/com/ibm/icu/message2/FormattedMessage.java index 19b8f2c6786..0bb0c442b58 100644 --- a/icu4j/main/core/src/main/java/com/ibm/icu/message2/FormattedMessage.java +++ b/icu4j/main/core/src/main/java/com/ibm/icu/message2/FormattedMessage.java @@ -3,9 +3,10 @@ package com.ibm.icu.message2; +import java.text.AttributedCharacterIterator; + import com.ibm.icu.text.ConstrainedFieldPosition; import com.ibm.icu.text.FormattedValue; -import java.text.AttributedCharacterIterator; /** * Not yet implemented: The result of a message formatting operation. diff --git a/icu4j/main/core/src/main/java/com/ibm/icu/message2/MFDataModelFormatter.java b/icu4j/main/core/src/main/java/com/ibm/icu/message2/MFDataModelFormatter.java index 7ea7f5a406d..6afaabd041b 100644 --- a/icu4j/main/core/src/main/java/com/ibm/icu/message2/MFDataModelFormatter.java +++ b/icu4j/main/core/src/main/java/com/ibm/icu/message2/MFDataModelFormatter.java @@ -3,6 +3,13 @@ package com.ibm.icu.message2; +import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Locale; +import java.util.Map; + import com.ibm.icu.message2.MFDataModel.Annotation; import com.ibm.icu.message2.MFDataModel.CatchallKey; import com.ibm.icu.message2.MFDataModel.Declaration; @@ -26,13 +33,6 @@ import com.ibm.icu.message2.MFDataModel.Variant; import com.ibm.icu.util.Calendar; import com.ibm.icu.util.CurrencyAmount; -import java.util.ArrayList; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Locale; -import java.util.Map; - /** * Takes an {@link MFDataModel} and formats it to a {@link String} * (and later on we will also implement formatting to a {@code FormattedMessage}). diff --git a/icu4j/main/core/src/main/java/com/ibm/icu/message2/MFDataModelValidator.java b/icu4j/main/core/src/main/java/com/ibm/icu/message2/MFDataModelValidator.java index 51a3c78866d..a17728434b3 100644 --- a/icu4j/main/core/src/main/java/com/ibm/icu/message2/MFDataModelValidator.java +++ b/icu4j/main/core/src/main/java/com/ibm/icu/message2/MFDataModelValidator.java @@ -3,6 +3,11 @@ package com.ibm.icu.message2; +import java.util.HashSet; +import java.util.List; +import java.util.Set; +import java.util.StringJoiner; + import com.ibm.icu.message2.MFDataModel.Annotation; import com.ibm.icu.message2.MFDataModel.CatchallKey; import com.ibm.icu.message2.MFDataModel.Declaration; @@ -21,10 +26,6 @@ import com.ibm.icu.message2.MFDataModel.SelectMessage; import com.ibm.icu.message2.MFDataModel.VariableExpression; import com.ibm.icu.message2.MFDataModel.VariableRef; import com.ibm.icu.message2.MFDataModel.Variant; -import java.util.HashSet; -import java.util.List; -import java.util.Set; -import java.util.StringJoiner; // I can merge all this in the MFDataModel class and make it private class MFDataModelValidator { diff --git a/icu4j/main/core/src/main/java/com/ibm/icu/message2/MFSerializer.java b/icu4j/main/core/src/main/java/com/ibm/icu/message2/MFSerializer.java index de5c47dea6a..58fcf81cba8 100644 --- a/icu4j/main/core/src/main/java/com/ibm/icu/message2/MFSerializer.java +++ b/icu4j/main/core/src/main/java/com/ibm/icu/message2/MFSerializer.java @@ -3,6 +3,10 @@ package com.ibm.icu.message2; +import java.util.List; +import java.util.Map; +import java.util.regex.Matcher; + import com.ibm.icu.message2.MFDataModel.Annotation; import com.ibm.icu.message2.MFDataModel.Attribute; import com.ibm.icu.message2.MFDataModel.CatchallKey; @@ -29,9 +33,6 @@ import com.ibm.icu.message2.MFDataModel.UnsupportedStatement; import com.ibm.icu.message2.MFDataModel.VariableExpression; import com.ibm.icu.message2.MFDataModel.VariableRef; import com.ibm.icu.message2.MFDataModel.Variant; -import java.util.List; -import java.util.Map; -import java.util.regex.Matcher; /** * This class serializes a MessageFormat 2 data model {@link MFDataModel.Message} to a string, diff --git a/icu4j/main/core/src/main/java/com/ibm/icu/message2/NumberFormatterFactory.java b/icu4j/main/core/src/main/java/com/ibm/icu/message2/NumberFormatterFactory.java index 2a1e92d8143..6cb6c56c45e 100644 --- a/icu4j/main/core/src/main/java/com/ibm/icu/message2/NumberFormatterFactory.java +++ b/icu4j/main/core/src/main/java/com/ibm/icu/message2/NumberFormatterFactory.java @@ -3,6 +3,13 @@ package com.ibm.icu.message2; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.Objects; + import com.ibm.icu.math.BigDecimal; import com.ibm.icu.number.FormattedNumber; import com.ibm.icu.number.LocalizedNumberFormatter; @@ -19,12 +26,6 @@ import com.ibm.icu.text.PluralRules; import com.ibm.icu.text.PluralRules.PluralType; import com.ibm.icu.util.CurrencyAmount; import com.ibm.icu.util.MeasureUnit; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Locale; -import java.util.Map; -import java.util.Objects; /** * Creates a {@link Formatter} doing numeric formatting, similar to {exp, number} diff --git a/icu4j/main/core/src/main/java/com/ibm/icu/message2/PlainStringFormattedValue.java b/icu4j/main/core/src/main/java/com/ibm/icu/message2/PlainStringFormattedValue.java index 9f27a02ed66..49d42ed5ffe 100644 --- a/icu4j/main/core/src/main/java/com/ibm/icu/message2/PlainStringFormattedValue.java +++ b/icu4j/main/core/src/main/java/com/ibm/icu/message2/PlainStringFormattedValue.java @@ -3,12 +3,13 @@ package com.ibm.icu.message2; -import com.ibm.icu.text.ConstrainedFieldPosition; -import com.ibm.icu.text.FormattedValue; import java.io.IOException; import java.io.UncheckedIOException; import java.text.AttributedCharacterIterator; +import com.ibm.icu.text.ConstrainedFieldPosition; +import com.ibm.icu.text.FormattedValue; + /** * Very-very rough implementation of FormattedValue, packaging a string. * Expect it to change. diff --git a/icu4j/main/core/src/main/java/com/ibm/icu/number/NumberRangeFormatterImpl.java b/icu4j/main/core/src/main/java/com/ibm/icu/number/NumberRangeFormatterImpl.java index 8fccd95153c..a26527342eb 100644 --- a/icu4j/main/core/src/main/java/com/ibm/icu/number/NumberRangeFormatterImpl.java +++ b/icu4j/main/core/src/main/java/com/ibm/icu/number/NumberRangeFormatterImpl.java @@ -17,8 +17,6 @@ import com.ibm.icu.impl.number.MacroProps; import com.ibm.icu.impl.number.MicroProps; import com.ibm.icu.impl.number.Modifier; import com.ibm.icu.impl.number.SimpleModifier; -import com.ibm.icu.impl.number.Modifier.Parameters; -import com.ibm.icu.impl.number.Modifier.Signum; import com.ibm.icu.impl.number.range.PrefixInfixSuffixLengthHelper; import com.ibm.icu.impl.number.range.RangeMacroProps; import com.ibm.icu.impl.number.range.StandardPluralRanges; diff --git a/icu4j/main/core/src/main/java/com/ibm/icu/text/RuleBasedBreakIterator.java b/icu4j/main/core/src/main/java/com/ibm/icu/text/RuleBasedBreakIterator.java index 9942200795c..9d54bd1aaa4 100644 --- a/icu4j/main/core/src/main/java/com/ibm/icu/text/RuleBasedBreakIterator.java +++ b/icu4j/main/core/src/main/java/com/ibm/icu/text/RuleBasedBreakIterator.java @@ -19,8 +19,8 @@ import java.io.InputStream; import java.io.OutputStream; import java.nio.ByteBuffer; import java.text.CharacterIterator; -import java.util.concurrent.ConcurrentLinkedQueue; import java.util.MissingResourceException; +import java.util.concurrent.ConcurrentLinkedQueue; import com.ibm.icu.impl.CharacterIteration; import com.ibm.icu.impl.ICUBinary; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/calendar/AstroTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/calendar/AstroTest.java index aaef1b79606..ab237f1c8d3 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/calendar/AstroTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/calendar/AstroTest.java @@ -8,7 +8,6 @@ */ package com.ibm.icu.dev.test.calendar; -import java.util.Date; import java.util.Locale; import org.junit.Test; @@ -19,7 +18,6 @@ import org.junit.runners.JUnit4; import com.ibm.icu.dev.test.CoreTestFmwk; import com.ibm.icu.impl.CalendarAstronomer; -import com.ibm.icu.impl.CalendarAstronomer.Ecliptic; import com.ibm.icu.impl.CalendarAstronomer.Equatorial; import com.ibm.icu.text.DateFormat; import com.ibm.icu.util.Calendar; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/message2/Args.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/message2/Args.java index 8eb18255638..6d37d97e5a8 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/message2/Args.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/message2/Args.java @@ -3,11 +3,12 @@ package com.ibm.icu.dev.test.message2; -import com.ibm.icu.message2.MessageFormatter; import java.util.Collections; import java.util.HashMap; import java.util.Map; +import com.ibm.icu.message2.MessageFormatter; + /** * Convenience class that provides the same functionality as * Map.of introduced in JDK 11, which can't be used yet for ICU4J. diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/message2/CoreTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/message2/CoreTest.java index 1b7013ee688..66c40ccfbdc 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/message2/CoreTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/message2/CoreTest.java @@ -3,12 +3,14 @@ package com.ibm.icu.dev.test.message2; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.io.Reader; + import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; +import com.ibm.icu.dev.test.CoreTestFmwk; + @SuppressWarnings({"static-method", "javadoc"}) @RunWith(JUnit4.class) public class CoreTest extends CoreTestFmwk { diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/message2/CustomFormatterGrammarCaseTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/message2/CustomFormatterGrammarCaseTest.java index 6627bda606e..3aa2e4e377e 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/message2/CustomFormatterGrammarCaseTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/message2/CustomFormatterGrammarCaseTest.java @@ -3,6 +3,13 @@ package com.ibm.icu.dev.test.message2; +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.CoreTestFmwk; import com.ibm.icu.message2.FormattedPlaceholder; import com.ibm.icu.message2.Formatter; @@ -10,11 +17,6 @@ import com.ibm.icu.message2.FormatterFactory; import com.ibm.icu.message2.MFFunctionRegistry; import com.ibm.icu.message2.MessageFormatter; import com.ibm.icu.message2.PlainStringFormattedValue; -import java.util.Locale; -import java.util.Map; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.JUnit4; /** * Showing a custom formatter that can handle grammatical cases. diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/message2/CustomFormatterListTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/message2/CustomFormatterListTest.java index 2600261a351..3242663b33a 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/message2/CustomFormatterListTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/message2/CustomFormatterListTest.java @@ -3,6 +3,15 @@ package com.ibm.icu.dev.test.message2; +import java.util.Arrays; +import java.util.Collection; +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.CoreTestFmwk; import com.ibm.icu.message2.FormattedPlaceholder; import com.ibm.icu.message2.Formatter; @@ -12,13 +21,6 @@ import com.ibm.icu.message2.PlainStringFormattedValue; import com.ibm.icu.text.ListFormatter; import com.ibm.icu.text.ListFormatter.Type; import com.ibm.icu.text.ListFormatter.Width; -import java.util.Arrays; -import java.util.Collection; -import java.util.Locale; -import java.util.Map; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.JUnit4; /** * Showing a custom formatter for a list, using the existing ICU {@link ListFormatter}. diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/message2/CustomFormatterMessageRefTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/message2/CustomFormatterMessageRefTest.java index 19abca79c37..362ff351e17 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/message2/CustomFormatterMessageRefTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/message2/CustomFormatterMessageRefTest.java @@ -3,20 +3,22 @@ package com.ibm.icu.dev.test.message2; +import java.util.Locale; +import java.util.Map; +import java.util.Properties; + +import org.junit.BeforeClass; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; + import com.ibm.icu.dev.test.CoreTestFmwk; -import com.ibm.icu.message2.PlainStringFormattedValue; import com.ibm.icu.message2.FormattedPlaceholder; import com.ibm.icu.message2.Formatter; import com.ibm.icu.message2.FormatterFactory; import com.ibm.icu.message2.MFFunctionRegistry; import com.ibm.icu.message2.MessageFormatter; -import java.util.Locale; -import java.util.Map; -import java.util.Properties; -import org.junit.BeforeClass; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.JUnit4; +import com.ibm.icu.message2.PlainStringFormattedValue; /** * Showing a custom formatter that can implement message references. diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/message2/CustomFormatterPersonTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/message2/CustomFormatterPersonTest.java index 71a322f0715..0fec7a46b4e 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/message2/CustomFormatterPersonTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/message2/CustomFormatterPersonTest.java @@ -3,18 +3,20 @@ package com.ibm.icu.dev.test.message2; +import java.util.Locale; +import java.util.Map; +import java.util.Objects; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; + import com.ibm.icu.dev.test.CoreTestFmwk; import com.ibm.icu.message2.FormattedPlaceholder; import com.ibm.icu.message2.Formatter; import com.ibm.icu.message2.FormatterFactory; import com.ibm.icu.message2.MFFunctionRegistry; import com.ibm.icu.message2.PlainStringFormattedValue; -import java.util.Locale; -import java.util.Map; -import java.util.Objects; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.JUnit4; /** * Showing a custom formatter for a user defined class. diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/message2/DataModelErrorsTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/message2/DataModelErrorsTest.java index 0434a32e656..162fade64c9 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/message2/DataModelErrorsTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/message2/DataModelErrorsTest.java @@ -3,19 +3,19 @@ package com.ibm.icu.dev.test.message2; -import static org.junit.Assert.fail; - -import com.google.gson.reflect.TypeToken; -import com.ibm.icu.dev.test.CoreTestFmwk; -import com.ibm.icu.message2.MessageFormatter; import java.io.Reader; import java.lang.reflect.Type; import java.util.Map; import java.util.Map.Entry; + import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; +import com.google.gson.reflect.TypeToken; +import com.ibm.icu.dev.test.CoreTestFmwk; +import com.ibm.icu.message2.MessageFormatter; + @SuppressWarnings({"static-method", "javadoc"}) @RunWith(JUnit4.class) public class DataModelErrorsTest extends CoreTestFmwk { diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/message2/FirstReleaseTests.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/message2/FirstReleaseTests.java index 7b58c6706c5..994366a559a 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/message2/FirstReleaseTests.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/message2/FirstReleaseTests.java @@ -3,12 +3,14 @@ package com.ibm.icu.dev.test.message2; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.io.Reader; + import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; +import com.ibm.icu.dev.test.CoreTestFmwk; + /* * This is the equivalent of the `FromJsonTest` class in the previous release. * That class was originally a json file, converted to some hard-coded tests in the Java class. diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/message2/FunctionsTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/message2/FunctionsTest.java index 515c8a41d03..6a3e15df0a0 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/message2/FunctionsTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/message2/FunctionsTest.java @@ -3,16 +3,18 @@ package com.ibm.icu.dev.test.message2; -import com.google.gson.reflect.TypeToken; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.io.Reader; import java.lang.reflect.Type; import java.util.Map; import java.util.Map.Entry; + import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; +import com.google.gson.reflect.TypeToken; +import com.ibm.icu.dev.test.CoreTestFmwk; + @SuppressWarnings({"static-method", "javadoc"}) @RunWith(JUnit4.class) public class FunctionsTest extends CoreTestFmwk { diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/message2/IcuFunctionsTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/message2/IcuFunctionsTest.java index b691f930a20..7930e6ccb18 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/message2/IcuFunctionsTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/message2/IcuFunctionsTest.java @@ -3,17 +3,19 @@ package com.ibm.icu.dev.test.message2; -import com.google.gson.reflect.TypeToken; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.io.Reader; import java.lang.reflect.Type; import java.util.Date; import java.util.Map; import java.util.Map.Entry; + import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; +import com.google.gson.reflect.TypeToken; +import com.ibm.icu.dev.test.CoreTestFmwk; + @SuppressWarnings({"static-method", "javadoc"}) @RunWith(JUnit4.class) public class IcuFunctionsTest extends CoreTestFmwk { diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/message2/MessageFormat2Test.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/message2/MessageFormat2Test.java index c0a91b7630d..33005b33c89 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/message2/MessageFormat2Test.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/message2/MessageFormat2Test.java @@ -3,6 +3,16 @@ package com.ibm.icu.dev.test.message2; +import java.util.Date; +import java.util.HashMap; +import java.util.Locale; +import java.util.Map; + +import org.junit.Assert; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; + import com.ibm.icu.dev.test.CoreTestFmwk; import com.ibm.icu.message2.FormattedPlaceholder; import com.ibm.icu.message2.Formatter; @@ -17,14 +27,6 @@ import com.ibm.icu.util.Calendar; import com.ibm.icu.util.GregorianCalendar; import com.ibm.icu.util.Measure; import com.ibm.icu.util.MeasureUnit; -import java.util.Date; -import java.util.HashMap; -import java.util.Locale; -import java.util.Map; -import org.junit.Assert; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.JUnit4; /** * Tests migrated from {@link com.ibm.icu.text.MessageFormat}, to show what they look like and that they work. diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/message2/Mf2IcuTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/message2/Mf2IcuTest.java index 4c21e54721d..b72f4db0a6c 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/message2/Mf2IcuTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/message2/Mf2IcuTest.java @@ -3,17 +3,19 @@ package com.ibm.icu.dev.test.message2; +import java.util.Date; +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.CoreTestFmwk; import com.ibm.icu.message2.MessageFormatter; import com.ibm.icu.text.MessageFormat; import com.ibm.icu.util.Calendar; import com.ibm.icu.util.GregorianCalendar; -import java.util.Date; -import java.util.Locale; -import java.util.Map; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.JUnit4; /** * Ported the unit tests from {@link com.ibm.icu.text.MessageFormat} to show that they work. diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/message2/ParserSmokeTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/message2/ParserSmokeTest.java index 09678a1d1ba..7b2a3b988c9 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/message2/ParserSmokeTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/message2/ParserSmokeTest.java @@ -3,17 +3,19 @@ package com.ibm.icu.dev.test.message2; -import com.google.gson.reflect.TypeToken; -import com.ibm.icu.dev.test.CoreTestFmwk; -import com.ibm.icu.message2.MFParser; import java.io.Reader; import java.lang.reflect.Type; import java.util.Map; import java.util.Map.Entry; + import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; +import com.google.gson.reflect.TypeToken; +import com.ibm.icu.dev.test.CoreTestFmwk; +import com.ibm.icu.message2.MFParser; + /* * A list of tests for the parser. */ diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/message2/SelectorsWithVariousArgumentsTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/message2/SelectorsWithVariousArgumentsTest.java index 5e55fa4936a..8762f475725 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/message2/SelectorsWithVariousArgumentsTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/message2/SelectorsWithVariousArgumentsTest.java @@ -3,12 +3,14 @@ package com.ibm.icu.dev.test.message2; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.io.Reader; + import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; +import com.ibm.icu.dev.test.CoreTestFmwk; + @SuppressWarnings({"static-method", "javadoc"}) @RunWith(JUnit4.class) public class SelectorsWithVariousArgumentsTest extends CoreTestFmwk { diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/message2/SerializationTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/message2/SerializationTest.java index 08266722591..01e18c586df 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/message2/SerializationTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/message2/SerializationTest.java @@ -3,13 +3,14 @@ package com.ibm.icu.dev.test.message2; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; + import com.ibm.icu.dev.test.CoreTestFmwk; import com.ibm.icu.message2.MFDataModel.Message; import com.ibm.icu.message2.MFParser; import com.ibm.icu.message2.MFSerializer; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.JUnit4; @RunWith(JUnit4.class) @SuppressWarnings({"static-method", "javadoc"}) diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/message2/SyntaxErrorsTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/message2/SyntaxErrorsTest.java index f27451044d5..30ad47f189a 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/message2/SyntaxErrorsTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/message2/SyntaxErrorsTest.java @@ -3,15 +3,15 @@ package com.ibm.icu.dev.test.message2; -import static org.junit.Assert.fail; - -import com.ibm.icu.dev.test.CoreTestFmwk; -import com.ibm.icu.message2.MessageFormatter; import java.io.Reader; + import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; +import com.ibm.icu.dev.test.CoreTestFmwk; +import com.ibm.icu.message2.MessageFormatter; + @SuppressWarnings({"static-method", "javadoc"}) @RunWith(JUnit4.class) public class SyntaxErrorsTest extends CoreTestFmwk { diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/message2/TestUtils.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/message2/TestUtils.java index bd8dee80135..ae8868d03f2 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/message2/TestUtils.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/message2/TestUtils.java @@ -6,10 +6,6 @@ package com.ibm.icu.dev.test.message2; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; -import com.ibm.icu.message2.MFFunctionRegistry; -import com.ibm.icu.message2.MessageFormatter; import java.io.IOException; import java.io.Reader; import java.net.URI; @@ -20,8 +16,14 @@ import java.nio.file.Path; import java.nio.file.Paths; import java.util.Locale; import java.util.Map; + import org.junit.Ignore; +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import com.ibm.icu.message2.MFFunctionRegistry; +import com.ibm.icu.message2.MessageFormatter; + /** Utility class, has no test methods. */ @Ignore("Utility class, has no test methods.") public class TestUtils { diff --git a/icu4j/perf-tests/src/main/java/com/ibm/icu/dev/test/perf/UnicodeSetPerf.java b/icu4j/perf-tests/src/main/java/com/ibm/icu/dev/test/perf/UnicodeSetPerf.java index 402af037d0e..488d1742d08 100644 --- a/icu4j/perf-tests/src/main/java/com/ibm/icu/dev/test/perf/UnicodeSetPerf.java +++ b/icu4j/perf-tests/src/main/java/com/ibm/icu/dev/test/perf/UnicodeSetPerf.java @@ -8,7 +8,6 @@ */ package com.ibm.icu.dev.test.perf; import java.util.HashSet; -import java.util.Iterator; import com.ibm.icu.text.UnicodeSet; import com.ibm.icu.text.UnicodeSetIterator;