Added unit tests Signed-off-by: Carolina Oliveira <61292734+CarolinaO…

…liiveira@users.noreply.github.com>

added spdx json validator testsfor v2.2 and invalid package purpose; added converter tests from spdx v2.2 to cyclonedx

Signed-off-by: Carolina Oliveira <61292734+CarolinaOliiveira@users.noreply.github.com>

tests/CycloneDX.Spdx.Interop.Tests/ConverterTests.cs

@@ -22,38 +22,41 @@
 using Snapshooter.Xunit;
 using CycloneDX.Models;
 using CycloneDX.Spdx.Serialization;
+using System.Reflection.Metadata;
 
 namespace CycloneDX.Spdx.Interop.Tests
 {
     public class ConverterTests
     {
         [Theory]
-        [InlineData("document")]
-        public void FromSpdxToCDXToSpdxRoundTripTest(string baseFilename)
+        [InlineData("v2.2")]
+        [InlineData("v2.3")]
+        public void FromSpdxToCDXToSpdxRoundTripTest(string version)
         {
-            var resourceFilename = Path.Join("Resources", "Spdx", "v2.3", baseFilename + ".json");
+            var resourceFilename = Path.Join("Resources", "Spdx", version, "document" + ".json");
             var fileContents = File.ReadAllText(resourceFilename);
 
             var spdxDocument = JsonSerializer.Deserialize(fileContents);
             var cdxBom = spdxDocument.ToCycloneDX();
             var result = cdxBom.ToSpdx();
             var resultString = JsonSerializer.Serialize(result);
 
-            Snapshot.Match(resultString, SnapshotNameExtension.Create(baseFilename));
+            Snapshot.Match(resultString, SnapshotNameExtension.Create($"{version}document"));
         }
 
         [Theory]
-        [InlineData("document")]
-        public void FromSpdxToCDXTest(string baseFilename)
+        [InlineData("v2.2")]
+        //[InlineData("v2.3")]
+        public void FromSpdxToCDXTest(string version)
         {
-            var resourceFilename = Path.Join("Resources", "Spdx", "v2.3", baseFilename + ".json");
+            var resourceFilename = Path.Join("Resources", "Spdx",version, "document" + ".json");
             var fileContents = File.ReadAllText(resourceFilename);
 
             var spdxDocument = JsonSerializer.Deserialize(fileContents);
             var cdxBom = spdxDocument.ToCycloneDX();
             var resultString = CycloneDX.Json.Serializer.Serialize(cdxBom);
 
-            Snapshot.Match(resultString, SnapshotNameExtension.Create(baseFilename));
+            Snapshot.Match(resultString, SnapshotNameExtension.Create($"{version}document"));
         }
 
         [Theory]

tests/CycloneDX.Spdx.Interop.Tests/CycloneDX.Spdx.Interop.Tests.csproj

@@ -26,6 +26,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <None Remove="Resources\Spdx\v2.2\document.json" />
     <None Remove="__snapshots__\ConverterTests.FromCDXToSpdxTest_assembly.snap" />
     <None Remove="__snapshots__\ConverterTests.FromCDXToSpdxTest_bom.snap" />
     <None Remove="__snapshots__\ConverterTests.FromCDXToSpdxTest_component-hashes.snap" />
@@ -63,20 +64,13 @@
     <None Remove="__snapshots__\ConverterTests.FromCDXToSpdxToCDXRoundTripTest_properties.snap" />
     <None Remove="__snapshots__\ConverterTests.FromCDXToSpdxToCDXRoundTripTest_service.snap" />
     <None Remove="__snapshots__\ConverterTests.FromSpdxToCDXTest_document.snap" />
-    <None Remove="__snapshots__\ConverterTests.FromSpdxToCDXToSpdxRoundTripTest_document.snap" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\CycloneDX.Spdx\CycloneDX.Spdx.csproj" />
     <ProjectReference Include="..\..\src\CycloneDX.Spdx.Interop\CycloneDX.Spdx.Interop.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Content Update="__snapshots__\ConverterTests.FromSpdxToCDXToSpdxRoundTripTest_document.snap">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
-
   <ItemGroup>
     <Folder Include="__snapshots__\__mismatch__\" />
   </ItemGroup>