Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/FileImporters/ProfilesImporterTest.cs =================================================================== diff -u -r21a8ed792a5a1fca14173225ba3ac976e40f7a1c -r4eaa942f6a986a04aacee22d1b8e142b0d07f389 --- Ringtoets/Common/test/Ringtoets.Common.IO.Test/FileImporters/ProfilesImporterTest.cs (.../ProfilesImporterTest.cs) (revision 21a8ed792a5a1fca14173225ba3ac976e40f7a1c) +++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/FileImporters/ProfilesImporterTest.cs (.../ProfilesImporterTest.cs) (revision 4eaa942f6a986a04aacee22d1b8e142b0d07f389) @@ -130,6 +130,21 @@ } [Test] + public void ParameteredConstructor_TypeDescriptorNull_ThrowsArgumentNullException() + { + // Setup + var messageProvider = mocks.Stub(); + mocks.ReplayAll(); + + // Call + TestDelegate call = () => new TestProfilesImporter(testImportTarget, testReferenceLine, testFilePath, messageProvider, null); + + // Assert + var exception = Assert.Throws(call); + Assert.AreEqual("typeDescriptor", exception.ParamName); + } + + [Test] [TestCase("", "bestandspad mag niet leeg of ongedefinieerd zijn.")] [TestCase(" ", "bestandspad mag niet leeg of ongedefinieerd zijn.")] [TestCase("c>\\Invalid_Characters.shp", "er zitten ongeldige tekens in het bestandspad. Alle tekens in het bestandspad moeten geldig zijn.")] @@ -586,10 +601,12 @@ public void Import_CreateProfilesThrowsUpdateDataException_ReturnsFalseAndLogsError() { // Setup + const string typeDescriptor = "A typeDescriptor"; + var messageProvider = mocks.StrictMock(); messageProvider.Expect(mp => mp.GetAddDataToModelProgressText()) .Return(""); - messageProvider.Expect(mp => mp.GetUpdateDataFailedLogMessageText(null)) + messageProvider.Expect(mp => mp.GetUpdateDataFailedLogMessageText(typeDescriptor)) .IgnoreArguments() .Return("error {0}"); mocks.ReplayAll(); @@ -598,7 +615,11 @@ Path.Combine("DikeProfiles", "AllOkTestData", "Voorlanden 12-2.shp")); ReferenceLine referenceLine = CreateMatchingReferenceLine(); - var testProfilesImporter = new TestProfilesImporter(new ObservableList(), referenceLine, filePath, messageProvider) + var testProfilesImporter = new TestProfilesImporter(new ObservableList(), + referenceLine, + filePath, + messageProvider, + typeDescriptor) { CreateProfileAction = () => { throw new UpdateDataException("Exception message"); } }; @@ -666,8 +687,12 @@ public TestProfilesImporter(ObservableList importTarget, ReferenceLine referenceLine, string filePath, IImporterMessageProvider messageProvider) - : base(referenceLine, filePath, importTarget, messageProvider) {} + : base(referenceLine, filePath, importTarget, messageProvider, string.Empty) {} + public TestProfilesImporter(ObservableList importTarget, ReferenceLine referenceLine, string filePath, + IImporterMessageProvider messageProvider, string typeDescriptor) + : base(referenceLine, filePath, importTarget, messageProvider, typeDescriptor) {} + protected override void CreateProfiles(ReadResult importProfileLocationResult, ReadResult importDikeProfileDataResult) {