From 9449f5b4fb76c0b39589366ef0cf4245b285d762 Mon Sep 17 00:00:00 2001
From: Alan Liu <alansliu@gmail.com>
Date: Thu, 11 Mar 2004 14:06:25 +0000
Subject: [PATCH] ICU-3391 add assert* convenience overloads taking
 UnicodeString msg

X-SVN-Rev: 14684
---
 icu4c/source/test/intltest/intltest.cpp | 26 +++++++++++++++++++++++++
 icu4c/source/test/intltest/intltest.h   |  5 +++++
 2 files changed, 31 insertions(+)

diff --git a/icu4c/source/test/intltest/intltest.cpp b/icu4c/source/test/intltest/intltest.cpp
index 42c9af0c728..f10c0aca965 100644
--- a/icu4c/source/test/intltest/intltest.cpp
+++ b/icu4c/source/test/intltest/intltest.cpp
@@ -1374,6 +1374,32 @@ UBool IntlTest::assertEquals(const char* message,
     return TRUE;
 }
 
+static char ASSERT_BUF[256];
+
+static const char* extractToAssertBuf(const UnicodeString& message) {
+    message.extract(0, 0x7FFFFFFF, ASSERT_BUF, sizeof(ASSERT_BUF)-1, 0);
+    ASSERT_BUF[sizeof(ASSERT_BUF)-1] = 0;
+    return ASSERT_BUF;
+}
+
+UBool IntlTest::assertTrue(const UnicodeString& message, UBool condition) {
+    return assertTrue(extractToAssertBuf(message), condition);
+}
+
+UBool IntlTest::assertFalse(const UnicodeString& message, UBool condition) {
+    return assertFalse(extractToAssertBuf(message), condition);
+}
+
+UBool IntlTest::assertSuccess(const UnicodeString& message, UErrorCode ec) {
+    return assertSuccess(extractToAssertBuf(message), ec);
+}
+
+UBool IntlTest::assertEquals(const UnicodeString& message,
+                             const UnicodeString& expected,
+                             const UnicodeString& actual) {
+    return assertEquals(extractToAssertBuf(message), expected, actual);
+}
+
 /*
  * Hey, Emacs, please set the following:
  *
diff --git a/icu4c/source/test/intltest/intltest.h b/icu4c/source/test/intltest/intltest.h
index 425c9091641..025ad2b497f 100644
--- a/icu4c/source/test/intltest/intltest.h
+++ b/icu4c/source/test/intltest/intltest.h
@@ -136,6 +136,11 @@ protected:
     UBool assertSuccess(const char* message, UErrorCode ec);
     UBool assertEquals(const char* message, const UnicodeString& expected,
                        const UnicodeString& actual);
+    UBool assertTrue(const UnicodeString& message, UBool condition);
+    UBool assertFalse(const UnicodeString& message, UBool condition);
+    UBool assertSuccess(const UnicodeString& message, UErrorCode ec);
+    UBool assertEquals(const UnicodeString& message, const UnicodeString& expected,
+                       const UnicodeString& actual);
 
     virtual void runIndexedTest( int32_t index, UBool exec, const char* &name, char* par = NULL ); // overide !