Merge pull request #580 from JeroenUH/master

Correctly generate multiple CLI arguments for Haskell

Author: jorg-vr

tested/languages/haskell/generators.py

@@ -241,7 +241,7 @@ def convert_execution_unit(pu: PreparedExecutionUnit) -> str:
             if tc.testcase.is_main_testcase():
                 assert isinstance(tc.input, MainInput)
                 wrapped = [json.dumps(a) for a in tc.input.arguments]
-                result += indent + f"let mainArgs = [{' '.join(wrapped)}]\n"
+                result += indent + f"let mainArgs = [{' ,'.join(wrapped)}]\n"
                 result += (
                     indent
                     + f"result <- try (withArgs mainArgs {pu.submission_name}.main) :: IO (Either SomeException ())\n"

tests/exercises/dedup/evaluation/plan.yaml

@@ -0,0 +1,9 @@
+- tab: "command_line_arguments"
+  testcases:
+  - arguments: [haskell, rust, java, haskell, c, rust]
+    stdout: "c haskell java rust"
+  - arguments: ["banana", "apple", "apple", "orange", "apple", "apple", "banana", "orange"]
+    stdout: "apple banana orange"
+  - arguments: []
+    stdout: "\n"
+  

tests/exercises/dedup/solution/solution.hs

@@ -0,0 +1,8 @@
+import Data.List (nub, sort)
+import System.Environment (getArgs)
+
+main :: IO ()
+main = do
+  args <- getArgs
+  let uniqueSorted = nub (sort args)
+  putStrLn (unwords uniqueSorted)

tests/test_cli_args.py

@@ -0,0 +1,30 @@
+import json
+from pathlib import Path
+
+import pytest
+import yaml
+
+from tested.datatypes import (
+    AdvancedNothingTypes,
+    AdvancedSequenceTypes,
+    BasicNumericTypes,
+)
+from tested.serialisation import NothingType, NumberType, SequenceType
+from tested.utils import sorted_no_duplicates, sorting_value_extract
+from tests.manual_utils import assert_valid_output, configuration, execute_config
+
+
+@pytest.mark.parametrize("language", ["haskell"])
+def test_cli_params(language: str, tmp_path: Path, pytestconfig: pytest.Config):
+    conf = configuration(
+        pytestconfig,
+        "dedup",
+        language,
+        tmp_path,
+        "plan.yaml",
+        "solution",
+    )
+    result = execute_config(conf)
+    print(result)
+    updates = assert_valid_output(result, pytestconfig)
+    assert updates.find_status_enum() == ["correct", "correct", "correct"]