Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/CsvParserTest.cs
===================================================================
diff -u -r4047 -r4070
--- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/CsvParserTest.cs	(.../CsvParserTest.cs)	(revision 4047)
+++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/CsvParserTest.cs	(.../CsvParserTest.cs)	(revision 4070)
@@ -20,11 +20,12 @@
 // All rights reserved.
 
 using System;
+using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Text.RegularExpressions;
 using Deltares.Dam.Data;
 using NUnit.Framework;
-using System.IO;
 
 namespace Deltares.Dam.Tests
 {
@@ -37,7 +38,7 @@
         public void FixtureSetup()
         {
             testFile = "test.csv";
-            using (var writer = File.CreateText(testFile))
+            using (StreamWriter writer = File.CreateText(testFile))
             {
                 writer.WriteLine("name;age"); //<- header contains name and age
                 writer.WriteLine("Anouar;31");
@@ -47,6 +48,15 @@
             }
         }
 
+        [TearDown]
+        public void FixtureTearDown()
+        {
+            if (File.Exists(testFile))
+            {
+                File.Delete(testFile);
+            }
+        }
+
         [Test]
         public void ThrowsArgumentExceptionWhenHeaderStringIsNullByCallingParseHeader()
         {
@@ -57,7 +67,7 @@
         [Test]
         public void ThrowsArgumentExceptionSplitterIsNull()
         {
-            var expectedMessage = "The given pattern to split the data values of the CSV files is not valid" + Environment.NewLine + "Parameter name: splitter";
+            string expectedMessage = "The given pattern to split the data values of the CSV files is not valid" + Environment.NewLine + "Parameter name: splitter";
             Assert.That(() => CsvParser.ParseHeader("test;test", null), Throws.TypeOf(typeof(ArgumentNullException)).With.Message.EqualTo(expectedMessage));
         }
 
@@ -78,7 +88,7 @@
         [Test]
         public void CanParseHeaderWithSemicolonSeparatedItems()
         {
-            var items = CsvParser.ParseHeader("header1;header 2", new Regex(CsvParser.CsvSplitPatternCommaAndSemicolonCombined));
+            string[] items = CsvParser.ParseHeader("header1;header 2", new Regex(CsvParser.CsvSplitPatternCommaAndSemicolonCombined));
             Assert.AreEqual(2, items.Length);
             Assert.AreEqual("header1", items[0]);
             Assert.AreEqual("header 2", items[1]);
@@ -87,7 +97,7 @@
         [Test]
         public void CanParseHeaderWithCommaSeparatedItems()
         {
-            var items = CsvParser.ParseHeader("header1,header 2", new Regex(CsvParser.CsvSplitPatternCommaAndSemicolonCombined));
+            string[] items = CsvParser.ParseHeader("header1,header 2", new Regex(CsvParser.CsvSplitPatternCommaAndSemicolonCombined));
             Assert.AreEqual(2, items.Length);
             Assert.AreEqual("header1", items[0]);
             Assert.AreEqual("header 2", items[1]);
@@ -130,11 +140,12 @@
         [Test]
         public void ThrowsExceptionWhenNumberOfItemsDoesntMatchWithHeader()
         {
-            using (var writer = File.CreateText(testFile))
+            using (StreamWriter writer = File.CreateText(testFile))
             {
                 writer.WriteLine("name;age"); //<- header contains name and age
                 writer.WriteLine("Barry;39;20");
             }
+
             var loader = new ObjectMaterializer<Foo>();
             loader.Add("name", (entity, value) => entity.Name = value);
             loader.Add("age", (entity, value) => entity.Age = int.Parse(value));
@@ -144,11 +155,12 @@
         [Test]
         public void ThrowsExceptionWhenMappedKeyDoesntExistInCsvHeader()
         {
-            using (var writer = File.CreateText(testFile))
+            using (StreamWriter writer = File.CreateText(testFile))
             {
                 writer.WriteLine("name;age"); //<- header contains name and age
                 writer.WriteLine("Barry;39;");
             }
+
             var loader = new ObjectMaterializer<Foo>();
             loader.Add("name", (entity, value) => entity.Name = value);
             loader.Add("ages", (entity, value) => entity.Age = int.Parse(value));
@@ -158,7 +170,7 @@
         [Test]
         public void CanParseTestFile()
         {
-            using (var writer = File.CreateText(testFile))
+            using (StreamWriter writer = File.CreateText(testFile))
             {
                 writer.WriteLine("name;age"); //<- header contains name and age
                 writer.WriteLine("Anouar;31");
@@ -170,20 +182,12 @@
             var loader = new ObjectMaterializer<Foo>();
             loader.Add("name", (entity, value) => entity.Name = value);
             loader.Add("age", (entity, value) => entity.Age = int.Parse(value));
-            var items = loader.LoadFromCsvFile(testFile).ToList();
+            List<Foo> items = loader.LoadFromCsvFile(testFile).ToList();
             Assert.AreEqual(4, items.Count());
             Assert.AreEqual("Tom", items.ElementAt(2).Name);
             Assert.AreEqual(48, items.ElementAt(2).Age);
         }
 
-
-        [TearDown]
-        public void FixtureTearDown()
-        {
-            if (File.Exists(testFile))
-                File.Delete(testFile);
-        }
-
         class Foo
         {
             public string Name { get; set; }