clean up

Author: nora-shap

services/notification/notifiers/comment/conditions.py

@@ -108,9 +108,7 @@ def _check_unexpected_changes(comparison: ComparisonProxy) -> bool:
     def _check_coverage_change(comparison: ComparisonProxy) -> bool:
         """Returns a bool that indicates wether there is any change in coverage"""
         diff = comparison.get_diff()
-        if diff is None:
-            return False
-        res = comparison.head.report.calculate_diff(diff)
+        res = None if not diff else comparison.head.report.calculate_diff(diff)
         return res is not None and res["general"].lines > 0
 
     @staticmethod
@@ -153,9 +151,7 @@ def _check_coverage_drop(comparison: ComparisonProxy) -> bool:
     @staticmethod
     def _check_uncovered_patch(comparison: ComparisonProxy) -> bool:
         diff = comparison.get_diff(use_original_base=True)
-        if diff is None:
-            return False
-        totals = comparison.head.report.apply_diff(diff)
+        totals = None if not diff else comparison.head.report.apply_diff(diff)
         coverage_not_affected_by_patch = totals and totals.lines == 0
         if totals is None or coverage_not_affected_by_patch:
             # The patch doesn't affect coverage. So we don't show a comment.

tests/services/notification/notifiers/comment/test_conditions.py

@@ -1,14 +1,11 @@
 import unittest
-from decimal import Decimal
 from unittest.mock import MagicMock, patch
 
 from services.comparison import ComparisonProxy
 from services.notification.notifiers.base import AbstractBaseNotifier
 from services.notification.notifiers.comment.conditions import (
     HasEnoughRequiredChanges,
-    NotifyCondition,
 )
-from shared.validation.types import CoverageCommentRequiredChanges
 
 
 class TestHasEnoughRequiredChanges(unittest.TestCase):
@@ -17,38 +14,29 @@ def setUp(self):
         self.comparison = MagicMock(spec=ComparisonProxy)
 
     def test_check_coverage_change_with_none_diff(self):
-        # Arrange
         self.comparison.get_diff.return_value = None
-
-        # Act
         result = HasEnoughRequiredChanges._check_coverage_change(self.comparison)
-
-        # Assert
         self.assertFalse(result)
         self.comparison.get_diff.assert_called_once()
         self.comparison.head.report.calculate_diff.assert_not_called()
 
     def test_check_uncovered_patch_with_none_diff(self):
-        # Arrange
         self.comparison.get_diff.return_value = None
-
-        # Act
         result = HasEnoughRequiredChanges._check_uncovered_patch(self.comparison)
-
-        # Assert
         self.assertFalse(result)
         self.comparison.get_diff.assert_called_once_with(use_original_base=True)
         self.comparison.head.report.apply_diff.assert_not_called()
 
     def test_check_any_change_with_none_diff(self):
-        # Arrange
         self.comparison.get_diff.return_value = None
-        
+
         # Mock _check_unexpected_changes to return False
-        with patch.object(HasEnoughRequiredChanges, '_check_unexpected_changes', return_value=False):
+        with patch.object(
+            HasEnoughRequiredChanges, "_check_unexpected_changes", return_value=False
+        ):
             # Act
             result = HasEnoughRequiredChanges._check_any_change(self.comparison)
-            
+
             # Assert
             self.assertFalse(result)
-            self.comparison.get_diff.assert_called_once()
+            self.comparison.get_diff.assert_called_once()