Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/TimeSerieCollectionTest.cs
===================================================================
diff -u -r4047 -r4070
--- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/TimeSerieCollectionTest.cs	(.../TimeSerieCollectionTest.cs)	(revision 4047)
+++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/TimeSerieCollectionTest.cs	(.../TimeSerieCollectionTest.cs)	(revision 4070)
@@ -30,17 +30,19 @@
     [TestFixture]
     public class TimeSerieCollectionTest
     {
+        private TimeSerieCollection timeSerieCollection;
+
         #region Setup/Teardown
 
         [SetUp]
         public void TestSetup()
         {
-            this.timeSerieCollection = new TimeSerieCollection();
+            timeSerieCollection = new TimeSerieCollection();
 
             timeSerieCollection.TimeZone = 4.75;
             timeSerieCollection.Version = "1.2";
 
-            TimeSerie timeSerie = new TimeSerie();
+            var timeSerie = new TimeSerie();
             timeSerie.ParameterId = "Cat speed";
             timeSerie.LocationId = "LOC-04";
 
@@ -83,71 +85,77 @@
 
         #endregion
 
-        private TimeSerieCollection timeSerieCollection;
-
         [Test]
         public void TestCannotFindSeries()
         {
-            TimeSerie timeSerie = this.timeSerieCollection.FindSerie("Bird speed", "LOC-36");
+            TimeSerie timeSerie = timeSerieCollection.FindSerie("Bird speed", "LOC-36");
             Assert.IsNull(timeSerie, "Series found incorrectly");
         }
 
         [Test]
         public void TestFindSeries()
         {
-            TimeSerie timeSerie = this.timeSerieCollection.FindSerie("Cat speed", "LOC-04");
+            TimeSerie timeSerie = timeSerieCollection.FindSerie("Cat speed", "LOC-04");
 
             Assert.IsTrue(timeSerie.ParameterId.Equals("Cat speed", StringComparison.InvariantCultureIgnoreCase));
             Assert.IsTrue(timeSerie.LocationId.Equals("LOC-04", StringComparison.InvariantCultureIgnoreCase));
 
-            Assert.AreEqual(0, this.timeSerieCollection.Series.IndexOf(timeSerie));
+            Assert.AreEqual(0, timeSerieCollection.Series.IndexOf(timeSerie));
 
-            timeSerie = this.timeSerieCollection.FindSerie("Dog speed", "LOC-27");
+            timeSerie = timeSerieCollection.FindSerie("Dog speed", "LOC-27");
 
             Assert.IsTrue(timeSerie.ParameterId.Equals("Dog speed", StringComparison.InvariantCultureIgnoreCase));
             Assert.IsTrue(timeSerie.LocationId.Equals("LOC-27", StringComparison.InvariantCultureIgnoreCase));
 
-            Assert.AreEqual(3, this.timeSerieCollection.Series.IndexOf(timeSerie));
+            Assert.AreEqual(3, timeSerieCollection.Series.IndexOf(timeSerie));
 
-            timeSerie = this.timeSerieCollection.FindSerie("OvertoppingRate", "LOC-27");
+            timeSerie = timeSerieCollection.FindSerie("OvertoppingRate", "LOC-27");
             Assert.IsTrue(timeSerie.ParameterId.Equals("OvertoppingRate", StringComparison.InvariantCultureIgnoreCase));
             Assert.IsTrue(timeSerie.LocationId.Equals("LOC-27", StringComparison.InvariantCultureIgnoreCase));
         }
 
         [Test]
         public void TestSeriesAtLocation()
         {
-            IEnumerable<TimeSerie> serieCollection = this.timeSerieCollection.GetSeriesByLocationId("LOC-04");
+            IEnumerable<TimeSerie> serieCollection = timeSerieCollection.GetSeriesByLocationId("LOC-04");
             Assert.AreEqual(2, serieCollection.Count());
 
-            serieCollection = this.timeSerieCollection.GetSeriesByLocationId("LOC-27");
+            serieCollection = timeSerieCollection.GetSeriesByLocationId("LOC-27");
             Assert.AreEqual(3, serieCollection.Count());
 
-            serieCollection = this.timeSerieCollection.GetSeriesByLocationId("LOC-36");
+            serieCollection = timeSerieCollection.GetSeriesByLocationId("LOC-36");
             Assert.AreEqual(0, serieCollection.Count());
         }
 
         [Test]
         public void TestSeriesOfParameter()
         {
-            IEnumerable<TimeSerie> serieCollection = this.timeSerieCollection.GetSeriesByParameterId("Cat Speed");
+            IEnumerable<TimeSerie> serieCollection = timeSerieCollection.GetSeriesByParameterId("Cat Speed");
             Assert.AreEqual(3, serieCollection.Count());
 
-            serieCollection = this.timeSerieCollection.GetSeriesByParameterId("Dog Speed");
+            serieCollection = timeSerieCollection.GetSeriesByParameterId("Dog Speed");
             Assert.AreEqual(2, serieCollection.Count());
 
-            serieCollection = this.timeSerieCollection.GetSeriesByParameterId("Bird Speed");
+            serieCollection = timeSerieCollection.GetSeriesByParameterId("Bird Speed");
             Assert.AreEqual(0, serieCollection.Count());
         }
 
-
         [Test]
         public void UpdateAllEntriesWorksCorrectly()
         {
             var collection = new TimeSerieCollection();
-            var timeSerie1 = new TimeSerie() { ParameterId = "test" };
-            var timeSerieEntry1 = new TimeSerieEntry() { Value = 1 };
-            var timeSerieEntry2 = new TimeSerieEntry() { Value = 2 };
+            var timeSerie1 = new TimeSerie
+            {
+                ParameterId = "test"
+            };
+            var timeSerieEntry1 = new TimeSerieEntry
+            {
+                Value = 1
+            };
+            var timeSerieEntry2 = new TimeSerieEntry
+            {
+                Value = 2
+            };
             timeSerie1.Entries.Add(timeSerieEntry1);
             timeSerie1.Entries.Add(timeSerieEntry2);
             collection.Series.Add(timeSerie1);
@@ -168,19 +176,29 @@
             const string locationId = "locationId";
             const string parameterId = "waterlevel";
             var collection = new TimeSerieCollection();
-            var timeSerie1 = new TimeSerie() { ParameterId = parameterId, LocationId = locationId};
-            var timeSerieEntry1 = new TimeSerieEntry() { Value = 1 };
-            var timeSerieEntry2 = new TimeSerieEntry() { Value = 2 };
+            var timeSerie1 = new TimeSerie
+            {
+                ParameterId = parameterId,
+                LocationId = locationId
+            };
+            var timeSerieEntry1 = new TimeSerieEntry
+            {
+                Value = 1
+            };
+            var timeSerieEntry2 = new TimeSerieEntry
+            {
+                Value = 2
+            };
             timeSerie1.Entries.Add(timeSerieEntry1);
             timeSerie1.Entries.Add(timeSerieEntry2);
             collection.Series.Add(timeSerie1);
-            var newCollection = collection.Map(locationId, parameterId, 
-                timeSerie => timeSerie.Map(timeSerieEntry => timeSerieEntry.Map(entry => entry.Value * 2)));
+            IEnumerable<TimeSerie> newCollection = collection.Map(locationId, parameterId,
+                                                                  timeSerie => timeSerie.Map(timeSerieEntry => timeSerieEntry.Map(entry => entry.Value * 2)));
             Assert.AreEqual(1, newCollection.Count());
-            var newTimeSerie = newCollection.ElementAt(0);
+            TimeSerie newTimeSerie = newCollection.ElementAt(0);
             Assert.AreEqual(2, newTimeSerie.Entries.Count);
             Assert.AreEqual(2, newTimeSerie.Entries[0].Value);
-            Assert.AreEqual(4, newTimeSerie.Entries[1].Value);            
+            Assert.AreEqual(4, newTimeSerie.Entries[1].Value);
         }
 
         [Test]
@@ -190,17 +208,31 @@
             const string locationId2 = "location2";
             const string parameterId = "waterlevel";
             var collection = new TimeSerieCollection();
-            var timeSerie1 = new TimeSerie() { ParameterId = parameterId, LocationId = locationId1 };
-            var timeSerie2 = new TimeSerie() { ParameterId = parameterId, LocationId = locationId2 };
-            var timeSerieEntry1 = new TimeSerieEntry() { Value = 1 };
-            var timeSerieEntry2 = new TimeSerieEntry() { Value = 2 };
+            var timeSerie1 = new TimeSerie
+            {
+                ParameterId = parameterId,
+                LocationId = locationId1
+            };
+            var timeSerie2 = new TimeSerie
+            {
+                ParameterId = parameterId,
+                LocationId = locationId2
+            };
+            var timeSerieEntry1 = new TimeSerieEntry
+            {
+                Value = 1
+            };
+            var timeSerieEntry2 = new TimeSerieEntry
+            {
+                Value = 2
+            };
             timeSerie1.Entries.Add(timeSerieEntry1);
             timeSerie2.Entries.Add(timeSerieEntry2);
             collection.Series.Add(timeSerie1);
-            var newCollection = collection.Map(locationId1, parameterId,
-                timeSerie => timeSerie.Map(timeSerieEntry => timeSerieEntry.Map(entry => entry.Value * 2)));
+            IEnumerable<TimeSerie> newCollection = collection.Map(locationId1, parameterId,
+                                                                  timeSerie => timeSerie.Map(timeSerieEntry => timeSerieEntry.Map(entry => entry.Value * 2)));
             Assert.AreEqual(1, newCollection.Count());
-            var newTimeSerie = newCollection.ElementAt(0);
+            TimeSerie newTimeSerie = newCollection.ElementAt(0);
             Assert.AreEqual(1, newTimeSerie.Entries.Count);
             Assert.AreEqual(2, newTimeSerie.Entries[0].Value);
         }