Index: Core/Common/src/Core.Common.Gui/Commands/GuiImportHandler.cs =================================================================== diff -u -r8e0856bca7d9689c4c09ff2c3008d6cad8c3bef7 -rbabec62dabf2b28efe0151887472b0756f59a6ce --- Core/Common/src/Core.Common.Gui/Commands/GuiImportHandler.cs (.../GuiImportHandler.cs) (revision 8e0856bca7d9689c4c09ff2c3008d6cad8c3bef7) +++ Core/Common/src/Core.Common.Gui/Commands/GuiImportHandler.cs (.../GuiImportHandler.cs) (revision babec62dabf2b28efe0151887472b0756f59a6ce) @@ -100,18 +100,18 @@ ImportItemsUsingDialog(importInfo, target); } - private ImportInfo SelectImportInfo(object target, ImportInfo[] supportedImportInfos) + private ImportInfo SelectImportInfo(object target, IReadOnlyList supportedImportInfos) { - if (supportedImportInfos.Length == 0) + if (supportedImportInfos.Count == 0) { - MessageBox.Show(Resources.GuiImportHandler_GetSupportedImporterForTargetType_No_importer_available_for_this_item, - Resources.GuiImportHandler_GetSupportedImporterForTargetType_Error); - log.ErrorFormat(Resources.GuiImportHandler_GetSupportedImporterForTargetType_No_importer_available_for_this_item_0_, + MessageBox.Show(Resources.GuiImportHandler_SelectImportInfo_No_importer_available_for_this_item, + Resources.GuiImportHandler_SelectImportInfo_Error); + log.ErrorFormat(Resources.GuiImportHandler_SelectImportInfo_No_importer_available_for_this_item_0_, target); return null; } - if (supportedImportInfos.Length == 1) + if (supportedImportInfos.Count == 1) { return supportedImportInfos[0]; } Index: Core/Common/src/Core.Common.Gui/ContextMenu/GuiContextMenuItemFactory.cs =================================================================== diff -u -r8e0856bca7d9689c4c09ff2c3008d6cad8c3bef7 -rbabec62dabf2b28efe0151887472b0756f59a6ce --- Core/Common/src/Core.Common.Gui/ContextMenu/GuiContextMenuItemFactory.cs (.../GuiContextMenuItemFactory.cs) (revision 8e0856bca7d9689c4c09ff2c3008d6cad8c3bef7) +++ Core/Common/src/Core.Common.Gui/ContextMenu/GuiContextMenuItemFactory.cs (.../GuiContextMenuItemFactory.cs) (revision babec62dabf2b28efe0151887472b0756f59a6ce) @@ -151,9 +151,9 @@ /// to the data of the given . /// /// An enumeration of instances, - /// representing one or more suitable import actions. + /// representing one or more supported import actions. /// The created . - /// When no parameter is provided, the suitable + /// When no parameter is provided, the supported /// instances - as registered by the plugins - will be resolved /// dynamically. public ToolStripItem CreateImportItem(IEnumerable importInfos = null) @@ -169,13 +169,13 @@ /// The toolTip of the import item. /// The image of the import item. /// An enumeration of instances, - /// representing one or more suitable import actions. + /// representing one or more supported import actions. /// The created . /// Thrown when /// is null or only whitespace. /// Thrown when /// or is null. - /// When no parameter is provided, the suitable + /// When no parameter is provided, the supported /// instances - as registered by the plugins - will be resolved /// dynamically. public ToolStripItem CreateImportItem(string text, string toolTip, Image image, IEnumerable importInfos = null) @@ -195,9 +195,9 @@ throw new ArgumentNullException(nameof(image)); } - importInfos = importInfos == null - ? importCommandHandler.GetSupportedImportInfos(dataObject) - : importInfos.Where(info => info.IsEnabled == null || info.IsEnabled(dataObject)).ToArray(); + importInfos = importInfos != null + ? importInfos.Where(info => info.IsEnabled == null || info.IsEnabled(dataObject)).ToArray() + : importCommandHandler.GetSupportedImportInfos(dataObject); var importItem = new ToolStripMenuItem(text) { Index: Core/Common/src/Core.Common.Gui/ContextMenu/IContextMenuBuilder.cs =================================================================== diff -u -rb2dc333e5cd778afbb75c3b29e00e872a25632f7 -rbabec62dabf2b28efe0151887472b0756f59a6ce --- Core/Common/src/Core.Common.Gui/ContextMenu/IContextMenuBuilder.cs (.../IContextMenuBuilder.cs) (revision b2dc333e5cd778afbb75c3b29e00e872a25632f7) +++ Core/Common/src/Core.Common.Gui/ContextMenu/IContextMenuBuilder.cs (.../IContextMenuBuilder.cs) (revision babec62dabf2b28efe0151887472b0756f59a6ce) @@ -79,9 +79,9 @@ /// Adds an item to the , which imports to the data of the . /// /// An enumeration of instances, representing one or more - /// suitable import actions. + /// supported import actions. /// The itself. - /// When no parameter is provided, the suitable + /// When no parameter is provided, the supported /// instances - as registered by the plugins - will be resolved dynamically. IContextMenuBuilder AddImportItem(IEnumerable importInfos = null); @@ -92,13 +92,13 @@ /// The tooltip of the import item. /// The image of the import item. /// An enumeration of instances, representing one or more - /// suitable import actions. + /// supported import actions. /// The itself. - /// When no parameter is provided, the suitable - /// instances - as registered by the plugins - will be resolved dynamically. /// Thrown when is null or only whitespace. /// Thrown when or /// is null. + /// When no parameter is provided, the supported + /// instances - as registered by the plugins - will be resolved dynamically. IContextMenuBuilder AddImportItem(string text, string toolTip, Image image, IEnumerable importInfos = null); /// Index: Core/Common/src/Core.Common.Gui/Properties/Resources.Designer.cs =================================================================== diff -u -r54eaeeec98bf8513617808fde953a216c569874a -rbabec62dabf2b28efe0151887472b0756f59a6ce --- Core/Common/src/Core.Common.Gui/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 54eaeeec98bf8513617808fde953a216c569874a) +++ Core/Common/src/Core.Common.Gui/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision babec62dabf2b28efe0151887472b0756f59a6ce) @@ -861,58 +861,56 @@ } /// - /// Looks up a localized string similar to Fout. + /// Looks up a localized string similar to Kies wat u wilt importeren. /// - public static string GuiImportHandler_GetSupportedImporterForTargetType_Error { + public static string GuiImportHandler_GetSupportedImporterUsingDialog_Select_importer { get { - return ResourceManager.GetString("GuiImportHandler_GetSupportedImporterForTargetType_Error", resourceCulture); + return ResourceManager.GetString("GuiImportHandler_GetSupportedImporterUsingDialog_Select_importer", resourceCulture); } } /// - /// Looks up a localized string similar to Geen enkele 'Importer' is beschikbaar voor dit element.. + /// Looks up a localized string similar to Importeren van gegevens is geannuleerd.. /// - public static string GuiImportHandler_GetSupportedImporterForTargetType_No_importer_available_for_this_item { + public static string GuiImportHandler_ImportItemsUsingDialog_Importing_cancelled { get { - return ResourceManager.GetString("GuiImportHandler_GetSupportedImporterForTargetType_No_importer_available_for_this" + - "_item", resourceCulture); + return ResourceManager.GetString("GuiImportHandler_ImportItemsUsingDialog_Importing_cancelled", resourceCulture); } } /// - /// Looks up a localized string similar to Geen enkele 'Importer' is beschikbaar voor dit element ({0}).. + /// Looks up a localized string similar to Importeren van '{0}'. /// - public static string GuiImportHandler_GetSupportedImporterForTargetType_No_importer_available_for_this_item_0_ { + public static string GuiImportHandler_RunImportActivity_Importing_0_ { get { - return ResourceManager.GetString("GuiImportHandler_GetSupportedImporterForTargetType_No_importer_available_for_this" + - "_item_0_", resourceCulture); + return ResourceManager.GetString("GuiImportHandler_RunImportActivity_Importing_0_", resourceCulture); } } /// - /// Looks up a localized string similar to Kies wat u wilt importeren. + /// Looks up a localized string similar to Fout. /// - public static string GuiImportHandler_GetSupportedImporterUsingDialog_Select_importer { + public static string GuiImportHandler_SelectImportInfo_Error { get { - return ResourceManager.GetString("GuiImportHandler_GetSupportedImporterUsingDialog_Select_importer", resourceCulture); + return ResourceManager.GetString("GuiImportHandler_SelectImportInfo_Error", resourceCulture); } } /// - /// Looks up a localized string similar to Importeren van gegevens is geannuleerd.. + /// Looks up a localized string similar to Geen enkele 'Importer' is beschikbaar voor dit element.. /// - public static string GuiImportHandler_ImportItemsUsingDialog_Importing_cancelled { + public static string GuiImportHandler_SelectImportInfo_No_importer_available_for_this_item { get { - return ResourceManager.GetString("GuiImportHandler_ImportItemsUsingDialog_Importing_cancelled", resourceCulture); + return ResourceManager.GetString("GuiImportHandler_SelectImportInfo_No_importer_available_for_this_item", resourceCulture); } } /// - /// Looks up a localized string similar to Importeren van '{0}'. + /// Looks up a localized string similar to Geen enkele 'Importer' is beschikbaar voor dit element ({0}).. /// - public static string GuiImportHandler_RunImportActivity_Importing_0_ { + public static string GuiImportHandler_SelectImportInfo_No_importer_available_for_this_item_0_ { get { - return ResourceManager.GetString("GuiImportHandler_RunImportActivity_Importing_0_", resourceCulture); + return ResourceManager.GetString("GuiImportHandler_SelectImportInfo_No_importer_available_for_this_item_0_", resourceCulture); } } Index: Core/Common/src/Core.Common.Gui/Properties/Resources.resx =================================================================== diff -u -rdbbc7ad2bb7ae73a675283e0fe8730ef0a11164f -rbabec62dabf2b28efe0151887472b0756f59a6ce --- Core/Common/src/Core.Common.Gui/Properties/Resources.resx (.../Resources.resx) (revision dbbc7ad2bb7ae73a675283e0fe8730ef0a11164f) +++ Core/Common/src/Core.Common.Gui/Properties/Resources.resx (.../Resources.resx) (revision babec62dabf2b28efe0151887472b0756f59a6ce) @@ -172,7 +172,7 @@ ..\Resources\saveHS.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - + Geen enkele 'Importer' is beschikbaar voor dit element ({0}). @@ -256,7 +256,7 @@ ../Resources/brick.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - + Geen enkele 'Importer' is beschikbaar voor dit element. @@ -397,7 +397,7 @@ Kan geen instanties maken van de benodigde objecten. - + Fout Index: Core/Common/test/Core.Common.Gui.Test/Commands/GuiImportHandlerTest.cs =================================================================== diff -u -r43b7cea64be3b5254e375b3e0afe1af5e0d48cbf -rbabec62dabf2b28efe0151887472b0756f59a6ce --- Core/Common/test/Core.Common.Gui.Test/Commands/GuiImportHandlerTest.cs (.../GuiImportHandlerTest.cs) (revision 43b7cea64be3b5254e375b3e0afe1af5e0d48cbf) +++ Core/Common/test/Core.Common.Gui.Test/Commands/GuiImportHandlerTest.cs (.../GuiImportHandlerTest.cs) (revision babec62dabf2b28efe0151887472b0756f59a6ce) @@ -93,6 +93,28 @@ } [Test] + public void GetSupportedImportInfos_TargetNull_ReturnsEmptyEnumeration() + { + // Setup + var mocks = new MockRepository(); + var dialogParent = mocks.Stub(); + var inquiryHelper = mocks.Stub(); + mocks.ReplayAll(); + + var commandHandler = new GuiImportHandler(dialogParent, new ImportInfo[] + { + new ImportInfo() + }, inquiryHelper); + + // Call + IEnumerable supportedImportInfos = commandHandler.GetSupportedImportInfos(null); + + // Assert + CollectionAssert.IsEmpty(supportedImportInfos); + mocks.VerifyAll(); + } + + [Test] public void GetSupportedImportInfos_NoImportInfos_ReturnsEmptyEnumeration() { // Setup @@ -271,7 +293,7 @@ } [Test] - public void ImportOn_SupportedImportInfoVerifyUpdatesSuccessful_ExpectedImportInfoFunctionsCalledAndActivityCreated() + public void ImportOn_SupportedImportInfoAndVerifyUpdatesSuccessful_ExpectedImportInfoFunctionsCalledAndActivityCreated() { // Setup const string filePath = "/some/path"; @@ -337,90 +359,90 @@ } [Test] - public void ImportOn_InquiryHelperReturnsNoPath_ImportCancelledWithLogMessage() + public void ImportOn_SupportedImportInfoAndVerifyUpdatesUnsuccessful_ActivityNotCreated() { // Setup var generator = new FileFilterGenerator(); var targetObject = new object(); var mockRepository = new MockRepository(); var inquiryHelper = mockRepository.Stub(); - inquiryHelper.Expect(ih => ih.GetSourceFileLocation(generator.Filter)).Return(null); + inquiryHelper.Stub(ih => ih.GetSourceFileLocation(generator.Filter)).Return("/some/path"); var fileImporter = mockRepository.Stub(); mockRepository.ReplayAll(); + var isVerifyUpdatedCalled = false; + using (var form = new Form()) { var supportedImportInfo = new ImportInfo { CreateFileImporter = (o, s) => { - Assert.Fail("CreateFileImporter is not expected to be called when no file path is chosen."); + Assert.Fail("CreateFileImporter is not expected to be called when VerifyUpdates function returns false."); return fileImporter; }, FileFilterGenerator = generator, - VerifyUpdates = o => true + VerifyUpdates = o => + { + Assert.AreSame(o, targetObject); + isVerifyUpdatedCalled = true; + return false; + } }; var importHandler = new GuiImportHandler(form, Enumerable.Empty(), inquiryHelper); // Call - void Call() => importHandler.ImportOn(targetObject, new ImportInfo[] + importHandler.ImportOn(targetObject, new ImportInfo[] { supportedImportInfo }); - - // Assert - TestHelper.AssertLogMessageIsGenerated(Call, "Importeren van gegevens is geannuleerd."); } + // Assert + Assert.IsTrue(isVerifyUpdatedCalled); mockRepository.VerifyAll(); } [Test] - public void ImportOn_SupportedImportInfoVerifyUpdatesUnsuccessful_ActivityNotCreated() + public void ImportOn_InquiryHelperReturnsNoPath_ImportCancelledWithLogMessage() { // Setup var generator = new FileFilterGenerator(); var targetObject = new object(); var mockRepository = new MockRepository(); var inquiryHelper = mockRepository.Stub(); - inquiryHelper.Stub(ih => ih.GetSourceFileLocation(generator.Filter)).Return("/some/path"); + inquiryHelper.Expect(ih => ih.GetSourceFileLocation(generator.Filter)).Return(null); var fileImporter = mockRepository.Stub(); mockRepository.ReplayAll(); - var isVerifyUpdatedCalled = false; - using (var form = new Form()) { var supportedImportInfo = new ImportInfo { CreateFileImporter = (o, s) => { - Assert.Fail("CreateFileImporter is not expected to be called when VerifyUpdates function returns false."); + Assert.Fail("CreateFileImporter is not expected to be called when no file path is chosen."); return fileImporter; }, FileFilterGenerator = generator, - VerifyUpdates = o => - { - Assert.AreSame(o, targetObject); - isVerifyUpdatedCalled = true; - return false; - } + VerifyUpdates = o => true }; var importHandler = new GuiImportHandler(form, Enumerable.Empty(), inquiryHelper); // Call - importHandler.ImportOn(targetObject, new ImportInfo[] + void Call() => importHandler.ImportOn(targetObject, new ImportInfo[] { supportedImportInfo }); + + // Assert + TestHelper.AssertLogMessageIsGenerated(Call, "Importeren van gegevens is geannuleerd."); } - // Assert - Assert.IsTrue(isVerifyUpdatedCalled); mockRepository.VerifyAll(); } Index: Core/Common/test/Core.Common.Gui.Test/ContextMenu/ContextMenuBuilderTest.cs =================================================================== diff -u -r8e0856bca7d9689c4c09ff2c3008d6cad8c3bef7 -rbabec62dabf2b28efe0151887472b0756f59a6ce --- Core/Common/test/Core.Common.Gui.Test/ContextMenu/ContextMenuBuilderTest.cs (.../ContextMenuBuilderTest.cs) (revision 8e0856bca7d9689c4c09ff2c3008d6cad8c3bef7) +++ Core/Common/test/Core.Common.Gui.Test/ContextMenu/ContextMenuBuilderTest.cs (.../ContextMenuBuilderTest.cs) (revision babec62dabf2b28efe0151887472b0756f59a6ce) @@ -56,17 +56,17 @@ using (var treeViewControl = new TreeViewControl()) { // Call - TestDelegate test = () => new ContextMenuBuilder(null, - importCommandHandler, - exportCommandHandler, - updateCommandHandler, - viewCommands, - new object(), - treeViewControl); + void Call() => new ContextMenuBuilder(null, + importCommandHandler, + exportCommandHandler, + updateCommandHandler, + viewCommands, + new object(), + treeViewControl); // Assert - string message = Assert.Throws(test).Message; - Assert.AreEqual(Resources.ContextMenuBuilder_ContextMenuBuilder_Cannot_create_instances_of_factories, message); + var exception = Assert.Throws(Call); + Assert.AreEqual(Resources.ContextMenuBuilder_ContextMenuBuilder_Cannot_create_instances_of_factories, exception.Message); } mocks.VerifyAll(); @@ -85,17 +85,17 @@ using (var treeViewControl = new TreeViewControl()) { // Call - TestDelegate test = () => new ContextMenuBuilder(applicationFeatureCommands, - null, - exportCommandHandler, - updateCommandHandler, - viewCommands, - new object(), - treeViewControl); + void Call() => new ContextMenuBuilder(applicationFeatureCommands, + null, + exportCommandHandler, + updateCommandHandler, + viewCommands, + new object(), + treeViewControl); // Assert - string message = Assert.Throws(test).Message; - Assert.AreEqual(Resources.ContextMenuBuilder_ContextMenuBuilder_Cannot_create_instances_of_factories, message); + var exception = Assert.Throws(Call); + Assert.AreEqual(Resources.ContextMenuBuilder_ContextMenuBuilder_Cannot_create_instances_of_factories, exception.Message); } mocks.VerifyAll(); @@ -114,17 +114,17 @@ using (var treeViewControl = new TreeViewControl()) { // Call - TestDelegate test = () => new ContextMenuBuilder(applicationFeatureCommands, - importCommandHandler, - null, - updateCommandHandler, - viewCommands, - new object(), - treeViewControl); + void Call() => new ContextMenuBuilder(applicationFeatureCommands, + importCommandHandler, + null, + updateCommandHandler, + viewCommands, + new object(), + treeViewControl); // Assert - string message = Assert.Throws(test).Message; - Assert.AreEqual(Resources.ContextMenuBuilder_ContextMenuBuilder_Cannot_create_instances_of_factories, message); + var exception = Assert.Throws(Call); + Assert.AreEqual(Resources.ContextMenuBuilder_ContextMenuBuilder_Cannot_create_instances_of_factories, exception.Message); } mocks.VerifyAll(); @@ -143,17 +143,17 @@ using (var treeViewControl = new TreeViewControl()) { // Call - TestDelegate test = () => new ContextMenuBuilder(applicationFeatureCommands, - importCommandHandler, - exportCommandHandler, - null, - viewCommands, - new object(), - treeViewControl); + void Call() => new ContextMenuBuilder(applicationFeatureCommands, + importCommandHandler, + exportCommandHandler, + null, + viewCommands, + new object(), + treeViewControl); // Assert - string message = Assert.Throws(test).Message; - Assert.AreEqual(Resources.ContextMenuBuilder_ContextMenuBuilder_Cannot_create_instances_of_factories, message); + var exception = Assert.Throws(Call); + Assert.AreEqual(Resources.ContextMenuBuilder_ContextMenuBuilder_Cannot_create_instances_of_factories, exception.Message); } mocks.VerifyAll(); @@ -172,17 +172,17 @@ using (var treeViewControl = new TreeViewControl()) { // Call - TestDelegate test = () => new ContextMenuBuilder(applicationFeatureCommands, - importCommandHandler, - exportCommandHandler, - updateCommandHandler, - null, - new object(), - treeViewControl); + void Call() => new ContextMenuBuilder(applicationFeatureCommands, + importCommandHandler, + exportCommandHandler, + updateCommandHandler, + null, + new object(), + treeViewControl); // Assert - string message = Assert.Throws(test).Message; - Assert.AreEqual(Resources.ContextMenuBuilder_ContextMenuBuilder_Cannot_create_instances_of_factories, message); + var exception = Assert.Throws(Call); + Assert.AreEqual(Resources.ContextMenuBuilder_ContextMenuBuilder_Cannot_create_instances_of_factories, exception.Message); } mocks.VerifyAll(); @@ -202,17 +202,17 @@ using (var treeViewControl = new TreeViewControl()) { // Call - TestDelegate test = () => new ContextMenuBuilder(applicationFeatureCommands, - importCommandHandler, - exportCommandHandler, - updateCommandHandler, - viewCommands, - null, - treeViewControl); + void Call() => new ContextMenuBuilder(applicationFeatureCommands, + importCommandHandler, + exportCommandHandler, + updateCommandHandler, + viewCommands, + null, + treeViewControl); // Assert - string message = Assert.Throws(test).Message; - Assert.AreEqual(Resources.ContextMenuBuilder_ContextMenuBuilder_Cannot_create_instances_of_factories, message); + var exception = Assert.Throws(Call); + Assert.AreEqual(Resources.ContextMenuBuilder_ContextMenuBuilder_Cannot_create_instances_of_factories, exception.Message); } mocks.VerifyAll(); @@ -229,17 +229,17 @@ var viewCommands = mocks.StrictMock(); // Call - TestDelegate test = () => new ContextMenuBuilder(applicationFeatureCommands, - importCommandHandler, - exportCommandHandler, - updateCommandHandler, - viewCommands, - new object(), - null); + void Call() => new ContextMenuBuilder(applicationFeatureCommands, + importCommandHandler, + exportCommandHandler, + updateCommandHandler, + viewCommands, + new object(), + null); // Assert - string message = Assert.Throws(test).Message; - Assert.AreEqual(Resources.ContextMenuBuilder_ContextMenuBuilder_Cannot_create_instances_of_factories, message); + var exception = Assert.Throws(Call); + Assert.AreEqual(Resources.ContextMenuBuilder_ContextMenuBuilder_Cannot_create_instances_of_factories, exception.Message); } [Test] @@ -256,16 +256,16 @@ using (var treeViewControl = new TreeViewControl()) { // Call - TestDelegate test = () => new ContextMenuBuilder(applicationFeatureCommands, - importCommandHandler, - exportCommandHandler, - updateCommandHandler, - viewCommands, - new object(), - treeViewControl); + void Call() => new ContextMenuBuilder(applicationFeatureCommands, + importCommandHandler, + exportCommandHandler, + updateCommandHandler, + viewCommands, + new object(), + treeViewControl); // Assert - Assert.DoesNotThrow(test); + Assert.DoesNotThrow(Call); } mocks.VerifyAll(); Index: Core/Common/test/Core.Common.Gui.Test/ContextMenu/GuiContextMenuItemFactoryTest.cs =================================================================== diff -u -r8e0856bca7d9689c4c09ff2c3008d6cad8c3bef7 -rbabec62dabf2b28efe0151887472b0756f59a6ce --- Core/Common/test/Core.Common.Gui.Test/ContextMenu/GuiContextMenuItemFactoryTest.cs (.../GuiContextMenuItemFactoryTest.cs) (revision 8e0856bca7d9689c4c09ff2c3008d6cad8c3bef7) +++ Core/Common/test/Core.Common.Gui.Test/ContextMenu/GuiContextMenuItemFactoryTest.cs (.../GuiContextMenuItemFactoryTest.cs) (revision babec62dabf2b28efe0151887472b0756f59a6ce) @@ -411,7 +411,7 @@ } [Test] - public void CreateImportItemWithoutParameters_SupportedImportInfos_CausesImportToStartWhenClicked() + public void CreateImportItemWithoutParameters_SupportedImportInfo_CausesImportToStartWhenClicked() { // Setup var commandHandler = mocks.StrictMock(); @@ -489,7 +489,7 @@ } [Test] - public void CreateImportItemWithImportInfosParameter_SupportedImportInfos_CausesImportToStartWhenClicked() + public void CreateImportItemWithImportInfosParameter_SupportedImportInfo_CausesImportToStartWhenClicked() { // Setup var commandHandler = mocks.StrictMock(); @@ -672,7 +672,7 @@ } [Test] - public void CreateImportItemWithTextualParameters_SupportedImportInfos_CausesImportToStartWhenClicked() + public void CreateImportItemWithTextualParameters_SupportedImportInfo_CausesImportToStartWhenClicked() { // Setup const string text = "Import"; @@ -860,7 +860,7 @@ } [Test] - public void CreateImportItemWithAllParameters_SupportedImportInfos_CausesImportToStartWhenClicked() + public void CreateImportItemWithAllParameters_SupportedImportInfo_CausesImportToStartWhenClicked() { // Setup const string text = "Import"; Index: Core/Common/test/Core.Common.Gui.TestUtil/ContextMenu/CustomItemsOnlyContextMenuBuilder.cs =================================================================== diff -u -r73bbf0af78f30b218cc043bf9aa076a7b00aad73 -rbabec62dabf2b28efe0151887472b0756f59a6ce --- Core/Common/test/Core.Common.Gui.TestUtil/ContextMenu/CustomItemsOnlyContextMenuBuilder.cs (.../CustomItemsOnlyContextMenuBuilder.cs) (revision 73bbf0af78f30b218cc043bf9aa076a7b00aad73) +++ Core/Common/test/Core.Common.Gui.TestUtil/ContextMenu/CustomItemsOnlyContextMenuBuilder.cs (.../CustomItemsOnlyContextMenuBuilder.cs) (revision babec62dabf2b28efe0151887472b0756f59a6ce) @@ -104,7 +104,7 @@ /// Adds a dummy to the . /// /// An enumeration of instances, representing one or more - /// suitable import actions. + /// supported import actions. /// The . public IContextMenuBuilder AddImportItem(IEnumerable importInfos = null) { @@ -118,7 +118,7 @@ /// The tooltip of the import item. /// The image of the import item. /// An enumeration of instances, representing one or more - /// suitable import actions. + /// supported import actions. /// The . public IContextMenuBuilder AddImportItem(string text, string toolTip, Image image, IEnumerable importInfos = null) { Index: Riskeer/Common/src/Riskeer.Common.Forms/TreeNodeInfos/RiskeerContextMenuBuilder.cs =================================================================== diff -u -r27447e223e55ca8602b5fbfc1b19456784b60c2a -rbabec62dabf2b28efe0151887472b0756f59a6ce --- Riskeer/Common/src/Riskeer.Common.Forms/TreeNodeInfos/RiskeerContextMenuBuilder.cs (.../RiskeerContextMenuBuilder.cs) (revision 27447e223e55ca8602b5fbfc1b19456784b60c2a) +++ Riskeer/Common/src/Riskeer.Common.Forms/TreeNodeInfos/RiskeerContextMenuBuilder.cs (.../RiskeerContextMenuBuilder.cs) (revision babec62dabf2b28efe0151887472b0756f59a6ce) @@ -451,9 +451,9 @@ /// Adds an item to the , which imports to the data of the . /// /// An enumeration of instances, representing one or more - /// suitable import actions. + /// supported import actions. /// The itself. - /// When no parameter is provided, the suitable + /// When no parameter is provided, the supported /// instances - as registered by the plugins - will be resolved dynamically. public RiskeerContextMenuBuilder AddImportItem(IEnumerable importInfos = null) { @@ -468,13 +468,13 @@ /// The tooltip of the import item. /// The image of the import item. /// An enumeration of instances, representing one or more - /// suitable import actions. + /// supported import actions. /// The itself. - /// When no parameter is provided, the suitable - /// instances - as registered by the plugins - will be resolved dynamically. /// Thrown when is null or only whitespace. /// Thrown when or /// is null. + /// When no parameter is provided, the supported + /// instances - as registered by the plugins - will be resolved dynamically. public RiskeerContextMenuBuilder AddImportItem(string text, string toolTip, Image image, IEnumerable importInfos = null) { contextMenuBuilder.AddImportItem(text, toolTip, image, importInfos);