Merge remote-tracking branch 'origin/develop'

globallightingdata · Dec 1, 2021 · 744ff7c · 744ff7c
2 parents 1b45197 + 494c4f9
commit 744ff7c
Show file tree

Hide file tree

Showing 81 changed files with 1,416 additions and 659 deletions.
diff --git a/src/Gldf.Net.Tests/DomainTests/EmitterReferencesTest.cs b/src/Gldf.Net.Tests/DomainTests/EmitterReferencesTest.cs
diff --git a/src/Gldf.Net.Tests/DomainTests/EmitterTests.cs b/src/Gldf.Net.Tests/DomainTests/EmitterTests.cs
@@ -0,0 +1,34 @@
+using FluentAssertions;
+using Gldf.Net.Domain.Definition;
+using Gldf.Net.Domain.Definition.Types;
+using Gldf.Net.Domain.Product.Types;
+using NUnit.Framework;
+
+namespace Gldf.Net.Tests.DomainTests
+{
+    [TestFixture]
+    public class EmitterTests
+    {
+        [Test]
+        public void GetLightEmitters_Should_Return_Expected()
+        {
+            var possibleFittings = new EmitterBase[] { new LightEmitter(), new LightEmitter() };
+            var emitter = new Emitter { PossibleFittings = possibleFittings };
+
+            var lightEmitters = emitter.GetLightEmitters();
+
+            lightEmitters.Should().BeEquivalentTo(possibleFittings);
+        }
+
+        [Test]
+        public void GetSensorEmitters_Should_Return_Expected()
+        {
+            var possibleFittings = new EmitterBase[] { new SensorEmitter(), new SensorEmitter() };
+            var emitter = new Emitter { PossibleFittings = possibleFittings };
+
+            var sensorEmitters = emitter.GetSensorEmitters();
+
+            sensorEmitters.Should().BeEquivalentTo(possibleFittings);
+        }
+    }
+}
diff --git a/src/Gldf.Net.Tests/Gldf.Net.Tests.csproj b/src/Gldf.Net.Tests/Gldf.Net.Tests.csproj
@@ -24,6 +24,8 @@
         <EmbeddedResource Include="TestData\ControlGears\ControlGearCompleteXml.xml" />
         <EmbeddedResource Include="TestData\ControlGears\ControlGearMandatoryXml.xml" />
         <EmbeddedResource Include="TestData\Descriptive\DescriptiveAttributesXml.xml" />
+        <EmbeddedResource Include="TestData\Emitters\EmitterCompleteXml.xml" />
+        <EmbeddedResource Include="TestData\Emitters\EmitterMandatoryXml.xml" />
         <EmbeddedResource Include="TestData\Equipments\EquipmentCompleteXml.xml" />
         <EmbeddedResource Include="TestData\Equipments\EquipmentMandatoryXml.xml" />
         <EmbeddedResource Include="TestData\Files\FilesCompleteXml.xml" />

diff --git a/src/Gldf.Net.Tests/ModelSerializationTests.cs b/src/Gldf.Net.Tests/ModelSerializationTests.cs
@@ -77,6 +77,12 @@ public void SerializeAndDeserialize_Model_Should_BeSameAs_Origin(Root model, str
             new TestCaseData(EmbeddedXmlTestData.GetEquipmentCompleteModel(),
                     EmbeddedXmlTestData.GetEquipmentCompleteXml())
                 {TestName = "Equipment complete property set"},
+            new TestCaseData(EmbeddedXmlTestData.GetEmitterMandatoryModel(),
+                    EmbeddedXmlTestData.GetEmitterMandatoryXml())
+                {TestName = "Emitter mandatory property set"},
+            new TestCaseData(EmbeddedXmlTestData.GetEmitterCompleteModel(),
+                    EmbeddedXmlTestData.GetEmitterCompleteXml())
+                {TestName = "Emitter complete property set"},
             new TestCaseData(EmbeddedXmlTestData.GetGeometryMandatoryModel(),
                     EmbeddedXmlTestData.GetGeometryMandatoryXml())
                 {TestName = "Geometry mandatory property set"},

diff --git a/src/Gldf.Net.Tests/TestData/Container/GldfWithFiles.gldf b/src/Gldf.Net.Tests/TestData/Container/GldfWithFiles.gldf
diff --git a/src/Gldf.Net.Tests/TestData/Container/GldfWithHeaderMandatory.gldf b/src/Gldf.Net.Tests/TestData/Container/GldfWithHeaderMandatory.gldf
diff --git a/src/Gldf.Net.Tests/TestData/Container/GldfWithInvalidRoot.gldf b/src/Gldf.Net.Tests/TestData/Container/GldfWithInvalidRoot.gldf
diff --git a/src/Gldf.Net.Tests/TestData/Container/GldfWithLargeFiles.gldf b/src/Gldf.Net.Tests/TestData/Container/GldfWithLargeFiles.gldf
diff --git a/src/Gldf.Net.Tests/TestData/Container/GldfWithMissingFiles.gldf b/src/Gldf.Net.Tests/TestData/Container/GldfWithMissingFiles.gldf
diff --git a/src/Gldf.Net.Tests/TestData/Container/GldfWithNoFiles.gldf b/src/Gldf.Net.Tests/TestData/Container/GldfWithNoFiles.gldf
diff --git a/src/Gldf.Net.Tests/TestData/Container/GldfWithOrphanedFiles.gldf b/src/Gldf.Net.Tests/TestData/Container/GldfWithOrphanedFiles.gldf
diff --git a/src/Gldf.Net.Tests/TestData/Container/GldfWithSignature.gldf b/src/Gldf.Net.Tests/TestData/Container/GldfWithSignature.gldf
diff --git a/src/Gldf.Net.Tests/TestData/ControlGears/ControlGearCompleteModel.cs b/src/Gldf.Net.Tests/TestData/ControlGears/ControlGearCompleteModel.cs
@@ -78,8 +78,8 @@ public class ControlGearCompleteModel
                         },
                         EnergyLabels = new[]
                         {
-                            new EnergyLabel {Region = "eu", Label = "A+"},
-                            new EnergyLabel {Region = "us", Label = "B"}
+                            new EnergyLabel { Region = "eu", Label = "A+" },
+                            new EnergyLabel { Region = "us", Label = "B" }
                         }
                     },
                     new ControlGear
