ICU-22326 BRS74 clean up import statements

See #2685
unicode-org · Oct 26, 2023 · 1caf1c9 · 1caf1c9
1 parent 97e2f3b
commit 1caf1c9
Show file tree

Hide file tree

Showing 161 changed files with 170 additions and 313 deletions.
diff --git a/...main/common_tests/src/test/java/com/ibm/icu/dev/test/calendar/DataDrivenCalendarTest.java b/...main/common_tests/src/test/java/com/ibm/icu/dev/test/calendar/DataDrivenCalendarTest.java
@@ -8,15 +8,14 @@
  */
 package com.ibm.icu.dev.test.calendar;
 
-import com.ibm.icu.dev.test.CoreTestFmwk;
 import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
 
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import com.ibm.icu.dev.test.CoreTestFmwk;
 import com.ibm.icu.dev.test.ModuleTest;
 import com.ibm.icu.dev.test.ModuleTest.TestDataPair;
 import com.ibm.icu.dev.test.TestDataModule;

diff --git a/...main/common_tests/src/test/java/com/ibm/icu/dev/test/format/CompactDecimalFormatTest.java b/...main/common_tests/src/test/java/com/ibm/icu/dev/test/format/CompactDecimalFormatTest.java
@@ -8,7 +8,6 @@
  */
 package com.ibm.icu.dev.test.format;
 
-import com.ibm.icu.dev.test.CoreTestFmwk;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -29,6 +28,7 @@
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
+import com.ibm.icu.dev.test.CoreTestFmwk;
 import com.ibm.icu.impl.number.DecimalFormatProperties;
 import com.ibm.icu.impl.number.PatternStringParser;
 import com.ibm.icu.text.CompactDecimalFormat;

diff --git a/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/format/DataDrivenFormatTest.java b/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/format/DataDrivenFormatTest.java
@@ -8,17 +8,16 @@
  */
 package com.ibm.icu.dev.test.format;
 
-import com.ibm.icu.dev.test.CoreTestFmwk;
 import java.text.FieldPosition;
 import java.text.ParsePosition;
 import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
 
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import com.ibm.icu.dev.test.CoreTestFmwk;
 import com.ibm.icu.dev.test.ModuleTest;
 import com.ibm.icu.dev.test.ModuleTest.TestDataPair;
 import com.ibm.icu.dev.test.TestDataModule;

diff --git a/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/format/DateFormatTest.java b/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/format/DateFormatTest.java
@@ -14,7 +14,6 @@
 
 package com.ibm.icu.dev.test.format;
 
-import com.ibm.icu.dev.test.CoreTestFmwk;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -37,12 +36,11 @@
 import java.util.ResourceBundle;
 import java.util.Set;
 
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
-import com.ibm.icu.dev.test.TestFmwk;
+import com.ibm.icu.dev.test.CoreTestFmwk;
 import com.ibm.icu.impl.ICUData;
 import com.ibm.icu.impl.ICUResourceBundle;
 import com.ibm.icu.text.ChineseDateFormat;

diff --git a/...ain/common_tests/src/test/java/com/ibm/icu/dev/test/format/IntlTestDecimalFormatAPIC.java b/...ain/common_tests/src/test/java/com/ibm/icu/dev/test/format/IntlTestDecimalFormatAPIC.java
@@ -14,7 +14,6 @@
 
 package com.ibm.icu.dev.test.format;
 
-import com.ibm.icu.dev.test.CoreTestFmwk;
 import java.text.AttributedCharacterIterator;
 import java.text.FieldPosition;
 import java.text.Format;
@@ -28,7 +27,7 @@
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
-import com.ibm.icu.dev.test.TestFmwk;
+import com.ibm.icu.dev.test.CoreTestFmwk;
 import com.ibm.icu.text.CurrencyPluralInfo;
 import com.ibm.icu.text.DecimalFormat;
 import com.ibm.icu.text.DecimalFormatSymbols;

diff --git a/...common_tests/src/test/java/com/ibm/icu/dev/test/format/IntlTestDecimalFormatSymbolsC.java b/...common_tests/src/test/java/com/ibm/icu/dev/test/format/IntlTestDecimalFormatSymbolsC.java
@@ -14,15 +14,14 @@
 
 package com.ibm.icu.dev.test.format;
 
-import com.ibm.icu.dev.test.CoreTestFmwk;
 import java.text.FieldPosition;
 import java.util.Locale;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
-import com.ibm.icu.dev.test.TestFmwk;
+import com.ibm.icu.dev.test.CoreTestFmwk;
 import com.ibm.icu.text.DecimalFormat;
 import com.ibm.icu.text.DecimalFormatSymbols;
 

diff --git a/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/format/MeasureUnitTest.java b/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/format/MeasureUnitTest.java
@@ -8,7 +8,6 @@
  */
 package com.ibm.icu.dev.test.format;
 
-import com.ibm.icu.dev.test.CoreTestFmwk;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -36,7 +35,7 @@
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
-import com.ibm.icu.dev.test.TestFmwk;
+import com.ibm.icu.dev.test.CoreTestFmwk;
 import com.ibm.icu.dev.test.serializable.FormatHandler;
 import com.ibm.icu.dev.test.serializable.SerializableTestUtility;
 import com.ibm.icu.impl.Pair;

