Update test expectations #447

Signed-off-by: Jono Yang <jyang@nexb.com>
nexB · Aug 2, 2022 · 053e311 · 053e311
1 parent 69fb4e2
commit 053e311
Show file tree

Hide file tree

Showing 12 changed files with 340 additions and 327 deletions.
diff --git a/scanpipe/tests/data/alpine_3_15_4_scan_codebase.json b/scanpipe/tests/data/alpine_3_15_4_scan_codebase.json
@@ -117,7 +117,7 @@
       "code_view_url": "",
       "vcs_url": "git+http://git.alpinelinux.org/aports/commit/?id=dfa1379357a321e638feef1cd8d55ab03d020f45",
       "copyright": "",
-      "license_expression": "",
+      "license_expression": "gpl-2.0",
       "declared_license": "GPL-2.0-only",
       "notice_text": "",
       "manifest_path": "",
@@ -185,7 +185,7 @@
       "code_view_url": "",
       "vcs_url": "git+http://git.alpinelinux.org/aports/commit/?id=aab68f8c9ab434a46710de8e12fb3206e2930a59",
       "copyright": "",
-      "license_expression": "",
+      "license_expression": "mit",
       "declared_license": "MIT",
       "notice_text": "",
       "manifest_path": "",
@@ -373,7 +373,7 @@
       "code_view_url": "",
       "vcs_url": "git+http://git.alpinelinux.org/aports/commit/?id=1ac3c1bb29eeff083c621cf6b27ad12ab93cb73a",
       "copyright": "",
-      "license_expression": "",
+      "license_expression": "gpl-2.0",
       "declared_license": "GPL-2.0-only",
       "notice_text": "",
       "manifest_path": "",
@@ -406,7 +406,7 @@
       "code_view_url": "",
       "vcs_url": "git+http://git.alpinelinux.org/aports/commit/?id=2745de7e1b09e663b477a8141b84f7d81a049963",
       "copyright": "",
-      "license_expression": "",
+      "license_expression": "gpl-2.0",
       "declared_license": "GPL-2.0-only",
       "notice_text": "",
       "manifest_path": "",
@@ -450,7 +450,7 @@
       "code_view_url": "",
       "vcs_url": "git+http://git.alpinelinux.org/aports/commit/?id=709b70bcb72738cfedc510bba08141b012038167",
       "copyright": "",
-      "license_expression": "",
+      "license_expression": "mpl-2.0 AND mit",
       "declared_license": "MPL-2.0 AND MIT",
       "notice_text": "",
       "manifest_path": "",
@@ -494,7 +494,7 @@
       "code_view_url": "",
       "vcs_url": "git+http://git.alpinelinux.org/aports/commit/?id=455e966899a9358fc94f5bce633afe8a1942095c",
       "copyright": "",
-      "license_expression": "",
+      "license_expression": "openssl-ssleay",
       "declared_license": "OpenSSL",
       "notice_text": "",
       "manifest_path": "",
@@ -562,7 +562,7 @@
       "code_view_url": "",
       "vcs_url": "git+http://git.alpinelinux.org/aports/commit/?id=60424133be2e79bbfeff3d58147a22886f817ce2",
       "copyright": "",
-      "license_expression": "",
+      "license_expression": "bsd-simplified AND bsd-new",
       "declared_license": "BSD-2-Clause AND BSD-3-Clause",
       "notice_text": "",
       "manifest_path": "",
@@ -595,7 +595,7 @@
       "code_view_url": "",
       "vcs_url": "git+http://git.alpinelinux.org/aports/commit/?id=91c7a9f3aa296b6d462c5634e7658ebdbff65bb9",
       "copyright": "",
-      "license_expression": "",
+      "license_expression": "isc AND (bsd-new OR mit)",
       "declared_license": "ISC AND (BSD-3-Clause OR MIT)",
       "notice_text": "",
       "manifest_path": "",
