Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/TimeSeriesAssemblerTest.cs
===================================================================
diff -u -r4047 -r4070
--- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/TimeSeriesAssemblerTest.cs	(.../TimeSeriesAssemblerTest.cs)	(revision 4047)
+++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/TimeSeriesAssemblerTest.cs	(.../TimeSeriesAssemblerTest.cs)	(revision 4070)
@@ -34,16 +34,6 @@
     [TestFixture]
     public class TimeSeriesAssemblerTest
     {
-        #region Setup/Teardown
-
-        [SetUp]
-        public void TestSetup()
-        {
-            this.assembler = new TimeSeriesAssembler();
-        }
-
-        #endregion
-
         private const string testFileName = @"TestData\HoekscheWaard\input_dam.xml";
         private const double Precision = 1e-8;
         private XDocument testDoc;
@@ -52,18 +42,28 @@
         [SetUp]
         public void TestFixtureSetup()
         {
-            this.testDoc = XDocument.Load(testFileName);
+            testDoc = XDocument.Load(testFileName);
         }
 
+        #region Setup/Teardown
+
+        [SetUp]
+        public void TestSetup()
+        {
+            assembler = new TimeSeriesAssembler();
+        }
+
+        #endregion
+
         [Test]
         public void CreateDtoFromEntity()
         {
-            TimeSerieCollection timeSerieCollection = new TimeSerieCollection();
+            var timeSerieCollection = new TimeSerieCollection();
 
             timeSerieCollection.TimeZone = 4.75;
             timeSerieCollection.Version = "1.2";
 
-            TimeSerie timeSerie = new TimeSerie();
+            var timeSerie = new TimeSerie();
             timeSerie.Type = "accumulative";
             timeSerie.LocationId = "LLANFAIR-04";
             timeSerie.ParameterId = "Train speed";
@@ -83,13 +83,29 @@
             timeSerie.Region = "North Wales";
 
             timeSerie.Entries.Add(new TimeSerieEntry
-                                      {DateTime = new DateTime(2009, 4, 13, 11, 51, 42), Value = 103.7, Flag = 0});
+            {
+                DateTime = new DateTime(2009, 4, 13, 11, 51, 42),
+                Value = 103.7,
+                Flag = 0
+            });
             timeSerie.Entries.Add(new TimeSerieEntry
-                                      {DateTime = new DateTime(2009, 4, 13, 12, 51, 42), Value = 88.4, Flag = 1});
+            {
+                DateTime = new DateTime(2009, 4, 13, 12, 51, 42),
+                Value = 88.4,
+                Flag = 1
+            });
             timeSerie.Entries.Add(new TimeSerieEntry
-                                      {DateTime = new DateTime(2009, 4, 13, 13, 51, 42), Value = 120.53, Flag = 1});
+            {
+                DateTime = new DateTime(2009, 4, 13, 13, 51, 42),
+                Value = 120.53,
+                Flag = 1
+            });
             timeSerie.Entries.Add(new TimeSerieEntry
-                                      {DateTime = new DateTime(2009, 4, 13, 14, 51, 42), Value = 108.5, Flag = 2});
+            {
+                DateTime = new DateTime(2009, 4, 13, 14, 51, 42),
+                Value = 108.5,
+                Flag = 2
+            });
 
             timeSerie.Comment = "Who knows how to pronounce Llanfairpwllgwyngyllgogerychwyrndrobwllllantysiliogogogoch?";
 
@@ -107,35 +123,59 @@
             timeSerie.MissVal = 109.17;
 
             timeSerie.Entries.Add(new TimeSerieEntry
-                                      {DateTime = new DateTime(2009, 3, 29, 13, 4, 17), Value = 45.7, Flag = 0});
+            {
+                DateTime = new DateTime(2009, 3, 29, 13, 4, 17),
+                Value = 45.7,
+                Flag = 0
+            });
             timeSerie.Entries.Add(new TimeSerieEntry
-                                      {DateTime = new DateTime(2009, 3, 29, 13, 5, 17), Value = 55.4, Flag = 1});
+            {
+                DateTime = new DateTime(2009, 3, 29, 13, 5, 17),
+                Value = 55.4,
+                Flag = 1
+            });
             timeSerie.Entries.Add(new TimeSerieEntry
-                                      {DateTime = new DateTime(2009, 3, 29, 13, 6, 17), Value = 80.57, Flag = 1});
+            {
+                DateTime = new DateTime(2009, 3, 29, 13, 6, 17),
+                Value = 80.57,
+                Flag = 1
+            });
             timeSerie.Entries.Add(new TimeSerieEntry
-                                      {DateTime = new DateTime(2009, 3, 29, 13, 7, 17), Value = 120.45, Flag = 3});
+            {
+                DateTime = new DateTime(2009, 3, 29, 13, 7, 17),
+                Value = 120.45,
+                Flag = 3
+            });
             timeSerie.Entries.Add(new TimeSerieEntry
-                                      {DateTime = new DateTime(2009, 3, 29, 13, 8, 17), Value = 108.45, Flag = 1});
+            {
+                DateTime = new DateTime(2009, 3, 29, 13, 8, 17),
+                Value = 108.45,
+                Flag = 1
+            });
             timeSerie.Entries.Add(new TimeSerieEntry
-                                      {DateTime = new DateTime(2009, 3, 29, 13, 9, 17), Value = 115.6, Flag = 2});
+            {
+                DateTime = new DateTime(2009, 3, 29, 13, 9, 17),
+                Value = 115.6,
+                Flag = 2
+            });
 
             timeSerieCollection.Series.Add(timeSerie);
 
             // Do the thing: create XML document from TimeSeries
-            XDocument doc = this.assembler.CreateDataTransferDocument(timeSerieCollection);
+            XDocument doc = assembler.CreateDataTransferDocument(timeSerieCollection);
 
             // Save XML for viewing purposes
             Directory.CreateDirectory(@"TestResults");
             doc.Save(@"TestResults\TestSeriesTestOut.xml");
 
             // Validate against schema
             string message;
-            if (!this.assembler.ValidateSchema(doc, out message))
+            if (!assembler.ValidateSchema(doc, out message))
             {
                 Assert.Fail("SCHEMA VALIDATION: " + message);
             }
 
-            XNamespace tns = this.assembler.ElementNamespace;
+            XNamespace tns = assembler.ElementNamespace;
 
             // Version
             Assert.AreEqual("1.2", doc.Root.AttributeAs<string>(TimeSeriesAssembler.XmlVersionAttributeName));
@@ -283,17 +323,17 @@
         public void CreateEntityFromDto()
         {
             // First validate test XML against schema
-            double tolerance = 0.001;
+            var tolerance = 0.001;
             string message;
-            if (!this.assembler.ValidateSchema(this.testDoc, out message))
+            if (!assembler.ValidateSchema(testDoc, out message))
             {
                 Assert.Fail("SCHEMA VALIDATION: " + message);
             }
 
-            XNamespace tns = this.assembler.ElementNamespace;
+            XNamespace tns = assembler.ElementNamespace;
 
             // Do the thing: create TimeSeries from XML element
-            TimeSerieCollection timeSerieCollection = assembler.CreateDomainObject(this.testDoc);
+            TimeSerieCollection timeSerieCollection = assembler.CreateDomainObject(testDoc);
 
             Assert.IsNotNull(timeSerieCollection);