Index: DamClients/DamUI/trunk/src/Dam/Tests/CsvExporterTest.cs
===================================================================
diff -u -r3527 -r3825
--- DamClients/DamUI/trunk/src/Dam/Tests/CsvExporterTest.cs	(.../CsvExporterTest.cs)	(revision 3527)
+++ DamClients/DamUI/trunk/src/Dam/Tests/CsvExporterTest.cs	(.../CsvExporterTest.cs)	(revision 3825)
@@ -32,24 +32,21 @@
         const string FileName = "test.csv";
 
         [Test]
-        [ExpectedException(typeof(CsvExporterException))]
         public void ThrowWhenFileNameIsNull()
         {
-            new CsvExporter<CsvExportData>(null, null);
+            Assert.That(() => new CsvExporter<CsvExportData>(null, null), Throws.InstanceOf<CsvExporterException>());
         }
 
         [Test]
-        [ExpectedException(typeof(CsvExporterException))]
         public void ThrowWhenFileNameIsNullOrEmpty()
         {
-            new CsvExporter<CsvExportData>("", null);
+            Assert.That(() => new CsvExporter<CsvExportData>("", null), Throws.InstanceOf<CsvExporterException>());
         }
 
         [Test]
-        [ExpectedException(typeof(CsvExporterException))]
         public void ThrowWhenFileNameOnlyContainsWhitespaces()
         {
-            new CsvExporter<CsvExportData>(" ", null);
+            Assert.That(() => new CsvExporter<CsvExportData>(" ", null), Throws.InstanceOf<CsvExporterException>());
         }
 
         [Test]
@@ -70,12 +67,11 @@
         }
 
         [Test]
-        [ExpectedException(typeof(CsvExporterException))]
         public void ThrowsIndexAlreadyExistsWhenDeclaredMultipleTimes()
         {
             var creator = new CsvExporter<DataStubWithWrongMetaData>(FileName, 
                 new List<DataStubWithWrongMetaData> { new DataStubWithWrongMetaData() });
-            creator.WriteFile();
+            Assert.That(() => creator.WriteFile(), Throws.InstanceOf<CsvExporterException>());
         }
 
         [Test]