Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Assemblers/Geometry2DSectionAssembler.cs =================================================================== diff -u -r4540 -r5142 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Assemblers/Geometry2DSectionAssembler.cs (.../Geometry2DSectionAssembler.cs) (revision 4540) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Assemblers/Geometry2DSectionAssembler.cs (.../Geometry2DSectionAssembler.cs) (revision 5142) @@ -51,36 +51,6 @@ public Geometry2DSectionAssembler() : base(XMLAttributes.XmlElementName, XMLAttributes.XmlElementNamespace, XMLAttributes.XsdEmbeddedResourcePath) {} - public override XDocument CreateDataTransferObject(Geometry2DSectionParameters dtoObject) - { - XDocument doc = base.CreateDataTransferObject(dtoObject); - XNamespace tns = ElementNamespace; - - // Geometry2DSectionParameters - XElement geometry2DSectionElement = GetGeometry2DSectionParametersElement(dtoObject, tns); - if (doc.Root != null) - { - doc.Root.Add(geometry2DSectionElement); - - // Profile - SoilProfile1D profile = dtoObject.SoilProfile; - if (profile != null) - { - var soilProfileAssembler = new SoilProfileAssembler(); - XNamespace tnsa = soilProfileAssembler.ElementNamespace; - doc.Root.Add(new XAttribute(XNamespace.Xmlns + "tnsa", tnsa.NamespaceName)); - - //TODO: Remove duplicate code. The method GetProfileElement should call the SoilProfileAssembler already defined in another namespace - XElement profileElement = GetProfileElement(profile, tns, tnsa); - // XElement profileElement = soilProfileAssembler.CreateDataTransferObject(profile); //GetProfileElement(profile, tns, tnsa); - // profileElement.Name = tns.GetName(profileElement.Name.LocalName);// .SetNamespace(DamMStabAssembler.XmlElementProfile, tns.NamespaceName); - doc.Root.Add(profileElement); - } - } - - return doc; - } - public override Geometry2DSectionParameters CreateOutputObject(XDocument dtoObject) { var geometry2DSectionParameters = new Geometry2DSectionParameters(); Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/Assemblers/Geometry2DSectionAssemblerTest.cs =================================================================== diff -u -r4627 -r5142 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/Assemblers/Geometry2DSectionAssemblerTest.cs (.../Geometry2DSectionAssemblerTest.cs) (revision 4627) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/Assemblers/Geometry2DSectionAssemblerTest.cs (.../Geometry2DSectionAssemblerTest.cs) (revision 5142) @@ -110,83 +110,6 @@ #endregion [Test] - [Category(Categories.WorkInProgress), Ignore("This test is not yet implemented, waits on stix implementation")] - public void CanCreateAndValidateGeometry2DSectionXML() - { - // Do the thing: create XML element from SoilProfile - XDocument doc = assembler.CreateDataTransferObject(geometry2DSectionParameters); - - Directory.CreateDirectory(testDirectory); - doc.Save(Path.Combine(testDirectory, testFileName)); - - //// Validate against schema - //string message; - //if (!this.assembler.ValidateSchema(doc, out message)) - //{ - // Assert.Fail("SCHEMA VALIDATION: " + message); - //} - - // Compare resulting XML to original object - - // Input - XElement inputElement = (from element in doc.Root.Descendants() - where element.Name.LocalName == Geometry2DSectionAssembler.XmlElementGeometry2DSectionInput - select element).Single(); - - // Database - Assert.That(inputElement.AttributeAs(Geometry2DSectionAssembler.XmlAttributeSoilGeometry2DFilename), Is.EqualTo(geometry2DSectionParameters.SoilGeometry2DName), $"{Geometry2DSectionAssembler.XmlAttributeSoilGeometry2DFilename}"); - Assert.That(inputElement.AttributeAs(Geometry2DSectionAssembler.XmlAttributeXCoordinateSection), Is.EqualTo(geometry2DSectionParameters.XCoordinateSection), $"{Geometry2DSectionAssembler.XmlAttributeXCoordinateSection}"); - - // Profile - IEnumerable soilProfileCollectionElements = from element in doc.Root.Descendants() - where element.Name.LocalName == XMLAttributes.XmlElementProfile - select element; - - Assert.That(soilProfileCollectionElements.Count(), Is.EqualTo(1), "Number of profiles"); - - XElement soilProfileElement = soilProfileCollectionElements.Single(); - - Assert.That(soilProfileElement.Attribute(XMLAttributes.XmlAttributeName), Is.Not.Null, $"{XMLAttributes.XmlAttributeName}"); - Assert.That(soilProfileElement.AttributeAs(XMLAttributes.XmlAttributeName), Is.EqualTo(geometry2DSectionParameters.SoilProfile.Name), $"{XMLAttributes.XmlAttributeName}"); - Assert.That(soilProfileElement.Attribute(XMLAttributes.XmlAttributeXCoordinate), Is.Not.Null, $"{XMLAttributes.XmlAttributeXCoordinate}"); - Assert.That(soilProfileElement.Attribute(XMLAttributes.XmlAttributeYCoordinate), Is.Not.Null, $"{XMLAttributes.XmlAttributeYCoordinate}"); - Assert.That(soilProfileElement.Attribute(XMLAttributes.XmlAttributePhreaticLevel), Is.Not.Null, $"{XMLAttributes.XmlAttributePhreaticLevel}"); - Assert.That(soilProfileElement.Attribute(XMLAttributes.XmlAttributeHasPhreaticLevel), Is.Not.Null, $"{XMLAttributes.XmlAttributeHasPhreaticLevel}"); - Assert.That(soilProfileElement.Attribute(XMLAttributes.XmlAttributeBottomLevel), Is.Not.Null, $"{XMLAttributes.XmlAttributeBottomLevel}"); - Assert.That(soilProfileElement.AttributeAs(XMLAttributes.XmlAttributeBottomLevel), Is.EqualTo(geometry2DSectionParameters.SoilProfile.BottomLevel).Within(cTolerance), $"{XMLAttributes.XmlAttributeBottomLevel}"); - // Created no PL line so characteristic layers are unassigned - Assert.That(soilProfileElement.Attribute(XMLAttributes.XmlAttributeBottomSandLayerID), Is.Not.Null, XMLAttributes.XmlAttributeBottomSandLayerID); - Assert.That(soilProfileElement.Attribute(XMLAttributes.XmlAttributeInBetweenSandLayerID), Is.Not.Null, XMLAttributes.XmlAttributeInBetweenSandLayerID); - Assert.That(soilProfileElement.Attribute(XMLAttributes.XmlAttributeInfiltrationLayerID), Is.Null, XMLAttributes.XmlAttributeInfiltrationLayerID); - - // Profile layers - IEnumerable layersCollectionElements = from element in soilProfileElement.Descendants() - where element.Name.LocalName == XMLAttributes.XmlElementLayers - select element; - - Assert.That(layersCollectionElements.Count(), Is.EqualTo(1), "profile layer collection tag"); - - IEnumerable layerCollectionElements = from element in layersCollectionElements.Descendants() - where element.Name.LocalName == XMLAttributes.XmlElementLayer - select element; - - Assert.That(layerCollectionElements.Count(), Is.EqualTo(geometry2DSectionParameters.SoilProfile.Layers.Count), "Number of profile layers"); - - IEnumerator layerElementEnumerator = layerCollectionElements.GetEnumerator(); - foreach (SoilLayer1D layer in geometry2DSectionParameters.SoilProfile.Layers) - { - layerElementEnumerator.MoveNext(); - XElement layerElement = layerElementEnumerator.Current; - Assert.That(layerElement.Attribute(XMLAttributes.XmlAttributeID), Is.Not.Null, $"ID of layer #{geometry2DSectionParameters.SoilProfile.Layers.IndexOf(layer)}"); - Assert.That(layerElement.AttributeAs(XMLAttributes.XmlAttributeID), Is.EqualTo(layer.Name), $"ID of layer #{geometry2DSectionParameters.SoilProfile.Layers.IndexOf(layer)}"); - Assert.That(layerElement.Attribute(XMLAttributes.XmlAttributeSoilID), Is.Not.Null, $"SoilID of layer #{geometry2DSectionParameters.SoilProfile.Layers.IndexOf(layer)}"); - Assert.That(layerElement.AttributeAs(XMLAttributes.XmlAttributeSoilID), Is.EqualTo(layer.Soil.Name), $"SoilID of layer #{geometry2DSectionParameters.SoilProfile.Layers.IndexOf(layer)}"); - Assert.That(layerElement.Attribute(XMLAttributes.XmlAttributeTopLevel), Is.Not.Null, $"TopLevel of layer #{geometry2DSectionParameters.SoilProfile.Layers.IndexOf(layer)}"); - Assert.That(layerElement.AttributeAs(XMLAttributes.XmlAttributeTopLevel), Is.EqualTo(layer.TopLevel), $"TopLevel of layer #{geometry2DSectionParameters.SoilProfile.Layers.IndexOf(layer)}"); - } - } - - [Test] public void CanReadGeometry2DSectionXML() { XDocument doc = XDocument.Load(outputXml); Fisheye: Tag 5142 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/Assemblers/TestData/18_4_94.sti'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 5142 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/Assemblers/TestData/1D1.sti'. Fisheye: No comparison available. Pass `N' to diff?