Fisheye: Tag 8c97f59adda15f1eb2a4550a06d2f7fb8bee91bf refers to a dead (removed) revision in file `Ringtoets/Common/src/Ringtoets.Common.IO/Exceptions/StructureUpdateException.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/Common/src/Ringtoets.Common.IO/Ringtoets.Common.IO.csproj =================================================================== diff -u -r670a5510c7638037a4f7e0c3efea0a261085bfbb -r8c97f59adda15f1eb2a4550a06d2f7fb8bee91bf --- Ringtoets/Common/src/Ringtoets.Common.IO/Ringtoets.Common.IO.csproj (.../Ringtoets.Common.IO.csproj) (revision 670a5510c7638037a4f7e0c3efea0a261085bfbb) +++ Ringtoets/Common/src/Ringtoets.Common.IO/Ringtoets.Common.IO.csproj (.../Ringtoets.Common.IO.csproj) (revision 8c97f59adda15f1eb2a4550a06d2f7fb8bee91bf) @@ -73,7 +73,6 @@ - Index: Ringtoets/Common/src/Ringtoets.Common.IO/Structures/IStructureUpdateStrategy.cs =================================================================== diff -u -r2f41eb6eb560911cd4ebe2d4d6924c26df911c40 -r8c97f59adda15f1eb2a4550a06d2f7fb8bee91bf --- Ringtoets/Common/src/Ringtoets.Common.IO/Structures/IStructureUpdateStrategy.cs (.../IStructureUpdateStrategy.cs) (revision 2f41eb6eb560911cd4ebe2d4d6924c26df911c40) +++ Ringtoets/Common/src/Ringtoets.Common.IO/Structures/IStructureUpdateStrategy.cs (.../IStructureUpdateStrategy.cs) (revision 8c97f59adda15f1eb2a4550a06d2f7fb8bee91bf) @@ -23,7 +23,7 @@ using System.Collections.Generic; using Core.Common.Base; using Ringtoets.Common.Data; -using Ringtoets.Common.IO.Exceptions; +using Ringtoets.Common.Data.Exceptions; namespace Ringtoets.Common.IO.Structures { @@ -42,7 +42,7 @@ /// The source path from where the structures were imported from. /// An of updated instances. /// Thrown when any of the input parameters is null. - /// Thrown when applying the strategy has failed. + /// Thrown when applying the strategy has failed. IEnumerable UpdateStructuresWithImportedData( StructureCollection targetDataCollection, IEnumerable readStructures, Fisheye: Tag 8c97f59adda15f1eb2a4550a06d2f7fb8bee91bf refers to a dead (removed) revision in file `Ringtoets/Common/test/Ringtoets.Common.IO.Test/Exceptions/StructureUpdateExceptionTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/Ringtoets.Common.IO.Test.csproj =================================================================== diff -u -r8b389428ece343431969fce2e902a7b241f2b372 -r8c97f59adda15f1eb2a4550a06d2f7fb8bee91bf --- Ringtoets/Common/test/Ringtoets.Common.IO.Test/Ringtoets.Common.IO.Test.csproj (.../Ringtoets.Common.IO.Test.csproj) (revision 8b389428ece343431969fce2e902a7b241f2b372) +++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/Ringtoets.Common.IO.Test.csproj (.../Ringtoets.Common.IO.Test.csproj) (revision 8c97f59adda15f1eb2a4550a06d2f7fb8bee91bf) @@ -78,7 +78,6 @@ - Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/FileImporters/HeightStructureReplaceDataStrategy.cs =================================================================== diff -u -r7c3fee822d908135cf99bb6cf2803982b257d409 -r8c97f59adda15f1eb2a4550a06d2f7fb8bee91bf --- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/FileImporters/HeightStructureReplaceDataStrategy.cs (.../HeightStructureReplaceDataStrategy.cs) (revision 7c3fee822d908135cf99bb6cf2803982b257d409) +++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/FileImporters/HeightStructureReplaceDataStrategy.cs (.../HeightStructureReplaceDataStrategy.cs) (revision 8c97f59adda15f1eb2a4550a06d2f7fb8bee91bf) @@ -23,10 +23,7 @@ using System.Collections.Generic; using Core.Common.Base; using Ringtoets.Common.Data; -using Ringtoets.Common.Data.Exceptions; using Ringtoets.Common.Data.UpdateDataStrategies; -using Ringtoets.Common.IO.Exceptions; -using Ringtoets.Common.IO.Properties; using Ringtoets.Common.IO.Structures; using Ringtoets.HeightStructures.Data; using Ringtoets.HeightStructures.Service; @@ -52,16 +49,7 @@ IEnumerable readStructures, string sourceFilePath) { - try - { - return ReplaceTargetCollectionWithImportedData(targetDataCollection, readStructures, sourceFilePath); - } - catch (UpdateDataException e) - { - string message = string.Format(Resources.IStructureUpdateStrategy_UpdateStructuresWithImportedData_Importing_Structures_failed_Reason_0_, - e.Message); - throw new StructureUpdateException(message, e); - } + return ReplaceTargetCollectionWithImportedData(targetDataCollection, readStructures, sourceFilePath); } protected override IEnumerable ClearData() Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/FileImporters/HeightStructureUpdateDataStrategy.cs =================================================================== diff -u -r7c3fee822d908135cf99bb6cf2803982b257d409 -r8c97f59adda15f1eb2a4550a06d2f7fb8bee91bf --- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/FileImporters/HeightStructureUpdateDataStrategy.cs (.../HeightStructureUpdateDataStrategy.cs) (revision 7c3fee822d908135cf99bb6cf2803982b257d409) +++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/FileImporters/HeightStructureUpdateDataStrategy.cs (.../HeightStructureUpdateDataStrategy.cs) (revision 8c97f59adda15f1eb2a4550a06d2f7fb8bee91bf) @@ -24,11 +24,8 @@ using System.Linq; using Core.Common.Base; using Ringtoets.Common.Data; -using Ringtoets.Common.Data.Exceptions; using Ringtoets.Common.Data.Structures; using Ringtoets.Common.Data.UpdateDataStrategies; -using Ringtoets.Common.IO.Exceptions; -using Ringtoets.Common.IO.Properties; using Ringtoets.Common.IO.Structures; using Ringtoets.Common.Service; using Ringtoets.Common.Utils; @@ -56,28 +53,14 @@ IEnumerable readStructures, string sourceFilePath) { - try - { - return UpdateTargetCollectionData(targetDataCollection, readStructures, sourceFilePath); - } - catch (UpdateDataException e) - { - string message = - string.Format(Resources.IStructureUpdateStrategy_UpdateStructuresWithImportedData_Update_Structures_failed_Reason_0_, - e.Message); - throw new StructureUpdateException(message, e); - } + return UpdateTargetCollectionData(targetDataCollection, readStructures, sourceFilePath); } - #region Removing Data Functions - protected override IEnumerable RemoveObjectAndDependentData(HeightStructure removedObject) { return HeightStructuresDataSynchronizationService.RemoveStructure(FailureMechanism, removedObject); } - #endregion - /// /// Class for comparing by only the id. /// Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/FileImporters/HeightStructureReplaceDataStrategyTest.cs =================================================================== diff -u -rb2fa3c06d32059473875aa82186750d50740606b -r8c97f59adda15f1eb2a4550a06d2f7fb8bee91bf --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/FileImporters/HeightStructureReplaceDataStrategyTest.cs (.../HeightStructureReplaceDataStrategyTest.cs) (revision b2fa3c06d32059473875aa82186750d50740606b) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/FileImporters/HeightStructureReplaceDataStrategyTest.cs (.../HeightStructureReplaceDataStrategyTest.cs) (revision 8c97f59adda15f1eb2a4550a06d2f7fb8bee91bf) @@ -31,7 +31,6 @@ using Ringtoets.Common.Data.Structures; using Ringtoets.Common.Data.TestUtil; using Ringtoets.Common.Data.UpdateDataStrategies; -using Ringtoets.Common.IO.Exceptions; using Ringtoets.Common.IO.Structures; using Ringtoets.HeightStructures.Data; using Ringtoets.HeightStructures.Data.TestUtil; @@ -356,7 +355,7 @@ } [Test] - public void UpdateStructuresWithImportedData_ImportedDataContainsDuplicateIds_ThrowsUpdateException() + public void UpdateStructuresWithImportedData_ImportedDataContainsDuplicateIds_ThrowsUpdateDataException() { // Setup const string duplicateId = "I am a duplicate id"; @@ -375,12 +374,10 @@ sourceFilePath); // Assert - var exception = Assert.Throws(call); - string expectedMessage = "Het importeren van de kunstwerken is mislukt: " + - "Kunstwerken moeten een unieke id hebben. " + + var exception = Assert.Throws(call); + string expectedMessage = "Kunstwerken moeten een unieke id hebben. " + $"Gevonden dubbele elementen: {duplicateId}."; Assert.AreEqual(expectedMessage, exception.Message); - Assert.IsInstanceOf(exception.InnerException); } } } \ No newline at end of file Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/FileImporters/HeightStructureUpdateDataStrategyTest.cs =================================================================== diff -u -rb2fa3c06d32059473875aa82186750d50740606b -r8c97f59adda15f1eb2a4550a06d2f7fb8bee91bf --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/FileImporters/HeightStructureUpdateDataStrategyTest.cs (.../HeightStructureUpdateDataStrategyTest.cs) (revision b2fa3c06d32059473875aa82186750d50740606b) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/FileImporters/HeightStructureUpdateDataStrategyTest.cs (.../HeightStructureUpdateDataStrategyTest.cs) (revision 8c97f59adda15f1eb2a4550a06d2f7fb8bee91bf) @@ -33,7 +33,6 @@ using Ringtoets.Common.Data.Structures; using Ringtoets.Common.Data.TestUtil; using Ringtoets.Common.Data.UpdateDataStrategies; -using Ringtoets.Common.IO.Exceptions; using Ringtoets.Common.IO.Structures; using Ringtoets.Common.Utils; using Ringtoets.HeightStructures.Data; @@ -217,7 +216,7 @@ } [Test] - public void UpdateStructuresWithImportedData_WithoutCurrentStructuresAndReadStructuresHaveDuplicateNames_ThrowsStructureUpdateException() + public void UpdateStructuresWithImportedData_WithoutCurrentStructuresAndReadStructuresHaveDuplicateNames_ThrowsUpdateDataException() { // Setup const string duplicateId = "I am a duplicate id"; @@ -236,18 +235,17 @@ sourceFilePath); // Assert - var exception = Assert.Throws(call); + var exception = Assert.Throws(call); - string expectedMessage = "Het bijwerken van de kunstwerken is mislukt: " + - $"Kunstwerken moeten een unieke id hebben. Gevonden dubbele elementen: {duplicateId}."; + string expectedMessage = "Kunstwerken moeten een unieke id hebben. " + + $"Gevonden dubbele elementen: {duplicateId}."; Assert.AreEqual(expectedMessage, exception.Message); - Assert.IsInstanceOf(exception.InnerException); CollectionAssert.IsEmpty(targetCollection); } [Test] - public void UpdateStructuresWithImportedData_WithCurrentStructureAndImportedMultipleStructuresWithSameId_ThrowsStructureUpdateException() + public void UpdateStructuresWithImportedData_WithCurrentStructureAndImportedMultipleStructuresWithSameId_ThrowsUpdateDataException() { // Setup const string duplicateId = "I am a duplicate id"; @@ -275,11 +273,9 @@ sourceFilePath); // Assert - var exception = Assert.Throws(call); - const string expectedMessage = "Het bijwerken van de kunstwerken is mislukt: " + - "Geïmporteerde data moet unieke elementen bevatten."; + var exception = Assert.Throws(call); + const string expectedMessage = "Geïmporteerde data moet unieke elementen bevatten."; Assert.AreEqual(expectedMessage, exception.Message); - Assert.IsInstanceOf(exception.InnerException); CollectionAssert.AreEqual(expectedCollection, targetCollection); }