@@ -639,7 +639,7 @@
       "code_view_url": "",
       "vcs_url": "git+http://git.alpinelinux.org/aports/commit/?id=455e966899a9358fc94f5bce633afe8a1942095c",
       "copyright": "",
-      "license_expression": "",
+      "license_expression": "openssl-ssleay",
       "declared_license": "OpenSSL",
       "notice_text": "",
       "manifest_path": "",
@@ -683,7 +683,7 @@
       "code_view_url": "",
       "vcs_url": "git+http://git.alpinelinux.org/aports/commit/?id=bf5bbfdbf780092f387b7abe401fbfceda90c84d",
       "copyright": "",
-      "license_expression": "",
+      "license_expression": "mit",
       "declared_license": "MIT",
       "notice_text": "",
       "manifest_path": "",
@@ -727,7 +727,7 @@
       "code_view_url": "",
       "vcs_url": "git+http://git.alpinelinux.org/aports/commit/?id=bf5bbfdbf780092f387b7abe401fbfceda90c84d",
       "copyright": "",
-      "license_expression": "",
+      "license_expression": "mit AND bsd-new AND gpl-2.0-plus",
       "declared_license": "MIT BSD GPL2+",
       "notice_text": "",
       "manifest_path": "",
@@ -760,7 +760,7 @@
       "code_view_url": "",
       "vcs_url": "git+http://git.alpinelinux.org/aports/commit/?id=86b3d4fbb0a760febf3476f9a58abf8d0f728d5c",
       "copyright": "",
-      "license_expression": "",
+      "license_expression": "gpl-2.0",
       "declared_license": "GPL-2.0-only",
       "notice_text": "",
       "manifest_path": "",
@@ -793,7 +793,7 @@
       "code_view_url": "",
       "vcs_url": "git+http://git.alpinelinux.org/aports/commit/?id=2745de7e1b09e663b477a8141b84f7d81a049963",
       "copyright": "",
-      "license_expression": "",
+      "license_expression": "gpl-2.0",
       "declared_license": "GPL-2.0-only",
       "notice_text": "",
       "manifest_path": "",
@@ -826,7 +826,7 @@
       "code_view_url": "",
       "vcs_url": "git+http://git.alpinelinux.org/aports/commit/?id=74148808679f47ad96dc99e83ef73acfdeec1642",
       "copyright": "",
-      "license_expression": "",
+      "license_expression": "zlib",
       "declared_license": "Zlib",
       "notice_text": "",
       "manifest_path": "",
@@ -1658,7 +1658,7 @@
       "for_packages": [
         "pkg:alpine/alpine-baselayout@3.2.0-r18?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758"
       ],
-      "path": "alpine_3_15_4.tar.gz-extract/40e48c8ef2450e6a9e8d50b846a58ede43f1b01dd351d2bdd7dca14c5c033f20/etc/profile.d/color_prompt.sh.disabled",
+      "path": "alpine_3_15_4.tar.gz-extract/40e48c8ef2450e6a9e8d50b846a58ede43f1b01dd351d2bdd7dca14c5c033f20/etc/profile.d/README",
       "sha1": "",
       "md5": "",
       "extra_data": {},
@@ -1672,8 +1672,8 @@
       "status": "system-package",
       "tag": "img-06c7c4-layer-01-40e48c",
       "type": "file",
-      "name": "color_prompt.sh.disabled",
-      "extension": ".disabled",
+      "name": "README",
+      "extension": "",
       "programming_language": "",
       "mime_type": "inode/x-empty",
       "is_binary": false,
@@ -1687,7 +1687,7 @@
       "for_packages": [
         "pkg:alpine/alpine-baselayout@3.2.0-r18?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758"
       ],
-      "path": "alpine_3_15_4.tar.gz-extract/40e48c8ef2450e6a9e8d50b846a58ede43f1b01dd351d2bdd7dca14c5c033f20/etc/profile.d/locale.sh",
+      "path": "alpine_3_15_4.tar.gz-extract/40e48c8ef2450e6a9e8d50b846a58ede43f1b01dd351d2bdd7dca14c5c033f20/etc/profile.d/color_prompt.sh.disabled",
       "sha1": "",
       "md5": "",
       "extra_data": {},
