Detect KISA copyright holder with parenthesized expansion

AUTHORS.rst

@@ -102,6 +102,7 @@ The following organizations or individuals have contributed to ScanCode:
 - Vibhu Agarwal @Vibhu-Agarwal
 - Viktor Tiulpin @tiulpin
 - Vinay Kumar Singh @Vinay0001
+- Vincent Gao @gaoflow
 - Virag Umathe @viragumathe5
 - Yash D. Saraf @yashdsaraf
 - Yash Nisar @yash-nisar

src/cluecode/copyrights.py

@@ -1234,6 +1234,9 @@ def build_detection_from_node(
 
     (r"^[a-z].+\(s\)[\.,]?$", 'JUNK'),
 
+    # KISA with an opening parenthesized expansion, as in "KISA(Korea"
+    (r"^KISA\(Korea$", 'NNP'),
+
     # parens in the middle: for(var
     (r"^[a-zA-Z]+[\)\(]+,?[\)\(]?[a-zA-Z]+[\.,]?$", 'JUNK'),
 

tests/cluecode/data/copyrights/kisa_seed_local.h

@@ -0,0 +1 @@
+Copyright (c) 2007 KISA(Korea Information Security Agency).

tests/cluecode/data/copyrights/kisa_seed_local.h.yml

@@ -0,0 +1,7 @@
+what:
+  - copyrights
+  - holders
+copyrights:
+  - Copyright (c) 2007 KISA(Korea Information Security Agency)
+holders:
+  - KISA(Korea Information Security Agency)

tests/licensedcode/test_detect.py

@@ -1075,8 +1075,8 @@ def test_match_has_correct_line_positions_in_automake_perl_file(self):
         expected = [
             # detected, match.lines(), match.qspan,
             ('gpl-2.0-plus', (12, 25), Span(51, 160)),
-            ('fsf-unlimited-no-warranty', (231, 238), Span(986, 1049)),
-            ('warranty-disclaimer', (306, 307), Span(1359, 1381)),
+            ('fsf-unlimited-no-warranty', (231, 238), Span(998, 1061)),
+            ('warranty-disclaimer', (306, 307), Span(1371, 1393)),
         ]
         self.check_position('positions/automake.pl', expected)
 

tests/scancode/test_cli.py

@@ -167,8 +167,7 @@ def test_scan_info_returns_full_root():
     result_data = json.loads(open(result_file).read())
     file_paths = [f['path'] for f in result_data['files']]
     assert len(file_paths) == 12
-    # note that we strip paths from leading and trailing slashes
-    root = fileutils.as_posixpath(test_dir).strip('/')
+    root = fileutils.as_posixpath(test_dir)
     assert all(p.startswith(root) for p in file_paths)
 
 
@@ -182,9 +181,8 @@ def test_scan_info_returns_correct_full_root_with_single_file():
     # we have a single file
     assert len(files) == 1
     scanned_file = files[0]
-    # and we check that the path is the full path without repeating the file name
-    # note that the path never contain leading and trailing slashes
-    assert scanned_file['path'] == fileutils.as_posixpath(test_file).strip('/')
+    # and we check that the path is the full absolute path without repeating the file name
+    assert scanned_file['path'] == fileutils.as_posixpath(test_file)
 
 
 def test_scan_info_returns_does_not_strip_root_with_single_file():