Upgrade ICU4J.

[Dictionary.git] / jars / icu4j-52_1 / main / tests / framework / src / com / ibm / icu / dev / test / AbstractTestLog.java

diff --git a/jars/icu4j-4_8_1_1/main/tests/framework/src/com/ibm/icu/dev/test/AbstractTestLog.java b/jars/icu4j-52_1/main/tests/framework/src/com/ibm/icu/dev/test/AbstractTestLog.java
similarity index 74%
rename from jars/icu4j-4_8_1_1/main/tests/framework/src/com/ibm/icu/dev/test/AbstractTestLog.java
rename to jars/icu4j-52_1/main/tests/framework/src/com/ibm/icu/dev/test/AbstractTestLog.java
index 6e40cf38059d1019aec954c401875dc3c27cb758..f2b3d16d0c8b06eb6b53d38e99a6cd5076ec9b76 100644 (file)
--- a/jars/icu4j-4_8_1_1/main/tests/framework/src/com/ibm/icu/dev/test/AbstractTestLog.java
+++ b/jars/icu4j-52_1/main/tests/framework/src/com/ibm/icu/dev/test/AbstractTestLog.java
@@ -1,7 +1,7 @@
 /**
  *******************************************************************************
- * Copyright (C) 2003-2010, International Business Machines Corporation and         *
- * others. All Rights Reserved.                                                *
+ * Copyright (C) 2003-2011, International Business Machines Corporation and
+ * others. All Rights Reserved.
  *******************************************************************************
  */
 package com.ibm.icu.dev.test;
@@ -13,21 +13,34 @@ import java.util.GregorianCalendar;
 import com.ibm.icu.util.VersionInfo;
 
 public abstract class AbstractTestLog implements TestLog {
+    /**
+     * Returns true if ICU_Version < major.minor.
+     */
+    static public boolean isICUVersionBefore(int major, int minor) {
+        return isICUVersionBefore(major, minor, 0);
+    }
+
+    /**
+     * Returns true if ICU_Version < major.minor.milli.
+     */
+    static public boolean isICUVersionBefore(int major, int minor, int milli) {
+        return VersionInfo.ICU_VERSION.compareTo(VersionInfo.getInstance(major, minor, milli)) < 0;
+    }
+
+    /**
+     * Returns true if ICU_Version >= major.minor.
+     */
+    static public boolean isICUVersionAtLeast(int major, int minor) {
+        return isICUVersionAtLeast(major, minor, 0);
+    }
 
-    public static boolean dontSkipForVersion = false;
     /**
-     * Returns true if the current ICU version is before, or equal to, the specified major.minor.micro version.
-     * TODO: Why is this called "before" when it returns true for "before or equal"? Can we fix it?
+     * Returns true if ICU_Version >= major.minor.milli.
      */
-    public boolean skipIfBeforeICU(int major, int minor, int micro) {
-        if (dontSkipForVersion || VersionInfo.ICU_VERSION.compareTo(VersionInfo.getInstance(major, minor, micro)) > 0) {
-            return false;
-        } 
-        logln("Test skipped before ICU release " + major + "." + minor + "." + micro);
-        return true;
+    static public boolean isICUVersionAtLeast(int major, int minor, int milli) {
+        return !isICUVersionBefore(major, minor, milli);
     }
 
-    
     /**
      * Add a message.
      */