[Python-checkins] cpython (2.7): Use non-zero and non-last positions in error handler tests.

[serhiy.storchaka]

https://hg.python.org/cpython/rev/0b44c749ae51
changeset:   95004:0b44c749ae51
branch:      2.7
parent:      94999:5bd3d48e7a2f
user:        Serhiy Storchaka <storchaka at gmail.com>
date:        Mon Mar 16 08:29:35 2015 +0200
summary:
  Use non-zero and non-last positions in error handler tests.

files:
  Lib/test/test_codeccallbacks.py |  40 ++++++++++++--------
  1 files changed, 24 insertions(+), 16 deletions(-)


diff --git a/Lib/test/test_codeccallbacks.py b/Lib/test/test_codeccallbacks.py
--- a/Lib/test/test_codeccallbacks.py
+++ b/Lib/test/test_codeccallbacks.py
@@ -467,16 +467,19 @@
         )
         # If the correct exception is passed in, "ignore" returns an empty replacement
         self.assertEqual(
-            codecs.ignore_errors(UnicodeEncodeError("ascii", u"\u3042", 0, 1, "ouch")),
-            (u"", 1)
+            codecs.ignore_errors(
+                UnicodeEncodeError("ascii", u"a\u3042b", 1, 2, "ouch")),
+            (u"", 2)
         )
         self.assertEqual(
-            codecs.ignore_errors(UnicodeDecodeError("ascii", "\xff", 0, 1, "ouch")),
-            (u"", 1)
+            codecs.ignore_errors(
+                UnicodeDecodeError("ascii", "a\xffb", 1, 2, "ouch")),
+            (u"", 2)
         )
         self.assertEqual(
-            codecs.ignore_errors(UnicodeTranslateError(u"\u3042", 0, 1, "ouch")),
-            (u"", 1)
+            codecs.ignore_errors(
+                UnicodeTranslateError(u"a\u3042b", 1, 2, "ouch")),
+            (u"", 2)
         )
 
     def test_badandgoodreplaceexceptions(self):
@@ -504,16 +507,19 @@
         )
         # With the correct exception, "replace" returns an "?" or u"\ufffd" replacement
         self.assertEqual(
-            codecs.replace_errors(UnicodeEncodeError("ascii", u"\u3042", 0, 1, "ouch")),
-            (u"?", 1)
+            codecs.replace_errors(
+                UnicodeEncodeError("ascii", u"a\u3042b", 1, 2, "ouch")),
+            (u"?", 2)
         )
         self.assertEqual(
-            codecs.replace_errors(UnicodeDecodeError("ascii", "\xff", 0, 1, "ouch")),
-            (u"\ufffd", 1)
+            codecs.replace_errors(
+                UnicodeDecodeError("ascii", "a\xffb", 1, 2, "ouch")),
+            (u"\ufffd", 2)
         )
         self.assertEqual(
-            codecs.replace_errors(UnicodeTranslateError(u"\u3042", 0, 1, "ouch")),
-            (u"\ufffd", 1)
+            codecs.replace_errors(
+                UnicodeTranslateError(u"a\u3042b", 1, 2, "ouch")),
+            (u"\ufffd", 2)
         )
 
     def test_badandgoodxmlcharrefreplaceexceptions(self):
@@ -548,9 +554,10 @@
         cs += (99999, 100000, 999999, 1000000)
         self.assertEqual(
             codecs.xmlcharrefreplace_errors(
-                UnicodeEncodeError("ascii", s, 0, len(s), "ouch")
+                UnicodeEncodeError("ascii", u"a" + s + u"b",
+                                   1, 1 + len(s), "ouch")
             ),
-            (u"".join(u"&#%d;" % c for c in cs), len(s))
+            (u"".join(u"&#%d;" % c for c in cs), 1 + len(s))
         )
 
     def test_badandgoodbackslashreplaceexceptions(self):
@@ -603,8 +610,9 @@
         for s, r in tests:
             self.assertEqual(
                 codecs.backslashreplace_errors(
-                    UnicodeEncodeError("ascii", s, 0, len(s), "ouch")),
-                (r, len(s))
+                    UnicodeEncodeError("ascii", u"a" + s + u"b",
+                                       1, 1 + len(s), "ouch")),
+                (r, 1 + len(s))
             )
 
     def test_badhandlerresults(self):

-- 
Repository URL: https://hg.python.org/cpython