From ea7b6f6e2a0484d6cebbe687e04b143b12cfd6ef Mon Sep 17 00:00:00 2001
From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Mon, 15 Aug 2011 10:04:28 +0300
Subject: [PATCH] #12266: move the tests in test_unicode.

---
 Lib/test/string_tests.py | 17 -----------------
 Lib/test/test_unicode.py | 19 +++++++++++++++++++
 2 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/Lib/test/string_tests.py b/Lib/test/string_tests.py
index 9cf334573d6..5931f3d88ba 100644
--- a/Lib/test/string_tests.py
+++ b/Lib/test/string_tests.py
@@ -96,23 +96,6 @@ class CommonTest(unittest.TestCase):
         self.checkequal('Aaaa', 'aaaa', 'capitalize')
         self.checkequal('Aaaa', 'AaAa', 'capitalize')
 
-        # check that titlecased chars are lowered correctly
-        # \u1ffc is the titlecased char
-        self.checkequal(u'\u1ffc\u1ff3\u1ff3\u1ff3',
-                        u'\u1ff3\u1ff3\u1ffc\u1ffc', 'capitalize')
-        # check with cased non-letter chars
-        self.checkequal(u'\u24c5\u24e8\u24e3\u24d7\u24de\u24dd',
-                        u'\u24c5\u24ce\u24c9\u24bd\u24c4\u24c3', 'capitalize')
-        self.checkequal(u'\u24c5\u24e8\u24e3\u24d7\u24de\u24dd',
-                        u'\u24df\u24e8\u24e3\u24d7\u24de\u24dd', 'capitalize')
-        self.checkequal(u'\u2160\u2171\u2172',
-                        u'\u2160\u2161\u2162', 'capitalize')
-        self.checkequal(u'\u2160\u2171\u2172',
-                        u'\u2170\u2171\u2172', 'capitalize')
-        # check with Ll chars with no upper - nothing changes here
-        self.checkequal(u'\u019b\u1d00\u1d86\u0221\u1fb7',
-                        u'\u019b\u1d00\u1d86\u0221\u1fb7', 'capitalize')
-
         self.checkraises(TypeError, 'hello', 'capitalize', 42)
 
     def test_count(self):
diff --git a/Lib/test/test_unicode.py b/Lib/test/test_unicode.py
index bd43dbc57b7..d5394e68646 100644
--- a/Lib/test/test_unicode.py
+++ b/Lib/test/test_unicode.py
@@ -269,6 +269,25 @@ class UnicodeTest(
         # Surrogates on both sides, no fixup required
         self.assertTrue(u'\ud800\udc02' < u'\ud84d\udc56')
 
+    def test_capitalize(self):
+        string_tests.CommonTest.test_capitalize(self)
+        # check that titlecased chars are lowered correctly
+        # \u1ffc is the titlecased char
+        self.checkequal(u'\u1ffc\u1ff3\u1ff3\u1ff3',
+                        u'\u1ff3\u1ff3\u1ffc\u1ffc', 'capitalize')
+        # check with cased non-letter chars
+        self.checkequal(u'\u24c5\u24e8\u24e3\u24d7\u24de\u24dd',
+                        u'\u24c5\u24ce\u24c9\u24bd\u24c4\u24c3', 'capitalize')
+        self.checkequal(u'\u24c5\u24e8\u24e3\u24d7\u24de\u24dd',
+                        u'\u24df\u24e8\u24e3\u24d7\u24de\u24dd', 'capitalize')
+        self.checkequal(u'\u2160\u2171\u2172',
+                        u'\u2160\u2161\u2162', 'capitalize')
+        self.checkequal(u'\u2160\u2171\u2172',
+                        u'\u2170\u2171\u2172', 'capitalize')
+        # check with Ll chars with no upper - nothing changes here
+        self.checkequal(u'\u019b\u1d00\u1d86\u0221\u1fb7',
+                        u'\u019b\u1d00\u1d86\u0221\u1fb7', 'capitalize')
+
     def test_islower(self):
         string_tests.MixinStrUnicodeUserStringTest.test_islower(self)
         self.checkequalnofix(False, u'\u1FFc', 'islower')