Update tallies test expectations

Reference: #2842 Signed-off-by: Jono Yang <jyang@nexb.com>
aboutcode-org · Apr 20, 2022 · 6a9576c · 6a9576c
1 parent 72504e5
commit 6a9576c
Show file tree

Hide file tree

Showing 12 changed files with 1,394 additions and 87 deletions.
diff --git a/tests/summarycode/data/plugin_consolidate/component-package-expected.json b/tests/summarycode/data/plugin_consolidate/component-package-expected.json
@@ -4,7 +4,6 @@
       "tool_name": "scancode-toolkit",
       "options": {
         "input": "<path>",
-        "--consolidate": true,
         "--copyright": true,
         "--info": true,
         "--json": "<file>",
@@ -15,6 +14,44 @@
       "output_format_version": "2.0.0",
       "message": null,
       "errors": [],
+      "warnings": [],
+      "extra_data": {
+        "spdx_license_list_version": "3.16",
+        "files_count": 7
+      }
+    },
+    {
+      "tool_name": "scancode-toolkit",
+      "options": {
+        "input": "<path>",
+        "--consolidate": true,
+        "--from-json": true,
+        "--json": "<file>"
+      },
+      "notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.",
+      "output_format_version": "2.0.0",
+      "message": null,
+      "errors": [],
+      "warnings": [
+        "The --consolidate option will be deprecated in a future version of scancode-toolkit."
+      ],
+      "extra_data": {
+        "spdx_license_list_version": "3.16",
+        "files_count": 7
+      }
+    },
+    {
+      "tool_name": "scancode-toolkit",
+      "options": {
+        "input": "<path>",
+        "--consolidate": true,
+        "--from-json": true,
+        "--json": "<file>"
+      },
+      "notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.",
+      "output_format_version": "2.0.0",
+      "message": null,
+      "errors": [],
       "warnings": [
         "The --consolidate option will be deprecated in a future version of scancode-toolkit."
       ],

diff --git a/tests/summarycode/data/tallies/copyright_tallies/tallies.expected.json b/tests/summarycode/data/tallies/copyright_tallies/tallies.expected.json
@@ -24,6 +24,54 @@
       {
         "value": null,
         "count": 4
+      },
+      {
+        "value": "Copyright (c) Jean-loup Gailly",
+        "count": 4
+      },
+      {
+        "value": "Copyright (c) Mark Adler",
+        "count": 4
+      },
+      {
+        "value": "Copyright (c) Jean-loup Gailly and Mark Adler",
+        "count": 3
+      },
+      {
+        "value": "Copyright (c) Brian Goetz and Tim Peierls",
+        "count": 1
+      },
+      {
+        "value": "Copyright (c) Christian Michelsen Research AS Advanced Computing",
+        "count": 1
+      },
+      {
+        "value": "Copyright (c) Dmitriy Anisimkov",
+        "count": 1
+      },
+      {
+        "value": "Copyright (c) Jean-loup Gailly, Brian Raiter and Gilles Vollant",
+        "count": 1
+      },
+      {
+        "value": "Copyright (c) by Henrik Ravn",
+        "count": 1
+      },
+      {
+        "value": "Copyright Henrik Ravn",
+        "count": 1
+      },
+      {
+        "value": "Copyright JBoss Inc., and individual contributors",
+        "count": 1
+      },
+      {
+        "value": "Copyright Red Hat Middleware LLC, and individual contributors",
+        "count": 1
+      },
+      {
+        "value": "Copyright Red Hat, Inc. and individual contributors",
+        "count": 1
       }
     ],
     "holders": [

diff --git a/tests/summarycode/data/tallies/copyright_tallies/tallies2.expected.json b/tests/summarycode/data/tallies/copyright_tallies/tallies2.expected.json
@@ -20,7 +20,16 @@
     }
   ],
   "tallies": {
-    "copyrights": [],
+    "copyrights": [
+      {
+        "value": "Copyright (c) Mort Bay Consulting Pty. Ltd. (Australia) and others",
+        "count": 1
+      },
+      {
+        "value": "copyright Sun Microsystems Inc.",
+        "count": 1
+      }
+    ],
     "holders": [
       {
         "value": "Mort Bay Consulting Pty. Ltd. (Australia) and others",