From 3c44e031be67eb383db736b185b5feaa970d86a2 Mon Sep 17 00:00:00 2001 From: Elango Cheran Date: Sun, 15 Oct 2023 01:07:54 +0000 Subject: [PATCH] ICU-22505 Ensure default TZ remains unchanged by each test See #2670 --- .../icu/dev/test/TestLocaleNamePackaging.java | 2 +- .../test/calendar/DataDrivenCalendarTest.java | 5 +- .../test/format/CompactDecimalFormatTest.java | 4 +- .../dev/test/format/DataDrivenFormatTest.java | 5 +- .../icu/dev/test/format/DateFormatTest.java | 6 +- .../format/IntlTestDecimalFormatAPIC.java | 5 +- .../format/IntlTestDecimalFormatSymbolsC.java | 3 +- .../icu/dev/test/format/MeasureUnitTest.java | 3 +- .../format/NumberFormatRegressionTest.java | 3 +- .../format/NumberFormatSpecificationTest.java | 3 +- .../icu/dev/test/format/NumberFormatTest.java | 16 ++-- .../test/format/NumberRegressionTests.java | 4 +- .../icu/dev/test/format/PluralRangesTest.java | 3 +- .../icu/dev/test/format/PluralRulesTest.java | 7 +- .../com/ibm/icu/dev/test/format/RbnfTest.java | 3 +- .../dev/test/format/TestMessageFormat.java | 9 +- .../dev/test/format/TimeZoneFormatTest.java | 3 +- .../dev/test/message2/Mf2FeaturesTest.java | 10 +-- .../icu/dev/test/normalizer/BasicTest.java | 4 +- .../test/number/NumberFormatterApiTest.java | 4 +- .../icu/dev/test/number/NumberParserTest.java | 22 +++-- .../test/number/NumberPermutationTest.java | 4 +- .../test/number/NumberRangeFormatterTest.java | 4 +- .../dev/test/number/PatternStringTest.java | 7 +- .../icu/dev/test/number/PropertiesTest.java | 57 +++++++------ .../dev/test/rbbi/LSTMBreakEngineTest.java | 4 +- .../test/serializable/CompatibilityTest.java | 5 +- .../dev/test/serializable/CoverageTest.java | 4 +- .../icu/dev/test/stringprep/TestIDNARef.java | 4 +- .../dev/test/stringprep/TestStringPrep.java | 4 +- .../ibm/icu/dev/test/util/CurrencyTest.java | 4 +- .../dev/test/util/ICUResourceBundleTest.java | 4 +- .../ibm/icu/dev/test/util/ICUServiceTest.java | 4 +- .../ibm/icu/dev/test/util/LocaleDataTest.java | 4 +- .../ibm/icu/dev/test/util/ULocaleTest.java | 6 +- .../com/ibm/icu/dev/test/CoreTestFmwk.java | 85 +++++++++++++++++++ .../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 | 3 +- .../ibm/icu/dev/test/calendar/AstroTest.java | 3 +- .../test/calendar/CalendarRegressionTest.java | 3 +- .../dev/test/calendar/CalendarTestFmwk.java | 3 +- .../dev/test/calendar/CompatibilityTest.java | 3 +- .../icu/dev/test/calendar/EraRulesTest.java | 3 +- .../ibm/icu/dev/test/calendar/HebrewTest.java | 1 + .../icu/dev/test/calendar/HolidayTest.java | 7 +- .../test/calendar/InTemporalLeapYearTest.java | 3 +- .../dev/test/calendar/OrdinalMonthTest.java | 3 +- .../test/calendar/TemporalMonthCodeTest.java | 3 +- .../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 | 3 +- .../dev/test/format/DateFormatMiscTests.java | 3 +- .../test/format/DateFormatRegressionTest.java | 3 +- .../format/DateFormatRegressionTestJ.java | 7 +- .../test/format/DateFormatRoundTripTest.java | 3 +- .../test/format/DateIntervalFormatTest.java | 3 +- .../test/format/DateTimeGeneratorTest.java | 3 +- .../dev/test/format/IntlTestDateFormat.java | 3 +- .../test/format/IntlTestDateFormatAPI.java | 7 +- .../test/format/IntlTestDateFormatAPIC.java | 3 +- .../format/IntlTestDateFormatSymbols.java | 3 +- .../test/format/IntlTestDecimalFormatAPI.java | 7 +- .../format/IntlTestDecimalFormatSymbols.java | 3 +- .../dev/test/format/IntlTestNumberFormat.java | 3 +- .../test/format/IntlTestNumberFormatAPI.java | 7 +- .../format/IntlTestSimpleDateFormatAPI.java | 7 +- .../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 | 3 +- .../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 | 7 +- .../ibm/icu/dev/test/lang/TestUScript.java | 3 +- .../ibm/icu/dev/test/lang/TestUScriptRun.java | 3 +- .../icu/dev/test/lang/UCharacterCaseTest.java | 4 +- .../dev/test/lang/UCharacterCategoryTest.java | 4 +- .../test/lang/UCharacterDirectionTest.java | 3 +- .../test/lang/UCharacterSurrogateTest.java | 3 +- .../ibm/icu/dev/test/lang/UCharacterTest.java | 3 +- .../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 | 3 +- .../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 | 3 +- .../dev/test/rbbi/BreakIteratorRegTest.java | 3 +- .../icu/dev/test/rbbi/BreakIteratorTest.java | 3 +- .../ibm/icu/dev/test/rbbi/RBBIAPITest.java | 3 +- .../ibm/icu/dev/test/rbbi/RBBILSTMTest.java | 3 +- .../ibm/icu/dev/test/rbbi/RBBIMonkeyTest.java | 3 +- .../com/ibm/icu/dev/test/rbbi/RBBITest.java | 3 +- .../icu/dev/test/rbbi/RBBITestExtended.java | 3 +- .../ibm/icu/dev/test/rbbi/RBBITestMonkey.java | 3 +- .../test/shaping/ArabicShapingRegTest.java | 3 +- .../DataDrivenArabicShapingRegTest.java | 9 +- .../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 | 4 +- .../timezone/TimeZoneOffsetLocalTest.java | 3 +- .../test/timezone/TimeZoneRegressionTest.java | 4 +- .../dev/test/timezone/TimeZoneRuleTest.java | 3 +- .../icu/dev/test/timezone/TimeZoneTest.java | 3 +- .../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 | 3 +- .../icu/dev/test/util/LocaleAliasTest.java | 3 +- .../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 | 3 +- .../com/ibm/icu/dev/test/util/TrieTest.java | 3 +- .../ibm/icu/dev/test/util/UtilityTest.java | 3 +- .../icu/dev/test/util/VersionInfoTest.java | 4 +- .../java/com/ibm/icu/dev/test/TestFmwk.java | 10 ++- 179 files changed, 523 insertions(+), 268 deletions(-) create mode 100644 icu4j/main/core/src/test/java/com/ibm/icu/dev/test/CoreTestFmwk.java diff --git a/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/TestLocaleNamePackaging.java b/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/TestLocaleNamePackaging.java index 24596b79179..c694c7cd15c 100644 --- a/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/TestLocaleNamePackaging.java +++ b/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/TestLocaleNamePackaging.java @@ -23,7 +23,7 @@ import com.ibm.icu.text.LocaleDisplayNames.DialectHandling; import com.ibm.icu.util.ULocale; @RunWith(JUnit4.class) -public class TestLocaleNamePackaging extends TestFmwk { +public class TestLocaleNamePackaging extends CoreTestFmwk { public TestLocaleNamePackaging() { } 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 90d877e8c7f..df8a88bb23e 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,6 +8,7 @@ */ 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; @@ -21,7 +22,6 @@ import com.ibm.icu.dev.test.ModuleTest.TestDataPair; import com.ibm.icu.dev.test.TestDataModule; import com.ibm.icu.dev.test.TestDataModule.DataMap; import com.ibm.icu.dev.test.TestDataModule.TestData; -import com.ibm.icu.dev.test.TestFmwk; import com.ibm.icu.dev.test.util.CalendarFieldsSet; import com.ibm.icu.text.DateFormat; import com.ibm.icu.text.SimpleDateFormat; @@ -40,7 +40,7 @@ import junitparams.Parameters; * */ @RunWith(JUnitParamsRunner.class) -public class DataDrivenCalendarTest extends TestFmwk { +public class DataDrivenCalendarTest extends CoreTestFmwk { public DataDrivenCalendarTest() { //super("com/ibm/icu/dev/data/testdata/", "calendar"); @@ -54,7 +54,6 @@ public class DataDrivenCalendarTest extends TestFmwk { /* (non-Javadoc) * @see com.ibm.icu.dev.test.ModuleTest#processModules() */ - @Ignore // TODO(ICU-22505) @Test @Parameters(method="getTestData") public void calendarTest(TestDataPair pair) { 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 f30d33504a9..d9efa8fff99 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,6 +8,7 @@ */ 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; @@ -28,7 +29,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import com.ibm.icu.dev.test.TestFmwk; import com.ibm.icu.impl.number.DecimalFormatProperties; import com.ibm.icu.impl.number.PatternStringParser; import com.ibm.icu.text.CompactDecimalFormat; @@ -41,7 +41,7 @@ import com.ibm.icu.util.CurrencyAmount; import com.ibm.icu.util.ULocale; @RunWith(JUnit4.class) -public class CompactDecimalFormatTest extends TestFmwk { +public class CompactDecimalFormatTest extends CoreTestFmwk { Object[][] EnglishTestData = { // default is 2 digits of accuracy {0.0d, "0"}, 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 97a2af44c4a..eab732fa3f9 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,6 +8,7 @@ */ 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 +24,6 @@ import com.ibm.icu.dev.test.ModuleTest.TestDataPair; import com.ibm.icu.dev.test.TestDataModule; import com.ibm.icu.dev.test.TestDataModule.DataMap; import com.ibm.icu.dev.test.TestDataModule.TestData; -import com.ibm.icu.dev.test.TestFmwk; import com.ibm.icu.dev.test.util.CalendarFieldsSet; import com.ibm.icu.dev.test.util.DateTimeStyleSet; import com.ibm.icu.text.DateFormat; @@ -41,7 +41,7 @@ import junitparams.Parameters; * */ @RunWith(JUnitParamsRunner.class) -public class DataDrivenFormatTest extends TestFmwk { +public class DataDrivenFormatTest extends CoreTestFmwk { /** * @param baseName @@ -59,7 +59,6 @@ public class DataDrivenFormatTest extends TestFmwk { /* (non-Javadoc) * @see com.ibm.icu.dev.test.ModuleTest#processModules() */ - @Ignore // TODO(ICU-22505) @Test @Parameters(method="getTestData") public void formatTest(TestDataPair pair) { 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 fd284467fb7..02168dfcfa6 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,6 +14,7 @@ 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; @@ -69,7 +70,7 @@ import com.ibm.icu.util.UResourceBundle; import com.ibm.icu.util.VersionInfo; @RunWith(JUnit4.class) -public class DateFormatTest extends TestFmwk { +public class DateFormatTest extends CoreTestFmwk { /** * Verify that patterns have the correct values and could produce the * the DateFormat instances that contain the correct localized patterns. @@ -614,7 +615,6 @@ public class DateFormatTest extends TestFmwk { expect(DATA, new Locale("en", "", "")); } - @Ignore // TODO(ICU-22505) @Test public void TestGenericTime() { @@ -720,7 +720,6 @@ public class DateFormatTest extends TestFmwk { } - @Ignore // TODO(ICU-22505) @Test public void TestGenericTimeZoneOrder() { // generic times should parse the same no matter what the placement of the time zone string @@ -2202,7 +2201,6 @@ public class DateFormatTest extends TestFmwk { /** * Test DateFormat(Calendar) API */ - @Ignore // TODO(ICU-22505) @Test public void TestDateFormatCalendar() { DateFormat date=null, time=null, full=null; 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 1b62ddf9473..6578c126a6d 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,6 +14,7 @@ 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; @@ -38,11 +39,12 @@ import com.ibm.icu.util.ULocale; // try to test the full functionality. It just calls each function in the class and // verifies that it works on a basic level. @RunWith(JUnit4.class) -public class IntlTestDecimalFormatAPIC extends TestFmwk { +public class IntlTestDecimalFormatAPIC extends CoreTestFmwk { // This test checks various generic API methods in DecimalFormat to achieve 100% API coverage. @Test public void TestAPI() { + Locale startLocale = Locale.getDefault(); logln("DecimalFormat API test---"); logln(""); @@ -250,6 +252,7 @@ public class IntlTestDecimalFormatAPIC extends TestFmwk { // errln("ERROR: Couldn't create a DecimalFormat"); // } + Locale.setDefault(startLocale); } @Test 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 dd44833fcbe..f411a0d4d23 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,6 +14,7 @@ package com.ibm.icu.dev.test.format; +import com.ibm.icu.dev.test.CoreTestFmwk; import java.text.FieldPosition; import java.util.Locale; @@ -29,7 +30,7 @@ import com.ibm.icu.text.DecimalFormatSymbols; * Tests for DecimalFormatSymbols **/ @RunWith(JUnit4.class) -public class IntlTestDecimalFormatSymbolsC extends TestFmwk { +public class IntlTestDecimalFormatSymbolsC extends CoreTestFmwk { /** * Test the API of DecimalFormatSymbols; primarily a simple get/set set. */ 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 dc995d50ffe..d4e77386490 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,6 +8,7 @@ */ 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; @@ -60,7 +61,7 @@ import com.ibm.icu.util.ULocale; * @author markdavis */ @RunWith(JUnit4.class) -public class MeasureUnitTest extends TestFmwk { +public class MeasureUnitTest extends CoreTestFmwk { static class OrderedPair extends Pair implements Comparable> { 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 2f02149f1d3..4c8e46dd1cb 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,6 +14,7 @@ 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; @@ -38,7 +39,7 @@ import com.ibm.icu.util.ULocale; * Performs regression test for MessageFormat **/ @RunWith(JUnit4.class) -public class NumberFormatRegressionTest extends TestFmwk { +public class NumberFormatRegressionTest extends CoreTestFmwk { /** * alphaWorks upgrade */ 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 7b0d3139f0e..098f29530cc 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,6 +8,7 @@ */ 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; @@ -24,7 +25,7 @@ import com.ibm.icu.util.ULocale; * */ @RunWith(JUnit4.class) -public class NumberFormatSpecificationTest extends TestFmwk { +public class NumberFormatSpecificationTest extends CoreTestFmwk { @Test public void TestBasicPatterns() { double num = 1234.567; diff --git a/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/format/NumberFormatTest.java b/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/format/NumberFormatTest.java index 7a8da28899f..ad7cdf13e22 100644 --- a/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/format/NumberFormatTest.java +++ b/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/format/NumberFormatTest.java @@ -40,7 +40,7 @@ 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.format.IntlTestDecimalFormatAPIC.FieldContainer; import com.ibm.icu.impl.DontCareFieldPosition; @@ -69,7 +69,7 @@ import com.ibm.icu.util.CurrencyAmount; import com.ibm.icu.util.ULocale; @RunWith(JUnit4.class) -public class NumberFormatTest extends TestFmwk { +public class NumberFormatTest extends CoreTestFmwk { @Test public void TestRoundingScientific10542() { @@ -208,7 +208,7 @@ public class NumberFormatTest extends TestFmwk { double value = parser.parse("-0,5").doubleValue(); assertEquals("Expect -0.5", -0.5, value); } catch (ParseException e) { - TestFmwk.errln("Parsing -0.5 should have succeeded."); + errln("Parsing -0.5 should have succeeded."); } } @@ -219,7 +219,7 @@ public class NumberFormatTest extends TestFmwk { double value = parser.parse("\u208B0.5").doubleValue(); assertEquals("Expect -0.5", -0.5, value); } catch (ParseException e) { - TestFmwk.errln("Parsing -0.5 should have succeeded."); + errln("Parsing -0.5 should have succeeded."); } } @@ -4625,14 +4625,14 @@ public class NumberFormatTest extends TestFmwk { result = parser.parse(value2Parse).doubleValue(); assertEquals("wrong parsed value", parseValue, result); } catch (ParseException e) { - TestFmwk.errln("Parsing " + value2Parse + " should have succeeded with " + testPattern[i] + + errln("Parsing " + value2Parse + " should have succeeded with " + testPattern[i] + " and isDecimalPointMatchRequired set to: " + parser.isDecimalPatternMatchRequired()); } try { result = parser.parse(value2ParseWithDecimal).doubleValue(); assertEquals("wrong parsed value", parseValueWithDecimal, result); } catch (ParseException e) { - TestFmwk.errln("Parsing " + value2ParseWithDecimal + " should have succeeded with " + testPattern[i] + + errln("Parsing " + value2ParseWithDecimal + " should have succeeded with " + testPattern[i] + " and isDecimalPointMatchRequired set to: " + parser.isDecimalPatternMatchRequired()); } @@ -4640,7 +4640,7 @@ public class NumberFormatTest extends TestFmwk { try { result = parser.parse(value2Parse).doubleValue(); if(hasDecimalPoint){ - TestFmwk.errln("Parsing " + value2Parse + " should NOT have succeeded with " + testPattern[i] + + errln("Parsing " + value2Parse + " should NOT have succeeded with " + testPattern[i] + " and isDecimalPointMatchRequired set to: " + parser.isDecimalPatternMatchRequired()); } } catch (ParseException e) { @@ -4649,7 +4649,7 @@ public class NumberFormatTest extends TestFmwk { try { result = parser.parse(value2ParseWithDecimal).doubleValue(); if(!hasDecimalPoint){ - TestFmwk.errln("Parsing " + value2ParseWithDecimal + " should NOT have succeeded with " + testPattern[i] + + errln("Parsing " + value2ParseWithDecimal + " should NOT have succeeded with " + testPattern[i] + " and isDecimalPointMatchRequired set to: " + parser.isDecimalPatternMatchRequired() + " (got: " + result + ")"); } diff --git a/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/format/NumberRegressionTests.java b/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/format/NumberRegressionTests.java index 92e04cfb2cc..61d464ee68b 100644 --- a/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/format/NumberRegressionTests.java +++ b/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/format/NumberRegressionTests.java @@ -43,7 +43,7 @@ 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.DateFormat; @@ -56,7 +56,7 @@ import com.ibm.icu.util.ULocale; import com.ibm.icu.util.VersionInfo; @RunWith(JUnit4.class) -public class NumberRegressionTests extends TestFmwk { +public class NumberRegressionTests extends CoreTestFmwk { private static final char EURO = '\u20ac'; /** 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 2d6d66771aa..c2fd8f8ba53 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,6 +8,7 @@ */ package com.ibm.icu.dev.test.format; +import com.ibm.icu.dev.test.CoreTestFmwk; import java.util.Arrays; import org.junit.Test; @@ -33,7 +34,7 @@ import com.ibm.icu.util.ULocale; * */ @RunWith(JUnit4.class) -public class PluralRangesTest extends TestFmwk { +public class PluralRangesTest extends CoreTestFmwk { @Test public void TestLocaleData() { String[][] tests = { 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 ef83a25e9b2..4027a62e095 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,6 +8,7 @@ */ 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; @@ -73,7 +74,7 @@ import com.ibm.icu.util.ULocale; * @author markdavis (Mark Davis) [for fractional support] */ @RunWith(JUnit4.class) -public class PluralRulesTest extends TestFmwk { +public class PluralRulesTest extends CoreTestFmwk { PluralRulesFactory factory = PluralRulesFactory.NORMAL; @@ -1712,6 +1713,8 @@ public class PluralRulesTest extends TestFmwk { @Test public void testBug20264() { + Locale startLocale = Locale.getDefault(); + String expected = "1.23400"; FixedDecimal fd = new FixedDecimal(1.234, 5, 2); assertEquals("FixedDecimal toString", expected, fd.toString()); @@ -1719,6 +1722,8 @@ public class PluralRulesTest extends TestFmwk { assertEquals("FixedDecimal toString", expected, fd.toString()); Locale.setDefault(Locale.GERMAN); assertEquals("FixedDecimal toString", expected, fd.toString()); + + Locale.setDefault(startLocale); } @Test 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 8066a8bf4a4..7bb5eb79da7 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,6 +8,7 @@ */ 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; @@ -31,7 +32,7 @@ import com.ibm.icu.util.ULocale; * introduces a dependency on collation. See RbnfLenientScannerTest. */ @RunWith(JUnit4.class) -public class RbnfTest extends TestFmwk { +public class RbnfTest extends CoreTestFmwk { static String fracRules = "%main:\n" + // this rule formats the number if it's 1 or more. It formats 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 5b7ce53cef4..c392c3f5886 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 @@ -32,7 +32,7 @@ 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.text.DecimalFormat; import com.ibm.icu.text.DecimalFormatSymbols; @@ -47,7 +47,7 @@ import com.ibm.icu.util.TimeZone; import com.ibm.icu.util.ULocale; @RunWith(JUnit4.class) -public class TestMessageFormat extends TestFmwk { +public class TestMessageFormat extends CoreTestFmwk { @Test public void TestBug3() { @@ -151,7 +151,6 @@ public class TestMessageFormat extends TestFmwk { } } - @Ignore // TODO(ICU-22505) @Test public void TestPattern() // aka PatternTest() { @@ -270,7 +269,6 @@ public class TestMessageFormat extends TestFmwk { form.format(testArgs1, buffer2, fieldpos).toString()); } - @Ignore // TODO(ICU-22505) @Test public void TestStaticFormat() { @@ -808,7 +806,6 @@ public class TestMessageFormat extends TestFmwk { * Verify that MessageFormat accommodates more than 10 arguments and * more than 10 subformats. */ - @Ignore // TODO(ICU-22505) @Test public void TestUnlimitedArgsAndSubformats() { final String pattern = @@ -1226,7 +1223,6 @@ public class TestMessageFormat extends TestFmwk { } catch (IllegalArgumentException e) {} } - @Ignore // TODO(ICU-22505) @Test public void testNumericFormatWithMap() { MessageFormat mf = new MessageFormat("X:{2} Y:{1}"); @@ -1603,7 +1599,6 @@ public class TestMessageFormat extends TestFmwk { } // Test case for formatToCharacterIterator - @Ignore // TODO(ICU-22505) @Test public void TestFormatToCharacterIterator() { MessageFormat[] msgfmts = { 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 002bfe9825a..9e3176b85f2 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,6 +9,7 @@ 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; @@ -53,7 +54,7 @@ import com.ibm.icu.util.TimeZoneTransition; import com.ibm.icu.util.ULocale; @RunWith(JUnit4.class) -public class TimeZoneFormatTest extends TestFmwk { +public class TimeZoneFormatTest extends CoreTestFmwk { private static boolean JDKTZ = (TimeZone.getDefaultTimeZoneType() == TimeZone.TIMEZONE_JDK); private static final Pattern EXCL_TZ_PATTERN = Pattern.compile(".*/Riyadh8[7-9]"); 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 4216bee4329..a2a1cc10a7f 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 @@ -12,7 +12,7 @@ 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.Currency; import com.ibm.icu.util.CurrencyAmount; @@ -27,7 +27,7 @@ import com.ibm.icu.util.CurrencyAmount; */ @RunWith(JUnit4.class) @SuppressWarnings("javadoc") -public class Mf2FeaturesTest extends TestFmwk { +public class Mf2FeaturesTest extends CoreTestFmwk { // November 23, 2022 at 7:42:37.123 PM static final Date TEST_DATE = new Date(1669261357123L); @@ -59,7 +59,6 @@ public class Mf2FeaturesTest extends TestFmwk { .build()); } - @Ignore // TODO(ICU-22505) @Test public void testArgumentMissing() { // Test to check what happens if an argument name from the placeholder is not found @@ -88,7 +87,6 @@ public class Mf2FeaturesTest extends TestFmwk { .build()); } - @Ignore // TODO(ICU-22505) @Test public void testDefaultLocale() { String message = "{Date: {$date :datetime skeleton=yMMMMdEEEE}.}"; @@ -124,7 +122,6 @@ public class Mf2FeaturesTest extends TestFmwk { Locale.setDefault(originalLocale); } - @Ignore // TODO(ICU-22505) @Test public void testAllKindOfDates() { // Default function @@ -361,7 +358,6 @@ public class Mf2FeaturesTest extends TestFmwk { .build()); } - @Ignore // TODO(ICU-22505) @Test public void testDefaultFunctionAndOptions() { TestUtils.runTestCase(new TestCase.Builder() @@ -436,7 +432,6 @@ public class Mf2FeaturesTest extends TestFmwk { // Local Variables - @Ignore // TODO(ICU-22505) @Test public void testSimpleLocaleVariable() { TestUtils.runTestCase(new TestCase.Builder() @@ -448,7 +443,6 @@ public class Mf2FeaturesTest extends TestFmwk { .build()); } - @Ignore // TODO(ICU-22505) @Test public void testLocaleVariableWithSelect() { String message = "" diff --git a/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/normalizer/BasicTest.java b/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/normalizer/BasicTest.java index 6d0198cca10..89775747c89 100644 --- a/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/normalizer/BasicTest.java +++ b/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/normalizer/BasicTest.java @@ -16,7 +16,7 @@ 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.Norm2AllModes; import com.ibm.icu.impl.Normalizer2Impl; import com.ibm.icu.impl.USerializedSet; @@ -34,7 +34,7 @@ import com.ibm.icu.text.UnicodeSetIterator; @RunWith(JUnit4.class) -public class BasicTest extends TestFmwk { +public class BasicTest extends CoreTestFmwk { String[][] canonTests = { // Input Decomposed Composed { "cat", "cat", "cat" }, diff --git a/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/number/NumberFormatterApiTest.java b/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/number/NumberFormatterApiTest.java index 361f554de65..a63da3be052 100644 --- a/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/number/NumberFormatterApiTest.java +++ b/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/number/NumberFormatterApiTest.java @@ -19,7 +19,7 @@ import org.junit.Assert; import org.junit.Ignore; import org.junit.Test; -import com.ibm.icu.dev.test.TestFmwk; +import com.ibm.icu.dev.test.CoreTestFmwk; import com.ibm.icu.dev.test.format.FormattedValueTest; import com.ibm.icu.dev.test.serializable.SerializableTestUtility; import com.ibm.icu.impl.IllegalIcuArgumentException; @@ -62,7 +62,7 @@ import com.ibm.icu.util.MeasureUnit; import com.ibm.icu.util.NoUnit; import com.ibm.icu.util.ULocale; -public class NumberFormatterApiTest extends TestFmwk { +public class NumberFormatterApiTest extends CoreTestFmwk { private static final Currency USD = Currency.getInstance("USD"); private static final Currency GBP = Currency.getInstance("GBP"); 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 265aeec00bd..5f3ba71ec29 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,8 @@ // 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.assertFalse; -import static org.junit.Assert.assertTrue; - +import com.ibm.icu.dev.test.CoreTestFmwk; +import org.junit.Assert; import org.junit.Test; import com.ibm.icu.impl.StringSegment; @@ -30,7 +28,7 @@ import com.ibm.icu.util.ULocale; * @author sffc * */ -public class NumberParserTest { +public class NumberParserTest extends CoreTestFmwk { @Test public void testBasic() { Object[][] cases = new Object[][] { @@ -199,13 +197,13 @@ public class NumberParserTest { ParsedNumber resultObject = new ParsedNumber(); parser.parse("epäluku", false, resultObject); - assertTrue(resultObject.success()); - assertEquals(Double.NaN, resultObject.getNumber().doubleValue(), 0.0); + assertTrue("Parsing locale fi spellout number", resultObject.success()); + Assert.assertEquals(Double.NaN, resultObject.getNumber().doubleValue(), 0.0); resultObject = new ParsedNumber(); parser.parse("1,2e3", false, resultObject); - assertTrue(resultObject.success()); - assertEquals(1200.0, resultObject.getNumber().doubleValue(), 0.0); + assertTrue("Parsing formatted compact decimal", resultObject.success()); + Assert.assertEquals(1200.0, resultObject.getNumber().doubleValue(), 0.0); } @Test @@ -219,9 +217,9 @@ public class NumberParserTest { series.addMatcher(IgnorablesMatcher.getInstance(0)); series.freeze(); - assertFalse(series.smokeTest(new StringSegment("x", false))); - assertFalse(series.smokeTest(new StringSegment("-", false))); - assertTrue(series.smokeTest(new StringSegment("+", false))); + Assert.assertFalse(series.smokeTest(new StringSegment("x", false))); + Assert.assertFalse(series.smokeTest(new StringSegment("-", false))); + Assert.assertTrue(series.smokeTest(new StringSegment("+", false))); Object[][] cases = new Object[][] { { "", 0, true }, diff --git a/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/number/NumberPermutationTest.java b/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/number/NumberPermutationTest.java index a592b52b47b..bbb56869ed3 100644 --- a/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/number/NumberPermutationTest.java +++ b/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/number/NumberPermutationTest.java @@ -8,7 +8,7 @@ import java.util.ArrayList; import org.junit.Test; -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.number.LocalizedNumberFormatter; import com.ibm.icu.number.NumberFormatter; @@ -18,7 +18,7 @@ import com.ibm.icu.util.ULocale; * @author sffc * */ -public class NumberPermutationTest extends TestFmwk { +public class NumberPermutationTest extends CoreTestFmwk { static final String[] kSkeletonParts = { // Notation diff --git a/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/number/NumberRangeFormatterTest.java b/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/number/NumberRangeFormatterTest.java index ddb9cca9ee4..d4c9d3a47d1 100644 --- a/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/number/NumberRangeFormatterTest.java +++ b/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/number/NumberRangeFormatterTest.java @@ -13,7 +13,7 @@ import java.util.Set; import org.junit.Test; -import com.ibm.icu.dev.test.TestFmwk; +import com.ibm.icu.dev.test.CoreTestFmwk; import com.ibm.icu.dev.test.format.FormattedValueTest; import com.ibm.icu.impl.ICUData; import com.ibm.icu.impl.ICUResourceBundle; @@ -41,7 +41,7 @@ import com.ibm.icu.util.UResourceBundle; * @author sffc * */ -public class NumberRangeFormatterTest extends TestFmwk { +public class NumberRangeFormatterTest extends CoreTestFmwk { private static final Currency USD = Currency.getInstance("USD"); private static final Currency CHF = Currency.getInstance("CHF"); 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 af9a72eaf01..66acc926ade 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 @@ -5,6 +5,7 @@ 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.format.FormattedValueTest; @@ -21,7 +22,7 @@ import com.ibm.icu.util.Currency; import com.ibm.icu.util.ULocale; /** @author sffc */ -public class PatternStringTest { +public class PatternStringTest extends CoreTestFmwk { @Test public void testLocalized() { @@ -35,8 +36,8 @@ public class PatternStringTest { String localized = "’.'ab'c'b''a'''#,##0a0b'a%'"; String toStandard = "+-'ab'c'b''a'''#,##0.0%'a%'"; - assertEquals(localized, PatternStringUtils.convertLocalized(standard, symbols, true)); - assertEquals(toStandard, PatternStringUtils.convertLocalized(localized, symbols, false)); + assertEquals("Localized decimal format symbols", localized, PatternStringUtils.convertLocalized(standard, symbols, true)); + assertEquals("Standard (unlocalized) decimal format symbols", toStandard, PatternStringUtils.convertLocalized(localized, symbols, false)); } @Test 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 3d45dda840d..6a6def83fec 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 @@ -7,6 +7,7 @@ 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; @@ -42,20 +43,20 @@ import com.ibm.icu.util.Currency.CurrencyUsage; import com.ibm.icu.util.MeasureUnit; import com.ibm.icu.util.ULocale; -public class PropertiesTest { +public class PropertiesTest extends CoreTestFmwk { @Test public void testBasicEquals() { DecimalFormatProperties p1 = new DecimalFormatProperties(); DecimalFormatProperties p2 = new DecimalFormatProperties(); - assertEquals(p1, p2); + assertEquals("DecimalFormatProperties.equals()", p1, p2); p1.setPositivePrefix("abc"); - assertNotEquals(p1, p2); + assertNotEquals("DecimalFormatProperties.equals()", p1, p2); p2.setPositivePrefix("xyz"); - assertNotEquals(p1, p2); + assertNotEquals("DecimalFormatProperties.equals()", p1, p2); p1.setPositivePrefix("xyz"); - assertEquals(p1, p2); + assertEquals("DecimalFormatProperties.equals()", p1, p2); } @Test @@ -124,50 +125,50 @@ public class PropertiesTest { Object val0 = getSampleValueForType(field.getType(), 0); Object val1 = getSampleValueForType(field.getType(), 1); Object val2 = getSampleValueForType(field.getType(), 2); - assertNotEquals(val0, val1); + assertNotEquals("Test setup values should be different", val0, val1); setter.invoke(p1, val0); setter.invoke(p2, val0); - assertEquals(p1, p2); - assertEquals(p1.hashCode(), p2.hashCode()); - assertEquals(getter.invoke(p1), getter.invoke(p2)); - assertEquals(getter.invoke(p1), val0); - assertNotEquals(getter.invoke(p1), val1); + assertEquals("Equal outputs for equal DecimalFormatProperties inputs", p1, p2); + assertEquals("Equal outputs for equal DecimalFormatProperties inputs", p1.hashCode(), p2.hashCode()); + assertEquals("Equal outputs for equal DecimalFormatProperties inputs", getter.invoke(p1), getter.invoke(p2)); + assertEquals("Getter returns equal val set by setter for DecimalFormatProperties", getter.invoke(p1), val0); + assertNotEquals("Getter returns equal vals for equal inputs", getter.invoke(p1), val1); hashCodes.add(p1.hashCode()); setter.invoke(p1, val1); assertNotEquals("Field " + field + " is missing from equals()", p1, p2); - assertNotEquals(getter.invoke(p1), getter.invoke(p2)); - assertNotEquals(getter.invoke(p1), val0); - assertEquals(getter.invoke(p1), val1); + assertNotEquals("Getter returns equal vals for equal inputs", getter.invoke(p1), getter.invoke(p2)); + assertNotEquals("Getter returns equal vals for equal inputs", getter.invoke(p1), val0); + assertEquals("Getter returns equal vals for equal inputs", getter.invoke(p1), val1); setter.invoke(p1, val0); assertEquals("Field " + field + " setter might have side effects", p1, p2); - assertEquals(p1.hashCode(), p2.hashCode()); - assertEquals(getter.invoke(p1), getter.invoke(p2)); + assertEquals("Getter returns equal vals for equal inputs", p1.hashCode(), p2.hashCode()); + assertEquals("Getter returns equal vals for equal inputs", getter.invoke(p1), getter.invoke(p2)); setter.invoke(p1, val1); setter.invoke(p2, val1); - assertEquals(p1, p2); - assertEquals(p1.hashCode(), p2.hashCode()); - assertEquals(getter.invoke(p1), getter.invoke(p2)); + assertEquals("Getter returns equal vals for equal inputs", p1, p2); + assertEquals("Getter returns equal vals for equal inputs", p1.hashCode(), p2.hashCode()); + assertEquals("Getter returns equal vals for equal inputs", getter.invoke(p1), getter.invoke(p2)); setter.invoke(p1, val2); setter.invoke(p1, val1); assertEquals("Field " + field + " setter might have side effects", p1, p2); - assertEquals(p1.hashCode(), p2.hashCode()); - assertEquals(getter.invoke(p1), getter.invoke(p2)); + assertEquals("Getter returns equal vals for equal inputs", p1.hashCode(), p2.hashCode()); + assertEquals("Getter returns equal vals for equal inputs", getter.invoke(p1), getter.invoke(p2)); hashCodes.add(p1.hashCode()); // Check for clone behavior DecimalFormatProperties copy = p1.clone(); assertEquals("Field " + field + " did not get copied in clone", p1, copy); - assertEquals(p1.hashCode(), copy.hashCode()); - assertEquals(getter.invoke(p1), getter.invoke(copy)); + assertEquals("Getter returns equal vals for equal inputs", p1.hashCode(), copy.hashCode()); + assertEquals("Getter returns equal vals for equal inputs", getter.invoke(p1), getter.invoke(copy)); // Check for copyFrom behavior setter.invoke(p1, val0); - assertNotEquals(p1, p2); - assertNotEquals(getter.invoke(p1), getter.invoke(p2)); + assertNotEquals("Getter returns equal vals for equal inputs", p1, p2); + assertNotEquals("Getter returns equal vals for equal inputs", getter.invoke(p1), getter.invoke(p2)); p2.copyFrom(p1); assertEquals("Field " + field + " is missing from copyFrom()", p1, p2); - assertEquals(p1.hashCode(), p2.hashCode()); - assertEquals(getter.invoke(p1), getter.invoke(p2)); + assertEquals("Getter returns equal vals for equal inputs", p1.hashCode(), p2.hashCode()); + assertEquals("Getter returns equal vals for equal inputs", getter.invoke(p1), getter.invoke(p2)); // Load values into p3 and p4 for clear() behavior test setter.invoke(p3, getSampleValueForType(field.getType(), 3)); @@ -184,7 +185,7 @@ public class PropertiesTest { } // Check for clear() behavior - assertNotEquals(p3, p4); + assertNotEquals("Setup for check for clear() behavior", p3, p4); p3.clear(); p4.clear(); assertEquals("A field is missing from the clear() function", p3, p4); diff --git a/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/rbbi/LSTMBreakEngineTest.java b/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/rbbi/LSTMBreakEngineTest.java index 1cedfd8e91d..91b3cee1d86 100644 --- a/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/rbbi/LSTMBreakEngineTest.java +++ b/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/rbbi/LSTMBreakEngineTest.java @@ -14,7 +14,7 @@ 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.breakiter.DictionaryBreakEngine; import com.ibm.icu.impl.breakiter.LSTMBreakEngine; import com.ibm.icu.lang.UScript; @@ -28,7 +28,7 @@ import com.ibm.icu.util.UResourceBundle; * */ @RunWith(JUnit4.class) -public class LSTMBreakEngineTest extends TestFmwk { +public class LSTMBreakEngineTest extends CoreTestFmwk { private static final ClassLoader testLoader = LSTMBreakEngineTest.class.getClassLoader(); 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 74794cd6f17..076489b77ce 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 @@ -27,7 +27,7 @@ import org.junit.Ignore; 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.serializable.SerializableTestUtility.Handler; import junitparams.JUnitParamsRunner; @@ -38,7 +38,7 @@ import junitparams.Parameters; * @author emader */ @RunWith(JUnitParamsRunner.class) -public class CompatibilityTest extends TestFmwk +public class CompatibilityTest extends CoreTestFmwk { private static final class FileHolder { String className; @@ -78,7 +78,6 @@ public class CompatibilityTest extends TestFmwk } } - @Ignore // TODO(ICU-22505) @Test @Parameters(method="generateClassList") public void testCompatibility(FileHolder holder) throws ClassNotFoundException, IOException { diff --git a/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/serializable/CoverageTest.java b/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/serializable/CoverageTest.java index a96f9b26e8c..2518fa99645 100644 --- a/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/serializable/CoverageTest.java +++ b/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/serializable/CoverageTest.java @@ -15,7 +15,7 @@ import java.util.List; 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.serializable.SerializableTestUtility.Handler; import junitparams.JUnitParamsRunner; @@ -27,7 +27,7 @@ import junitparams.Parameters; * */ @RunWith(JUnitParamsRunner.class) -public class CoverageTest extends TestFmwk { +public class CoverageTest extends CoreTestFmwk { @Test @Parameters(method="generateClassList") diff --git a/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/stringprep/TestIDNARef.java b/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/stringprep/TestIDNARef.java index 24c41fc4e1f..da9cfdbd3d6 100644 --- a/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/stringprep/TestIDNARef.java +++ b/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/stringprep/TestIDNARef.java @@ -12,7 +12,7 @@ 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.StringPrepParseException; import com.ibm.icu.text.UCharacterIterator; @@ -23,7 +23,7 @@ import com.ibm.icu.text.UCharacterIterator; * Window>Preferences>Java>Code Generation>Code and Comments */ @RunWith(JUnit4.class) -public class TestIDNARef extends TestFmwk { +public class TestIDNARef extends CoreTestFmwk { private StringPrepParseException unassignedException = new StringPrepParseException("",StringPrepParseException.UNASSIGNED_ERROR); @Test diff --git a/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/stringprep/TestStringPrep.java b/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/stringprep/TestStringPrep.java index 31770b4acce..4290680102e 100644 --- a/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/stringprep/TestStringPrep.java +++ b/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/stringprep/TestStringPrep.java @@ -14,7 +14,7 @@ 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; @@ -23,7 +23,7 @@ import com.ibm.icu.text.StringPrepParseException; * */ @RunWith(JUnit4.class) -public class TestStringPrep extends TestFmwk { +public class TestStringPrep extends CoreTestFmwk { /* There are several special identifiers ("who") which need to be understood universally, rather than in the context of a particular diff --git a/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/util/CurrencyTest.java b/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/util/CurrencyTest.java index 01c12ea3ea3..1b4cf513149 100644 --- a/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/util/CurrencyTest.java +++ b/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/util/CurrencyTest.java @@ -24,7 +24,7 @@ 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.CurrencyData; import com.ibm.icu.text.CurrencyDisplayNames; import com.ibm.icu.text.CurrencyMetaInfo; @@ -43,7 +43,7 @@ import com.ibm.icu.util.ULocale; * @summary General test of Currency */ @RunWith(JUnit4.class) -public class CurrencyTest extends TestFmwk { +public class CurrencyTest extends CoreTestFmwk { /** * Test of basic API. */ diff --git a/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/util/ICUResourceBundleTest.java b/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/util/ICUResourceBundleTest.java index fc501299dda..de760d4c6c8 100644 --- a/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/util/ICUResourceBundleTest.java +++ b/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/util/ICUResourceBundleTest.java @@ -29,7 +29,7 @@ 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.impl.UResource; @@ -44,7 +44,7 @@ import com.ibm.icu.util.UResourceBundleIterator; import com.ibm.icu.util.UResourceTypeMismatchException; @RunWith(JUnit4.class) -public final class ICUResourceBundleTest extends TestFmwk { +public final class ICUResourceBundleTest extends CoreTestFmwk { private static final ClassLoader testLoader = ICUResourceBundleTest.class.getClassLoader(); @Test diff --git a/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/util/ICUServiceTest.java b/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/util/ICUServiceTest.java index 5d8f9c68464..4006ec8d144 100644 --- a/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/util/ICUServiceTest.java +++ b/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/util/ICUServiceTest.java @@ -26,7 +26,7 @@ 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.ICULocaleService; import com.ibm.icu.impl.ICULocaleService.ICUResourceBundleFactory; import com.ibm.icu.impl.ICULocaleService.LocaleKey; @@ -43,7 +43,7 @@ import com.ibm.icu.impl.LocaleUtility; import com.ibm.icu.util.ULocale; @RunWith(JUnit4.class) -public class ICUServiceTest extends TestFmwk +public class ICUServiceTest extends CoreTestFmwk { private String lrmsg(String message, Object lhs, Object rhs) { return message + " lhs: " + lhs + " rhs: " + rhs; diff --git a/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/util/LocaleDataTest.java b/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/util/LocaleDataTest.java index e9f077ca486..473bbff0eb9 100644 --- a/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/util/LocaleDataTest.java +++ b/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/util/LocaleDataTest.java @@ -16,7 +16,7 @@ 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.ICUResourceBundle; import com.ibm.icu.lang.UScript; import com.ibm.icu.text.UnicodeSet; @@ -32,7 +32,7 @@ import com.ibm.icu.util.ULocale; * Window>Preferences>Java>Code Generation>Code and Comments */ @RunWith(JUnit4.class) -public class LocaleDataTest extends TestFmwk{ +public class LocaleDataTest extends CoreTestFmwk{ private ULocale[] availableLocales = null; public LocaleDataTest(){ diff --git a/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/util/ULocaleTest.java b/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/util/ULocaleTest.java index 5f1903a28a2..bade0734858 100644 --- a/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/util/ULocaleTest.java +++ b/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/util/ULocaleTest.java @@ -33,7 +33,7 @@ import org.junit.Assert; 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.dev.test.TestUtil.JavaVendor; import com.ibm.icu.text.DateFormat; @@ -59,7 +59,7 @@ import junitparams.JUnitParamsRunner; import junitparams.Parameters; @RunWith(JUnitParamsRunner.class) -public class ULocaleTest extends TestFmwk { +public class ULocaleTest extends CoreTestFmwk { // Ticket #8078 and #11674 private static final boolean JAVA7_OR_LATER = @@ -4125,7 +4125,7 @@ public class ULocaleTest extends TestFmwk { cldrVersion = LocaleData.getCLDRVersion(); - TestFmwk.logln("uloc_getCLDRVersion() returned: '"+cldrVersion+"'"); + logln("uloc_getCLDRVersion() returned: '"+cldrVersion+"'"); // why isn't this public for tests somewhere? final ClassLoader testLoader = ICUResourceBundleTest.class.getClassLoader(); 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 new file mode 100644 index 00000000000..1cfdfc71e47 --- /dev/null +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/CoreTestFmwk.java @@ -0,0 +1,85 @@ +// © 2023 and later: Unicode, Inc. and others. +// License & terms of use: http://www.unicode.org/copyright.html + +package com.ibm.icu.dev.test; + +import com.ibm.icu.util.ULocale; +import org.junit.Rule; +import org.junit.rules.TestName; + +/** + * A base class for testing within the cross-component tests in the `common_tests` component. + * + *

