adjust import and multi input tests

.gitignore

@@ -28,3 +28,5 @@ tsconfig.tsbuildinfo
 .yarn/install-state.gz
 docs/**/typedoc
 .venv
+
+__pycache__/

python/answer_displayers/CheckboxesField.py

@@ -1,4 +1,4 @@
-from python.answer_displayer import AnswerDisplayer
+from python.answer_displayers.shared.answer_displayer import AnswerDisplayer
 
 
 class CheckboxesFieldDisplayer(AnswerDisplayer):

python/answer_displayers/ClientSideFileUploadField.py

@@ -1,4 +1,4 @@
-from python.answer_displayer import AnswerDisplayer
+from python.answer_displayers.shared.answer_displayer import AnswerDisplayer
 
 
 class ClientSideFileUploadFieldDisplayer(AnswerDisplayer):

python/answer_displayers/DatePartsField.py

@@ -1,7 +1,7 @@
 import contextlib
 import datetime
 
-from python.answer_displayer import AnswerDisplayer
+from python.answer_displayers.shared.answer_displayer import AnswerDisplayer
 
 
 class DatePartsFieldDisplayer(AnswerDisplayer):

python/answer_displayers/EmailAddressField.py

@@ -1,4 +1,4 @@
-from python.answer_displayer import AnswerDisplayer
+from python.answer_displayers.shared.answer_displayer import AnswerDisplayer
 
 
 class EmailAddressFieldDisplayer(AnswerDisplayer):

python/answer_displayers/FreeTextField.py

@@ -1,5 +1,5 @@
 from bs4 import BeautifulSoup
-from python.answer_displayer import AnswerDisplayer
+from python.answer_displayers.shared.answer_displayer import AnswerDisplayer
 
 
 class FreeTextFieldDisplayer(AnswerDisplayer):

python/answer_displayers/MonthYearField.py

@@ -1,7 +1,7 @@
 import contextlib
 import datetime
 
-from python.answer_displayer import AnswerDisplayer
+from python.answer_displayers.shared.answer_displayer import AnswerDisplayer
 
 
 class MonthYearFieldDisplayer(AnswerDisplayer):

python/answer_displayers/MultiInputField.py

@@ -1,6 +1,6 @@
 from typing import Any
 
-from python.answer_displayer import AnswerDisplayer
+from python.answer_displayers.shared.answer_displayer import AnswerDisplayer
 
 
 class MultiInputFieldDisplayer(AnswerDisplayer):
@@ -22,7 +22,7 @@ def _legacy_parsed_answer(self) -> str:
 
     @property
     def _parse_multi_input_component(self) -> list[dict[str, AnswerDisplayer]]:
-        from python.dictionaries import (
+        from python.answer_displayers.shared.dictionaries import (
             EXISTING_KEY_TO_TYPE_DICT,
             FIELD_TO_DISPLAYER_DICT_MULTI_INPUT,
         )

python/answer_displayers/NumberField.py

@@ -1,4 +1,4 @@
-from python.answer_displayer import AnswerDisplayer
+from python.answer_displayers.shared.answer_displayer import AnswerDisplayer
 
 
 class NumberFieldDisplayer(AnswerDisplayer):

python/answer_displayers/RadiosField.py

@@ -1,4 +1,4 @@
-from python.answer_displayer import AnswerDisplayer
+from python.answer_displayers.shared.answer_displayer import AnswerDisplayer
 
 
 class RadiosFieldDisplayer(AnswerDisplayer):

python/answer_displayers/TelephoneNumberField.py

@@ -1,4 +1,4 @@
-from python.answer_displayer import AnswerDisplayer
+from python.answer_displayers.shared.answer_displayer import AnswerDisplayer
 
 
 class TelephoneNumberFieldDisplayer(AnswerDisplayer):

python/answer_displayers/TextField.py

@@ -1,4 +1,4 @@
-from python.answer_displayer import AnswerDisplayer
+from python.answer_displayers.shared.answer_displayer import AnswerDisplayer
 
 
 class TextFieldDisplayer(AnswerDisplayer):

python/answer_displayers/UkAddressField.py

@@ -1,4 +1,4 @@
-from python.answer_displayer import AnswerDisplayer
+from python.answer_displayers.shared.answer_displayer import AnswerDisplayer
 
 
 class UkAddressFieldDisplayer(AnswerDisplayer):

python/answer_displayers/WebsiteField.py

@@ -1,4 +1,4 @@
-from python.answer_displayer import AnswerDisplayer
+from python.answer_displayers.shared.answer_displayer import AnswerDisplayer
 
 
 class WebsiteFieldDisplayer(AnswerDisplayer):

python/answer_displayers/YesNoField.py

@@ -1,4 +1,4 @@
-from python.answer_displayer import AnswerDisplayer
+from python.answer_displayers.shared.answer_displayer import AnswerDisplayer
 
 
 class YesNoFieldDisplayer(AnswerDisplayer):

python/tests/test_MultiInputField.py

@@ -77,14 +77,19 @@ def test_as_pdf(answer, expected_result):
     '1\nTest About your organisation CYP Form\n268 Schultz Fold, Upper Berge, W12 0HS\nhttps://twitter.com/luhc\nNone\nNone\n'
 ]
 _TEST_OUTPUTS = [
-    ["Test Value for Money CYP Form", "£678.00", "March 2024", "Capital"],
     [
-        "Test About your organisation CYP Form",
-        "268 Schultz Fold, Upper Berge, W12 0HS",
-        "https://twitter.com/luhc",
-        None,
-        None,
+        ["Test Value for Money CYP Form FIRST", "£678.00", "March 2024", "Capital"],
+        ["Test Value for Money CYP Form SECOND", "£678.00", "April 2024", "Capital"]
     ],
+    [
+        [
+            "Test About your organisation CYP Form",
+            "268 Schultz Fold, Upper Berge, W12 0HS",
+            "https://twitter.com/luhc",
+            None,
+            None,
+        ]
+    ]
 ]
 
 @pytest.mark.parametrize(
@@ -93,8 +98,8 @@ def test_as_pdf(answer, expected_result):
 )
 def test_as_csv_multi_input(answer, expected_answers):
     answer_displayers = MultiInputFieldDisplayer(answer).as_csv
-    for answer_displayer_dict in answer_displayers:
-        for key, expected_answer in zip(answer_displayer_dict, expected_answers):
+    for index, answer_displayer_dict in enumerate(answer_displayers):
+        for key, expected_answer in zip(answer_displayer_dict, expected_answers[index]):
             assert answer_displayer_dict[key].as_csv == expected_answer
 
 
@@ -113,6 +118,6 @@ def test_as_txt_multi_input(answer, expected_answers):
 )
 def test_as_pdf_multi_input(answer, expected_answers):
     answer_displayers = MultiInputFieldDisplayer(answer).as_pdf
-    for answer_displayer_dict in answer_displayers:
-        for key, expected_answer in zip(answer_displayer_dict, expected_answers):
-            assert answer_displayer_dict[key].as_pdf == expected_answer
+    for index, answer_displayer_dict in enumerate(answer_displayers):
+        for key, expected_answer in zip(answer_displayer_dict, expected_answers[index]):
+            assert answer_displayer_dict[key].as_pdf == expected_answer