Fisheye: Tag 50597fbeb76b752bc250107dfa91b696bb6c4995 refers to a dead (removed) revision in file `Ringtoets/Piping/src/Ringtoets.Piping.IO/Exceptions/StochasticSoilModelUpdateException.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/Piping/src/Ringtoets.Piping.IO/Importers/IStochasticSoilModelUpdateModelStrategy.cs
===================================================================
diff -u -r81fa8a9bf3bd503cbd280e88b8f6037a840cff12 -r50597fbeb76b752bc250107dfa91b696bb6c4995
--- Ringtoets/Piping/src/Ringtoets.Piping.IO/Importers/IStochasticSoilModelUpdateModelStrategy.cs	(.../IStochasticSoilModelUpdateModelStrategy.cs)	(revision 81fa8a9bf3bd503cbd280e88b8f6037a840cff12)
+++ Ringtoets/Piping/src/Ringtoets.Piping.IO/Importers/IStochasticSoilModelUpdateModelStrategy.cs	(.../IStochasticSoilModelUpdateModelStrategy.cs)	(revision 50597fbeb76b752bc250107dfa91b696bb6c4995)
@@ -22,8 +22,8 @@
 using System;
 using System.Collections.Generic;
 using Core.Common.Base;
+using Ringtoets.Common.Data.Exceptions;
 using Ringtoets.Piping.Data;
-using Ringtoets.Piping.IO.Exceptions;
 
 namespace Ringtoets.Piping.IO.Importers
 {
@@ -41,8 +41,8 @@
         /// <param name="readStochasticSoilModels">The stochastic soil models which were imported.</param>
         /// <param name="sourceFilePath">The path to the source file from which the soil models were imported.</param>
         /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
-        /// <exception cref="StochasticSoilModelUpdateException">Thrown when applying the strategy failed.
-        /// <see cref="StochasticSoilModelUpdateException.InnerException"/> is set with the more detailed
+        /// <exception cref="UpdateDataException">Thrown when applying the strategy failed.
+        /// <see cref="UpdateDataException.InnerException"/> is set with the more detailed
         /// exception.</exception>
         /// <returns>A <see cref="IEnumerable{IObservable}"/> of updated instances.</returns>
         IEnumerable<IObservable> UpdateModelWithImportedData(
Index: Ringtoets/Piping/src/Ringtoets.Piping.IO/Importers/StochasticSoilModelImporter.cs
===================================================================
diff -u -r8e74b5d6680386fce48486c8253b62331f7d7055 -r50597fbeb76b752bc250107dfa91b696bb6c4995
--- Ringtoets/Piping/src/Ringtoets.Piping.IO/Importers/StochasticSoilModelImporter.cs	(.../StochasticSoilModelImporter.cs)	(revision 8e74b5d6680386fce48486c8253b62331f7d7055)
+++ Ringtoets/Piping/src/Ringtoets.Piping.IO/Importers/StochasticSoilModelImporter.cs	(.../StochasticSoilModelImporter.cs)	(revision 50597fbeb76b752bc250107dfa91b696bb6c4995)
@@ -26,6 +26,7 @@
 using Core.Common.Base;
 using Core.Common.Base.IO;
 using Core.Common.IO.Readers;
+using Ringtoets.Common.Data.Exceptions;
 using Ringtoets.Common.IO.FileImporters.MessageProviders;
 using Ringtoets.Piping.Data;
 using Ringtoets.Piping.IO.Exceptions;
@@ -109,8 +110,19 @@
             }
 
             NotifyProgress(messageProvider.GetAddDataToModelProgressText(), 1, 1);
-            updatedInstances = modelUpdateStrategy.UpdateModelWithImportedData(ImportTarget, validStochasticSoilModels, FilePath);
 
+            try
+            {
+                updatedInstances = modelUpdateStrategy.UpdateModelWithImportedData(ImportTarget, validStochasticSoilModels, FilePath);
+            }
+            catch (UpdateDataException e)
+            {
+                string message = string.Format(messageProvider.GetUpdateDataFailedLogMessageText(
+                                                   RingtoetsPipingDataResources.StochasticSoilModelCollection_TypeDescriptor),
+                                               e.Message);
+                Log.Error(message, e);
+                return false;
+            }
             return true;
         }
 
Index: Ringtoets/Piping/src/Ringtoets.Piping.IO/Ringtoets.Piping.IO.csproj
===================================================================
diff -u -ra8d5814e2cb003b85852c499cbc25ca0156887d4 -r50597fbeb76b752bc250107dfa91b696bb6c4995
--- Ringtoets/Piping/src/Ringtoets.Piping.IO/Ringtoets.Piping.IO.csproj	(.../Ringtoets.Piping.IO.csproj)	(revision a8d5814e2cb003b85852c499cbc25ca0156887d4)
+++ Ringtoets/Piping/src/Ringtoets.Piping.IO/Ringtoets.Piping.IO.csproj	(.../Ringtoets.Piping.IO.csproj)	(revision 50597fbeb76b752bc250107dfa91b696bb6c4995)
@@ -58,7 +58,6 @@
     <Compile Include="Importers\ISurfaceLineUpdateDataStrategy.cs" />
     <Compile Include="Importers\PipingCalculationConfigurationImporter.cs" />
     <Compile Include="Importers\StochasticSoilModelImporter.cs" />
-    <Compile Include="Exceptions\StochasticSoilModelUpdateException.cs" />
     <Compile Include="Properties\Resources.Designer.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/FileImporter/StochasticSoilModelReplaceDataStrategy.cs
===================================================================
diff -u -rf041e286343be511163e939762223954d4851a4e -r50597fbeb76b752bc250107dfa91b696bb6c4995
--- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/FileImporter/StochasticSoilModelReplaceDataStrategy.cs	(.../StochasticSoilModelReplaceDataStrategy.cs)	(revision f041e286343be511163e939762223954d4851a4e)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/FileImporter/StochasticSoilModelReplaceDataStrategy.cs	(.../StochasticSoilModelReplaceDataStrategy.cs)	(revision 50597fbeb76b752bc250107dfa91b696bb6c4995)
@@ -22,12 +22,9 @@
 using System;
 using System.Collections.Generic;
 using Core.Common.Base;
-using Ringtoets.Common.Data.Exceptions;
 using Ringtoets.Common.Data.UpdateDataStrategies;
 using Ringtoets.Piping.Data;
-using Ringtoets.Piping.IO.Exceptions;
 using Ringtoets.Piping.IO.Importers;
-using Ringtoets.Piping.Plugin.Properties;
 using Ringtoets.Piping.Service;
 
 namespace Ringtoets.Piping.Plugin.FileImporter
@@ -50,17 +47,7 @@
                                                                     IEnumerable<StochasticSoilModel> readStochasticSoilModels,
                                                                     string sourceFilePath)
         {
-            try
-            {
-                return ReplaceTargetCollectionWithImportedData(targetDataCollection, readStochasticSoilModels, sourceFilePath);
-            }
-            catch (UpdateDataException e)
-            {
-                string message =
-                    string.Format(Resources.StochasticSoilModelReplaceDataStrategy_UpdateModelWithImportedData_Importing_StochasticSoilModels_failed_Reason_0,
-                                  e.Message);
-                throw new StochasticSoilModelUpdateException(message, e);
-            }
+            return ReplaceTargetCollectionWithImportedData(targetDataCollection, readStochasticSoilModels, sourceFilePath);
         }
 
         protected override IEnumerable<IObservable> ClearData()
Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/FileImporter/StochasticSoilModelUpdateDataStrategy.cs
===================================================================
diff -u -r81fa8a9bf3bd503cbd280e88b8f6037a840cff12 -r50597fbeb76b752bc250107dfa91b696bb6c4995
--- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/FileImporter/StochasticSoilModelUpdateDataStrategy.cs	(.../StochasticSoilModelUpdateDataStrategy.cs)	(revision 81fa8a9bf3bd503cbd280e88b8f6037a840cff12)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/FileImporter/StochasticSoilModelUpdateDataStrategy.cs	(.../StochasticSoilModelUpdateDataStrategy.cs)	(revision 50597fbeb76b752bc250107dfa91b696bb6c4995)
@@ -24,12 +24,9 @@
 using System.Linq;
 using Core.Common.Base;
 using Core.Common.Utils;
-using Ringtoets.Common.Data.Exceptions;
 using Ringtoets.Common.Data.UpdateDataStrategies;
 using Ringtoets.Piping.Data;
-using Ringtoets.Piping.IO.Exceptions;
 using Ringtoets.Piping.IO.Importers;
-using Ringtoets.Piping.Plugin.Properties;
 using Ringtoets.Piping.Primitives;
 using Ringtoets.Piping.Service;
 
@@ -53,17 +50,7 @@
                                                                     IEnumerable<StochasticSoilModel> readStochasticSoilModels,
                                                                     string sourceFilePath)
         {
-            try
-            {
-                return UpdateTargetCollectionData(targetDataCollection, readStochasticSoilModels, sourceFilePath);
-            }
-            catch (UpdateDataException e)
-            {
-                string message =
-                    string.Format(Resources.StochasticSoilModelUpdateDataStrategy_UpdateModelWithImportedData_Update_of_StochasticSoilModel_failed_Reason_0,
-                                  e.Message);
-                throw new StochasticSoilModelUpdateException(message, e);
-            }
+            return UpdateTargetCollectionData(targetDataCollection, readStochasticSoilModels, sourceFilePath);
         }
 
         #region Remove Data Functions
Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/Properties/Resources.Designer.cs
===================================================================
diff -u -ra8d5814e2cb003b85852c499cbc25ca0156887d4 -r50597fbeb76b752bc250107dfa91b696bb6c4995
--- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision a8d5814e2cb003b85852c499cbc25ca0156887d4)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 50597fbeb76b752bc250107dfa91b696bb6c4995)
@@ -446,25 +446,5 @@
                 return ResourceManager.GetString("Soil_file_Extension", resourceCulture);
             }
         }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Het importeren van stochastische ondergrondmodellen is mislukt: {0}.
-        /// </summary>
-        public static string StochasticSoilModelReplaceDataStrategy_UpdateModelWithImportedData_Importing_StochasticSoilModels_failed_Reason_0 {
-            get {
-                return ResourceManager.GetString("StochasticSoilModelReplaceDataStrategy_UpdateModelWithImportedData_Importing_Stoc" +
-                        "hasticSoilModels_failed_Reason_0", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Het bijwerken van de stochastische ondergrondmodellen is mislukt: {0}.
-        /// </summary>
-        public static string StochasticSoilModelUpdateDataStrategy_UpdateModelWithImportedData_Update_of_StochasticSoilModel_failed_Reason_0 {
-            get {
-                return ResourceManager.GetString("StochasticSoilModelUpdateDataStrategy_UpdateModelWithImportedData_Update_of_Stoch" +
-                        "asticSoilModel_failed_Reason_0", resourceCulture);
-            }
-        }
     }
 }
Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/Properties/Resources.resx
===================================================================
diff -u -ra8d5814e2cb003b85852c499cbc25ca0156887d4 -r50597fbeb76b752bc250107dfa91b696bb6c4995
--- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/Properties/Resources.resx	(.../Resources.resx)	(revision a8d5814e2cb003b85852c499cbc25ca0156887d4)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/Properties/Resources.resx	(.../Resources.resx)	(revision 50597fbeb76b752bc250107dfa91b696bb6c4995)
@@ -192,9 +192,6 @@
   <data name="PipingSurfaceLinesCsvImporter_CheckCharacteristicPoints_EntryPointL_greater_or_equal_to_ExitPointL_for_0_" xml:space="preserve">
     <value>Het uittredepunt moet landwaarts van het intredepunt liggen voor locatie {0}.</value>
   </data>
-  <data name="StochasticSoilModelUpdateDataStrategy_UpdateModelWithImportedData_Update_of_StochasticSoilModel_failed_Reason_0" xml:space="preserve">
-    <value>Het bijwerken van de stochastische ondergrondmodellen is mislukt: {0}</value>
-  </data>
   <data name="PipingPlugin_VerifyStochasticSoilModelImport_When_importing_StochasticSoilModels_calculation_output_will_be_cleared_confirm" xml:space="preserve">
     <value>Als u stochastische ondergrondmodellen importeert, dan worden alle rekenresultaten van dit toetsspoor verwijderd.
 
@@ -243,7 +240,4 @@
 
 Weet u zeker dat u wilt doorgaan?</value>
   </data>
-  <data name="StochasticSoilModelReplaceDataStrategy_UpdateModelWithImportedData_Importing_StochasticSoilModels_failed_Reason_0" xml:space="preserve">
-    <value>Het importeren van stochastische ondergrondmodellen is mislukt: {0}</value>
-  </data>
 </root>
\ No newline at end of file
Fisheye: Tag 50597fbeb76b752bc250107dfa91b696bb6c4995 refers to a dead (removed) revision in file `Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Exceptions/StochasticSoilModelUpdateExceptionTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Importers/StochasticSoilModelImporterTest.cs
===================================================================
diff -u -r81fa8a9bf3bd503cbd280e88b8f6037a840cff12 -r50597fbeb76b752bc250107dfa91b696bb6c4995
--- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Importers/StochasticSoilModelImporterTest.cs	(.../StochasticSoilModelImporterTest.cs)	(revision 81fa8a9bf3bd503cbd280e88b8f6037a840cff12)
+++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Importers/StochasticSoilModelImporterTest.cs	(.../StochasticSoilModelImporterTest.cs)	(revision 50597fbeb76b752bc250107dfa91b696bb6c4995)
@@ -29,6 +29,8 @@
 using Core.Common.Utils.Builders;
 using NUnit.Framework;
 using Rhino.Mocks;