This subclass of TestFmwk allows the usage of functionality from the `core` component. TestFmwk + * is not able to depend on `core` since it is located in `framework`, while `core` tests already + * use TestFmwk, which requires that `core` depends on `framework`. We cannot have a cycle in our + * dependencies. + * + *

With the allowance for this test class to use functionality from components, we can do things + * like assert whether tests are properly resetting the ICU and JDK time zones to their original + * values at the end of their execution. + */ +public class CoreTestFmwk extends TestFmwk { + + private com.ibm.icu.util.TimeZone testStartDefaultIcuTz; + + private java.util.TimeZone testStartDefaultJdkTz; + + private com.ibm.icu.util.ULocale testStartDefaultULocale; + + private java.util.Locale testStartDefaultLocale; + + @Rule + public TestName name = new TestName(); + + @Override + public void localTestInitialize() { + super.localTestInitialize(); + + // Just like TestFmwk initializes JDK TimeZone and Locale before every test, + // do the same for ICU TimeZone and ULocale. + ULocale.setDefault(ULocale.forLocale(defaultLocale)); + com.ibm.icu.util.TimeZone.setDefault( + com.ibm.icu.util.TimeZone.getTimeZone(defaultTimeZone.getID())); + + // Save starting timezones + testStartDefaultIcuTz = com.ibm.icu.util.TimeZone.getDefault(); + testStartDefaultJdkTz = java.util.TimeZone.getDefault(); + + // Save starting locales + testStartDefaultULocale = com.ibm.icu.util.ULocale.getDefault(); + testStartDefaultLocale = java.util.Locale.getDefault(); + } + + @Override + public void localTestTeardown() { + String testMethodName = name.getMethodName(); + + // Assert that timezones are in a good state + + com.ibm.icu.util.TimeZone testEndDefaultIcuTz = com.ibm.icu.util.TimeZone.getDefault(); + java.util.TimeZone testEndDefaultJdkTz = java.util.TimeZone.getDefault(); + + assertEquals("In [" + testMethodName + "] Test should keep in sync ICU & JDK TZs", + testEndDefaultIcuTz.getID(), + testEndDefaultJdkTz.getID()); + + assertEquals("In [" + testMethodName + "] Test should reset ICU default TZ", + testStartDefaultIcuTz.getID(), testEndDefaultIcuTz.getID()); + assertEquals("In [" + testMethodName + "] Test should reset JDK default TZ", + testStartDefaultJdkTz.getID(), testEndDefaultJdkTz.getID()); + + // Assert that locales are in a good state + + com.ibm.icu.util.ULocale testEndDefaultULocale = com.ibm.icu.util.ULocale.getDefault(); + java.util.Locale testEndDefaultLocale = java.util.Locale.getDefault(); + + assertEquals("In [" + testMethodName + "] Test should reset ICU ULocale", + testStartDefaultULocale.toLanguageTag(), testEndDefaultULocale.toLanguageTag()); + assertEquals("In [" + testMethodName + "] Test should reset JDK Locale", + testStartDefaultLocale.toLanguageTag(), testEndDefaultLocale.toLanguageTag()); + + super.localTestTeardown(); + } + +} 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 997c164947e..eab582433e7 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,6 +8,7 @@ */ package com.ibm.icu.dev.test.bidi; +import com.ibm.icu.dev.test.CoreTestFmwk; import java.io.BufferedReader; import java.io.IOException; @@ -27,7 +28,7 @@ import com.ibm.icu.text.BidiClassifier; * Ported from ICU4C intltest/bidiconf.cpp . */ @RunWith(JUnit4.class) -public class BiDiConformanceTest extends TestFmwk { +public class BiDiConformanceTest extends CoreTestFmwk { public BiDiConformanceTest() {} @Test 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 ee01e3b5928..de016c56377 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,6 +9,7 @@ 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; @@ -24,7 +25,7 @@ import com.ibm.icu.util.VersionInfo; * @author Lina Kemmel, Matitiahu Allouche */ -public class BidiFmwk extends TestFmwk { +public class BidiFmwk extends CoreTestFmwk { protected static final char[] charFromDirProp = { /* L R EN ES ET AN CS B S WS ON */ 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 a8649951058..a8baa667727 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,6 +3,7 @@ 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; @@ -22,7 +23,7 @@ import com.ibm.icu.text.BidiTransform.Order; * */ @RunWith(JUnit4.class) -public class TestBidiTransform extends TestFmwk { +public class TestBidiTransform extends CoreTestFmwk { static final char LATN_ZERO = '\u0030'; static final char ARAB_ZERO = '\u0660'; 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 cad92208bfe..ae194008a8c 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,6 +11,7 @@ /* 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; @@ -100,7 +101,7 @@ import com.ibm.icu.math.BigDecimal; */ @RunWith(JUnit4.class) -public class DiagBigDecimalTest extends TestFmwk { +public class DiagBigDecimalTest extends CoreTestFmwk { private static final com.ibm.icu.math.BigDecimal zero = com.ibm.icu.math.BigDecimal.ZERO; private static final com.ibm.icu.math.BigDecimal one = com.ibm.icu.math.BigDecimal.ONE; private static final com.ibm.icu.math.BigDecimal two = new com.ibm.icu.math.BigDecimal(2); 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 ced85771f83..be34ae52fff 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 @@ -10,6 +10,7 @@ package com.ibm.icu.dev.test.calendar; // AstroTest +import com.ibm.icu.dev.test.CoreTestFmwk; import java.util.Date; import java.util.Locale; @@ -30,7 +31,7 @@ import com.ibm.icu.util.TimeZone; // TODO: try finding next new moon after 07/28/1984 16:00 GMT @RunWith(JUnit4.class) -public class AstroTest extends TestFmwk { +public class AstroTest extends CoreTestFmwk { static final double PI = Math.PI; @Test 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 2d0e07225ab..ca462636b67 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,6 +8,7 @@ */ 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; @@ -46,7 +47,7 @@ import com.ibm.icu.util.ULocale; * 4174361 4177484 4197699 4209071 4288792 */ @RunWith(JUnit4.class) -public class CalendarRegressionTest extends com.ibm.icu.dev.test.TestFmwk { +public class CalendarRegressionTest extends CoreTestFmwk { static final String[] FIELD_NAME = { "ERA", "YEAR", "MONTH", "WEEK_OF_YEAR", "WEEK_OF_MONTH", "DAY_OF_MONTH", "DAY_OF_YEAR", "DAY_OF_WEEK", 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 b82e116fcde..6f5418cbd8c 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,6 +9,7 @@ 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; @@ -26,7 +27,7 @@ import com.ibm.icu.util.SimpleTimeZone; * A base class for classes that test individual Calendar subclasses. * Defines various useful utility methods and constants */ -public class CalendarTestFmwk extends TestFmwk { +public class CalendarTestFmwk extends CoreTestFmwk { // Constants for use by subclasses, solely to save typing public final static int SUN = Calendar.SUNDAY; 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 696d8c24bec..6b3d6d18174 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,6 +8,7 @@ */ 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; @@ -29,7 +30,7 @@ import com.ibm.icu.util.SimpleTimeZone; import com.ibm.icu.util.TimeZone; @RunWith(JUnit4.class) -public class CompatibilityTest extends TestFmwk { +public class CompatibilityTest extends CoreTestFmwk { static final String[] FIELD_NAME = { "ERA", "YEAR", "MONTH", "WEEK_OF_YEAR", "WEEK_OF_MONTH", "DAY_OF_MONTH", "DAY_OF_YEAR", "DAY_OF_WEEK", 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 796d1b7bbbf..7195def1445 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,6 +2,7 @@ // 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; @@ -18,7 +19,7 @@ import com.ibm.icu.util.ULocale; * Tests for EraRules class */ @RunWith(JUnit4.class) -public class EraRulesTest extends TestFmwk { +public class EraRulesTest extends CoreTestFmwk { @Test public void testAPIs() { for (CalType calType : CalType.values()) { diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/calendar/HebrewTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/calendar/HebrewTest.java index 668f41a0974..7647ba60e0b 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/calendar/HebrewTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/calendar/HebrewTest.java @@ -8,6 +8,7 @@ */ package com.ibm.icu.dev.test.calendar; + import java.util.Date; import java.util.Locale; import java.util.MissingResourceException; 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 d6feac1f283..72048858f9d 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,6 +8,7 @@ */ package com.ibm.icu.dev.test.calendar; +import com.ibm.icu.dev.test.CoreTestFmwk; import java.util.Date; import java.util.Locale; @@ -31,12 +32,14 @@ import com.ibm.icu.util.ULocale; * Tests for the Holiday class. */ @RunWith(JUnit4.class) -public class HolidayTest extends TestFmwk { +public class HolidayTest extends CoreTestFmwk { // Do not use Before annotation, because TestFmwk's Before // method must be executed first to initialize default time zone @Override - protected void localTestInitialize() { + public void localTestInitialize() { + super.localTestInitialize(); + cal = new GregorianCalendar(1, 0, 1); longTimeAgo = cal.getTime(); now = new Date(); 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 2453aba85bf..76ca216cb4d 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,6 +2,7 @@ // 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; @@ -13,7 +14,7 @@ import com.ibm.icu.util.HebrewCalendar; import com.ibm.icu.util.ULocale; @RunWith(JUnit4.class) -public class InTemporalLeapYearTest extends com.ibm.icu.dev.test.TestFmwk { +public class InTemporalLeapYearTest extends CoreTestFmwk { @Test public void TestGregorian() { // test from year 1800 to 2500 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 fdab8639b8b..fdd3cbe0d75 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,6 +2,7 @@ // 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; @@ -12,7 +13,7 @@ import com.ibm.icu.util.HebrewCalendar; import com.ibm.icu.util.ULocale; @RunWith(JUnit4.class) -public class OrdinalMonthTest extends com.ibm.icu.dev.test.TestFmwk { +public class OrdinalMonthTest extends CoreTestFmwk { private void VerifyMonth(String message, Calendar cc, int expectedMonth, int expectedOrdinalMonth, boolean expectedLeapMonth, 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 6aa4fa7a8d4..b953577cdc2 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,6 +2,7 @@ // 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; @@ -15,7 +16,7 @@ import com.ibm.icu.util.HebrewCalendar; import com.ibm.icu.util.ULocale; @RunWith(JUnit4.class) -public class TemporalMonthCodeTest extends com.ibm.icu.dev.test.TestFmwk { +public class TemporalMonthCodeTest extends CoreTestFmwk { @Test public void TestChineseCalendarGetTemporalMonthCode() { RunChineseGetTemporalMonthCode( 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 948434f64f5..1760cdafb11 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,6 +8,7 @@ */ 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; @@ -41,7 +42,7 @@ import com.ibm.icu.text.CharsetMatch; * @author andy */ @RunWith(JUnit4.class) -public class TestCharsetDetector extends TestFmwk +public class TestCharsetDetector extends CoreTestFmwk { public TestCharsetDetector() { 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 da02271b631..62762fe13b4 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,6 +8,7 @@ */ 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; @@ -16,7 +17,7 @@ import com.ibm.icu.dev.test.TestFmwk; import com.ibm.icu.text.UnicodeDecompressor; @RunWith(JUnit4.class) -public class DecompressionTest extends TestFmwk { +public class DecompressionTest extends CoreTestFmwk { /** Print out a segment of a character array, if in verbose mode */ private void log(char [] chars, int start, int count) { log("|"); 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 244a4546c2e..aded86371e4 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,6 +8,7 @@ */ 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; @@ -17,7 +18,7 @@ import com.ibm.icu.text.UnicodeCompressor; import com.ibm.icu.text.UnicodeDecompressor; @RunWith(JUnit4.class) -public class ExhaustiveTest extends TestFmwk { +public class ExhaustiveTest extends CoreTestFmwk { /** Test simple compress/decompress API, returning # of errors */ @Test public void testSimple() throws Exception { 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 19bbc4e7403..00bc38b8818 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,6 +11,7 @@ package com.ibm.icu.dev.test.duration; +import com.ibm.icu.dev.test.CoreTestFmwk; import java.io.StringReader; import java.io.StringWriter; @@ -23,7 +24,7 @@ import com.ibm.icu.impl.duration.impl.XMLRecordReader; import com.ibm.icu.impl.duration.impl.XMLRecordWriter; @RunWith(JUnit4.class) -public class DataReadWriteTest extends TestFmwk { +public class DataReadWriteTest extends CoreTestFmwk { // strip line ends and trailing spaces private String normalize(String str) { StringBuffer sb = new StringBuffer(); 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 459c12ab30a..7b408f0343d 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,6 +8,7 @@ */ 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; @@ -33,7 +34,7 @@ import com.ibm.icu.util.ULocale; * */ @RunWith(JUnit4.class) -public class ICUDurationTest extends TestFmwk { +public class ICUDurationTest extends CoreTestFmwk { /** * Allows us to not depend on javax.xml.datatype.DatatypeFactory. * We need just a tiny subset of the Duration API: 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 e7190a261cd..74402554c6a 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,6 +11,7 @@ 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; @@ -40,7 +41,7 @@ import com.ibm.icu.impl.duration.impl.DataRecord.EUnitVariant; * Test cases for en */ @RunWith(JUnit4.class) -public abstract class LanguageTestFmwk extends TestFmwk implements TimeUnitConstants { +public abstract class LanguageTestFmwk extends CoreTestFmwk implements TimeUnitConstants { private static final TimeUnit[] units = { TimeUnit.YEAR, TimeUnit.MONTH, TimeUnit.WEEK, TimeUnit.DAY, TimeUnit.HOUR, 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 7f5cbdfe190..827a29f0a84 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,6 +11,7 @@ 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; @@ -24,7 +25,7 @@ import com.ibm.icu.impl.duration.TimeUnit; import com.ibm.icu.impl.duration.TimeUnitConstants; @RunWith(JUnit4.class) -public class PeriodBuilderFactoryTest extends TestFmwk implements TimeUnitConstants { +public class PeriodBuilderFactoryTest extends CoreTestFmwk implements TimeUnitConstants { private PeriodBuilderFactory pbf; private static final long[] approxDurations = { 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 32f67f6f78b..19d592e03c0 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,6 +11,7 @@ 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; @@ -20,7 +21,7 @@ import com.ibm.icu.impl.duration.Period; import com.ibm.icu.impl.duration.TimeUnit; @RunWith(JUnit4.class) -public class PeriodTest extends TestFmwk { +public class PeriodTest extends CoreTestFmwk { @Test public void testIsSet() { Period p = Period.at(0, TimeUnit.YEAR); 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 e8cedb768a5..fa65d19db62 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,6 +8,7 @@ */ 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; @@ -21,7 +22,7 @@ import com.ibm.icu.text.DurationFormat; import com.ibm.icu.util.ULocale; @RunWith(JUnit4.class) -public class RegressionTest extends TestFmwk { +public class RegressionTest extends CoreTestFmwk { // bug6397 @Test public void TestDisallowedMillis() { 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 e6ccea84bb8..46860042cfb 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,6 +11,7 @@ package com.ibm.icu.dev.test.duration; +import com.ibm.icu.dev.test.CoreTestFmwk; import java.util.Collection; import java.util.Iterator; @@ -23,7 +24,7 @@ import com.ibm.icu.impl.duration.impl.PeriodFormatterData; import com.ibm.icu.impl.duration.impl.ResourceBasedPeriodFormatterDataService; @RunWith(JUnit4.class) -public class ResourceBasedPeriodFormatterDataServiceTest extends TestFmwk { +public class ResourceBasedPeriodFormatterDataServiceTest extends CoreTestFmwk { @Test public void testAvailable() { ResourceBasedPeriodFormatterDataService service = 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 6ff6d7cd6fc..65377aa85a7 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,6 +8,7 @@ */ package com.ibm.icu.dev.test.format; +import com.ibm.icu.dev.test.CoreTestFmwk; import java.text.ParseException; import java.util.Locale; @@ -26,7 +27,7 @@ import com.ibm.icu.text.NumberFormat; * General test of Big NumberFormat */ @RunWith(JUnit4.class) -public class BigNumberFormatTest extends TestFmwk { +public class BigNumberFormatTest extends CoreTestFmwk { static final int ILLEGAL = -1; 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 cdae6817559..f7913fe8de2 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,6 +8,7 @@ */ 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; @@ -22,7 +23,7 @@ import com.ibm.icu.impl.Utility; /** * A collection of methods to run the data driven number format test suite. */ -public class DataDrivenNumberFormatTestUtility extends TestFmwk { +public class DataDrivenNumberFormatTestUtility extends CoreTestFmwk { /** * Base class for code under test. 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 2c7c1f71336..42c7f560238 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,6 +14,7 @@ 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; @@ -31,7 +32,7 @@ import com.ibm.icu.text.SimpleDateFormat; * Performs miscellaneous tests for DateFormat, SimpleDateFormat, DateFormatSymbols **/ @RunWith(JUnit4.class) -public class DateFormatMiscTests extends TestFmwk { +public class DateFormatMiscTests extends CoreTestFmwk { /* * @bug 4097450 */ 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 6e760b998ca..d5e7669236a 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,6 +14,7 @@ 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; @@ -46,7 +47,7 @@ import com.ibm.icu.util.ULocale; * Performs regression test for DateFormat **/ @RunWith(JUnit4.class) -public class DateFormatRegressionTest extends TestFmwk { +public class DateFormatRegressionTest extends CoreTestFmwk { /** * @bug 4029195 */ 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 ba992590687..4e7e2738a7f 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,6 +13,7 @@ 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; @@ -31,7 +32,7 @@ import com.ibm.icu.util.Calendar; import com.ibm.icu.util.TimeZone; @RunWith(JUnit4.class) -public class DateFormatRegressionTestJ extends TestFmwk { +public class DateFormatRegressionTestJ extends CoreTestFmwk { private static final String TIME_STRING = "2000/11/17 08:01:00"; private static final long UTC_LONG = 974476860000L; @@ -170,6 +171,8 @@ public class DateFormatRegressionTestJ extends TestFmwk { //about regression test @Test public void Test4266432() { + Locale startLocale = Locale.getDefault(); + Locale.setDefault(Locale.JAPAN); Locale loc = Locale.getDefault(); String dateFormat = "MM/dd/yy HH:mm:ss zzz"; @@ -179,6 +182,8 @@ public class DateFormatRegressionTestJ extends TestFmwk { logln("Under " + loc +" locale"); Date d = fmt.parse("01/22/92 04:52:00 GMT", p0); logln(d.toString()); + + Locale.setDefault(startLocale); } //SimpleDateFormat inconsistent for number of digits for years 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 bdee7614af5..bf3fc010a5c 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,6 +14,7 @@ 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; @@ -35,7 +36,7 @@ import com.ibm.icu.util.TimeZone; * Performs round-trip tests for DateFormat **/ @RunWith(JUnit4.class) -public class DateFormatRoundTripTest extends TestFmwk { +public class DateFormatRoundTripTest extends CoreTestFmwk { public boolean INFINITE = false; public boolean quick = true; private SimpleDateFormat dateFormat; 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 76384c4cdd4..e3bcecbb25e 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,6 +15,7 @@ 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; @@ -49,7 +50,7 @@ import com.ibm.icu.util.TimeZone; import com.ibm.icu.util.ULocale; @RunWith(JUnit4.class) -public class DateIntervalFormatTest extends TestFmwk { +public class DateIntervalFormatTest extends CoreTestFmwk { /** * 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 78b89b0dfa6..847d84e9a88 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,6 +9,7 @@ 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; @@ -43,7 +44,7 @@ import com.ibm.icu.util.TimeZone; import com.ibm.icu.util.ULocale; @RunWith(JUnit4.class) -public class DateTimeGeneratorTest extends TestFmwk { +public class DateTimeGeneratorTest extends CoreTestFmwk { public static boolean GENERATE_TEST_DATA; static { try { 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 0c54eda6678..81e792183af 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,6 +18,7 @@ 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; @@ -34,7 +35,7 @@ import com.ibm.icu.text.SimpleDateFormat; import com.ibm.icu.util.ULocale; @RunWith(JUnit4.class) -public class IntlTestDateFormat extends TestFmwk { +public class IntlTestDateFormat extends CoreTestFmwk { // Values in milliseconds (== Date) private static final long ONESECOND = 1000; private static final long ONEMINUTE = 60 * ONESECOND; 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 d91bcbf2e14..ae2de2d40f0 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,6 +18,7 @@ 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; @@ -35,7 +36,7 @@ import com.ibm.icu.util.Calendar; import com.ibm.icu.util.TimeZone; @RunWith(JUnit4.class) -public class IntlTestDateFormatAPI extends TestFmwk +public class IntlTestDateFormatAPI extends CoreTestFmwk { // Test that the equals method works correctly. @Test @@ -74,6 +75,8 @@ public class IntlTestDateFormatAPI extends TestFmwk @Test public void TestAPI() { + Locale startLocale = Locale.getDefault(); + logln("DateFormat API test---"); logln(""); Locale.setDefault(Locale.ENGLISH); @@ -228,5 +231,7 @@ public class IntlTestDateFormatAPI extends TestFmwk // catch (Exception e) { // errln("ERROR: Couldn't create a DateFormat"); // } + + Locale.setDefault(startLocale); } } 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 948ee635909..54168975b15 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,6 +14,7 @@ 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; @@ -34,7 +35,7 @@ import com.ibm.icu.text.SimpleDateFormat; * verifies that it works on a basic level. */ @RunWith(JUnit4.class) -public class IntlTestDateFormatAPIC extends TestFmwk { +public class IntlTestDateFormatAPIC extends CoreTestFmwk { /** * Test hiding of parse() and format() APIs in the Format hierarchy. * We test the entire hierarchy, even though this test is located in 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 9be1c759bbe..2ad380714ac 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,6 +18,7 @@ package com.ibm.icu.dev.test.format; +import com.ibm.icu.dev.test.CoreTestFmwk; import java.util.Locale; import org.junit.Test; @@ -30,7 +31,7 @@ import com.ibm.icu.util.Calendar; import com.ibm.icu.util.ULocale; @RunWith(JUnit4.class) -public class IntlTestDateFormatSymbols extends TestFmwk +public class IntlTestDateFormatSymbols extends CoreTestFmwk { // Test getMonths @Test 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 e9b14a08545..bb3ad852c35 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,6 +18,7 @@ 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; @@ -36,7 +37,7 @@ import com.ibm.icu.text.DecimalFormatSymbols; import com.ibm.icu.text.NumberFormat; @RunWith(JUnit4.class) -public class IntlTestDecimalFormatAPI extends TestFmwk +public class IntlTestDecimalFormatAPI extends CoreTestFmwk { /** * Problem 1: simply running @@ -101,6 +102,8 @@ public class IntlTestDecimalFormatAPI extends TestFmwk @Test public void TestAPI() { + Locale startLocale = Locale.getDefault(); + logln("DecimalFormat API test---"); logln(""); Locale.setDefault(Locale.ENGLISH); @@ -265,6 +268,8 @@ public class IntlTestDecimalFormatAPI extends TestFmwk if( ! s3.equals(p2) ) { errln("ERROR: toLocalizedPattern() result did not match pattern applied"); } + + Locale.setDefault(startLocale); } @Test 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 c9e9ee8db23..215d762adc3 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,6 +19,7 @@ package com.ibm.icu.dev.test.format; +import com.ibm.icu.dev.test.CoreTestFmwk; import java.util.Arrays; import java.util.Locale; @@ -34,7 +35,7 @@ import com.ibm.icu.util.Currency; import com.ibm.icu.util.ULocale; @RunWith(JUnit4.class) -public class IntlTestDecimalFormatSymbols extends TestFmwk +public class IntlTestDecimalFormatSymbols extends CoreTestFmwk { // Test the API of DecimalFormatSymbols; primarily a simple get/set set. @Test 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 ab9fae562d1..e89f06551e1 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,6 +14,7 @@ package com.ibm.icu.dev.test.format; +import com.ibm.icu.dev.test.CoreTestFmwk; import java.util.Locale; import java.util.Random; @@ -31,7 +32,7 @@ import com.ibm.icu.util.ULocale; * NumberFormat. */ @RunWith(JUnit4.class) -public class IntlTestNumberFormat extends TestFmwk { +public class IntlTestNumberFormat extends CoreTestFmwk { public NumberFormat fNumberFormat; 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 64c9f530d5d..c5dec2de37f 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,6 +17,7 @@ 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; @@ -32,12 +33,14 @@ import com.ibm.icu.text.NumberFormat; import com.ibm.icu.util.ULocale; @RunWith(JUnit4.class) -public class IntlTestNumberFormatAPI extends TestFmwk +public class IntlTestNumberFormatAPI extends CoreTestFmwk { // This test checks various generic API methods in DecimalFormat to achieve 100% API coverage. @Test public void TestAPI() { + Locale startLocale = Locale.getDefault(); + logln("NumberFormat API test---"); logln(""); Locale.setDefault(Locale.ENGLISH); @@ -204,6 +207,8 @@ public class IntlTestNumberFormatAPI extends TestFmwk // catch (Exception e) { // errln("ERROR: Couldn't create a DecimalFormat"); // } + + Locale.setDefault(startLocale); } // Jitterbug 4451, for coverage 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 9cc0b63d9c5..861bd788334 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,6 +19,7 @@ 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; @@ -39,12 +40,14 @@ import com.ibm.icu.text.SimpleDateFormat; * @summary test International Simple Date Format API */ @RunWith(JUnit4.class) -public class IntlTestSimpleDateFormatAPI extends TestFmwk +public class IntlTestSimpleDateFormatAPI extends CoreTestFmwk { // This test checks various generic API methods in DecimalFormat to achieve 100% API coverage. @Test public void TestAPI() { + Locale startLocale = Locale.getDefault(); + logln("SimpleDateFormat API test---"); logln(""); Locale.setDefault(Locale.ENGLISH); @@ -185,6 +188,8 @@ public class IntlTestSimpleDateFormatAPI extends TestFmwk // catch (Exception e) { // errln("ERROR: Couldn't create a SimpleDateFormat"); // } + + Locale.setDefault(startLocale); } // Jitterbug 4451, for coverage 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 3c68db7d256..26ecd6035ff 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,6 +8,7 @@ */ 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; @@ -26,7 +27,7 @@ import com.ibm.icu.text.ListFormatter.Width; import com.ibm.icu.util.ULocale; @RunWith(JUnit4.class) -public class ListFormatterTest extends TestFmwk { +public class ListFormatterTest extends CoreTestFmwk { String[] HardcodedTestData = { "", "A", 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 1a43c8c7b91..49f3f8d1789 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,6 +3,7 @@ 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; @@ -16,7 +17,7 @@ import com.ibm.icu.util.MeasureUnit; import com.ibm.icu.util.ULocale; @RunWith(JUnit4.class) -public class MeasureUnitThreadTest extends TestFmwk { +public class MeasureUnitThreadTest extends CoreTestFmwk { @Test public void MUThreadTest() { 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 2dd092f2a48..74a173a5afc 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,6 +11,7 @@ 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; @@ -35,7 +36,7 @@ import com.ibm.icu.text.MessagePatternUtil.VariantNode; * by building parallel trees of nodes and verifying that they match. */ @RunWith(JUnit4.class) -public final class MessagePatternUtilTest extends TestFmwk { +public final class MessagePatternUtilTest extends CoreTestFmwk { // The following nested "Expect..." classes are used to build // a tree structure parallel to what the MessagePatternUtil class builds. // These nested test classes are not static so that they have access to TestFmwk methods. 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 7be9c872e56..62f4d01a981 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,6 +32,7 @@ attribution to Taligent may not be removed. */ 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; @@ -55,7 +56,7 @@ import com.ibm.icu.text.NumberFormat; import com.ibm.icu.util.ULocale; @RunWith(JUnit4.class) -public class MessageRegressionTest extends TestFmwk { +public class MessageRegressionTest extends CoreTestFmwk { /* @bug 4074764 * Null exception when formatting pattern with MessageFormat * with no parameters. 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 5ea9a936385..df6541a1901 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,6 +2,7 @@ // 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 7f20cb4c9b3..9d5ffaffecd 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,6 +8,7 @@ */ package com.ibm.icu.dev.test.format; +import com.ibm.icu.dev.test.CoreTestFmwk; import java.util.Arrays; import org.junit.Test; @@ -20,7 +21,7 @@ import com.ibm.icu.text.NumberFormat.SimpleNumberFormatFactory; import com.ibm.icu.util.ULocale; @RunWith(JUnit4.class) -public class NumberFormatRegistrationTest extends TestFmwk { +public class NumberFormatRegistrationTest extends CoreTestFmwk { @Test public void TestRegistration() { final ULocale SRC_LOC = ULocale.FRANCE; 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 fc1a67c7fc8..2f7c7518502 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,6 +14,7 @@ package com.ibm.icu.dev.test.format; +import com.ibm.icu.dev.test.CoreTestFmwk; import java.util.Locale; import java.util.Random; @@ -29,7 +30,7 @@ import com.ibm.icu.text.NumberFormat; * Performs round-trip tests for NumberFormat **/ @RunWith(JUnit4.class) -public class NumberFormatRoundTripTest extends TestFmwk { +public class NumberFormatRoundTripTest extends CoreTestFmwk { public double MAX_ERROR = 1e-14; public double max_numeric_error = 0.0; 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 58590135f25..f41e5ece800 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,6 +2,7 @@ // 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; @@ -31,7 +32,7 @@ import junitparams.Parameters; * the CLDR project. */ @RunWith(JUnitParamsRunner.class) -public class PersonNameConsistencyTest extends TestFmwk { +public class PersonNameConsistencyTest extends CoreTestFmwk { /** * Change this to true to cause the tests that would normally be skipped to also run (without * causing the test suite to fail). 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 2681386be34..bf3ccac9d58 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,6 +2,7 @@ // 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; @@ -18,7 +19,7 @@ import com.ibm.icu.text.PersonNameFormatter; import com.ibm.icu.text.SimplePersonName; @RunWith(JUnit4.class) -public class PersonNameFormatterTest extends TestFmwk{ +public class PersonNameFormatterTest extends CoreTestFmwk{ private static class NameAndTestCases { public String nameFields; public String[][] testCases; 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 8bd0940e33c..bd01f11168b 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,6 +8,7 @@ */ 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; @@ -28,7 +29,7 @@ import com.ibm.icu.util.ULocale; * */ @RunWith(JUnit4.class) -public class PluralFormatTest extends TestFmwk { +public class PluralFormatTest extends CoreTestFmwk { private void helperTestRules(String localeIDs, String testPattern, Map changes) { String[] locales = Utility.split(localeIDs, ','); 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 1e2c0d94649..5947dfba1b9 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,6 +9,7 @@ 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; @@ -39,7 +40,7 @@ import com.ibm.icu.util.ULocale; * */ @RunWith(JUnit4.class) -public class PluralFormatUnitTest extends TestFmwk { +public class PluralFormatUnitTest extends CoreTestFmwk { @Test public void TestConstructor() { // Test correct formatting of numbers. 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 8faeb56e26d..aa801f8d230 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,6 +8,7 @@ */ package com.ibm.icu.dev.test.format; +import com.ibm.icu.dev.test.CoreTestFmwk; import java.text.ParseException; import java.util.Locale; @@ -21,7 +22,7 @@ import com.ibm.icu.text.RuleBasedNumberFormat; import com.ibm.icu.util.ULocale; @RunWith(JUnit4.class) -public class RBNFParseTest extends TestFmwk { +public class RBNFParseTest extends CoreTestFmwk { @Test public void TestParse() { 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 964fd8d6013..374f865e3ed 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,6 +8,7 @@ */ package com.ibm.icu.dev.test.format; +import com.ibm.icu.dev.test.CoreTestFmwk; import java.util.Locale; import org.junit.Test; @@ -18,7 +19,7 @@ import com.ibm.icu.dev.test.TestFmwk; import com.ibm.icu.text.RuleBasedNumberFormat; @RunWith(JUnit4.class) -public class RbnfRoundTripTest extends TestFmwk { +public class RbnfRoundTripTest extends CoreTestFmwk { /** * Perform an exhaustive round-trip test on the English spellout rules */ 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 36d6f655cd3..abf85fc5a6d 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,6 +8,7 @@ */ package com.ibm.icu.dev.test.format; +import com.ibm.icu.dev.test.CoreTestFmwk; import java.util.Locale; import org.junit.Test; @@ -29,7 +30,7 @@ import com.ibm.icu.text.RuleBasedNumberFormat; import com.ibm.icu.util.ULocale; @RunWith(JUnit4.class) -public class RelativeDateTimeFormatterTest extends TestFmwk { +public class RelativeDateTimeFormatterTest extends CoreTestFmwk { @Test public void TestRelativeDateWithQuantity() { Object[][] data = { 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 005079ee141..718aa1a2c67 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,6 +8,7 @@ */ 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; @@ -23,7 +24,7 @@ import com.ibm.icu.util.ULocale; * */ @RunWith(JUnit4.class) -public class ScientificNumberFormatterTest extends TestFmwk { +public class ScientificNumberFormatterTest extends CoreTestFmwk { @Test public void TestBasic() { ScientificNumberFormatter markup = ScientificNumberFormatter.getMarkupInstance( 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 78c9c69dd84..be817b331ee 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,6 +9,7 @@ */ package com.ibm.icu.dev.test.format; +import com.ibm.icu.dev.test.CoreTestFmwk; import java.text.FieldPosition; import java.text.ParsePosition; @@ -24,7 +25,7 @@ import com.ibm.icu.text.SelectFormat; * This class tests the API functionality of the SelectFormat */ @RunWith(JUnit4.class) -public class SelectFormatAPITest extends TestFmwk { +public class SelectFormatAPITest extends CoreTestFmwk { static final String SIMPLE_PATTERN1 = "feminine {feminineVerbValue1} other{otherVerbValue1}"; static final String SIMPLE_PATTERN2 = "feminine {feminineVerbValue2} other{otherVerbValue2}"; 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 fb983a95609..bd1686741df 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,6 +9,7 @@ */ 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; @@ -21,7 +22,7 @@ import com.ibm.icu.text.SelectFormat; * This class does the unit testing for the SelectFormat */ @RunWith(JUnit4.class) -public class SelectFormatUnitTest extends TestFmwk { +public class SelectFormatUnitTest extends CoreTestFmwk { static final String SIMPLE_PATTERN = "feminine {feminineVerbValue} other{otherVerbValue}"; 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 a55c57a438d..3684464cfeb 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,6 +8,7 @@ */ 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; @@ -32,7 +33,7 @@ import com.ibm.icu.util.ULocale; * */ @RunWith(JUnit4.class) -public class TimeUnitTest extends TestFmwk { +public class TimeUnitTest extends CoreTestFmwk { @Test public void Test10219FractionalPlurals() { TimeUnitFormat tuf = new TimeUnitFormat(ULocale.ENGLISH, TimeUnitFormat.FULL_NAME); 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 4f1059ad5ca..87d20134ca4 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,6 +3,7 @@ package com.ibm.icu.dev.test.impl; +import com.ibm.icu.dev.test.CoreTestFmwk; import java.text.CharacterIterator; import java.text.StringCharacterIterator; @@ -14,7 +15,7 @@ import com.ibm.icu.dev.test.TestFmwk; import com.ibm.icu.impl.CSCharacterIterator; @RunWith(JUnit4.class) -public class CSCharacterIteratorTest extends TestFmwk { +public class CSCharacterIteratorTest extends CoreTestFmwk { public CSCharacterIteratorTest() {}; @Test 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 8e0bed7848f..71ca72d99bd 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,6 +8,7 @@ */ 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; @@ -17,7 +18,7 @@ import com.ibm.icu.impl.CacheValue; import com.ibm.icu.impl.CacheValue.Strength; @RunWith(JUnit4.class) -public class CacheTest extends TestFmwk { +public class CacheTest extends CoreTestFmwk { public CacheTest() {} /** Code coverage for CacheValue. */ 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 028f2f9edab..03562cc688d 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,6 +2,7 @@ // 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 56eb4495ffb..26df24c5229 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,6 +8,7 @@ */ package com.ibm.icu.dev.test.iterator; +import com.ibm.icu.dev.test.CoreTestFmwk; import java.text.CharacterIterator; import java.text.StringCharacterIterator; @@ -29,7 +30,7 @@ import com.ibm.icu.text.UTF16; * Window>Preferences>Java>Code Generation. */ @RunWith(JUnit4.class) -public class TestUCharacterIterator extends TestFmwk{ +public class TestUCharacterIterator extends CoreTestFmwk{ // constructor ----------------------------------------------------- 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 84b57190e56..cf0d5f20567 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,6 +3,7 @@ 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; @@ -17,7 +18,7 @@ import com.ibm.icu.lang.UScript; import com.ibm.icu.util.ULocale; @RunWith(Enclosed.class) -public class DataDrivenUScriptTest extends TestFmwk { +public class DataDrivenUScriptTest extends CoreTestFmwk { private static String scriptsToString(int[] scripts) { if (scripts == null) { @@ -114,7 +115,7 @@ public class DataDrivenUScriptTest extends TestFmwk { } @RunWith(Parameterized.class) - public static class TestMultipleUScript extends TestFmwk { + public static class TestMultipleUScript extends CoreTestFmwk { private String testLocaleName; private Locale testLocale; private int[] expected; @@ -165,7 +166,7 @@ public class DataDrivenUScriptTest extends TestFmwk { } @RunWith(Parameterized.class) - public static class GetCodeTest extends TestFmwk { + public static class GetCodeTest extends CoreTestFmwk { private String testName; private int expected; 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 54e017edbb1..34f5cb71795 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,6 +9,7 @@ package com.ibm.icu.dev.test.lang; +import com.ibm.icu.dev.test.CoreTestFmwk; import java.util.BitSet; import org.junit.Test; @@ -22,7 +23,7 @@ import com.ibm.icu.lang.UScript.ScriptUsage; import com.ibm.icu.text.UnicodeSet; @RunWith(JUnit4.class) -public class TestUScript extends TestFmwk { +public class TestUScript extends CoreTestFmwk { /** * Constructor 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 e8ab4370352..b6a336595c8 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,6 +9,7 @@ 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; @@ -18,7 +19,7 @@ import com.ibm.icu.lang.UScript; import com.ibm.icu.lang.UScriptRun; @RunWith(JUnit4.class) -public class TestUScriptRun extends TestFmwk +public class TestUScriptRun extends CoreTestFmwk { public TestUScriptRun() { 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 9cb8079d4e8..2dc83012656 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,7 @@ 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; @@ -44,7 +44,7 @@ import com.ibm.icu.util.ULocale; * @since march 14 2002 */ @RunWith(JUnit4.class) -public final class UCharacterCaseTest extends TestFmwk +public final class UCharacterCaseTest extends CoreTestFmwk { // constructor ----------------------------------------------------------- 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 f0f121314f5..35548c143c0 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 @@ -7,6 +7,8 @@ ******************************************************************************* */ 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; @@ -20,7 +22,7 @@ import com.ibm.icu.lang.UCharacterCategory; * @since April 02 2002 */ @RunWith(JUnit4.class) -public class UCharacterCategoryTest extends TestFmwk +public class UCharacterCategoryTest extends CoreTestFmwk { // constructor ----------------------------------------------------------- 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 fe765a4b001..e495364099d 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,6 +8,7 @@ */ 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; @@ -21,7 +22,7 @@ import com.ibm.icu.lang.UCharacterDirection; * @since July 22 2002 */ @RunWith(JUnit4.class) -public class UCharacterDirectionTest extends TestFmwk +public class UCharacterDirectionTest extends CoreTestFmwk { // constructor ----------------------------------------------------------- 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 4d341641a08..34ea1cd6481 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,6 +9,7 @@ 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; @@ -22,7 +23,7 @@ import com.ibm.icu.text.UTF16; * Test JDK 1.5 cover APIs. */ @RunWith(JUnit4.class) -public final class UCharacterSurrogateTest extends TestFmwk { +public final class UCharacterSurrogateTest extends CoreTestFmwk { @Test public void TestUnicodeBlockForName() { String[] names = {"Latin-1 Supplement", 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 c7091179e8a..a1e40e72b88 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,6 +9,7 @@ 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; @@ -49,7 +50,7 @@ import com.ibm.icu.util.VersionInfo; * @since nov 04 2000 */ @RunWith(JUnit4.class) -public final class UCharacterTest extends TestFmwk +public final class UCharacterTest extends CoreTestFmwk { // private variables ============================================= 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 b1eb9230447..2b522de7968 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,6 +8,7 @@ */ 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; @@ -24,7 +25,7 @@ import com.ibm.icu.lang.UCharacter; * */ @RunWith(JUnit4.class) -public class UCharacterThreadTest extends TestFmwk { +public class UCharacterThreadTest extends CoreTestFmwk { // constructor ----------------------------------------------------------- /** 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 95c3436870d..5c1c6cdeea3 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,6 +12,7 @@ */ 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; @@ -21,7 +22,7 @@ import com.ibm.icu.lang.UCharacter; import com.ibm.icu.lang.UProperty; @RunWith(JUnit4.class) -public class UPropertyAliasesTest extends TestFmwk { +public class UPropertyAliasesTest extends CoreTestFmwk { public UPropertyAliasesTest() {} 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 f8e3e9499e6..85db0dc1b25 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,6 +9,7 @@ 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; @@ -27,7 +28,7 @@ import com.ibm.icu.text.UTF16.StringComparator; * @since feb 09 2001 */ @RunWith(JUnit4.class) -public final class UTF16Test extends TestFmwk +public final class UTF16Test extends CoreTestFmwk { // constructor =================================================== 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 a2e254c01f9..8d389a0d508 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,6 +8,7 @@ */ package com.ibm.icu.dev.test.lang; +import com.ibm.icu.dev.test.CoreTestFmwk; import java.util.Collection; import org.junit.Test; @@ -26,7 +27,7 @@ import com.ibm.icu.util.OutputInt; * @summary General test of UnicodeSet string span. */ @RunWith(JUnit4.class) -public class UnicodeSetStringSpanTest extends TestFmwk { +public class UnicodeSetStringSpanTest extends CoreTestFmwk { // Simple test first, easier to debug. @Test public void TestSimpleStringSpan() { 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 deac1ac3ec8..1ec8abfe69b 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,6 +8,7 @@ */ 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; @@ -56,7 +57,7 @@ import com.ibm.icu.util.OutputInt; * @summary General test of UnicodeSet */ @RunWith(JUnit4.class) -public class UnicodeSetTest extends TestFmwk { +public class UnicodeSetTest extends CoreTestFmwk { static final String NOT = "%%%%"; 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 065f0cbd7a1..4aab063d896 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/message2/CustomFormatterGrammarCaseTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/message2/CustomFormatterGrammarCaseTest.java @@ -3,6 +3,7 @@ package com.ibm.icu.dev.test.message2; +import com.ibm.icu.dev.test.CoreTestFmwk; import java.util.Locale; import java.util.Map; @@ -23,7 +24,7 @@ import com.ibm.icu.message2.PlainStringFormattedValue; */ @RunWith(JUnit4.class) @SuppressWarnings("javadoc") -public class CustomFormatterGrammarCaseTest extends TestFmwk { +public class CustomFormatterGrammarCaseTest extends CoreTestFmwk { static class GrammarCasesFormatterFactory implements 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 1b3bac2ff76..89231c4c099 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/message2/CustomFormatterListTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/message2/CustomFormatterListTest.java @@ -3,6 +3,7 @@ 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; @@ -27,7 +28,7 @@ import com.ibm.icu.text.ListFormatter.Width; */ @RunWith(JUnit4.class) @SuppressWarnings("javadoc") -public class CustomFormatterListTest extends TestFmwk { +public class CustomFormatterListTest extends CoreTestFmwk { static class ListFormatterFactory implements 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 9b6b153fdac..84931698994 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,6 +3,7 @@ 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; @@ -28,7 +29,7 @@ import com.ibm.icu.message2.PlainStringFormattedValue; */ @RunWith(JUnit4.class) @SuppressWarnings("javadoc") -public class CustomFormatterMessageRefTest extends TestFmwk { +public class CustomFormatterMessageRefTest extends CoreTestFmwk { static class ResourceManagerFactory implements 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 b60149a8e4e..f0e1bd7b59f 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,6 +3,7 @@ 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; @@ -23,7 +24,7 @@ import com.ibm.icu.message2.PlainStringFormattedValue; */ @RunWith(JUnit4.class) @SuppressWarnings("javadoc") -public class CustomFormatterPersonTest extends TestFmwk { +public class CustomFormatterPersonTest extends CoreTestFmwk { public static class Person { final String title; 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 71030ab5f3f..d8eb190b497 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,6 +3,7 @@ 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; @@ -17,7 +18,7 @@ import com.ibm.icu.dev.test.TestFmwk; */ @RunWith(JUnit4.class) @SuppressWarnings("javadoc") -public class FromJsonTest extends TestFmwk { +public class FromJsonTest extends CoreTestFmwk { static final TestCase[] TEST_CASES = { new TestCase.Builder() 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 b16acb63088..de4733a396b 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/message2/MessageFormat2Test.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/message2/MessageFormat2Test.java @@ -3,6 +3,7 @@ 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; @@ -35,7 +36,7 @@ import com.ibm.icu.util.MeasureUnit; */ @RunWith(JUnit4.class) @SuppressWarnings("javadoc") -public class MessageFormat2Test extends TestFmwk { +public class MessageFormat2Test extends CoreTestFmwk { @Test public void test() { 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 b93605f07ad..c0250877dcb 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,6 +3,7 @@ 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; @@ -24,7 +25,7 @@ import com.ibm.icu.util.GregorianCalendar; */ @RunWith(JUnit4.class) @SuppressWarnings("javadoc") -public class Mf2IcuTest extends TestFmwk { +public class Mf2IcuTest extends CoreTestFmwk { @Test public void testSample() { 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 ee484bfe21a..2785bcf9e8f 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,6 +9,7 @@ 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; @@ -26,7 +27,7 @@ import com.ibm.icu.text.UTF16; import com.ibm.icu.text.UnicodeSet; @RunWith(JUnit4.class) -public class ConformanceTest extends TestFmwk { +public class ConformanceTest extends CoreTestFmwk { Normalizer 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 b22e5e1c130..a58f8eb5054 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,6 +9,7 @@ package com.ibm.icu.dev.test.normalizer; +import com.ibm.icu.dev.test.CoreTestFmwk; import java.util.Random; import org.junit.Test; @@ -22,7 +23,7 @@ import com.ibm.icu.text.Normalizer; import com.ibm.icu.text.UTF16; @RunWith(JUnit4.class) -public class NormalizationMonkeyTest extends TestFmwk { +public class NormalizationMonkeyTest extends CoreTestFmwk { int loopCount = 100; int maxCharCount = 20; int maxCodePoint = 0x10ffff; 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 0addad84f7e..06498f062fd 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,6 +9,7 @@ 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; @@ -17,7 +18,7 @@ import com.ibm.icu.dev.test.TestFmwk; import com.ibm.icu.text.Normalizer; @RunWith(JUnit4.class) -public class NormalizerRegressionTests extends TestFmwk { +public class NormalizerRegressionTests extends CoreTestFmwk { @Test public void TestJB4472() { // submitter's test case 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 351522942a2..651da630627 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,6 +8,7 @@ */ 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; @@ -29,7 +30,7 @@ import com.ibm.icu.text.UTF16; // TODO: fit into test framework @RunWith(JUnit4.class) -public class TestCanonicalIterator extends TestFmwk { +public class TestCanonicalIterator extends CoreTestFmwk { static final boolean SHOW_NAMES = false; 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 6199d5de606..093b0e97951 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,6 +8,7 @@ */ 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; @@ -21,7 +22,7 @@ import com.ibm.icu.text.Normalizer; import com.ibm.icu.text.StringCharacterIterator; @RunWith(JUnit4.class) -public class TestDeprecatedNormalizerAPI extends TestFmwk +public class TestDeprecatedNormalizerAPI extends CoreTestFmwk { public TestDeprecatedNormalizerAPI() { } 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 b798fe7882a..3ef739a5b20 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,6 +8,7 @@ */ 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; @@ -36,7 +37,7 @@ import com.ibm.icu.util.ICUInputTooLongException; * @since 2010jul10 */ @RunWith(JUnit4.class) -public class UTS46Test extends TestFmwk { +public class UTS46Test extends CoreTestFmwk { public UTS46Test() { int commonOptions= IDNA.USE_STD3_RULES|IDNA.CHECK_BIDI| 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 c089f6b9e34..45ad609fcea 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,6 +9,7 @@ package com.ibm.icu.dev.test.normalizer; +import com.ibm.icu.dev.test.CoreTestFmwk; import java.io.BufferedReader; import java.io.IOException; @@ -24,7 +25,7 @@ import com.ibm.icu.text.UnicodeSet; @RunWith(JUnit4.class) -public class UnicodeNormalizerConformanceTest extends TestFmwk { +public class UnicodeNormalizerConformanceTest extends CoreTestFmwk { UnicodeNormalizer normalizer_C, normalizer_D, normalizer_KC, normalizer_KD; 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 8863e609257..15cc4d873c2 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,6 +2,7 @@ // 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; @@ -36,7 +37,7 @@ import com.ibm.icu.text.PluralRules.Operand; import com.ibm.icu.util.ULocale; @RunWith(JUnit4.class) -public class DecimalQuantityTest extends TestFmwk { +public class DecimalQuantityTest extends CoreTestFmwk { @Ignore @Test 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 9668774dc3a..6a0adb036a5 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,6 +2,7 @@ // 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; @@ -28,7 +29,7 @@ import com.ibm.icu.util.ULocale; * * @author sffc */ -public class ExhaustiveNumberTest extends TestFmwk { +public class ExhaustiveNumberTest extends CoreTestFmwk { @Before public void beforeMethod() { // Disable this test class except for exhaustive mode. 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 65d75a3ae3e..fcc6c509119 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,6 +2,7 @@ // 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; @@ -17,7 +18,7 @@ import com.ibm.icu.text.BreakIterator; * */ @RunWith(JUnit4.class) -public class AbstractBreakIteratorTests extends TestFmwk { +public class AbstractBreakIteratorTests extends CoreTestFmwk { private class AbstractBreakIterator extends BreakIterator { private int position = 0; 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 e8e643f2466..00739920ea8 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,6 +8,7 @@ */ 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; @@ -20,7 +21,7 @@ import com.ibm.icu.dev.test.TestFmwk; import com.ibm.icu.text.BreakIterator; @RunWith(JUnit4.class) -public class BreakIteratorRegTest extends TestFmwk +public class BreakIteratorRegTest extends CoreTestFmwk { @Test public void TestRegUnreg() { 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 3e6413f192b..5bec8a262a8 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,6 +8,7 @@ */ package com.ibm.icu.dev.test.rbbi; +import com.ibm.icu.dev.test.CoreTestFmwk; import java.text.StringCharacterIterator; import java.util.Locale; @@ -21,7 +22,7 @@ import com.ibm.icu.text.FilteredBreakIteratorBuilder; import com.ibm.icu.util.ULocale; @RunWith(JUnit4.class) -public class BreakIteratorTest extends TestFmwk +public class BreakIteratorTest extends CoreTestFmwk { public BreakIteratorTest() { 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 51522911894..9fe053785b2 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,6 +14,7 @@ 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; @@ -35,7 +36,7 @@ import com.ibm.icu.util.ULocale; * API Test the RuleBasedBreakIterator class */ @RunWith(JUnit4.class) -public class RBBIAPITest extends TestFmwk { +public class RBBIAPITest extends CoreTestFmwk { /** * Tests clone() and equals() methods of 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 92d8e826156..b622441b814 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,6 +2,7 @@ // 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; @@ -25,7 +26,7 @@ import com.ibm.icu.text.BreakIterator; * See the data file for a description of the tests. */ @RunWith(JUnit4.class) -public class RBBILSTMTest extends TestFmwk { +public class RBBILSTMTest extends CoreTestFmwk { public RBBILSTMTest() { } 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 c23b1e41863..f63f48ae5d4 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,6 +3,7 @@ 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; @@ -34,7 +35,7 @@ import com.ibm.icu.util.ULocale; */ @RunWith(JUnit4.class) -public class RBBIMonkeyTest extends TestFmwk { +public class RBBIMonkeyTest extends CoreTestFmwk { // class CharClass Represents a single character class from the source break rules. 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 14a7659455f..204595a0dcc 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 @@ -16,6 +16,7 @@ package com.ibm.icu.dev.test.rbbi; // 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; @@ -34,7 +35,7 @@ import com.ibm.icu.util.ULocale; @RunWith(JUnit4.class) -public class RBBITest extends TestFmwk { +public class RBBITest extends CoreTestFmwk { public RBBITest() { } 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 183e24a3fec..82328562f6d 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,6 +9,7 @@ */ 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; @@ -35,7 +36,7 @@ import com.ibm.icu.util.ULocale; * */ @RunWith(JUnit4.class) -public class RBBITestExtended extends TestFmwk { +public class RBBITestExtended extends CoreTestFmwk { public RBBITestExtended() { } 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 f85006e7fe2..fb421070fe0 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 @@ -13,6 +13,7 @@ package com.ibm.icu.dev.test.rbbi; // 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; @@ -42,7 +43,7 @@ import com.ibm.icu.text.UnicodeSet; * */ @RunWith(JUnit4.class) -public class RBBITestMonkey extends TestFmwk { +public class RBBITestMonkey extends CoreTestFmwk { // // class RBBIMonkeyKind // 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 f8d81e4f891..8567bf786cb 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,6 +9,7 @@ package com.ibm.icu.dev.test.shaping; +import com.ibm.icu.dev.test.CoreTestFmwk; import java.lang.reflect.Method; import org.junit.Test; @@ -22,7 +23,7 @@ import com.ibm.icu.text.ArabicShaping; * Regression test for Arabic shaping. */ @RunWith(JUnit4.class) -public class ArabicShapingRegTest extends TestFmwk { +public class ArabicShapingRegTest extends CoreTestFmwk { /* constants copied from ArabicShaping for convenience */ 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 406e4f03463..57ef19438ef 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,6 +3,7 @@ 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; @@ -20,7 +21,7 @@ import com.ibm.icu.text.ArabicShapingException; * Regression test for Arabic shaping. */ @RunWith(Enclosed.class) -public class DataDrivenArabicShapingRegTest extends TestFmwk { +public class DataDrivenArabicShapingRegTest extends CoreTestFmwk { /* constants copied from ArabicShaping for convenience */ @@ -48,7 +49,7 @@ public class DataDrivenArabicShapingRegTest extends TestFmwk { public static final int DIGIT_TYPE_AN_EXTENDED = 0x100; @RunWith(Parameterized.class) - public static class StandardDataTest extends TestFmwk { + public static class StandardDataTest extends CoreTestFmwk { private String source; private int flags; private String expected; @@ -378,7 +379,7 @@ public class DataDrivenArabicShapingRegTest extends TestFmwk { } @RunWith(Parameterized.class) - public static class PreflightDataTest extends TestFmwk { + public static class PreflightDataTest extends CoreTestFmwk { private String source; private int flags; private int length; @@ -429,7 +430,7 @@ public class DataDrivenArabicShapingRegTest extends TestFmwk { } @RunWith(Parameterized.class) - public static class ErrorDataTest extends TestFmwk { + public static class ErrorDataTest extends CoreTestFmwk { private String source; private int flags; private Class error; 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 3319a79af48..e3103659044 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,6 +11,7 @@ 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; @@ -34,7 +35,7 @@ import com.ibm.icu.text.UTF16; * */ @RunWith(JUnit4.class) -public class IDNAConformanceTest extends TestFmwk { +public class IDNAConformanceTest extends CoreTestFmwk { @Test public void TestConformance() { 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 d34599b6a00..9ae7d9f678e 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,6 +8,7 @@ */ 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 a06da264714..e65913c7af5 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,6 +8,7 @@ */ package com.ibm.icu.dev.test.stringprep; +import com.ibm.icu.dev.test.CoreTestFmwk; import java.util.Random; import org.junit.Ignore; @@ -27,7 +28,7 @@ import com.ibm.icu.text.UTF16; * @author ram */ @RunWith(JUnit4.class) -public class TestIDNA extends TestFmwk { +public class TestIDNA extends CoreTestFmwk { private StringPrepParseException unassignedException = new StringPrepParseException("",StringPrepParseException.UNASSIGNED_ERROR); @Test 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 aec93be66d3..bb51b825941 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,6 +8,7 @@ */ 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; @@ -21,7 +22,7 @@ import com.ibm.icu.text.StringPrepParseException; * */ @RunWith(JUnit4.class) -public class TestStringPrepProfiles extends TestFmwk { +public class TestStringPrepProfiles extends CoreTestFmwk { /* * The format of the test cases should be the following: * { 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 8ffedfbcda4..ac4ce3b6a46 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,6 +3,7 @@ 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; @@ -22,7 +23,7 @@ import com.ibm.icu.text.DisplayOptions.SubstituteHandling; * @summary Test of DisplayOptions Class. */ @RunWith(JUnit4.class) -public class DisplayOptionsTest extends TestFmwk { +public class DisplayOptionsTest extends CoreTestFmwk { @Test public void TestDisplayOptionsDefault(){ 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 d6c8539e60b..1005e36fb21 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,6 +8,7 @@ */ 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; @@ -42,7 +43,7 @@ import com.ibm.icu.text.UnicodeSet; import com.ibm.icu.util.ULocale; @RunWith(JUnit4.class) -public class SpoofCheckerTest extends TestFmwk { +public class SpoofCheckerTest extends CoreTestFmwk { /* * Identifiers for verifying that spoof checking is minimally alive and working. */ 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 7c1c59315b9..a4e89d7f510 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,6 +10,7 @@ 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; @@ -22,7 +23,7 @@ import com.ibm.icu.util.UniversalTimeScale; * Test UniversalTimeScale API */ @RunWith(JUnit4.class) -public class TimeScaleAPITest extends TestFmwk +public class TimeScaleAPITest extends CoreTestFmwk { /** 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 048d3036946..c042e179a56 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,6 +10,7 @@ package com.ibm.icu.dev.test.timescale; +import com.ibm.icu.dev.test.CoreTestFmwk; import java.util.Date; import java.util.Locale; @@ -30,7 +31,7 @@ import com.ibm.icu.util.UniversalTimeScale; * Window - Preferences - Java - Code Style - Code Templates */ @RunWith(JUnit4.class) -public class TimeScaleDataTest extends TestFmwk +public class TimeScaleDataTest extends CoreTestFmwk { /** 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 5574bd7fc9c..7e3f1fd91c5 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,6 +10,7 @@ package com.ibm.icu.dev.test.timescale; +import com.ibm.icu.dev.test.CoreTestFmwk; import java.util.Random; import org.junit.Test; @@ -26,7 +27,7 @@ import com.ibm.icu.util.UniversalTimeScale; * that they round-trip correctly. */ @RunWith(JUnit4.class) -public class TimeScaleMonkeyTest extends TestFmwk +public class TimeScaleMonkeyTest extends CoreTestFmwk { /** 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 76e2cb1fd29..e8adf606d73 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,6 +8,7 @@ */ 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; @@ -37,7 +38,7 @@ import com.ibm.icu.util.TimeZone; * */ @RunWith(JUnit4.class) -public class TimeZoneAliasTest extends TestFmwk { +public class TimeZoneAliasTest extends CoreTestFmwk { /** * There are two things to check aliases for:
* 1. the alias set must be uniform: if a isAlias b, then aliasSet(a) == aliasSet(b)
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 8b8271cc5cc..d27638d5f06 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 @@ -7,6 +7,8 @@ ******************************************************************************* */ package com.ibm.icu.dev.test.timezone; + +import com.ibm.icu.dev.test.CoreTestFmwk; import java.util.Date; import org.junit.Test; @@ -26,7 +28,7 @@ import com.ibm.icu.util.TimeZone; * that they are correct. */ @RunWith(JUnit4.class) -public class TimeZoneBoundaryTest extends TestFmwk +public class TimeZoneBoundaryTest extends CoreTestFmwk { static final int ONE_SECOND = 1000; static final int ONE_MINUTE = 60*ONE_SECOND; 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 55acc689b01..d8c7026f8c7 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,6 +8,7 @@ */ package com.ibm.icu.dev.test.timezone; +import com.ibm.icu.dev.test.CoreTestFmwk; import java.util.Date; import org.junit.Test; @@ -31,7 +32,7 @@ import com.ibm.icu.util.TimeZone; * Testing getOffset APIs using local time */ @RunWith(JUnit4.class) -public class TimeZoneOffsetLocalTest extends TestFmwk { +public class TimeZoneOffsetLocalTest extends CoreTestFmwk { /* * Testing getOffset APIs around rule transition by local standard/wall time. */ 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 bf10b1f6848..be6054b6e50 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 @@ -14,6 +14,8 @@ */ 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; @@ -37,7 +39,7 @@ import com.ibm.icu.util.TimeZone; import com.ibm.icu.util.ULocale; @RunWith(JUnit4.class) -public class TimeZoneRegressionTest extends TestFmwk { +public class TimeZoneRegressionTest extends CoreTestFmwk { @Test public void Test4052967() { logln("*** CHECK TIMEZONE AGAINST HOST OS SETTING ***"); 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 98bedcea686..05b6327d255 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,6 +8,7 @@ */ 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; @@ -42,7 +43,7 @@ import com.ibm.icu.util.VTimeZone; * Test cases for TimeZoneRule and RuleBasedTimeZone */ @RunWith(JUnit4.class) -public class TimeZoneRuleTest extends TestFmwk { +public class TimeZoneRuleTest extends CoreTestFmwk { private static final int HOUR = 60 * 60 * 1000; 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 e51e7ee521e..f3b9dfd676e 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,6 +9,7 @@ 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; @@ -52,7 +53,7 @@ import com.ibm.icu.util.VersionInfo; * @build TimeZoneTest */ @RunWith(JUnit4.class) -public class TimeZoneTest extends TestFmwk +public class TimeZoneTest extends CoreTestFmwk { static final int millisPerHour = 3600000; 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 abe461ed469..461e7365adc 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,6 +12,7 @@ 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; @@ -26,7 +27,7 @@ import com.ibm.icu.util.BytesTrieBuilder; import com.ibm.icu.util.StringTrieBuilder; @RunWith(JUnit4.class) -public class BytesTrieTest extends TestFmwk { +public class BytesTrieTest extends CoreTestFmwk { public BytesTrieTest() {} // All test functions have a TestNN prefix where NN is a double-digit number. 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 b7c3e98e987..18710c0b161 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,6 +12,7 @@ package com.ibm.icu.dev.test.util; +import com.ibm.icu.dev.test.CoreTestFmwk; import java.util.NoSuchElementException; import org.junit.Test; @@ -26,7 +27,7 @@ import com.ibm.icu.util.CharsTrieBuilder; import com.ibm.icu.util.StringTrieBuilder; @RunWith(JUnit4.class) -public class CharsTrieTest extends TestFmwk { +public class CharsTrieTest extends CoreTestFmwk { public CharsTrieTest() {} // All test functions have a TestNN prefix where NN is a double-digit number. 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 eed78c4c4bd..d127dc821ba 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,6 +8,7 @@ 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; @@ -29,7 +30,7 @@ import com.ibm.icu.util.MutableCodePointTrie; import com.ibm.icu.util.VersionInfo; @RunWith(JUnit4.class) -public final class CodePointTrieTest extends TestFmwk { +public final class CodePointTrieTest extends CoreTestFmwk { /* Values for setting possibly overlapping, out-of-order ranges of values */ private static class SetRange { SetRange(int start, int limit, int value) { 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 4f2289c64f6..c9c44101521 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,6 +8,7 @@ */ 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; @@ -21,7 +22,7 @@ import com.ibm.icu.util.CompactCharArray; * @since release 2.2 */ @RunWith(JUnit4.class) -public final class CompactArrayTest extends TestFmwk +public final class CompactArrayTest extends CoreTestFmwk { @Test public void TestByteArrayCoverage() { 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 451e7c5a6c7..b6b20e68ce8 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,6 +8,7 @@ */ 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; @@ -19,7 +20,7 @@ import com.ibm.icu.dev.test.TestFmwk; * */ @RunWith(JUnit4.class) -public class DebugUtilitiesTest extends TestFmwk { +public class DebugUtilitiesTest extends CoreTestFmwk { @Test public void TestStrings() { 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 031d3276a9e..ebbc0f74d44 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,6 +8,7 @@ */ 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; @@ -35,7 +36,7 @@ import com.ibm.icu.util.UResourceBundle; // TODO(junit): test is broken in main branch @RunWith(JUnit4.class) -public class DisplayNameTest extends TestFmwk { +public class DisplayNameTest extends CoreTestFmwk { static final boolean SHOW_ALL = false; interface DisplayNameGetter { 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 3dd1d7286b6..7be70a37c7d 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,6 +8,7 @@ */ package com.ibm.icu.dev.test.util; +import com.ibm.icu.dev.test.CoreTestFmwk; import java.util.Arrays; import java.util.List; @@ -21,7 +22,7 @@ import com.ibm.icu.util.GenderInfo.Gender; import com.ibm.icu.util.ULocale; @RunWith(JUnit4.class) -public class GenderInfoTest extends TestFmwk { +public class GenderInfoTest extends CoreTestFmwk { public static GenderInfo NEUTRAL_LOCALE = GenderInfo.getInstance(ULocale.ENGLISH); public static GenderInfo MIXED_NEUTRAL_LOCALE = GenderInfo.getInstance(new ULocale("is")); public static GenderInfo MALE_TAINTS_LOCALE = GenderInfo.getInstance(ULocale.FRENCH); 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 1ecf03fe0da..cce2313068a 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,6 +9,7 @@ package com.ibm.icu.dev.test.util; +import com.ibm.icu.dev.test.CoreTestFmwk; import java.io.IOException; import java.nio.ByteBuffer; @@ -27,7 +28,7 @@ import com.ibm.icu.impl.ICUBinary; * @since release 2.1 Jan 01 2002 */ @RunWith(JUnit4.class) -public final class ICUBinaryTest extends TestFmwk +public final class ICUBinaryTest extends CoreTestFmwk { // constructor --------------------------------------------------- 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 d5a4aa70b3a..843b05e0fbd 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,6 +8,7 @@ */ 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; @@ -36,7 +37,7 @@ import com.ibm.icu.impl.ICUService.SimpleFactory; import com.ibm.icu.util.ULocale; @RunWith(JUnit4.class) -public class ICUServiceThreadTest extends TestFmwk +public class ICUServiceThreadTest extends CoreTestFmwk { private static final boolean PRINTSTATS = false; 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 997fd296262..a2b9d7ddee2 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,6 +14,7 @@ package com.ibm.icu.dev.test.util; +import com.ibm.icu.dev.test.CoreTestFmwk; import java.util.HashMap; import org.junit.Before; @@ -29,7 +30,7 @@ import com.ibm.icu.util.ULocale; import com.ibm.icu.util.UResourceBundle; @RunWith(JUnit4.class) -public class LocaleAliasTest extends TestFmwk { +public class LocaleAliasTest extends CoreTestFmwk { private static final ULocale[][] _LOCALES = { {new ULocale("en", "RH"), new ULocale("en", "ZW")}, 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 73061916d39..9ad74bad2b6 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,6 +8,7 @@ */ package com.ibm.icu.dev.test.util; +import com.ibm.icu.dev.test.CoreTestFmwk; import java.util.Arrays; import org.junit.Test; @@ -23,7 +24,7 @@ import com.ibm.icu.util.ULocale.Builder; * Test cases for ULocale.LocaleBuilder */ @RunWith(JUnit4.class) -public class LocaleBuilderTest extends TestFmwk { +public class LocaleBuilderTest extends CoreTestFmwk { @Test public void TestLocaleBuilder() { // "L": +1 = language 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 f75bdffdd98..069f6443dad 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,6 +2,7 @@ // 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; @@ -26,7 +27,7 @@ import com.ibm.icu.util.ULocale; * @author markdavis */ @RunWith(JUnit4.class) -public class LocaleDistanceTest extends TestFmwk { +public class LocaleDistanceTest extends CoreTestFmwk { private static final boolean REFORMAT = false; // set to true to get a reformatted data file listed private LocaleDistance localeDistance = LocaleDistance.INSTANCE; 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 b0443f4a40b..6dbadfe7f20 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,6 +9,7 @@ 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; @@ -40,7 +41,7 @@ import junitparams.Parameters; * @author markdavis */ @RunWith(JUnitParamsRunner.class) -public class LocaleMatcherTest extends TestFmwk { +public class LocaleMatcherTest extends CoreTestFmwk { private static final ULocale ZH_MO = new ULocale("zh_MO"); private static final ULocale ZH_HK = new ULocale("zh_HK"); 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 a0453aecff2..535b6528367 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,6 +9,7 @@ package com.ibm.icu.dev.test.util; +import com.ibm.icu.dev.test.CoreTestFmwk; import java.util.Set; import org.junit.Test; @@ -24,7 +25,7 @@ import com.ibm.icu.util.ULocale; * @author markdavis@google.com */ @RunWith(JUnit4.class) -public class LocalePriorityListTest extends TestFmwk { +public class LocalePriorityListTest extends CoreTestFmwk { @Test public void testLanguagePriorityList() { final String expected = "af, en, fr"; 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 e80a4b9e1f6..8bcea221199 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,6 +13,7 @@ package com.ibm.icu.dev.test.util; +import com.ibm.icu.dev.test.CoreTestFmwk; import java.util.List; import java.util.Set; @@ -30,7 +31,7 @@ import com.ibm.icu.util.Region.RegionType; */ @RunWith(JUnit4.class) -public class RegionTest extends TestFmwk { +public class RegionTest extends CoreTestFmwk { String[][] knownRegions = { // Code , Numeric , Parent, Type, Containing Continent { "001", "001", null , "WORLD", null }, 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 2d4b5640ea7..1bd9034918c 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,6 +8,7 @@ */ 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; @@ -18,7 +19,7 @@ import com.ibm.icu.text.SimpleFormatter; import com.ibm.icu.util.ULocale; @RunWith(JUnit4.class) -public class SimpleFormatterTest extends TestFmwk { +public class SimpleFormatterTest extends CoreTestFmwk { /** * Constructor 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 b701435e1f7..f3779c4f447 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,6 +9,7 @@ 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; @@ -25,7 +26,7 @@ import com.ibm.icu.util.StringTokenizer; * @since oct 26 2002 */ @RunWith(JUnit4.class) -public final class StringTokenizerTest extends TestFmwk +public final class StringTokenizerTest extends CoreTestFmwk { // constructor =================================================== 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 64e7d9373c5..978da2abdab 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,6 +8,7 @@ */ 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; @@ -34,7 +35,7 @@ import com.ibm.icu.util.ULocale; * */ @RunWith(JUnit4.class) -public class TestLocaleValidity extends TestFmwk { +public class TestLocaleValidity extends CoreTestFmwk { @Test public void testBasic() { String[][] tests = { 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 0ce33df4006..b99ca7bed73 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,6 +8,7 @@ */ package com.ibm.icu.dev.test.util; +import com.ibm.icu.dev.test.CoreTestFmwk; import java.util.Arrays; import java.util.Iterator; @@ -20,7 +21,7 @@ import com.ibm.icu.impl.TextTrieMap; import com.ibm.icu.text.UnicodeSet; @RunWith(JUnit4.class) -public class TextTrieMapTest extends TestFmwk { +public class TextTrieMapTest extends CoreTestFmwk { private static final Integer SUN = new Integer(1); private static final Integer MON = new Integer(2); 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 fa3ffc8b016..0dd36c884ee 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,6 +9,7 @@ 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; @@ -28,7 +29,7 @@ import com.ibm.icu.impl.Trie2_16; import com.ibm.icu.impl.Trie2_32; @RunWith(JUnit4.class) -public class Trie2Test extends TestFmwk { +public class Trie2Test extends CoreTestFmwk { /** * Constructor */ 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 cb5d58f84a8..7c432d46c8a 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,6 +8,7 @@ */ 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; @@ -38,7 +39,7 @@ import com.ibm.icu.util.StringTrieBuilder.Option; import com.ibm.icu.util.ULocale; @RunWith(JUnit4.class) -public class TrieMapTest extends TestFmwk { +public class TrieMapTest extends CoreTestFmwk { static final boolean SHORT = false; static final boolean HACK_TO_MAKE_TESTS_PASS = false; static final int MASK = 0x3; 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 a6de61784b7..b3dea2f36e7 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,6 +9,7 @@ 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; @@ -31,7 +32,7 @@ import com.ibm.icu.util.RangeValueIterator; * @since release 2.1 Jan 01 2002 */ @RunWith(JUnit4.class) -public final class TrieTest extends TestFmwk +public final class TrieTest extends CoreTestFmwk { // constructor --------------------------------------------------- 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 ddc8b0d9aea..94f9656f1a6 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,6 +12,7 @@ */ 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; @@ -36,7 +37,7 @@ import com.ibm.icu.util.CaseInsensitiveString; * @summary Test of internal Utility class */ @RunWith(JUnit4.class) -public class UtilityTest extends TestFmwk { +public class UtilityTest extends CoreTestFmwk { @Test public void TestUnescape() { final String input = 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 1577793eecc..b9664c09aa7 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,7 +10,7 @@ package com.ibm.icu.dev.test.util; - +import com.ibm.icu.dev.test.CoreTestFmwk; import java.util.Arrays; import org.junit.Test; @@ -27,7 +27,7 @@ import com.ibm.icu.util.VersionInfo; * @since release 2.1 March 01 2002 */ @RunWith(JUnit4.class) -public final class VersionInfoTest extends TestFmwk +public final class VersionInfoTest extends CoreTestFmwk { // constructor --------------------------------------------------- diff --git a/icu4j/main/framework/src/test/java/com/ibm/icu/dev/test/TestFmwk.java b/icu4j/main/framework/src/test/java/com/ibm/icu/dev/test/TestFmwk.java index f6bf8e3c0be..067f96e6504 100644 --- a/icu4j/main/framework/src/test/java/com/ibm/icu/dev/test/TestFmwk.java +++ b/icu4j/main/framework/src/test/java/com/ibm/icu/dev/test/TestFmwk.java @@ -38,12 +38,12 @@ abstract public class TestFmwk extends AbstractTestLog { /** * The default time zone for all of our tests. Used in @Before */ - private final static TimeZone defaultTimeZone = TimeZone.getTimeZone("America/Los_Angeles"); + protected final static TimeZone defaultTimeZone = TimeZone.getTimeZone("America/Los_Angeles"); /** * The default locale used for all of our tests. Used in @Before */ - private final static Locale defaultLocale = Locale.US; + protected final static Locale defaultLocale = Locale.US; private static final String EXHAUSTIVENESS = "ICU.exhaustive"; private static final int DEFAULT_EXHAUSTIVENESS = 0; @@ -86,6 +86,9 @@ abstract public class TestFmwk extends AbstractTestLog { * Because JUnit does not guarantee the order of multiple Before * methods, TestFmwk implementation class should override this * method, instead of annotating Before. + * + *

Any implementation of the override should be sure to call + * super.localTestInitialize(). */ protected void localTestInitialize() { } @@ -94,6 +97,9 @@ abstract public class TestFmwk extends AbstractTestLog { * This method is called at the beginning of {@link #testTeardown()}. * TestFmwk implementation class should override this method, instead * of annotating After. + * + *

Any implementation of the override should be sure to call + * super.localTestTeardown(). */ protected void localTestTeardown() { }