Merge pull request #186 from arnav-mandal1234/test_fix

Fix all broken tests and minor refactoring
nexB · Mar 21, 2023 · 832bdf2 · 832bdf2
2 parents aa713f8 + c88b899
commit 832bdf2
Show file tree

Hide file tree

Showing 68 changed files with 74 additions and 23 deletions.
diff --git a/src/deltacode/__init__.py b/src/deltacode/__init__.py
@@ -121,7 +121,7 @@ def similarity(self):
                 )
 
     def create_deltas(
-        self, new_resource, old_resource, new_path, old_path, score, status
+        self, new_resource, old_resource, score, status
     ):
         """
         Creates the Delta Objects and appends them to the member list.
@@ -153,7 +153,7 @@ def determine_delta(self):
                 )
             # If the resource is a file align its path
 
-                old_resource = self.codebase2.get_resource_from_path(path_new)
+                old_resource = self.codebase2.get_resource(path_new)
                 # Check in the old codebase weather a resource with such a path exists or not
                 # if it exists and their corresponding sha's are same then its an unmodified delta
 
@@ -163,7 +163,7 @@ def determine_delta(self):
                         paths.split(old_resource.path)[Delta.OLD_CODEBASE_OFFSET :]
                     )
                     self.create_deltas(
-                        new_resource, old_resource, path_new, path_old, 0, "unmodified",
+                        new_resource, old_resource, 0, "unmodified",
                     )
                     self.stats.num_unmodified += 1
 
@@ -196,8 +196,6 @@ def determine_delta(self):
                                 self.create_deltas(
                                     new_resource,
                                     old_resource,
-                                    path_new,
-                                    path_old,
                                     0,
                                     "unmodified",
                                 )
@@ -209,8 +207,6 @@ def determine_delta(self):
                                 self.create_deltas(
                                     new_resource,
                                     old_resource,
-                                    path_new,
-                                    path_old,
                                     20,
                                     "modified",
                                 )
@@ -225,8 +221,6 @@ def determine_delta(self):
                                 self.create_deltas(
                                     new_resource,
                                     old_resource,
-                                    path_new,
-                                    path_old,
                                     0,
                                     "moved",
                                 )
@@ -236,7 +230,7 @@ def determine_delta(self):
                 if ADDED:
                     # If none of the above criteria matches then the delta is an added one.
                     self.create_deltas(
-                        new_resource, None, path_new, None, 100, "added",
+                        new_resource, None, 100, "added",
                     )
                     self.stats.num_added += 1
 
@@ -253,7 +247,7 @@ def determine_delta(self):
                     ]
                 )
                 self.create_deltas(
-                    None, old_resource_remaining, None, path_old, 0, "removed",
+                    None, old_resource_remaining, 0, "removed",
                 )
                 self.stats.num_removed += 1
 

diff --git a/tests/data/deltacode/scan_modified_old_license_added.json b/tests/data/deltacode/scan_modified_old_license_added.json
@@ -37,7 +37,7 @@
       {
         "path": "some/path/b/b1.py",
         "type": "file",
-        "name": "b2.py",
+        "name": "b1.py",
         "size": 200,
         "sha1": "333647771481d39dd3a53f6dc210c26abac37748",
         "licenses": [

diff --git a/tests/data/utils/update_from_copyright_info_copyright_info_added_new.json b/tests/data/utils/update_from_copyright_info_copyright_info_added_new.json
@@ -10,6 +10,7 @@
         {
             "path":"test/path.txt",
             "name": "path.txt",
+            "type": "file",
             "sha1": "a",
             "original_path": "",
             "copyrights": [

diff --git a/tests/data/utils/update_from_copyright_info_copyright_info_added_old.json b/tests/data/utils/update_from_copyright_info_copyright_info_added_old.json
@@ -10,6 +10,7 @@
         {
             "path":"test/path.txt",
             "name": "path.txt",
+            "type": "file",
             "sha1": "a_modified",
             "original_path": "",
             "copyrights": []

diff --git a/tests/data/utils/update_from_copyright_info_copyright_info_removed_new.json b/tests/data/utils/update_from_copyright_info_copyright_info_removed_new.json
@@ -10,6 +10,7 @@
         {
             "path":"test/path.txt",
             "name": "path.txt",
+            "type": "file",
             "sha1": "a",
             "original_path": "",
             "copyrights": []

diff --git a/tests/data/utils/update_from_copyright_info_copyright_info_removed_old.json b/tests/data/utils/update_from_copyright_info_copyright_info_removed_old.json
@@ -10,6 +10,7 @@
         {
             "path":"test/path.txt",
             "name": "path.txt",
+            "type": "file",
             "sha1": "a_modified",
             "original_path": "",
             "copyrights": [

diff --git a/tests/data/utils/update_from_copyright_info_file_added_one_copyright_new.json b/tests/data/utils/update_from_copyright_info_file_added_one_copyright_new.json
@@ -19,6 +19,7 @@
         {
             "path":"test/path.txt",
             "name": "path.txt",
+            "type": "file",
             "sha1": "a",
             "original_path": "",
             "copyrights": [

diff --git a/tests/data/utils/update_from_copyright_info_no_copyright_changes_new.json b/tests/data/utils/update_from_copyright_info_no_copyright_changes_new.json
@@ -10,6 +10,7 @@
         {
             "path":"test/path.txt",
             "name": "path.txt",
+            "type": "file",
             "sha1": "a",
             "original_path": "",
             "copyrights": [

diff --git a/tests/data/utils/update_from_copyright_info_no_copyright_changes_old.json b/tests/data/utils/update_from_copyright_info_no_copyright_changes_old.json
@@ -10,6 +10,7 @@
         {
             "path":"test/path.txt",
             "name": "path.txt",
+            "type": "file",
             "sha1": "a_modified",
             "original_path": "",
             "copyrights": [

diff --git a/tests/data/utils/update_from_copyright_info_no_copyright_key_value_new.json b/tests/data/utils/update_from_copyright_info_no_copyright_key_value_new.json
@@ -10,6 +10,7 @@
         {
             "path":"test/path.txt",
             "name": "path.txt",
+            "type": "file",
             "sha1": "a",
             "original_path": ""
         }

diff --git a/tests/data/utils/update_from_copyright_info_no_copyright_key_value_old.json b/tests/data/utils/update_from_copyright_info_no_copyright_key_value_old.json
@@ -10,6 +10,7 @@
         {
             "path":"test/path.txt",
             "name": "path.txt",
+            "type": "file",
             "sha1": "a_modified",
             "original_path": ""
         }

diff --git a/tests/data/utils/update_from_copyright_info_non_modified_new.json b/tests/data/utils/update_from_copyright_info_non_modified_new.json
@@ -10,6 +10,7 @@
         {
             "path":"test/path.txt",
             "name": "path.txt",
+            "type": "file",
             "sha1": "a",
             "original_path": "",
             "copyrights": [

diff --git a/tests/data/utils/update_from_copyright_info_non_modified_old.json b/tests/data/utils/update_from_copyright_info_non_modified_old.json
@@ -10,6 +10,7 @@
         {
             "path":"test/path.txt",
             "name": "path.txt",
+            "type": "file",
             "sha1": "a",
             "original_path": "",
             "copyrights": [

diff --git a/tests/data/utils/update_from_copyright_info_one_copyright_added_new.json b/tests/data/utils/update_from_copyright_info_one_copyright_added_new.json
@@ -10,6 +10,7 @@
         {
             "path":"test/path.txt",
             "name": "path.txt",
+            "type": "file",
             "sha1": "a",
             "original_path": "",
             "copyrights": [

diff --git a/tests/data/utils/update_from_copyright_info_one_copyright_added_old.json b/tests/data/utils/update_from_copyright_info_one_copyright_added_old.json
@@ -10,6 +10,7 @@
         {
             "path":"test/path.txt",
             "name": "path.txt",
+            "type": "file",
             "sha1": "a_modified",
             "original_path": "",
             "copyrights": [

diff --git a/tests/data/utils/update_from_copyright_info_one_copyright_removed_new.json b/tests/data/utils/update_from_copyright_info_one_copyright_removed_new.json
@@ -10,6 +10,7 @@
         {
             "path":"test/path.txt",
             "name": "path.txt",
+            "type": "file",
             "sha1": "a",
             "original_path": "",
             "copyrights": [

diff --git a/tests/data/utils/update_from_copyright_info_one_copyright_removed_old.json b/tests/data/utils/update_from_copyright_info_one_copyright_removed_old.json
@@ -10,6 +10,7 @@
         {
             "path":"test/path.txt",
             "name": "path.txt",
+            "type": "file",
             "sha1": "a_modified",
             "original_path": "",
             "copyrights": [

diff --git a/tests/data/utils/update_from_copyright_info_single_copyright_change_holders_only_new.json b/tests/data/utils/update_from_copyright_info_single_copyright_change_holders_only_new.json
@@ -10,6 +10,7 @@
         {
             "path":"test/path.txt",
             "name": "path.txt",
+            "type": "file",
             "sha1": "a",
             "original_path": "",
             "copyrights": [

diff --git a/tests/data/utils/update_from_copyright_info_single_copyright_change_holders_only_old.json b/tests/data/utils/update_from_copyright_info_single_copyright_change_holders_only_old.json
@@ -10,6 +10,7 @@
         {
             "path":"test/path.txt",
             "name": "path.txt",
+            "type": "file",
             "sha1": "a_modified",
             "original_path": "",
             "copyrights": [

diff --git a/tests/data/utils/update_from_copyright_info_single_copyright_change_new.json b/tests/data/utils/update_from_copyright_info_single_copyright_change_new.json
@@ -10,6 +10,7 @@
         {
             "path":"test/path.txt",
             "name": "path.txt",
+            "type": "file",
             "sha1": "a",
             "original_path": "",
             "copyrights": [

diff --git a/tests/data/utils/update_from_copyright_info_single_copyright_change_old.json b/tests/data/utils/update_from_copyright_info_single_copyright_change_old.json
@@ -10,6 +10,7 @@
         {
             "path":"test/path.txt",
             "name": "path.txt",
+            "type": "file",
             "sha1": "a_modified",
             "original_path": "",
             "copyrights": [

diff --git a/tests/data/utils/update_from_copyright_info_single_copyright_change_statements_only_new.json b/tests/data/utils/update_from_copyright_info_single_copyright_change_statements_only_new.json
@@ -10,6 +10,7 @@
         {
             "path":"test/path.txt",
             "name": "path.txt",
+            "type": "file",
             "sha1": "a",
             "original_path": "",
             "copyrights": [

diff --git a/tests/data/utils/update_from_copyright_info_single_copyright_change_statements_only_old.json b/tests/data/utils/update_from_copyright_info_single_copyright_change_statements_only_old.json
@@ -10,6 +10,7 @@
         {
             "path":"test/path.txt",
             "name": "path.txt",
+            "type": "file",
             "sha1": "a_modified",
             "original_path": "",
             "copyrights": [

diff --git a/tests/data/utils/update_from_lic_copy_info_copyright_and_license_info_added_new.json b/tests/data/utils/update_from_lic_copy_info_copyright_and_license_info_added_new.json
@@ -10,6 +10,7 @@
         {
             "path":"test/path.txt",
             "name": "path.txt",
+            "type": "file",
             "sha1": "a",
             "original_path": "",
             "licenses": [

diff --git a/tests/data/utils/update_from_lic_copy_info_copyright_and_license_info_added_old.json b/tests/data/utils/update_from_lic_copy_info_copyright_and_license_info_added_old.json
@@ -10,6 +10,7 @@
         {
             "path":"test/path.txt",
             "name": "path.txt",
+            "type": "file",
             "sha1": "a_modified",
             "original_path": "",
             "licenses": [],

diff --git a/tests/data/utils/update_from_lic_copy_info_copyright_and_license_info_removed_new.json b/tests/data/utils/update_from_lic_copy_info_copyright_and_license_info_removed_new.json
@@ -10,6 +10,7 @@
         {
             "path":"test/path.txt",
             "name": "path.txt",
+            "type": "file",
             "sha1": "a",
             "original_path": "",
             "licenses": [],

diff --git a/tests/data/utils/update_from_lic_copy_info_copyright_and_license_info_removed_old.json b/tests/data/utils/update_from_lic_copy_info_copyright_and_license_info_removed_old.json
@@ -10,6 +10,7 @@
         {
             "path":"test/path.txt",
             "name": "path.txt",
+            "type": "file",
             "sha1": "a_modified",
             "original_path": "",
             "licenses": [

diff --git a/tests/data/utils/update_from_lic_copy_info_copyright_change_no_license_change_new.json b/tests/data/utils/update_from_lic_copy_info_copyright_change_no_license_change_new.json
@@ -11,6 +11,7 @@
         {
             "path":"test/path.txt",
             "name": "path.txt",
+            "type": "file",
             "sha1": "a",
             "original_path": "",
             "licenses": [

diff --git a/tests/data/utils/update_from_lic_copy_info_copyright_change_no_license_change_old.json b/tests/data/utils/update_from_lic_copy_info_copyright_change_no_license_change_old.json
@@ -11,6 +11,7 @@
         {
             "path":"test/path.txt",
             "name": "path.txt",
+            "type": "file",
             "sha1": "a_modified",
             "original_path": "",
             "licenses": [

diff --git a/...s/data/utils/update_from_lic_copy_info_copyright_info_added_license_info_removed_new.json b/...s/data/utils/update_from_lic_copy_info_copyright_info_added_license_info_removed_new.json
@@ -11,6 +11,7 @@
         {
             "path":"test/path.txt",
             "name": "path.txt",
+            "type": "file",
             "sha1": "a",
             "original_path": "",
             "licenses": [],

diff --git a/...s/data/utils/update_from_lic_copy_info_copyright_info_added_license_info_removed_old.json b/...s/data/utils/update_from_lic_copy_info_copyright_info_added_license_info_removed_old.json
@@ -11,6 +11,7 @@
         {
             "path":"test/path.txt",
             "name": "path.txt",
+            "type": "file",
             "sha1": "a_modified",
             "original_path": "",
             "licenses": [

diff --git a/...ate_from_lic_copy_info_file_added_copyright_and_commercial_and_copyleft_licenses_new.json b/...ate_from_lic_copy_info_file_added_copyright_and_commercial_and_copyleft_licenses_new.json
@@ -8,17 +8,10 @@
     },
     "files_count": 2,
     "files": [
-        {
-            "path":"test",
-            "name": "path",
-            "sha1": "c",
-            "original_path": "",
-            "licenses": [],
-            "copyrights": []
-        },
         {
             "path":"/test/path.txt",
             "name": "path.txt",
+            "type": "file",
             "sha1": "a",
             "original_path": "",
             "licenses": [

diff --git a/...ate_from_lic_copy_info_file_added_copyright_and_commercial_and_copyleft_licenses_old.json b/...ate_from_lic_copy_info_file_added_copyright_and_commercial_and_copyleft_licenses_old.json
@@ -11,6 +11,7 @@
         {
             "path":"test",
             "name": "path",
+            "type": "directory",
             "sha1": "c",
             "original_path": "",
             "licenses": [],

diff --git a/...data/utils/update_from_lic_copy_info_file_added_copyright_and_permissive_license_new.json b/...data/utils/update_from_lic_copy_info_file_added_copyright_and_permissive_license_new.json
@@ -19,6 +19,7 @@
         {
             "path":"test/path.txt",
             "name": "path.txt",
+            "type": "file",
             "sha1": "a",
             "original_path": "",
             "licenses": [

diff --git a/...data/utils/update_from_lic_copy_info_file_added_copyright_and_permissive_license_old.json b/...data/utils/update_from_lic_copy_info_file_added_copyright_and_permissive_license_old.json
@@ -11,6 +11,7 @@
         {
             "path":"test",
             "name": "test",
+            "type": "directory",
             "sha1": "b",
             "original_path": "",
             "licenses": [],

diff --git a/tests/data/utils/update_from_lic_copy_info_license_change_no_copyright_change_new.json b/tests/data/utils/update_from_lic_copy_info_license_change_no_copyright_change_new.json
@@ -10,6 +10,7 @@
         {
             "path":"test/path.txt",
             "name": "path.txt",
+            "type": "file",
             "sha1": "a",
             "original_path": "",
             "licenses": [

diff --git a/tests/data/utils/update_from_lic_copy_info_license_change_no_copyright_change_old.json b/tests/data/utils/update_from_lic_copy_info_license_change_no_copyright_change_old.json
@@ -10,6 +10,7 @@
         {
             "path":"test/path.txt",
             "name": "path.txt",
+            "type": "file",
             "sha1": "a_modified",
             "original_path": "",
             "licenses": [

diff --git a/...s/data/utils/update_from_lic_copy_info_license_info_added_copyright_info_removed_new.json b/...s/data/utils/update_from_lic_copy_info_license_info_added_copyright_info_removed_new.json
@@ -11,6 +11,7 @@
         {
             "path":"test/path.txt",
             "name": "path.txt",
+            "type": "file",
             "sha1": "a",
             "original_path": "",
             "licenses": [

diff --git a/...s/data/utils/update_from_lic_copy_info_license_info_added_copyright_info_removed_old.json b/...s/data/utils/update_from_lic_copy_info_license_info_added_copyright_info_removed_old.json
@@ -11,6 +11,7 @@
         {
             "path":"test/path.txt",
             "name": "path.txt",
+            "type": "file",
             "sha1": "a_modified",
             "original_path": "",
             "licenses": [],

diff --git a/tests/data/utils/update_from_license_info_copyleft_license_info_added_new.json b/tests/data/utils/update_from_license_info_copyleft_license_info_added_new.json
@@ -11,6 +11,7 @@
         {
             "path":"test/path.txt",
             "name": "path.txt",
+            "type": "file",
             "sha1": "a",
             "original_path": "",
             "licenses": [