Fix maven tests

Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>

Author: AyanSinhaMahapatra

src/packagedcode/maven.py

@@ -72,7 +72,7 @@ def is_datafile(cls, location, filetypes=tuple()):
         Return True if the file at location is highly likely to be a POM.
         """
         if super().is_datafile(location, filetypes=filetypes):
-            return
+            return True
 
         T = contenttype.get_type(location)
         if not T.is_text:
@@ -95,7 +95,7 @@ def is_datafile(cls, location, filetypes=tuple()):
                     return True
 
     @classmethod
-    def parse(cls, location, base_url='http://repo1.maven.org/maven2'):
+    def parse(cls, location, base_url='https://repo1.maven.org/maven2'):
         return parse(
             location=location,
             datasource_id=cls.datasource_id,
@@ -242,7 +242,7 @@ def build_url(
     artifact_id,
     version,
     filename=None,
-    base_url='http://repo1.maven.org/maven2',
+    base_url='https://repo1.maven.org/maven2',
 ):
     """
     Return a download URL for a Maven artifact built from its POM "coordinates".
@@ -302,11 +302,11 @@ def to_dict(self):
         Return a mapping representing this POM
         """
         return {
-            'group_id', self.group_id,
-            'artifact_id', self.artifact_id,
-            'version', str(self.version) if self.version else None,
-            'classifier', self.classifier,
-            'type', self.type,
+            'group_id': self.group_id,
+            'artifact_id': self.artifact_id,
+            'version': str(self.version) if self.version else None,
+            'classifier': self.classifier,
+            'type': self.type,
         }
 
 
@@ -908,7 +908,7 @@ def get_maven_pom(location=None):
     if not hbpa:
         if TRACE:
             logger.debug(f'get_maven_pom: has_basic_pom_attributes: {hbpa}')
-        return {}
+        return
     return pom
 
 
@@ -1033,7 +1033,7 @@ def get_parties(pom):
     return parties
 
 
-def get_urls(namespace, name, version, qualifiers, base_url='http://repo1.maven.org/maven2'):
+def get_urls(namespace, name, version, qualifiers, base_url='https://repo1.maven.org/maven2'):
     """
     Return a mapping of URLs.
     """
@@ -1089,7 +1089,7 @@ def parse(
     datasource_id,
     package_type,
     primary_language,
-    base_url='http://repo1.maven.org/maven2',
+    base_url='https://repo1.maven.org/maven2',
 ):
     """
     Yield Packagedata objects from parsing a Maven pom file at `location` or
