Fix SPDX validation and confirm with tests

Author: Malcolmnixon

src/DemaConsulting.SpdxModel/SpdxElement.cs

@@ -36,7 +36,7 @@ public abstract class SpdxElement
     ///     Regular expression for checking element IDs of the form "SPDXRef-name"
     /// </summary>
     protected static readonly Regex SpdxRefRegex = new(
-        "^SPDXRef-[a-zA-Z0-9,-]+$",
+        "^SPDXRef-[a-zA-Z0-9.-]+$",
         RegexOptions.None,
         TimeSpan.FromMilliseconds(100));
 

test/DemaConsulting.SpdxModel.Tests/SpdxFileTests.cs

@@ -242,6 +242,40 @@ public void SpdxFile_Validate_ReportsInvalidFileId()
             issues.Any(issue => issue.Contains("File ./file1.txt Invalid SPDX Identifier Field")));
     }
 
+    /// <summary>
+    ///     Tests that a valid file passes validation.
+    /// </summary>
+    [TestMethod]
+    public void SpdxFile_Validate_Success()
+    {
+        // Arrange: Create a valid SpdxFile instance
+        var spdxFile = new SpdxFile
+        {
+            Id = "SPDXRef-File--file1.txt-85ed0817af83a24ad8da68c2b5094de69833983c",
+            FileName = "./file1.txt",
+            Checksums =
+            [
+                new SpdxChecksum
+                {
+                    Algorithm = SpdxChecksumAlgorithm.Sha1,
+                    Value = "85ed0817af83a24ad8da68c2b5094de69833983c"
+                },
+                new SpdxChecksum
+                {
+                    Algorithm = SpdxChecksumAlgorithm.Sha256,
+                    Value = "2e5c078f9471ccf53c786b3949b34dbb9d2937da0752317f79693879ddf34d5b"
+                }
+            ]
+        };
+
+        // Act: Perform validation on the SpdxFile instance.
+        var issues = new List<string>();
+        spdxFile.Validate(issues);
+
+        // Assert: Verify that the validation reports no issues.
+        Assert.AreEqual(0, issues.Count);
+    }
+
     /// <summary>
     ///     Tests the <see cref="SpdxFileTypeExtensions.FromText(string)" /> method with valid inputs.
     /// </summary>

test/DemaConsulting.SpdxModel.Tests/SpdxPackageTests.cs

@@ -203,4 +203,28 @@ public void SpdxPackage_Validate_ReportsInvalidPackageIds()
         Assert.IsTrue(
             issues.Any(i => i.StartsWith("Package TestPackage Invalid SPDX Identifier Field")));
     }
+
+    /// <summary>
+    ///     Tests that a valid package passes validation.
+    /// </summary>
+    [TestMethod]
+    public void SpdxPackage_Validate_Success()
+    {
+        // Arrange: Construct a valid SpdxPackage
+        var package = new SpdxPackage
+        {
+            Id = "SPDXRef-Package-SpdxModel",
+            Name = "DemaConsulting.SpdxModel",
+            Version = "0.0.0",
+            DownloadLocation = "https://www.nuget.org/packages/DemaConsulting.SpdxModel",
+            Supplier = "Organization: DemaConsulting"
+        };
+
+        // Act: Validate the package
+        var issues = new List<string>();
+        package.Validate(issues, null, true);
+
+        // Assert: Verify that the validation reports no issues.
+        Assert.AreEqual(0, issues.Count);
+    }
 }

test/DemaConsulting.SpdxModel.Tests/SpdxSnippetTests.cs

@@ -153,7 +153,6 @@ public void SpdxSnippet_Enhance_AddsOrUpdatesInformationCorrectly()
         Assert.AreEqual(40, snippets[1].SnippetByteEnd);
     }
 
-
     /// <summary>
     ///     Tests that an invalid snippet ID fails validation.
     /// </summary>
@@ -177,4 +176,29 @@ public void SpdxSnippet_Validate_ReportsInvalidSnippetId()
         Assert.IsTrue(
             issues.Any(issue => issue.Contains("Snippet Invalid SPDX Identifier Field")));
     }
+
+    /// <summary>
+    ///     Tests that a valid snippet passes validation.
+    /// </summary>
+    [TestMethod]
+    public void SpdxSnippet_Validate_Success()
+    {
+        // Arrange: Create a valid SpdxSnippet
+        var snippet = new SpdxSnippet
+        {
+            Id = "SPDXRef-Snippet",
+            SnippetFromFile = "SPDXRef-File1",
+            SnippetByteStart = 100,
+            SnippetByteEnd = 200,
+            ConcludedLicense = "MIT",
+            CopyrightText = "Copyright(c) 2024 DEMA Consulting"
+        };
+
+        // Act: Validate the snippet
+        var issues = new List<string>();
+        snippet.Validate(issues);
+
+        // Assert: Verify that the validation reports no issues.
+        Assert.AreEqual(0, issues.Count);
+    }
 }