@@ -107,6 +107,20 @@ public class ControlGearCompleteModel
                             Interface.DmxRdm
                         }
                     }
+                },
+                Emitters = new[]
+                {
+                    new Emitter
+                    {
+                        Id = "emitter",
+                        PossibleFittings = new EmitterBase[]
+                        {
+                            new LightEmitter
+                            {
+                                PhotometryId = "photometry"
+                            }
+                        }
+                    }
                 }
             },
             ProductDefinitions = new ProductDefinitions
@@ -139,12 +153,9 @@ public class ControlGearCompleteModel
                         {
                             new Locale { Language = "en", Text = "Variant 1" }
                         },
-                        EmitterReferences = new EmitterReferences
+                        Reference = new EmitterReference
                         {
-                            Reference = new LightEmitterReference
-                            {
-                                PhotometryId = "photometry"
-                            }
+                            EmitterId = "emitter"
                         }
                     }
                 }

diff --git a/src/Gldf.Net.Tests/TestData/ControlGears/ControlGearCompleteXml.xml b/src/Gldf.Net.Tests/TestData/ControlGears/ControlGearCompleteXml.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Root xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:noNamespaceSchemaLocation="https://gldf.io/xsd/gldf/0.9-beta.6/gldf.xsd">
+      xsi:noNamespaceSchemaLocation="https://gldf.io/xsd/gldf/0.9-beta.7/gldf.xsd">
     <Header>
         <Manufacturer>DIAL</Manufacturer>
         <CreationTimeCode>2021-03-29T14:30:00Z</CreationTimeCode>
@@ -62,6 +62,11 @@
                 </Interfaces>
             </ControlGear>
         </ControlGears>
+        <Emitters>
+            <Emitter id="emitter">
+                <LightEmitter photometryId="photometry" />
+            </Emitter>
+        </Emitters>
     </GeneralDefinitions>
     <ProductDefinitions>
         <ProductMetaData>
@@ -77,9 +82,7 @@
                 <VariantName>
                     <Locale language="en">Variant 1</Locale>
                 </VariantName>
-                <EmitterReferences>
-                    <LightEmitterReference photometryId="photometry" />
-                </EmitterReferences>
+                <EmitterReference emitterId="emitter"/>
             </Variant>
         </Variants>
     </ProductDefinitions>

diff --git a/src/Gldf.Net.Tests/TestData/ControlGears/ControlGearMandatoryModel.cs b/src/Gldf.Net.Tests/TestData/ControlGears/ControlGearMandatoryModel.cs
@@ -56,6 +56,20 @@ public class ControlGearMandatoryModel
                             }
                         }
                     }
+                },
+                Emitters = new[]
+                {
+                    new Emitter
+                    {
+                        Id = "emitter",
+                        PossibleFittings = new EmitterBase[]
+                        {
+                            new LightEmitter
+                            {
+                                PhotometryId = "photometry"
+                            }
+                        }
+                    }
                 }
             },
             ProductDefinitions = new ProductDefinitions
@@ -88,12 +102,9 @@ public class ControlGearMandatoryModel
                         {
                             new Locale { Language = "en", Text = "Variant 1" }
                         },
-                        EmitterReferences = new EmitterReferences
+                        Reference = new EmitterReference
                         {
-                            Reference = new LightEmitterReference
-                            {
-                                PhotometryId = "photometry"
-                            }
+                            EmitterId = "emitter"
                         }
                     }
                 }

diff --git a/src/Gldf.Net.Tests/TestData/ControlGears/ControlGearMandatoryXml.xml b/src/Gldf.Net.Tests/TestData/ControlGears/ControlGearMandatoryXml.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Root xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:noNamespaceSchemaLocation="https://gldf.io/xsd/gldf/0.9-beta.6/gldf.xsd">
+      xsi:noNamespaceSchemaLocation="https://gldf.io/xsd/gldf/0.9-beta.7/gldf.xsd">
     <Header>
         <Manufacturer>DIAL</Manufacturer>
         <CreationTimeCode>2021-03-29T14:30:00Z</CreationTimeCode>
