Add object check to Delta class constructor #27

  * Also fixed five failing tests.

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

Author: johnmhoran

src/deltacode/__init__.py

@@ -27,6 +27,7 @@
 
 from collections import OrderedDict
 
+from deltacode.models import File
 from deltacode.models import Scan
 from deltacode import utils
 
@@ -171,8 +172,8 @@ class Delta(object):
     """
     def __init__(self, new_file=None, old_file=None, delta_type=None):
         # TODO: add check to ensure both are File objects
-        self.new_file = new_file
-        self.old_file = old_file
+        self.new_file = new_file if new_file else File()
+        self.old_file = old_file if old_file else File()
         self.category = delta_type
 
         # Change the Delta object's 'category' attribute to
@@ -187,9 +188,6 @@ def _license_diff(self, cutoff_score=50):
         'license change' if those details differ and the cutoff score test is
         satisfied.
         """
-        if not self.new_file or not self.old_file:
-            return
-
         new_licenses = self.new_file.licenses or []
         new_keys = set(l.key for l in new_licenses if l.score >= cutoff_score)
 
@@ -204,9 +202,6 @@ def to_dict(self):
         Check the 'category' attribute of the Delta object and return an
         OrderedDict comprising the 'category' and 'path' of the object.
         """
-        if self.new_file is None and self.old_file is None:
-            return
-
         if self.category == 'added':
             return OrderedDict([
                 ('category', 'added'),

tests/test_deltacode.py

@@ -493,8 +493,8 @@ def test_Delta_license_diff_one_None(self):
     def test_Delta_license_diff_None_files(self):
         delta = deltacode.Delta(None, None, None)
 
-        assert delta.new_file == None
-        assert delta.old_file == None
+        assert type(delta.new_file) == type(models.File())
+        assert type(delta.old_file) == type(models.File())
         assert delta.category == None
 
     def test_DeltaCode_license_modified_low_score(self):
@@ -678,15 +678,15 @@ def test_Delta_to_dict_unmodified(self):
     def test_Delta_to_dict_empty(self):
         delta = deltacode.Delta()
 
-        assert delta.to_dict() == None
+        assert delta.to_dict() == OrderedDict([('category', 'unmodified'), ('path', None)])
 
     def test_Delta_create_object_removed(self):
         new = None
         old = models.File({'path': 'path/removed.txt'})
 
         delta = deltacode.Delta(new, old, 'removed')
 
-        assert delta.new_file == None
+        assert type(delta.new_file) == type(models.File())
         assert delta.old_file.path == 'path/removed.txt'
         assert delta.category == 'removed'
 
@@ -697,7 +697,7 @@ def test_Delta_create_object_added(self):
         delta = deltacode.Delta(new, old, 'added')
 
         assert delta.new_file.path == 'path/added.txt'
-        assert delta.old_file == None
+        assert type(delta.old_file) == type(models.File())
         assert delta.category == 'added'
 
     def test_Delta_create_object_modified(self):
@@ -727,6 +727,6 @@ def test_Delta_create_object_unmodified(self):
     def test_Delta_create_object_empty(self):
         delta = deltacode.Delta()
 
-        assert delta.new_file == None
-        assert delta.old_file == None
+        assert type(delta.new_file) == type(models.File())
+        assert type(delta.old_file) == type(models.File())
         assert delta.category == None