From c8515c5cb47a92bdfba183850db76fe82b089f4c Mon Sep 17 00:00:00 2001
From: Alan Liu <alansliu@gmail.com>
Date: Thu, 28 Nov 2002 00:53:05 +0000
Subject: [PATCH] ICU-2118 more coverage

X-SVN-Rev: 10404
---
 icu4c/source/test/intltest/transtst.cpp       |  4 ++--
 icu4c/source/test/intltest/usettest.cpp       | 14 +++++++++----
 .../icu/dev/test/translit/UnicodeSetTest.java | 20 ++++++++++++-------
 3 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/icu4c/source/test/intltest/transtst.cpp b/icu4c/source/test/intltest/transtst.cpp
index 973ef962152..bd9234d1008 100644
--- a/icu4c/source/test/intltest/transtst.cpp
+++ b/icu4c/source/test/intltest/transtst.cpp
@@ -3818,7 +3818,7 @@ void TransliteratorTest::TestAllCodepoints(){
     if (t->getDynamicClassID() != cls::getStaticClassID()) { \
       errln("FAIL: " #cls " dynamic and static class ID mismatch"); \
     } \
-    t = t; /*coverage test for assignment op*/ \
+    /* *t = *t; /*can't do this: coverage test for assignment op*/ \
   } \
   delete t; \
 }
@@ -3833,7 +3833,7 @@ void TransliteratorTest::TestAllCodepoints(){
     if (t->getDynamicClassID() != cls ::getStaticClassID()) { \
       errln("FAIL: " #cls " dynamic and static class ID mismatch"); \
     } \
-    t = t; /*coverage test for assignment op*/ \
+    /* *t = *t; /*can't do this: coverage test for assignment op*/ \
   } \
   delete t; \
 }
diff --git a/icu4c/source/test/intltest/usettest.cpp b/icu4c/source/test/intltest/usettest.cpp
index a75750ca658..5b2a86c12ff 100644
--- a/icu4c/source/test/intltest/usettest.cpp
+++ b/icu4c/source/test/intltest/usettest.cpp
@@ -550,18 +550,24 @@ void UnicodeSetTest::TestAPI() {
 
     exp.applyPattern("[a-z]", status);
     if (U_FAILURE(status)) { errln("FAIL"); return; }
-    if (set.containsNone(exp)) { errln("FAIL: containsNone(UnicodeSet)"); return; }
+    if (set.containsNone(exp)) { errln("FAIL: containsNone(UnicodeSet)"); }
+    if (!set.containsSome(exp)) { errln("FAIL: containsSome(UnicodeSet)"); }
     exp.applyPattern("[aln]", status);
     if (U_FAILURE(status)) { errln("FAIL"); return; }
-    if (!set.containsNone(exp)) { errln("FAIL: containsNone(UnicodeSet)"); return; }
+    if (!set.containsNone(exp)) { errln("FAIL: containsNone(UnicodeSet)"); }
+    if (set.containsSome(exp)) { errln("FAIL: containsSome(UnicodeSet)"); }
 
     if (set.containsNone((UChar32)0x61, (UChar32)0x7A)) {
         errln("FAIL: containsNone(UChar32, UChar32)");
-        return;
+    }
+    if (!set.containsSome((UChar32)0x61, (UChar32)0x7A)) {
+        errln("FAIL: containsSome(UChar32, UChar32)");
     }
     if (!set.containsNone((UChar32)0x41, (UChar32)0x5A)) {
         errln("FAIL: containsNone(UChar32, UChar32)");
-        return;
+    }
+    if (set.containsSome((UChar32)0x41, (UChar32)0x5A)) {
+        errln("FAIL: containsSome(UChar32, UChar32)");
     }
 
     set.removeAll("liu");
diff --git a/icu4j/src/com/ibm/icu/dev/test/translit/UnicodeSetTest.java b/icu4j/src/com/ibm/icu/dev/test/translit/UnicodeSetTest.java
index c9757cea4d5..9518baee83c 100755
--- a/icu4j/src/com/ibm/icu/dev/test/translit/UnicodeSetTest.java
+++ b/icu4j/src/com/ibm/icu/dev/test/translit/UnicodeSetTest.java
@@ -5,8 +5,8 @@
  *******************************************************************************
  *
  * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/dev/test/translit/UnicodeSetTest.java,v $ 
- * $Date: 2002/11/26 18:31:56 $ 
- * $Revision: 1.36 $
+ * $Date: 2002/11/28 00:53:05 $ 
+ * $Revision: 1.37 $
  *
  *****************************************************************************************
  */
@@ -478,17 +478,23 @@ public class UnicodeSetTest extends TestFmwk {
         if (!set.equals(exp)) { errln("FAIL: complementAll(\"alan\")"); return; }
 
         exp.applyPattern("[a-z]");
-        if (set.containsNone(exp)) { errln("FAIL: containsNone(UnicodeSet)"); return; }
+        if (set.containsNone(exp)) { errln("FAIL: containsNone(UnicodeSet)"); }
+        if (!set.containsSome(exp)) { errln("FAIL: containsSome(UnicodeSet)"); }
         exp.applyPattern("[aln]");
-        if (!set.containsNone(exp)) { errln("FAIL: containsNone(UnicodeSet)"); return; }
-
+        if (!set.containsNone(exp)) { errln("FAIL: containsNone(UnicodeSet)"); }
+        if (set.containsSome(exp)) { errln("FAIL: containsSome(UnicodeSet)"); }
+        
         if (set.containsNone((char)0x61, (char)0x7A)) {
             errln("FAIL: containsNone(char, char)");
-            return;
+        }
+        if (!set.containsSome((char)0x61, (char)0x7A)) {
+            errln("FAIL: containsSome(char, char)");
         }
         if (!set.containsNone((char)0x41, (char)0x5A)) {
             errln("FAIL: containsNone(char, char)");
-            return;
+        }
+        if (set.containsSome((char)0x41, (char)0x5A)) {
+            errln("FAIL: containsSome(char, char)");
         }
 
         set.removeAll("liu");