@@ -1153,7 +1153,6 @@ def parse(
 
     scm = pom.scm or {}
     urls = build_vcs_and_code_view_urls(scm)
-    print(urls)
     urls.update(get_urls(
         namespace=group_id,
         name=artifact_id, version=version,
@@ -1206,7 +1205,7 @@ def build_vcs_and_code_view_urls(scm):
         if code_view_url:
             # we can craft a vcs_url in some cases
             vcs_url = code_view_url
-        return vcs_url, code_view_url
+        return dict(vcs_url=vcs_url, code_view_url=code_view_url,)
 
     vcs_url = parse_scm_connection(vcs_url)
 

src/packagedcode/spec.py

@@ -69,12 +69,12 @@ def get_source(line):
 
 # mapping of parser callable by its field name
 PARSER_BY_NAME = {
-    'name': partial(get_value, name='name', match=parse_name),
-    'version': partial(get_value, name='version', match=parse_version),
-    'license': partial(get_value, name='license', match=parse_license),
-    'summary': partial(get_value, name='summary', match=parse_summary),
-    'description': partial(get_value, name='description', match=parse_description),
-    'homepage': partial(get_value, name='homepage', match=parse_homepage),
+    'name': partial(get_value, name='name', matcher=parse_name),
+    'version': partial(get_value, name='version', matcher=parse_version),
+    'license': partial(get_value, name='license', matcher=parse_license),
+    'summary': partial(get_value, name='summary', matcher=parse_summary),
+    'description': partial(get_value, name='description', matcher=parse_description),
+    'homepage': partial(get_value, name='homepage', matcher=parse_homepage),
     'source': get_source,
 }
 
@@ -92,11 +92,11 @@ def parse_spec(location, package_type):
             line = pre_process(line)
 
             for attribute_name, parser in PARSER_BY_NAME.items():
-                parsed = parser(line)
+                parsed = parser(line=line)
                 if parsed:
                     spec_data[attribute_name] = parsed
 
-            match = parse_description(line)
+            match = parse_description.match(line)
             if match:
                 if location.endswith('.gemspec'):
                     # FIXME: description can be in single or multi-lines

tests/packagedcode/data/m2/ant/ant-launcher/1.6.5/ant-launcher-1.6.5.pom.package.json

@@ -27,10 +27,12 @@
   "source_packages": [
     "pkg:maven/ant/ant-launcher@1.6.5?classifier=sources"
   ],
+  "file_references": [],
   "extra_data": {},
   "dependencies": [],
-  "purl": "pkg:maven/ant/ant-launcher@1.6.5",
   "repository_homepage_url": "https://repo1.maven.org/maven2/ant/ant-launcher/1.6.5/",
   "repository_download_url": "https://repo1.maven.org/maven2/ant/ant-launcher/1.6.5/ant-launcher-1.6.5.jar",
-  "api_data_url": "https://repo1.maven.org/maven2/ant/ant-launcher/1.6.5/ant-launcher-1.6.5.pom"
+  "api_data_url": "https://repo1.maven.org/maven2/ant/ant-launcher/1.6.5/ant-launcher-1.6.5.pom",
+  "datasource_id": "maven_pom",
+  "purl": "pkg:maven/ant/ant-launcher@1.6.5"
 }

tests/packagedcode/data/m2/ant/ant/1.6.5/ant-1.6.5.pom.package.json

@@ -27,6 +27,7 @@
   "source_packages": [
     "pkg:maven/ant/ant@1.6.5?classifier=sources"
   ],
+  "file_references": [],
   "extra_data": {},
   "dependencies": [
     {
@@ -48,8 +49,9 @@
       "resolved_package": {}
     }
   ],
-  "purl": "pkg:maven/ant/ant@1.6.5",
   "repository_homepage_url": "https://repo1.maven.org/maven2/ant/ant/1.6.5/",
   "repository_download_url": "https://repo1.maven.org/maven2/ant/ant/1.6.5/ant-1.6.5.jar",
-  "api_data_url": "https://repo1.maven.org/maven2/ant/ant/1.6.5/ant-1.6.5.pom"
+  "api_data_url": "https://repo1.maven.org/maven2/ant/ant/1.6.5/ant-1.6.5.pom",
+  "datasource_id": "maven_pom",
+  "purl": "pkg:maven/ant/ant@1.6.5"
 }

tests/packagedcode/data/m2/antlr/antlr/2.7.6/antlr-2.7.6.pom.package.json

@@ -27,10 +27,12 @@
   "source_packages": [
     "pkg:maven/antlr/antlr@2.7.6?classifier=sources"
   ],
+  "file_references": [],
   "extra_data": {},
   "dependencies": [],
-  "purl": "pkg:maven/antlr/antlr@2.7.6",
   "repository_homepage_url": "https://repo1.maven.org/maven2/antlr/antlr/2.7.6/",
   "repository_download_url": "https://repo1.maven.org/maven2/antlr/antlr/2.7.6/antlr-2.7.6.jar",
-  "api_data_url": "https://repo1.maven.org/maven2/antlr/antlr/2.7.6/antlr-2.7.6.pom"
+  "api_data_url": "https://repo1.maven.org/maven2/antlr/antlr/2.7.6/antlr-2.7.6.pom",
+  "datasource_id": "maven_pom",
+  "purl": "pkg:maven/antlr/antlr@2.7.6"
 }

tests/packagedcode/data/m2/aopalliance/aopalliance/1.0/aopalliance-1.0.pom.package.json

@@ -34,10 +34,12 @@
   "source_packages": [
     "pkg:maven/aopalliance/aopalliance@1.0?classifier=sources"
   ],
+  "file_references": [],
   "extra_data": {},
   "dependencies": [],
-  "purl": "pkg:maven/aopalliance/aopalliance@1.0",
   "repository_homepage_url": "https://repo1.maven.org/maven2/aopalliance/aopalliance/1.0/",
   "repository_download_url": "https://repo1.maven.org/maven2/aopalliance/aopalliance/1.0/aopalliance-1.0.jar",
