From 73cdcc4c600f0e8fb15c39aa867afdfcdde90264 Mon Sep 17 00:00:00 2001
From: Athanasius <github@miggy.org>
Date: Fri, 19 Aug 2022 17:21:59 +0100
Subject: [PATCH] tests: Move 'plain_no_softwarename' message into conftest.py

---
 src/tests/conftest.py                            | 10 ++++++++++
 src/tests/gateway/test_parse_and_error_handle.py | 12 +-----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/tests/conftest.py b/src/tests/conftest.py
index 9c5db89..1b38388 100644
--- a/src/tests/conftest.py
+++ b/src/tests/conftest.py
@@ -18,6 +18,16 @@ test_messages = {
         }
     }''',
 
+	'plain_no_softwarename': '''{
+        "$schemaRef": "https://eddn.edcd.io/schemas/journal/1",
+        "header": {
+            "uploaderID": "no softwareName",
+            "softwareVersion": "v0.0.1"
+        },
+        "message": {
+        }
+	}''',
+
     'plain_journal_scan_valid': '''{
         "$schemaRef": "https://eddn.edcd.io/schemas/journal/1",
         "header": {
diff --git a/src/tests/gateway/test_parse_and_error_handle.py b/src/tests/gateway/test_parse_and_error_handle.py
index 24d835a..e06a49f 100644
--- a/src/tests/gateway/test_parse_and_error_handle.py
+++ b/src/tests/gateway/test_parse_and_error_handle.py
@@ -47,17 +47,7 @@ def test_outdated_schema(fix_sys_path, eddn_gateway, eddn_message: Callable) ->
 
 def test_fail_validation_no_softwarename(fix_sys_path, eddn_gateway, eddn_message: Callable) -> None:
     """Test detecting a message with no softwareName in the message."""
-    msg = """
-{
-    "$schemaRef": "https://eddn.edcd.io/schemas/journal/1",
-    "header": {
-        "uploaderID": "no softwareName",
-        "softwareVersion": "v0.0.1"
-    },
-    "message": {
-	}
-}
-    """
+    msg = eddn_message('plain_no_softwarename')
     res = eddn_gateway.parse_and_error_handle(msg.encode(encoding="utf-8"))
     assert res.startswith("FAIL: Schema Validation: [<ValidationError: \"'softwareName' is a required property\">]")