ICU-531.31.tar.gz

[apple/icu.git] / icuSources / test / intltest / trcoll.cpp

diff --git a/icuSources/test/intltest/trcoll.cpp b/icuSources/test/intltest/trcoll.cpp
index 70d5d33487671713ebe6de6f7dc40d3b98a6929e..ee042c01d961d4cf31e54030fa705c53d180f130 100644 (file)
--- a/icuSources/test/intltest/trcoll.cpp
+++ b/icuSources/test/intltest/trcoll.cpp
@@ -1,33 +1,18 @@
 /********************************************************************
  * COPYRIGHT: 
- * Copyright (c) 1997-2003, International Business Machines Corporation and
+ * Copyright (c) 1997-2009, International Business Machines Corporation and
  * others. All Rights Reserved.
  ********************************************************************/
 
-#include "unicode/utypes.h"
+#include "unicode/unistr.h"
 
 #if !UCONFIG_NO_COLLATION
 
-#ifndef _COLL
+#include "unicode/tstdtmod.h"
 #include "unicode/coll.h"
-#endif
-
-#ifndef _TBLCOLL
 #include "unicode/tblcoll.h"
-#endif
-
-#ifndef _UNISTR
-#include "unicode/unistr.h"
-#endif
-
-#ifndef _SORTKEY
 #include "unicode/sortkey.h"
-#endif
-
-#ifndef _TRCOLL
 #include "trcoll.h"
-#endif
-
 #include "sfwdchit.h"
 
 CollationTurkishTest::CollationTurkishTest()
@@ -107,8 +92,8 @@ void CollationTurkishTest::runIndexedTest( int32_t index, UBool exec, const char
     if (exec) logln("TestSuite CollationTurkishTest: ");
 
     if((!myCollation) && exec) {
-      errln(__FILE__ " cannot test - failed to create collator.");
-      name = "";
+      dataerrln(__FILE__ " cannot test - failed to create collator.");
+      name = "some test";
       return;
     }
     switch (index) {