From e15c8e28dd7f40dd26088d8e0fa40efa6baceb05 Mon Sep 17 00:00:00 2001
From: Athanasius <github@miggy.org>
Date: Fri, 19 Aug 2022 17:27:48 +0100
Subject: [PATCH] tests/gateway/parse_and_error_handle: Switch to conftest
 'plain_journal_scan_valid'

---
 .../gateway/test_parse_and_error_handle.py    | 20 ++-----------------
 1 file changed, 2 insertions(+), 18 deletions(-)

diff --git a/src/tests/gateway/test_parse_and_error_handle.py b/src/tests/gateway/test_parse_and_error_handle.py
index e06a49f..eb69940 100644
--- a/src/tests/gateway/test_parse_and_error_handle.py
+++ b/src/tests/gateway/test_parse_and_error_handle.py
@@ -7,7 +7,7 @@ import pytest
 
 
 @pytest.fixture
-def fix_sys_path():
+def fix_sys_path() -> None:
     """Set up an eddn.Gateway import."""
     # Tests don't include the directory that `pytest` is run from on sys.path
     sys.path.append(os.getcwd())
@@ -54,22 +54,6 @@ def test_fail_validation_no_softwarename(fix_sys_path, eddn_gateway, eddn_messag
 
 def test_valid_journal_scan(fix_sys_path, eddn_gateway, eddn_message: Callable) -> None:
     """Test a valid journal/1, `event == 'Scan'` message."""
-    msg = """
-{
-    "$schemaRef": "https://eddn.edcd.io/schemas/journal/1",
-    "header": {
-        "uploaderID": "valid journal message",
-        "softwareName": "pytest:Gateway.parse_and_error_handle",
-        "softwareVersion": "v0.0.1"
-    },
-    "message": {
-        "timestamp":"2021-11-05T15:46:28Z",
-        "event":"Scan",
-        "StarSystem":"Elphin",
-        "StarPos":[-30.12500,8.18750,-17.00000],
-        "SystemAddress":3932076118738
-	}
-}
-    """
+    msg = eddn_message('plain_journal_scan_valid')
     res = eddn_gateway.parse_and_error_handle(msg.encode(encoding="utf-8"))
     assert res == "OK"