SAR-150 Simplified tests

tests/test_transactions.py

@@ -155,35 +155,41 @@ class TestTransactionLogging:
                 return
         assert 0, f"Could not get a log message with `Inner Log` and `transaction_id` in {records}"
 
-    def test_enter_log_override(self, recording_logger):
+    def test_log_override_enter_exit(self, recording_logger):
         parameters = {}
         with transaction("name", parameters, logger=recording_logger) as transaction_id:
             recording_logger.info("Inner Log")
-        records = get_all_record_logs(recording_logger)
-        for record in records:
-            _, _, _, _, func_name, file_name, _, log_message = record.split("|")
-            if (
-                "]: Enter[" in log_message
-                and func_name == "test_enter_log_override"
-                and "test_transactions.py" in file_name
-            ):
-                return
-        assert 0, f"Enter not overridden in these logs: {records}"
 
-    def test_exit_log_override(self, recording_logger):
+        second_log_record, _ = get_second_record_and_log_message(recording_logger)
+        last_log_message, _ = get_last_record_and_log_message(recording_logger)
+
+        assert "Enter" in second_log_record.message
+        assert second_log_record.funcName == "test_log_override_enter_exit"
+        assert second_log_record.filename == "test_transactions.py"
+        assert "Exit" in last_log_message.message
+        assert last_log_message.funcName == "test_log_override_enter_exit"
+        assert last_log_message.filename == "test_transactions.py"
+
+    def test_log_override_enter_exit(self, recording_logger):
         parameters = {}
-        with transaction("name", parameters, logger=recording_logger) as transaction_id:
+        with transaction("name", parameters) as transaction_id:
             recording_logger.info("Inner Log")
-        records = get_all_record_logs(recording_logger)
-        for record in records:
-            _, _, _, _, func_name, file_name, _, log_message = record.split("|")
-            if (
-                "]: Exit[" in log_message
-                and func_name == "test_exit_log_override"
-                and "test_transactions.py" in file_name
-            ):
-                return
-        assert 0, f"Exit not overridden in these logs: {records}"
+
+        first_log_record, _ = get_first_record_and_log_message(recording_logger)
+        second_log_record, _ = get_second_record_and_log_message(recording_logger)
+        last_log_message, _ = get_last_record_and_log_message(recording_logger)
+
+        assert "Generated" in first_log_record.message
+        assert first_log_record.funcName != "test_log_override_enter_exit"
+        assert first_log_record.filename != "test_transactions.py"
+
+        assert "Enter" in second_log_record.message
+        assert second_log_record.funcName == "test_log_override_enter_exit"
+        assert second_log_record.filename == "test_transactions.py"
+
+        assert "Exit" in last_log_message.message
+        assert last_log_message.funcName == "test_log_override_enter_exit"
+        assert last_log_message.filename == "test_transactions.py"
 
     def test_specified_logger(self):
         logger = MagicMock()
@@ -194,6 +200,13 @@ class TestTransactionLogging:
             assert logger.info.call_args_list[i].starts_with(message)
         assert logger.info.call_count == 4, f"Log calls incorrect {logger.info.call_args_list}"
 
+    def test_unspecified_logger(self):
+        logger = MagicMock()
+        parameters = {}
+        with transaction("name", parameters) as transaction_id:
+            logger.info("A message")
+        assert logger.info.call_count == 1
+
 
 class TestTransactionIdGenerator:
     """Tests for :class:`~ska.logging.transactions.TransactionIdGenerator`."""