From 0f0a9786920d7817be7d21da3759013af62d6858 Mon Sep 17 00:00:00 2001
From: Mike Kinney <mike.kinney@gmail.com>
Date: Wed, 22 Dec 2021 16:20:09 -0800
Subject: [PATCH] minor refactor now that there is a fixture

---
 meshtastic/tests/conftest.py            |  2 +-
 meshtastic/tests/test_mesh_interface.py | 60 +++++++------------------
 2 files changed, 18 insertions(+), 44 deletions(-)

diff --git a/meshtastic/tests/conftest.py b/meshtastic/tests/conftest.py
index 38b2554..12c566c 100644
--- a/meshtastic/tests/conftest.py
+++ b/meshtastic/tests/conftest.py
@@ -2,8 +2,8 @@
 
 import argparse
 
+from unittest.mock import MagicMock
 import pytest
-from unittest.mock import patch, MagicMock
 
 from meshtastic.__main__ import Globals
 from ..mesh_interface import MeshInterface
diff --git a/meshtastic/tests/test_mesh_interface.py b/meshtastic/tests/test_mesh_interface.py
index 2bb865b..2f56ebb 100644
--- a/meshtastic/tests/test_mesh_interface.py
+++ b/meshtastic/tests/test_mesh_interface.py
@@ -54,57 +54,31 @@ def test_MeshInterface(capsys, reset_globals):
 
 
 @pytest.mark.unit
-def test_getMyUser_and_LongName_and_ShortName(reset_globals):
-    """Test getMyUser(), getLongName(), and getShortName().
-       Note: These should be separate tests, but feeling lazy.
-             Could move these nodes out to a fixture and
-             create smaller tests.
-    """
+def test_getMyUser(reset_globals, iface_with_nodes):
+    """Test getMyUser()"""
+    iface = iface_with_nodes
 
-    nodesById = {
-        '!9388f81c': {
-            'num': 2475227164,
-            'user': {
-                'id': '!9388f81c',
-                'longName': 'Unknown f81c',
-                'shortName': '?1C',
-                'macaddr': 'RBeTiPgc',
-                'hwModel': 'TBEAM'
-            },
-            'position': {},
-            'lastHeard': 1640204888
-        }
-    }
-
-    nodesByNum = {
-            2475227164: {
-                'num': 2475227164,
-                'user': {
-                    'id': '!9388f81c',
-                    'longName': 'Unknown f81c',
-                    'shortName': '?1C',
-                    'macaddr': 'RBeTiPgc',
-                    'hwModel': 'TBEAM'
-                },
-                'position': {
-                    'time': 1640206266
-                 },
-                'lastHeard': 1640206266
-             }
-           }
-
-    iface = MeshInterface(noProto=True)
-    iface.nodes = nodesById
-    iface.nodesByNum = nodesByNum
-    myInfo = MagicMock()
-    iface.myInfo = myInfo
     iface.myInfo.my_node_num = 2475227164
     myuser = iface.getMyUser()
     print(f'myuser:{myuser}')
     assert myuser is not None
     assert myuser["id"] == '!9388f81c'
+
+
+@pytest.mark.unit
+def test_getLongName(reset_globals, iface_with_nodes):
+    """Test getLongName()"""
+    iface = iface_with_nodes
+    iface.myInfo.my_node_num = 2475227164
     mylongname = iface.getLongName()
     assert mylongname == 'Unknown f81c'
+
+
+@pytest.mark.unit
+def test_getShortName(reset_globals, iface_with_nodes):
+    """Test getShortName()."""
+    iface = iface_with_nodes
+    iface.myInfo.my_node_num = 2475227164
     myshortname = iface.getShortName()
     assert myshortname == '?1C'