+using Ringtoets.Common.Data.AssessmentSection;
+using Ringtoets.Common.Data.Exceptions;
 using Ringtoets.Common.IO.FileImporters.MessageProviders;
 using Ringtoets.Piping.Data;
 using Ringtoets.Piping.IO.Importers;
@@ -969,10 +971,43 @@
         }
 
         [Test]
+        public void Import_UpdateSurfaceLinesWithImportedDataThrowsUpdateDataException_ReturnFalseAndLogError()
+        {
+            // Setup
+            var importTarget = new StochasticSoilModelCollection();
+
+            string filePath = Path.Combine(testDataPath, "complete.soil");
+
+            var messageProvider = mocks.StrictMock<IImporterMessageProvider>();
+            messageProvider.Expect(mp => mp.GetAddDataToModelProgressText()).Return("");
+            messageProvider.Expect(mp => mp.GetUpdateDataFailedLogMessageText("Stochastische ondergrondmodellen"))
+                           .Return("error {0}");
+
+            var strategy = mocks.StrictMock<IStochasticSoilModelUpdateModelStrategy>();
+            strategy.Expect(s => s.UpdateModelWithImportedData(
+                                Arg<StochasticSoilModelCollection>.Is.Same(importTarget),
+                                Arg<StochasticSoilModel[]>.Is.NotNull,
+                                Arg<string>.Is.Same(filePath)
+                            )).Throw(new UpdateDataException("Exception message"));
+            mocks.ReplayAll();
+
+            var importer = new StochasticSoilModelImporter(importTarget, filePath, messageProvider, strategy);
+
+            var importResult = true;
+
+            // Call
+            Action call = () => importResult = importer.Import();
+
+            // Then
+            const string expectedMessage = "error Exception message";
+            TestHelper.AssertLogMessageWithLevelIsGenerated(call, Tuple.Create(expectedMessage, LogLevelConstant.Error), 1);
+            Assert.IsFalse(importResult);
+        }
+
+        [Test]
         public void DoPostImport_AfterImport_ObserversNotified()
         {
             // Setup
-            var mocks = new MockRepository();
             var observableA = mocks.StrictMock<IObservable>();
             observableA.Expect(o => o.NotifyObservers());
             var observableB = mocks.StrictMock<IObservable>();
Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Ringtoets.Piping.IO.Test.csproj
===================================================================
diff -u -ra8d5814e2cb003b85852c499cbc25ca0156887d4 -r50597fbeb76b752bc250107dfa91b696bb6c4995
--- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Ringtoets.Piping.IO.Test.csproj	(.../Ringtoets.Piping.IO.Test.csproj)	(revision a8d5814e2cb003b85852c499cbc25ca0156887d4)
+++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Ringtoets.Piping.IO.Test.csproj	(.../Ringtoets.Piping.IO.Test.csproj)	(revision 50597fbeb76b752bc250107dfa91b696bb6c4995)
@@ -75,7 +75,6 @@
     <Compile Include="Exporters\PipingCalculationConfigurationExporterTest.cs" />
     <Compile Include="Exporters\PipingCalculationConfigurationWriterTest.cs" />
     <Compile Include="Importers\PipingCalculationConfigurationImporterTest.cs" />
-    <Compile Include="Exceptions\StochasticSoilModelUpdateExceptionTest.cs" />
     <Compile Include="Readers\PipingCalculationConfigurationReaderTest.cs" />
     <Compile Include="Readers\ReadPipingCalculationTest.cs" />
     <Compile Include="Schema\PipingCalculationConfigurationSchemaIdentifiersTest.cs" />
Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/FileImporter/StochasticSoilModelReplaceDataStrategyTest.cs
===================================================================
diff -u -r81fa8a9bf3bd503cbd280e88b8f6037a840cff12 -r50597fbeb76b752bc250107dfa91b696bb6c4995
--- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/FileImporter/StochasticSoilModelReplaceDataStrategyTest.cs	(.../StochasticSoilModelReplaceDataStrategyTest.cs)	(revision 81fa8a9bf3bd503cbd280e88b8f6037a840cff12)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/FileImporter/StochasticSoilModelReplaceDataStrategyTest.cs	(.../StochasticSoilModelReplaceDataStrategyTest.cs)	(revision 50597fbeb76b752bc250107dfa91b696bb6c4995)
@@ -28,7 +28,6 @@
 using Ringtoets.Common.Data.UpdateDataStrategies;
 using Ringtoets.Piping.Data;
 using Ringtoets.Piping.Data.TestUtil;
-using Ringtoets.Piping.IO.Exceptions;
 using Ringtoets.Piping.IO.Importers;
 using Ringtoets.Piping.Plugin.FileImporter;
 
@@ -220,7 +219,7 @@
         }
 
         [Test]
