From c4451727911d1b9415e11c93e6d53920d31aea2d Mon Sep 17 00:00:00 2001
From: Vladimir Weinstein <icu@weivsara.com>
Date: Tue, 6 Jan 2004 22:20:45 +0000
Subject: [PATCH] ICU-3480 update tests

X-SVN-Rev: 14242
---
 .../com/ibm/icu/dev/test/collator/CollationEnglishTest.java | 4 ++--
 .../com/ibm/icu/dev/test/collator/CollationFinnishTest.java | 2 +-
 .../com/ibm/icu/dev/test/collator/CollationMiscTest.java    | 2 +-
 icu4j/src/com/ibm/icu/dev/test/collator/TestAll.java        | 6 +++---
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/icu4j/src/com/ibm/icu/dev/test/collator/CollationEnglishTest.java b/icu4j/src/com/ibm/icu/dev/test/collator/CollationEnglishTest.java
index f18b54b4c3..6e62531f1f 100644
--- a/icu4j/src/com/ibm/icu/dev/test/collator/CollationEnglishTest.java
+++ b/icu4j/src/com/ibm/icu/dev/test/collator/CollationEnglishTest.java
@@ -232,10 +232,10 @@ public class CollationEnglishTest extends TestFmwk{
 
     private static char[][] testMore = {
         {0x0061 /* 'a' */, 0x0065 /* 'e' */},
-        {0x0061 /* 'a' */, 0x0066 /* 'f' */},
         { 0x00E6},
         { 0x00C6},
-        {0x006F /* 'o' */, 0x0065 /* 'e' */},
+        {0x0061 /* 'a' */, 0x0066 /* 'f' */},
+		{0x006F /* 'o' */, 0x0065 /* 'e' */},
         { 0x0153},
         { 0x0152},
         {0x006F /* 'o' */, 0x0066 /* 'f' */},
diff --git a/icu4j/src/com/ibm/icu/dev/test/collator/CollationFinnishTest.java b/icu4j/src/com/ibm/icu/dev/test/collator/CollationFinnishTest.java
index 3bfcedfc63..c44004398c 100644
--- a/icu4j/src/com/ibm/icu/dev/test/collator/CollationFinnishTest.java
+++ b/icu4j/src/com/ibm/icu/dev/test/collator/CollationFinnishTest.java
@@ -48,7 +48,7 @@ public class CollationFinnishTest extends TestFmwk {
         1,
         -1,
         // test primary > 4
-        0,
+        1,
     };
 
     private Collator myCollation = null;
diff --git a/icu4j/src/com/ibm/icu/dev/test/collator/CollationMiscTest.java b/icu4j/src/com/ibm/icu/dev/test/collator/CollationMiscTest.java
index 8372d6bb57..17e75b3dff 100644
--- a/icu4j/src/com/ibm/icu/dev/test/collator/CollationMiscTest.java
+++ b/icu4j/src/com/ibm/icu/dev/test/collator/CollationMiscTest.java
@@ -1091,7 +1091,7 @@ public class CollationMiscTest extends TestFmwk{
         }
     }
     
-    public void TestJ831() {
+    public void DontTestJ831() { // Latvian does not use upper first
         String[] data = {
             "I",
             "i",
diff --git a/icu4j/src/com/ibm/icu/dev/test/collator/TestAll.java b/icu4j/src/com/ibm/icu/dev/test/collator/TestAll.java
index 8bd7765bf0..adde5262b0 100644
--- a/icu4j/src/com/ibm/icu/dev/test/collator/TestAll.java
+++ b/icu4j/src/com/ibm/icu/dev/test/collator/TestAll.java
@@ -5,8 +5,8 @@
  *******************************************************************************
  *
  * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/dev/test/collator/TestAll.java,v $
- * $Date: 2003/11/21 04:22:59 $
- * $Revision: 1.6 $
+ * $Date: 2004/01/06 22:20:44 $
+ * $Revision: 1.7 $
  *
  *****************************************************************************************
  */
@@ -28,7 +28,7 @@ public class TestAll extends TestGroup {
                   "CollationTest",
                   "CollationAPITest",
                   "CollationCurrencyTest",
-                  "CollationDanishTest",
+                  //"CollationDanishTest", //Danish is already tested through data driven tests
                   "CollationDummyTest",
                   "CollationEnglishTest",
                   "CollationFinnishTest",