Fixes #3117 Serialization should ignore unknown elements (#3118)

* Fixes #3117 Serialization should ignore unknown elements

* throw exception

Author: rwmcintosh

src/PKSim.Infrastructure/Serialization/Xml/Serializers/UsedBuildingBlockXmlSerializer.cs

@@ -2,6 +2,7 @@
 using System.Xml.Linq;
 using PKSim.Core.Model;
 using OSPSuite.Core.Serialization.Xml;
+using OSPSuite.Serializer;
 
 namespace PKSim.Infrastructure.Serialization.Xml.Serializers
 {
@@ -33,6 +34,9 @@ protected override void TypedDeserialize(UsedBuildingBlock usedBuildingBlock, XE
          var buildingBlockNode = usedBuildingBlockNode.Elements().First();
          var serializer = SerializerRepository.SerializerFor(buildingBlockNode);
 
+         if (serializer == null)
+            throw new SerializerNotFoundException(buildingBlockNode.Name.LocalName);
+
          usedBuildingBlock.BuildingBlock = serializer.Deserialize<IPKSimBuildingBlock>(buildingBlockNode, context);
       }
    }

src/PKSim.Infrastructure/Serialization/Xml/XmlReader.cs

@@ -1,9 +1,8 @@
 using System;
 using System.Xml.Linq;
-using OSPSuite.Serializer;
+using OSPSuite.Core.Serialization.Xml;
 using OSPSuite.Serializer.Xml;
 using PKSim.Infrastructure.Serialization.Xml.Serializers;
-using OSPSuite.Core.Serialization.Xml;
 
 namespace PKSim.Infrastructure.Serialization.Xml
 {
@@ -24,7 +23,7 @@ public XmlReader(IPKSimXmlSerializerRepository serializerRepository)
 
       public T ReadFrom(XElement element, SerializationContext serializationContext)
       {
-         var itemSerializer = resolveSerializer(typeof (T), element);
+         var itemSerializer = resolveSerializer(typeof(T), element);
          _serializerRepository.DeserializeFormulaCache(element, serializationContext, itemSerializer.ObjectType);
          return itemSerializer.Deserialize<T>(element, serializationContext);
       }
@@ -39,15 +38,10 @@ public void ReadFrom(T objectToRead, XElement element, SerializationContext seri
 
       private IXmlSerializer<SerializationContext> resolveSerializer(Type typeOfObject, XElement element)
       {
-         try
-         {
-            return _serializerRepository.SerializerFor(element);
-         }
+         var serializer = _serializerRepository.SerializerFor(element);
+
          //this can happen if the given type was not registered explicitly in the serializer.
-         catch (SerializerNotFoundException)
-         {
-            return _serializerRepository.SerializerFor(typeOfObject);
-         }
+         return serializer ?? _serializerRepository.SerializerFor(typeOfObject);
       }
    }
 }

tests/PKSim.Tests/Infrastructure/XmlReaderSpecs.cs

@@ -48,7 +48,7 @@ protected override void Context()
          //serializers only defined for type but not for element
          A.CallTo(() => _serializerRepository.SerializerFor(typeof(IEntity))).Returns(_entitySerializer);
 
-         A.CallTo(() => _serializerRepository.SerializerFor(_element)).Throws(new SerializerNotFoundException("toto"));
+         A.CallTo(() => _serializerRepository.SerializerFor(_element)).Returns(null);
       }
 
       protected override void Because()

tests/PKSim.Tests/IntegrationTests/SimulationXmlSerializerSpecs.cs

@@ -1,10 +1,9 @@
 using System.Linq;
+using NUnit.Framework;
 using OSPSuite.BDDHelper;
 using OSPSuite.BDDHelper.Extensions;
-using NUnit.Framework;
 using OSPSuite.Core.Domain;
 using OSPSuite.Core.Domain.Data;
-using OSPSuite.Core.Domain.ParameterIdentifications;
 using PKSim.Core;
 using PKSim.Core.Model;
 using PKSim.Infrastructure;
@@ -62,14 +61,12 @@ public void should_have_deserialized_the_simulation_settings()
          _deserializedSimulation.Settings.ShouldNotBeNull();
       }
 
-
       [Observation]
       public void should_have_deserialized_the_solver_settings()
       {
          _deserializedSimulation.Solver.ShouldNotBeNull();
       }
 
-
       [Observation]
       public void should_have_deserialized_the_output_selection()
       {
@@ -88,7 +85,7 @@ public void should_have_deserialized_references_to_compound_in_compound_properti
          foreach (var compound in _deserializedSimulation.Compounds)
          {
             var cp = _deserializedSimulation.CompoundPropertiesFor(compound);
-            Assert.AreSame(cp.Compound,compound);
+            Assert.AreSame(cp.Compound, compound);
          }
       }