Split out types tests.

tests/test_basic.py

@@ -960,3 +960,27 @@ def cli():
     result = runner.invoke(cli, ["--version"], prog_name="mytool")
     assert result.exit_code == 0
     assert result.output == "mytool 1.0\n"
+
+
+@pytest.mark.parametrize(
+    ("nargs", "multiple", "default", "expect"),
+    [
+        (2, False, None, None),
+        (2, False, (None, None), (None, None)),
+        (None, True, None, ()),
+        (None, True, (None, None), (None, None)),
+        (2, True, None, ()),
+        (2, True, [(None, None)], ((None, None),)),
+        (-1, None, None, ()),
+    ],
+)
+def test_cast_multi_default(runner, nargs, multiple, default, expect):
+    if nargs == -1:
+        param = click.Argument(["a"], nargs=nargs, default=default)
+    else:
+        param = click.Option(["-a"], nargs=nargs, multiple=multiple, default=default)
+
+    cli = click.Command("cli", params=[param], callback=lambda a: a)
+    result = runner.invoke(cli, standalone_mode=False)
+    assert result.exception is None
+    assert result.return_value == expect

tests/test_exceptions/test_FileError.py

@@ -0,0 +1,6 @@
+import click
+
+
+def test_file_error_surrogates():
+    message = click.FileError(filename="\udcff").format_message()
+    assert message == "Could not open file '�': unknown error"