Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DataPluginDataSourceXmlSerializerTests.cs =================================================================== diff -u -r4047 -r4070 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DataPluginDataSourceXmlSerializerTests.cs (.../DataPluginDataSourceXmlSerializerTests.cs) (revision 4047) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DataPluginDataSourceXmlSerializerTests.cs (.../DataPluginDataSourceXmlSerializerTests.cs) (revision 4070) @@ -20,41 +20,42 @@ // All rights reserved. using System.Linq; +using Deltares.Dam.Data; using Deltares.Dam.Data.DataPlugins.Configuration; using Deltares.Geotechnics.SurfaceLines; +using NUnit.Framework; +using DataAttribute = Deltares.Dam.Data.DataPlugins.Configuration.DataAttribute; namespace Deltares.Dam.Tests { - using NUnit.Framework; - using Deltares.Dam.Data; - - [TestFixture] public class DataPluginDataSourceXmlSerializerTests { private const string cXmlFilename = "datasource.xml"; [SetUp] - public void TestFixtureSetup() - { - } + public void TestFixtureSetup() {} [Test] public void ReadAfterWriteReturnsSameData() { var dataSourceContainerSrc = new DataSourceContainer(); - dataSourceContainerSrc.DataSourceList.Add(new DataSource() + dataSourceContainerSrc.DataSourceList.Add(new DataSource { DataSourceType = DataSourceType.MSoilBase, DataLocation = "Soilbase.mdb" }); - dataSourceContainerSrc.DataSourceList.Add(new DataSource() + dataSourceContainerSrc.DataSourceList.Add(new DataSource { DataSourceType = DataSourceType.CsvFiles, DataLocation = @".\CSVFiles\" }); - dataSourceContainerSrc.Add(new Data.DataPlugins.Configuration.DataAttribute { AttributeName = "testAttribute", DataSource = "testfile.shp"}); + dataSourceContainerSrc.Add(new DataAttribute + { + AttributeName = "testAttribute", + DataSource = "testfile.shp" + }); dataSourceContainerSrc.MapSoilProfile2D = @".\Geometries"; dataSourceContainerSrc.SensorConfigurationFilename = @".\SensorData.xls"; dataSourceContainerSrc.DataSourceEsriProjection = @"GDSKFJSDALKFKS"; @@ -63,7 +64,7 @@ DataSourceContainer.Serialize(dataSourceContainerSrc, cXmlFilename); - var dataSourceContainerDest = DataSourceContainer.Deserialize(cXmlFilename); + DataSourceContainer dataSourceContainerDest = DataSourceContainer.Deserialize(cXmlFilename); Assert.AreEqual(dataSourceContainerSrc.MapSoilProfile2D, dataSourceContainerDest.MapSoilProfile2D); Assert.AreEqual(dataSourceContainerSrc.SensorConfigurationFilename, dataSourceContainerDest.SensorConfigurationFilename); @@ -84,8 +85,14 @@ { var container = new DataSourceContainer(); const string attributeName = "testattribute"; - container.Add(new Data.DataPlugins.Configuration.DataAttribute() { AttributeName = attributeName }); - Assert.IsTrue(DataSourceContainer.Validate(container, new[]{ attributeName }).Count() == 0); + container.Add(new DataAttribute + { + AttributeName = attributeName + }); + Assert.IsTrue(DataSourceContainer.Validate(container, new[] + { + attributeName + }).Count() == 0); } } -} +} \ No newline at end of file