-        public void UpdateModelWithImportedData_ImportedModelsContainDuplicateNames_ThrowsUpdateException()
+        public void UpdateModelWithImportedData_ImportedModelsContainDuplicateNames_ThrowsUpdateDataException()
         {
             // Setup
             var importedStochasticSoilModels = new[]
@@ -235,10 +234,9 @@
             TestDelegate test = () => strategy.UpdateModelWithImportedData(targetCollection, importedStochasticSoilModels, "path");
 
             // Assert
-            var exception = Assert.Throws<StochasticSoilModelUpdateException>(test);
-            Assert.AreEqual("Het importeren van stochastische ondergrondmodellen is mislukt: " +
-                            "Stochastische ondergrondmodellen moeten een unieke naam hebben. Gevonden dubbele elementen: B.", exception.Message);
-            Assert.IsInstanceOf<UpdateDataException>(exception.InnerException);
+            var exception = Assert.Throws<UpdateDataException>(test);
+            Assert.AreEqual("Stochastische ondergrondmodellen moeten een unieke naam hebben. " +
+                            "Gevonden dubbele elementen: B.", exception.Message);
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/FileImporter/StochasticSoilModelUpdateDataStrategyTest.cs
===================================================================
diff -u -r81fa8a9bf3bd503cbd280e88b8f6037a840cff12 -r50597fbeb76b752bc250107dfa91b696bb6c4995
--- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/FileImporter/StochasticSoilModelUpdateDataStrategyTest.cs	(.../StochasticSoilModelUpdateDataStrategyTest.cs)	(revision 81fa8a9bf3bd503cbd280e88b8f6037a840cff12)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/FileImporter/StochasticSoilModelUpdateDataStrategyTest.cs	(.../StochasticSoilModelUpdateDataStrategyTest.cs)	(revision 50597fbeb76b752bc250107dfa91b696bb6c4995)
@@ -28,7 +28,6 @@
 using Ringtoets.Common.Data.UpdateDataStrategies;
 using Ringtoets.Piping.Data;
 using Ringtoets.Piping.Data.TestUtil;
-using Ringtoets.Piping.IO.Exceptions;
 using Ringtoets.Piping.IO.Importers;
 using Ringtoets.Piping.KernelWrapper.TestUtil;
 using Ringtoets.Piping.Plugin.FileImporter;
@@ -106,7 +105,7 @@
         }
 
         [Test]
