From 6240bea863d65bcf9887d0bdcd5bf1f52345b8a2 Mon Sep 17 00:00:00 2001 From: Elizabeth Mattijsen Date: Mon, 28 Jul 2025 13:02:12 +0200 Subject: [PATCH 1/5] Fix some casing typos in CPAN tests --- tests/types/cpan-test.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/types/cpan-test.json b/tests/types/cpan-test.json index b48e64a5..42e53bce 100644 --- a/tests/types/cpan-test.json +++ b/tests/types/cpan-test.json @@ -301,7 +301,7 @@ "input": { "type": "cpan", "namespace": null, - "name": "perl::Version", + "name": "Perl::Version", "version": "1.013", "qualifiers": null, "subpath": null @@ -465,7 +465,7 @@ "input": { "type": "cpan", "namespace": null, - "name": "lwp::UserAgent", + "name": "LWP::UserAgent", "version": null, "qualifiers": null, "subpath": null From 5b0aa472c419b11e6ad5774394d77f1861649592 Mon Sep 17 00:00:00 2001 From: "Salve J. Nilsen" Date: Sun, 14 Sep 2025 04:24:41 +0200 Subject: [PATCH 2/5] Update cpan-test.json Undo previous deletion --- tests/types/cpan-test.json | 200 ++++++++++++++++++++++++++++++++++++- 1 file changed, 199 insertions(+), 1 deletion(-) diff --git a/tests/types/cpan-test.json b/tests/types/cpan-test.json index c5e81bc6..0ded9d19 100644 --- a/tests/types/cpan-test.json +++ b/tests/types/cpan-test.json @@ -67,6 +67,163 @@ "expected_failure": true, "expected_failure_reason": "Should fail to build a PURL from invalid input components" }, + { + "description": "cpan valid module name. Rountrip an input purl to canonical.", + "test_group": "advanced", + "test_type": "roundtrip", + "input": "pkg:cpan/DateTime@1.55", + "expected_output": "pkg:cpan/DateTime@1.55", + "expected_failure": false, + "expected_failure_reason": null + }, + { + "description": "cpan valid module name", + "test_group": "base", + "test_type": "parse", + "input": "pkg:cpan/DateTime@1.55", + "expected_output": { + "type": "cpan", + "namespace": null, + "name": "DateTime", + "version": "1.55", + "qualifiers": null, + "subpath": null + }, + "expected_failure": false, + "expected_failure_reason": null + }, + { + "description": "cpan valid module name. Rountrip a canonical input to canonical output.", + "test_group": "base", + "test_type": "roundtrip", + "input": "pkg:cpan/DateTime@1.55", + "expected_output": "pkg:cpan/DateTime@1.55", + "expected_failure": false, + "expected_failure_reason": null + }, + { + "description": "cpan valid module name", + "test_group": "base", + "test_type": "build", + "input": { + "type": "cpan", + "namespace": null, + "name": "DateTime", + "version": "1.55", + "qualifiers": null, + "subpath": null + }, + "expected_output": "pkg:cpan/DateTime@1.55", + "expected_failure": false, + "expected_failure_reason": null + }, + { + "description": "cpan valid module name without version. Rountrip an input purl to canonical.", + "test_group": "advanced", + "test_type": "roundtrip", + "input": "pkg:cpan/URI", + "expected_output": "pkg:cpan/URI", + "expected_failure": false, + "expected_failure_reason": null + }, + { + "description": "cpan valid module name without version", + "test_group": "base", + "test_type": "parse", + "input": "pkg:cpan/URI", + "expected_output": { + "type": "cpan", + "namespace": null, + "name": "URI", + "version": null, + "qualifiers": null, + "subpath": null + }, + "expected_failure": false, + "expected_failure_reason": null + }, + { + "description": "cpan valid module name without version. Rountrip a canonical input to canonical output.", + "test_group": "base", + "test_type": "roundtrip", + "input": "pkg:cpan/URI", + "expected_output": "pkg:cpan/URI", + "expected_failure": false, + "expected_failure_reason": null + }, + { + "description": "cpan valid module name without version", + "test_group": "base", + "test_type": "build", + "input": { + "type": "cpan", + "namespace": null, + "name": "URI", + "version": null, + "qualifiers": null, + "subpath": null + }, + "expected_output": "pkg:cpan/URI", + "expected_failure": false, + "expected_failure_reason": null + }, + { + "description": "Parse test for PURL", + "test_group": "base", + "test_type": "parse", + "input": "pkg:cpan/Perl::Version@1.013", + "expected_output": { + "type": "cpan", + "namespace": null, + "name": "perl::Version", + "version": "1.013", + "qualifiers": null, + "subpath": null + }, + "expected_failure": false, + "expected_failure_reason": null + }, + { + "description": "Rountrip test for PURL", + "test_group": "base", + "test_type": "roundtrip", + "input": "pkg:cpan/Perl::Version@1.013", + "expected_output": "pkg:cpan/Perl::Version@1.013", + "expected_failure": false, + "expected_failure_reason": null + }, + { + "description": "Build test for PURL", + "test_group": "base", + "test_type": "build", + "input": { + "type": "cpan", + "namespace": null, + "name": "Perl::Version", + "version": "1.013", + "qualifiers": null, + "subpath": null + }, + "expected_output": "pkg:cpan/Perl::Version@1.013", + "expected_failure": false, + "expected_failure_reason": null + }, + { + "description": "Parse test for PURL", + "test_group": "base", + "test_type": "parse", + "input": "pkg:cpan/DROLSKY/DateTime@1.55", + "expected_output": { + "type": "cpan", + "namespace": "DROLSKY", + "name": "DateTime", + "version": "1.55", + "qualifiers": null, + "subpath": null + }, + "expected_failure": false, + "expected_failure_reason": null + }, { "description": "CPAN with just the module name and version", "test_group": "base", @@ -126,6 +283,47 @@ "expected_failure": false, "expected_failure_reason": null }, + { + "description": "Parse test for PURL", + "test_group": "base", + "test_type": "parse", + "input": "pkg:cpan/LWP::UserAgent", + "expected_output": { + "type": "cpan", + "namespace": null, + "name": "lwp::UserAgent", + "version": null, + "qualifiers": null, + "subpath": null + }, + "expected_failure": false, + "expected_failure_reason": null + }, + { + "description": "Rountrip test for PURL", + "test_group": "base", + "test_type": "roundtrip", + "input": "pkg:cpan/LWP::UserAgent", + "expected_output": "pkg:cpan/LWP::UserAgent", + "expected_failure": false, + "expected_failure_reason": null + }, + { + "description": "Build test for PURL", + "test_group": "base", + "test_type": "build", + "input": { + "type": "cpan", + "namespace": null, + "name": "LWP::UserAgent", + "version": null, + "qualifiers": null, + "subpath": null + }, + "expected_output": "pkg:cpan/LWP::UserAgent", + "expected_failure": false, + "expected_failure_reason": null + }, { "description": "Parse test for PURL", "test_group": "base", @@ -254,4 +452,4 @@ "expected_failure_reason": null } ] -} \ No newline at end of file +} From 16b6c4e33817f40268eea8fe2dfe65c001d1eae2 Mon Sep 17 00:00:00 2001 From: "Salve J. Nilsen" Date: Wed, 17 Sep 2025 17:53:48 +0200 Subject: [PATCH 3/5] Undo adding tests These tests were removed by gdt, and I shouln't have re-added them in this PR. --- tests/types/cpan-test.json | 198 ------------------------------------- 1 file changed, 198 deletions(-) diff --git a/tests/types/cpan-test.json b/tests/types/cpan-test.json index 0ded9d19..2bae6f5a 100644 --- a/tests/types/cpan-test.json +++ b/tests/types/cpan-test.json @@ -67,163 +67,6 @@ "expected_failure": true, "expected_failure_reason": "Should fail to build a PURL from invalid input components" }, - { - "description": "cpan valid module name. Rountrip an input purl to canonical.", - "test_group": "advanced", - "test_type": "roundtrip", - "input": "pkg:cpan/DateTime@1.55", - "expected_output": "pkg:cpan/DateTime@1.55", - "expected_failure": false, - "expected_failure_reason": null - }, - { - "description": "cpan valid module name", - "test_group": "base", - "test_type": "parse", - "input": "pkg:cpan/DateTime@1.55", - "expected_output": { - "type": "cpan", - "namespace": null, - "name": "DateTime", - "version": "1.55", - "qualifiers": null, - "subpath": null - }, - "expected_failure": false, - "expected_failure_reason": null - }, - { - "description": "cpan valid module name. Rountrip a canonical input to canonical output.", - "test_group": "base", - "test_type": "roundtrip", - "input": "pkg:cpan/DateTime@1.55", - "expected_output": "pkg:cpan/DateTime@1.55", - "expected_failure": false, - "expected_failure_reason": null - }, - { - "description": "cpan valid module name", - "test_group": "base", - "test_type": "build", - "input": { - "type": "cpan", - "namespace": null, - "name": "DateTime", - "version": "1.55", - "qualifiers": null, - "subpath": null - }, - "expected_output": "pkg:cpan/DateTime@1.55", - "expected_failure": false, - "expected_failure_reason": null - }, - { - "description": "cpan valid module name without version. Rountrip an input purl to canonical.", - "test_group": "advanced", - "test_type": "roundtrip", - "input": "pkg:cpan/URI", - "expected_output": "pkg:cpan/URI", - "expected_failure": false, - "expected_failure_reason": null - }, - { - "description": "cpan valid module name without version", - "test_group": "base", - "test_type": "parse", - "input": "pkg:cpan/URI", - "expected_output": { - "type": "cpan", - "namespace": null, - "name": "URI", - "version": null, - "qualifiers": null, - "subpath": null - }, - "expected_failure": false, - "expected_failure_reason": null - }, - { - "description": "cpan valid module name without version. Rountrip a canonical input to canonical output.", - "test_group": "base", - "test_type": "roundtrip", - "input": "pkg:cpan/URI", - "expected_output": "pkg:cpan/URI", - "expected_failure": false, - "expected_failure_reason": null - }, - { - "description": "cpan valid module name without version", - "test_group": "base", - "test_type": "build", - "input": { - "type": "cpan", - "namespace": null, - "name": "URI", - "version": null, - "qualifiers": null, - "subpath": null - }, - "expected_output": "pkg:cpan/URI", - "expected_failure": false, - "expected_failure_reason": null - }, - { - "description": "Parse test for PURL", - "test_group": "base", - "test_type": "parse", - "input": "pkg:cpan/Perl::Version@1.013", - "expected_output": { - "type": "cpan", - "namespace": null, - "name": "perl::Version", - "version": "1.013", - "qualifiers": null, - "subpath": null - }, - "expected_failure": false, - "expected_failure_reason": null - }, - { - "description": "Rountrip test for PURL", - "test_group": "base", - "test_type": "roundtrip", - "input": "pkg:cpan/Perl::Version@1.013", - "expected_output": "pkg:cpan/Perl::Version@1.013", - "expected_failure": false, - "expected_failure_reason": null - }, - { - "description": "Build test for PURL", - "test_group": "base", - "test_type": "build", - "input": { - "type": "cpan", - "namespace": null, - "name": "Perl::Version", - "version": "1.013", - "qualifiers": null, - "subpath": null - }, - "expected_output": "pkg:cpan/Perl::Version@1.013", - "expected_failure": false, - "expected_failure_reason": null - }, - { - "description": "Parse test for PURL", - "test_group": "base", - "test_type": "parse", - "input": "pkg:cpan/DROLSKY/DateTime@1.55", - "expected_output": { - "type": "cpan", - "namespace": "DROLSKY", - "name": "DateTime", - "version": "1.55", - "qualifiers": null, - "subpath": null - }, - "expected_failure": false, - "expected_failure_reason": null - }, { "description": "CPAN with just the module name and version", "test_group": "base", @@ -283,47 +126,6 @@ "expected_failure": false, "expected_failure_reason": null }, - { - "description": "Parse test for PURL", - "test_group": "base", - "test_type": "parse", - "input": "pkg:cpan/LWP::UserAgent", - "expected_output": { - "type": "cpan", - "namespace": null, - "name": "lwp::UserAgent", - "version": null, - "qualifiers": null, - "subpath": null - }, - "expected_failure": false, - "expected_failure_reason": null - }, - { - "description": "Rountrip test for PURL", - "test_group": "base", - "test_type": "roundtrip", - "input": "pkg:cpan/LWP::UserAgent", - "expected_output": "pkg:cpan/LWP::UserAgent", - "expected_failure": false, - "expected_failure_reason": null - }, - { - "description": "Build test for PURL", - "test_group": "base", - "test_type": "build", - "input": { - "type": "cpan", - "namespace": null, - "name": "LWP::UserAgent", - "version": null, - "qualifiers": null, - "subpath": null - }, - "expected_output": "pkg:cpan/LWP::UserAgent", - "expected_failure": false, - "expected_failure_reason": null - }, { "description": "Parse test for PURL", "test_group": "base", From 63274fc00347f1d7b026565651303f118952ef20 Mon Sep 17 00:00:00 2001 From: "Salve J. Nilsen" Date: Wed, 17 Sep 2025 18:03:29 +0200 Subject: [PATCH 4/5] Remove spurious newline From 7e4cf3d6920be467b3f2d68d8afdc507a4f3085a Mon Sep 17 00:00:00 2001 From: "Salve J. Nilsen" Date: Wed, 17 Sep 2025 18:05:06 +0200 Subject: [PATCH 5/5] Doesn't gh allow removing the last newline?