Merge branch 'main' into glob-add

tests/test_commands.py

@@ -1,10 +1,15 @@
+import codecs
 import os
 import shutil
+import sys
 import tempfile
+from io import StringIO
 from unittest import TestCase
 
 from aider import models
+from aider.coders import Coder
 from aider.commands import Commands
+from aider.dump import dump  # noqa: F401
 from aider.io import InputOutput
 
 
@@ -18,6 +23,21 @@ class TestCommands(TestCase):
         os.chdir(self.original_cwd)
         shutil.rmtree(self.tempdir)
 
+    def test_cmd_add(self):
+        # Initialize the Commands and InputOutput objects
+        io = InputOutput(pretty=False, yes=True)
+        from aider.coders import Coder
+
+        coder = Coder.create(models.GPT35, None, io, openai_api_key="deadbeef")
+        commands = Commands(io, coder)
+
+        # Call the cmd_add method with 'foo.txt' and 'bar.txt' as a single string
+        commands.cmd_add("foo.txt bar.txt")
+
+        # Check if both files have been created in the temporary directory
+        self.assertTrue(os.path.exists("foo.txt"))
+        self.assertTrue(os.path.exists("bar.txt"))
+
     def test_cmd_add_with_glob_patterns(self):
         # Initialize the Commands and InputOutput objects
         io = InputOutput(pretty=False, yes=True)
@@ -80,3 +100,43 @@ class TestCommands(TestCase):
         # Check if the Python files have been removed from the chat session
         self.assertIn(os.path.abspath("test1.py"), coder.abs_fnames)
         self.assertNotIn(os.path.abspath("test2.py"), coder.abs_fnames)
+
+    def test_cmd_add_bad_encoding(self):
+        # Initialize the Commands and InputOutput objects
+        io = InputOutput(pretty=False, yes=True)
+        from aider.coders import Coder
+
+        coder = Coder.create(models.GPT35, None, io, openai_api_key="deadbeef")
+        commands = Commands(io, coder)
+
+        # Create a new file foo.bad which will fail to decode as utf-8
+        with codecs.open("foo.bad", "w", encoding="iso-8859-15") as f:
+            f.write("ÆØÅ")  # Characters not present in utf-8
+
+        commands.cmd_add("foo.bad")
+
+        self.assertEqual(coder.abs_fnames, set())
+
+    def test_cmd_tokens(self):
+        # Initialize the Commands and InputOutput objects
+        io = InputOutput(pretty=False, yes=True)
+
+        coder = Coder.create(models.GPT35, None, io, openai_api_key="deadbeef")
+        commands = Commands(io, coder)
+
+        commands.cmd_add("foo.txt bar.txt")
+
+        # Redirect the standard output to an instance of io.StringIO
+        stdout = StringIO()
+        sys.stdout = stdout
+
+        commands.cmd_tokens("")
+
+        # Reset the standard output
+        sys.stdout = sys.__stdout__
+
+        # Get the console output
+        console_output = stdout.getvalue()
+
+        self.assertIn("foo.txt", console_output)
+        self.assertIn("bar.txt", console_output)