Merge pull request #1030 from nexB/990-load-from-json

Add test for minimal virtualcodebase #990

Author: pombredanne

src/scancode/resource.py

@@ -1130,7 +1130,7 @@ def res_data(file_data):
             file_data.pop('base_name', None)
             file_data.pop('extension', None)
 
-            file_type = file_data.pop('type', False)
+            file_type = file_data.pop('type', 'file')
             is_file = file_type == 'file'
 
             return name, path, is_file, file_data

tests/scancode/data/resource/virtual_codebase/noinfo.json

@@ -0,0 +1,30 @@
+{
+  "scancode_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.",
+  "scancode_version": "2.9.1.post71.a1f6ea002",
+  "scancode_options": {
+    "input": "NOTICE",
+    "--copyright": true,
+    "--json-pp": "noinfo.json"
+  },
+  "files_count": 1,
+  "files": [
+    {
+      "path": "NOTICE",
+      "type": "file",
+      "copyrights": [
+        {
+          "statements": [
+            "Copyright (c) 2017 nexB Inc. and others."
+          ],
+          "holders": [
+            "nexB Inc. and others."
+          ],
+          "authors": [],
+          "start_line": 4,
+          "end_line": 4
+        }
+      ],
+      "scan_errors": []
+    }
+  ]
+}

tests/scancode/data/resource/virtual_codebase/only-path.json

@@ -0,0 +1,8 @@
+{
+  "files_count": 1,
+  "files": [
+    {
+      "path": "NOTICE"
+    }
+  ]
+}

tests/scancode/test_resource.py

@@ -27,16 +27,17 @@
 from __future__ import print_function
 from __future__ import unicode_literals
 
+from collections import OrderedDict
 from os.path import dirname
 from os.path import exists
 from os.path import join
 
 from commoncode.testcase import FileBasedTesting
+from commoncode.fileutils import parent_directory
 
 from scancode.resource import Codebase
-from scancode.resource import VirtualCodebase
-from commoncode.fileutils import parent_directory
 from scancode.resource import get_path
+from scancode.resource import VirtualCodebase
 
 
 class TestCodebase(FileBasedTesting):
@@ -411,7 +412,6 @@ def test_get_path(self):
         assert full == full_skipped
 
     def test_compute_counts_when_using_disk_cache(self):
-        from functools import partial
 
         test_codebase = self.get_test_loc('resource/samples')
         codebase = Codebase(test_codebase, strip_root=True, max_in_memory=-1)
@@ -421,6 +421,7 @@ def test_compute_counts_when_using_disk_cache(self):
         assert size_count == 0
 
     def test_low_max_in_memory_does_not_raise_exception_when_ignoring_files(self):
+
         def is_ignored(location, ignores):
             """
             Return a tuple of (pattern , message) if a file at location is ignored or
@@ -848,6 +849,37 @@ def test_virtual_codebase_get_resource(self):
                                            plugin_attributes=attributes)
         assert virtual_codebase.root is virtual_codebase.get_resource(0)
 
+    def test_virtual_codebase_can_process_minimal_resources_without_info(self):
+        scan_data = self.get_test_loc('resource/virtual_codebase/noinfo.json')
+        codebase = VirtualCodebase(json_scan_location=scan_data, plugin_attributes={})
+        expected = [
+            OrderedDict([
+                (u'path', u'NOTICE'),
+                (u'type', u'file'),
+                (u'copyrights', [
+                    OrderedDict([
+                        (u'statements', [u'Copyright (c) 2017 nexB Inc. and others.']),
+                        (u'holders', [u'nexB Inc. and others.']),
+                        (u'authors', []),
+                        (u'start_line', 4),
+                        (u'end_line', 4)
+                    ])
+                ]),
+                (u'scan_errors', [])
+            ])
+        ]
+        assert expected == [r.to_dict() for r in codebase.walk()]
+
+    def test_virtual_codebase_can_process_minimal_resources_with_only_path(self):
+        scan_data = self.get_test_loc('resource/virtual_codebase/only-path.json')
+        codebase = VirtualCodebase(json_scan_location=scan_data, plugin_attributes={})
+        expected = [OrderedDict([
+            (u'path', u'NOTICE'),
+            (u'type', u'file'),
+            (u'scan_errors', [])
+        ])]
+        assert expected == [r.to_dict() for r in codebase.walk()]
+
 
 class TestVirtualCodebaseCache(FileBasedTesting):
     test_data_dir = join(dirname(__file__), 'data')