Index: Core/Common/src/Core.Common.Base/IO/IFileExporter.cs =================================================================== diff -u -rdd84dcabe5561e637e4ade45457437d9c037535b -r2e73db6bbdd25adf8d0e26a2db9f862e2ed3c191 --- Core/Common/src/Core.Common.Base/IO/IFileExporter.cs (.../IFileExporter.cs) (revision dd84dcabe5561e637e4ade45457437d9c037535b) +++ Core/Common/src/Core.Common.Base/IO/IFileExporter.cs (.../IFileExporter.cs) (revision 2e73db6bbdd25adf8d0e26a2db9f862e2ed3c191) @@ -30,7 +30,6 @@ /// This method performs the export routine. /// /// true if the export was successful, false otherwise. - /// Implementations of this export method are allowed to throw exceptions of any kind. bool Export(); } } \ No newline at end of file Index: Core/Common/src/Core.Common.Gui/Commands/GuiExportHandler.cs =================================================================== diff -u -r77c945bdf8a9d69da89a86c7b943250e51f0cc39 -r2e73db6bbdd25adf8d0e26a2db9f862e2ed3c191 --- Core/Common/src/Core.Common.Gui/Commands/GuiExportHandler.cs (.../GuiExportHandler.cs) (revision 77c945bdf8a9d69da89a86c7b943250e51f0cc39) +++ Core/Common/src/Core.Common.Gui/Commands/GuiExportHandler.cs (.../GuiExportHandler.cs) (revision 2e73db6bbdd25adf8d0e26a2db9f862e2ed3c191) @@ -23,6 +23,7 @@ using System.Drawing; using System.Linq; using System.Windows.Forms; +using Core.Common.Base.IO; using Core.Common.Gui.Forms; using Core.Common.Gui.Plugin; using Core.Common.Gui.Properties; @@ -60,7 +61,7 @@ public void ExportFrom(object source) { - var exportInfo = GetSupportedExportInfoUsingDialog(source); + ExportInfo exportInfo = GetSupportedExportInfoUsingDialog(source); if (exportInfo == null) { return; @@ -83,13 +84,13 @@ private ExportInfo GetSupportedExportInfoUsingDialog(object source) { - var supportedExportInfos = GetSupportedExportInfos(source).ToArray(); + ExportInfo[] supportedExportInfos = GetSupportedExportInfos(source).ToArray(); if (supportedExportInfos.Length == 0) { MessageBox.Show(Resources.GuiExportHandler_GetSupportedExporterForItemUsingDialog_No_exporter_for_this_item_available, Resources.GuiExportHandler_GetSupportedExporterForItemUsingDialog_Error); - var itemToExportType = source == null ? "null" : source.GetType().FullName; + string itemToExportType = source == null ? "null" : source.GetType().FullName; log.Warn(string.Format(Resources.GuiExportHandler_GetSupportedExporterForItemUsingDialog_No_exporter_for_this_item_0_available, itemToExportType)); return null; } @@ -117,7 +118,8 @@ private void ExportItemUsingFileOpenDialog(ExportInfo exportInfo, object source) { - var windowTitle = string.Format(Resources.GuiExportHandler_ExporterItemUsingFileOpenDialog_Select_a_DataType_0_file_to_export_to, exportInfo.Name); + string windowTitle = string.Format(Resources.GuiExportHandler_ExporterItemUsingFileOpenDialog_Select_a_DataType_0_file_to_export_to, + exportInfo.Name); using (var saveFileDialog = new SaveFileDialog { Filter = exportInfo.FileFilter, @@ -129,7 +131,7 @@ { log.Info(Resources.GuiExportHandler_ExporterItemUsingFileOpenDialog_Start_exporting); - var exporter = exportInfo.CreateFileExporter(source, saveFileDialog.FileName); + IFileExporter exporter = exportInfo.CreateFileExporter(source, saveFileDialog.FileName); if (exporter.Export()) { Index: Core/Common/src/Core.Common.Gui/Commands/GuiImportHandler.cs =================================================================== diff -u -r77c945bdf8a9d69da89a86c7b943250e51f0cc39 -r2e73db6bbdd25adf8d0e26a2db9f862e2ed3c191 --- Core/Common/src/Core.Common.Gui/Commands/GuiImportHandler.cs (.../GuiImportHandler.cs) (revision 77c945bdf8a9d69da89a86c7b943250e51f0cc39) +++ Core/Common/src/Core.Common.Gui/Commands/GuiImportHandler.cs (.../GuiImportHandler.cs) (revision 2e73db6bbdd25adf8d0e26a2db9f862e2ed3c191) @@ -20,6 +20,7 @@ // All rights reserved. using System.Collections.Generic; +using System.Drawing; using System.Linq; using System.Windows.Forms; using Core.Common.Base.IO; @@ -59,7 +60,7 @@ public void ImportOn(object target) { - var importer = GetSupportedImporterUsingDialog(target); + IFileImporter importer = GetSupportedImporterUsingDialog(target); if (importer == null) { return; @@ -70,7 +71,7 @@ private IFileImporter GetSupportedImporterUsingDialog(object target) { - var importers = fileImporters.Where(fileImporter => fileImporter.CanImportOn(target)).ToArray(); + IFileImporter[] importers = fileImporters.Where(fileImporter => fileImporter.CanImportOn(target)).ToArray(); if (!importers.Any()) { @@ -90,8 +91,10 @@ { foreach (IFileImporter importer in importers) { - var category = string.IsNullOrEmpty(importer.Category) ? Resources.GuiImportHandler_GetSupportedImporterForTargetType_Data_Import : importer.Category; - var itemImage = importer.Image ?? Resources.brick; + string category = string.IsNullOrEmpty(importer.Category) ? + Resources.GuiImportHandler_GetSupportedImporterForTargetType_Data_Import : + importer.Category; + Bitmap itemImage = importer.Image ?? Resources.brick; selectImporterDialog.AddItemType(importer.Name, category, itemImage, null); } @@ -121,7 +124,8 @@ { log.Info(Resources.GuiImportHandler_GetImportedItemsUsingFileOpenDialog_Start_importing_data); - ActivityProgressDialogRunner.Run(dialogParent, dialog.FileNames.Select(f => new FileImportActivity(importer, target, f)).ToList()); + FileImportActivity[] importActivitiesToRun = dialog.FileNames.Select(f => new FileImportActivity(importer, target, f)).ToArray(); + ActivityProgressDialogRunner.Run(dialogParent, importActivitiesToRun); } } } Index: Core/Common/src/Core.Common.Gui/Plugin/ExportInfo.cs =================================================================== diff -u -reff4bc47aee9786f42f3aa60728840b0793d6f96 -r2e73db6bbdd25adf8d0e26a2db9f862e2ed3c191 --- Core/Common/src/Core.Common.Gui/Plugin/ExportInfo.cs (.../ExportInfo.cs) (revision eff4bc47aee9786f42f3aa60728840b0793d6f96) +++ Core/Common/src/Core.Common.Gui/Plugin/ExportInfo.cs (.../ExportInfo.cs) (revision 2e73db6bbdd25adf8d0e26a2db9f862e2ed3c191) @@ -149,9 +149,9 @@ return new ExportInfo { DataType = exportInfo.DataType, - CreateFileExporter = (data, filePath) => exportInfo.CreateFileExporter != null - ? exportInfo.CreateFileExporter((TData) data, filePath) - : null, + CreateFileExporter = (data, filePath) => exportInfo.CreateFileExporter != null ? + exportInfo.CreateFileExporter((TData) data, filePath) : + null, IsEnabled = data => exportInfo.IsEnabled == null || exportInfo.IsEnabled((TData) data), Name = exportInfo.Name, Category = exportInfo.Category, Index: Core/Common/src/Core.Common.Gui/Plugin/PropertyInfo.cs =================================================================== diff -u -rdd84dcabe5561e637e4ade45457437d9c037535b -r2e73db6bbdd25adf8d0e26a2db9f862e2ed3c191 --- Core/Common/src/Core.Common.Gui/Plugin/PropertyInfo.cs (.../PropertyInfo.cs) (revision dd84dcabe5561e637e4ade45457437d9c037535b) +++ Core/Common/src/Core.Common.Gui/Plugin/PropertyInfo.cs (.../PropertyInfo.cs) (revision 2e73db6bbdd25adf8d0e26a2db9f862e2ed3c191) @@ -148,15 +148,15 @@ { DataType = typeof(TObject), PropertyObjectType = typeof(TProperty), - AdditionalDataCheck = propertyInfo.AdditionalDataCheck != null - ? o => propertyInfo.AdditionalDataCheck((TObject) o) - : (Func) null, - GetObjectPropertiesData = propertyInfo.GetObjectPropertiesData != null - ? o => propertyInfo.GetObjectPropertiesData((TObject) o) - : (Func) null, - AfterCreate = propertyInfo.AfterCreate != null - ? op => propertyInfo.AfterCreate((TProperty) op) - : (Action) null + AdditionalDataCheck = propertyInfo.AdditionalDataCheck != null ? + o => propertyInfo.AdditionalDataCheck((TObject) o) : + (Func) null, + GetObjectPropertiesData = propertyInfo.GetObjectPropertiesData != null ? + o => propertyInfo.GetObjectPropertiesData((TObject) o) : + (Func) null, + AfterCreate = propertyInfo.AfterCreate != null ? + op => propertyInfo.AfterCreate((TProperty) op) : + (Action) null }; } } Index: Core/Common/test/Core.Common.Gui.Test/Commands/GuiExportHandlerTest.cs =================================================================== diff -u -rbd05036a45f8ac148a65905243242822ac3aeb88 -r2e73db6bbdd25adf8d0e26a2db9f862e2ed3c191 --- Core/Common/test/Core.Common.Gui.Test/Commands/GuiExportHandlerTest.cs (.../GuiExportHandlerTest.cs) (revision bd05036a45f8ac148a65905243242822ac3aeb88) +++ Core/Common/test/Core.Common.Gui.Test/Commands/GuiExportHandlerTest.cs (.../GuiExportHandlerTest.cs) (revision 2e73db6bbdd25adf8d0e26a2db9f862e2ed3c191) @@ -21,6 +21,7 @@ using System; using System.Collections.Generic; +using System.IO; using System.Windows.Forms; using Core.Common.Base.IO; using Core.Common.Gui.Commands; @@ -65,7 +66,7 @@ Action call = () => exportHandler.ExportFrom(source); // Assert - var sourceTypeName = source == null ? "null" : source.GetType().FullName; + string sourceTypeName = source == null ? "null" : source.GetType().FullName; TestHelper.AssertLogMessageIsGenerated(call, string.Format("Ringtoets kan de huidige selectie ({0}) niet exporteren.", sourceTypeName)); Assert.AreEqual("Fout", messageBoxTitle); Assert.AreEqual("Ringtoets kan de huidige selectie niet exporteren.", messageBoxText); @@ -104,7 +105,7 @@ Action call = () => exportHandler.ExportFrom(source); // Assert - var sourceTypeName = source == null ? "null" : source.GetType().FullName; + string sourceTypeName = source == null ? "null" : source.GetType().FullName; TestHelper.AssertLogMessageIsGenerated(call, string.Format("Ringtoets kan de huidige selectie ({0}) niet exporteren.", sourceTypeName)); Assert.AreEqual("Fout", messageBoxTitle); Assert.AreEqual("Ringtoets kan de huidige selectie niet exporteren.", messageBoxText); @@ -155,22 +156,30 @@ mockRepository.ReplayAll(); + const int expectedData = 1234; + string expectedExportPath = Path.GetFullPath("exportFile.txt"); + ModalFormHandler = (name, wnd, form) => { var messageBox = new SaveFileDialogTester(wnd); - messageBox.SaveFile("exportFile.txt"); + messageBox.SaveFile(expectedExportPath); }; var exportHandler = new GuiExportHandler(mainWindow, new List { new ExportInfo { - CreateFileExporter = (data, filePath) => exporterMock + CreateFileExporter = (data, filePath) => + { + Assert.AreEqual(expectedData, data); + Assert.AreEqual(expectedExportPath, filePath); + return exporterMock; + } } }); // Call - Action call = () => exportHandler.ExportFrom(1234); + Action call = () => exportHandler.ExportFrom(expectedData); // Assert TestHelper.AssertLogMessagesAreGenerated(call, new[] Index: Core/Common/test/Core.Common.Gui.Test/Commands/GuiImportHandlerTest.cs =================================================================== diff -u -r92ce91281efab19772bd3e2d7ecea2c0a6c8ea97 -r2e73db6bbdd25adf8d0e26a2db9f862e2ed3c191 --- Core/Common/test/Core.Common.Gui.Test/Commands/GuiImportHandlerTest.cs (.../GuiImportHandlerTest.cs) (revision 92ce91281efab19772bd3e2d7ecea2c0a6c8ea97) +++ Core/Common/test/Core.Common.Gui.Test/Commands/GuiImportHandlerTest.cs (.../GuiImportHandlerTest.cs) (revision 2e73db6bbdd25adf8d0e26a2db9f862e2ed3c191) @@ -112,7 +112,7 @@ var commandHandler = new GuiImportHandler(dialogParent, fileImporters); // Call - var isImportPossible = commandHandler.CanImportOn(new object()); + bool isImportPossible = commandHandler.CanImportOn(new object()); // Assert Assert.IsFalse(isImportPossible); @@ -139,7 +139,7 @@ var commandHandler = new GuiImportHandler(dialogParent, fileImporters); // Call - var isImportPossible = commandHandler.CanImportOn(target); + bool isImportPossible = commandHandler.CanImportOn(target); // Assert Assert.IsTrue(isImportPossible); @@ -165,7 +165,7 @@ var commandHandler = new GuiImportHandler(dialogParent, fileImporters); // Call - var isImportPossible = commandHandler.CanImportOn(target); + bool isImportPossible = commandHandler.CanImportOn(target); // Assert Assert.IsFalse(isImportPossible); @@ -193,7 +193,7 @@ var commandHandler = new GuiImportHandler(dialogParent, fileImporters); // Call - var isImportPossible = commandHandler.CanImportOn(target); + bool isImportPossible = commandHandler.CanImportOn(target); // Assert Assert.IsTrue(isImportPossible); @@ -221,7 +221,7 @@ var commandHandler = new GuiImportHandler(dialogParent, fileImporters); // Call - var isImportPossible = commandHandler.CanImportOn(target); + bool isImportPossible = commandHandler.CanImportOn(target); // Assert Assert.IsFalse(isImportPossible); Index: Core/Common/test/Core.Common.Gui.Test/ContextMenu/ContextMenuBuilderTest.cs =================================================================== diff -u -r92ce91281efab19772bd3e2d7ecea2c0a6c8ea97 -r2e73db6bbdd25adf8d0e26a2db9f862e2ed3c191 --- Core/Common/test/Core.Common.Gui.Test/ContextMenu/ContextMenuBuilderTest.cs (.../ContextMenuBuilderTest.cs) (revision 92ce91281efab19772bd3e2d7ecea2c0a6c8ea97) +++ Core/Common/test/Core.Common.Gui.Test/ContextMenu/ContextMenuBuilderTest.cs (.../ContextMenuBuilderTest.cs) (revision 2e73db6bbdd25adf8d0e26a2db9f862e2ed3c191) @@ -61,7 +61,7 @@ treeViewControl); // Assert - var message = Assert.Throws(test).Message; + string message = Assert.Throws(test).Message; Assert.AreEqual(Resources.ContextMenuBuilder_ContextMenuBuilder_Cannot_create_instances_of_factories, message); } mocks.VerifyAll(); @@ -87,7 +87,7 @@ treeViewControl); // Assert - var message = Assert.Throws(test).Message; + string message = Assert.Throws(test).Message; Assert.AreEqual(Resources.ContextMenuBuilder_ContextMenuBuilder_Cannot_create_instances_of_factories, message); } mocks.VerifyAll(); @@ -113,7 +113,7 @@ treeViewControl); // Assert - var message = Assert.Throws(test).Message; + string message = Assert.Throws(test).Message; Assert.AreEqual(Resources.ContextMenuBuilder_ContextMenuBuilder_Cannot_create_instances_of_factories, message); } mocks.VerifyAll(); @@ -139,7 +139,7 @@ treeViewControl); // Assert - var message = Assert.Throws(test).Message; + string message = Assert.Throws(test).Message; Assert.AreEqual(Resources.ContextMenuBuilder_ContextMenuBuilder_Cannot_create_instances_of_factories, message); } mocks.VerifyAll(); @@ -166,7 +166,7 @@ treeViewControl); // Assert - var message = Assert.Throws(test).Message; + string message = Assert.Throws(test).Message; Assert.AreEqual(Resources.ContextMenuBuilder_ContextMenuBuilder_Cannot_create_instances_of_factories, message); } mocks.VerifyAll(); @@ -190,7 +190,7 @@ null); // Assert - var message = Assert.Throws(test).Message; + string message = Assert.Throws(test).Message; Assert.AreEqual(Resources.ContextMenuBuilder_ContextMenuBuilder_Cannot_create_instances_of_factories, message); } @@ -240,7 +240,7 @@ treeViewControl); // Call - var result = builder.Build(); + ContextMenuStrip result = builder.Build(); // Assert Assert.IsInstanceOf(result); @@ -254,38 +254,40 @@ { // Setup var dataObject = new object(); - var treeViewControl = new TreeViewControl(); - var applicationFeatureCommandsMock = mocks.StrictMock(); - var importCommandHandlerMock = mocks.StrictMock(); - var exportCommandHandlerMock = mocks.StrictMock(); - var viewCommandsMock = mocks.StrictMock(); - var treeNodeInfoMock = mocks.StrictMock>(); + using (var treeViewControl = new TreeViewControl()) + { + var applicationFeatureCommandsMock = mocks.StrictMock(); + var importCommandHandlerMock = mocks.StrictMock(); + var exportCommandHandlerMock = mocks.StrictMock(); + var viewCommandsMock = mocks.StrictMock(); + var treeNodeInfoMock = mocks.StrictMock>(); - treeNodeInfoMock.CanRename = (data, parentData) => data == dataObject; + treeNodeInfoMock.CanRename = (data, parentData) => data == dataObject; - treeViewControl.RegisterTreeNodeInfo(treeNodeInfoMock); + treeViewControl.RegisterTreeNodeInfo(treeNodeInfoMock); - treeViewControl.Data = dataObject; + treeViewControl.Data = dataObject; - mocks.ReplayAll(); + mocks.ReplayAll(); - var builder = new ContextMenuBuilder(applicationFeatureCommandsMock, - importCommandHandlerMock, - exportCommandHandlerMock, - viewCommandsMock, - dataObject, - treeViewControl); + var builder = new ContextMenuBuilder(applicationFeatureCommandsMock, + importCommandHandlerMock, + exportCommandHandlerMock, + viewCommandsMock, + dataObject, + treeViewControl); - // Call - var result = builder.AddRenameItem().Build(); + // Call + ContextMenuStrip result = builder.AddRenameItem().Build(); - // Assert - Assert.IsInstanceOf(result); - Assert.AreEqual(1, result.Items.Count); + // Assert + Assert.IsInstanceOf(result); + Assert.AreEqual(1, result.Items.Count); - TestHelper.AssertContextMenuStripContainsItem(result, 0, Resources.Rename, Resources.Rename_ToolTip, Resources.RenameIcon); + TestHelper.AssertContextMenuStripContainsItem(result, 0, Resources.Rename, Resources.Rename_ToolTip, Resources.RenameIcon); - mocks.VerifyAll(); + mocks.VerifyAll(); + } } [Test] @@ -294,44 +296,46 @@ // Setup var nodeData = "string"; var parentData = new object(); - var treeViewControl = new TreeViewControl(); - var applicationFeatureCommandsMock = mocks.StrictMock(); - var importCommandHandlerMock = mocks.StrictMock(); - var exportCommandHandlerMock = mocks.StrictMock(); - var viewCommandsMock = mocks.StrictMock(); - var treeNodeInfoMock = mocks.StrictMock>(); - var parentTreeNodeInfoMock = mocks.StrictMock>(); - - treeNodeInfoMock.CanRemove = (nd, pnd) => nd == nodeData && pnd == parentData; - parentTreeNodeInfoMock.ChildNodeObjects = nd => new object[] + using (var treeViewControl = new TreeViewControl()) { - nodeData - }; + var applicationFeatureCommandsMock = mocks.StrictMock(); + var importCommandHandlerMock = mocks.StrictMock(); + var exportCommandHandlerMock = mocks.StrictMock(); + var viewCommandsMock = mocks.StrictMock(); + var treeNodeInfoMock = mocks.StrictMock>(); + var parentTreeNodeInfoMock = mocks.StrictMock>(); - treeViewControl.RegisterTreeNodeInfo(treeNodeInfoMock); - treeViewControl.RegisterTreeNodeInfo(parentTreeNodeInfoMock); + treeNodeInfoMock.CanRemove = (nd, pnd) => nd == nodeData && pnd == parentData; + parentTreeNodeInfoMock.ChildNodeObjects = nd => new object[] + { + nodeData + }; - treeViewControl.Data = parentData; + treeViewControl.RegisterTreeNodeInfo(treeNodeInfoMock); + treeViewControl.RegisterTreeNodeInfo(parentTreeNodeInfoMock); - mocks.ReplayAll(); + treeViewControl.Data = parentData; - var builder = new ContextMenuBuilder(applicationFeatureCommandsMock, - importCommandHandlerMock, - exportCommandHandlerMock, - viewCommandsMock, - nodeData, - treeViewControl); + mocks.ReplayAll(); - // Call - var result = builder.AddDeleteItem().Build(); + var builder = new ContextMenuBuilder(applicationFeatureCommandsMock, + importCommandHandlerMock, + exportCommandHandlerMock, + viewCommandsMock, + nodeData, + treeViewControl); - // Assert - Assert.IsInstanceOf(result); - Assert.AreEqual(1, result.Items.Count); + // Call + ContextMenuStrip result = builder.AddDeleteItem().Build(); - TestHelper.AssertContextMenuStripContainsItem(result, 0, Resources.Delete, Resources.Delete_ToolTip, Resources.DeleteIcon); + // Assert + Assert.IsInstanceOf(result); + Assert.AreEqual(1, result.Items.Count); - mocks.VerifyAll(); + TestHelper.AssertContextMenuStripContainsItem(result, 0, Resources.Delete, Resources.Delete_ToolTip, Resources.DeleteIcon); + + mocks.VerifyAll(); + } } [Test] @@ -359,7 +363,7 @@ treeViewControlMock); // Call - var result = builder.AddExpandAllItem().Build(); + ContextMenuStrip result = builder.AddExpandAllItem().Build(); // Assert Assert.IsInstanceOf(result); @@ -395,7 +399,7 @@ treeViewControlMock); // Call - var result = builder.AddCollapseAllItem().Build(); + ContextMenuStrip result = builder.AddCollapseAllItem().Build(); // Assert Assert.IsInstanceOf(result); @@ -412,12 +416,12 @@ public void AddOpenItem_WhenBuild_ItemAddedToContextMenu(bool hasViewForNodeData) { // Setup + var nodeData = new object(); + var applicationFeatureCommandsMock = mocks.StrictMock(); var importCommandHandlerMock = mocks.StrictMock(); var exportCommandHandlerMock = mocks.StrictMock(); var viewCommandsMock = mocks.StrictMock(); - - var nodeData = new object(); viewCommandsMock.Expect(ch => ch.CanOpenViewFor(nodeData)).Return(hasViewForNodeData); mocks.ReplayAll(); @@ -432,7 +436,7 @@ treeViewControl); // Call - var result = builder.AddOpenItem().Build(); + ContextMenuStrip result = builder.AddOpenItem().Build(); // Assert Assert.IsInstanceOf(result); @@ -449,12 +453,12 @@ public void AddExportItem_WhenBuild_ItemAddedToContextMenu(bool hasExportersForNodeData) { // Setup + var nodeData = new object(); + var applicationFeatureCommandsMock = mocks.StrictMock(); var importCommandHandlerMock = mocks.StrictMock(); var exportCommandHandlerMock = mocks.StrictMock(); var viewCommandsMock = mocks.StrictMock(); - - var nodeData = new object(); exportCommandHandlerMock.Expect(ch => ch.CanExportFrom(nodeData)).Return(hasExportersForNodeData); mocks.ReplayAll(); @@ -469,7 +473,7 @@ treeViewControl); // Call - var result = builder.AddExportItem().Build(); + ContextMenuStrip result = builder.AddExportItem().Build(); // Assert Assert.IsInstanceOf(result); @@ -486,12 +490,12 @@ public void AddImportItem_WhenBuild_ItemAddedToContextMenu(bool hasImportersForNodeData) { // Setup + var nodeData = new object(); + var applicationFeatureCommandsMock = mocks.StrictMock(); var importCommandHandlerMock = mocks.StrictMock(); var exportCommandHandlerMock = mocks.StrictMock(); var viewCommandsMock = mocks.StrictMock(); - - var nodeData = new object(); importCommandHandlerMock.Expect(ch => ch.CanImportOn(nodeData)).Return(hasImportersForNodeData); mocks.ReplayAll(); @@ -506,7 +510,7 @@ treeViewControl); // Call - var result = builder.AddImportItem().Build(); + ContextMenuStrip result = builder.AddImportItem().Build(); // Assert Assert.IsInstanceOf(result); @@ -523,12 +527,12 @@ public void AddPropertiesItem_WhenBuild_ItemAddedToContextMenu(bool hasPropertiesForNodeData) { // Setup + var nodeData = new object(); + var applicationFeatureCommandsMock = mocks.StrictMock(); var importCommandHandlerMock = mocks.StrictMock(); var exportCommandHandlerMock = mocks.StrictMock(); var viewCommandsMock = mocks.StrictMock(); - - var nodeData = new object(); applicationFeatureCommandsMock.Expect(ch => ch.CanShowPropertiesFor(nodeData)).Return(hasPropertiesForNodeData); mocks.ReplayAll(); @@ -543,7 +547,7 @@ treeViewControl); // Call - var result = builder.AddPropertiesItem().Build(); + ContextMenuStrip result = builder.AddPropertiesItem().Build(); // Assert Assert.IsInstanceOf(result); @@ -574,7 +578,7 @@ var item = new StrictContextMenuItem(null, null, null, null); // Call - var result = builder.AddCustomItem(item).Build(); + ContextMenuStrip result = builder.AddCustomItem(item).Build(); // Assert Assert.IsInstanceOf(result); @@ -605,7 +609,7 @@ treeViewControl); // Call - var result = builder.AddSeparator().Build(); + ContextMenuStrip result = builder.AddSeparator().Build(); // Assert Assert.IsInstanceOf(result); @@ -642,7 +646,7 @@ { builder.AddSeparator(); } - var result = builder.AddCustomItem(someItem).Build(); + ContextMenuStrip result = builder.AddCustomItem(someItem).Build(); // Assert Assert.IsInstanceOf(result); @@ -684,7 +688,7 @@ { builder.AddSeparator(); } - var result = builder.AddCustomItem(someOtherItem).Build(); + ContextMenuStrip result = builder.AddCustomItem(someOtherItem).Build(); // Assert Assert.IsInstanceOf(result); @@ -724,7 +728,7 @@ { builder.AddSeparator(); } - var result = builder.Build(); + ContextMenuStrip result = builder.Build(); // Assert Assert.IsInstanceOf(result);