diff --git a/...in/common_tests/src/test/java/com/ibm/icu/dev/test/format/NumberFormatRegressionTest.java b/...in/common_tests/src/test/java/com/ibm/icu/dev/test/format/NumberFormatRegressionTest.java
@@ -14,7 +14,6 @@
 
 package com.ibm.icu.dev.test.format;
 
-import com.ibm.icu.dev.test.CoreTestFmwk;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.ObjectInputStream;
@@ -27,7 +26,7 @@
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
-import com.ibm.icu.dev.test.TestFmwk;
+import com.ibm.icu.dev.test.CoreTestFmwk;
 import com.ibm.icu.text.DateFormat;
 import com.ibm.icu.text.DecimalFormat;
 import com.ibm.icu.text.DecimalFormatSymbols;

diff --git a/...common_tests/src/test/java/com/ibm/icu/dev/test/format/NumberFormatSpecificationTest.java b/...common_tests/src/test/java/com/ibm/icu/dev/test/format/NumberFormatSpecificationTest.java
@@ -8,12 +8,11 @@
  */
 package com.ibm.icu.dev.test.format;
 
-import com.ibm.icu.dev.test.CoreTestFmwk;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
-import com.ibm.icu.dev.test.TestFmwk;
+import com.ibm.icu.dev.test.CoreTestFmwk;
 import com.ibm.icu.text.DecimalFormat;
 import com.ibm.icu.text.DecimalFormatSymbols;
 import com.ibm.icu.text.NumberFormat;

diff --git a/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/format/PluralRangesTest.java b/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/format/PluralRangesTest.java
@@ -8,14 +8,13 @@
  */
 package com.ibm.icu.dev.test.format;
 
-import com.ibm.icu.dev.test.CoreTestFmwk;
 import java.util.Arrays;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
-import com.ibm.icu.dev.test.TestFmwk;
+import com.ibm.icu.dev.test.CoreTestFmwk;
 import com.ibm.icu.impl.SimpleFormatterImpl;
 import com.ibm.icu.impl.StandardPlural;
 import com.ibm.icu.impl.number.range.StandardPluralRanges;

diff --git a/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/format/PluralRulesTest.java b/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/format/PluralRulesTest.java
@@ -8,7 +8,6 @@
  */
 package com.ibm.icu.dev.test.format;
 
-import com.ibm.icu.dev.test.CoreTestFmwk;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -43,7 +42,7 @@
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
-import com.ibm.icu.dev.test.TestFmwk;
+import com.ibm.icu.dev.test.CoreTestFmwk;
 import com.ibm.icu.dev.test.serializable.SerializableTestUtility;
 import com.ibm.icu.dev.util.CollectionUtilities;
 import com.ibm.icu.impl.Relation;

diff --git a/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/format/RbnfTest.java b/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/format/RbnfTest.java
@@ -8,7 +8,6 @@
  */
 package com.ibm.icu.dev.test.format;
 
-import com.ibm.icu.dev.test.CoreTestFmwk;
 import java.math.BigInteger;
 import java.text.ParseException;
 import java.util.Locale;
@@ -18,7 +17,7 @@
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
-import com.ibm.icu.dev.test.TestFmwk;
+import com.ibm.icu.dev.test.CoreTestFmwk;
 import com.ibm.icu.math.BigDecimal;
 import com.ibm.icu.text.DecimalFormat;
 import com.ibm.icu.text.DecimalFormatSymbols;

diff --git a/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/format/TestMessageFormat.java b/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/format/TestMessageFormat.java
@@ -27,7 +27,6 @@
 import java.util.Set;
 import java.util.TreeMap;
 
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;

diff --git a/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/format/TimeZoneFormatTest.java b/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/format/TimeZoneFormatTest.java
@@ -9,7 +9,6 @@
 
 package com.ibm.icu.dev.test.format;
 
-import com.ibm.icu.dev.test.CoreTestFmwk;
 import java.text.FieldPosition;
 import java.text.ParseException;
 import java.text.ParsePosition;
@@ -30,6 +29,7 @@
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
+import com.ibm.icu.dev.test.CoreTestFmwk;
 import com.ibm.icu.dev.test.TestFmwk;
 import com.ibm.icu.impl.TZDBTimeZoneNames;
 import com.ibm.icu.impl.ZoneMeta;

diff --git a/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/message2/Mf2FeaturesTest.java b/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/message2/Mf2FeaturesTest.java
@@ -7,7 +7,6 @@
 import java.util.Locale;
 import java.util.Map;
 
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;

diff --git a/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/number/NumberParserTest.java b/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/number/NumberParserTest.java
@@ -2,10 +2,10 @@
 // License & terms of use: http://www.unicode.org/copyright.html
 package com.ibm.icu.dev.test.number;
 
-import com.ibm.icu.dev.test.CoreTestFmwk;
 import org.junit.Assert;
 import org.junit.Test;
 
