From 34fc3891625e5f4082cec617130b2535b77541fb Mon Sep 17 00:00:00 2001 From: Kyle Huey Date: Thu, 17 Nov 2022 19:41:19 -0800 Subject: [PATCH] Add tests for multiple licenses. --- .../Json/v1.4/SerializationTests.cs | 2 ++ ...st_valid-multiple-license-id-1.4.json.snap | 27 ++++++++++++++++++ ...st_valid-multiple-license-id-1.4.json.snap | 27 ++++++++++++++++++ .../v1.4/valid-multiple-license-id-1.4.json | 27 ++++++++++++++++++ .../v1.4/valid-multiple-license-id-1.4.xml | 28 +++++++++++++++++++ .../Xml/v1.4/SerializationTests.cs | 2 ++ ...est_valid-multiple-license-id-1.4.xml.snap | 28 +++++++++++++++++++ ...est_valid-multiple-license-id-1.4.xml.snap | 28 +++++++++++++++++++ 8 files changed, 169 insertions(+) create mode 100644 tests/CycloneDX.Core.Tests/Json/v1.4/__snapshots__/SerializationTests.JsonRoundTripAsyncTest_valid-multiple-license-id-1.4.json.snap create mode 100644 tests/CycloneDX.Core.Tests/Json/v1.4/__snapshots__/SerializationTests.JsonRoundTripTest_valid-multiple-license-id-1.4.json.snap create mode 100644 tests/CycloneDX.Core.Tests/Resources/v1.4/valid-multiple-license-id-1.4.json create mode 100644 tests/CycloneDX.Core.Tests/Resources/v1.4/valid-multiple-license-id-1.4.xml create mode 100644 tests/CycloneDX.Core.Tests/Xml/v1.4/__snapshots__/SerializationTests.XmlRoundTripStreamTest_valid-multiple-license-id-1.4.xml.snap create mode 100644 tests/CycloneDX.Core.Tests/Xml/v1.4/__snapshots__/SerializationTests.XmlRoundTripTest_valid-multiple-license-id-1.4.xml.snap diff --git a/tests/CycloneDX.Core.Tests/Json/v1.4/SerializationTests.cs b/tests/CycloneDX.Core.Tests/Json/v1.4/SerializationTests.cs index 38c7febf..3e4d87f4 100644 --- a/tests/CycloneDX.Core.Tests/Json/v1.4/SerializationTests.cs +++ b/tests/CycloneDX.Core.Tests/Json/v1.4/SerializationTests.cs @@ -50,6 +50,7 @@ public class SerializationTests [InlineData("valid-metadata-timestamp-1.4.json")] [InlineData("valid-metadata-tool-1.4.json")] [InlineData("valid-minimal-viable-1.4.json")] + [InlineData("valid-multiple-license-id-1.4.json")] [InlineData("valid-patch-1.4.json")] [InlineData("valid-properties-1.4.json")] [InlineData("valid-release-notes-1.4.json")] @@ -91,6 +92,7 @@ public void JsonRoundTripTest(string filename) [InlineData("valid-metadata-timestamp-1.4.json")] [InlineData("valid-metadata-tool-1.4.json")] [InlineData("valid-minimal-viable-1.4.json")] + [InlineData("valid-multiple-license-id-1.4.json")] [InlineData("valid-patch-1.4.json")] [InlineData("valid-properties-1.4.json")] [InlineData("valid-release-notes-1.4.json")] diff --git a/tests/CycloneDX.Core.Tests/Json/v1.4/__snapshots__/SerializationTests.JsonRoundTripAsyncTest_valid-multiple-license-id-1.4.json.snap b/tests/CycloneDX.Core.Tests/Json/v1.4/__snapshots__/SerializationTests.JsonRoundTripAsyncTest_valid-multiple-license-id-1.4.json.snap new file mode 100644 index 00000000..7789bcce --- /dev/null +++ b/tests/CycloneDX.Core.Tests/Json/v1.4/__snapshots__/SerializationTests.JsonRoundTripAsyncTest_valid-multiple-license-id-1.4.json.snap @@ -0,0 +1,27 @@ +{ + "bomFormat": "CycloneDX", + "specVersion": "1.4", + "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", + "version": 1, + "components": [ + { + "type": "library", + "publisher": "Acme Inc", + "group": "com.acme", + "name": "tomcat-catalina", + "version": "9.0.14", + "licenses": [ + { + "license": { + "id": "Apache-2.0" + } + }, + { + "license": { + "id": "MIT" + } + } + ] + } + ] +} diff --git a/tests/CycloneDX.Core.Tests/Json/v1.4/__snapshots__/SerializationTests.JsonRoundTripTest_valid-multiple-license-id-1.4.json.snap b/tests/CycloneDX.Core.Tests/Json/v1.4/__snapshots__/SerializationTests.JsonRoundTripTest_valid-multiple-license-id-1.4.json.snap new file mode 100644 index 00000000..7789bcce --- /dev/null +++ b/tests/CycloneDX.Core.Tests/Json/v1.4/__snapshots__/SerializationTests.JsonRoundTripTest_valid-multiple-license-id-1.4.json.snap @@ -0,0 +1,27 @@ +{ + "bomFormat": "CycloneDX", + "specVersion": "1.4", + "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", + "version": 1, + "components": [ + { + "type": "library", + "publisher": "Acme Inc", + "group": "com.acme", + "name": "tomcat-catalina", + "version": "9.0.14", + "licenses": [ + { + "license": { + "id": "Apache-2.0" + } + }, + { + "license": { + "id": "MIT" + } + } + ] + } + ] +} diff --git a/tests/CycloneDX.Core.Tests/Resources/v1.4/valid-multiple-license-id-1.4.json b/tests/CycloneDX.Core.Tests/Resources/v1.4/valid-multiple-license-id-1.4.json new file mode 100644 index 00000000..926e1ac7 --- /dev/null +++ b/tests/CycloneDX.Core.Tests/Resources/v1.4/valid-multiple-license-id-1.4.json @@ -0,0 +1,27 @@ +{ + "bomFormat": "CycloneDX", + "specVersion": "1.4", + "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", + "version": 1, + "components": [ + { + "type": "library", + "publisher": "Acme Inc", + "group": "com.acme", + "name": "tomcat-catalina", + "version": "9.0.14", + "licenses": [ + { + "license": { + "id": "Apache-2.0" + } + }, + { + "license": { + "id": "MIT" + } + } + ] + } + ] +} diff --git a/tests/CycloneDX.Core.Tests/Resources/v1.4/valid-multiple-license-id-1.4.xml b/tests/CycloneDX.Core.Tests/Resources/v1.4/valid-multiple-license-id-1.4.xml new file mode 100644 index 00000000..145e066c --- /dev/null +++ b/tests/CycloneDX.Core.Tests/Resources/v1.4/valid-multiple-license-id-1.4.xml @@ -0,0 +1,28 @@ + + + + + Acme Inc + com.acme + tomcat-catalina + 9.0.14 + Modified version of Apache Catalina + required + + 3942447fac867ae5cdb3229b658f4d48 + e6b1000b94e835ffd37f4c6dcbdad43f4b48a02a + f498a8ff2dd007e29c2074f5e4b01a9a01775c3ff3aeaf6906ea503bc5791b7b + e8f33e424f3f4ed6db76a482fde1a5298970e442c531729119e37991884bdffab4f9426b7ee11fccd074eeda0634d71697d6f88a460dce0ac8d627a29f7d1282 + + + + Apache-2.0 + + + MIT + + + pkg:maven/com.acme/tomcat-catalina@9.0.14?packaging=jar + + + diff --git a/tests/CycloneDX.Core.Tests/Xml/v1.4/SerializationTests.cs b/tests/CycloneDX.Core.Tests/Xml/v1.4/SerializationTests.cs index c34d8c69..ee112e2d 100644 --- a/tests/CycloneDX.Core.Tests/Xml/v1.4/SerializationTests.cs +++ b/tests/CycloneDX.Core.Tests/Xml/v1.4/SerializationTests.cs @@ -52,6 +52,7 @@ public class SerializationTests [InlineData("valid-metadata-timestamp-1.4.xml")] [InlineData("valid-metadata-tool-1.4.xml")] [InlineData("valid-minimal-viable-1.4.xml")] + [InlineData("valid-multiple-license-id-1.4.xml")] [InlineData("valid-patch-1.4.xml")] [InlineData("valid-properties-1.4.xml")] // [InlineData("valid-random-attributes-1.4.xml")] @@ -95,6 +96,7 @@ public void XmlRoundTripTest(string filename) [InlineData("valid-metadata-timestamp-1.4.xml")] [InlineData("valid-metadata-tool-1.4.xml")] [InlineData("valid-minimal-viable-1.4.xml")] + [InlineData("valid-multiple-license-id-1.4.xml")] [InlineData("valid-patch-1.4.xml")] [InlineData("valid-properties-1.4.xml")] // [InlineData("valid-random-attributes-1.4.xml")] diff --git a/tests/CycloneDX.Core.Tests/Xml/v1.4/__snapshots__/SerializationTests.XmlRoundTripStreamTest_valid-multiple-license-id-1.4.xml.snap b/tests/CycloneDX.Core.Tests/Xml/v1.4/__snapshots__/SerializationTests.XmlRoundTripStreamTest_valid-multiple-license-id-1.4.xml.snap new file mode 100644 index 00000000..b2ba58d0 --- /dev/null +++ b/tests/CycloneDX.Core.Tests/Xml/v1.4/__snapshots__/SerializationTests.XmlRoundTripStreamTest_valid-multiple-license-id-1.4.xml.snap @@ -0,0 +1,28 @@ + + + + + Acme Inc + com.acme + tomcat-catalina + 9.0.14 + Modified version of Apache Catalina + required + + 3942447fac867ae5cdb3229b658f4d48 + e6b1000b94e835ffd37f4c6dcbdad43f4b48a02a + f498a8ff2dd007e29c2074f5e4b01a9a01775c3ff3aeaf6906ea503bc5791b7b + e8f33e424f3f4ed6db76a482fde1a5298970e442c531729119e37991884bdffab4f9426b7ee11fccd074eeda0634d71697d6f88a460dce0ac8d627a29f7d1282 + + + + Apache-2.0 + + + MIT + + + pkg:maven/com.acme/tomcat-catalina@9.0.14?packaging=jar + + + diff --git a/tests/CycloneDX.Core.Tests/Xml/v1.4/__snapshots__/SerializationTests.XmlRoundTripTest_valid-multiple-license-id-1.4.xml.snap b/tests/CycloneDX.Core.Tests/Xml/v1.4/__snapshots__/SerializationTests.XmlRoundTripTest_valid-multiple-license-id-1.4.xml.snap new file mode 100644 index 00000000..b2ba58d0 --- /dev/null +++ b/tests/CycloneDX.Core.Tests/Xml/v1.4/__snapshots__/SerializationTests.XmlRoundTripTest_valid-multiple-license-id-1.4.xml.snap @@ -0,0 +1,28 @@ + + + + + Acme Inc + com.acme + tomcat-catalina + 9.0.14 + Modified version of Apache Catalina + required + + 3942447fac867ae5cdb3229b658f4d48 + e6b1000b94e835ffd37f4c6dcbdad43f4b48a02a + f498a8ff2dd007e29c2074f5e4b01a9a01775c3ff3aeaf6906ea503bc5791b7b + e8f33e424f3f4ed6db76a482fde1a5298970e442c531729119e37991884bdffab4f9426b7ee11fccd074eeda0634d71697d6f88a460dce0ac8d627a29f7d1282 + + + + Apache-2.0 + + + MIT + + + pkg:maven/com.acme/tomcat-catalina@9.0.14?packaging=jar + + +