Move string.templatelib specific tests to test_string/test_templatlib.py (python#70)

Author: AA-Turner

Lib/test/.ruff.toml

@@ -9,6 +9,7 @@ extend-exclude = [
     "encoded_modules/module_koi8_r.py",
     # SyntaxError because of t-strings
     "test_tstring.py",
+    "test_string/test_templatelib.py",
     # TODO Fix: F811 Redefinition of unused name
     "test_buffer.py",
     "test_dataclasses/__init__.py",

Lib/test/test_string/__init__.py

@@ -0,0 +1,5 @@
+import os
+from test.support import load_package_tests
+
+def load_tests(*args):
+    return load_package_tests(os.path.dirname(__file__), *args)

Lib/test/test_string/_support.py

@@ -0,0 +1,24 @@
+from string.templatelib import Interpolation
+
+
+def convert(value, conversion):
+    if conversion == "a":
+        return ascii(value)
+    elif conversion == "r":
+        return repr(value)
+    elif conversion == "s":
+        return str(value)
+    return value
+
+
+def f(template):
+    parts = []
+    for item in template:
+        match item:
+            case str() as s:
+                parts.append(s)
+            case Interpolation(value, _, conversion, format_spec):
+                value = convert(value, conversion)
+                value = format(value, format_spec)
+                parts.append(value)
+    return "".join(parts)

Lib/test/test_string.py renamed to Lib/test/test_string/test_string.py

@@ -0,0 +1,78 @@
+import unittest
+from string.templatelib import Template, Interpolation
+
+from test.test_string._support import f
+
+
+class TestTemplate(unittest.TestCase):
+
+    def test_basic_creation(self):
+        # Simple t-string creation
+        t = t"Hello, world"
+        self.assertTrue(isinstance(t, Template))
+        self.assertEqual(t.strings, ("Hello, world",))
+        self.assertEqual(len(t.interpolations), 0)
+        self.assertEqual(f(t), "Hello, world")
+
+        # Empty t-string
+        t = t""
+        self.assertEqual(t.strings, ("",))
+        self.assertEqual(len(t.interpolations), 0)
+        self.assertEqual(f(t), "")
+
+        # Multi-line t-string
+        t = t"""Hello,
+world"""
+        self.assertEqual(t.strings, ("Hello,\nworld",))
+        self.assertEqual(len(t.interpolations), 0)
+        self.assertEqual(f(t), "Hello,\nworld")
+
+    def test_creation_interleaving(self):
+        # Should add strings on either side
+        t = Template(Interpolation("Maria", "name", None, ""))
+        self.assertEqual(t.strings, ("", ""))
+        self.assertEqual(t.interpolations[0].value, "Maria")
+        self.assertEqual(t.interpolations[0].expression, "name")
+        self.assertEqual(t.interpolations[0].conversion, None)
+        self.assertEqual(t.interpolations[0].format_spec, "")
+        self.assertEqual(f(t), "Maria")
+
+        # Should prepend empty string
+        t = Template(Interpolation("Maria", "name", None, ""), " is my name")
+        self.assertEqual(t.strings, ("", " is my name"))
+        self.assertEqual(t.interpolations[0].value, "Maria")
+        self.assertEqual(t.interpolations[0].expression, "name")
+        self.assertEqual(t.interpolations[0].conversion, None)
+        self.assertEqual(t.interpolations[0].format_spec, "")
+        self.assertEqual(f(t), "Maria is my name")
+
+        # Should append empty string
+        t = Template("Hello, ", Interpolation("Maria", "name", None, ""))
+        self.assertEqual(t.strings, ("Hello, ", ""))
+        self.assertEqual(t.interpolations[0].value, "Maria")
+        self.assertEqual(t.interpolations[0].expression, "name")
+        self.assertEqual(t.interpolations[0].conversion, None)
+        self.assertEqual(t.interpolations[0].format_spec, "")
+        self.assertEqual(f(t), "Hello, Maria")
+
+        # Should concatenate strings
+        t = Template("Hello", ", ", Interpolation("Maria", "name", None, ""), "!")
+        self.assertEqual(t.strings, ("Hello, ", "!"))
+        self.assertEqual(t.interpolations[0].value, "Maria")
+        self.assertEqual(t.interpolations[0].expression, "name")
+        self.assertEqual(t.interpolations[0].conversion, None)
+        self.assertEqual(t.interpolations[0].format_spec, "")
+        self.assertEqual(f(t), "Hello, Maria!")
+
+        # Should add strings on either side and in between
+        t = Template(Interpolation("Maria", "name", None, ""), Interpolation("Python", "language", None, ""))
+        self.assertEqual(t.strings, ("", "", ""))
+        self.assertEqual(t.interpolations[0].value, "Maria")
+        self.assertEqual(t.interpolations[0].expression, "name")
+        self.assertEqual(t.interpolations[0].conversion, None)
+        self.assertEqual(t.interpolations[0].format_spec, "")
+        self.assertEqual(t.interpolations[1].value, "Python")
+        self.assertEqual(t.interpolations[1].expression, "language")
+        self.assertEqual(t.interpolations[1].conversion, None)
+        self.assertEqual(t.interpolations[1].format_spec, "")
+        self.assertEqual(f(t), "MariaPython")

Lib/test/test_string/test_templatelib.py

@@ -1,30 +1,7 @@
 import ast
 import unittest
 
-from string.templatelib import Template, Interpolation
-
-
-def convert(value, conversion):
-    if conversion == "a":
-        return ascii(value)
-    elif conversion == "r":
-        return repr(value)
-    elif conversion == "s":
-        return str(value)
-    return value
-
-
-def f(template):
-    parts = []
-    for item in template:
-        match item:
-            case str() as s:
-                parts.append(s)
-            case Interpolation(value, _, conversion, format_spec):
-                value = convert(value, conversion)
-                value = format(value, format_spec)
-                parts.append(value)
-    return "".join(parts)
+from test.test_string._support import f
 
 
 class TestTString(unittest.TestCase):
@@ -34,77 +11,6 @@ def assertAllRaise(self, exception_type, regex, error_strings):
                 with self.assertRaisesRegex(exception_type, regex):
                     eval(s)
 
-    def test_template_basic_creation(self):
-        # Simple t-string creation
-        t = t"Hello, world"
-        self.assertTrue(isinstance(t, Template))
-        self.assertEqual(t.strings, ("Hello, world",))
-        self.assertEqual(len(t.interpolations), 0)
-        self.assertEqual(f(t), "Hello, world")
-
-        # Empty t-string
-        t = t""
-        self.assertEqual(t.strings, ("",))
-        self.assertEqual(len(t.interpolations), 0)
-        self.assertEqual(f(t), "")
-
-        # Multi-line t-string
-        t = t"""Hello,
-world"""
-        self.assertEqual(t.strings, ("Hello,\nworld",))
-        self.assertEqual(len(t.interpolations), 0)
-        self.assertEqual(f(t), "Hello,\nworld")
-
-    def test_template_creation_interleaving(self):
-        # Should add strings on either side
-        t = Template(Interpolation("Maria", "name", None, ""))
-        self.assertEqual(t.strings, ("", ""))
-        self.assertEqual(t.interpolations[0].value, "Maria")
-        self.assertEqual(t.interpolations[0].expression, "name")
-        self.assertEqual(t.interpolations[0].conversion, None)
-        self.assertEqual(t.interpolations[0].format_spec, "")
-        self.assertEqual(f(t), "Maria")
-
-        # Should prepend empty string
-        t = Template(Interpolation("Maria", "name", None, ""), " is my name")
-        self.assertEqual(t.strings, ("", " is my name"))
-        self.assertEqual(t.interpolations[0].value, "Maria")
-        self.assertEqual(t.interpolations[0].expression, "name")
-        self.assertEqual(t.interpolations[0].conversion, None)
-        self.assertEqual(t.interpolations[0].format_spec, "")
-        self.assertEqual(f(t), "Maria is my name")
-
-        # Should append empty string
-        t = Template("Hello, ", Interpolation("Maria", "name", None, ""))
-        self.assertEqual(t.strings, ("Hello, ", ""))
-        self.assertEqual(t.interpolations[0].value, "Maria")
-        self.assertEqual(t.interpolations[0].expression, "name")
-        self.assertEqual(t.interpolations[0].conversion, None)
-        self.assertEqual(t.interpolations[0].format_spec, "")
-        self.assertEqual(f(t), "Hello, Maria")
-
-        # Should concatenate strings
-        t = Template("Hello", ", ", Interpolation("Maria", "name", None, ""), "!")
-        self.assertEqual(t.strings, ("Hello, ", "!"))
-        self.assertEqual(t.interpolations[0].value, "Maria")
-        self.assertEqual(t.interpolations[0].expression, "name")
-        self.assertEqual(t.interpolations[0].conversion, None)
-        self.assertEqual(t.interpolations[0].format_spec, "")
-        self.assertEqual(f(t), "Hello, Maria!")
-
-        # Should add strings on either side and in between
-        t = Template(Interpolation("Maria", "name", None, ""), Interpolation("Python", "language", None, ""))
-        self.assertEqual(t.strings, ("", "", ""))
-        self.assertEqual(t.interpolations[0].value, "Maria")
-        self.assertEqual(t.interpolations[0].expression, "name")
-        self.assertEqual(t.interpolations[0].conversion, None)
-        self.assertEqual(t.interpolations[0].format_spec, "")
-        self.assertEqual(t.interpolations[1].value, "Python")
-        self.assertEqual(t.interpolations[1].expression, "language")
-        self.assertEqual(t.interpolations[1].conversion, None)
-        self.assertEqual(t.interpolations[1].format_spec, "")
-        self.assertEqual(f(t), "MariaPython")
-
     def test_string_representation(self):
         # Test __repr__
         t = t"Hello"