-  "api_data_url": "https://repo1.maven.org/maven2/aopalliance/aopalliance/1.0/aopalliance-1.0.pom"
+  "api_data_url": "https://repo1.maven.org/maven2/aopalliance/aopalliance/1.0/aopalliance-1.0.pom",
+  "datasource_id": "maven_pom",
+  "purl": "pkg:maven/aopalliance/aopalliance@1.0"
 }

tests/packagedcode/data/m2/asm/asm-attrs/1.5.3/asm-attrs-1.5.3.pom.package.json

@@ -49,10 +49,12 @@
   "source_packages": [
     "pkg:maven/asm/asm-attrs@1.5.3?classifier=sources"
   ],
+  "file_references": [],
   "extra_data": {},
   "dependencies": [],
-  "purl": "pkg:maven/asm/asm-attrs@1.5.3",
   "repository_homepage_url": "https://repo1.maven.org/maven2/asm/asm-attrs/1.5.3/",
   "repository_download_url": "https://repo1.maven.org/maven2/asm/asm-attrs/1.5.3/asm-attrs-1.5.3.jar",
-  "api_data_url": "https://repo1.maven.org/maven2/asm/asm-attrs/1.5.3/asm-attrs-1.5.3.pom"
+  "api_data_url": "https://repo1.maven.org/maven2/asm/asm-attrs/1.5.3/asm-attrs-1.5.3.pom",
+  "datasource_id": "maven_pom",
+  "purl": "pkg:maven/asm/asm-attrs@1.5.3"
 }

tests/packagedcode/data/m2/asm/asm-parent/3.0/asm-parent-3.0.pom.package.json

@@ -49,6 +49,7 @@
   "source_packages": [
     "pkg:maven/asm/asm-parent@3.0?classifier=sources"
   ],
+  "file_references": [],
   "extra_data": {},
   "dependencies": [
     {
@@ -106,8 +107,9 @@
       "resolved_package": {}
     }
   ],
-  "purl": "pkg:maven/asm/asm-parent@3.0",
   "repository_homepage_url": "https://repo1.maven.org/maven2/asm/asm-parent/3.0/",
   "repository_download_url": "https://repo1.maven.org/maven2/asm/asm-parent/3.0/asm-parent-3.0.jar",
-  "api_data_url": "https://repo1.maven.org/maven2/asm/asm-parent/3.0/asm-parent-3.0.pom"
+  "api_data_url": "https://repo1.maven.org/maven2/asm/asm-parent/3.0/asm-parent-3.0.pom",
+  "datasource_id": "maven_pom",
+  "purl": "pkg:maven/asm/asm-parent@3.0"
 }

tests/packagedcode/data/m2/asm/asm/1.5.3/asm-1.5.3.pom.package.json

@@ -49,10 +49,12 @@
   "source_packages": [
     "pkg:maven/asm/asm@1.5.3?classifier=sources"
   ],
+  "file_references": [],
   "extra_data": {},
   "dependencies": [],
-  "purl": "pkg:maven/asm/asm@1.5.3",
   "repository_homepage_url": "https://repo1.maven.org/maven2/asm/asm/1.5.3/",
   "repository_download_url": "https://repo1.maven.org/maven2/asm/asm/1.5.3/asm-1.5.3.jar",
-  "api_data_url": "https://repo1.maven.org/maven2/asm/asm/1.5.3/asm-1.5.3.pom"
+  "api_data_url": "https://repo1.maven.org/maven2/asm/asm/1.5.3/asm-1.5.3.pom",
+  "datasource_id": "maven_pom",
+  "purl": "pkg:maven/asm/asm@1.5.3"
 }

tests/packagedcode/data/m2/asm/asm/3.0/asm-3.0.pom.package.json

@@ -27,10 +27,12 @@
   "source_packages": [
     "pkg:maven/asm/asm@3.0?classifier=sources"
   ],
+  "file_references": [],
   "extra_data": {},
   "dependencies": [],
-  "purl": "pkg:maven/asm/asm@3.0",
   "repository_homepage_url": "https://repo1.maven.org/maven2/asm/asm/3.0/",
   "repository_download_url": "https://repo1.maven.org/maven2/asm/asm/3.0/asm-3.0.jar",
-  "api_data_url": "https://repo1.maven.org/maven2/asm/asm/3.0/asm-3.0.pom"
+  "api_data_url": "https://repo1.maven.org/maven2/asm/asm/3.0/asm-3.0.pom",
+  "datasource_id": "maven_pom",
+  "purl": "pkg:maven/asm/asm@3.0"
 }