From d3816ad096c4632dcb56c0d50fe756227a8b4a8e Mon Sep 17 00:00:00 2001 From: Sebastian Ramacher Date: Sun, 7 Feb 2021 17:21:04 +0100 Subject: [PATCH] Mark exec_test as internal --- tests/test_cwcwidth.py | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/tests/test_cwcwidth.py b/tests/test_cwcwidth.py index 96f0385..6a12918 100644 --- a/tests/test_cwcwidth.py +++ b/tests/test_cwcwidth.py @@ -6,7 +6,7 @@ supports_utf8 = "UTF-8" in locale.getlocale() class Tests(unittest.TestCase): - def exec_test( + def _exec_test( self, phrase, individual_expected_lengths, expected_length=None, n=None ): if expected_length is None: @@ -20,39 +20,38 @@ class Tests(unittest.TestCase): @unittest.skipUnless(supports_utf8, "locale does not support UTF-8") def test_hello_jp(self): """Width of Japanese phrase: コンニチハ, セカイ!""" - self.exec_test("コンニチハ, セカイ!", (2, 2, 2, 2, 2, 1, 1, 2, 2, 2, 1)) + self._exec_test("コンニチハ, セカイ!", (2, 2, 2, 2, 2, 1, 1, 2, 2, 2, 1)) @unittest.skipUnless(supports_utf8, "locale does not support UTF-8") def test_wcswidth_substr(self): - """Test wcswidth() optional 2nd parameter, ``n``.""" - self.exec_test("コンニチハ, セカイ!", (2, 2, 2, 2, 2, 1, 1), n=7) + """Test wcswidth() optional 2nd parameter.""" + self._exec_test("コンニチハ, セカイ!", (2, 2, 2, 2, 2, 1, 1), n=7) def test_null_width_0(self): """NULL (0) reports width 0.""" - self.exec_test("abc\x00def", (1, 1, 1, 0, 1, 1, 1)) - self.exec_test("abc\x00def", (1, 1, 1, 0, 1, 1, 1), n=7) + self._exec_test("abc\x00def", (1, 1, 1, 0, 1, 1, 1)) + self._exec_test("abc\x00def", (1, 1, 1, 0, 1, 1, 1), n=7) def test_control_c0_width_negative_1(self): """CSI (Control sequence initiate) reports width -1.""" - self.exec_test("\x1b[0m", (-1, 1, 1, 1), expected_length=-1) + self._exec_test("\x1b[0m", (-1, 1, 1, 1), expected_length=-1) @unittest.skipUnless(supports_utf8, "locale does not support UTF-8") def test_combining_width_negative_1(self): """Simple test combining reports total width of 4.""" - self.exec_test("--\u05bf--", (1, 1, 0, 1, 1)) + self._exec_test("--\u05bf--", (1, 1, 0, 1, 1)) @unittest.skipUnless(supports_utf8, "locale does not support UTF-8") def test_combining_cafe(self): """Phrase cafe + COMBINING ACUTE ACCENT is café of length 4.""" - self.exec_test("cafe\u0301", (1, 1, 1, 1, 0)) + self._exec_test("cafe\u0301", (1, 1, 1, 1, 0)) @unittest.skipUnless(supports_utf8, "locale does not support UTF-8") def test_combining_enclosing(self): """CYRILLIC CAPITAL LETTER A + COMBINING CYRILLIC HUNDRED THOUSANDS SIGN is А҈ of length 1.""" - expect_length_each = (1, 0) - self.exec_test("\u0410\u0488", (1, 0)) + self._exec_test("\u0410\u0488", (1, 0)) @unittest.skipUnless(supports_utf8, "locale does not support UTF-8") def test_combining_spacing(self): """Balinese kapal (ship) is ᬓᬨᬮ᭄ of length 4.""" - self.exec_test("\u1B13\u1B28\u1B2E\u1B44", (1, 1, 1, 1)) + self._exec_test("\u1B13\u1B28\u1B2E\u1B44", (1, 1, 1, 1))