@@ -1701,9 +1701,9 @@
       "status": "system-package",
       "tag": "img-06c7c4-layer-01-40e48c",
       "type": "file",
-      "name": "locale.sh",
-      "extension": ".sh",
-      "programming_language": "Bash",
+      "name": "color_prompt.sh.disabled",
+      "extension": ".disabled",
+      "programming_language": "",
       "mime_type": "inode/x-empty",
       "is_binary": false,
       "is_text": true,
@@ -1716,7 +1716,7 @@
       "for_packages": [
         "pkg:alpine/alpine-baselayout@3.2.0-r18?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758"
       ],
-      "path": "alpine_3_15_4.tar.gz-extract/40e48c8ef2450e6a9e8d50b846a58ede43f1b01dd351d2bdd7dca14c5c033f20/etc/profile.d/README",
+      "path": "alpine_3_15_4.tar.gz-extract/40e48c8ef2450e6a9e8d50b846a58ede43f1b01dd351d2bdd7dca14c5c033f20/etc/profile.d/locale.sh",
       "sha1": "",
       "md5": "",
       "extra_data": {},
@@ -1730,9 +1730,9 @@
       "status": "system-package",
       "tag": "img-06c7c4-layer-01-40e48c",
       "type": "file",
-      "name": "README",
-      "extension": "",
-      "programming_language": "",
+      "name": "locale.sh",
+      "extension": ".sh",
+      "programming_language": "Bash",
       "mime_type": "inode/x-empty",
       "is_binary": false,
       "is_text": true,