+import com.ibm.icu.dev.test.CoreTestFmwk;
 import com.ibm.icu.impl.StringSegment;
 import com.ibm.icu.impl.number.CustomSymbolCurrency;
 import com.ibm.icu.impl.number.DecimalFormatProperties;

diff --git a/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/number/PatternStringTest.java b/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/number/PatternStringTest.java
@@ -2,12 +2,9 @@
 // License & terms of use: http://www.unicode.org/copyright.html
 package com.ibm.icu.dev.test.number;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
-import com.ibm.icu.dev.test.CoreTestFmwk;
 import org.junit.Test;
 
+import com.ibm.icu.dev.test.CoreTestFmwk;
 import com.ibm.icu.dev.test.format.FormattedValueTest;
 import com.ibm.icu.impl.number.DecimalFormatProperties;
 import com.ibm.icu.impl.number.MacroProps;

diff --git a/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/number/PropertiesTest.java b/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/number/PropertiesTest.java
@@ -2,12 +2,6 @@
 // License & terms of use: http://www.unicode.org/copyright.html
 package com.ibm.icu.dev.test.number;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import com.ibm.icu.dev.test.CoreTestFmwk;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -29,6 +23,7 @@
 
 import org.junit.Test;
 
+import com.ibm.icu.dev.test.CoreTestFmwk;
 import com.ibm.icu.dev.test.serializable.SerializableTestUtility;
 import com.ibm.icu.impl.number.DecimalFormatProperties;
 import com.ibm.icu.impl.number.DecimalFormatProperties.ParseMode;

diff --git a/.../main/common_tests/src/test/java/com/ibm/icu/dev/test/serializable/CompatibilityTest.java b/.../main/common_tests/src/test/java/com/ibm/icu/dev/test/serializable/CompatibilityTest.java
@@ -23,7 +23,6 @@
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
 
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 

diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/CoreTestFmwk.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/CoreTestFmwk.java
@@ -3,10 +3,11 @@
 
 package com.ibm.icu.dev.test;
 
-import com.ibm.icu.util.ULocale;
 import org.junit.Rule;
 import org.junit.rules.TestName;
 
+import com.ibm.icu.util.ULocale;
+
 /**
  * A base class for testing within the cross-component tests in the `common_tests` component.
  *

diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/bidi/BiDiConformanceTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/bidi/BiDiConformanceTest.java
@@ -8,15 +8,14 @@
  */
 package com.ibm.icu.dev.test.bidi;
 
-import com.ibm.icu.dev.test.CoreTestFmwk;
 import java.io.BufferedReader;
 import java.io.IOException;
 
 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.lang.UCharacterDirection;
 import com.ibm.icu.text.Bidi;

diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/bidi/BidiFmwk.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/bidi/BidiFmwk.java
@@ -9,10 +9,9 @@
 
 package com.ibm.icu.dev.test.bidi;
 
-import com.ibm.icu.dev.test.CoreTestFmwk;
 import java.util.Arrays;
 
-import com.ibm.icu.dev.test.TestFmwk;
+import com.ibm.icu.dev.test.CoreTestFmwk;
 import com.ibm.icu.impl.Utility;
 import com.ibm.icu.lang.UCharacter;
 import com.ibm.icu.text.Bidi;

diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/bidi/TestBidiTransform.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/bidi/TestBidiTransform.java
@@ -3,12 +3,11 @@
 
 package com.ibm.icu.dev.test.bidi;
 
-import com.ibm.icu.dev.test.CoreTestFmwk;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
-import com.ibm.icu.dev.test.TestFmwk;
+import com.ibm.icu.dev.test.CoreTestFmwk;
 import com.ibm.icu.lang.UCharacter;
 import com.ibm.icu.text.ArabicShaping;
 import com.ibm.icu.text.Bidi;

diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/bigdec/DiagBigDecimalTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/bigdec/DiagBigDecimalTest.java
@@ -11,13 +11,13 @@
 /* The generated code has been manually modified. */
 package com.ibm.icu.dev.test.bigdec;
 
-import com.ibm.icu.dev.test.CoreTestFmwk;
 import java.math.BigInteger;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
+import com.ibm.icu.dev.test.CoreTestFmwk;
 import com.ibm.icu.dev.test.TestFmwk;
 import com.ibm.icu.dev.test.TestUtil;
 import com.ibm.icu.dev.test.TestUtil.JavaVendor;

diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/calendar/AstroTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/calendar/AstroTest.java
@@ -8,17 +8,16 @@
  */
 package com.ibm.icu.dev.test.calendar;
 
-// AstroTest
-
-import com.ibm.icu.dev.test.CoreTestFmwk;
 import java.util.Date;
 import java.util.Locale;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
-import com.ibm.icu.dev.test.TestFmwk;
+// AstroTest
+
+import com.ibm.icu.dev.test.CoreTestFmwk;
 import com.ibm.icu.impl.CalendarAstronomer;
 import com.ibm.icu.impl.CalendarAstronomer.Ecliptic;
 import com.ibm.icu.impl.CalendarAstronomer.Equatorial;