-        public void UpdateModelWithImportedData_WithCurrentModelsAndImportedMultipleModelsWithSameName_ThrowsStochasticSoilModelUpdateException()
+        public void UpdateModelWithImportedData_WithCurrentModelsAndImportedMultipleModelsWithSameName_ThrowsUpdateDataException()
         {
             // Setup
             const string nonUniqueName = "non-unique name";
@@ -128,15 +127,13 @@
             TestDelegate test = () => strategy.UpdateModelWithImportedData(targetCollection, importedStochasticSoilModels, sourceFilePath);
 
             // Assert
-            var exception = Assert.Throws<StochasticSoilModelUpdateException>(test);
-            const string expectedMessage = "Het bijwerken van de stochastische ondergrondmodellen is mislukt: " +
-                                           "Geïmporteerde data moet unieke elementen bevatten.";
+            var exception = Assert.Throws<UpdateDataException>(test);
+            const string expectedMessage = "Geïmporteerde data moet unieke elementen bevatten.";
             Assert.AreEqual(expectedMessage, exception.Message);
-            Assert.IsInstanceOf<UpdateDataException>(exception.InnerException);
         }
 
         [Test]
-        public void UpdateModelWithImportedData_WithoutCurrentModelsAndImportedMultipleModelsWithSameName_ThrowsStochasticSoilModelUpdateException()
+        public void UpdateModelWithImportedData_WithoutCurrentModelsAndImportedMultipleModelsWithSameName_ThrowsUpdateDataException()
         {
             // Setup
             const string nonUniqueName = "non-unique name";
@@ -154,11 +151,10 @@
             TestDelegate test = () => strategy.UpdateModelWithImportedData(targetCollection, importedStochasticSoilModels, sourceFilePath);
 
             // Assert
-            var exception = Assert.Throws<StochasticSoilModelUpdateException>(test);
-            const string expectedMessage = "Het bijwerken van de stochastische ondergrondmodellen is mislukt: " +
-                                           "Stochastische ondergrondmodellen moeten een unieke naam hebben. Gevonden dubbele elementen: non-unique name.";
+            var exception = Assert.Throws<UpdateDataException>(test);
+            const string expectedMessage = "Stochastische ondergrondmodellen moeten een unieke naam hebben. " +
+                                           "Gevonden dubbele elementen: non-unique name.";
             Assert.AreEqual(expectedMessage, exception.Message);
-            Assert.IsInstanceOf<UpdateDataException>(exception.InnerException);
 
             CollectionAssert.IsEmpty(targetCollection);
         }