From b3365b405a053bed84d8316fb01caeda66d125c4 Mon Sep 17 00:00:00 2001
From: Markus Scherer <markus.icu@gmail.com>
Date: Thu, 15 Dec 2011 16:57:46 +0000
Subject: [PATCH] ICU-7973 fix & rename skipIfBeforeICU() ->
 isICUVersionBefore() & isICUVersionAtLeast()

X-SVN-Rev: 31121
---
 .../ibm/icu/dev/test/search/SearchTest.java   |  4 +-
 .../test/format/DateTimeGeneratorTest.java    |  2 +-
 .../com/ibm/icu/dev/test/AbstractTestLog.java | 37 +++++++++++++------
 .../icu/dev/test/translit/RoundTripTest.java  |  2 +-
 4 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/icu4j/main/tests/collate/src/com/ibm/icu/dev/test/search/SearchTest.java b/icu4j/main/tests/collate/src/com/ibm/icu/dev/test/search/SearchTest.java
index e88ce5b0297..e6b6f2174e4 100644
--- a/icu4j/main/tests/collate/src/com/ibm/icu/dev/test/search/SearchTest.java
+++ b/icu4j/main/tests/collate/src/com/ibm/icu/dev/test/search/SearchTest.java
@@ -1790,7 +1790,7 @@ public class SearchTest extends TestFmwk {
     }
 
     public void TestSupplementary() {
-        if (skipIfBeforeICU(49,0,2)) { // ticket#8080
+        if (isICUVersionBefore(49, 1)) { // ticket#8080
             return;
         }
         int count = 0;
@@ -1803,7 +1803,7 @@ public class SearchTest extends TestFmwk {
     }
 
     public void TestSupplementaryCanonical() {
-        if (skipIfBeforeICU(49,0,2)) { // ticket#8080
+        if (isICUVersionBefore(49, 1)) { // ticket#8080
             return;
         }
         int count = 0;
diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/DateTimeGeneratorTest.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/DateTimeGeneratorTest.java
index 5cf4d1d319d..db618bc3ee6 100644
--- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/DateTimeGeneratorTest.java
+++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/DateTimeGeneratorTest.java
@@ -551,7 +551,7 @@ public class DateTimeGeneratorTest extends TestFmwk {
         DateOrder order2 = getOrdering(style2, uLocale);
         if (!order1.hasSameOrderAs(order2)) {
             if (order1.monthLength == order2.monthLength) { // error if have same month length, different ordering
-                if (skipIfBeforeICU(49,0,2)) { // ticket#6806
+                if (isICUVersionBefore(49, 1)) { // ticket#6806
                     logln(showOrderComparison(uLocale, style1, style2, order1, order2));
                 } else {
                     errln(showOrderComparison(uLocale, style1, style2, order1, order2));
diff --git a/icu4j/main/tests/framework/src/com/ibm/icu/dev/test/AbstractTestLog.java b/icu4j/main/tests/framework/src/com/ibm/icu/dev/test/AbstractTestLog.java
index 6e40cf38059..f2b3d16d0c8 100644
--- a/icu4j/main/tests/framework/src/com/ibm/icu/dev/test/AbstractTestLog.java
+++ b/icu4j/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.
      */
diff --git a/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/translit/RoundTripTest.java b/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/translit/RoundTripTest.java
index 5f5244b3bfd..14536fbb995 100644
--- a/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/translit/RoundTripTest.java
+++ b/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/translit/RoundTripTest.java
@@ -82,7 +82,7 @@ public class RoundTripTest extends TestFmwk {
     public void init() {
         // TODO(Mark): Fix ticket #8989, transliterate U+0970.
         // Remove this method?
-        beforeICU49 = skipIfBeforeICU(49, 0, 2);  // actually tests <= 49m2 not <
+        beforeICU49 = isICUVersionBefore(49, 1);
         minusDevAbbBefore49 = beforeICU49 ? "-[\u0970]" : "";
     }
 
-- 
2.40.0