From 974eef34cc82e3ddd5874172fa2b4db8c8946c9e Mon Sep 17 00:00:00 2001 From: Yoshito Umaoka Date: Thu, 26 Oct 2023 10:09:55 -0400 Subject: [PATCH] ICU-22326 BRS74 clean up import statements See #2685 --- icu4c/source/test/depstest/dependencies.txt | 1 + icu4c/source/test/fuzzer/locale_util.h | 1 + .../test/calendar/DataDrivenCalendarTest.java | 3 +-- .../test/format/CompactDecimalFormatTest.java | 2 +- .../dev/test/format/DataDrivenFormatTest.java | 3 +-- .../icu/dev/test/format/DateFormatTest.java | 4 +--- .../format/IntlTestDecimalFormatAPIC.java | 3 +-- .../format/IntlTestDecimalFormatSymbolsC.java | 3 +-- .../icu/dev/test/format/MeasureUnitTest.java | 3 +-- .../format/NumberFormatRegressionTest.java | 3 +-- .../format/NumberFormatSpecificationTest.java | 3 +-- .../icu/dev/test/format/PluralRangesTest.java | 3 +-- .../icu/dev/test/format/PluralRulesTest.java | 3 +-- .../com/ibm/icu/dev/test/format/RbnfTest.java | 3 +-- .../dev/test/format/TestMessageFormat.java | 1 - .../dev/test/format/TimeZoneFormatTest.java | 2 +- .../dev/test/message2/Mf2FeaturesTest.java | 1 - .../icu/dev/test/number/NumberParserTest.java | 2 +- .../dev/test/number/PatternStringTest.java | 5 +---- .../icu/dev/test/number/PropertiesTest.java | 7 +------ .../test/serializable/CompatibilityTest.java | 1 - .../com/ibm/icu/dev/test/CoreTestFmwk.java | 3 ++- .../dev/test/bidi/BiDiConformanceTest.java | 3 +-- .../com/ibm/icu/dev/test/bidi/BidiFmwk.java | 3 +-- .../icu/dev/test/bidi/TestBidiTransform.java | 3 +-- .../dev/test/bigdec/DiagBigDecimalTest.java | 2 +- .../ibm/icu/dev/test/calendar/AstroTest.java | 7 +++---- .../test/calendar/CalendarRegressionTest.java | 2 +- .../dev/test/calendar/CalendarTestFmwk.java | 2 +- .../dev/test/calendar/CompatibilityTest.java | 3 +-- .../icu/dev/test/calendar/EraRulesTest.java | 3 +-- .../icu/dev/test/calendar/HolidayTest.java | 3 +-- .../test/calendar/InTemporalLeapYearTest.java | 2 +- .../dev/test/calendar/OrdinalMonthTest.java | 2 +- .../test/calendar/TemporalMonthCodeTest.java | 2 +- .../test/charsetdet/TestCharsetDetector.java | 3 +-- .../test/compression/DecompressionTest.java | 3 +-- .../dev/test/compression/ExhaustiveTest.java | 3 +-- .../dev/test/duration/DataReadWriteTest.java | 3 +-- .../dev/test/duration/ICUDurationTest.java | 3 +-- .../dev/test/duration/LanguageTestFmwk.java | 3 +-- .../duration/PeriodBuilderFactoryTest.java | 3 +-- .../ibm/icu/dev/test/duration/PeriodTest.java | 3 +-- .../icu/dev/test/duration/RegressionTest.java | 3 +-- ...ceBasedPeriodFormatterDataServiceTest.java | 3 +-- .../dev/test/format/BigNumberFormatTest.java | 3 +-- .../DataDrivenNumberFormatTestUtility.java | 2 +- .../dev/test/format/DateFormatMiscTests.java | 3 +-- .../test/format/DateFormatRegressionTest.java | 3 +-- .../format/DateFormatRegressionTestJ.java | 3 +-- .../test/format/DateFormatRoundTripTest.java | 3 +-- .../test/format/DateIntervalFormatTest.java | 2 +- .../test/format/DateTimeGeneratorTest.java | 3 +-- .../dev/test/format/IntlTestDateFormat.java | 3 +-- .../test/format/IntlTestDateFormatAPI.java | 3 +-- .../test/format/IntlTestDateFormatAPIC.java | 3 +-- .../format/IntlTestDateFormatSymbols.java | 3 +-- .../test/format/IntlTestDecimalFormatAPI.java | 3 +-- .../format/IntlTestDecimalFormatSymbols.java | 3 +-- .../dev/test/format/IntlTestNumberFormat.java | 2 +- .../test/format/IntlTestNumberFormatAPI.java | 3 +-- .../format/IntlTestSimpleDateFormatAPI.java | 3 +-- .../dev/test/format/ListFormatterTest.java | 3 +-- .../test/format/MeasureUnitThreadTest.java | 3 +-- .../test/format/MessagePatternUtilTest.java | 3 +-- .../test/format/MessageRegressionTest.java | 3 +-- .../NumberFormatJavaCompatilityTest.java | 1 - .../format/NumberFormatRegistrationTest.java | 3 +-- .../format/NumberFormatRoundTripTest.java | 3 +-- .../format/PersonNameConsistencyTest.java | 3 +-- .../test/format/PersonNameFormatterTest.java | 3 +-- .../icu/dev/test/format/PluralFormatTest.java | 3 +-- .../dev/test/format/PluralFormatUnitTest.java | 2 +- .../icu/dev/test/format/RBNFParseTest.java | 3 +-- .../dev/test/format/RbnfRoundTripTest.java | 3 +-- .../format/RelativeDateTimeFormatterTest.java | 3 +-- .../format/ScientificNumberFormatterTest.java | 3 +-- .../dev/test/format/SelectFormatAPITest.java | 3 +-- .../dev/test/format/SelectFormatUnitTest.java | 3 +-- .../ibm/icu/dev/test/format/TimeUnitTest.java | 3 +-- .../test/impl/CSCharacterIteratorTest.java | 3 +-- .../com/ibm/icu/dev/test/impl/CacheTest.java | 3 +-- .../icu/dev/test/impl/StringSegmentTest.java | 1 - .../test/iterator/TestUCharacterIterator.java | 3 +-- .../dev/test/lang/DataDrivenUScriptTest.java | 3 +-- .../ibm/icu/dev/test/lang/TestUScript.java | 3 +-- .../ibm/icu/dev/test/lang/TestUScriptRun.java | 3 +-- .../icu/dev/test/lang/UCharacterCaseTest.java | 3 +-- .../dev/test/lang/UCharacterCategoryTest.java | 3 +-- .../test/lang/UCharacterDirectionTest.java | 3 +-- .../test/lang/UCharacterSurrogateTest.java | 3 +-- .../ibm/icu/dev/test/lang/UCharacterTest.java | 2 +- .../dev/test/lang/UCharacterThreadTest.java | 3 +-- .../dev/test/lang/UPropertyAliasesTest.java | 3 +-- .../com/ibm/icu/dev/test/lang/UTF16Test.java | 3 +-- .../test/lang/UnicodeSetStringSpanTest.java | 3 +-- .../ibm/icu/dev/test/lang/UnicodeSetTest.java | 2 +- .../CustomFormatterGrammarCaseTest.java | 3 +-- .../message2/CustomFormatterListTest.java | 3 +-- .../CustomFormatterMessageRefTest.java | 3 +-- .../message2/CustomFormatterPersonTest.java | 3 +-- .../icu/dev/test/message2/FromJsonTest.java | 3 +-- .../dev/test/message2/MessageFormat2Test.java | 3 +-- .../ibm/icu/dev/test/message2/Mf2IcuTest.java | 3 +-- .../dev/test/normalizer/ConformanceTest.java | 3 +-- .../normalizer/NormalizationMonkeyTest.java | 3 +-- .../normalizer/NormalizerRegressionTests.java | 3 +-- .../normalizer/TestCanonicalIterator.java | 3 +-- .../TestDeprecatedNormalizerAPI.java | 3 +-- .../icu/dev/test/normalizer/UTS46Test.java | 3 +-- .../UnicodeNormalizerConformanceTest.java | 3 +-- .../dev/test/number/DecimalQuantityTest.java | 3 +-- .../dev/test/number/ExhaustiveNumberTest.java | 3 +-- .../test/rbbi/AbstractBreakIteratorTests.java | 2 +- .../dev/test/rbbi/BreakIteratorRegTest.java | 3 +-- .../icu/dev/test/rbbi/BreakIteratorTest.java | 3 +-- .../ibm/icu/dev/test/rbbi/RBBIAPITest.java | 2 +- .../ibm/icu/dev/test/rbbi/RBBILSTMTest.java | 3 +-- .../ibm/icu/dev/test/rbbi/RBBIMonkeyTest.java | 3 +-- .../com/ibm/icu/dev/test/rbbi/RBBITest.java | 19 +++++++++---------- .../icu/dev/test/rbbi/RBBITestExtended.java | 3 +-- .../ibm/icu/dev/test/rbbi/RBBITestMonkey.java | 11 +++++------ .../test/shaping/ArabicShapingRegTest.java | 3 +-- .../DataDrivenArabicShapingRegTest.java | 3 +-- .../test/stringprep/IDNAConformanceTest.java | 3 +-- .../dev/test/stringprep/IDNAReference.java | 1 - .../ibm/icu/dev/test/stringprep/TestIDNA.java | 3 +-- .../stringprep/TestStringPrepProfiles.java | 3 +-- .../icu/dev/test/text/DisplayOptionsTest.java | 3 +-- .../icu/dev/test/text/SpoofCheckerTest.java | 3 +-- .../dev/test/timescale/TimeScaleAPITest.java | 3 +-- .../dev/test/timescale/TimeScaleDataTest.java | 3 +-- .../test/timescale/TimeScaleMonkeyTest.java | 3 +-- .../dev/test/timezone/TimeZoneAliasTest.java | 3 +-- .../test/timezone/TimeZoneBoundaryTest.java | 3 +-- .../timezone/TimeZoneOffsetLocalTest.java | 3 +-- .../test/timezone/TimeZoneRegressionTest.java | 3 +-- .../dev/test/timezone/TimeZoneRuleTest.java | 2 +- .../icu/dev/test/timezone/TimeZoneTest.java | 2 +- .../ibm/icu/dev/test/util/BytesTrieTest.java | 3 +-- .../ibm/icu/dev/test/util/CharsTrieTest.java | 3 +-- .../icu/dev/test/util/CodePointTrieTest.java | 3 +-- .../icu/dev/test/util/CompactArrayTest.java | 3 +-- .../icu/dev/test/util/DebugUtilitiesTest.java | 3 +-- .../icu/dev/test/util/DisplayNameTest.java | 3 +-- .../ibm/icu/dev/test/util/GenderInfoTest.java | 3 +-- .../ibm/icu/dev/test/util/ICUBinaryTest.java | 3 +-- .../dev/test/util/ICUServiceThreadTest.java | 2 +- .../icu/dev/test/util/LocaleAliasTest.java | 2 +- .../icu/dev/test/util/LocaleBuilderTest.java | 3 +-- .../icu/dev/test/util/LocaleDistanceTest.java | 3 +-- .../icu/dev/test/util/LocaleMatcherTest.java | 3 +-- .../dev/test/util/LocalePriorityListTest.java | 3 +-- .../com/ibm/icu/dev/test/util/RegionTest.java | 3 +-- .../dev/test/util/SimpleFormatterTest.java | 3 +-- .../dev/test/util/StringTokenizerTest.java | 3 +-- .../icu/dev/test/util/TestLocaleValidity.java | 3 +-- .../icu/dev/test/util/TextTrieMapTest.java | 3 +-- .../com/ibm/icu/dev/test/util/Trie2Test.java | 3 +-- .../ibm/icu/dev/test/util/TrieMapTest.java | 2 +- .../com/ibm/icu/dev/test/util/TrieTest.java | 3 +-- .../ibm/icu/dev/test/util/UtilityTest.java | 2 +- .../icu/dev/test/util/VersionInfoTest.java | 3 +-- 163 files changed, 172 insertions(+), 313 deletions(-) diff --git a/icu4c/source/test/depstest/dependencies.txt b/icu4c/source/test/depstest/dependencies.txt index 58c35d7764dd..1486b779f767 100644 --- a/icu4c/source/test/depstest/dependencies.txt +++ b/icu4c/source/test/depstest/dependencies.txt @@ -145,6 +145,7 @@ group: iostream "std::basic_ostream >& std::operator<< >(std::basic_ostream >&, char const*)" std::ios_base::Init::Init() std::ios_base::Init::~Init() + std::ios_base_library_init() std::istream::get() std::istream::putback(char) # Additional symbols in an optimized build. diff --git a/icu4c/source/test/fuzzer/locale_util.h b/icu4c/source/test/fuzzer/locale_util.h index 09848ff4a37b..85594454f87e 100644 --- a/icu4c/source/test/fuzzer/locale_util.h +++ b/icu4c/source/test/fuzzer/locale_util.h @@ -4,6 +4,7 @@ #ifndef I18N_ICU_FUZZ_LOCALE_UTIL_H_ #define I18N_ICU_FUZZ_LOCALE_UTIL_H_ +#include #include // Takes uint8_t data from fuzzer, and makes a zero terminated string. diff --git a/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/calendar/DataDrivenCalendarTest.java b/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/calendar/DataDrivenCalendarTest.java index df8a88bb23e3..04f6a9c22830 100644 --- a/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/calendar/DataDrivenCalendarTest.java +++ b/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/calendar/DataDrivenCalendarTest.java @@ -8,15 +8,14 @@ */ package com.ibm.icu.dev.test.calendar; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.util.Date; import java.util.Iterator; import java.util.List; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; +import com.ibm.icu.dev.test.CoreTestFmwk; import com.ibm.icu.dev.test.ModuleTest; import com.ibm.icu.dev.test.ModuleTest.TestDataPair; import com.ibm.icu.dev.test.TestDataModule; diff --git a/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/format/CompactDecimalFormatTest.java b/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/format/CompactDecimalFormatTest.java index d9efa8fff99b..96f8b9012495 100644 --- a/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/format/CompactDecimalFormatTest.java +++ b/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/format/CompactDecimalFormatTest.java @@ -8,7 +8,6 @@ */ package com.ibm.icu.dev.test.format; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -29,6 +28,7 @@ import org.junit.runner.RunWith; import org.junit.runners.JUnit4; +import com.ibm.icu.dev.test.CoreTestFmwk; import com.ibm.icu.impl.number.DecimalFormatProperties; import com.ibm.icu.impl.number.PatternStringParser; import com.ibm.icu.text.CompactDecimalFormat; diff --git a/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/format/DataDrivenFormatTest.java b/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/format/DataDrivenFormatTest.java index eab732fa3f93..8afcf8cf6cf6 100644 --- a/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/format/DataDrivenFormatTest.java +++ b/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/format/DataDrivenFormatTest.java @@ -8,17 +8,16 @@ */ package com.ibm.icu.dev.test.format; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.text.FieldPosition; import java.text.ParsePosition; import java.util.Date; import java.util.Iterator; import java.util.List; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; +import com.ibm.icu.dev.test.CoreTestFmwk; import com.ibm.icu.dev.test.ModuleTest; import com.ibm.icu.dev.test.ModuleTest.TestDataPair; import com.ibm.icu.dev.test.TestDataModule; diff --git a/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/format/DateFormatTest.java b/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/format/DateFormatTest.java index 02168dfcfa64..6fa4036f549d 100644 --- a/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/format/DateFormatTest.java +++ b/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/format/DateFormatTest.java @@ -14,7 +14,6 @@ package com.ibm.icu.dev.test.format; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -37,12 +36,11 @@ import java.util.ResourceBundle; import java.util.Set; -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.dev.test.CoreTestFmwk; import com.ibm.icu.impl.ICUData; import com.ibm.icu.impl.ICUResourceBundle; import com.ibm.icu.text.ChineseDateFormat; diff --git a/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/format/IntlTestDecimalFormatAPIC.java b/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/format/IntlTestDecimalFormatAPIC.java index 6578c126a6d9..e8d91494ea16 100644 --- a/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/format/IntlTestDecimalFormatAPIC.java +++ b/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/format/IntlTestDecimalFormatAPIC.java @@ -14,7 +14,6 @@ package com.ibm.icu.dev.test.format; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.text.AttributedCharacterIterator; import java.text.FieldPosition; import java.text.Format; @@ -28,7 +27,7 @@ import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import com.ibm.icu.dev.test.TestFmwk; +import com.ibm.icu.dev.test.CoreTestFmwk; import com.ibm.icu.text.CurrencyPluralInfo; import com.ibm.icu.text.DecimalFormat; import com.ibm.icu.text.DecimalFormatSymbols; diff --git a/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/format/IntlTestDecimalFormatSymbolsC.java b/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/format/IntlTestDecimalFormatSymbolsC.java index f411a0d4d239..8f5ad9aa48f9 100644 --- a/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/format/IntlTestDecimalFormatSymbolsC.java +++ b/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/format/IntlTestDecimalFormatSymbolsC.java @@ -14,7 +14,6 @@ package com.ibm.icu.dev.test.format; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.text.FieldPosition; import java.util.Locale; @@ -22,7 +21,7 @@ import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import com.ibm.icu.dev.test.TestFmwk; +import com.ibm.icu.dev.test.CoreTestFmwk; import com.ibm.icu.text.DecimalFormat; import com.ibm.icu.text.DecimalFormatSymbols; diff --git a/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/format/MeasureUnitTest.java b/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/format/MeasureUnitTest.java index d4e773864903..4337e8475748 100644 --- a/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/format/MeasureUnitTest.java +++ b/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/format/MeasureUnitTest.java @@ -8,7 +8,6 @@ */ package com.ibm.icu.dev.test.format; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -36,7 +35,7 @@ import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import com.ibm.icu.dev.test.TestFmwk; +import com.ibm.icu.dev.test.CoreTestFmwk; import com.ibm.icu.dev.test.serializable.FormatHandler; import com.ibm.icu.dev.test.serializable.SerializableTestUtility; import com.ibm.icu.impl.Pair; diff --git a/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/format/NumberFormatRegressionTest.java b/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/format/NumberFormatRegressionTest.java index 4c8e46dd1cbe..9dc81860f2b8 100644 --- a/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/format/NumberFormatRegressionTest.java +++ b/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/format/NumberFormatRegressionTest.java @@ -14,7 +14,6 @@ package com.ibm.icu.dev.test.format; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.ObjectInputStream; @@ -27,7 +26,7 @@ import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import com.ibm.icu.dev.test.TestFmwk; +import com.ibm.icu.dev.test.CoreTestFmwk; import com.ibm.icu.text.DateFormat; import com.ibm.icu.text.DecimalFormat; import com.ibm.icu.text.DecimalFormatSymbols; diff --git a/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/format/NumberFormatSpecificationTest.java b/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/format/NumberFormatSpecificationTest.java index 098f29530cc3..9abf5afdb53a 100644 --- a/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/format/NumberFormatSpecificationTest.java +++ b/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/format/NumberFormatSpecificationTest.java @@ -8,12 +8,11 @@ */ package com.ibm.icu.dev.test.format; -import com.ibm.icu.dev.test.CoreTestFmwk; 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.dev.test.CoreTestFmwk; import com.ibm.icu.text.DecimalFormat; import com.ibm.icu.text.DecimalFormatSymbols; import com.ibm.icu.text.NumberFormat; diff --git a/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/format/PluralRangesTest.java b/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/format/PluralRangesTest.java index c2fd8f8ba535..d75ce50d1371 100644 --- a/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/format/PluralRangesTest.java +++ b/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/format/PluralRangesTest.java @@ -8,14 +8,13 @@ */ package com.ibm.icu.dev.test.format; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.util.Arrays; 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.dev.test.CoreTestFmwk; import com.ibm.icu.impl.SimpleFormatterImpl; import com.ibm.icu.impl.StandardPlural; import com.ibm.icu.impl.number.range.StandardPluralRanges; diff --git a/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/format/PluralRulesTest.java b/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/format/PluralRulesTest.java index 4027a62e0957..7a80c7901568 100644 --- a/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/format/PluralRulesTest.java +++ b/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/format/PluralRulesTest.java @@ -8,7 +8,6 @@ */ package com.ibm.icu.dev.test.format; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -43,7 +42,7 @@ import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import com.ibm.icu.dev.test.TestFmwk; +import com.ibm.icu.dev.test.CoreTestFmwk; import com.ibm.icu.dev.test.serializable.SerializableTestUtility; import com.ibm.icu.dev.util.CollectionUtilities; import com.ibm.icu.impl.Relation; diff --git a/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/format/RbnfTest.java b/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/format/RbnfTest.java index 7bb5eb79da7a..4a482a02ca0c 100644 --- a/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/format/RbnfTest.java +++ b/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/format/RbnfTest.java @@ -8,7 +8,6 @@ */ package com.ibm.icu.dev.test.format; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.math.BigInteger; import java.text.ParseException; import java.util.Locale; @@ -18,7 +17,7 @@ import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import com.ibm.icu.dev.test.TestFmwk; +import com.ibm.icu.dev.test.CoreTestFmwk; import com.ibm.icu.math.BigDecimal; import com.ibm.icu.text.DecimalFormat; import com.ibm.icu.text.DecimalFormatSymbols; diff --git a/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/format/TestMessageFormat.java b/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/format/TestMessageFormat.java index c392c3f5886d..29170617c31e 100644 --- a/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/format/TestMessageFormat.java +++ b/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/format/TestMessageFormat.java @@ -27,7 +27,6 @@ import java.util.Set; import java.util.TreeMap; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; diff --git a/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/format/TimeZoneFormatTest.java b/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/format/TimeZoneFormatTest.java index 9e3176b85f2a..be823588a3f3 100644 --- a/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/format/TimeZoneFormatTest.java +++ b/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/format/TimeZoneFormatTest.java @@ -9,7 +9,6 @@ package com.ibm.icu.dev.test.format; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.text.FieldPosition; import java.text.ParseException; import java.text.ParsePosition; @@ -30,6 +29,7 @@ import org.junit.runner.RunWith; import org.junit.runners.JUnit4; +import com.ibm.icu.dev.test.CoreTestFmwk; import com.ibm.icu.dev.test.TestFmwk; import com.ibm.icu.impl.TZDBTimeZoneNames; import com.ibm.icu.impl.ZoneMeta; 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 a2a1cc10a7fc..6d4fa23fafc0 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 @@ -7,7 +7,6 @@ import java.util.Locale; import java.util.Map; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; diff --git a/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/number/NumberParserTest.java b/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/number/NumberParserTest.java index 5f3ba71ec29b..1e0d18e80722 100644 --- a/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/number/NumberParserTest.java +++ b/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/number/NumberParserTest.java @@ -2,10 +2,10 @@ // License & terms of use: http://www.unicode.org/copyright.html package com.ibm.icu.dev.test.number; -import com.ibm.icu.dev.test.CoreTestFmwk; import org.junit.Assert; import org.junit.Test; +import com.ibm.icu.dev.test.CoreTestFmwk; import com.ibm.icu.impl.StringSegment; import com.ibm.icu.impl.number.CustomSymbolCurrency; import com.ibm.icu.impl.number.DecimalFormatProperties; diff --git a/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/number/PatternStringTest.java b/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/number/PatternStringTest.java index 66acc926ade0..2a98fdafe4dd 100644 --- a/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/number/PatternStringTest.java +++ b/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/number/PatternStringTest.java @@ -2,12 +2,9 @@ // License & terms of use: http://www.unicode.org/copyright.html package com.ibm.icu.dev.test.number; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; - -import com.ibm.icu.dev.test.CoreTestFmwk; import org.junit.Test; +import com.ibm.icu.dev.test.CoreTestFmwk; import com.ibm.icu.dev.test.format.FormattedValueTest; import com.ibm.icu.impl.number.DecimalFormatProperties; import com.ibm.icu.impl.number.MacroProps; diff --git a/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/number/PropertiesTest.java b/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/number/PropertiesTest.java index 6a6def83fecb..309da2b67e2a 100644 --- a/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/number/PropertiesTest.java +++ b/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/number/PropertiesTest.java @@ -2,12 +2,6 @@ // License & terms of use: http://www.unicode.org/copyright.html package com.ibm.icu.dev.test.number; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - -import com.ibm.icu.dev.test.CoreTestFmwk; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -29,6 +23,7 @@ import org.junit.Test; +import com.ibm.icu.dev.test.CoreTestFmwk; import com.ibm.icu.dev.test.serializable.SerializableTestUtility; import com.ibm.icu.impl.number.DecimalFormatProperties; import com.ibm.icu.impl.number.DecimalFormatProperties.ParseMode; diff --git a/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/serializable/CompatibilityTest.java b/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/serializable/CompatibilityTest.java index 076489b77ced..fb77b2e9060e 100644 --- a/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/serializable/CompatibilityTest.java +++ b/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/serializable/CompatibilityTest.java @@ -23,7 +23,6 @@ import java.util.jar.JarEntry; import java.util.jar.JarFile; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/CoreTestFmwk.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/CoreTestFmwk.java index 1cfdfc71e477..9270d674a095 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/CoreTestFmwk.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/CoreTestFmwk.java @@ -3,10 +3,11 @@ package com.ibm.icu.dev.test; -import com.ibm.icu.util.ULocale; import org.junit.Rule; import org.junit.rules.TestName; +import com.ibm.icu.util.ULocale; + /** * A base class for testing within the cross-component tests in the `common_tests` component. * diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/bidi/BiDiConformanceTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/bidi/BiDiConformanceTest.java index eab582433e7d..2766e07505ca 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/bidi/BiDiConformanceTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/bidi/BiDiConformanceTest.java @@ -8,7 +8,6 @@ */ package com.ibm.icu.dev.test.bidi; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.io.BufferedReader; import java.io.IOException; @@ -16,7 +15,7 @@ import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import com.ibm.icu.dev.test.TestFmwk; +import com.ibm.icu.dev.test.CoreTestFmwk; import com.ibm.icu.dev.test.TestUtil; import com.ibm.icu.lang.UCharacterDirection; import com.ibm.icu.text.Bidi; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/bidi/BidiFmwk.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/bidi/BidiFmwk.java index de016c563772..ba3f4262f1b6 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/bidi/BidiFmwk.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/bidi/BidiFmwk.java @@ -9,10 +9,9 @@ package com.ibm.icu.dev.test.bidi; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.util.Arrays; -import com.ibm.icu.dev.test.TestFmwk; +import com.ibm.icu.dev.test.CoreTestFmwk; import com.ibm.icu.impl.Utility; import com.ibm.icu.lang.UCharacter; import com.ibm.icu.text.Bidi; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/bidi/TestBidiTransform.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/bidi/TestBidiTransform.java index a8baa6677274..1dafe166b901 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/bidi/TestBidiTransform.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/bidi/TestBidiTransform.java @@ -3,12 +3,11 @@ package com.ibm.icu.dev.test.bidi; -import com.ibm.icu.dev.test.CoreTestFmwk; 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.dev.test.CoreTestFmwk; import com.ibm.icu.lang.UCharacter; import com.ibm.icu.text.ArabicShaping; import com.ibm.icu.text.Bidi; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/bigdec/DiagBigDecimalTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/bigdec/DiagBigDecimalTest.java index ae194008a8c8..5e6360a42564 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/bigdec/DiagBigDecimalTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/bigdec/DiagBigDecimalTest.java @@ -11,13 +11,13 @@ /* The generated code has been manually modified. */ package com.ibm.icu.dev.test.bigdec; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.math.BigInteger; 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.dev.test.TestFmwk; import com.ibm.icu.dev.test.TestUtil; import com.ibm.icu.dev.test.TestUtil.JavaVendor; 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 be34ae52fff8..b8dc6e0dd9ae 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,9 +8,6 @@ */ package com.ibm.icu.dev.test.calendar; -// AstroTest - -import com.ibm.icu.dev.test.CoreTestFmwk; import java.util.Date; import java.util.Locale; @@ -18,7 +15,9 @@ import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import com.ibm.icu.dev.test.TestFmwk; +// AstroTest + +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; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/calendar/CalendarRegressionTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/calendar/CalendarRegressionTest.java index ca462636b671..1657146bba67 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/calendar/CalendarRegressionTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/calendar/CalendarRegressionTest.java @@ -8,7 +8,6 @@ */ package com.ibm.icu.dev.test.calendar; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -27,6 +26,7 @@ import org.junit.runner.RunWith; import org.junit.runners.JUnit4; +import com.ibm.icu.dev.test.CoreTestFmwk; import com.ibm.icu.text.DateFormat; import com.ibm.icu.text.NumberFormat; import com.ibm.icu.text.SimpleDateFormat; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/calendar/CalendarTestFmwk.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/calendar/CalendarTestFmwk.java index 6f5418cbd8c6..4f6a824f356f 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/calendar/CalendarTestFmwk.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/calendar/CalendarTestFmwk.java @@ -9,12 +9,12 @@ package com.ibm.icu.dev.test.calendar; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.util.Date; import java.util.HashMap; import java.util.Locale; import java.util.Map; +import com.ibm.icu.dev.test.CoreTestFmwk; import com.ibm.icu.dev.test.TestFmwk; import com.ibm.icu.text.DateFormat; import com.ibm.icu.text.SimpleDateFormat; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/calendar/CompatibilityTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/calendar/CompatibilityTest.java index 6b3d6d18174e..929203215a4d 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/calendar/CompatibilityTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/calendar/CompatibilityTest.java @@ -8,7 +8,6 @@ */ package com.ibm.icu.dev.test.calendar; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -22,7 +21,7 @@ import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import com.ibm.icu.dev.test.TestFmwk; +import com.ibm.icu.dev.test.CoreTestFmwk; import com.ibm.icu.text.DateFormat; import com.ibm.icu.util.Calendar; import com.ibm.icu.util.GregorianCalendar; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/calendar/EraRulesTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/calendar/EraRulesTest.java index 7195def14453..5175083e32ea 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/calendar/EraRulesTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/calendar/EraRulesTest.java @@ -2,12 +2,11 @@ // License & terms of use: http://www.unicode.org/copyright.html package com.ibm.icu.dev.test.calendar; -import com.ibm.icu.dev.test.CoreTestFmwk; 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.dev.test.CoreTestFmwk; import com.ibm.icu.impl.CalType; import com.ibm.icu.impl.EraRules; import com.ibm.icu.util.Calendar; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/calendar/HolidayTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/calendar/HolidayTest.java index 72048858f9de..a36872770e06 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/calendar/HolidayTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/calendar/HolidayTest.java @@ -8,7 +8,6 @@ */ package com.ibm.icu.dev.test.calendar; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.util.Date; import java.util.Locale; @@ -16,7 +15,7 @@ import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import com.ibm.icu.dev.test.TestFmwk; +import com.ibm.icu.dev.test.CoreTestFmwk; import com.ibm.icu.impl.LocaleUtility; import com.ibm.icu.util.Calendar; import com.ibm.icu.util.EasterHoliday; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/calendar/InTemporalLeapYearTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/calendar/InTemporalLeapYearTest.java index 76ca216cb4d2..5a314a92edf1 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/calendar/InTemporalLeapYearTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/calendar/InTemporalLeapYearTest.java @@ -2,11 +2,11 @@ // License & terms of use: http://www.unicode.org/copyright.html package com.ibm.icu.dev.test.calendar; -import com.ibm.icu.dev.test.CoreTestFmwk; 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.dev.test.TestFmwk; import com.ibm.icu.util.Calendar; import com.ibm.icu.util.GregorianCalendar; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/calendar/OrdinalMonthTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/calendar/OrdinalMonthTest.java index fdd3cbe0d75b..a49979ead451 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/calendar/OrdinalMonthTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/calendar/OrdinalMonthTest.java @@ -2,11 +2,11 @@ // License & terms of use: http://www.unicode.org/copyright.html package com.ibm.icu.dev.test.calendar; -import com.ibm.icu.dev.test.CoreTestFmwk; 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.util.Calendar; import com.ibm.icu.util.GregorianCalendar; import com.ibm.icu.util.HebrewCalendar; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/calendar/TemporalMonthCodeTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/calendar/TemporalMonthCodeTest.java index b953577cdc20..455a9ed16c24 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/calendar/TemporalMonthCodeTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/calendar/TemporalMonthCodeTest.java @@ -2,11 +2,11 @@ // License & terms of use: http://www.unicode.org/copyright.html package com.ibm.icu.dev.test.calendar; -import com.ibm.icu.dev.test.CoreTestFmwk; 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.dev.test.TestFmwk; import com.ibm.icu.util.Calendar; import com.ibm.icu.util.CopticCalendar; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/charsetdet/TestCharsetDetector.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/charsetdet/TestCharsetDetector.java index 1760cdafb11d..db0323f0255a 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/charsetdet/TestCharsetDetector.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/charsetdet/TestCharsetDetector.java @@ -8,7 +8,6 @@ */ package com.ibm.icu.dev.test.charsetdet; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.InputStream; @@ -30,7 +29,7 @@ import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import com.ibm.icu.dev.test.TestFmwk; +import com.ibm.icu.dev.test.CoreTestFmwk; import com.ibm.icu.dev.test.TestUtil; import com.ibm.icu.dev.test.TestUtil.JavaVendor; import com.ibm.icu.impl.Utility; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/compression/DecompressionTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/compression/DecompressionTest.java index 62762fe13b41..8d271356aac9 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/compression/DecompressionTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/compression/DecompressionTest.java @@ -8,12 +8,11 @@ */ package com.ibm.icu.dev.test.compression; -import com.ibm.icu.dev.test.CoreTestFmwk; 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.dev.test.CoreTestFmwk; import com.ibm.icu.text.UnicodeDecompressor; @RunWith(JUnit4.class) diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/compression/ExhaustiveTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/compression/ExhaustiveTest.java index aded86371e49..696c26ff17e3 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/compression/ExhaustiveTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/compression/ExhaustiveTest.java @@ -8,12 +8,11 @@ */ package com.ibm.icu.dev.test.compression; -import com.ibm.icu.dev.test.CoreTestFmwk; 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.dev.test.CoreTestFmwk; import com.ibm.icu.text.UnicodeCompressor; import com.ibm.icu.text.UnicodeDecompressor; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/duration/DataReadWriteTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/duration/DataReadWriteTest.java index 00bc38b88180..54e16cc64934 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/duration/DataReadWriteTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/duration/DataReadWriteTest.java @@ -11,7 +11,6 @@ package com.ibm.icu.dev.test.duration; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.io.StringReader; import java.io.StringWriter; @@ -19,7 +18,7 @@ import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import com.ibm.icu.dev.test.TestFmwk; +import com.ibm.icu.dev.test.CoreTestFmwk; import com.ibm.icu.impl.duration.impl.XMLRecordReader; import com.ibm.icu.impl.duration.impl.XMLRecordWriter; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/duration/ICUDurationTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/duration/ICUDurationTest.java index 7b408f0343da..8f94f6702a44 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/duration/ICUDurationTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/duration/ICUDurationTest.java @@ -8,7 +8,6 @@ */ package com.ibm.icu.dev.test.duration; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.math.BigDecimal; import java.text.FieldPosition; import java.util.Date; @@ -24,7 +23,7 @@ import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import com.ibm.icu.dev.test.TestFmwk; +import com.ibm.icu.dev.test.CoreTestFmwk; import com.ibm.icu.text.DurationFormat; import com.ibm.icu.util.Calendar; import com.ibm.icu.util.ULocale; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/duration/LanguageTestFmwk.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/duration/LanguageTestFmwk.java index 74402554c6ae..e7dbb058f610 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/duration/LanguageTestFmwk.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/duration/LanguageTestFmwk.java @@ -11,7 +11,6 @@ package com.ibm.icu.dev.test.duration; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.io.BufferedReader; import java.io.InputStream; import java.io.InputStreamReader; @@ -25,7 +24,7 @@ import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import com.ibm.icu.dev.test.TestFmwk; +import com.ibm.icu.dev.test.CoreTestFmwk; import com.ibm.icu.impl.duration.BasicPeriodFormatterService; import com.ibm.icu.impl.duration.Period; import com.ibm.icu.impl.duration.PeriodBuilder; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/duration/PeriodBuilderFactoryTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/duration/PeriodBuilderFactoryTest.java index 827a29f0a843..3b230044896f 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/duration/PeriodBuilderFactoryTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/duration/PeriodBuilderFactoryTest.java @@ -11,12 +11,11 @@ package com.ibm.icu.dev.test.duration; -import com.ibm.icu.dev.test.CoreTestFmwk; 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.dev.test.CoreTestFmwk; import com.ibm.icu.impl.duration.BasicPeriodFormatterService; import com.ibm.icu.impl.duration.Period; import com.ibm.icu.impl.duration.PeriodBuilder; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/duration/PeriodTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/duration/PeriodTest.java index 19d592e03c08..29d4b50fb4ed 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/duration/PeriodTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/duration/PeriodTest.java @@ -11,12 +11,11 @@ package com.ibm.icu.dev.test.duration; -import com.ibm.icu.dev.test.CoreTestFmwk; 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.dev.test.CoreTestFmwk; import com.ibm.icu.impl.duration.Period; import com.ibm.icu.impl.duration.TimeUnit; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/duration/RegressionTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/duration/RegressionTest.java index fa65d19db62d..2dcb96148cf2 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/duration/RegressionTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/duration/RegressionTest.java @@ -8,12 +8,11 @@ */ package com.ibm.icu.dev.test.duration; -import com.ibm.icu.dev.test.CoreTestFmwk; 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.dev.test.CoreTestFmwk; import com.ibm.icu.impl.duration.BasicPeriodFormatterService; import com.ibm.icu.impl.duration.DurationFormatter; import com.ibm.icu.impl.duration.PeriodBuilder; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/duration/ResourceBasedPeriodFormatterDataServiceTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/duration/ResourceBasedPeriodFormatterDataServiceTest.java index 46860042cfbe..17af5f8214e7 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/duration/ResourceBasedPeriodFormatterDataServiceTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/duration/ResourceBasedPeriodFormatterDataServiceTest.java @@ -11,7 +11,6 @@ package com.ibm.icu.dev.test.duration; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.util.Collection; import java.util.Iterator; @@ -19,7 +18,7 @@ import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import com.ibm.icu.dev.test.TestFmwk; +import com.ibm.icu.dev.test.CoreTestFmwk; import com.ibm.icu.impl.duration.impl.PeriodFormatterData; import com.ibm.icu.impl.duration.impl.ResourceBasedPeriodFormatterDataService; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/BigNumberFormatTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/BigNumberFormatTest.java index 65377aa85a71..bb5d35589889 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/BigNumberFormatTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/BigNumberFormatTest.java @@ -8,7 +8,6 @@ */ package com.ibm.icu.dev.test.format; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.text.ParseException; import java.util.Locale; @@ -16,7 +15,7 @@ import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import com.ibm.icu.dev.test.TestFmwk; +import com.ibm.icu.dev.test.CoreTestFmwk; import com.ibm.icu.impl.Utility; import com.ibm.icu.text.DecimalFormat; import com.ibm.icu.text.DecimalFormatSymbols; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/DataDrivenNumberFormatTestUtility.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/DataDrivenNumberFormatTestUtility.java index f7913fe8de22..f630c83d868f 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/DataDrivenNumberFormatTestUtility.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/DataDrivenNumberFormatTestUtility.java @@ -8,7 +8,6 @@ */ package com.ibm.icu.dev.test.format; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.io.BufferedReader; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -16,6 +15,7 @@ import java.util.ArrayList; import java.util.List; +import com.ibm.icu.dev.test.CoreTestFmwk; import com.ibm.icu.dev.test.TestFmwk; import com.ibm.icu.dev.test.TestUtil; import com.ibm.icu.impl.Utility; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/DateFormatMiscTests.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/DateFormatMiscTests.java index 42c7f5602386..9ed13c42cfe3 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/DateFormatMiscTests.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/DateFormatMiscTests.java @@ -14,7 +14,6 @@ package com.ibm.icu.dev.test.format; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.text.FieldPosition; import java.text.ParseException; import java.util.Date; @@ -24,7 +23,7 @@ import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import com.ibm.icu.dev.test.TestFmwk; +import com.ibm.icu.dev.test.CoreTestFmwk; import com.ibm.icu.text.DateFormatSymbols; import com.ibm.icu.text.SimpleDateFormat; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/DateFormatRegressionTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/DateFormatRegressionTest.java index d5e7669236a7..10cc547bc9eb 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/DateFormatRegressionTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/DateFormatRegressionTest.java @@ -14,7 +14,6 @@ package com.ibm.icu.dev.test.format; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -32,7 +31,7 @@ import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import com.ibm.icu.dev.test.TestFmwk; +import com.ibm.icu.dev.test.CoreTestFmwk; import com.ibm.icu.text.DateFormat; import com.ibm.icu.text.SimpleDateFormat; import com.ibm.icu.util.Calendar; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/DateFormatRegressionTestJ.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/DateFormatRegressionTestJ.java index 4e7e2738a7f5..2fb96e74adbc 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/DateFormatRegressionTestJ.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/DateFormatRegressionTestJ.java @@ -13,7 +13,6 @@ package com.ibm.icu.dev.test.format; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.text.ParseException; import java.text.ParsePosition; import java.util.Date; @@ -24,7 +23,7 @@ import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import com.ibm.icu.dev.test.TestFmwk; +import com.ibm.icu.dev.test.CoreTestFmwk; import com.ibm.icu.text.DateFormat; import com.ibm.icu.text.DateFormatSymbols; import com.ibm.icu.text.SimpleDateFormat; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/DateFormatRoundTripTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/DateFormatRoundTripTest.java index bf3fc010a5c9..409f3b5164c0 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/DateFormatRoundTripTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/DateFormatRoundTripTest.java @@ -14,7 +14,6 @@ package com.ibm.icu.dev.test.format; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.text.FieldPosition; import java.text.ParseException; import java.util.Date; @@ -25,7 +24,7 @@ import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import com.ibm.icu.dev.test.TestFmwk; +import com.ibm.icu.dev.test.CoreTestFmwk; import com.ibm.icu.text.DateFormat; import com.ibm.icu.text.SimpleDateFormat; import com.ibm.icu.util.Calendar; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/DateIntervalFormatTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/DateIntervalFormatTest.java index e3bcecbb25e7..a7ca4221ff9b 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/DateIntervalFormatTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/DateIntervalFormatTest.java @@ -15,7 +15,6 @@ package com.ibm.icu.dev.test.format; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.text.FieldPosition; import java.text.Format.Field; import java.text.ParseException; @@ -30,6 +29,7 @@ import org.junit.runner.RunWith; import org.junit.runners.JUnit4; +import com.ibm.icu.dev.test.CoreTestFmwk; import com.ibm.icu.dev.test.TestFmwk; import com.ibm.icu.impl.DontCareFieldPosition; import com.ibm.icu.impl.Utility; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/DateTimeGeneratorTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/DateTimeGeneratorTest.java index 847d84e9a886..9e43bd53f4cd 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/DateTimeGeneratorTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/DateTimeGeneratorTest.java @@ -9,7 +9,6 @@ package com.ibm.icu.dev.test.format; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.text.ParsePosition; import java.util.Collection; import java.util.Date; @@ -27,7 +26,7 @@ import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import com.ibm.icu.dev.test.TestFmwk; +import com.ibm.icu.dev.test.CoreTestFmwk; import com.ibm.icu.impl.PatternTokenizer; import com.ibm.icu.impl.Utility; import com.ibm.icu.text.DateFormat; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/IntlTestDateFormat.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/IntlTestDateFormat.java index 81e792183afe..4d673d2d7fb8 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/IntlTestDateFormat.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/IntlTestDateFormat.java @@ -18,7 +18,6 @@ package com.ibm.icu.dev.test.format; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.text.FieldPosition; import java.text.ParseException; import java.util.Date; @@ -29,7 +28,7 @@ import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import com.ibm.icu.dev.test.TestFmwk; +import com.ibm.icu.dev.test.CoreTestFmwk; import com.ibm.icu.text.DateFormat; import com.ibm.icu.text.SimpleDateFormat; import com.ibm.icu.util.ULocale; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/IntlTestDateFormatAPI.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/IntlTestDateFormatAPI.java index ae2de2d40f00..3cf3292a5edc 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/IntlTestDateFormatAPI.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/IntlTestDateFormatAPI.java @@ -18,7 +18,6 @@ package com.ibm.icu.dev.test.format; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.text.FieldPosition; import java.text.ParseException; import java.text.ParsePosition; @@ -29,7 +28,7 @@ import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import com.ibm.icu.dev.test.TestFmwk; +import com.ibm.icu.dev.test.CoreTestFmwk; import com.ibm.icu.text.DateFormat; import com.ibm.icu.text.NumberFormat; import com.ibm.icu.util.Calendar; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/IntlTestDateFormatAPIC.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/IntlTestDateFormatAPIC.java index 54168975b15a..243d60b1f073 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/IntlTestDateFormatAPIC.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/IntlTestDateFormatAPIC.java @@ -14,7 +14,6 @@ package com.ibm.icu.dev.test.format; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.text.FieldPosition; import java.text.ParsePosition; import java.util.Date; @@ -23,7 +22,7 @@ import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import com.ibm.icu.dev.test.TestFmwk; +import com.ibm.icu.dev.test.CoreTestFmwk; import com.ibm.icu.text.DateFormat; import com.ibm.icu.text.DecimalFormat; import com.ibm.icu.text.NumberFormat; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/IntlTestDateFormatSymbols.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/IntlTestDateFormatSymbols.java index 2ad380714acf..08743b0404b2 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/IntlTestDateFormatSymbols.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/IntlTestDateFormatSymbols.java @@ -18,14 +18,13 @@ package com.ibm.icu.dev.test.format; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.util.Locale; 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.dev.test.CoreTestFmwk; import com.ibm.icu.text.DateFormatSymbols; import com.ibm.icu.util.Calendar; import com.ibm.icu.util.ULocale; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/IntlTestDecimalFormatAPI.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/IntlTestDecimalFormatAPI.java index bb3ad852c353..6f66b9207c32 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/IntlTestDecimalFormatAPI.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/IntlTestDecimalFormatAPI.java @@ -18,7 +18,6 @@ package com.ibm.icu.dev.test.format; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.text.FieldPosition; import java.text.Format; import java.text.ParseException; @@ -29,7 +28,7 @@ import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import com.ibm.icu.dev.test.TestFmwk; +import com.ibm.icu.dev.test.CoreTestFmwk; import com.ibm.icu.math.BigDecimal; import com.ibm.icu.math.MathContext; import com.ibm.icu.text.DecimalFormat; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/IntlTestDecimalFormatSymbols.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/IntlTestDecimalFormatSymbols.java index 215d762adc33..26b23750084c 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/IntlTestDecimalFormatSymbols.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/IntlTestDecimalFormatSymbols.java @@ -19,7 +19,6 @@ package com.ibm.icu.dev.test.format; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.util.Arrays; import java.util.Locale; @@ -27,7 +26,7 @@ import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import com.ibm.icu.dev.test.TestFmwk; +import com.ibm.icu.dev.test.CoreTestFmwk; import com.ibm.icu.text.DecimalFormat; import com.ibm.icu.text.DecimalFormatSymbols; import com.ibm.icu.text.NumberingSystem; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/IntlTestNumberFormat.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/IntlTestNumberFormat.java index e89f06551e14..9759670fe92a 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/IntlTestNumberFormat.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/IntlTestNumberFormat.java @@ -14,7 +14,6 @@ package com.ibm.icu.dev.test.format; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.util.Locale; import java.util.Random; @@ -22,6 +21,7 @@ import org.junit.runner.RunWith; import org.junit.runners.JUnit4; +import com.ibm.icu.dev.test.CoreTestFmwk; import com.ibm.icu.dev.test.TestFmwk; import com.ibm.icu.text.DecimalFormat; import com.ibm.icu.text.NumberFormat; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/IntlTestNumberFormatAPI.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/IntlTestNumberFormatAPI.java index c5dec2de37fa..cda2f7518335 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/IntlTestNumberFormatAPI.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/IntlTestNumberFormatAPI.java @@ -17,7 +17,6 @@ package com.ibm.icu.dev.test.format; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.math.BigInteger; import java.text.FieldPosition; import java.text.ParseException; @@ -28,7 +27,7 @@ import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import com.ibm.icu.dev.test.TestFmwk; +import com.ibm.icu.dev.test.CoreTestFmwk; import com.ibm.icu.text.NumberFormat; import com.ibm.icu.util.ULocale; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/IntlTestSimpleDateFormatAPI.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/IntlTestSimpleDateFormatAPI.java index 861bd7883340..2ca75cd4dc70 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/IntlTestSimpleDateFormatAPI.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/IntlTestSimpleDateFormatAPI.java @@ -19,7 +19,6 @@ package com.ibm.icu.dev.test.format; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.text.FieldPosition; import java.text.Format; import java.text.ParseException; @@ -31,7 +30,7 @@ import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import com.ibm.icu.dev.test.TestFmwk; +import com.ibm.icu.dev.test.CoreTestFmwk; import com.ibm.icu.text.DateFormatSymbols; import com.ibm.icu.text.SimpleDateFormat; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/ListFormatterTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/ListFormatterTest.java index 26ecd6035ffa..feb47927100e 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/ListFormatterTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/ListFormatterTest.java @@ -8,7 +8,6 @@ */ package com.ibm.icu.dev.test.format; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -18,7 +17,7 @@ import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import com.ibm.icu.dev.test.TestFmwk; +import com.ibm.icu.dev.test.CoreTestFmwk; import com.ibm.icu.text.ConstrainedFieldPosition; import com.ibm.icu.text.ListFormatter; import com.ibm.icu.text.ListFormatter.FormattedList; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/MeasureUnitThreadTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/MeasureUnitThreadTest.java index 49f3f8d17899..df83c1d37ddf 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/MeasureUnitThreadTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/MeasureUnitThreadTest.java @@ -3,12 +3,11 @@ package com.ibm.icu.dev.test.format; -import com.ibm.icu.dev.test.CoreTestFmwk; 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.dev.test.CoreTestFmwk; import com.ibm.icu.impl.DontCareFieldPosition; import com.ibm.icu.text.MeasureFormat; import com.ibm.icu.util.Currency; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/MessagePatternUtilTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/MessagePatternUtilTest.java index 74a173a5afc2..77ffe1b8916a 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/MessagePatternUtilTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/MessagePatternUtilTest.java @@ -11,7 +11,6 @@ package com.ibm.icu.dev.test.format; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.util.ArrayList; import java.util.Iterator; import java.util.List; @@ -21,7 +20,7 @@ import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import com.ibm.icu.dev.test.TestFmwk; +import com.ibm.icu.dev.test.CoreTestFmwk; import com.ibm.icu.text.MessagePattern; import com.ibm.icu.text.MessagePatternUtil; import com.ibm.icu.text.MessagePatternUtil.ArgNode; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/MessageRegressionTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/MessageRegressionTest.java index 62f4d01a981e..21b601538670 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/MessageRegressionTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/MessageRegressionTest.java @@ -32,7 +32,6 @@ */ package com.ibm.icu.dev.test.format; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -50,7 +49,7 @@ import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import com.ibm.icu.dev.test.TestFmwk; +import com.ibm.icu.dev.test.CoreTestFmwk; import com.ibm.icu.text.MessageFormat; import com.ibm.icu.text.NumberFormat; import com.ibm.icu.util.ULocale; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/NumberFormatJavaCompatilityTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/NumberFormatJavaCompatilityTest.java index df6541a19017..5ea9a936385a 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/NumberFormatJavaCompatilityTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/NumberFormatJavaCompatilityTest.java @@ -2,7 +2,6 @@ // License & terms of use: http://www.unicode.org/copyright.html package com.ibm.icu.dev.test.format; -import com.ibm.icu.dev.test.CoreTestFmwk; import static org.junit.Assert.assertEquals; import java.text.ParsePosition; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/NumberFormatRegistrationTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/NumberFormatRegistrationTest.java index 9d5ffaffecd2..6babfe6d2683 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/NumberFormatRegistrationTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/NumberFormatRegistrationTest.java @@ -8,14 +8,13 @@ */ package com.ibm.icu.dev.test.format; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.util.Arrays; 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.dev.test.CoreTestFmwk; import com.ibm.icu.text.NumberFormat; import com.ibm.icu.text.NumberFormat.SimpleNumberFormatFactory; import com.ibm.icu.util.ULocale; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/NumberFormatRoundTripTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/NumberFormatRoundTripTest.java index 2f7c7518502d..13e3405cb9a5 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/NumberFormatRoundTripTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/NumberFormatRoundTripTest.java @@ -14,7 +14,6 @@ package com.ibm.icu.dev.test.format; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.util.Locale; import java.util.Random; @@ -22,7 +21,7 @@ import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import com.ibm.icu.dev.test.TestFmwk; +import com.ibm.icu.dev.test.CoreTestFmwk; import com.ibm.icu.text.DecimalFormat; import com.ibm.icu.text.NumberFormat; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/PersonNameConsistencyTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/PersonNameConsistencyTest.java index f41e5ece8003..cd8b70d4d4e2 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/PersonNameConsistencyTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/PersonNameConsistencyTest.java @@ -2,7 +2,6 @@ // License & terms of use: http://www.unicode.org/copyright.html package com.ibm.icu.dev.test.format; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; @@ -18,7 +17,7 @@ import org.junit.Test; import org.junit.runner.RunWith; -import com.ibm.icu.dev.test.TestFmwk; +import com.ibm.icu.dev.test.CoreTestFmwk; import com.ibm.icu.dev.test.TestUtil; import com.ibm.icu.text.PersonName; import com.ibm.icu.text.PersonNameFormatter; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/PersonNameFormatterTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/PersonNameFormatterTest.java index bf3ccac9d585..951a0093e76c 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/PersonNameFormatterTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/PersonNameFormatterTest.java @@ -2,7 +2,6 @@ // License & terms of use: http://www.unicode.org/copyright.html package com.ibm.icu.dev.test.format; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.util.Arrays; import java.util.HashSet; import java.util.Locale; @@ -13,7 +12,7 @@ import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import com.ibm.icu.dev.test.TestFmwk; +import com.ibm.icu.dev.test.CoreTestFmwk; import com.ibm.icu.text.PersonName; import com.ibm.icu.text.PersonNameFormatter; import com.ibm.icu.text.SimplePersonName; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/PluralFormatTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/PluralFormatTest.java index bd01f11168be..3a0204930e2d 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/PluralFormatTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/PluralFormatTest.java @@ -8,7 +8,6 @@ */ package com.ibm.icu.dev.test.format; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.util.HashMap; import java.util.Locale; import java.util.Map; @@ -17,7 +16,7 @@ import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import com.ibm.icu.dev.test.TestFmwk; +import com.ibm.icu.dev.test.CoreTestFmwk; import com.ibm.icu.impl.Utility; import com.ibm.icu.text.CurrencyPluralInfo; import com.ibm.icu.text.NumberFormat; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/PluralFormatUnitTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/PluralFormatUnitTest.java index 5947dfba1b91..f0755f0b9776 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/PluralFormatUnitTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/PluralFormatUnitTest.java @@ -9,7 +9,6 @@ package com.ibm.icu.dev.test.format; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.text.FieldPosition; import java.text.ParsePosition; import java.util.Collection; @@ -23,6 +22,7 @@ import org.junit.runner.RunWith; import org.junit.runners.JUnit4; +import com.ibm.icu.dev.test.CoreTestFmwk; import com.ibm.icu.dev.test.TestFmwk; import com.ibm.icu.impl.number.DecimalQuantity; import com.ibm.icu.text.DecimalFormat; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/RBNFParseTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/RBNFParseTest.java index aa801f8d2300..54df0d1fb8b8 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/RBNFParseTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/RBNFParseTest.java @@ -8,7 +8,6 @@ */ package com.ibm.icu.dev.test.format; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.text.ParseException; import java.util.Locale; @@ -17,7 +16,7 @@ import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import com.ibm.icu.dev.test.TestFmwk; +import com.ibm.icu.dev.test.CoreTestFmwk; import com.ibm.icu.text.RuleBasedNumberFormat; import com.ibm.icu.util.ULocale; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/RbnfRoundTripTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/RbnfRoundTripTest.java index 374f865e3ed1..6e4eb02deba9 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/RbnfRoundTripTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/RbnfRoundTripTest.java @@ -8,14 +8,13 @@ */ package com.ibm.icu.dev.test.format; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.util.Locale; 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.dev.test.CoreTestFmwk; import com.ibm.icu.text.RuleBasedNumberFormat; @RunWith(JUnit4.class) diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/RelativeDateTimeFormatterTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/RelativeDateTimeFormatterTest.java index abf85fc5a6dd..613f1fc16ce0 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/RelativeDateTimeFormatterTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/RelativeDateTimeFormatterTest.java @@ -8,14 +8,13 @@ */ package com.ibm.icu.dev.test.format; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.util.Locale; 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.dev.test.CoreTestFmwk; import com.ibm.icu.math.BigDecimal; import com.ibm.icu.text.DisplayContext; import com.ibm.icu.text.NumberFormat; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/ScientificNumberFormatterTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/ScientificNumberFormatterTest.java index 718aa1a2c676..bd82c1d39e7b 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/ScientificNumberFormatterTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/ScientificNumberFormatterTest.java @@ -8,12 +8,11 @@ */ package com.ibm.icu.dev.test.format; -import com.ibm.icu.dev.test.CoreTestFmwk; 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.dev.test.CoreTestFmwk; import com.ibm.icu.text.DecimalFormat; import com.ibm.icu.text.NumberFormat; import com.ibm.icu.text.ScientificNumberFormatter; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/SelectFormatAPITest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/SelectFormatAPITest.java index be817b331eeb..dd2e1c17f1fb 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/SelectFormatAPITest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/SelectFormatAPITest.java @@ -9,7 +9,6 @@ */ package com.ibm.icu.dev.test.format; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.text.FieldPosition; import java.text.ParsePosition; @@ -17,7 +16,7 @@ import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import com.ibm.icu.dev.test.TestFmwk; +import com.ibm.icu.dev.test.CoreTestFmwk; import com.ibm.icu.text.SelectFormat; /** diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/SelectFormatUnitTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/SelectFormatUnitTest.java index bd1686741dfa..82b3a3ff6a45 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/SelectFormatUnitTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/SelectFormatUnitTest.java @@ -9,12 +9,11 @@ */ package com.ibm.icu.dev.test.format; -import com.ibm.icu.dev.test.CoreTestFmwk; 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.dev.test.CoreTestFmwk; import com.ibm.icu.text.SelectFormat; /** diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/TimeUnitTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/TimeUnitTest.java index 3684464cfeb8..14447fc52291 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/TimeUnitTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/TimeUnitTest.java @@ -8,7 +8,6 @@ */ package com.ibm.icu.dev.test.format; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.text.ParseException; import java.text.ParsePosition; import java.util.Locale; @@ -17,7 +16,7 @@ import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import com.ibm.icu.dev.test.TestFmwk; +import com.ibm.icu.dev.test.CoreTestFmwk; import com.ibm.icu.math.BigDecimal; import com.ibm.icu.text.MeasureFormat; import com.ibm.icu.text.NumberFormat; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/impl/CSCharacterIteratorTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/impl/CSCharacterIteratorTest.java index 87d20134ca4c..cb9d3eaf7390 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/impl/CSCharacterIteratorTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/impl/CSCharacterIteratorTest.java @@ -3,7 +3,6 @@ package com.ibm.icu.dev.test.impl; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.text.CharacterIterator; import java.text.StringCharacterIterator; @@ -11,7 +10,7 @@ import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import com.ibm.icu.dev.test.TestFmwk; +import com.ibm.icu.dev.test.CoreTestFmwk; import com.ibm.icu.impl.CSCharacterIterator; @RunWith(JUnit4.class) diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/impl/CacheTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/impl/CacheTest.java index 71ca72d99bd0..8ffe07d013ef 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/impl/CacheTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/impl/CacheTest.java @@ -8,12 +8,11 @@ */ package com.ibm.icu.dev.test.impl; -import com.ibm.icu.dev.test.CoreTestFmwk; 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.dev.test.CoreTestFmwk; import com.ibm.icu.impl.CacheValue; import com.ibm.icu.impl.CacheValue.Strength; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/impl/StringSegmentTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/impl/StringSegmentTest.java index 03562cc688d8..028f2f9edab6 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/impl/StringSegmentTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/impl/StringSegmentTest.java @@ -2,7 +2,6 @@ // License & terms of use: http://www.unicode.org/copyright.html package com.ibm.icu.dev.test.impl; -import com.ibm.icu.dev.test.CoreTestFmwk; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/iterator/TestUCharacterIterator.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/iterator/TestUCharacterIterator.java index 26df24c5229f..9100fde42c1b 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/iterator/TestUCharacterIterator.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/iterator/TestUCharacterIterator.java @@ -8,7 +8,6 @@ */ package com.ibm.icu.dev.test.iterator; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.text.CharacterIterator; import java.text.StringCharacterIterator; @@ -16,7 +15,7 @@ import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import com.ibm.icu.dev.test.TestFmwk; +import com.ibm.icu.dev.test.CoreTestFmwk; import com.ibm.icu.text.ReplaceableString; import com.ibm.icu.text.UCharacterIterator; import com.ibm.icu.text.UTF16; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/lang/DataDrivenUScriptTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/lang/DataDrivenUScriptTest.java index cf0d5f205673..00df24b6bedc 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/lang/DataDrivenUScriptTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/lang/DataDrivenUScriptTest.java @@ -3,7 +3,6 @@ package com.ibm.icu.dev.test.lang; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.util.Arrays; import java.util.Collection; import java.util.Locale; @@ -13,7 +12,7 @@ import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import com.ibm.icu.dev.test.TestFmwk; +import com.ibm.icu.dev.test.CoreTestFmwk; import com.ibm.icu.lang.UScript; import com.ibm.icu.util.ULocale; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/lang/TestUScript.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/lang/TestUScript.java index 34f5cb717951..ce6d79cd6090 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/lang/TestUScript.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/lang/TestUScript.java @@ -9,14 +9,13 @@ package com.ibm.icu.dev.test.lang; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.util.BitSet; 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.dev.test.CoreTestFmwk; import com.ibm.icu.lang.UProperty; import com.ibm.icu.lang.UScript; import com.ibm.icu.lang.UScript.ScriptUsage; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/lang/TestUScriptRun.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/lang/TestUScriptRun.java index b6a336595c84..1c84c7ce4d0e 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/lang/TestUScriptRun.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/lang/TestUScriptRun.java @@ -9,12 +9,11 @@ package com.ibm.icu.dev.test.lang; -import com.ibm.icu.dev.test.CoreTestFmwk; 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.dev.test.CoreTestFmwk; import com.ibm.icu.lang.UScript; import com.ibm.icu.lang.UScriptRun; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/lang/UCharacterCaseTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/lang/UCharacterCaseTest.java index 2dc830126569..07148ce6e9f2 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/lang/UCharacterCaseTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/lang/UCharacterCaseTest.java @@ -10,7 +10,6 @@ package com.ibm.icu.dev.test.lang; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.io.BufferedReader; import java.util.ArrayList; import java.util.Arrays; @@ -22,7 +21,7 @@ import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import com.ibm.icu.dev.test.TestFmwk; +import com.ibm.icu.dev.test.CoreTestFmwk; import com.ibm.icu.dev.test.TestUtil; import com.ibm.icu.impl.CaseMapImpl; import com.ibm.icu.impl.Utility; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/lang/UCharacterCategoryTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/lang/UCharacterCategoryTest.java index 35548c143c07..782007566d00 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/lang/UCharacterCategoryTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/lang/UCharacterCategoryTest.java @@ -8,12 +8,11 @@ */ package com.ibm.icu.dev.test.lang; -import com.ibm.icu.dev.test.CoreTestFmwk; 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.dev.test.CoreTestFmwk; import com.ibm.icu.lang.UCharacterCategory; /** diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/lang/UCharacterDirectionTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/lang/UCharacterDirectionTest.java index e495364099dd..16cb8fcdfe24 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/lang/UCharacterDirectionTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/lang/UCharacterDirectionTest.java @@ -8,12 +8,11 @@ */ package com.ibm.icu.dev.test.lang; -import com.ibm.icu.dev.test.CoreTestFmwk; 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.dev.test.CoreTestFmwk; import com.ibm.icu.lang.UCharacterDirection; /** diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/lang/UCharacterSurrogateTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/lang/UCharacterSurrogateTest.java index 34ea1cd64810..9990c3870f76 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/lang/UCharacterSurrogateTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/lang/UCharacterSurrogateTest.java @@ -9,12 +9,11 @@ package com.ibm.icu.dev.test.lang; -import com.ibm.icu.dev.test.CoreTestFmwk; 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.dev.test.CoreTestFmwk; import com.ibm.icu.impl.Utility; import com.ibm.icu.lang.UCharacter; import com.ibm.icu.text.UTF16; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/lang/UCharacterTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/lang/UCharacterTest.java index a1e40e72b881..64e39cf8464d 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/lang/UCharacterTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/lang/UCharacterTest.java @@ -9,7 +9,6 @@ package com.ibm.icu.dev.test.lang; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.io.BufferedReader; import java.io.IOException; import java.util.Arrays; @@ -19,6 +18,7 @@ import org.junit.runner.RunWith; import org.junit.runners.JUnit4; +import com.ibm.icu.dev.test.CoreTestFmwk; import com.ibm.icu.dev.test.TestFmwk; import com.ibm.icu.dev.test.TestUtil; import com.ibm.icu.impl.Norm2AllModes; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/lang/UCharacterThreadTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/lang/UCharacterThreadTest.java index 2b522de79680..5873fb36e5b5 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/lang/UCharacterThreadTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/lang/UCharacterThreadTest.java @@ -8,7 +8,6 @@ */ package com.ibm.icu.dev.test.lang; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.util.LinkedList; import java.util.List; import java.util.ListIterator; @@ -17,7 +16,7 @@ import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import com.ibm.icu.dev.test.TestFmwk; +import com.ibm.icu.dev.test.CoreTestFmwk; import com.ibm.icu.lang.UCharacter; /** diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/lang/UPropertyAliasesTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/lang/UPropertyAliasesTest.java index 5c1c6cdeea34..845032f85333 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/lang/UPropertyAliasesTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/lang/UPropertyAliasesTest.java @@ -12,12 +12,11 @@ */ package com.ibm.icu.dev.test.lang; -import com.ibm.icu.dev.test.CoreTestFmwk; 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.dev.test.CoreTestFmwk; import com.ibm.icu.lang.UCharacter; import com.ibm.icu.lang.UProperty; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/lang/UTF16Test.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/lang/UTF16Test.java index 85db0dc1b251..f555e8d10c23 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/lang/UTF16Test.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/lang/UTF16Test.java @@ -9,12 +9,11 @@ package com.ibm.icu.dev.test.lang; -import com.ibm.icu.dev.test.CoreTestFmwk; 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.dev.test.CoreTestFmwk; import com.ibm.icu.dev.test.UTF16Util; import com.ibm.icu.impl.Utility; import com.ibm.icu.lang.UCharacter; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/lang/UnicodeSetStringSpanTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/lang/UnicodeSetStringSpanTest.java index 8d389a0d5086..d6ac029c2a39 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/lang/UnicodeSetStringSpanTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/lang/UnicodeSetStringSpanTest.java @@ -8,14 +8,13 @@ */ package com.ibm.icu.dev.test.lang; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.util.Collection; 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.dev.test.CoreTestFmwk; import com.ibm.icu.impl.Utility; import com.ibm.icu.text.UTF16; import com.ibm.icu.text.UnicodeSet; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/lang/UnicodeSetTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/lang/UnicodeSetTest.java index 1ec8abfe69b2..0509401358a4 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/lang/UnicodeSetTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/lang/UnicodeSetTest.java @@ -8,7 +8,6 @@ */ package com.ibm.icu.dev.test.lang; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.text.NumberFormat; import java.text.ParsePosition; import java.util.ArrayList; @@ -30,6 +29,7 @@ import org.junit.runner.RunWith; import org.junit.runners.JUnit4; +import com.ibm.icu.dev.test.CoreTestFmwk; import com.ibm.icu.dev.test.TestFmwk; import com.ibm.icu.dev.util.CollectionUtilities; import com.ibm.icu.impl.SortedSetRelation; 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 4aab063d8967..30004fc79b7e 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,7 +3,6 @@ package com.ibm.icu.dev.test.message2; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.util.Locale; import java.util.Map; @@ -11,7 +10,7 @@ import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import com.ibm.icu.dev.test.TestFmwk; +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; 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 89231c4c099f..160b63c09f62 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,7 +3,6 @@ package com.ibm.icu.dev.test.message2; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.util.Arrays; import java.util.Collection; import java.util.Locale; @@ -13,7 +12,7 @@ import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import com.ibm.icu.dev.test.TestFmwk; +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; 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 849316989948..a41d462f163e 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,7 +3,6 @@ package com.ibm.icu.dev.test.message2; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.util.Locale; import java.util.Map; import java.util.Properties; @@ -13,7 +12,7 @@ import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import com.ibm.icu.dev.test.TestFmwk; +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; 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 f0e1bd7b59f4..06502d178c88 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,7 +3,6 @@ package com.ibm.icu.dev.test.message2; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.util.Locale; import java.util.Map; import java.util.Objects; @@ -12,7 +11,7 @@ import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import com.ibm.icu.dev.test.TestFmwk; +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; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/message2/FromJsonTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/message2/FromJsonTest.java index d8eb190b4973..6f821973ba0d 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/message2/FromJsonTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/message2/FromJsonTest.java @@ -3,12 +3,11 @@ package com.ibm.icu.dev.test.message2; -import com.ibm.icu.dev.test.CoreTestFmwk; 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.dev.test.CoreTestFmwk; /** * These tests come from the test suite created for the JavaScript implementation of MessageFormat v2. 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 de4733a396b5..9137b0c31448 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,7 +3,6 @@ package com.ibm.icu.dev.test.message2; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.util.Date; import java.util.HashMap; import java.util.Locale; @@ -14,7 +13,7 @@ import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import com.ibm.icu.dev.test.TestFmwk; +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; 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 c0250877dcb2..8742fed04fe8 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,7 +3,6 @@ package com.ibm.icu.dev.test.message2; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.util.Date; import java.util.Locale; import java.util.Map; @@ -12,7 +11,7 @@ import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import com.ibm.icu.dev.test.TestFmwk; +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; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/normalizer/ConformanceTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/normalizer/ConformanceTest.java index 2785bcf9e8f3..3584f1b8dc8f 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/normalizer/ConformanceTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/normalizer/ConformanceTest.java @@ -9,7 +9,6 @@ package com.ibm.icu.dev.test.normalizer; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.io.BufferedReader; import java.io.IOException; import java.text.StringCharacterIterator; @@ -19,7 +18,7 @@ import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import com.ibm.icu.dev.test.TestFmwk; +import com.ibm.icu.dev.test.CoreTestFmwk; import com.ibm.icu.dev.test.TestUtil; import com.ibm.icu.impl.Utility; import com.ibm.icu.text.Normalizer; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/normalizer/NormalizationMonkeyTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/normalizer/NormalizationMonkeyTest.java index a58f8eb5054e..3c9f9bcd2c2d 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/normalizer/NormalizationMonkeyTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/normalizer/NormalizationMonkeyTest.java @@ -9,14 +9,13 @@ package com.ibm.icu.dev.test.normalizer; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.util.Random; 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.dev.test.CoreTestFmwk; import com.ibm.icu.lang.UCharacter; import com.ibm.icu.lang.UCharacterCategory; import com.ibm.icu.text.Normalizer; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/normalizer/NormalizerRegressionTests.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/normalizer/NormalizerRegressionTests.java index 06498f062fd3..ee9e3bf80388 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/normalizer/NormalizerRegressionTests.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/normalizer/NormalizerRegressionTests.java @@ -9,12 +9,11 @@ package com.ibm.icu.dev.test.normalizer; -import com.ibm.icu.dev.test.CoreTestFmwk; 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.dev.test.CoreTestFmwk; import com.ibm.icu.text.Normalizer; @RunWith(JUnit4.class) diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/normalizer/TestCanonicalIterator.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/normalizer/TestCanonicalIterator.java index 651da630627c..104825d2569b 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/normalizer/TestCanonicalIterator.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/normalizer/TestCanonicalIterator.java @@ -8,7 +8,6 @@ */ package com.ibm.icu.dev.test.normalizer; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.util.Collection; import java.util.Iterator; import java.util.Set; @@ -19,7 +18,7 @@ import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import com.ibm.icu.dev.test.TestFmwk; +import com.ibm.icu.dev.test.CoreTestFmwk; import com.ibm.icu.impl.Utility; import com.ibm.icu.lang.UCharacter; import com.ibm.icu.text.CanonicalIterator; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/normalizer/TestDeprecatedNormalizerAPI.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/normalizer/TestDeprecatedNormalizerAPI.java index 093b0e979511..d3c60844246e 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/normalizer/TestDeprecatedNormalizerAPI.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/normalizer/TestDeprecatedNormalizerAPI.java @@ -8,12 +8,11 @@ */ package com.ibm.icu.dev.test.normalizer; -import com.ibm.icu.dev.test.CoreTestFmwk; 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.dev.test.CoreTestFmwk; import com.ibm.icu.impl.Utility; import com.ibm.icu.lang.UCharacter; import com.ibm.icu.lang.UProperty; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/normalizer/UTS46Test.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/normalizer/UTS46Test.java index 3ef739a5b202..d96ca3e7356d 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/normalizer/UTS46Test.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/normalizer/UTS46Test.java @@ -8,7 +8,6 @@ */ package com.ibm.icu.dev.test.normalizer; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.io.BufferedReader; import java.io.IOException; import java.util.Collections; @@ -22,7 +21,7 @@ import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import com.ibm.icu.dev.test.TestFmwk; +import com.ibm.icu.dev.test.CoreTestFmwk; import com.ibm.icu.dev.test.TestUtil; import com.ibm.icu.impl.Normalizer2Impl.UTF16Plus; import com.ibm.icu.impl.Punycode; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/normalizer/UnicodeNormalizerConformanceTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/normalizer/UnicodeNormalizerConformanceTest.java index 45ad609fcea5..44252261e46c 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/normalizer/UnicodeNormalizerConformanceTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/normalizer/UnicodeNormalizerConformanceTest.java @@ -9,7 +9,6 @@ package com.ibm.icu.dev.test.normalizer; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.io.BufferedReader; import java.io.IOException; @@ -18,7 +17,7 @@ import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import com.ibm.icu.dev.test.TestFmwk; +import com.ibm.icu.dev.test.CoreTestFmwk; import com.ibm.icu.dev.test.TestUtil; import com.ibm.icu.text.UTF16; import com.ibm.icu.text.UnicodeSet; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/number/DecimalQuantityTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/number/DecimalQuantityTest.java index 15cc4d873c25..585a69f339a3 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/number/DecimalQuantityTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/number/DecimalQuantityTest.java @@ -2,7 +2,6 @@ // License & terms of use: http://www.unicode.org/copyright.html package com.ibm.icu.dev.test.number; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.math.BigDecimal; import java.math.BigInteger; import java.math.MathContext; @@ -19,7 +18,7 @@ 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.dev.test.CoreTestFmwk; import com.ibm.icu.impl.FormattedStringBuilder; import com.ibm.icu.impl.number.DecimalFormatProperties; import com.ibm.icu.impl.number.DecimalQuantity; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/number/ExhaustiveNumberTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/number/ExhaustiveNumberTest.java index 6a0adb036a5b..094600994da7 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/number/ExhaustiveNumberTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/number/ExhaustiveNumberTest.java @@ -2,7 +2,6 @@ // License & terms of use: http://www.unicode.org/copyright.html package com.ibm.icu.dev.test.number; -import com.ibm.icu.dev.test.CoreTestFmwk; import static com.ibm.icu.impl.StaticUnicodeSets.get; import java.math.BigDecimal; @@ -11,7 +10,7 @@ import org.junit.Before; import org.junit.Test; -import com.ibm.icu.dev.test.TestFmwk; +import com.ibm.icu.dev.test.CoreTestFmwk; import com.ibm.icu.impl.StaticUnicodeSets.Key; import com.ibm.icu.impl.number.DecimalQuantity_DualStorageBCD; import com.ibm.icu.lang.UCharacter; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/rbbi/AbstractBreakIteratorTests.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/rbbi/AbstractBreakIteratorTests.java index fcc6c509119d..a0d9de9d7362 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/rbbi/AbstractBreakIteratorTests.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/rbbi/AbstractBreakIteratorTests.java @@ -2,7 +2,6 @@ // License & terms of use: http://www.unicode.org/copyright.html package com.ibm.icu.dev.test.rbbi; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.text.CharacterIterator; import org.junit.Before; @@ -10,6 +9,7 @@ import org.junit.runner.RunWith; import org.junit.runners.JUnit4; +import com.ibm.icu.dev.test.CoreTestFmwk; import com.ibm.icu.dev.test.TestFmwk; import com.ibm.icu.text.BreakIterator; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/rbbi/BreakIteratorRegTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/rbbi/BreakIteratorRegTest.java index 00739920ea8c..d7e1ed1235e8 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/rbbi/BreakIteratorRegTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/rbbi/BreakIteratorRegTest.java @@ -8,7 +8,6 @@ */ package com.ibm.icu.dev.test.rbbi; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.text.CharacterIterator; import java.util.Arrays; import java.util.Locale; @@ -17,7 +16,7 @@ import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import com.ibm.icu.dev.test.TestFmwk; +import com.ibm.icu.dev.test.CoreTestFmwk; import com.ibm.icu.text.BreakIterator; @RunWith(JUnit4.class) diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/rbbi/BreakIteratorTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/rbbi/BreakIteratorTest.java index 5bec8a262a88..d6dda2a895e3 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/rbbi/BreakIteratorTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/rbbi/BreakIteratorTest.java @@ -8,7 +8,6 @@ */ package com.ibm.icu.dev.test.rbbi; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.text.StringCharacterIterator; import java.util.Locale; @@ -16,7 +15,7 @@ import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import com.ibm.icu.dev.test.TestFmwk; +import com.ibm.icu.dev.test.CoreTestFmwk; import com.ibm.icu.text.BreakIterator; import com.ibm.icu.text.FilteredBreakIteratorBuilder; import com.ibm.icu.util.ULocale; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/rbbi/RBBIAPITest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/rbbi/RBBIAPITest.java index 9fe053785b29..8064bf841fa9 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/rbbi/RBBIAPITest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/rbbi/RBBIAPITest.java @@ -14,7 +14,6 @@ package com.ibm.icu.dev.test.rbbi; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.io.ByteArrayOutputStream; import java.io.PrintStream; import java.text.CharacterIterator; @@ -27,6 +26,7 @@ import org.junit.runner.RunWith; import org.junit.runners.JUnit4; +import com.ibm.icu.dev.test.CoreTestFmwk; import com.ibm.icu.dev.test.TestFmwk; import com.ibm.icu.text.BreakIterator; import com.ibm.icu.text.RuleBasedBreakIterator; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/rbbi/RBBILSTMTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/rbbi/RBBILSTMTest.java index b622441b8148..dedf8233d99c 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/rbbi/RBBILSTMTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/rbbi/RBBILSTMTest.java @@ -2,7 +2,6 @@ // License & terms of use: http://www.unicode.org/copyright.html package com.ibm.icu.dev.test.rbbi; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; @@ -13,7 +12,7 @@ import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import com.ibm.icu.dev.test.TestFmwk; +import com.ibm.icu.dev.test.CoreTestFmwk; import com.ibm.icu.impl.breakiter.LSTMBreakEngine; import com.ibm.icu.lang.UScript; import com.ibm.icu.text.BreakIterator; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/rbbi/RBBIMonkeyTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/rbbi/RBBIMonkeyTest.java index f63f48ae5d41..83651fcae0d8 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/rbbi/RBBIMonkeyTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/rbbi/RBBIMonkeyTest.java @@ -3,7 +3,6 @@ package com.ibm.icu.dev.test.rbbi; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; @@ -20,7 +19,7 @@ import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import com.ibm.icu.dev.test.TestFmwk; +import com.ibm.icu.dev.test.CoreTestFmwk; import com.ibm.icu.impl.UCharacterName; import com.ibm.icu.impl.UCharacterNameChoice; import com.ibm.icu.text.BreakIterator; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/rbbi/RBBITest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/rbbi/RBBITest.java index 204595a0dcc1..15f7265d0636 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/rbbi/RBBITest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/rbbi/RBBITest.java @@ -8,15 +8,6 @@ */ package com.ibm.icu.dev.test.rbbi; -//Regression testing of RuleBasedBreakIterator -// -// TODO: These tests should be mostly retired. -// Much of the test data that was originally here was removed when the RBBI rules -// were updated to match the Unicode boundary TRs, and the data was found to be invalid. -// Much of the remaining data has been moved into the rbbitst.txt test data file, -// which is common between ICU4C and ICU4J. The remaining test data should also be moved, -// or simply retired if it is no longer interesting. -import com.ibm.icu.dev.test.CoreTestFmwk; import java.text.CharacterIterator; import java.util.ArrayList; import java.util.List; @@ -26,7 +17,15 @@ import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import com.ibm.icu.dev.test.TestFmwk; +//Regression testing of RuleBasedBreakIterator +// +// TODO: These tests should be mostly retired. +// Much of the test data that was originally here was removed when the RBBI rules +// were updated to match the Unicode boundary TRs, and the data was found to be invalid. +// Much of the remaining data has been moved into the rbbitst.txt test data file, +// which is common between ICU4C and ICU4J. The remaining test data should also be moved, +// or simply retired if it is no longer interesting. +import com.ibm.icu.dev.test.CoreTestFmwk; import com.ibm.icu.impl.RBBIDataWrapper; import com.ibm.icu.text.BreakIterator; import com.ibm.icu.text.RuleBasedBreakIterator; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/rbbi/RBBITestExtended.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/rbbi/RBBITestExtended.java index 82328562f6d4..14606f77a79c 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/rbbi/RBBITestExtended.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/rbbi/RBBITestExtended.java @@ -9,7 +9,6 @@ */ package com.ibm.icu.dev.test.rbbi; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; @@ -19,7 +18,7 @@ import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import com.ibm.icu.dev.test.TestFmwk; +import com.ibm.icu.dev.test.CoreTestFmwk; import com.ibm.icu.impl.ICUConfig; import com.ibm.icu.impl.Utility; import com.ibm.icu.lang.UCharacter; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/rbbi/RBBITestMonkey.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/rbbi/RBBITestMonkey.java index fb421070fe00..d28c01ffb0cf 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/rbbi/RBBITestMonkey.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/rbbi/RBBITestMonkey.java @@ -9,11 +9,6 @@ package com.ibm.icu.dev.test.rbbi; -// Monkey testing of RuleBasedBreakIterator. -// The old, original monkey test. TODO: remove -// The new monkey test is class RBBIMonkeyTest. - -import com.ibm.icu.dev.test.CoreTestFmwk; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -23,7 +18,11 @@ import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import com.ibm.icu.dev.test.TestFmwk; +// Monkey testing of RuleBasedBreakIterator. +// The old, original monkey test. TODO: remove +// The new monkey test is class RBBIMonkeyTest. + +import com.ibm.icu.dev.test.CoreTestFmwk; import com.ibm.icu.lang.UCharacter; import com.ibm.icu.lang.UProperty; import com.ibm.icu.text.BreakIterator; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/shaping/ArabicShapingRegTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/shaping/ArabicShapingRegTest.java index 8567bf786cbc..4dc1935d54cd 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/shaping/ArabicShapingRegTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/shaping/ArabicShapingRegTest.java @@ -9,14 +9,13 @@ package com.ibm.icu.dev.test.shaping; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.lang.reflect.Method; 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.dev.test.CoreTestFmwk; import com.ibm.icu.text.ArabicShaping; /** diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/shaping/DataDrivenArabicShapingRegTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/shaping/DataDrivenArabicShapingRegTest.java index 57ef19438eff..2e7beef0c0aa 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/shaping/DataDrivenArabicShapingRegTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/shaping/DataDrivenArabicShapingRegTest.java @@ -3,7 +3,6 @@ package com.ibm.icu.dev.test.shaping; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.util.Arrays; import java.util.Collection; import java.util.MissingResourceException; @@ -13,7 +12,7 @@ import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import com.ibm.icu.dev.test.TestFmwk; +import com.ibm.icu.dev.test.CoreTestFmwk; import com.ibm.icu.text.ArabicShaping; import com.ibm.icu.text.ArabicShapingException; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/stringprep/IDNAConformanceTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/stringprep/IDNAConformanceTest.java index e3103659044d..7a65fb18a106 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/stringprep/IDNAConformanceTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/stringprep/IDNAConformanceTest.java @@ -11,7 +11,6 @@ package com.ibm.icu.dev.test.stringprep; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.io.BufferedReader; import java.io.IOException; import java.io.UnsupportedEncodingException; @@ -24,7 +23,7 @@ import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import com.ibm.icu.dev.test.TestFmwk; +import com.ibm.icu.dev.test.CoreTestFmwk; import com.ibm.icu.dev.test.TestUtil; import com.ibm.icu.text.IDNA; import com.ibm.icu.text.StringPrepParseException; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/stringprep/IDNAReference.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/stringprep/IDNAReference.java index 9ae7d9f678eb..d34599b6a00c 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/stringprep/IDNAReference.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/stringprep/IDNAReference.java @@ -8,7 +8,6 @@ */ package com.ibm.icu.dev.test.stringprep; -import com.ibm.icu.dev.test.CoreTestFmwk; import com.ibm.icu.text.StringPrepParseException; import com.ibm.icu.text.UCharacterIterator; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/stringprep/TestIDNA.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/stringprep/TestIDNA.java index e65913c7af5e..315911649bf3 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/stringprep/TestIDNA.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/stringprep/TestIDNA.java @@ -8,7 +8,6 @@ */ package com.ibm.icu.dev.test.stringprep; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.util.Random; import org.junit.Ignore; @@ -16,7 +15,7 @@ import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import com.ibm.icu.dev.test.TestFmwk; +import com.ibm.icu.dev.test.CoreTestFmwk; import com.ibm.icu.impl.Utility; import com.ibm.icu.text.IDNA; import com.ibm.icu.text.StringPrep; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/stringprep/TestStringPrepProfiles.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/stringprep/TestStringPrepProfiles.java index bb51b8259413..9baad46ce4ac 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/stringprep/TestStringPrepProfiles.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/stringprep/TestStringPrepProfiles.java @@ -8,12 +8,11 @@ */ package com.ibm.icu.dev.test.stringprep; -import com.ibm.icu.dev.test.CoreTestFmwk; 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.dev.test.CoreTestFmwk; import com.ibm.icu.text.StringPrep; import com.ibm.icu.text.StringPrepParseException; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/text/DisplayOptionsTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/text/DisplayOptionsTest.java index ac4ce3b6a464..66498eab3fad 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/text/DisplayOptionsTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/text/DisplayOptionsTest.java @@ -3,12 +3,11 @@ package com.ibm.icu.dev.test.text; -import com.ibm.icu.dev.test.CoreTestFmwk; 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.dev.test.CoreTestFmwk; import com.ibm.icu.text.DisplayOptions; import com.ibm.icu.text.DisplayOptions.Capitalization; import com.ibm.icu.text.DisplayOptions.DisplayLength; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/text/SpoofCheckerTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/text/SpoofCheckerTest.java index 1005e36fb213..9ef1eb11137e 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/text/SpoofCheckerTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/text/SpoofCheckerTest.java @@ -8,7 +8,6 @@ */ package com.ibm.icu.dev.test.text; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.io.BufferedReader; import java.io.IOException; import java.io.Reader; @@ -29,7 +28,7 @@ import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import com.ibm.icu.dev.test.TestFmwk; +import com.ibm.icu.dev.test.CoreTestFmwk; import com.ibm.icu.dev.test.TestUtil; import com.ibm.icu.dev.test.TestUtil.JavaVendor; import com.ibm.icu.impl.Utility; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/timescale/TimeScaleAPITest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/timescale/TimeScaleAPITest.java index a4e89d7f5100..e74a4d2d9ed7 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/timescale/TimeScaleAPITest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/timescale/TimeScaleAPITest.java @@ -10,12 +10,11 @@ package com.ibm.icu.dev.test.timescale; -import com.ibm.icu.dev.test.CoreTestFmwk; 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.dev.test.CoreTestFmwk; import com.ibm.icu.math.BigDecimal; import com.ibm.icu.util.UniversalTimeScale; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/timescale/TimeScaleDataTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/timescale/TimeScaleDataTest.java index c042e179a566..8e46985431fa 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/timescale/TimeScaleDataTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/timescale/TimeScaleDataTest.java @@ -10,7 +10,6 @@ package com.ibm.icu.dev.test.timescale; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.util.Date; import java.util.Locale; @@ -18,7 +17,7 @@ import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import com.ibm.icu.dev.test.TestFmwk; +import com.ibm.icu.dev.test.CoreTestFmwk; import com.ibm.icu.util.GregorianCalendar; import com.ibm.icu.util.SimpleTimeZone; import com.ibm.icu.util.TimeZone; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/timescale/TimeScaleMonkeyTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/timescale/TimeScaleMonkeyTest.java index 7e3f1fd91c59..2f2ee1986d78 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/timescale/TimeScaleMonkeyTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/timescale/TimeScaleMonkeyTest.java @@ -10,14 +10,13 @@ package com.ibm.icu.dev.test.timescale; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.util.Random; 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.dev.test.CoreTestFmwk; import com.ibm.icu.math.BigDecimal; import com.ibm.icu.util.UniversalTimeScale; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/timezone/TimeZoneAliasTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/timezone/TimeZoneAliasTest.java index e8adf606d732..29ad92e6ac59 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/timezone/TimeZoneAliasTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/timezone/TimeZoneAliasTest.java @@ -8,7 +8,6 @@ */ package com.ibm.icu.dev.test.timezone; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.text.DateFormat; import java.text.NumberFormat; import java.util.ArrayList; @@ -29,7 +28,7 @@ import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import com.ibm.icu.dev.test.TestFmwk; +import com.ibm.icu.dev.test.CoreTestFmwk; import com.ibm.icu.util.TimeZone; /** diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/timezone/TimeZoneBoundaryTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/timezone/TimeZoneBoundaryTest.java index d27638d5f06b..62d4f9f1c36f 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/timezone/TimeZoneBoundaryTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/timezone/TimeZoneBoundaryTest.java @@ -8,14 +8,13 @@ */ package com.ibm.icu.dev.test.timezone; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.util.Date; 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.dev.test.CoreTestFmwk; import com.ibm.icu.dev.test.TestUtil; import com.ibm.icu.dev.test.TestUtil.JavaVendor; import com.ibm.icu.text.DateFormat; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/timezone/TimeZoneOffsetLocalTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/timezone/TimeZoneOffsetLocalTest.java index d8c7026f8c71..5c15509e4e6b 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/timezone/TimeZoneOffsetLocalTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/timezone/TimeZoneOffsetLocalTest.java @@ -8,14 +8,13 @@ */ package com.ibm.icu.dev.test.timezone; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.util.Date; 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.dev.test.CoreTestFmwk; import com.ibm.icu.text.DateFormat; import com.ibm.icu.util.AnnualTimeZoneRule; import com.ibm.icu.util.BasicTimeZone; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/timezone/TimeZoneRegressionTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/timezone/TimeZoneRegressionTest.java index be6054b6e50b..f3461ec9cadd 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/timezone/TimeZoneRegressionTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/timezone/TimeZoneRegressionTest.java @@ -15,7 +15,6 @@ package com.ibm.icu.dev.test.timezone; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -29,7 +28,7 @@ import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import com.ibm.icu.dev.test.TestFmwk; +import com.ibm.icu.dev.test.CoreTestFmwk; import com.ibm.icu.text.DateFormat; import com.ibm.icu.text.SimpleDateFormat; import com.ibm.icu.util.Calendar; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/timezone/TimeZoneRuleTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/timezone/TimeZoneRuleTest.java index 05b6327d255e..8396670e3474 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/timezone/TimeZoneRuleTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/timezone/TimeZoneRuleTest.java @@ -8,7 +8,6 @@ */ package com.ibm.icu.dev.test.timezone; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -22,6 +21,7 @@ import org.junit.runner.RunWith; import org.junit.runners.JUnit4; +import com.ibm.icu.dev.test.CoreTestFmwk; import com.ibm.icu.dev.test.TestFmwk; import com.ibm.icu.util.AnnualTimeZoneRule; import com.ibm.icu.util.BasicTimeZone; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/timezone/TimeZoneTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/timezone/TimeZoneTest.java index f3b9dfd676ea..f7f87c65019d 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/timezone/TimeZoneTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/timezone/TimeZoneTest.java @@ -9,7 +9,6 @@ package com.ibm.icu.dev.test.timezone; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -25,6 +24,7 @@ import org.junit.runner.RunWith; import org.junit.runners.JUnit4; +import com.ibm.icu.dev.test.CoreTestFmwk; import com.ibm.icu.dev.test.TestFmwk; import com.ibm.icu.impl.ICUData; import com.ibm.icu.impl.TimeZoneAdapter; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/util/BytesTrieTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/util/BytesTrieTest.java index 461e7365adc5..5240052b20aa 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/util/BytesTrieTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/util/BytesTrieTest.java @@ -12,7 +12,6 @@ package com.ibm.icu.dev.test.util; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.nio.ByteBuffer; import java.util.Arrays; import java.util.NoSuchElementException; @@ -21,7 +20,7 @@ import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import com.ibm.icu.dev.test.TestFmwk; +import com.ibm.icu.dev.test.CoreTestFmwk; import com.ibm.icu.util.BytesTrie; import com.ibm.icu.util.BytesTrieBuilder; import com.ibm.icu.util.StringTrieBuilder; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/util/CharsTrieTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/util/CharsTrieTest.java index 18710c0b1614..18691cc51d98 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/util/CharsTrieTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/util/CharsTrieTest.java @@ -12,14 +12,13 @@ package com.ibm.icu.dev.test.util; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.util.NoSuchElementException; 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.dev.test.CoreTestFmwk; import com.ibm.icu.text.UnicodeSet; import com.ibm.icu.util.BytesTrie; import com.ibm.icu.util.CharsTrie; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/util/CodePointTrieTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/util/CodePointTrieTest.java index d127dc821ba6..a1434a60c123 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/util/CodePointTrieTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/util/CodePointTrieTest.java @@ -8,7 +8,6 @@ package com.ibm.icu.dev.test.util; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.io.ByteArrayOutputStream; import java.nio.ByteBuffer; import java.util.ArrayList; @@ -18,7 +17,7 @@ import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import com.ibm.icu.dev.test.TestFmwk; +import com.ibm.icu.dev.test.CoreTestFmwk; import com.ibm.icu.impl.Normalizer2Impl.UTF16Plus; import com.ibm.icu.impl.Utility; import com.ibm.icu.lang.UCharacter; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/util/CompactArrayTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/util/CompactArrayTest.java index c9c441015218..73c1e840cf69 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/util/CompactArrayTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/util/CompactArrayTest.java @@ -8,12 +8,11 @@ */ package com.ibm.icu.dev.test.util; -import com.ibm.icu.dev.test.CoreTestFmwk; 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.dev.test.CoreTestFmwk; import com.ibm.icu.impl.Utility; import com.ibm.icu.util.CompactByteArray; import com.ibm.icu.util.CompactCharArray; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/util/DebugUtilitiesTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/util/DebugUtilitiesTest.java index b6b20e68ce8c..8035890dc7a5 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/util/DebugUtilitiesTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/util/DebugUtilitiesTest.java @@ -8,12 +8,11 @@ */ package com.ibm.icu.dev.test.util; -import com.ibm.icu.dev.test.CoreTestFmwk; 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.dev.test.CoreTestFmwk; /** * @author srl diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/util/DisplayNameTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/util/DisplayNameTest.java index ebbc0f74d44a..4338d0d7f8b9 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/util/DisplayNameTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/util/DisplayNameTest.java @@ -8,7 +8,6 @@ */ package com.ibm.icu.dev.test.util; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.util.ArrayList; import java.util.Arrays; import java.util.Date; @@ -24,7 +23,7 @@ import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import com.ibm.icu.dev.test.TestFmwk; +import com.ibm.icu.dev.test.CoreTestFmwk; import com.ibm.icu.impl.ICUResourceBundle; import com.ibm.icu.util.Calendar; import com.ibm.icu.util.Currency; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/util/GenderInfoTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/util/GenderInfoTest.java index 7be70a37c7d3..39bc6d2ae2cc 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/util/GenderInfoTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/util/GenderInfoTest.java @@ -8,7 +8,6 @@ */ package com.ibm.icu.dev.test.util; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.util.Arrays; import java.util.List; @@ -16,7 +15,7 @@ import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import com.ibm.icu.dev.test.TestFmwk; +import com.ibm.icu.dev.test.CoreTestFmwk; import com.ibm.icu.util.GenderInfo; import com.ibm.icu.util.GenderInfo.Gender; import com.ibm.icu.util.ULocale; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/util/ICUBinaryTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/util/ICUBinaryTest.java index cce2313068a5..ba40000fbaf3 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/util/ICUBinaryTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/util/ICUBinaryTest.java @@ -9,7 +9,6 @@ package com.ibm.icu.dev.test.util; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.io.IOException; import java.nio.ByteBuffer; @@ -17,7 +16,7 @@ import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import com.ibm.icu.dev.test.TestFmwk; +import com.ibm.icu.dev.test.CoreTestFmwk; import com.ibm.icu.impl.ICUBinary; /** diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/util/ICUServiceThreadTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/util/ICUServiceThreadTest.java index 843b05e0fbd5..7e449e3581e6 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/util/ICUServiceThreadTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/util/ICUServiceThreadTest.java @@ -8,7 +8,6 @@ */ package com.ibm.icu.dev.test.util; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.text.Collator; import java.util.ArrayList; import java.util.Arrays; @@ -29,6 +28,7 @@ import org.junit.runner.RunWith; import org.junit.runners.JUnit4; +import com.ibm.icu.dev.test.CoreTestFmwk; import com.ibm.icu.dev.test.TestFmwk; import com.ibm.icu.impl.ICULocaleService; import com.ibm.icu.impl.ICUService; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/util/LocaleAliasTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/util/LocaleAliasTest.java index a2b9d7ddee25..a8ce3c0acfc2 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/util/LocaleAliasTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/util/LocaleAliasTest.java @@ -14,7 +14,6 @@ package com.ibm.icu.dev.test.util; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.util.HashMap; import org.junit.Before; @@ -22,6 +21,7 @@ import org.junit.runner.RunWith; import org.junit.runners.JUnit4; +import com.ibm.icu.dev.test.CoreTestFmwk; import com.ibm.icu.dev.test.TestFmwk; import com.ibm.icu.impl.ICUData; import com.ibm.icu.text.DateFormat; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/util/LocaleBuilderTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/util/LocaleBuilderTest.java index 9ad74bad2b60..5d0dd1d09283 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/util/LocaleBuilderTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/util/LocaleBuilderTest.java @@ -8,14 +8,13 @@ */ package com.ibm.icu.dev.test.util; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.util.Arrays; 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.dev.test.CoreTestFmwk; import com.ibm.icu.util.IllformedLocaleException; import com.ibm.icu.util.ULocale; import com.ibm.icu.util.ULocale.Builder; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/util/LocaleDistanceTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/util/LocaleDistanceTest.java index 069f6443dad9..9f16e302a46b 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/util/LocaleDistanceTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/util/LocaleDistanceTest.java @@ -2,7 +2,6 @@ // License & terms of use: http://www.unicode.org/copyright.html package com.ibm.icu.dev.test.util; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.io.IOException; import java.util.ArrayList; import java.util.List; @@ -12,7 +11,7 @@ import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import com.ibm.icu.dev.test.TestFmwk; +import com.ibm.icu.dev.test.CoreTestFmwk; import com.ibm.icu.dev.tool.locale.LocaleDistanceBuilder; import com.ibm.icu.impl.locale.LocaleDistance; import com.ibm.icu.util.LocaleMatcher; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/util/LocaleMatcherTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/util/LocaleMatcherTest.java index 6dbadfe7f204..74a3216ac8c0 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/util/LocaleMatcherTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/util/LocaleMatcherTest.java @@ -9,7 +9,6 @@ package com.ibm.icu.dev.test.util; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.io.BufferedReader; import java.util.ArrayList; import java.util.Arrays; @@ -24,7 +23,7 @@ import org.junit.Test; import org.junit.runner.RunWith; -import com.ibm.icu.dev.test.TestFmwk; +import com.ibm.icu.dev.test.CoreTestFmwk; import com.ibm.icu.impl.locale.XCldrStub.FileUtilities; import com.ibm.icu.impl.locale.XLikelySubtags; import com.ibm.icu.util.LocaleMatcher; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/util/LocalePriorityListTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/util/LocalePriorityListTest.java index 535b65283677..a821b88c1ad6 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/util/LocalePriorityListTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/util/LocalePriorityListTest.java @@ -9,14 +9,13 @@ package com.ibm.icu.dev.test.util; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.util.Set; 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.dev.test.CoreTestFmwk; import com.ibm.icu.util.LocalePriorityList; import com.ibm.icu.util.ULocale; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/util/RegionTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/util/RegionTest.java index 8bcea221199f..165a2561fe1f 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/util/RegionTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/util/RegionTest.java @@ -13,7 +13,6 @@ package com.ibm.icu.dev.test.util; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.util.List; import java.util.Set; @@ -21,7 +20,7 @@ import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import com.ibm.icu.dev.test.TestFmwk; +import com.ibm.icu.dev.test.CoreTestFmwk; import com.ibm.icu.util.Region; import com.ibm.icu.util.Region.RegionType; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/util/SimpleFormatterTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/util/SimpleFormatterTest.java index 1bd9034918cc..b873d0ee2bfc 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/util/SimpleFormatterTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/util/SimpleFormatterTest.java @@ -8,12 +8,11 @@ */ package com.ibm.icu.dev.test.util; -import com.ibm.icu.dev.test.CoreTestFmwk; 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.dev.test.CoreTestFmwk; import com.ibm.icu.text.MessageFormat; import com.ibm.icu.text.SimpleFormatter; import com.ibm.icu.util.ULocale; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/util/StringTokenizerTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/util/StringTokenizerTest.java index f3779c4f447f..e5e76ab32006 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/util/StringTokenizerTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/util/StringTokenizerTest.java @@ -9,12 +9,11 @@ package com.ibm.icu.dev.test.util; -import com.ibm.icu.dev.test.CoreTestFmwk; 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.dev.test.CoreTestFmwk; import com.ibm.icu.impl.Utility; import com.ibm.icu.text.ReplaceableString; import com.ibm.icu.text.UnicodeSet; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/util/TestLocaleValidity.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/util/TestLocaleValidity.java index 978da2abdabb..2142a1537ec9 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/util/TestLocaleValidity.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/util/TestLocaleValidity.java @@ -8,7 +8,6 @@ */ package com.ibm.icu.dev.test.util; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.util.Collections; import java.util.EnumSet; import java.util.LinkedHashSet; @@ -20,7 +19,7 @@ import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import com.ibm.icu.dev.test.TestFmwk; +import com.ibm.icu.dev.test.CoreTestFmwk; import com.ibm.icu.impl.ValidIdentifiers; import com.ibm.icu.impl.ValidIdentifiers.Datasubtype; import com.ibm.icu.impl.ValidIdentifiers.Datatype; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/util/TextTrieMapTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/util/TextTrieMapTest.java index b99ca7bed730..8e6aa0fa15ef 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/util/TextTrieMapTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/util/TextTrieMapTest.java @@ -8,7 +8,6 @@ */ package com.ibm.icu.dev.test.util; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.util.Arrays; import java.util.Iterator; @@ -16,7 +15,7 @@ import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import com.ibm.icu.dev.test.TestFmwk; +import com.ibm.icu.dev.test.CoreTestFmwk; import com.ibm.icu.impl.TextTrieMap; import com.ibm.icu.text.UnicodeSet; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/util/Trie2Test.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/util/Trie2Test.java index 0dd36c884eeb..ce79619132c3 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/util/Trie2Test.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/util/Trie2Test.java @@ -9,7 +9,6 @@ package com.ibm.icu.dev.test.util; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -21,7 +20,7 @@ import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import com.ibm.icu.dev.test.TestFmwk; +import com.ibm.icu.dev.test.CoreTestFmwk; import com.ibm.icu.impl.ICUBinary; import com.ibm.icu.impl.Trie2; import com.ibm.icu.impl.Trie2Writable; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/util/TrieMapTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/util/TrieMapTest.java index 7c432d46c8a5..3f98a90407a5 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/util/TrieMapTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/util/TrieMapTest.java @@ -8,7 +8,6 @@ */ package com.ibm.icu.dev.test.util; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.text.DecimalFormat; import java.util.ArrayList; import java.util.Arrays; @@ -26,6 +25,7 @@ import org.junit.runner.RunWith; import org.junit.runners.JUnit4; +import com.ibm.icu.dev.test.CoreTestFmwk; import com.ibm.icu.dev.test.TestFmwk; import com.ibm.icu.dev.test.util.TrieMap.Style; import com.ibm.icu.dev.util.Timer; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/util/TrieTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/util/TrieTest.java index b3dea2f36e7e..f713f48b9541 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/util/TrieTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/util/TrieTest.java @@ -9,12 +9,11 @@ package com.ibm.icu.dev.test.util; -import com.ibm.icu.dev.test.CoreTestFmwk; 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.dev.test.CoreTestFmwk; import com.ibm.icu.impl.CharTrie; import com.ibm.icu.impl.IntTrie; import com.ibm.icu.impl.IntTrieBuilder; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/util/UtilityTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/util/UtilityTest.java index 94f9656f1a6b..cb27835b1273 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/util/UtilityTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/util/UtilityTest.java @@ -12,7 +12,6 @@ */ package com.ibm.icu.dev.test.util; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.util.ArrayList; import java.util.Arrays; import java.util.HashSet; @@ -24,6 +23,7 @@ import org.junit.runner.RunWith; import org.junit.runners.JUnit4; +import com.ibm.icu.dev.test.CoreTestFmwk; import com.ibm.icu.dev.test.TestFmwk; import com.ibm.icu.impl.Assert; import com.ibm.icu.impl.InvalidFormatException; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/util/VersionInfoTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/util/VersionInfoTest.java index b9664c09aa75..bc22403c22c9 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/util/VersionInfoTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/util/VersionInfoTest.java @@ -10,14 +10,13 @@ package com.ibm.icu.dev.test.util; -import com.ibm.icu.dev.test.CoreTestFmwk; import java.util.Arrays; 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.dev.test.CoreTestFmwk; import com.ibm.icu.util.VersionInfo;