X-Git-Url: https://git.saurik.com/apple/icu.git/blobdiff_plain/73c04bcfe1096173b00431f0cdc742894b15eef0..1546d4af2ed1219a41ef4170bf188f2ab91442e6:/icuSources/test/intltest/ustrtest.h

diff --git a/icuSources/test/intltest/ustrtest.h b/icuSources/test/intltest/ustrtest.h
index c3f9f399..4ba348c4 100644
--- a/icuSources/test/intltest/ustrtest.h
+++ b/icuSources/test/intltest/ustrtest.h
@@ -1,16 +1,24 @@
+// © 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html
 /********************************************************************
  * COPYRIGHT: 
- * Copyright (c) 1997-2005, International Business Machines Corporation and
+ * Copyright (c) 1997-2015, International Business Machines Corporation and
  * others. All Rights Reserved.
  ********************************************************************/
 
 #ifndef UNICODESTRINGTEST_H
 #define UNICODESTRINGTEST_H
 
+#include "unicode/locid.h"
 #include "unicode/unistr.h"
-#include "unicode/ubrk.h"
 #include "intltest.h"
 
+U_NAMESPACE_BEGIN
+
+class Appendable;
+
+U_NAMESPACE_END
+
 /**
  * Perform API and functionality tests for class UnicodeString
  **/
@@ -49,6 +57,7 @@ public:
      * Test methods startsWith and endsWith
      **/
     void TestPrefixAndSuffix(void);
+    void TestStartsWithAndEndsWithNulTerminated();
     /**
      * Test method findAndReplace
      **/
@@ -71,32 +80,22 @@ public:
     void TestUnescape(void);
 
     void _testUnicodeStringHasMoreChar32Than(const UnicodeString &s, int32_t start, int32_t length, int32_t number);
-    void TestCountChar32(void);
+    void TestCountChar32();
     void TestBogus();
     void TestStringEnumeration();
-    void TestCharString(void);
-};
+    void TestNameSpace();
+    void TestUTF32();
+    void TestUTF8();
+    void TestReadOnlyAlias();
+    void doTestAppendable(UnicodeString &dest, Appendable &app);
+    void TestAppendable();
+    void TestUnicodeStringImplementsAppendable();
+    void TestSizeofUnicodeString();
+    void TestMoveSwap();
 
-class StringCaseTest: public IntlTest {
-public:
-    StringCaseTest() {}
-    virtual ~StringCaseTest();
-    
-    void runIndexedTest(int32_t index, UBool exec, const char *&name, char *par=0);
-
-    void TestCaseConversion();
-
-    void TestCasingImpl(const UnicodeString &input,
-                        const UnicodeString &output,
-                        int32_t whichCase,
-                        const char *localeID, uint32_t options);
-#if !UCONFIG_NO_BREAK_ITERATION
-    void TestTitleCasing(const UnicodeString &input,
-                         const UnicodeString &output,
-                         const char *localeID,
-                         UBreakIterator *iter);
-#endif
-    void TestCasing();
+    void TestUInt16Pointers();
+    void TestWCharPointers();
+    void TestNullPointers();
 };
 
 #endif