Fine tune '_license_diff()' and related tests #29

Signed-off-by: John M. Horan <johnmhoran@gmail.com>

Author: johnmhoran

src/deltacode/__init__.py

@@ -184,21 +184,19 @@ def _license_diff(self, cutoff_score=50):
         new_licenses = self.new_file.licenses or []
         old_licenses = self.old_file.licenses or []
 
-        if self.new_file.licenses and not self.old_file.licenses:
+        if len(self.new_file.licenses) > 0 and self.old_file.licenses == []:
             self.category = 'license info added'
-        if not self.new_file.licenses and self.old_file.licenses:
+            return
+
+        if self.new_file.licenses == [] and len(self.old_file.licenses) > 0:
             self.category = 'license info removed'
+            return
 
         new_keys = set(l.key for l in new_licenses if l.score >= cutoff_score)
         old_keys = set(l.key for l in old_licenses if l.score >= cutoff_score)
 
         if new_keys != old_keys:
-            if len(new_keys) == 0:
-                self.category = 'license info removed'
-            elif len(old_keys) == 0:
-                self.category = 'license info added'
-            else:
-                self.category = 'license change'
+            self.category = 'license change'
 
     def to_dict(self):
         """

tests/test_deltacode.py

@@ -414,7 +414,6 @@ def test_Delta_license_diff_old_no_license_info(self):
         old_file = models.File({'path': 'old/path.txt'})
 
         result = deltacode.Delta(new_file, old_file, 'modified')
-        #result.license_diff()
 
         assert result.category == 'license info added'
         assert result.to_dict().get('category') == 'license info added'
@@ -424,7 +423,6 @@ def test_Delta_license_diff_old_no_license_info_below_cutoff_score(self):
         old_file = models.File({'path': 'old/path.txt'})
 
         result = deltacode.Delta(new_file, old_file, 'modified')
-        #result.license_diff()
 
         assert result.category == 'license info added'
         assert result.to_dict().get('category') == 'license info added'
@@ -434,7 +432,6 @@ def test_Delta_license_diff_single_diff_multiple_keys(self):
         old_file = models.File({'path': 'old/path.txt', 'licenses': [{'key': 'mit', 'score': 50.0}]})
 
         result = deltacode.Delta(new_file, old_file, 'modified')
-        #result.license_diff()
 
         assert result.category == 'license change'
 
@@ -443,7 +440,6 @@ def test_Delta_license_diff_no_diff_multiple_keys(self):
         old_file = models.File({'path': 'old/path.txt', 'licenses': [{'key': 'mit', 'score': 100.0}]})
 
         result = deltacode.Delta(new_file, old_file, 'modified')
-        #result.license_diff()
 
         assert result.category == 'modified'
 
@@ -452,7 +448,6 @@ def test_Delta_license_diff_no_diff_multiple_keys_low_score_new(self):
         old_file = models.File({'path': 'old/path.txt', 'licenses': [{'key': 'mit', 'score': 100.0}]})
 
         result = deltacode.Delta(new_file, old_file, 'modified')
-        #result.license_diff()
 
         assert result.category == 'modified'
 
@@ -461,7 +456,6 @@ def test_Delta_license_diff_no_diff_multiple_keys_low_score_old(self):
         old_file = models.File({'path': 'old/path.txt', 'licenses': [{'key': 'mit', 'score': 100.0}, {'key': 'gpl-2.0', 'score': 49.9}]})
 
         result = deltacode.Delta(new_file, old_file, 'modified')
-        #result.license_diff()
 
         assert result.category == 'modified'
 
@@ -470,7 +464,6 @@ def test_Delta_license_diff_single_diff(self):
         old_file = models.File({'path': 'old/path.txt', 'licenses': [{'key': 'mit', 'score': 80.0}]})
 
         result = deltacode.Delta(new_file, old_file, 'modified')
-        #result.license_diff()
 
         assert result.category == 'license change'
 
@@ -479,7 +472,6 @@ def test_Delta_license_diff_no_diff(self):
         old_file = models.File({'path': 'old/path.txt', 'licenses': [{'key': 'mit', 'score': 95.0}]})
 
         result = deltacode.Delta(new_file, old_file, 'modified')
-        #result.license_diff()
 
         assert result.category == 'modified'
 
@@ -488,28 +480,23 @@ def test_Delta_license_diff_missing_diff_low_score_new(self):
         old_file = models.File({'path': 'old/path.txt', 'licenses': [{'key': 'mit', 'score': 95.0}]})
 
         result = deltacode.Delta(new_file, old_file, 'modified')
-        #result.license_diff()
 
-        assert result.category == 'license info removed'
+        assert result.category == 'license change'
 
     def test_Delta_license_diff_missing_diff_low_score_old(self):
         new_file = models.File({'path': 'new/path.txt', 'licenses': [{'key': 'mit', 'score': 95.0}]})
         old_file = models.File({'path': 'old/path.txt', 'licenses': [{'key': 'mit', 'score': 45.0}]})
 
         result = deltacode.Delta(new_file, old_file, 'modified')
-        #result.license_diff()
 
-        assert result.category == 'license info added'
+        assert result.category == 'license change'
 
     def test_Delta_license_diff_one_None(self):
         file_obj = models.File({'path': 'fake/path.txt'})
 
         first_None = deltacode.Delta(None, file_obj, 'removed')
         second_None = deltacode.Delta(file_obj, None, 'added')
 
-        #first_None.license_diff()
-        #second_None.license_diff()
-
         assert first_None.category == 'removed'
         assert second_None.category == 'added'