Index: DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/FillDamFromXmlInputTests.cs =================================================================== diff -u -r3893 -r4000 --- DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/FillDamFromXmlInputTests.cs (.../FillDamFromXmlInputTests.cs) (revision 3893) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/FillDamFromXmlInputTests.cs (.../FillDamFromXmlInputTests.cs) (revision 4000) @@ -26,6 +26,7 @@ using Deltares.DamEngine.TestHelpers.Factories; using KellermanSoftware.CompareNetObjects; using NUnit.Framework; +using Location = Deltares.DamEngine.Data.General.Location; namespace Deltares.DamEngine.Interface.Tests { @@ -74,7 +75,7 @@ public void CanAquiferListBeHandledOk() { const string inputFileName = @"TestFiles\AquiferListInputFile.xml"; - var input = DamXmlSerialization.LoadInputFromXmlFile(inputFileName); + Input input = DamXmlSerialization.LoadInputFromXmlFile(inputFileName); Assert.AreEqual(28, input.AquiferSoils.Length); DamProjectData actualDamProjectData = FillDamFromXmlInput.CreateDamProjectData(input); Assert.AreEqual(11, actualDamProjectData.Dike.SoilList.AquiferDictionary.Count); @@ -87,8 +88,8 @@ { // Given DataSet Containing Illegal Characters DamProjectData expectedDamProjectData = FactoryForDamProjectData.CreateExampleDamProjectData(); - var location = expectedDamProjectData.Dike.Locations[0]; - location.Name = id; + Location location = expectedDamProjectData.Dike.Locations[0]; + location.Name = id; // When Writing Xml // Then Raise Exception With Clear Message() @@ -119,7 +120,7 @@ { // Given DataSet Containing Illegal Characters DamProjectData expectedDamProjectData = FactoryForDamProjectData.CreateExampleDamProjectData(); - var location = expectedDamProjectData.Dike.Locations[0]; + Location location = expectedDamProjectData.Dike.Locations[0]; location.Name = id; // When Writing Xml @@ -131,14 +132,19 @@ input = DamXmlSerialization.LoadInputFromXmlString(xmlString); DamProjectData actualDamProjectData = FillDamFromXmlInput.CreateDamProjectData(input); CompareDamProjectData(actualDamProjectData, expectedDamProjectData); - } private void CompareDamProjectData(DamProjectData actual, DamProjectData expected) { Assert.AreEqual(FactoryForDamProjectData.ExpectedAnalysisType, DamProjectCalculationSpecification.SelectedAnalysisType); - var compare = new CompareLogic { Config = { MaxDifferences = 100 } }; + var compare = new CompareLogic + { + Config = + { + MaxDifferences = 100 + } + }; compare.Config.MembersToIgnore = new List { "Points", @@ -152,11 +158,9 @@ "SurfaceLine", "Loops", }; // TODO i.m.o the serializing of the geometry should be improved, so these ignores are not needed anymore - var result = compare.Compare(expected, actual); - Assert.AreEqual(0, result.Differences.Count, - "Differences found read/write Input object:" + result.DifferencesString); - + ComparisonResult result = compare.Compare(expected, actual); + Assert.AreEqual(0, result.Differences.Count, + "Differences found read/write Input object:" + result.DifferencesString); } } - -} +} \ No newline at end of file