@@ -1888,9 +1888,9 @@
     },
     {
       "for_packages": [
-        "pkg:alpine/libcrypto1.1@1.1.1n-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758"
+        "pkg:alpine/ca-certificates-bundle@20211220-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758"
       ],
-      "path": "alpine_3_15_4.tar.gz-extract/40e48c8ef2450e6a9e8d50b846a58ede43f1b01dd351d2bdd7dca14c5c033f20/etc/ssl1.1/ct_log_list.cnf.dist",
+      "path": "alpine_3_15_4.tar.gz-extract/40e48c8ef2450e6a9e8d50b846a58ede43f1b01dd351d2bdd7dca14c5c033f20/etc/ssl/certs/ca-certificates.crt",
       "sha1": "",
       "md5": "",
       "extra_data": {},
@@ -1904,8 +1904,8 @@
       "status": "system-package",
       "tag": "img-06c7c4-layer-01-40e48c",
       "type": "file",
-      "name": "ct_log_list.cnf.dist",
-      "extension": ".dist",
+      "name": "ca-certificates.crt",
+      "extension": ".crt",
       "programming_language": "",
       "mime_type": "inode/x-empty",
       "is_binary": false,
@@ -1919,7 +1919,7 @@
       "for_packages": [
         "pkg:alpine/libcrypto1.1@1.1.1n-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758"
       ],
-      "path": "alpine_3_15_4.tar.gz-extract/40e48c8ef2450e6a9e8d50b846a58ede43f1b01dd351d2bdd7dca14c5c033f20/etc/ssl1.1/openssl.cnf",
+      "path": "alpine_3_15_4.tar.gz-extract/40e48c8ef2450e6a9e8d50b846a58ede43f1b01dd351d2bdd7dca14c5c033f20/etc/ssl1.1/ct_log_list.cnf.dist",
       "sha1": "",
       "md5": "",
       "extra_data": {},
@@ -1933,8 +1933,8 @@
       "status": "system-package",
       "tag": "img-06c7c4-layer-01-40e48c",
       "type": "file",
-      "name": "openssl.cnf",
-      "extension": ".cnf",
+      "name": "ct_log_list.cnf.dist",
+      "extension": ".dist",
       "programming_language": "",
       "mime_type": "inode/x-empty",
       "is_binary": false,
@@ -1948,7 +1948,7 @@
       "for_packages": [
         "pkg:alpine/libcrypto1.1@1.1.1n-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758"
       ],
-      "path": "alpine_3_15_4.tar.gz-extract/40e48c8ef2450e6a9e8d50b846a58ede43f1b01dd351d2bdd7dca14c5c033f20/etc/ssl1.1/openssl.cnf.dist",
+      "path": "alpine_3_15_4.tar.gz-extract/40e48c8ef2450e6a9e8d50b846a58ede43f1b01dd351d2bdd7dca14c5c033f20/etc/ssl1.1/openssl.cnf",
       "sha1": "",
       "md5": "",
       "extra_data": {},
@@ -1962,8 +1962,8 @@
       "status": "system-package",
       "tag": "img-06c7c4-layer-01-40e48c",
       "type": "file",
-      "name": "openssl.cnf.dist",
-      "extension": ".dist",
+      "name": "openssl.cnf",
+      "extension": ".cnf",
       "programming_language": "",
       "mime_type": "inode/x-empty",
       "is_binary": false,
@@ -1975,9 +1975,9 @@
     },
     {
       "for_packages": [
-        "pkg:alpine/ca-certificates-bundle@20211220-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758"
+        "pkg:alpine/libcrypto1.1@1.1.1n-r0?arch=x86_64&uuid=fixed-uid-done-for-testing-5642512d1758"
       ],
-      "path": "alpine_3_15_4.tar.gz-extract/40e48c8ef2450e6a9e8d50b846a58ede43f1b01dd351d2bdd7dca14c5c033f20/etc/ssl/certs/ca-certificates.crt",
+      "path": "alpine_3_15_4.tar.gz-extract/40e48c8ef2450e6a9e8d50b846a58ede43f1b01dd351d2bdd7dca14c5c033f20/etc/ssl1.1/openssl.cnf.dist",
       "sha1": "",
       "md5": "",
       "extra_data": {},
@@ -1991,8 +1991,8 @@
       "status": "system-package",
       "tag": "img-06c7c4-layer-01-40e48c",
       "type": "file",
-      "name": "ca-certificates.crt",
-      "extension": ".crt",
+      "name": "openssl.cnf.dist",
+      "extension": ".dist",
       "programming_language": "",
       "mime_type": "inode/x-empty",
       "is_binary": false,

diff --git a/scanpipe/tests/data/asgiref-3.3.0_load_inventory_expected.json b/scanpipe/tests/data/asgiref-3.3.0_load_inventory_expected.json
@@ -900,9 +900,9 @@
     },
     {
       "for_packages": [],
-      "path": "asgiref-3.3.0-py3-none-any.whl-extract/asgiref-3.3.0.dist-info/top_level.txt",
-      "sha1": "612390bd0d0227c009f9c99b479878adf7ac2f23",
-      "md5": "680e61db4d95c8d9501b7a49fa2bf0b2",
+      "path": "asgiref-3.3.0-py3-none-any.whl-extract/asgiref-3.3.0.dist-info/WHEEL",
+      "sha1": "ddd91bc89b15fc5c66e0fa259392955c74ba041f",
+      "md5": "5ccc7519eb42f1dfceee6e7d685f1ff5",
       "extra_data": {},
       "copyrights": [],
       "holders": [],
@@ -914,8 +914,8 @@
       "status": "",
       "tag": "",
       "type": "file",
-      "name": "top_level.txt",
-      "extension": ".txt",
+      "name": "WHEEL",
+      "extension": "",
       "programming_language": "",
       "mime_type": "text/plain",
       "is_binary": false,
@@ -927,9 +927,9 @@
     },
     {
       "for_packages": [],
-      "path": "asgiref-3.3.0-py3-none-any.whl-extract/asgiref-3.3.0.dist-info/WHEEL",
-      "sha1": "ddd91bc89b15fc5c66e0fa259392955c74ba041f",
-      "md5": "5ccc7519eb42f1dfceee6e7d685f1ff5",
+      "path": "asgiref-3.3.0-py3-none-any.whl-extract/asgiref-3.3.0.dist-info/top_level.txt",
+      "sha1": "612390bd0d0227c009f9c99b479878adf7ac2f23",
+      "md5": "680e61db4d95c8d9501b7a49fa2bf0b2",
       "extra_data": {},
       "copyrights": [],
       "holders": [],
@@ -941,8 +941,8 @@
       "status": "",
       "tag": "",
       "type": "file",
-      "name": "WHEEL",
-      "extension": "",
+      "name": "top_level.txt",
+      "extension": ".txt",
       "programming_language": "",
       "mime_type": "text/plain",
       "is_binary": false,
@@ -954,9 +954,9 @@
     },
     {
       "for_packages": [],
-      "path": "asgiref-3.3.0-py3-none-any.whl-extract/asgiref/compatibility.py",
-      "sha1": "9c74e64e9a71903bb227907ea1806eac77e52434",
-      "md5": "5231077fd0628314246fcba7817b561e",
+      "path": "asgiref-3.3.0-py3-none-any.whl-extract/asgiref/__init__.py",
+      "sha1": "91bc786d907bf3ca8b8e6277063107975780f9ca",
+      "md5": "4910b756f4e611055140e80f757d9325",
       "extra_data": {},
       "copyrights": [],
       "holders": [],
@@ -968,10 +968,10 @@
       "status": "",
       "tag": "",
       "type": "file",
-      "name": "compatibility.py",
+      "name": "__init__.py",
       "extension": ".py",
       "programming_language": "Python",
-      "mime_type": "text/x-script.python",
+      "mime_type": "text/plain",
       "is_binary": false,
       "is_text": true,
       "is_archive": false,
@@ -981,9 +981,9 @@
     },
     {
       "for_packages": [],
-      "path": "asgiref-3.3.0-py3-none-any.whl-extract/asgiref/current_thread_executor.py",
-      "sha1": "aacf7e5e2e5ba78ccfb67fa10e9e6b22c3935c9b",
-      "md5": "b4c45f37055d88dd11b15eb4de51b074",
+      "path": "asgiref-3.3.0-py3-none-any.whl-extract/asgiref/compatibility.py",
+      "sha1": "9c74e64e9a71903bb227907ea1806eac77e52434",
+      "md5": "5231077fd0628314246fcba7817b561e",
       "extra_data": {},
       "copyrights": [],
       "holders": [],
@@ -995,7 +995,7 @@
       "status": "",
       "tag": "",
       "type": "file",
-      "name": "current_thread_executor.py",
+      "name": "compatibility.py",
       "extension": ".py",
       "programming_language": "Python",
       "mime_type": "text/x-script.python",
@@ -1008,9 +1008,9 @@
     },
     {
       "for_packages": [],
-      "path": "asgiref-3.3.0-py3-none-any.whl-extract/asgiref/__init__.py",
-      "sha1": "91bc786d907bf3ca8b8e6277063107975780f9ca",
-      "md5": "4910b756f4e611055140e80f757d9325",
+      "path": "asgiref-3.3.0-py3-none-any.whl-extract/asgiref/current_thread_executor.py",
+      "sha1": "aacf7e5e2e5ba78ccfb67fa10e9e6b22c3935c9b",
+      "md5": "b4c45f37055d88dd11b15eb4de51b074",
       "extra_data": {},
       "copyrights": [],
       "holders": [],
@@ -1022,10 +1022,10 @@
       "status": "",
       "tag": "",
       "type": "file",
-      "name": "__init__.py",
+      "name": "current_thread_executor.py",
       "extension": ".py",
       "programming_language": "Python",
-      "mime_type": "text/plain",
+      "mime_type": "text/x-script.python",
       "is_binary": false,
       "is_text": true,
       "is_archive": false,