@@ -23,6 +23,11 @@
                 </Description>
             </ControlGear>
         </ControlGears>
+        <Emitters>
+            <Emitter id="emitter">
+                <LightEmitter photometryId="photometry" />
+            </Emitter>
+        </Emitters>
     </GeneralDefinitions>
     <ProductDefinitions>
         <ProductMetaData>
@@ -38,9 +43,7 @@
                 <VariantName>
                     <Locale language="en">Variant 1</Locale>
                 </VariantName>
-                <EmitterReferences>
-                    <LightEmitterReference photometryId="photometry" />
-                </EmitterReferences>
+                <EmitterReference emitterId="emitter"/>
             </Variant>
         </Variants>
     </ProductDefinitions>

diff --git a/src/Gldf.Net.Tests/TestData/Descriptive/DescriptiveAttributesModel.cs b/src/Gldf.Net.Tests/TestData/Descriptive/DescriptiveAttributesModel.cs
@@ -44,6 +44,20 @@ public class DescriptiveAttributesModel
                             FileId = "eulumdat"
                         }
                     }
+                },
+                Emitters = new[]
+                {
+                    new Emitter
+                    {
+                        Id = "emitter",
+                        PossibleFittings = new EmitterBase[]
+                        {
+                            new LightEmitter
+                            {
+                                PhotometryId = "photometry"
+                            }
+                        }
+                    }
                 }
             },
             ProductDefinitions = new ProductDefinitions
@@ -76,12 +90,9 @@ public class DescriptiveAttributesModel
                         {
                             new Locale { Language = "en", Text = "Variant 1" }
                         },
-                        EmitterReferences = new EmitterReferences
+                        Reference = new EmitterReference
                         {
-                            Reference = new LightEmitterReference
-                            {
-                                PhotometryId = "photometry"
-                            }
+                            EmitterId = "emitter"
                         },
                         VariantDescriptiveAttributes = new DescriptiveAttributes
                         {
@@ -190,12 +201,9 @@ public class DescriptiveAttributesModel
                         {
                             new Locale { Language = "en", Text = "Variant 2" }
                         },
-                        EmitterReferences = new EmitterReferences
+                        Reference = new EmitterReference
                         {
-                            Reference = new LightEmitterReference
-                            {
-                                PhotometryId = "photometry"
-                            }
+                            EmitterId = "emitter"
                         },
                         VariantDescriptiveAttributes = new DescriptiveAttributes
                         {
@@ -381,12 +389,9 @@ public class DescriptiveAttributesModel
                         {
                             new Locale { Language = "en", Text = "Variant 3" }
                         },
-                        EmitterReferences = new EmitterReferences
+                        Reference = new EmitterReference
                         {
-                            Reference = new LightEmitterReference
-                            {
-                                PhotometryId = "photometry"
-                            }
+                            EmitterId = "emitter"
                         },
                         VariantDescriptiveAttributes = new DescriptiveAttributes
                         {
@@ -409,12 +414,9 @@ public class DescriptiveAttributesModel
                         {
                             new Locale { Language = "en", Text = "Variant 4" }
                         },
-                        EmitterReferences = new EmitterReferences
+                        Reference = new EmitterReference
                         {
-                            Reference = new LightEmitterReference
-                            {
-                                PhotometryId = "photometry"
-                            }
+                            EmitterId = "emitter"
                         },
                         VariantDescriptiveAttributes = new DescriptiveAttributes
                         {
@@ -437,12 +439,9 @@ public class DescriptiveAttributesModel
                         {
                             new Locale { Language = "en", Text = "Variant 5" }
                         },
-                        EmitterReferences = new EmitterReferences
+                        Reference = new EmitterReference
                         {
-                            Reference = new LightEmitterReference
-                            {
-                                PhotometryId = "photometry"
-                            }
+                            EmitterId = "emitter"
                         },
                         VariantDescriptiveAttributes = new DescriptiveAttributes
                         {
@@ -465,12 +464,9 @@ public class DescriptiveAttributesModel
                         {
                             new Locale { Language = "en", Text = "Variant 6" }
                         },
-                        EmitterReferences = new EmitterReferences
+                        Reference = new EmitterReference
                         {
-                            Reference = new LightEmitterReference
-                            {
-                                PhotometryId = "photometry"
-                            }
+                            EmitterId = "emitter"
                         },
                         VariantDescriptiveAttributes = new DescriptiveAttributes
                         {
@@ -492,12 +488,9 @@ public class DescriptiveAttributesModel
                         {
                             new Locale { Language = "en", Text = "Variant 7" }
                         },
-                        EmitterReferences = new EmitterReferences
+                        Reference = new EmitterReference
                         {
-                            Reference = new LightEmitterReference
-                            {
-                                PhotometryId = "photometry"
-                            }
+                            EmitterId = "emitter"
                         },
                         VariantDescriptiveAttributes = new DescriptiveAttributes
                         {