Modified enumerated types to be parsed with case-insensitivity.

Added tests for code-coverage.

Author: Malcolmnixon

src/DemaConsulting.SpdxModel/SpdxAnnotationType.cs

@@ -54,7 +54,7 @@ public static class SpdxAnnotationTypeExtensions
     /// <exception cref="InvalidOperationException">on error</exception>
     public static SpdxAnnotationType FromText(string annotationType)
     {
-        return annotationType switch
+        return annotationType.ToUpperInvariant() switch
         {
             "" => SpdxAnnotationType.Missing,
             "REVIEW" => SpdxAnnotationType.Review,

src/DemaConsulting.SpdxModel/SpdxChecksumAlgorithm.cs

@@ -129,7 +129,7 @@ public static class SpdxChecksumAlgorithmExtensions
     /// <exception cref="InvalidOperationException">on error</exception>
     public static SpdxChecksumAlgorithm FromText(string checksumAlgorithm)
     {
-        return checksumAlgorithm switch
+        return checksumAlgorithm.ToUpperInvariant() switch
         {
             "" => SpdxChecksumAlgorithm.Missing,
             "SHA1" => SpdxChecksumAlgorithm.Sha1,
@@ -144,9 +144,9 @@ public static SpdxChecksumAlgorithm FromText(string checksumAlgorithm)
             "SHA3-256" => SpdxChecksumAlgorithm.Sha3256,
             "SHA3-384" => SpdxChecksumAlgorithm.Sha3384,
             "SHA3-512" => SpdxChecksumAlgorithm.Sha3512,
-            "BLAKE2b-256" => SpdxChecksumAlgorithm.Blake2B256,
-            "BLAKE2b-384" => SpdxChecksumAlgorithm.Blake2B384,
-            "BLAKE2b-512" => SpdxChecksumAlgorithm.Blake2B512,
+            "BLAKE2B-256" => SpdxChecksumAlgorithm.Blake2B256,
+            "BLAKE2B-384" => SpdxChecksumAlgorithm.Blake2B384,
+            "BLAKE2B-512" => SpdxChecksumAlgorithm.Blake2B512,
             "BLAKE3" => SpdxChecksumAlgorithm.Blake3,
             "ADLER32" => SpdxChecksumAlgorithm.Adler32,
             _ => throw new InvalidOperationException($"Unsupported SPDX Checksum Algorithm '{checksumAlgorithm}'")

src/DemaConsulting.SpdxModel/SpdxFileType.cs

@@ -94,7 +94,7 @@ public static class SpdxFileTypeExtensions
     /// <exception cref="InvalidOperationException">on error</exception>
     public static SpdxFileType FromText(string fileType)
     {
-        return fileType switch
+        return fileType.ToUpperInvariant() switch
         {
             "SOURCE" => SpdxFileType.Source,
             "BINARY" => SpdxFileType.Binary,

src/DemaConsulting.SpdxModel/SpdxRelationshipType.cs

@@ -269,7 +269,7 @@ public static class SpdxRelationshipTypeExtensions
     /// <exception cref="InvalidOperationException">on error</exception>
     public static SpdxRelationshipType FromText(string relationshipType)
     {
-        return relationshipType switch
+        return relationshipType.ToUpperInvariant() switch
         {
             "" => SpdxRelationshipType.Missing,
             "DESCRIBES" => SpdxRelationshipType.Describes,

test/DemaConsulting.SpdxModel.Tests/SpdxAnnotationTests.cs

@@ -142,4 +142,42 @@ public void Enhance()
         Assert.AreEqual("2023-11-20T12:34:23Z", annotations[1].Date);
         Assert.AreEqual(SpdxAnnotationType.Other, annotations[1].Type);
     }
+
+    /// <summary>
+    /// Tests the <see cref="SpdxAnnotationTypeExtensions.FromText(string)"/> method for the "REVIEW" annotation type.
+    /// </summary>
+    [TestMethod]
+    public void SpdxAnnotationTypeExtensions_FromText_Review()
+    {
+        Assert.AreEqual(SpdxAnnotationType.Review, SpdxAnnotationTypeExtensions.FromText("REVIEW"));
+        Assert.AreEqual(SpdxAnnotationType.Review, SpdxAnnotationTypeExtensions.FromText("review"));
+        Assert.AreEqual(SpdxAnnotationType.Review, SpdxAnnotationTypeExtensions.FromText("Review"));
+    }
+
+    /// <summary>
+    /// Tests the <see cref="SpdxAnnotationTypeExtensions.FromText(string)"/> method for an invalid annotation type.
+    /// </summary>
+    [TestMethod]
+    public void SpdxAnnotationTypeExtensions_FromText_Invalid()
+    {
+        Assert.ThrowsException<InvalidOperationException>(() => SpdxAnnotationTypeExtensions.FromText("invalid"));
+    }
+
+    /// <summary>
+    /// Tests the <see cref="SpdxAnnotationTypeExtensions.ToText(SpdxAnnotationType)"/> method for the "REVIEW" annotation type.
+    /// </summary>
+    [TestMethod]
+    public void SpdxAnnotationTypeExtensions_ToText_Review()
+    {
+        Assert.AreEqual("REVIEW", SpdxAnnotationType.Review.ToText());
+    }
+
+    /// <summary>
+    /// Tests the <see cref="SpdxAnnotationTypeExtensions.ToText(SpdxAnnotationType)"/> method for an invalid annotation type.
+    /// </summary>
+    [TestMethod]
+    public void SpdxAnnotationTypeExtensions_ToText_Invalid()
+    {
+        Assert.ThrowsException<InvalidOperationException>(() => ((SpdxAnnotationType)1000).ToText());
+    }
 }

test/DemaConsulting.SpdxModel.Tests/SpdxChecksumTests.cs

@@ -123,4 +123,40 @@ public void Enhance()
         Assert.AreEqual(SpdxChecksumAlgorithm.Md5, checksums[1].Algorithm);
         Assert.AreEqual("624c1abb3664f4b35547e7c73864ad24", checksums[1].Value);
     }
+
+    /// <summary>
+    /// Tests the <see cref="SpdxChecksumAlgorithmExtensions.FromText(string)"/> method.
+    /// </summary>
+    [TestMethod]
+    public void SpdxChecksumAlgorithmExtensions_FromText_Sha256()
+    {
+        Assert.AreEqual(SpdxChecksumAlgorithm.Sha256, SpdxChecksumAlgorithmExtensions.FromText("SHA256"));
+    }
+
+    /// <summary>
+    /// Tests the <see cref="SpdxChecksumAlgorithmExtensions.FromText(string)"/> method.
+    /// </summary>
+    [TestMethod]
+    public void SpdxChecksumAlgorithmExtensions_FromText_InvalidAlgorithm()
+    {
+        Assert.ThrowsException<InvalidOperationException>(() => SpdxChecksumAlgorithmExtensions.FromText("unknown"));
+    }
+
+    /// <summary>
+    /// Tests the <see cref="SpdxChecksumAlgorithmExtensions.ToText(SpdxChecksumAlgorithm)"/> method.
+    /// </summary>
+    [TestMethod]
+    public void SpdxChecksumAlgorithmExtensions_ToText_Sha256()
+    {
+        Assert.AreEqual("SHA256", SpdxChecksumAlgorithm.Sha256.ToText());
+    }
+
+    /// <summary>
+    /// Tests the <see cref="SpdxChecksumAlgorithmExtensions.ToText(SpdxChecksumAlgorithm)"/> method.
+    /// </summary>
+    [TestMethod]
+    public void SpdxChecksumAlgorithmExtensions_ToText_InvalidAlgorithm()
+    {
+        Assert.ThrowsException<InvalidOperationException>(() => ((SpdxChecksumAlgorithm)1000).ToText());
+    }
 }

test/DemaConsulting.SpdxModel.Tests/SpdxFileTests.cs

@@ -201,4 +201,42 @@ public void Enhance()
         Assert.AreEqual(SpdxChecksumAlgorithm.Sha1, files[1].Checksums[0].Algorithm);
         Assert.AreEqual("c2b4e1c67a2d28fced849ee1bb76e7391b93f125", files[1].Checksums[0].Value);
     }
+
+    /// <summary>
+    /// Tests the <see cref="SpdxFileTypeExtensions.FromText(string)"/> method.
+    /// </summary>
+    [TestMethod]
+    public void SpdxFileTypeExtensions_FromText_Source()
+    {
+        Assert.AreEqual(SpdxFileType.Source, SpdxFileTypeExtensions.FromText("SOURCE"));
+        Assert.AreEqual(SpdxFileType.Source, SpdxFileTypeExtensions.FromText("source"));
+        Assert.AreEqual(SpdxFileType.Source, SpdxFileTypeExtensions.FromText("Source"));
+    }
+
+    /// <summary>
+    /// Tests the <see cref="SpdxFileTypeExtensions.FromText(string)"/> method.
+    /// </summary>
+    [TestMethod]
+    public void SpdxFileTypeExtensions_FromText_Invalid()
+    {
+        Assert.ThrowsException<InvalidOperationException>(() => SpdxFileTypeExtensions.FromText("Invalid"));
+    }
+
+    /// <summary>
+    /// Tests the <see cref="SpdxFileTypeExtensions.ToText"/> method.
+    /// </summary>
+    [TestMethod]
+    public void SpdxFileTypeExtensions_ToText_Source()
+    {
+        Assert.AreEqual("SOURCE", SpdxFileType.Source.ToText());
+    }
+
+    /// <summary>
+    /// Tests the <see cref="SpdxFileTypeExtensions.ToText"/> method.
+    /// </summary>
+    [TestMethod]
+    public void SpdxFileTypeExtensions_ToText_Invalid()
+    {
+        Assert.ThrowsException<InvalidOperationException>(() => ((SpdxFileType)1000).ToText());
+    }
 }

test/DemaConsulting.SpdxModel.Tests/SpdxRelationshipTests.cs

@@ -181,4 +181,42 @@ public void Enhance()
         Assert.AreEqual(SpdxRelationshipType.DevToolOf, relationships[1].RelationshipType);
         Assert.AreEqual("SPDXRef-Package4", relationships[1].RelatedSpdxElement);
     }
+
+    /// <summary>
+    /// Tests the <see cref="SpdxRelationshipTypeExtensions.FromText(string)"/> method for the "CONTAINS" relationship type.
+    /// </summary>
+    [TestMethod]
+    public void SpdxRelationshipTypeExtensions_FromText_Contains()
+    {
+        Assert.AreEqual(SpdxRelationshipType.Contains, SpdxRelationshipTypeExtensions.FromText("CONTAINS"));
+        Assert.AreEqual(SpdxRelationshipType.Contains, SpdxRelationshipTypeExtensions.FromText("contains"));
+        Assert.AreEqual(SpdxRelationshipType.Contains, SpdxRelationshipTypeExtensions.FromText("Contains"));
+    }
+
+    /// <summary>
+    /// Tests the <see cref="SpdxRelationshipTypeExtensions.FromText(string)"/> method for an invalid relationship type.
+    /// </summary>
+    [TestMethod]
+    public void SpdxRelationshipTypeExtensions_FromText_Invalid()
+    {
+        Assert.ThrowsException<InvalidOperationException>(() => SpdxRelationshipTypeExtensions.FromText("Invalid"));
+    }
+
+    /// <summary>
+    /// Tests the <see cref="SpdxRelationshipTypeExtensions.ToText(SpdxRelationshipType)"/> method for the "CONTAINS" relationship type.
+    /// </summary>
+    [TestMethod]
+    public void SpdxRelationshipTypeExtensions_ToText_Contains()
+    {
+        Assert.AreEqual("CONTAINS", SpdxRelationshipType.Contains.ToText());
+    }
+
+    /// <summary>
+    /// Tests the <see cref="SpdxRelationshipTypeExtensions.ToText(SpdxRelationshipType)"/> method for an invalid relationship type.
+    /// </summary>
+    [TestMethod]
+    public void SpdxRelationshipTypeExtensions_ToText_Invalid()
+    {
+        Assert.ThrowsException<InvalidOperationException>(() => ((SpdxRelationshipType)1000).ToText());
+    }
 }