ICU-8022 Merged changes for ticket#8207 - r29141 and r29146 for fixing spoof data and its test case.

X-SVN-Rev: 29147
diff --git a/main/shared/data/icudata.jar b/main/shared/data/icudata.jar
index 28c458e..2cf30e0 100755
--- a/main/shared/data/icudata.jar
+++ b/main/shared/data/icudata.jar
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e7173c5e28c013476e278b4081d3d49fff317667dc0f685b70d0b70014277657
-size 6738723
+oid sha256:825165788d76967aab56f25fb93bc469288b1ae58ba506cfc3f4327453344daf
+size 6738729
diff --git a/main/tests/core/src/com/ibm/icu/dev/test/text/SpoofCheckerTest.java b/main/tests/core/src/com/ibm/icu/dev/test/text/SpoofCheckerTest.java
index 1811028..b8102fc 100644
--- a/main/tests/core/src/com/ibm/icu/dev/test/text/SpoofCheckerTest.java
+++ b/main/tests/core/src/com/ibm/icu/dev/test/text/SpoofCheckerTest.java
@@ -272,10 +272,8 @@
         TEST_ASSERT_EQ(SpoofChecker.CHAR_LIMIT, result.checks);
 
         checkResults = sc.check(goodGreek, result);
-        if (false) {   // Ticket 8054.  Understand why this is different from ICU4C.
-            TEST_ASSERT(checkResults);
-            TEST_ASSERT_EQ(SpoofChecker.WHOLE_SCRIPT_CONFUSABLE, result.checks);
-        }
+        TEST_ASSERT(checkResults);
+        TEST_ASSERT_EQ(SpoofChecker.WHOLE_SCRIPT_CONFUSABLE, result.checks);
         teardown();
     }