Index: Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Plugin/ClosingStructuresPlugin.cs =================================================================== diff -u -rd2233d09b25a96914d3af5b58a03fc8bffa52c41 -r277b8107bf8ffad7dad7fa6dbb75cdb23a0feee2 --- Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Plugin/ClosingStructuresPlugin.cs (.../ClosingStructuresPlugin.cs) (revision d2233d09b25a96914d3af5b58a03fc8bffa52c41) +++ Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Plugin/ClosingStructuresPlugin.cs (.../ClosingStructuresPlugin.cs) (revision 277b8107bf8ffad7dad7fa6dbb75cdb23a0feee2) @@ -452,6 +452,7 @@ IEnumerable> calculations = closingStructuresFailureMechanismContext.WrappedData .Calculations .Cast>(); + IInquiryHelper inquiryHelper = GetInquiryHelper(); var builder = new RiskeerContextMenuBuilder(Gui.Get(closingStructuresFailureMechanismContext, treeViewControl)); @@ -470,7 +471,7 @@ .AddSeparator() .AddClearAllCalculationOutputInFailureMechanismItem(closingStructuresFailureMechanismContext.WrappedData) .AddClearIllustrationPointsOfCalculationsInFailureMechanismItem(() => IllustrationPointsHelper.HasIllustrationPoints(calculations), - CreateChangeHandler(GetInquiryHelper(), calculations)) + CreateChangeHandler(inquiryHelper, calculations)) .AddSeparator() .AddCollapseAllItem() .AddExpandAllItem() @@ -542,6 +543,7 @@ TreeViewControl treeViewControl) { CalculationGroup group = context.WrappedData; + IInquiryHelper inquiryHelper = GetInquiryHelper(); var builder = new RiskeerContextMenuBuilder(Gui.Get(context, treeViewControl)); bool isNestedGroup = parentData is ClosingStructuresCalculationGroupContext; @@ -573,8 +575,7 @@ builder.AddRenameItem(); } - builder.AddUpdateForeshoreProfileOfCalculationsItem(calculations, - GetInquiryHelper(), + builder.AddUpdateForeshoreProfileOfCalculationsItem(calculations, inquiryHelper, SynchronizeCalculationWithForeshoreProfileHelper.UpdateForeshoreProfileDerivedCalculationInput) .AddCustomItem(CreateUpdateStructureItem(calculations)) .AddSeparator() @@ -590,7 +591,7 @@ .AddSeparator() .AddClearAllCalculationOutputInGroupItem(group) .AddClearIllustrationPointsOfCalculationsInGroupItem(() => IllustrationPointsHelper.HasIllustrationPoints(calculations), - CreateChangeHandler(GetInquiryHelper(), calculations)); + CreateChangeHandler(inquiryHelper, calculations)); if (isNestedGroup) { Index: Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/ClosingStructuresPluginTest.cs =================================================================== diff -u -rd28e27005c5da2025e65e0544e70f89e5c08b67e -r277b8107bf8ffad7dad7fa6dbb75cdb23a0feee2 --- Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/ClosingStructuresPluginTest.cs (.../ClosingStructuresPluginTest.cs) (revision d28e27005c5da2025e65e0544e70f89e5c08b67e) +++ Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/ClosingStructuresPluginTest.cs (.../ClosingStructuresPluginTest.cs) (revision 277b8107bf8ffad7dad7fa6dbb75cdb23a0feee2) @@ -22,9 +22,12 @@ using System.Linq; using Core.Common.Base; using Core.Common.Controls.TreeView; +using Core.Common.Gui; +using Core.Common.Gui.Forms.MainWindow; using Core.Common.Gui.Plugin; using Core.Common.Gui.TestUtil; using NUnit.Framework; +using Rhino.Mocks; using Riskeer.ClosingStructures.Data; using Riskeer.ClosingStructures.Forms.PresentationObjects; using Riskeer.ClosingStructures.Forms.PropertyClasses; @@ -176,8 +179,17 @@ public void GetExportInfos_ReturnsSupportedExportInfos() { // Setup - using (var plugin = new ClosingStructuresPlugin()) + var mocks = new MockRepository(); + var mainWindow = mocks.Stub(); + var gui = mocks.Stub(); + gui.Stub(g => g.MainWindow).Return(mainWindow); + mocks.ReplayAll(); + + using (var plugin = new ClosingStructuresPlugin { + Gui = gui + }) + { // Call ExportInfo[] exportInfos = plugin.GetExportInfos().ToArray(); @@ -186,6 +198,8 @@ Assert.IsTrue(exportInfos.Any(tni => tni.DataType == typeof(ClosingStructuresCalculationGroupContext))); Assert.IsTrue(exportInfos.Any(tni => tni.DataType == typeof(ClosingStructuresCalculationContext))); } + + mocks.VerifyAll(); } } } \ No newline at end of file Index: Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/ExportInfos/ClosingStructuresCalculationContextExportInfoTest.cs =================================================================== diff -u -rd2233d09b25a96914d3af5b58a03fc8bffa52c41 -r277b8107bf8ffad7dad7fa6dbb75cdb23a0feee2 --- Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/ExportInfos/ClosingStructuresCalculationContextExportInfoTest.cs (.../ClosingStructuresCalculationContextExportInfoTest.cs) (revision d2233d09b25a96914d3af5b58a03fc8bffa52c41) +++ Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/ExportInfos/ClosingStructuresCalculationContextExportInfoTest.cs (.../ClosingStructuresCalculationContextExportInfoTest.cs) (revision 277b8107bf8ffad7dad7fa6dbb75cdb23a0feee2) @@ -21,6 +21,8 @@ using System.Linq; using Core.Common.Base.IO; +using Core.Common.Gui; +using Core.Common.Gui.Forms.MainWindow; using Core.Common.Gui.Plugin; using Core.Common.TestUtil; using NUnit.Framework; @@ -38,31 +40,52 @@ [TestFixture] public class ClosingStructuresCalculationContextExportInfoTest { - [Test] - public void Initialized_Always_ExpectedPropertiesSet() + private ClosingStructuresPlugin plugin; + private ExportInfo info; + private MockRepository mocks; + + [SetUp] + public void SetUp() { - // Setup - using (var plugin = new ClosingStructuresPlugin()) + mocks = new MockRepository(); + var mainWindow = mocks.Stub(); + var gui = mocks.Stub(); + gui.Stub(g => g.MainWindow).Return(mainWindow); + mocks.Replay(gui); + mocks.Replay(mainWindow); + + plugin = new ClosingStructuresPlugin { - // Call - ExportInfo info = GetExportInfo(plugin); + Gui = gui + }; - // Assert - Assert.IsNotNull(info.CreateFileExporter); - Assert.IsNotNull(info.IsEnabled); - Assert.AreEqual("Riskeer berekeningenconfiguratie", info.Name); - Assert.AreEqual("xml", info.Extension); - Assert.AreEqual("Algemeen", info.Category); - TestHelper.AssertImagesAreEqual(CoreCommonGuiResources.ExportIcon, info.Image); - Assert.IsNotNull(info.GetExportPath); - } + info = plugin.GetExportInfos().First(ei => ei.DataType == typeof(ClosingStructuresCalculationContext)); } + [TearDown] + public void TearDown() + { + plugin.Dispose(); + mocks.VerifyAll(); + } + [Test] + public void Initialized_Always_ExpectedPropertiesSet() + { + // Assert + Assert.IsNotNull(info.CreateFileExporter); + Assert.IsNotNull(info.IsEnabled); + Assert.AreEqual("Riskeer berekeningenconfiguratie", info.Name); + Assert.AreEqual("xml", info.Extension); + Assert.AreEqual("Algemeen", info.Category); + TestHelper.AssertImagesAreEqual(CoreCommonGuiResources.ExportIcon, info.Image); + Assert.IsNotNull(info.GetExportPath); + } + + [Test] public void CreateFileExporter_Always_ReturnFileExporter() { // Setup - var mocks = new MockRepository(); var assessmentSection = mocks.Stub(); mocks.ReplayAll(); @@ -71,25 +94,17 @@ new ClosingStructuresFailureMechanism(), assessmentSection); - using (var plugin = new ClosingStructuresPlugin()) - { - ExportInfo info = GetExportInfo(plugin); + // Call + IFileExporter fileExporter = info.CreateFileExporter(context, "test"); - // Call - IFileExporter fileExporter = info.CreateFileExporter(context, "test"); - - // Assert - Assert.IsInstanceOf(fileExporter); - } - - mocks.VerifyAll(); + // Assert + Assert.IsInstanceOf(fileExporter); } [Test] public void IsEnabled_Always_ReturnTrue() { // Setup - var mocks = new MockRepository(); var assessmentSection = mocks.Stub(); mocks.ReplayAll(); @@ -98,23 +113,11 @@ new ClosingStructuresFailureMechanism(), assessmentSection); - using (var plugin = new ClosingStructuresPlugin()) - { - ExportInfo info = GetExportInfo(plugin); + // Call + bool isEnabled = info.IsEnabled(context); - // Call - bool isEnabled = info.IsEnabled(context); - - // Assert - Assert.IsTrue(isEnabled); - } - - mocks.VerifyAll(); + // Assert + Assert.IsTrue(isEnabled); } - - private static ExportInfo GetExportInfo(ClosingStructuresPlugin plugin) - { - return plugin.GetExportInfos().First(ei => ei.DataType == typeof(ClosingStructuresCalculationContext)); - } } } \ No newline at end of file Index: Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/ExportInfos/ClosingStructuresCalculationGroupContextExportInfoTest.cs =================================================================== diff -u -rd2233d09b25a96914d3af5b58a03fc8bffa52c41 -r277b8107bf8ffad7dad7fa6dbb75cdb23a0feee2 --- Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/ExportInfos/ClosingStructuresCalculationGroupContextExportInfoTest.cs (.../ClosingStructuresCalculationGroupContextExportInfoTest.cs) (revision d2233d09b25a96914d3af5b58a03fc8bffa52c41) +++ Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/ExportInfos/ClosingStructuresCalculationGroupContextExportInfoTest.cs (.../ClosingStructuresCalculationGroupContextExportInfoTest.cs) (revision 277b8107bf8ffad7dad7fa6dbb75cdb23a0feee2) @@ -21,6 +21,8 @@ using System.Linq; using Core.Common.Base.IO; +using Core.Common.Gui; +using Core.Common.Gui.Forms.MainWindow; using Core.Common.Gui.Plugin; using Core.Common.TestUtil; using NUnit.Framework; @@ -38,31 +40,52 @@ [TestFixture] public class ClosingStructuresCalculationGroupContextExportInfoTest { - [Test] - public void Initialized_Always_ExpectedPropertiesSet() + private ClosingStructuresPlugin plugin; + private ExportInfo info; + private MockRepository mocks; + + [SetUp] + public void SetUp() { - // Setup - using (var plugin = new ClosingStructuresPlugin()) + mocks = new MockRepository(); + var mainWindow = mocks.Stub(); + var gui = mocks.Stub(); + gui.Stub(g => g.MainWindow).Return(mainWindow); + mocks.Replay(gui); + mocks.Replay(mainWindow); + + plugin = new ClosingStructuresPlugin { - // Call - ExportInfo info = GetExportInfo(plugin); + Gui = gui + }; - // Assert - Assert.IsNotNull(info.CreateFileExporter); - Assert.IsNotNull(info.IsEnabled); - Assert.AreEqual("Riskeer berekeningenconfiguratie", info.Name); - Assert.AreEqual("xml", info.Extension); - Assert.AreEqual("Algemeen", info.Category); - TestHelper.AssertImagesAreEqual(CoreCommonGuiResources.ExportIcon, info.Image); - Assert.IsNotNull(info.GetExportPath); - } + info = plugin.GetExportInfos().First(ei => ei.DataType == typeof(ClosingStructuresCalculationGroupContext)); } + [TearDown] + public void TearDown() + { + plugin.Dispose(); + mocks.VerifyAll(); + } + [Test] + public void Initialized_Always_ExpectedPropertiesSet() + { + // Assert + Assert.IsNotNull(info.CreateFileExporter); + Assert.IsNotNull(info.IsEnabled); + Assert.AreEqual("Riskeer berekeningenconfiguratie", info.Name); + Assert.AreEqual("xml", info.Extension); + Assert.AreEqual("Algemeen", info.Category); + TestHelper.AssertImagesAreEqual(CoreCommonGuiResources.ExportIcon, info.Image); + Assert.IsNotNull(info.GetExportPath); + } + + [Test] public void CreateFileExporter_Always_ReturnFileExporter() { // Setup - var mocks = new MockRepository(); var assessmentSection = mocks.Stub(); mocks.ReplayAll(); @@ -71,25 +94,17 @@ new ClosingStructuresFailureMechanism(), assessmentSection); - using (var plugin = new ClosingStructuresPlugin()) - { - ExportInfo info = GetExportInfo(plugin); + // Call + IFileExporter fileExporter = info.CreateFileExporter(context, "test"); - // Call - IFileExporter fileExporter = info.CreateFileExporter(context, "test"); - - // Assert - Assert.IsInstanceOf(fileExporter); - } - - mocks.VerifyAll(); + // Assert + Assert.IsInstanceOf(fileExporter); } [Test] public void IsEnabled_CalculationGroupNoChildren_ReturnFalse() { // Setup - var mocks = new MockRepository(); var assessmentSection = mocks.Stub(); mocks.ReplayAll(); @@ -98,18 +113,11 @@ new ClosingStructuresFailureMechanism(), assessmentSection); - using (var plugin = new ClosingStructuresPlugin()) - { - ExportInfo info = GetExportInfo(plugin); + // Call + bool isEnabled = info.IsEnabled(context); - // Call - bool isEnabled = info.IsEnabled(context); - - // Assert - Assert.IsFalse(isEnabled); - } - - mocks.VerifyAll(); + // Assert + Assert.IsFalse(isEnabled); } [Test] @@ -118,7 +126,6 @@ public void IsEnabled_CalculationGroupWithChildren_ReturnTrue(bool hasNestedGroup, bool hasCalculation) { // Setup - var mocks = new MockRepository(); var assessmentSection = mocks.Stub(); mocks.ReplayAll(); @@ -139,23 +146,11 @@ new ClosingStructuresFailureMechanism(), assessmentSection); - using (var plugin = new ClosingStructuresPlugin()) - { - ExportInfo info = GetExportInfo(plugin); + // Call + bool isEnabled = info.IsEnabled(context); - // Call - bool isEnabled = info.IsEnabled(context); - - // Assert - Assert.IsTrue(isEnabled); - } - - mocks.VerifyAll(); + // Assert + Assert.IsTrue(isEnabled); } - - private static ExportInfo GetExportInfo(ClosingStructuresPlugin plugin) - { - return plugin.GetExportInfos().First(ei => ei.DataType == typeof(ClosingStructuresCalculationGroupContext)); - } } } \ No newline at end of file Index: Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsPlugin.cs =================================================================== diff -u -rd2233d09b25a96914d3af5b58a03fc8bffa52c41 -r277b8107bf8ffad7dad7fa6dbb75cdb23a0feee2 --- Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsPlugin.cs (.../GrassCoverErosionInwardsPlugin.cs) (revision d2233d09b25a96914d3af5b58a03fc8bffa52c41) +++ Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsPlugin.cs (.../GrassCoverErosionInwardsPlugin.cs) (revision 277b8107bf8ffad7dad7fa6dbb75cdb23a0feee2) @@ -623,6 +623,7 @@ IEnumerable calculations = grassCoverErosionInwardsFailureMechanismContext.WrappedData .Calculations .Cast(); + IInquiryHelper inquiryHelper = GetInquiryHelper(); var builder = new RiskeerContextMenuBuilder(Gui.Get(grassCoverErosionInwardsFailureMechanismContext, treeViewControl)); return builder @@ -642,7 +643,7 @@ .AddClearAllCalculationOutputInFailureMechanismItem(grassCoverErosionInwardsFailureMechanismContext.WrappedData) .AddClearIllustrationPointsOfCalculationsInFailureMechanismItem( () => GrassCoverErosionInwardsIllustrationPointsHelper.HasIllustrationPoints(calculations), - CreateChangeHandler(GetInquiryHelper(), calculations)) + CreateChangeHandler(inquiryHelper, calculations)) .AddSeparator() .AddCollapseAllItem() .AddExpandAllItem() @@ -721,6 +722,8 @@ .ToArray(); StrictContextMenuItem updateDikeProfileItem = CreateUpdateDikeProfileItem(calculations); + IInquiryHelper inquiryHelper = GetInquiryHelper(); + var builder = new RiskeerContextMenuBuilder(Gui.Get(context, treeViewControl)); builder.AddImportItem() .AddExportItem() @@ -760,7 +763,7 @@ .AddSeparator() .AddClearAllCalculationOutputInGroupItem(group) .AddClearIllustrationPointsOfCalculationsInGroupItem(() => GrassCoverErosionInwardsIllustrationPointsHelper.HasIllustrationPoints(calculations), - CreateChangeHandler(GetInquiryHelper(), calculations)); + CreateChangeHandler(inquiryHelper, calculations)); if (isNestedGroup) { Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/ExportInfos/GrassCoverErosionInwardsCalculationContextExportInfoTest.cs =================================================================== diff -u -rd2233d09b25a96914d3af5b58a03fc8bffa52c41 -r277b8107bf8ffad7dad7fa6dbb75cdb23a0feee2 --- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/ExportInfos/GrassCoverErosionInwardsCalculationContextExportInfoTest.cs (.../GrassCoverErosionInwardsCalculationContextExportInfoTest.cs) (revision d2233d09b25a96914d3af5b58a03fc8bffa52c41) +++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/ExportInfos/GrassCoverErosionInwardsCalculationContextExportInfoTest.cs (.../GrassCoverErosionInwardsCalculationContextExportInfoTest.cs) (revision 277b8107bf8ffad7dad7fa6dbb75cdb23a0feee2) @@ -21,6 +21,8 @@ using System.Linq; using Core.Common.Base.IO; +using Core.Common.Gui; +using Core.Common.Gui.Forms.MainWindow; using Core.Common.Gui.Plugin; using Core.Common.TestUtil; using NUnit.Framework; @@ -37,31 +39,52 @@ [TestFixture] public class GrassCoverErosionInwardsCalculationContextExportInfoTest { - [Test] - public void Initialized_Always_ExpectedPropertiesSet() + private GrassCoverErosionInwardsPlugin plugin; + private ExportInfo info; + private MockRepository mocks; + + [SetUp] + public void SetUp() { - // Setup - using (var plugin = new GrassCoverErosionInwardsPlugin()) + mocks = new MockRepository(); + var mainWindow = mocks.Stub(); + var gui = mocks.Stub(); + gui.Stub(g => g.MainWindow).Return(mainWindow); + mocks.Replay(gui); + mocks.Replay(mainWindow); + + plugin = new GrassCoverErosionInwardsPlugin { - // Call - ExportInfo info = GetExportInfo(plugin); + Gui = gui + }; - // Assert - Assert.IsNotNull(info.CreateFileExporter); - Assert.IsNotNull(info.IsEnabled); - Assert.AreEqual("Riskeer berekeningenconfiguratie", info.Name); - Assert.AreEqual("xml", info.Extension); - Assert.AreEqual("Algemeen", info.Category); - TestHelper.AssertImagesAreEqual(CoreCommonGuiResources.ExportIcon, info.Image); - Assert.IsNotNull(info.GetExportPath); - } + info = plugin.GetExportInfos().First(ei => ei.DataType == typeof(GrassCoverErosionInwardsCalculationContext)); } + [TearDown] + public void TearDown() + { + plugin.Dispose(); + mocks.VerifyAll(); + } + [Test] + public void Initialized_Always_ExpectedPropertiesSet() + { + // Assert + Assert.IsNotNull(info.CreateFileExporter); + Assert.IsNotNull(info.IsEnabled); + Assert.AreEqual("Riskeer berekeningenconfiguratie", info.Name); + Assert.AreEqual("xml", info.Extension); + Assert.AreEqual("Algemeen", info.Category); + TestHelper.AssertImagesAreEqual(CoreCommonGuiResources.ExportIcon, info.Image); + Assert.IsNotNull(info.GetExportPath); + } + + [Test] public void CreateFileExporter_Always_ReturnFileExporter() { // Setup - var mocks = new MockRepository(); var assessmentSection = mocks.Stub(); mocks.ReplayAll(); @@ -70,25 +93,17 @@ new GrassCoverErosionInwardsFailureMechanism(), assessmentSection); - using (var plugin = new GrassCoverErosionInwardsPlugin()) - { - ExportInfo info = GetExportInfo(plugin); + // Call + IFileExporter fileExporter = info.CreateFileExporter(context, "test"); - // Call - IFileExporter fileExporter = info.CreateFileExporter(context, "test"); - - // Assert - Assert.IsInstanceOf(fileExporter); - } - - mocks.VerifyAll(); + // Assert + Assert.IsInstanceOf(fileExporter); } [Test] public void IsEnabled_Always_ReturnTrue() { // Setup - var mocks = new MockRepository(); var assessmentSection = mocks.Stub(); mocks.ReplayAll(); @@ -97,23 +112,11 @@ new GrassCoverErosionInwardsFailureMechanism(), assessmentSection); - using (var plugin = new GrassCoverErosionInwardsPlugin()) - { - ExportInfo info = GetExportInfo(plugin); + // Call + bool isEnabled = info.IsEnabled(context); - // Call - bool isEnabled = info.IsEnabled(context); - - // Assert - Assert.IsTrue(isEnabled); - } - - mocks.VerifyAll(); + // Assert + Assert.IsTrue(isEnabled); } - - private static ExportInfo GetExportInfo(GrassCoverErosionInwardsPlugin plugin) - { - return plugin.GetExportInfos().First(ei => ei.DataType == typeof(GrassCoverErosionInwardsCalculationContext)); - } } } \ No newline at end of file Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/ExportInfos/GrassCoverErosionInwardsCalculationGroupContextExportInfoTest.cs =================================================================== diff -u -rd2233d09b25a96914d3af5b58a03fc8bffa52c41 -r277b8107bf8ffad7dad7fa6dbb75cdb23a0feee2 --- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/ExportInfos/GrassCoverErosionInwardsCalculationGroupContextExportInfoTest.cs (.../GrassCoverErosionInwardsCalculationGroupContextExportInfoTest.cs) (revision d2233d09b25a96914d3af5b58a03fc8bffa52c41) +++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/ExportInfos/GrassCoverErosionInwardsCalculationGroupContextExportInfoTest.cs (.../GrassCoverErosionInwardsCalculationGroupContextExportInfoTest.cs) (revision 277b8107bf8ffad7dad7fa6dbb75cdb23a0feee2) @@ -21,9 +21,10 @@ using System.Linq; using Core.Common.Base.IO; +using Core.Common.Gui; +using Core.Common.Gui.Forms.MainWindow; using Core.Common.Gui.Plugin; using Core.Common.TestUtil; -using Core.Common.Util; using NUnit.Framework; using Rhino.Mocks; using Riskeer.Common.Data.AssessmentSection; @@ -38,31 +39,52 @@ [TestFixture] public class GrassCoverErosionInwardsCalculationGroupContextExportInfoTest { - [Test] - public void Initialized_Always_ExpectedPropertiesSet() + private GrassCoverErosionInwardsPlugin plugin; + private ExportInfo info; + private MockRepository mocks; + + [SetUp] + public void SetUp() { - // Setup - using (var plugin = new GrassCoverErosionInwardsPlugin()) + mocks = new MockRepository(); + var mainWindow = mocks.Stub(); + var gui = mocks.Stub(); + gui.Stub(g => g.MainWindow).Return(mainWindow); + mocks.Replay(gui); + mocks.Replay(mainWindow); + + plugin = new GrassCoverErosionInwardsPlugin { - // Call - ExportInfo info = GetExportInfo(plugin); + Gui = gui + }; - // Assert - Assert.IsNotNull(info.CreateFileExporter); - Assert.IsNotNull(info.IsEnabled); - Assert.AreEqual("Riskeer berekeningenconfiguratie", info.Name); - Assert.AreEqual("xml", info.Extension); - Assert.AreEqual("Algemeen", info.Category); - TestHelper.AssertImagesAreEqual(CoreCommonGuiResources.ExportIcon, info.Image); - Assert.IsNotNull(info.GetExportPath); - } + info = plugin.GetExportInfos().First(ei => ei.DataType == typeof(GrassCoverErosionInwardsCalculationGroupContext)); } + [TearDown] + public void TearDown() + { + plugin.Dispose(); + mocks.VerifyAll(); + } + [Test] + public void Initialized_Always_ExpectedPropertiesSet() + { + // Assert + Assert.IsNotNull(info.CreateFileExporter); + Assert.IsNotNull(info.IsEnabled); + Assert.AreEqual("Riskeer berekeningenconfiguratie", info.Name); + Assert.AreEqual("xml", info.Extension); + Assert.AreEqual("Algemeen", info.Category); + TestHelper.AssertImagesAreEqual(CoreCommonGuiResources.ExportIcon, info.Image); + Assert.IsNotNull(info.GetExportPath); + } + + [Test] public void CreateFileExporter_Always_ReturnFileExporter() { // Setup - var mocks = new MockRepository(); var assessmentSection = mocks.Stub(); mocks.ReplayAll(); @@ -71,25 +93,17 @@ new GrassCoverErosionInwardsFailureMechanism(), assessmentSection); - using (var plugin = new GrassCoverErosionInwardsPlugin()) - { - ExportInfo info = GetExportInfo(plugin); + // Call + IFileExporter fileExporter = info.CreateFileExporter(context, "test"); - // Call - IFileExporter fileExporter = info.CreateFileExporter(context, "test"); - - // Assert - Assert.IsInstanceOf(fileExporter); - } - - mocks.VerifyAll(); + // Assert + Assert.IsInstanceOf(fileExporter); } [Test] public void IsEnabled_CalculationGroupNoChildren_ReturnFalse() { // Setup - var mocks = new MockRepository(); var assessmentSection = mocks.Stub(); mocks.ReplayAll(); @@ -98,18 +112,11 @@ new GrassCoverErosionInwardsFailureMechanism(), assessmentSection); - using (var plugin = new GrassCoverErosionInwardsPlugin()) - { - ExportInfo info = GetExportInfo(plugin); + // Call + bool isEnabled = info.IsEnabled(context); - // Call - bool isEnabled = info.IsEnabled(context); - - // Assert - Assert.IsFalse(isEnabled); - } - - mocks.VerifyAll(); + // Assert + Assert.IsFalse(isEnabled); } [Test] @@ -118,7 +125,6 @@ public void IsEnabled_CalculationGroupWithChildren_ReturnTrue(bool hasNestedGroup, bool hasCalculation) { // Setup - var mocks = new MockRepository(); var assessmentSection = mocks.Stub(); mocks.ReplayAll(); @@ -139,23 +145,11 @@ new GrassCoverErosionInwardsFailureMechanism(), assessmentSection); - using (var plugin = new GrassCoverErosionInwardsPlugin()) - { - ExportInfo info = GetExportInfo(plugin); + // Call + bool isEnabled = info.IsEnabled(context); - // Call - bool isEnabled = info.IsEnabled(context); - - // Assert - Assert.IsTrue(isEnabled); - } - - mocks.VerifyAll(); + // Assert + Assert.IsTrue(isEnabled); } - - private static ExportInfo GetExportInfo(GrassCoverErosionInwardsPlugin plugin) - { - return plugin.GetExportInfos().First(ei => ei.DataType == typeof(GrassCoverErosionInwardsCalculationGroupContext)); - } } } \ No newline at end of file Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/GrassCoverErosionInwardsPluginTest.cs =================================================================== diff -u -rf1a99bd6f1bfda45d8b7b4dbb8d7b7e51fcc718f -r277b8107bf8ffad7dad7fa6dbb75cdb23a0feee2 --- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/GrassCoverErosionInwardsPluginTest.cs (.../GrassCoverErosionInwardsPluginTest.cs) (revision f1a99bd6f1bfda45d8b7b4dbb8d7b7e51fcc718f) +++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/GrassCoverErosionInwardsPluginTest.cs (.../GrassCoverErosionInwardsPluginTest.cs) (revision 277b8107bf8ffad7dad7fa6dbb75cdb23a0feee2) @@ -22,9 +22,12 @@ using System.Linq; using Core.Common.Base; using Core.Common.Controls.TreeView; +using Core.Common.Gui; +using Core.Common.Gui.Forms.MainWindow; using Core.Common.Gui.Plugin; using Core.Common.Gui.TestUtil; using NUnit.Framework; +using Rhino.Mocks; using Riskeer.Common.Data.Calculation; using Riskeer.Common.Data.DikeProfiles; using Riskeer.Common.Forms.PresentationObjects; @@ -219,8 +222,17 @@ public void GetExportInfos_ReturnsSupportedExportInfos() { // Setup - using (var plugin = new GrassCoverErosionInwardsPlugin()) + var mocks = new MockRepository(); + var mainWindow = mocks.Stub(); + var gui = mocks.Stub(); + gui.Stub(g => g.MainWindow).Return(mainWindow); + mocks.ReplayAll(); + + using (var plugin = new GrassCoverErosionInwardsPlugin { + Gui = gui + }) + { // Call ExportInfo[] exportInfos = plugin.GetExportInfos().ToArray(); @@ -229,6 +241,8 @@ Assert.IsTrue(exportInfos.Any(tni => tni.DataType == typeof(GrassCoverErosionInwardsCalculationGroupContext))); Assert.IsTrue(exportInfos.Any(tni => tni.DataType == typeof(GrassCoverErosionInwardsCalculationContext))); } + + mocks.VerifyAll(); } } } \ No newline at end of file Index: Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs =================================================================== diff -u -r203ec3098b2fefad9c87c54b3839a961de59f698 -r277b8107bf8ffad7dad7fa6dbb75cdb23a0feee2 --- Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs (.../GrassCoverErosionOutwardsPlugin.cs) (revision 203ec3098b2fefad9c87c54b3839a961de59f698) +++ Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs (.../GrassCoverErosionOutwardsPlugin.cs) (revision 277b8107bf8ffad7dad7fa6dbb75cdb23a0feee2) @@ -736,6 +736,7 @@ TreeViewControl treeViewControl) { CalculationGroup group = nodeData.WrappedData; + IInquiryHelper inquiryHelper = GetInquiryHelper(); var builder = new RiskeerContextMenuBuilder(Gui.Get(nodeData, treeViewControl)); bool isNestedGroup = parentData is GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext; @@ -770,7 +771,7 @@ builder.AddRenameItem(); } - builder.AddUpdateForeshoreProfileOfCalculationsItem(calculations, GetInquiryHelper(), + builder.AddUpdateForeshoreProfileOfCalculationsItem(calculations, inquiryHelper, SynchronizeCalculationWithForeshoreProfileHelper.UpdateForeshoreProfileDerivedCalculationInput) .AddSeparator() .AddValidateAllCalculationsInGroupItem( @@ -947,6 +948,7 @@ object parentData, TreeViewControl treeViewControl) { + IInquiryHelper inquiryHelper = GetInquiryHelper(); var builder = new RiskeerContextMenuBuilder(Gui.Get(nodeData, treeViewControl)); GrassCoverErosionOutwardsWaveConditionsCalculation calculation = nodeData.WrappedData; @@ -957,7 +959,7 @@ .AddDuplicateCalculationItem(calculation, nodeData) .AddSeparator() .AddRenameItem() - .AddUpdateForeshoreProfileOfCalculationItem(calculation, GetInquiryHelper(), + .AddUpdateForeshoreProfileOfCalculationItem(calculation, inquiryHelper, SynchronizeCalculationWithForeshoreProfileHelper.UpdateForeshoreProfileDerivedCalculationInput) .AddSeparator() .AddValidateCalculationItem( Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/ExportInfos/GrassCoverErosionOutwardsHydraulicBoundaryDatabaseContextExportInfoTest.cs =================================================================== diff -u -r203ec3098b2fefad9c87c54b3839a961de59f698 -r277b8107bf8ffad7dad7fa6dbb75cdb23a0feee2 --- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/ExportInfos/GrassCoverErosionOutwardsHydraulicBoundaryDatabaseContextExportInfoTest.cs (.../GrassCoverErosionOutwardsHydraulicBoundaryDatabaseContextExportInfoTest.cs) (revision 203ec3098b2fefad9c87c54b3839a961de59f698) +++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/ExportInfos/GrassCoverErosionOutwardsHydraulicBoundaryDatabaseContextExportInfoTest.cs (.../GrassCoverErosionOutwardsHydraulicBoundaryDatabaseContextExportInfoTest.cs) (revision 277b8107bf8ffad7dad7fa6dbb75cdb23a0feee2) @@ -21,6 +21,8 @@ using System.Linq; using Core.Common.Base.IO; +using Core.Common.Gui; +using Core.Common.Gui.Forms.MainWindow; using Core.Common.Gui.Plugin; using Core.Common.TestUtil; using NUnit.Framework; @@ -38,69 +40,83 @@ [TestFixture] public class GrassCoverErosionOutwardsHydraulicBoundaryDatabaseContextExportInfoTest { - private ExportInfo exportInfo; + private GrassCoverErosionOutwardsPlugin plugin; + private ExportInfo info; + private MockRepository mocks; [SetUp] - public void Setup() + public void SetUp() { - using (var plugin = new GrassCoverErosionOutwardsPlugin()) + mocks = new MockRepository(); + var mainWindow = mocks.Stub(); + var gui = mocks.Stub(); + gui.Stub(g => g.MainWindow).Return(mainWindow); + mocks.Replay(gui); + mocks.Replay(mainWindow); + + plugin = new GrassCoverErosionOutwardsPlugin { - exportInfo = plugin.GetExportInfos() - .Single(ei => ei.DataType == typeof(GrassCoverErosionOutwardsHydraulicBoundaryDatabaseContext) - && ei.Name.Equals("Waterstanden en golfhoogten uit marginale statistiek")); - } + Gui = gui + }; + + info = plugin.GetExportInfos() + .Single(ei => ei.DataType == typeof(GrassCoverErosionOutwardsHydraulicBoundaryDatabaseContext) + && ei.Name.Equals("Waterstanden en golfhoogten uit marginale statistiek")); } + [TearDown] + public void TearDown() + { + plugin.Dispose(); + mocks.VerifyAll(); + } + [Test] public void Initialized_Always_ExpectedPropertiesSet() { // Assert - Assert.AreEqual("shp", exportInfo.Extension); - Assert.IsNotNull(exportInfo.CreateFileExporter); - Assert.IsNotNull(exportInfo.IsEnabled); - Assert.AreEqual("Algemeen", exportInfo.Category); - TestHelper.AssertImagesAreEqual(CoreCommonGuiResources.ExportIcon, exportInfo.Image); - Assert.IsNotNull(exportInfo.GetExportPath); + Assert.AreEqual("shp", info.Extension); + Assert.IsNotNull(info.CreateFileExporter); + Assert.IsNotNull(info.IsEnabled); + Assert.AreEqual("Algemeen", info.Category); + TestHelper.AssertImagesAreEqual(CoreCommonGuiResources.ExportIcon, info.Image); + Assert.IsNotNull(info.GetExportPath); } [Test] public void CreateFileExporter_Always_ReturnFileExporter() { // Setup - var mockRepository = new MockRepository(); - IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mockRepository); - mockRepository.ReplayAll(); + IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mocks); + mocks.ReplayAll(); var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); var context = new GrassCoverErosionOutwardsHydraulicBoundaryDatabaseContext(assessmentSection.HydraulicBoundaryDatabase, failureMechanism, assessmentSection); // Call - IFileExporter fileExporter = exportInfo.CreateFileExporter(context, "test"); + IFileExporter fileExporter = info.CreateFileExporter(context, "test"); // Assert Assert.IsInstanceOf(fileExporter); - mockRepository.VerifyAll(); } [Test] public void IsEnabled_HydraulicBoundaryLocationsEmpty_ReturnFalse() { // Setup - var mockRepository = new MockRepository(); - IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mockRepository); - mockRepository.ReplayAll(); + IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mocks); + mocks.ReplayAll(); var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); var context = new GrassCoverErosionOutwardsHydraulicBoundaryDatabaseContext(assessmentSection.HydraulicBoundaryDatabase, failureMechanism, assessmentSection); // Call - bool isEnabled = exportInfo.IsEnabled(context); + bool isEnabled = info.IsEnabled(context); // Assert Assert.IsFalse(isEnabled); - mockRepository.VerifyAll(); } [Test] @@ -116,7 +132,7 @@ var context = new GrassCoverErosionOutwardsHydraulicBoundaryDatabaseContext(assessmentSection.HydraulicBoundaryDatabase, failureMechanism, assessmentSection); // Call - bool isEnabled = exportInfo.IsEnabled(context); + bool isEnabled = info.IsEnabled(context); // Assert Assert.IsTrue(isEnabled); Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/ExportInfos/GrassCoverErosionOutwardsHydraulicBoundaryDatabaseContextWaveConditionsExportInfoTest.cs =================================================================== diff -u -r203ec3098b2fefad9c87c54b3839a961de59f698 -r277b8107bf8ffad7dad7fa6dbb75cdb23a0feee2 --- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/ExportInfos/GrassCoverErosionOutwardsHydraulicBoundaryDatabaseContextWaveConditionsExportInfoTest.cs (.../GrassCoverErosionOutwardsHydraulicBoundaryDatabaseContextWaveConditionsExportInfoTest.cs) (revision 203ec3098b2fefad9c87c54b3839a961de59f698) +++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/ExportInfos/GrassCoverErosionOutwardsHydraulicBoundaryDatabaseContextWaveConditionsExportInfoTest.cs (.../GrassCoverErosionOutwardsHydraulicBoundaryDatabaseContextWaveConditionsExportInfoTest.cs) (revision 277b8107bf8ffad7dad7fa6dbb75cdb23a0feee2) @@ -21,6 +21,8 @@ using System.Linq; using Core.Common.Base.IO; +using Core.Common.Gui; +using Core.Common.Gui.Forms.MainWindow; using Core.Common.Gui.Plugin; using Core.Common.TestUtil; using NUnit.Framework; @@ -38,99 +40,110 @@ [TestFixture] public class GrassCoverErosionOutwardsHydraulicBoundaryDatabaseContextWaveConditionsExportInfoTest { - private ExportInfo exportInfo; + private GrassCoverErosionOutwardsPlugin plugin; + private ExportInfo info; + private MockRepository mocks; [SetUp] - public void Setup() + public void SetUp() { - using (var plugin = new GrassCoverErosionOutwardsPlugin()) + mocks = new MockRepository(); + var mainWindow = mocks.Stub(); + var gui = mocks.Stub(); + gui.Stub(g => g.MainWindow).Return(mainWindow); + mocks.Replay(gui); + mocks.Replay(mainWindow); + + plugin = new GrassCoverErosionOutwardsPlugin { - exportInfo = plugin.GetExportInfos() - .Single(ei => ei.DataType == typeof(GrassCoverErosionOutwardsHydraulicBoundaryDatabaseContext) - && ei.Name.Equals("Berekende belastingen bij verschillende waterstanden")); - } + Gui = gui + }; + + info = plugin.GetExportInfos() + .Single(ei => ei.DataType == typeof(GrassCoverErosionOutwardsHydraulicBoundaryDatabaseContext) + && ei.Name.Equals("Berekende belastingen bij verschillende waterstanden")); } + [TearDown] + public void TearDown() + { + plugin.Dispose(); + mocks.VerifyAll(); + } + [Test] public void Initialized_Always_ExpectedPropertiesSet() { // Assert - Assert.AreEqual("csv", exportInfo.Extension); - Assert.IsNotNull(exportInfo.CreateFileExporter); - Assert.IsNotNull(exportInfo.IsEnabled); - Assert.AreEqual("Algemeen", exportInfo.Category); - TestHelper.AssertImagesAreEqual(CoreCommonGuiResources.ExportIcon, exportInfo.Image); - Assert.IsNotNull(exportInfo.GetExportPath); + Assert.AreEqual("csv", info.Extension); + Assert.IsNotNull(info.CreateFileExporter); + Assert.IsNotNull(info.IsEnabled); + Assert.AreEqual("Algemeen", info.Category); + TestHelper.AssertImagesAreEqual(CoreCommonGuiResources.ExportIcon, info.Image); + Assert.IsNotNull(info.GetExportPath); } [Test] public void CreateFileExporter_Always_ReturnFileExporter() { // Setup - var mockRepository = new MockRepository(); - IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mockRepository); - mockRepository.ReplayAll(); + IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mocks); + mocks.ReplayAll(); var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); var context = new GrassCoverErosionOutwardsHydraulicBoundaryDatabaseContext(assessmentSection.HydraulicBoundaryDatabase, failureMechanism, assessmentSection); // Call - IFileExporter fileExporter = exportInfo.CreateFileExporter(context, "test"); + IFileExporter fileExporter = info.CreateFileExporter(context, "test"); // Assert Assert.IsInstanceOf(fileExporter); - mockRepository.VerifyAll(); } [Test] public void IsEnabled_NoCalculations_ReturnFalse() { // Setup - var mockRepository = new MockRepository(); - IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mockRepository); - mockRepository.ReplayAll(); + IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mocks); + mocks.ReplayAll(); var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); var context = new GrassCoverErosionOutwardsHydraulicBoundaryDatabaseContext(assessmentSection.HydraulicBoundaryDatabase, failureMechanism, assessmentSection); // Call - bool isEnabled = exportInfo.IsEnabled(context); + bool isEnabled = info.IsEnabled(context); // Assert Assert.IsFalse(isEnabled); - mockRepository.VerifyAll(); } [Test] public void IsEnabled_CalculationsWithoutOutput_ReturnFalse() { // Setup - var mockRepository = new MockRepository(); - IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mockRepository); - mockRepository.ReplayAll(); + IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mocks); + mocks.ReplayAll(); var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); failureMechanism.WaveConditionsCalculationGroup.Children.Add(new GrassCoverErosionOutwardsWaveConditionsCalculation()); var context = new GrassCoverErosionOutwardsHydraulicBoundaryDatabaseContext(assessmentSection.HydraulicBoundaryDatabase, failureMechanism, assessmentSection); // Call - bool isEnabled = exportInfo.IsEnabled(context); + bool isEnabled = info.IsEnabled(context); // Assert Assert.IsFalse(isEnabled); - mockRepository.VerifyAll(); } [Test] public void IsEnabled_CalculationsWithOutput_ReturnTrue() { // Setup - var mockRepository = new MockRepository(); - IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mockRepository); - mockRepository.ReplayAll(); + IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mocks); + mocks.ReplayAll(); var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); failureMechanism.WaveConditionsCalculationGroup.Children.Add(new GrassCoverErosionOutwardsWaveConditionsCalculation @@ -141,11 +154,10 @@ var context = new GrassCoverErosionOutwardsHydraulicBoundaryDatabaseContext(assessmentSection.HydraulicBoundaryDatabase, failureMechanism, assessmentSection); // Call - bool isEnabled = exportInfo.IsEnabled(context); + bool isEnabled = info.IsEnabled(context); // Assert Assert.IsTrue(isEnabled); - mockRepository.VerifyAll(); } } } \ No newline at end of file Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/ExportInfos/GrassCoverErosionOutwardsWaveConditionsCalculationContextConfigurationExportInfoTest.cs =================================================================== diff -u -rd2233d09b25a96914d3af5b58a03fc8bffa52c41 -r277b8107bf8ffad7dad7fa6dbb75cdb23a0feee2 --- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/ExportInfos/GrassCoverErosionOutwardsWaveConditionsCalculationContextConfigurationExportInfoTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationContextConfigurationExportInfoTest.cs) (revision d2233d09b25a96914d3af5b58a03fc8bffa52c41) +++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/ExportInfos/GrassCoverErosionOutwardsWaveConditionsCalculationContextConfigurationExportInfoTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationContextConfigurationExportInfoTest.cs) (revision 277b8107bf8ffad7dad7fa6dbb75cdb23a0feee2) @@ -22,6 +22,8 @@ using System; using System.Linq; using Core.Common.Base.IO; +using Core.Common.Gui; +using Core.Common.Gui.Forms.MainWindow; using Core.Common.Gui.Plugin; using Core.Common.TestUtil; using NUnit.Framework; @@ -39,36 +41,53 @@ [TestFixture] public class GrassCoverErosionOutwardsWaveConditionsCalculationContextConfigurationExportInfoTest { - private ExportInfo exportInfo; + private GrassCoverErosionOutwardsPlugin plugin; + private ExportInfo info; + private MockRepository mocks; [SetUp] - public void Setup() + public void SetUp() { - using (var plugin = new GrassCoverErosionOutwardsPlugin()) + mocks = new MockRepository(); + var mainWindow = mocks.Stub(); + var gui = mocks.Stub(); + gui.Stub(g => g.MainWindow).Return(mainWindow); + mocks.Replay(gui); + mocks.Replay(mainWindow); + + plugin = new GrassCoverErosionOutwardsPlugin { - exportInfo = plugin.GetExportInfos() - .Single(ei => ei.DataType == typeof(GrassCoverErosionOutwardsWaveConditionsCalculationContext) - && ei.Name.Equals("Riskeer berekeningenconfiguratie")); - } + Gui = gui + }; + + info = plugin.GetExportInfos() + .Single(ei => ei.DataType == typeof(GrassCoverErosionOutwardsWaveConditionsCalculationContext) + && ei.Name.Equals("Riskeer berekeningenconfiguratie")); } + [TearDown] + public void TearDown() + { + plugin.Dispose(); + mocks.VerifyAll(); + } + [Test] public void Initialized_Always_ExpectedPropertiesSet() { // Assert - Assert.AreEqual("xml", exportInfo.Extension); - Assert.IsNotNull(exportInfo.CreateFileExporter); - Assert.IsNotNull(exportInfo.IsEnabled); - Assert.AreEqual("Algemeen", exportInfo.Category); - TestHelper.AssertImagesAreEqual(CoreCommonGuiResources.ExportIcon, exportInfo.Image); - Assert.IsNotNull(exportInfo.GetExportPath); + Assert.AreEqual("xml", info.Extension); + Assert.IsNotNull(info.CreateFileExporter); + Assert.IsNotNull(info.IsEnabled); + Assert.AreEqual("Algemeen", info.Category); + TestHelper.AssertImagesAreEqual(CoreCommonGuiResources.ExportIcon, info.Image); + Assert.IsNotNull(info.GetExportPath); } [Test] public void CreateFileExporter_Always_ReturnFileExporter() { // Setup - var mocks = new MockRepository(); var assessmentSection = mocks.Stub(); mocks.ReplayAll(); @@ -86,18 +105,16 @@ assessmentSection); // Call - IFileExporter fileExporter = exportInfo.CreateFileExporter(context, "test"); + IFileExporter fileExporter = info.CreateFileExporter(context, "test"); // Assert Assert.IsInstanceOf(fileExporter); - mocks.VerifyAll(); } [Test] public void IsEnabled_Always_ReturnTrue() { // Setup - var mocks = new MockRepository(); var assessmentSection = mocks.Stub(); mocks.ReplayAll(); @@ -107,11 +124,10 @@ assessmentSection); // Call - bool isEnabled = exportInfo.IsEnabled(context); + bool isEnabled = info.IsEnabled(context); // Assert Assert.IsTrue(isEnabled); - mocks.VerifyAll(); } } } \ No newline at end of file Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/ExportInfos/GrassCoverErosionOutwardsWaveConditionsCalculationContextWaveConditionsExportInfoTest.cs =================================================================== diff -u -r203ec3098b2fefad9c87c54b3839a961de59f698 -r277b8107bf8ffad7dad7fa6dbb75cdb23a0feee2 --- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/ExportInfos/GrassCoverErosionOutwardsWaveConditionsCalculationContextWaveConditionsExportInfoTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationContextWaveConditionsExportInfoTest.cs) (revision 203ec3098b2fefad9c87c54b3839a961de59f698) +++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/ExportInfos/GrassCoverErosionOutwardsWaveConditionsCalculationContextWaveConditionsExportInfoTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationContextWaveConditionsExportInfoTest.cs) (revision 277b8107bf8ffad7dad7fa6dbb75cdb23a0feee2) @@ -21,9 +21,10 @@ using System.Linq; using Core.Common.Base.IO; +using Core.Common.Gui; +using Core.Common.Gui.Forms.MainWindow; using Core.Common.Gui.Plugin; using Core.Common.TestUtil; -using Core.Common.Util; using NUnit.Framework; using Rhino.Mocks; using Riskeer.Common.Data.AssessmentSection; @@ -39,36 +40,53 @@ [TestFixture] public class GrassCoverErosionOutwardsWaveConditionsCalculationContextWaveConditionsExportInfoTest { - private ExportInfo exportInfo; + private GrassCoverErosionOutwardsPlugin plugin; + private ExportInfo info; + private MockRepository mocks; [SetUp] - public void Setup() + public void SetUp() { - using (var plugin = new GrassCoverErosionOutwardsPlugin()) + mocks = new MockRepository(); + var mainWindow = mocks.Stub(); + var gui = mocks.Stub(); + gui.Stub(g => g.MainWindow).Return(mainWindow); + mocks.Replay(gui); + mocks.Replay(mainWindow); + + plugin = new GrassCoverErosionOutwardsPlugin { - exportInfo = plugin.GetExportInfos() - .Single(ei => ei.DataType == typeof(GrassCoverErosionOutwardsWaveConditionsCalculationContext) - && ei.Name.Equals("Berekende belastingen bij verschillende waterstanden")); - } + Gui = gui + }; + + info = plugin.GetExportInfos() + .Single(ei => ei.DataType == typeof(GrassCoverErosionOutwardsWaveConditionsCalculationContext) + && ei.Name.Equals("Berekende belastingen bij verschillende waterstanden")); } + [TearDown] + public void TearDown() + { + plugin.Dispose(); + mocks.VerifyAll(); + } + [Test] public void Initialized_Always_ExpectedPropertiesSet() { // Assert - Assert.AreEqual("csv", exportInfo.Extension); - Assert.IsNotNull(exportInfo.CreateFileExporter); - Assert.IsNotNull(exportInfo.IsEnabled); - Assert.AreEqual("Algemeen", exportInfo.Category); - TestHelper.AssertImagesAreEqual(CoreCommonGuiResources.ExportIcon, exportInfo.Image); - Assert.IsNotNull(exportInfo.GetExportPath); + Assert.AreEqual("csv", info.Extension); + Assert.IsNotNull(info.CreateFileExporter); + Assert.IsNotNull(info.IsEnabled); + Assert.AreEqual("Algemeen", info.Category); + TestHelper.AssertImagesAreEqual(CoreCommonGuiResources.ExportIcon, info.Image); + Assert.IsNotNull(info.GetExportPath); } [Test] public void CreateFileExporter_Always_ReturnFileExporter() { // Setup - var mocks = new MockRepository(); var assessmentSection = mocks.Stub(); mocks.ReplayAll(); @@ -78,18 +96,16 @@ assessmentSection); // Call - IFileExporter fileExporter = exportInfo.CreateFileExporter(context, "test"); + IFileExporter fileExporter = info.CreateFileExporter(context, "test"); // Assert Assert.IsInstanceOf(fileExporter); - mocks.VerifyAll(); } [Test] public void IsEnabled_CalculationWithoutOutput_ReturnFalse() { // Setup - var mocks = new MockRepository(); var assessmentSection = mocks.Stub(); mocks.ReplayAll(); @@ -101,18 +117,16 @@ assessmentSection); // Call - bool isEnabled = exportInfo.IsEnabled(context); + bool isEnabled = info.IsEnabled(context); // Assert Assert.IsFalse(isEnabled); - mocks.VerifyAll(); } [Test] public void IsEnabled_CalculationWithOutput_ReturnTrue() { // Setup - var mocks = new MockRepository(); var assessmentSection = mocks.Stub(); mocks.ReplayAll(); @@ -126,11 +140,10 @@ assessmentSection); // Call - bool isEnabled = exportInfo.IsEnabled(context); + bool isEnabled = info.IsEnabled(context); // Assert Assert.IsTrue(isEnabled); - mocks.VerifyAll(); } } } \ No newline at end of file Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/ExportInfos/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextConfigurationExportInfoTest.cs =================================================================== diff -u -rd2233d09b25a96914d3af5b58a03fc8bffa52c41 -r277b8107bf8ffad7dad7fa6dbb75cdb23a0feee2 --- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/ExportInfos/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextConfigurationExportInfoTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextConfigurationExportInfoTest.cs) (revision d2233d09b25a96914d3af5b58a03fc8bffa52c41) +++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/ExportInfos/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextConfigurationExportInfoTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextConfigurationExportInfoTest.cs) (revision 277b8107bf8ffad7dad7fa6dbb75cdb23a0feee2) @@ -21,6 +21,8 @@ using System.Linq; using Core.Common.Base.IO; +using Core.Common.Gui; +using Core.Common.Gui.Forms.MainWindow; using Core.Common.Gui.Plugin; using Core.Common.TestUtil; using NUnit.Framework; @@ -37,36 +39,53 @@ [TestFixture] public class GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextConfigurationExportInfoTest { - private ExportInfo exportInfo; + private GrassCoverErosionOutwardsPlugin plugin; + private ExportInfo info; + private MockRepository mocks; [SetUp] - public void Setup() + public void SetUp() { - using (var plugin = new GrassCoverErosionOutwardsPlugin()) + mocks = new MockRepository(); + var mainWindow = mocks.Stub(); + var gui = mocks.Stub(); + gui.Stub(g => g.MainWindow).Return(mainWindow); + mocks.Replay(gui); + mocks.Replay(mainWindow); + + plugin = new GrassCoverErosionOutwardsPlugin { - exportInfo = plugin.GetExportInfos() - .Single(ei => ei.DataType == typeof(GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext) - && ei.Name.Equals("Riskeer berekeningenconfiguratie")); - } + Gui = gui + }; + + info = plugin.GetExportInfos() + .Single(ei => ei.DataType == typeof(GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext) + && ei.Name.Equals("Riskeer berekeningenconfiguratie")); } + [TearDown] + public void TearDown() + { + plugin.Dispose(); + mocks.VerifyAll(); + } + [Test] public void Initialized_Always_ExpectedPropertiesSet() { // Assert - Assert.AreEqual("xml", exportInfo.Extension); - Assert.IsNotNull(exportInfo.CreateFileExporter); - Assert.IsNotNull(exportInfo.IsEnabled); - Assert.AreEqual("Algemeen", exportInfo.Category); - TestHelper.AssertImagesAreEqual(CoreCommonGuiResources.ExportIcon, exportInfo.Image); - Assert.IsNotNull(exportInfo.GetExportPath); + Assert.AreEqual("xml", info.Extension); + Assert.IsNotNull(info.CreateFileExporter); + Assert.IsNotNull(info.IsEnabled); + Assert.AreEqual("Algemeen", info.Category); + TestHelper.AssertImagesAreEqual(CoreCommonGuiResources.ExportIcon, info.Image); + Assert.IsNotNull(info.GetExportPath); } [Test] public void CreateFileExporter_Always_ReturnFileExporter() { // Setup - var mocks = new MockRepository(); var assessmentSection = mocks.Stub(); mocks.ReplayAll(); @@ -76,7 +95,7 @@ assessmentSection); // Call - IFileExporter fileExporter = exportInfo.CreateFileExporter(context, "test"); + IFileExporter fileExporter = info.CreateFileExporter(context, "test"); // Assert Assert.IsInstanceOf(fileExporter); @@ -86,7 +105,6 @@ public void IsEnabled_CalculationGroupNoChildren_ReturnFalse() { // Setup - var mocks = new MockRepository(); var assessmentSection = mocks.Stub(); mocks.ReplayAll(); @@ -96,7 +114,7 @@ assessmentSection); // Call - bool isEnabled = exportInfo.IsEnabled(context); + bool isEnabled = info.IsEnabled(context); // Assert Assert.IsFalse(isEnabled); @@ -108,7 +126,6 @@ public void IsEnabled_CalculationGroupWithChildren_ReturnTrue(bool hasNestedGroup, bool hasCalculation) { // Setup - var mocks = new MockRepository(); var assessmentSection = mocks.Stub(); mocks.ReplayAll(); @@ -130,7 +147,7 @@ assessmentSection); // Call - bool isEnabled = exportInfo.IsEnabled(context); + bool isEnabled = info.IsEnabled(context); // Assert Assert.IsTrue(isEnabled); Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/ExportInfos/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextWaveConditionsExportInfoTest.cs =================================================================== diff -u -r203ec3098b2fefad9c87c54b3839a961de59f698 -r277b8107bf8ffad7dad7fa6dbb75cdb23a0feee2 --- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/ExportInfos/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextWaveConditionsExportInfoTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextWaveConditionsExportInfoTest.cs) (revision 203ec3098b2fefad9c87c54b3839a961de59f698) +++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/ExportInfos/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextWaveConditionsExportInfoTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextWaveConditionsExportInfoTest.cs) (revision 277b8107bf8ffad7dad7fa6dbb75cdb23a0feee2) @@ -21,6 +21,8 @@ using System.Linq; using Core.Common.Base.IO; +using Core.Common.Gui; +using Core.Common.Gui.Forms.MainWindow; using Core.Common.Gui.Plugin; using Core.Common.TestUtil; using NUnit.Framework; @@ -38,36 +40,53 @@ [TestFixture] public class GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextWaveConditionsExportInfoTest { - private ExportInfo exportInfo; + private GrassCoverErosionOutwardsPlugin plugin; + private ExportInfo info; + private MockRepository mocks; [SetUp] - public void Setup() + public void SetUp() { - using (var plugin = new GrassCoverErosionOutwardsPlugin()) + mocks = new MockRepository(); + var mainWindow = mocks.Stub(); + var gui = mocks.Stub(); + gui.Stub(g => g.MainWindow).Return(mainWindow); + mocks.Replay(gui); + mocks.Replay(mainWindow); + + plugin = new GrassCoverErosionOutwardsPlugin { - exportInfo = plugin.GetExportInfos() - .Single(ei => ei.DataType == typeof(GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext) - && ei.Name.Equals("Berekende belastingen bij verschillende waterstanden")); - } + Gui = gui + }; + + info = plugin.GetExportInfos() + .Single(ei => ei.DataType == typeof(GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext) + && ei.Name.Equals("Berekende belastingen bij verschillende waterstanden")); } + [TearDown] + public void TearDown() + { + plugin.Dispose(); + mocks.VerifyAll(); + } + [Test] public void Initialized_Always_ExpectedPropertiesSet() { // Assert - Assert.AreEqual("csv", exportInfo.Extension); - Assert.IsNotNull(exportInfo.CreateFileExporter); - Assert.IsNotNull(exportInfo.IsEnabled); - Assert.AreEqual("Algemeen", exportInfo.Category); - TestHelper.AssertImagesAreEqual(CoreCommonGuiResources.ExportIcon, exportInfo.Image); - Assert.IsNotNull(exportInfo.GetExportPath); + Assert.AreEqual("csv", info.Extension); + Assert.IsNotNull(info.CreateFileExporter); + Assert.IsNotNull(info.IsEnabled); + Assert.AreEqual("Algemeen", info.Category); + TestHelper.AssertImagesAreEqual(CoreCommonGuiResources.ExportIcon, info.Image); + Assert.IsNotNull(info.GetExportPath); } [Test] public void CreateFileExporter_Always_ReturnFileExporter() { // Setup - var mocks = new MockRepository(); var assessmentSection = mocks.Stub(); mocks.ReplayAll(); @@ -77,19 +96,16 @@ var context = new GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(calculationGroup, null, failureMechanism, assessmentSection); // Call - IFileExporter fileExporter = exportInfo.CreateFileExporter(context, "test"); + IFileExporter fileExporter = info.CreateFileExporter(context, "test"); // Assert Assert.IsInstanceOf(fileExporter); - - mocks.VerifyAll(); } [Test] public void IsEnabled_NoCalculation_ReturnFalse() { // Setup - var mocks = new MockRepository(); var assessmentSection = mocks.Stub(); mocks.ReplayAll(); @@ -99,11 +115,10 @@ var context = new GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(calculationGroup, null, failureMechanism, assessmentSection); // Call - bool isEnabled = exportInfo.IsEnabled(context); + bool isEnabled = info.IsEnabled(context); // Assert Assert.IsFalse(isEnabled); - mocks.VerifyAll(); } [Test] @@ -112,7 +127,6 @@ public void IsEnabled_CalculationWithOrWithoutOutput_ReturnExpectedEnabledState(bool hasOutput) { // Setup - var mocks = new MockRepository(); var assessmentSection = mocks.Stub(); mocks.ReplayAll(); @@ -130,11 +144,10 @@ var context = new GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(calculationGroup, null, failureMechanism, assessmentSection); // Call - bool isEnabled = exportInfo.IsEnabled(context); + bool isEnabled = info.IsEnabled(context); // Assert Assert.AreEqual(hasOutput, isEnabled); - mocks.VerifyAll(); } [Test] @@ -143,7 +156,6 @@ public void IsEnabled_CalculationWithOrWithoutOutputInSubFolder_ReturnExpectedEnabledState(bool hasOutput) { // Setup - var mocks = new MockRepository(); var assessmentSection = mocks.Stub(); mocks.ReplayAll(); @@ -171,11 +183,10 @@ var context = new GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(calculationGroup, null, failureMechanism, assessmentSection); // Call - bool isEnabled = exportInfo.IsEnabled(context); + bool isEnabled = info.IsEnabled(context); // Assert Assert.AreEqual(hasOutput, isEnabled); - mocks.VerifyAll(); } } } \ No newline at end of file Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/GrassCoverErosionOutwardsPluginTest.cs =================================================================== diff -u -r5299261dce08137976c5f234f1261d4c0683e6e9 -r277b8107bf8ffad7dad7fa6dbb75cdb23a0feee2 --- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/GrassCoverErosionOutwardsPluginTest.cs (.../GrassCoverErosionOutwardsPluginTest.cs) (revision 5299261dce08137976c5f234f1261d4c0683e6e9) +++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/GrassCoverErosionOutwardsPluginTest.cs (.../GrassCoverErosionOutwardsPluginTest.cs) (revision 277b8107bf8ffad7dad7fa6dbb75cdb23a0feee2) @@ -23,9 +23,12 @@ using System.Linq; using Core.Common.Base; using Core.Common.Controls.TreeView; +using Core.Common.Gui; +using Core.Common.Gui.Forms.MainWindow; using Core.Common.Gui.Plugin; using Core.Common.Gui.TestUtil; using NUnit.Framework; +using Rhino.Mocks; using Riskeer.Common.Data.Calculation; using Riskeer.Common.Data.Hydraulics; using Riskeer.Common.Forms.PresentationObjects; @@ -176,8 +179,17 @@ public void GetExportInfos_ReturnsSupportedExportInfos() { // Setup - using (var plugin = new GrassCoverErosionOutwardsPlugin()) + var mocks = new MockRepository(); + var mainWindow = mocks.Stub(); + var gui = mocks.Stub(); + gui.Stub(g => g.MainWindow).Return(mainWindow); + mocks.ReplayAll(); + + using (var plugin = new GrassCoverErosionOutwardsPlugin { + Gui = gui + }) + { // Call ExportInfo[] exportInfos = plugin.GetExportInfos().ToArray(); @@ -187,6 +199,8 @@ Assert.AreEqual(2, exportInfos.Count(ei => ei.DataType == typeof(GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext))); Assert.AreEqual(2, exportInfos.Count(ei => ei.DataType == typeof(GrassCoverErosionOutwardsWaveConditionsCalculationContext))); } + + mocks.VerifyAll(); } [Test] Index: Riskeer/HeightStructures/src/Riskeer.HeightStructures.Plugin/HeightStructuresPlugin.cs =================================================================== diff -u -rd2233d09b25a96914d3af5b58a03fc8bffa52c41 -r277b8107bf8ffad7dad7fa6dbb75cdb23a0feee2 --- Riskeer/HeightStructures/src/Riskeer.HeightStructures.Plugin/HeightStructuresPlugin.cs (.../HeightStructuresPlugin.cs) (revision d2233d09b25a96914d3af5b58a03fc8bffa52c41) +++ Riskeer/HeightStructures/src/Riskeer.HeightStructures.Plugin/HeightStructuresPlugin.cs (.../HeightStructuresPlugin.cs) (revision 277b8107bf8ffad7dad7fa6dbb75cdb23a0feee2) @@ -463,6 +463,8 @@ .Calculations .Cast>(); + IInquiryHelper inquiryHelper = GetInquiryHelper(); + var builder = new RiskeerContextMenuBuilder(Gui.Get(context, treeViewControl)); return builder.AddOpenItem() @@ -480,7 +482,7 @@ .AddSeparator() .AddClearAllCalculationOutputInFailureMechanismItem(context.WrappedData) .AddClearIllustrationPointsOfCalculationsInFailureMechanismItem(() => IllustrationPointsHelper.HasIllustrationPoints(calculations), - CreateChangeHandler(GetInquiryHelper(), calculations)) + CreateChangeHandler(inquiryHelper, calculations)) .AddSeparator() .AddCollapseAllItem() .AddExpandAllItem() @@ -550,6 +552,7 @@ TreeViewControl treeViewControl) { CalculationGroup group = context.WrappedData; + IInquiryHelper inquiryHelper = GetInquiryHelper(); var builder = new RiskeerContextMenuBuilder(Gui.Get(context, treeViewControl)); bool isNestedGroup = parentData is HeightStructuresCalculationGroupContext; @@ -582,7 +585,7 @@ builder.AddRenameItem(); } - builder.AddUpdateForeshoreProfileOfCalculationsItem(calculations, GetInquiryHelper(), + builder.AddUpdateForeshoreProfileOfCalculationsItem(calculations, inquiryHelper, SynchronizeCalculationWithForeshoreProfileHelper.UpdateForeshoreProfileDerivedCalculationInput) .AddCustomItem(CreateUpdateStructureItem(calculations)) .AddSeparator() @@ -598,7 +601,7 @@ .AddSeparator() .AddClearAllCalculationOutputInGroupItem(group) .AddClearIllustrationPointsOfCalculationsInGroupItem(() => IllustrationPointsHelper.HasIllustrationPoints(calculations), - CreateChangeHandler(GetInquiryHelper(), calculations)); + CreateChangeHandler(inquiryHelper, calculations)); if (isNestedGroup) { Index: Riskeer/HeightStructures/test/Riskeer.HeightStructures.Plugin.Test/ExportInfos/HeightStructuresCalculationContextExportInfoTest.cs =================================================================== diff -u -rd2233d09b25a96914d3af5b58a03fc8bffa52c41 -r277b8107bf8ffad7dad7fa6dbb75cdb23a0feee2 --- Riskeer/HeightStructures/test/Riskeer.HeightStructures.Plugin.Test/ExportInfos/HeightStructuresCalculationContextExportInfoTest.cs (.../HeightStructuresCalculationContextExportInfoTest.cs) (revision d2233d09b25a96914d3af5b58a03fc8bffa52c41) +++ Riskeer/HeightStructures/test/Riskeer.HeightStructures.Plugin.Test/ExportInfos/HeightStructuresCalculationContextExportInfoTest.cs (.../HeightStructuresCalculationContextExportInfoTest.cs) (revision 277b8107bf8ffad7dad7fa6dbb75cdb23a0feee2) @@ -21,6 +21,8 @@ using System.Linq; using Core.Common.Base.IO; +using Core.Common.Gui; +using Core.Common.Gui.Forms.MainWindow; using Core.Common.Gui.Plugin; using Core.Common.TestUtil; using NUnit.Framework; @@ -38,31 +40,52 @@ [TestFixture] public class HeightStructuresCalculationContextExportInfoTest { - [Test] - public void Initialized_Always_ExpectedPropertiesSet() + private HeightStructuresPlugin plugin; + private ExportInfo info; + private MockRepository mocks; + + [SetUp] + public void SetUp() { - // Setup - using (var plugin = new HeightStructuresPlugin()) + mocks = new MockRepository(); + var mainWindow = mocks.Stub(); + var gui = mocks.Stub(); + gui.Stub(g => g.MainWindow).Return(mainWindow); + mocks.Replay(gui); + mocks.Replay(mainWindow); + + plugin = new HeightStructuresPlugin { - // Call - ExportInfo info = GetExportInfo(plugin); + Gui = gui + }; - // Assert - Assert.IsNotNull(info.CreateFileExporter); - Assert.IsNotNull(info.IsEnabled); - Assert.AreEqual("Riskeer berekeningenconfiguratie", info.Name); - Assert.AreEqual("xml", info.Extension); - Assert.AreEqual("Algemeen", info.Category); - TestHelper.AssertImagesAreEqual(CoreCommonGuiResources.ExportIcon, info.Image); - Assert.IsNotNull(info.GetExportPath); - } + info = plugin.GetExportInfos().First(ei => ei.DataType == typeof(HeightStructuresCalculationContext)); } + [TearDown] + public void TearDown() + { + plugin.Dispose(); + mocks.VerifyAll(); + } + [Test] + public void Initialized_Always_ExpectedPropertiesSet() + { + // Assert + Assert.IsNotNull(info.CreateFileExporter); + Assert.IsNotNull(info.IsEnabled); + Assert.AreEqual("Riskeer berekeningenconfiguratie", info.Name); + Assert.AreEqual("xml", info.Extension); + Assert.AreEqual("Algemeen", info.Category); + TestHelper.AssertImagesAreEqual(CoreCommonGuiResources.ExportIcon, info.Image); + Assert.IsNotNull(info.GetExportPath); + } + + [Test] public void CreateFileExporter_Always_ReturnFileExporter() { // Setup - var mocks = new MockRepository(); var assessmentSection = mocks.Stub(); mocks.ReplayAll(); @@ -71,25 +94,17 @@ new HeightStructuresFailureMechanism(), assessmentSection); - using (var plugin = new HeightStructuresPlugin()) - { - ExportInfo info = GetExportInfo(plugin); + // Call + IFileExporter fileExporter = info.CreateFileExporter(context, "test"); - // Call - IFileExporter fileExporter = info.CreateFileExporter(context, "test"); - - // Assert - Assert.IsInstanceOf(fileExporter); - } - - mocks.VerifyAll(); + // Assert + Assert.IsInstanceOf(fileExporter); } [Test] public void IsEnabled_Always_ReturnTrue() { // Setup - var mocks = new MockRepository(); var assessmentSection = mocks.Stub(); mocks.ReplayAll(); @@ -98,23 +113,11 @@ new HeightStructuresFailureMechanism(), assessmentSection); - using (var plugin = new HeightStructuresPlugin()) - { - ExportInfo info = GetExportInfo(plugin); + // Call + bool isEnabled = info.IsEnabled(context); - // Call - bool isEnabled = info.IsEnabled(context); - - // Assert - Assert.IsTrue(isEnabled); - } - - mocks.VerifyAll(); + // Assert + Assert.IsTrue(isEnabled); } - - private static ExportInfo GetExportInfo(HeightStructuresPlugin plugin) - { - return plugin.GetExportInfos().First(ei => ei.DataType == typeof(HeightStructuresCalculationContext)); - } } } \ No newline at end of file Index: Riskeer/HeightStructures/test/Riskeer.HeightStructures.Plugin.Test/ExportInfos/HeightStructuresCalculationGroupContextExportInfoTest.cs =================================================================== diff -u -rd2233d09b25a96914d3af5b58a03fc8bffa52c41 -r277b8107bf8ffad7dad7fa6dbb75cdb23a0feee2 --- Riskeer/HeightStructures/test/Riskeer.HeightStructures.Plugin.Test/ExportInfos/HeightStructuresCalculationGroupContextExportInfoTest.cs (.../HeightStructuresCalculationGroupContextExportInfoTest.cs) (revision d2233d09b25a96914d3af5b58a03fc8bffa52c41) +++ Riskeer/HeightStructures/test/Riskeer.HeightStructures.Plugin.Test/ExportInfos/HeightStructuresCalculationGroupContextExportInfoTest.cs (.../HeightStructuresCalculationGroupContextExportInfoTest.cs) (revision 277b8107bf8ffad7dad7fa6dbb75cdb23a0feee2) @@ -21,6 +21,8 @@ using System.Linq; using Core.Common.Base.IO; +using Core.Common.Gui; +using Core.Common.Gui.Forms.MainWindow; using Core.Common.Gui.Plugin; using Core.Common.TestUtil; using NUnit.Framework; @@ -38,31 +40,52 @@ [TestFixture] public class HeightStructuresCalculationGroupContextExportInfoTest { - [Test] - public void Initialized_Always_ExpectedPropertiesSet() + private HeightStructuresPlugin plugin; + private ExportInfo info; + private MockRepository mocks; + + [SetUp] + public void SetUp() { - // Setup - using (var plugin = new HeightStructuresPlugin()) + mocks = new MockRepository(); + var mainWindow = mocks.Stub(); + var gui = mocks.Stub(); + gui.Stub(g => g.MainWindow).Return(mainWindow); + mocks.Replay(gui); + mocks.Replay(mainWindow); + + plugin = new HeightStructuresPlugin { - // Call - ExportInfo info = GetExportInfo(plugin); + Gui = gui + }; - // Assert - Assert.IsNotNull(info.CreateFileExporter); - Assert.IsNotNull(info.IsEnabled); - Assert.AreEqual("Riskeer berekeningenconfiguratie", info.Name); - Assert.AreEqual("xml", info.Extension); - Assert.AreEqual("Algemeen", info.Category); - TestHelper.AssertImagesAreEqual(CoreCommonGuiResources.ExportIcon, info.Image); - Assert.IsNotNull(info.GetExportPath); - } + info = plugin.GetExportInfos().First(ei => ei.DataType == typeof(HeightStructuresCalculationGroupContext)); } + [TearDown] + public void TearDown() + { + plugin.Dispose(); + mocks.VerifyAll(); + } + [Test] + public void Initialized_Always_ExpectedPropertiesSet() + { + // Assert + Assert.IsNotNull(info.CreateFileExporter); + Assert.IsNotNull(info.IsEnabled); + Assert.AreEqual("Riskeer berekeningenconfiguratie", info.Name); + Assert.AreEqual("xml", info.Extension); + Assert.AreEqual("Algemeen", info.Category); + TestHelper.AssertImagesAreEqual(CoreCommonGuiResources.ExportIcon, info.Image); + Assert.IsNotNull(info.GetExportPath); + } + + [Test] public void CreateFileExporter_Always_ReturnFileExporter() { // Setup - var mocks = new MockRepository(); var assessmentSection = mocks.Stub(); mocks.ReplayAll(); @@ -71,25 +94,17 @@ new HeightStructuresFailureMechanism(), assessmentSection); - using (var plugin = new HeightStructuresPlugin()) - { - ExportInfo info = GetExportInfo(plugin); + // Call + IFileExporter fileExporter = info.CreateFileExporter(context, "test"); - // Call - IFileExporter fileExporter = info.CreateFileExporter(context, "test"); - - // Assert - Assert.IsInstanceOf(fileExporter); - } - - mocks.VerifyAll(); + // Assert + Assert.IsInstanceOf(fileExporter); } [Test] public void IsEnabled_CalculationGroupNoChildren_ReturnFalse() { // Setup - var mocks = new MockRepository(); var assessmentSection = mocks.Stub(); mocks.ReplayAll(); @@ -98,18 +113,11 @@ new HeightStructuresFailureMechanism(), assessmentSection); - using (var plugin = new HeightStructuresPlugin()) - { - ExportInfo info = GetExportInfo(plugin); + // Call + bool isEnabled = info.IsEnabled(context); - // Call - bool isEnabled = info.IsEnabled(context); - - // Assert - Assert.IsFalse(isEnabled); - } - - mocks.VerifyAll(); + // Assert + Assert.IsFalse(isEnabled); } [Test] @@ -118,7 +126,6 @@ public void IsEnabled_CalculationGroupWithChildren_ReturnTrue(bool hasNestedGroup, bool hasCalculation) { // Setup - var mocks = new MockRepository(); var assessmentSection = mocks.Stub(); mocks.ReplayAll(); @@ -139,23 +146,11 @@ new HeightStructuresFailureMechanism(), assessmentSection); - using (var plugin = new HeightStructuresPlugin()) - { - ExportInfo info = GetExportInfo(plugin); + // Call + bool isEnabled = info.IsEnabled(context); - // Call - bool isEnabled = info.IsEnabled(context); - - // Assert - Assert.IsTrue(isEnabled); - } - - mocks.VerifyAll(); + // Assert + Assert.IsTrue(isEnabled); } - - private static ExportInfo GetExportInfo(HeightStructuresPlugin plugin) - { - return plugin.GetExportInfos().First(ei => ei.DataType == typeof(HeightStructuresCalculationGroupContext)); - } } } \ No newline at end of file Index: Riskeer/HeightStructures/test/Riskeer.HeightStructures.Plugin.Test/HeightStructuresPluginTest.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r277b8107bf8ffad7dad7fa6dbb75cdb23a0feee2 --- Riskeer/HeightStructures/test/Riskeer.HeightStructures.Plugin.Test/HeightStructuresPluginTest.cs (.../HeightStructuresPluginTest.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/HeightStructures/test/Riskeer.HeightStructures.Plugin.Test/HeightStructuresPluginTest.cs (.../HeightStructuresPluginTest.cs) (revision 277b8107bf8ffad7dad7fa6dbb75cdb23a0feee2) @@ -22,9 +22,12 @@ using System.Linq; using Core.Common.Base; using Core.Common.Controls.TreeView; +using Core.Common.Gui; +using Core.Common.Gui.Forms.MainWindow; using Core.Common.Gui.Plugin; using Core.Common.Gui.TestUtil; using NUnit.Framework; +using Rhino.Mocks; using Riskeer.Common.Data.Calculation; using Riskeer.Common.Forms.PresentationObjects; using Riskeer.Common.Forms.PropertyClasses; @@ -176,8 +179,17 @@ public void GetExportInfos_ReturnsSupportedExportInfos() { // Setup - using (var plugin = new HeightStructuresPlugin()) + var mocks = new MockRepository(); + var mainWindow = mocks.Stub(); + var gui = mocks.Stub(); + gui.Stub(g => g.MainWindow).Return(mainWindow); + mocks.ReplayAll(); + + using (var plugin = new HeightStructuresPlugin { + Gui = gui + }) + { // Call ExportInfo[] exportInfos = plugin.GetExportInfos().ToArray(); @@ -186,6 +198,8 @@ Assert.IsTrue(exportInfos.Any(tni => tni.DataType == typeof(HeightStructuresCalculationGroupContext))); Assert.IsTrue(exportInfos.Any(tni => tni.DataType == typeof(HeightStructuresCalculationContext))); } + + mocks.VerifyAll(); } } } \ No newline at end of file Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/ExportInfos/MacroStabilityInwardsCalculationContextConfigurationExportInfoTest.cs =================================================================== diff -u -rd2233d09b25a96914d3af5b58a03fc8bffa52c41 -r277b8107bf8ffad7dad7fa6dbb75cdb23a0feee2 --- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/ExportInfos/MacroStabilityInwardsCalculationContextConfigurationExportInfoTest.cs (.../MacroStabilityInwardsCalculationContextConfigurationExportInfoTest.cs) (revision d2233d09b25a96914d3af5b58a03fc8bffa52c41) +++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/ExportInfos/MacroStabilityInwardsCalculationContextConfigurationExportInfoTest.cs (.../MacroStabilityInwardsCalculationContextConfigurationExportInfoTest.cs) (revision 277b8107bf8ffad7dad7fa6dbb75cdb23a0feee2) @@ -21,6 +21,8 @@ using System.Linq; using Core.Common.Base.IO; +using Core.Common.Gui; +using Core.Common.Gui.Forms.MainWindow; using Core.Common.Gui.Plugin; using Core.Common.TestUtil; using NUnit.Framework; @@ -39,31 +41,53 @@ [TestFixture] public class MacroStabilityInwardsCalculationContextConfigurationExportInfoTest { - [Test] - public void Initialized_Always_ExpectedPropertiesSet() + private MacroStabilityInwardsPlugin plugin; + private ExportInfo info; + private MockRepository mocks; + + [SetUp] + public void SetUp() { - // Setup - using (var plugin = new MacroStabilityInwardsPlugin()) + mocks = new MockRepository(); + var mainWindow = mocks.Stub(); + var gui = mocks.Stub(); + gui.Stub(g => g.MainWindow).Return(mainWindow); + mocks.Replay(gui); + mocks.Replay(mainWindow); + + plugin = new MacroStabilityInwardsPlugin { - // Call - ExportInfo info = GetExportInfo(plugin); + Gui = gui + }; - // Assert - Assert.IsNotNull(info.CreateFileExporter); - Assert.IsNotNull(info.IsEnabled); - Assert.AreEqual("Riskeer berekeningenconfiguratie", info.Name); - Assert.AreEqual("xml", info.Extension); - Assert.AreEqual("Algemeen", info.Category); - TestHelper.AssertImagesAreEqual(CoreCommonGuiResources.ExportIcon, info.Image); - Assert.IsNotNull(info.GetExportPath); - } + info = plugin.GetExportInfos().First(ei => ei.DataType == typeof(MacroStabilityInwardsCalculationScenarioContext) + && ei.Name.Equals("Riskeer berekeningenconfiguratie")); } + [TearDown] + public void TearDown() + { + plugin.Dispose(); + mocks.VerifyAll(); + } + [Test] + public void Initialized_Always_ExpectedPropertiesSet() + { + // Assert + Assert.IsNotNull(info.CreateFileExporter); + Assert.IsNotNull(info.IsEnabled); + Assert.AreEqual("Riskeer berekeningenconfiguratie", info.Name); + Assert.AreEqual("xml", info.Extension); + Assert.AreEqual("Algemeen", info.Category); + TestHelper.AssertImagesAreEqual(CoreCommonGuiResources.ExportIcon, info.Image); + Assert.IsNotNull(info.GetExportPath); + } + + [Test] public void CreateFileExporter_Always_ReturnFileExporter() { // Setup - var mocks = new MockRepository(); var assessmentSection = mocks.Stub(); mocks.ReplayAll(); @@ -74,25 +98,17 @@ new MacroStabilityInwardsFailureMechanism(), assessmentSection); - using (var plugin = new MacroStabilityInwardsPlugin()) - { - ExportInfo info = GetExportInfo(plugin); + // Call + IFileExporter fileExporter = info.CreateFileExporter(context, "test"); - // Call - IFileExporter fileExporter = info.CreateFileExporter(context, "test"); - - // Assert - Assert.IsInstanceOf(fileExporter); - } - - mocks.VerifyAll(); + // Assert + Assert.IsInstanceOf(fileExporter); } [Test] public void IsEnabled_Always_ReturnTrue() { // Setup - var mocks = new MockRepository(); var assessmentSection = mocks.Stub(); mocks.ReplayAll(); @@ -103,24 +119,11 @@ new MacroStabilityInwardsFailureMechanism(), assessmentSection); - using (var plugin = new MacroStabilityInwardsPlugin()) - { - ExportInfo info = GetExportInfo(plugin); + // Call + bool isEnabled = info.IsEnabled(context); - // Call - bool isEnabled = info.IsEnabled(context); - - // Assert - Assert.IsTrue(isEnabled); - } - - mocks.VerifyAll(); + // Assert + Assert.IsTrue(isEnabled); } - - private static ExportInfo GetExportInfo(MacroStabilityInwardsPlugin plugin) - { - return plugin.GetExportInfos().First(ei => ei.DataType == typeof(MacroStabilityInwardsCalculationScenarioContext) - && ei.Name.Equals("Riskeer berekeningenconfiguratie")); - } } } \ No newline at end of file Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/ExportInfos/MacroStabilityInwardsCalculationContextExportInfoTest.cs =================================================================== diff -u -r203ec3098b2fefad9c87c54b3839a961de59f698 -r277b8107bf8ffad7dad7fa6dbb75cdb23a0feee2 --- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/ExportInfos/MacroStabilityInwardsCalculationContextExportInfoTest.cs (.../MacroStabilityInwardsCalculationContextExportInfoTest.cs) (revision 203ec3098b2fefad9c87c54b3839a961de59f698) +++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/ExportInfos/MacroStabilityInwardsCalculationContextExportInfoTest.cs (.../MacroStabilityInwardsCalculationContextExportInfoTest.cs) (revision 277b8107bf8ffad7dad7fa6dbb75cdb23a0feee2) @@ -1,9 +1,10 @@ using System.Linq; using Core.Common.Base.IO; +using Core.Common.Gui; +using Core.Common.Gui.Forms.MainWindow; using Core.Common.Gui.Plugin; using Core.Common.Gui.Properties; using Core.Common.TestUtil; -using NUnit.Extensions.Forms; using NUnit.Framework; using Rhino.Mocks; using Riskeer.Common.Data.AssessmentSection; @@ -18,33 +19,55 @@ namespace Riskeer.MacroStabilityInwards.Plugin.Test.ExportInfos { [TestFixture] - public class MacroStabilityInwardsCalculationContextExportInfoTest : NUnitFormTest + public class MacroStabilityInwardsCalculationContextExportInfoTest { - [Test] - public void Initialized_Always_ExpectedPropertiesSet() + private MacroStabilityInwardsPlugin plugin; + private ExportInfo info; + private MockRepository mocks; + + [SetUp] + public void SetUp() { - // Setup - using (var plugin = new MacroStabilityInwardsPlugin()) + mocks = new MockRepository(); + var mainWindow = mocks.Stub(); + var gui = mocks.Stub(); + gui.Stub(g => g.MainWindow).Return(mainWindow); + mocks.Replay(gui); + mocks.Replay(mainWindow); + + plugin = new MacroStabilityInwardsPlugin { - // Call - ExportInfo info = GetExportInfo(plugin); + Gui = gui + }; - // Assert - Assert.AreEqual("D-GEO Suite Stability Project", info.Name); - Assert.AreEqual("stix", info.Extension); - Assert.IsNotNull(info.CreateFileExporter); - Assert.IsNotNull(info.IsEnabled); - Assert.AreEqual("Algemeen", info.Category); - TestHelper.AssertImagesAreEqual(Resources.ExportIcon, info.Image); - Assert.IsNotNull(info.GetExportPath); - } + info = plugin.GetExportInfos().First(ei => ei.DataType == typeof(MacroStabilityInwardsCalculationScenarioContext) + && ei.Name.Equals("D-GEO Suite Stability Project")); } + [TearDown] + public void TearDown() + { + plugin.Dispose(); + mocks.VerifyAll(); + } + [Test] + public void Initialized_Always_ExpectedPropertiesSet() + { + // Assert + Assert.AreEqual("D-GEO Suite Stability Project", info.Name); + Assert.AreEqual("stix", info.Extension); + Assert.IsNotNull(info.CreateFileExporter); + Assert.IsNotNull(info.IsEnabled); + Assert.AreEqual("Algemeen", info.Category); + TestHelper.AssertImagesAreEqual(Resources.ExportIcon, info.Image); + Assert.IsNotNull(info.GetExportPath); + } + + [Test] public void CreateFileExporter_WithContext_ReturnFileExporter() { // Setup - var mocks = new MockRepository(); var assessmentSection = mocks.Stub(); mocks.ReplayAll(); @@ -55,54 +78,38 @@ new MacroStabilityInwardsFailureMechanism(), assessmentSection); - using (var plugin = new MacroStabilityInwardsPlugin()) - { - ExportInfo info = GetExportInfo(plugin); + // Call + IFileExporter fileExporter = info.CreateFileExporter(context, "test"); - // Call - IFileExporter fileExporter = info.CreateFileExporter(context, "test"); - - // Assert - Assert.IsInstanceOf(fileExporter); - } - - mocks.VerifyAll(); + // Assert + Assert.IsInstanceOf(fileExporter); } [Test] public void IsEnabled_CalculationWithoutOutput_ReturnFalse() { // Setup - var mocks = new MockRepository(); var assessmentSection = mocks.Stub(); mocks.ReplayAll(); - + var context = new MacroStabilityInwardsCalculationScenarioContext(new MacroStabilityInwardsCalculationScenario(), new CalculationGroup(), Enumerable.Empty(), Enumerable.Empty(), new MacroStabilityInwardsFailureMechanism(), assessmentSection); - using (var plugin = new MacroStabilityInwardsPlugin()) - { - ExportInfo info = GetExportInfo(plugin); + // Call + bool isEnabled = info.IsEnabled(context); - // Call - bool isEnabled = info.IsEnabled(context); - - // Assert - Assert.IsFalse(isEnabled); - } - - mocks.VerifyAll(); + // Assert + Assert.IsFalse(isEnabled); } [Test] public void IsEnabled_CalculationWithOutput_ReturnTrue() { // Setup - var mocks = new MockRepository(); var assessmentSection = mocks.Stub(); mocks.ReplayAll(); @@ -118,24 +125,11 @@ new MacroStabilityInwardsFailureMechanism(), assessmentSection); - using (var plugin = new MacroStabilityInwardsPlugin()) - { - ExportInfo info = GetExportInfo(plugin); + // Call + bool isEnabled = info.IsEnabled(context); - // Call - bool isEnabled = info.IsEnabled(context); - - // Assert - Assert.IsTrue(isEnabled); - } - - mocks.VerifyAll(); + // Assert + Assert.IsTrue(isEnabled); } - - private static ExportInfo GetExportInfo(MacroStabilityInwardsPlugin plugin) - { - return plugin.GetExportInfos().First(ei => ei.DataType == typeof(MacroStabilityInwardsCalculationScenarioContext) - && ei.Name.Equals("D-GEO Suite Stability Project")); - } } } \ No newline at end of file Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/ExportInfos/MacroStabilityInwardsCalculationGroupContextConfigurationExportInfoTest.cs =================================================================== diff -u -rd2233d09b25a96914d3af5b58a03fc8bffa52c41 -r277b8107bf8ffad7dad7fa6dbb75cdb23a0feee2 --- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/ExportInfos/MacroStabilityInwardsCalculationGroupContextConfigurationExportInfoTest.cs (.../MacroStabilityInwardsCalculationGroupContextConfigurationExportInfoTest.cs) (revision d2233d09b25a96914d3af5b58a03fc8bffa52c41) +++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/ExportInfos/MacroStabilityInwardsCalculationGroupContextConfigurationExportInfoTest.cs (.../MacroStabilityInwardsCalculationGroupContextConfigurationExportInfoTest.cs) (revision 277b8107bf8ffad7dad7fa6dbb75cdb23a0feee2) @@ -21,6 +21,8 @@ using System.Linq; using Core.Common.Base.IO; +using Core.Common.Gui; +using Core.Common.Gui.Forms.MainWindow; using Core.Common.Gui.Plugin; using Core.Common.TestUtil; using NUnit.Framework; @@ -39,31 +41,53 @@ [TestFixture] public class MacroStabilityInwardsCalculationGroupContextConfigurationExportInfoTest { - [Test] - public void Initialized_Always_ExpectedPropertiesSet() + private MacroStabilityInwardsPlugin plugin; + private ExportInfo info; + private MockRepository mocks; + + [SetUp] + public void SetUp() { - // Setup - using (var plugin = new MacroStabilityInwardsPlugin()) + mocks = new MockRepository(); + var mainWindow = mocks.Stub(); + var gui = mocks.Stub(); + gui.Stub(g => g.MainWindow).Return(mainWindow); + mocks.Replay(gui); + mocks.Replay(mainWindow); + + plugin = new MacroStabilityInwardsPlugin { - // Call - ExportInfo info = GetExportInfo(plugin); + Gui = gui + }; - // Assert - Assert.IsNotNull(info.CreateFileExporter); - Assert.IsNotNull(info.IsEnabled); - Assert.AreEqual("Riskeer berekeningenconfiguratie", info.Name); - Assert.AreEqual("xml", info.Extension); - Assert.AreEqual("Algemeen", info.Category); - TestHelper.AssertImagesAreEqual(CoreCommonGuiResources.ExportIcon, info.Image); - Assert.IsNotNull(info.GetExportPath); - } + info = plugin.GetExportInfos().First(ei => ei.DataType == typeof(MacroStabilityInwardsCalculationGroupContext) + && ei.Name.Equals("Riskeer berekeningenconfiguratie")); } + [TearDown] + public void TearDown() + { + plugin.Dispose(); + mocks.VerifyAll(); + } + [Test] + public void Initialized_Always_ExpectedPropertiesSet() + { + // Assert + Assert.IsNotNull(info.CreateFileExporter); + Assert.IsNotNull(info.IsEnabled); + Assert.AreEqual("Riskeer berekeningenconfiguratie", info.Name); + Assert.AreEqual("xml", info.Extension); + Assert.AreEqual("Algemeen", info.Category); + TestHelper.AssertImagesAreEqual(CoreCommonGuiResources.ExportIcon, info.Image); + Assert.IsNotNull(info.GetExportPath); + } + + [Test] public void CreateFileExporter_Always_ReturnFileExporter() { // Setup - var mocks = new MockRepository(); var assessmentSection = mocks.Stub(); mocks.ReplayAll(); @@ -74,25 +98,17 @@ new MacroStabilityInwardsFailureMechanism(), assessmentSection); - using (var plugin = new MacroStabilityInwardsPlugin()) - { - ExportInfo info = GetExportInfo(plugin); + // Call + IFileExporter fileExporter = info.CreateFileExporter(context, "test"); - // Call - IFileExporter fileExporter = info.CreateFileExporter(context, "test"); - - // Assert - Assert.IsInstanceOf(fileExporter); - } - - mocks.VerifyAll(); + // Assert + Assert.IsInstanceOf(fileExporter); } [Test] public void IsEnabled_CalculationGroupNoChildren_ReturnFalse() { // Setup - var mocks = new MockRepository(); var assessmentSection = mocks.Stub(); mocks.ReplayAll(); @@ -103,18 +119,11 @@ new MacroStabilityInwardsFailureMechanism(), assessmentSection); - using (var plugin = new MacroStabilityInwardsPlugin()) - { - ExportInfo info = GetExportInfo(plugin); + // Call + bool isEnabled = info.IsEnabled(context); - // Call - bool isEnabled = info.IsEnabled(context); - - // Assert - Assert.IsFalse(isEnabled); - } - - mocks.VerifyAll(); + // Assert + Assert.IsFalse(isEnabled); } [Test] @@ -123,7 +132,6 @@ public void IsEnabled_CalculationGroupWithChildren_ReturnTrue(bool hasNestedGroup, bool hasCalculation) { // Setup - var mocks = new MockRepository(); var assessmentSection = mocks.Stub(); mocks.ReplayAll(); @@ -146,24 +154,11 @@ new MacroStabilityInwardsFailureMechanism(), assessmentSection); - using (var plugin = new MacroStabilityInwardsPlugin()) - { - ExportInfo info = GetExportInfo(plugin); + // Call + bool isEnabled = info.IsEnabled(context); - // Call - bool isEnabled = info.IsEnabled(context); - - // Assert - Assert.IsTrue(isEnabled); - } - - mocks.VerifyAll(); + // Assert + Assert.IsTrue(isEnabled); } - - private static ExportInfo GetExportInfo(MacroStabilityInwardsPlugin plugin) - { - return plugin.GetExportInfos().First(ei => ei.DataType == typeof(MacroStabilityInwardsCalculationGroupContext) - && ei.Name.Equals("Riskeer berekeningenconfiguratie")); - } } } \ No newline at end of file Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/ExportInfos/MacroStabilityInwardsCalculationGroupContextExportInfoTest.cs =================================================================== diff -u -r203ec3098b2fefad9c87c54b3839a961de59f698 -r277b8107bf8ffad7dad7fa6dbb75cdb23a0feee2 --- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/ExportInfos/MacroStabilityInwardsCalculationGroupContextExportInfoTest.cs (.../MacroStabilityInwardsCalculationGroupContextExportInfoTest.cs) (revision 203ec3098b2fefad9c87c54b3839a961de59f698) +++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/ExportInfos/MacroStabilityInwardsCalculationGroupContextExportInfoTest.cs (.../MacroStabilityInwardsCalculationGroupContextExportInfoTest.cs) (revision 277b8107bf8ffad7dad7fa6dbb75cdb23a0feee2) @@ -21,6 +21,8 @@ using System.Linq; using Core.Common.Base.IO; +using Core.Common.Gui; +using Core.Common.Gui.Forms.MainWindow; using Core.Common.Gui.Plugin; using Core.Common.TestUtil; using NUnit.Framework; @@ -40,31 +42,53 @@ [TestFixture] public class MacroStabilityInwardsCalculationGroupContextExportInfoTest { - [Test] - public void Initialized_Always_ExpectedPropertiesSet() + private MacroStabilityInwardsPlugin plugin; + private ExportInfo info; + private MockRepository mocks; + + [SetUp] + public void SetUp() { - // Setup - using (var plugin = new MacroStabilityInwardsPlugin()) + mocks = new MockRepository(); + var mainWindow = mocks.Stub(); + var gui = mocks.Stub(); + gui.Stub(g => g.MainWindow).Return(mainWindow); + mocks.Replay(gui); + mocks.Replay(mainWindow); + + plugin = new MacroStabilityInwardsPlugin { - // Call - ExportInfo info = GetExportInfo(plugin); + Gui = gui + }; - // Assert - Assert.AreEqual("D-GEO Suite Stability Project", info.Name); - Assert.AreEqual("stix", info.Extension); - Assert.IsNotNull(info.CreateFileExporter); - Assert.IsNotNull(info.IsEnabled); - Assert.AreEqual("Algemeen", info.Category); - TestHelper.AssertImagesAreEqual(CoreCommonGuiResources.ExportIcon, info.Image); - Assert.IsNotNull(info.GetExportPath); - } + info = plugin.GetExportInfos().First(ei => ei.DataType == typeof(MacroStabilityInwardsCalculationGroupContext) + && ei.Name.Equals("D-GEO Suite Stability Project")); } + [TearDown] + public void TearDown() + { + plugin.Dispose(); + mocks.VerifyAll(); + } + [Test] + public void Initialized_Always_ExpectedPropertiesSet() + { + // Assert + Assert.AreEqual("D-GEO Suite Stability Project", info.Name); + Assert.AreEqual("stix", info.Extension); + Assert.IsNotNull(info.CreateFileExporter); + Assert.IsNotNull(info.IsEnabled); + Assert.AreEqual("Algemeen", info.Category); + TestHelper.AssertImagesAreEqual(CoreCommonGuiResources.ExportIcon, info.Image); + Assert.IsNotNull(info.GetExportPath); + } + + [Test] public void CreateFileExporter_WithContext_ReturnFileExporter() { // Setup - var mocks = new MockRepository(); var assessmentSection = mocks.Stub(); mocks.ReplayAll(); @@ -75,25 +99,17 @@ new MacroStabilityInwardsFailureMechanism(), assessmentSection); - using (var plugin = new MacroStabilityInwardsPlugin()) - { - ExportInfo info = GetExportInfo(plugin); + // Call + IFileExporter fileExporter = info.CreateFileExporter(context, "test"); - // Call - IFileExporter fileExporter = info.CreateFileExporter(context, "test"); - - // Assert - Assert.IsInstanceOf(fileExporter); - } - - mocks.VerifyAll(); + // Assert + Assert.IsInstanceOf(fileExporter); } [Test] public void IsEnabled_CalculationGroupNoChildren_ReturnFalse() { // Setup - var mocks = new MockRepository(); var assessmentSection = mocks.Stub(); mocks.ReplayAll(); @@ -104,25 +120,17 @@ new MacroStabilityInwardsFailureMechanism(), assessmentSection); - using (var plugin = new MacroStabilityInwardsPlugin()) - { - ExportInfo info = GetExportInfo(plugin); + // Call + bool isEnabled = info.IsEnabled(context); - // Call - bool isEnabled = info.IsEnabled(context); - - // Assert - Assert.IsFalse(isEnabled); - } - - mocks.VerifyAll(); + // Assert + Assert.IsFalse(isEnabled); } [Test] public void IsEnabled_CalculationGroupChildIsNestedGroup_ReturnFalse() { // Setup - var mocks = new MockRepository(); var assessmentSection = mocks.Stub(); mocks.ReplayAll(); @@ -136,25 +144,17 @@ new MacroStabilityInwardsFailureMechanism(), assessmentSection); - using (var plugin = new MacroStabilityInwardsPlugin()) - { - ExportInfo info = GetExportInfo(plugin); + // Call + bool isEnabled = info.IsEnabled(context); - // Call - bool isEnabled = info.IsEnabled(context); - - // Assert - Assert.IsFalse(isEnabled); - } - - mocks.VerifyAll(); + // Assert + Assert.IsFalse(isEnabled); } [Test] public void IsEnabled_CalculationGroupChildIsCalculationWithoutOutput_ReturnFalse() { // Setup - var mocks = new MockRepository(); var assessmentSection = mocks.Stub(); mocks.ReplayAll(); @@ -168,25 +168,17 @@ new MacroStabilityInwardsFailureMechanism(), assessmentSection); - using (var plugin = new MacroStabilityInwardsPlugin()) - { - ExportInfo info = GetExportInfo(plugin); + // Call + bool isEnabled = info.IsEnabled(context); - // Call - bool isEnabled = info.IsEnabled(context); - - // Assert - Assert.IsFalse(isEnabled); - } - - mocks.VerifyAll(); + // Assert + Assert.IsFalse(isEnabled); } [Test] public void IsEnabled_CalculationGroupChildIsCalculationWithOutput_ReturnTrue() { // Setup - var mocks = new MockRepository(); var assessmentSection = mocks.Stub(); mocks.ReplayAll(); @@ -205,25 +197,17 @@ new MacroStabilityInwardsFailureMechanism(), assessmentSection); - using (var plugin = new MacroStabilityInwardsPlugin()) - { - ExportInfo info = GetExportInfo(plugin); + // Call + bool isEnabled = info.IsEnabled(context); - // Call - bool isEnabled = info.IsEnabled(context); - - // Assert - Assert.IsTrue(isEnabled); - } - - mocks.VerifyAll(); + // Assert + Assert.IsTrue(isEnabled); } [Test] public void IsEnabled_CalculationGroupChildIsNestedGroupWithCalculationWithAndWithoutOutput_ReturnTrue() { // Setup - var mocks = new MockRepository(); var assessmentSection = mocks.Stub(); mocks.ReplayAll(); @@ -232,7 +216,7 @@ Output = MacroStabilityInwardsOutputTestFactory.CreateOutput() }; - var nestedGroup= new CalculationGroup(); + var nestedGroup = new CalculationGroup(); nestedGroup.Children.Add(calculation); nestedGroup.Children.Add(new MacroStabilityInwardsCalculationScenario()); @@ -246,24 +230,11 @@ new MacroStabilityInwardsFailureMechanism(), assessmentSection); - using (var plugin = new MacroStabilityInwardsPlugin()) - { - ExportInfo info = GetExportInfo(plugin); + // Call + bool isEnabled = info.IsEnabled(context); - // Call - bool isEnabled = info.IsEnabled(context); - - // Assert - Assert.IsTrue(isEnabled); - } - - mocks.VerifyAll(); + // Assert + Assert.IsTrue(isEnabled); } - - private static ExportInfo GetExportInfo(MacroStabilityInwardsPlugin plugin) - { - return plugin.GetExportInfos().First(ei => ei.DataType == typeof(MacroStabilityInwardsCalculationGroupContext) - && ei.Name.Equals("D-GEO Suite Stability Project")); - } } } \ No newline at end of file Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/MacroStabilityInwardsPluginTest.cs =================================================================== diff -u -r824300c8334af59592df1efcfdff772318db561a -r277b8107bf8ffad7dad7fa6dbb75cdb23a0feee2 --- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/MacroStabilityInwardsPluginTest.cs (.../MacroStabilityInwardsPluginTest.cs) (revision 824300c8334af59592df1efcfdff772318db561a) +++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/MacroStabilityInwardsPluginTest.cs (.../MacroStabilityInwardsPluginTest.cs) (revision 277b8107bf8ffad7dad7fa6dbb75cdb23a0feee2) @@ -23,9 +23,12 @@ using System.Linq; using Core.Common.Base; using Core.Common.Controls.TreeView; +using Core.Common.Gui; +using Core.Common.Gui.Forms.MainWindow; using Core.Common.Gui.Plugin; using Core.Common.Gui.TestUtil; using NUnit.Framework; +using Rhino.Mocks; using Riskeer.Common.Data.Calculation; using Riskeer.Common.Data.FailureMechanism; using Riskeer.Common.Forms.PresentationObjects; @@ -232,8 +235,17 @@ public void GetExportInfos_ReturnsSupportedExportInfos() { // Setup - using (var plugin = new MacroStabilityInwardsPlugin()) + var mocks = new MockRepository(); + var mainWindow = mocks.Stub(); + var gui = mocks.Stub(); + gui.Stub(g => g.MainWindow).Return(mainWindow); + mocks.ReplayAll(); + + using (var plugin = new MacroStabilityInwardsPlugin { + Gui = gui + }) + { // Call ExportInfo[] exportInfos = plugin.GetExportInfos().ToArray(); @@ -242,6 +254,8 @@ Assert.AreEqual(2, exportInfos.Count(i => i.DataType == typeof(MacroStabilityInwardsCalculationGroupContext))); Assert.AreEqual(2, exportInfos.Count(i => i.DataType == typeof(MacroStabilityInwardsCalculationScenarioContext))); } + + mocks.VerifyAll(); } } } \ No newline at end of file Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ExportInfos/PipingCalculationContextExportInfoTest.cs =================================================================== diff -u -rd2233d09b25a96914d3af5b58a03fc8bffa52c41 -r277b8107bf8ffad7dad7fa6dbb75cdb23a0feee2 --- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ExportInfos/PipingCalculationContextExportInfoTest.cs (.../PipingCalculationContextExportInfoTest.cs) (revision d2233d09b25a96914d3af5b58a03fc8bffa52c41) +++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ExportInfos/PipingCalculationContextExportInfoTest.cs (.../PipingCalculationContextExportInfoTest.cs) (revision 277b8107bf8ffad7dad7fa6dbb75cdb23a0feee2) @@ -21,6 +21,8 @@ using System.Linq; using Core.Common.Base.IO; +using Core.Common.Gui; +using Core.Common.Gui.Forms.MainWindow; using Core.Common.Gui.Plugin; using Core.Common.TestUtil; using NUnit.Framework; @@ -39,31 +41,52 @@ [TestFixture] public class PipingCalculationContextExportInfoTest { - [Test] - public void Initialized_Always_ExpectedPropertiesSet() + private PipingPlugin plugin; + private ExportInfo info; + private MockRepository mocks; + + [SetUp] + public void SetUp() { - // Setup - using (var plugin = new PipingPlugin()) + mocks = new MockRepository(); + var mainWindow = mocks.Stub(); + var gui = mocks.Stub(); + gui.Stub(g => g.MainWindow).Return(mainWindow); + mocks.Replay(gui); + mocks.Replay(mainWindow); + + plugin = new PipingPlugin { - // Call - ExportInfo info = GetExportInfo(plugin); + Gui = gui + }; - // Assert - Assert.IsNotNull(info.CreateFileExporter); - Assert.IsNotNull(info.IsEnabled); - Assert.AreEqual("Riskeer berekeningenconfiguratie", info.Name); - Assert.AreEqual("xml", info.Extension); - Assert.AreEqual("Algemeen", info.Category); - TestHelper.AssertImagesAreEqual(CoreCommonGuiResources.ExportIcon, info.Image); - Assert.IsNotNull(info.GetExportPath); - } + info = plugin.GetExportInfos().First(ei => ei.DataType == typeof(PipingCalculationScenarioContext)); } + [TearDown] + public void TearDown() + { + plugin.Dispose(); + mocks.VerifyAll(); + } + [Test] + public void Initialized_Always_ExpectedPropertiesSet() + { + // Assert + Assert.IsNotNull(info.CreateFileExporter); + Assert.IsNotNull(info.IsEnabled); + Assert.AreEqual("Riskeer berekeningenconfiguratie", info.Name); + Assert.AreEqual("xml", info.Extension); + Assert.AreEqual("Algemeen", info.Category); + TestHelper.AssertImagesAreEqual(CoreCommonGuiResources.ExportIcon, info.Image); + Assert.IsNotNull(info.GetExportPath); + } + + [Test] public void CreateFileExporter_Always_ReturnFileExporter() { // Setup - var mocks = new MockRepository(); var assessmentSection = mocks.Stub(); mocks.ReplayAll(); @@ -74,25 +97,17 @@ new PipingFailureMechanism(), assessmentSection); - using (var plugin = new PipingPlugin()) - { - ExportInfo info = GetExportInfo(plugin); + // Call + IFileExporter fileExporter = info.CreateFileExporter(context, "test"); - // Call - IFileExporter fileExporter = info.CreateFileExporter(context, "test"); - - // Assert - Assert.IsInstanceOf(fileExporter); - } - - mocks.VerifyAll(); + // Assert + Assert.IsInstanceOf(fileExporter); } [Test] public void IsEnabled_Always_ReturnTrue() { // Setup - var mocks = new MockRepository(); var assessmentSection = mocks.Stub(); mocks.ReplayAll(); @@ -103,23 +118,11 @@ new PipingFailureMechanism(), assessmentSection); - using (var plugin = new PipingPlugin()) - { - ExportInfo info = GetExportInfo(plugin); + // Call + bool isEnabled = info.IsEnabled(context); - // Call - bool isEnabled = info.IsEnabled(context); - - // Assert - Assert.IsTrue(isEnabled); - } - - mocks.VerifyAll(); + // Assert + Assert.IsTrue(isEnabled); } - - private static ExportInfo GetExportInfo(PipingPlugin plugin) - { - return plugin.GetExportInfos().First(ei => ei.DataType == typeof(PipingCalculationScenarioContext)); - } } } \ No newline at end of file Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ExportInfos/PipingCalculationGroupContextExportInfoTest.cs =================================================================== diff -u -rd2233d09b25a96914d3af5b58a03fc8bffa52c41 -r277b8107bf8ffad7dad7fa6dbb75cdb23a0feee2 --- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ExportInfos/PipingCalculationGroupContextExportInfoTest.cs (.../PipingCalculationGroupContextExportInfoTest.cs) (revision d2233d09b25a96914d3af5b58a03fc8bffa52c41) +++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ExportInfos/PipingCalculationGroupContextExportInfoTest.cs (.../PipingCalculationGroupContextExportInfoTest.cs) (revision 277b8107bf8ffad7dad7fa6dbb75cdb23a0feee2) @@ -21,6 +21,8 @@ using System.Linq; using Core.Common.Base.IO; +using Core.Common.Gui; +using Core.Common.Gui.Forms.MainWindow; using Core.Common.Gui.Plugin; using Core.Common.TestUtil; using NUnit.Framework; @@ -39,31 +41,52 @@ [TestFixture] public class PipingCalculationGroupContextExportInfoTest { - [Test] - public void Initialized_Always_ExpectedPropertiesSet() + private PipingPlugin plugin; + private ExportInfo info; + private MockRepository mocks; + + [SetUp] + public void SetUp() { - // Setup - using (var plugin = new PipingPlugin()) + mocks = new MockRepository(); + var mainWindow = mocks.Stub(); + var gui = mocks.Stub(); + gui.Stub(g => g.MainWindow).Return(mainWindow); + mocks.Replay(gui); + mocks.Replay(mainWindow); + + plugin = new PipingPlugin { - // Call - ExportInfo info = GetExportInfo(plugin); + Gui = gui + }; - // Assert - Assert.IsNotNull(info.CreateFileExporter); - Assert.IsNotNull(info.IsEnabled); - Assert.AreEqual("Riskeer berekeningenconfiguratie", info.Name); - Assert.AreEqual("xml", info.Extension); - Assert.AreEqual("Algemeen", info.Category); - TestHelper.AssertImagesAreEqual(CoreCommonGuiResources.ExportIcon, info.Image); - Assert.IsNotNull(info.GetExportPath); - } + info = plugin.GetExportInfos().First(ei => ei.DataType == typeof(PipingCalculationGroupContext)); } + [TearDown] + public void TearDown() + { + plugin.Dispose(); + mocks.VerifyAll(); + } + [Test] + public void Initialized_Always_ExpectedPropertiesSet() + { + // Assert + Assert.IsNotNull(info.CreateFileExporter); + Assert.IsNotNull(info.IsEnabled); + Assert.AreEqual("Riskeer berekeningenconfiguratie", info.Name); + Assert.AreEqual("xml", info.Extension); + Assert.AreEqual("Algemeen", info.Category); + TestHelper.AssertImagesAreEqual(CoreCommonGuiResources.ExportIcon, info.Image); + Assert.IsNotNull(info.GetExportPath); + } + + [Test] public void CreateFileExporter_Always_ReturnFileExporter() { // Setup - var mocks = new MockRepository(); var assessmentSection = mocks.Stub(); mocks.ReplayAll(); @@ -74,25 +97,17 @@ new PipingFailureMechanism(), assessmentSection); - using (var plugin = new PipingPlugin()) - { - ExportInfo info = GetExportInfo(plugin); + // Call + IFileExporter fileExporter = info.CreateFileExporter(context, "test"); - // Call - IFileExporter fileExporter = info.CreateFileExporter(context, "test"); - - // Assert - Assert.IsInstanceOf(fileExporter); - } - - mocks.VerifyAll(); + // Assert + Assert.IsInstanceOf(fileExporter); } [Test] public void IsEnabled_CalculationGroupNoChildren_ReturnFalse() { // Setup - var mocks = new MockRepository(); var assessmentSection = mocks.Stub(); mocks.ReplayAll(); @@ -103,18 +118,11 @@ new PipingFailureMechanism(), assessmentSection); - using (var plugin = new PipingPlugin()) - { - ExportInfo info = GetExportInfo(plugin); + // Call + bool isEnabled = info.IsEnabled(context); - // Call - bool isEnabled = info.IsEnabled(context); - - // Assert - Assert.IsFalse(isEnabled); - } - - mocks.VerifyAll(); + // Assert + Assert.IsFalse(isEnabled); } [Test] @@ -123,7 +131,6 @@ public void IsEnabled_CalculationGroupWithChildren_ReturnTrue(bool hasNestedGroup, bool hasCalculation) { // Setup - var mocks = new MockRepository(); var assessmentSection = mocks.Stub(); mocks.ReplayAll(); @@ -146,23 +153,11 @@ new PipingFailureMechanism(), assessmentSection); - using (var plugin = new PipingPlugin()) - { - ExportInfo info = GetExportInfo(plugin); + // Call + bool isEnabled = info.IsEnabled(context); - // Call - bool isEnabled = info.IsEnabled(context); - - // Assert - Assert.IsTrue(isEnabled); - } - - mocks.VerifyAll(); + // Assert + Assert.IsTrue(isEnabled); } - - private static ExportInfo GetExportInfo(PipingPlugin plugin) - { - return plugin.GetExportInfos().First(ei => ei.DataType == typeof(PipingCalculationGroupContext)); - } } } \ No newline at end of file Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/PipingPluginTest.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r277b8107bf8ffad7dad7fa6dbb75cdb23a0feee2 --- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/PipingPluginTest.cs (.../PipingPluginTest.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/PipingPluginTest.cs (.../PipingPluginTest.cs) (revision 277b8107bf8ffad7dad7fa6dbb75cdb23a0feee2) @@ -24,9 +24,12 @@ using System.Threading; using Core.Common.Base; using Core.Common.Controls.TreeView; +using Core.Common.Gui; +using Core.Common.Gui.Forms.MainWindow; using Core.Common.Gui.Plugin; using Core.Common.Gui.TestUtil; using NUnit.Framework; +using Rhino.Mocks; using Riskeer.Common.Data.Calculation; using Riskeer.Common.Data.FailureMechanism; using Riskeer.Common.Forms.PresentationObjects; @@ -229,8 +232,17 @@ public void GetExportInfos_ReturnsSupportedExportInfos() { // Setup - using (var plugin = new PipingPlugin()) + var mocks = new MockRepository(); + var mainWindow = mocks.Stub(); + var gui = mocks.Stub(); + gui.Stub(g => g.MainWindow).Return(mainWindow); + mocks.ReplayAll(); + + using (var plugin = new PipingPlugin { + Gui = gui + }) + { // Call ExportInfo[] exportInfos = plugin.GetExportInfos().ToArray(); @@ -239,6 +251,8 @@ Assert.IsTrue(exportInfos.Any(tni => tni.DataType == typeof(PipingCalculationGroupContext))); Assert.IsTrue(exportInfos.Any(tni => tni.DataType == typeof(PipingCalculationScenarioContext))); } + + mocks.VerifyAll(); } } } \ No newline at end of file Index: Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Plugin/StabilityPointStructuresPlugin.cs =================================================================== diff -u -rd2233d09b25a96914d3af5b58a03fc8bffa52c41 -r277b8107bf8ffad7dad7fa6dbb75cdb23a0feee2 --- Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Plugin/StabilityPointStructuresPlugin.cs (.../StabilityPointStructuresPlugin.cs) (revision d2233d09b25a96914d3af5b58a03fc8bffa52c41) +++ Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Plugin/StabilityPointStructuresPlugin.cs (.../StabilityPointStructuresPlugin.cs) (revision 277b8107bf8ffad7dad7fa6dbb75cdb23a0feee2) @@ -459,7 +459,7 @@ IEnumerable> calculations = failureMechanismContext.WrappedData .Calculations .Cast>(); - + IInquiryHelper inquiryHelper = GetInquiryHelper(); var builder = new RiskeerContextMenuBuilder(Gui.Get(failureMechanismContext, treeViewControl)); return builder.AddOpenItem() .AddSeparator() @@ -476,7 +476,7 @@ .AddSeparator() .AddClearAllCalculationOutputInFailureMechanismItem(failureMechanismContext.WrappedData) .AddClearIllustrationPointsOfCalculationsInFailureMechanismItem(() => IllustrationPointsHelper.HasIllustrationPoints(calculations), - CreateChangeHandler(GetInquiryHelper(), calculations)) + CreateChangeHandler(inquiryHelper, calculations)) .AddSeparator() .AddCollapseAllItem() .AddExpandAllItem() @@ -546,6 +546,8 @@ TreeViewControl treeViewControl) { CalculationGroup group = context.WrappedData; + IInquiryHelper inquiryHelper = GetInquiryHelper(); + var builder = new RiskeerContextMenuBuilder(Gui.Get(context, treeViewControl)); bool isNestedGroup = parentData is StabilityPointStructuresCalculationGroupContext; @@ -578,7 +580,7 @@ builder.AddRenameItem(); } - builder.AddUpdateForeshoreProfileOfCalculationsItem(calculations, GetInquiryHelper(), + builder.AddUpdateForeshoreProfileOfCalculationsItem(calculations, inquiryHelper, SynchronizeCalculationWithForeshoreProfileHelper.UpdateForeshoreProfileDerivedCalculationInput) .AddCustomItem(CreateUpdateStructureItem(calculations)) .AddSeparator() @@ -594,7 +596,7 @@ .AddSeparator() .AddClearAllCalculationOutputInGroupItem(group) .AddClearIllustrationPointsOfCalculationsInGroupItem(() => IllustrationPointsHelper.HasIllustrationPoints(calculations), - CreateChangeHandler(GetInquiryHelper(), calculations)); + CreateChangeHandler(inquiryHelper, calculations)); if (isNestedGroup) { Index: Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/ExportInfos/StabilityPointStructuresCalculationContextExportInfoTest.cs =================================================================== diff -u -rd2233d09b25a96914d3af5b58a03fc8bffa52c41 -r277b8107bf8ffad7dad7fa6dbb75cdb23a0feee2 --- Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/ExportInfos/StabilityPointStructuresCalculationContextExportInfoTest.cs (.../StabilityPointStructuresCalculationContextExportInfoTest.cs) (revision d2233d09b25a96914d3af5b58a03fc8bffa52c41) +++ Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/ExportInfos/StabilityPointStructuresCalculationContextExportInfoTest.cs (.../StabilityPointStructuresCalculationContextExportInfoTest.cs) (revision 277b8107bf8ffad7dad7fa6dbb75cdb23a0feee2) @@ -21,6 +21,8 @@ using System.Linq; using Core.Common.Base.IO; +using Core.Common.Gui; +using Core.Common.Gui.Forms.MainWindow; using Core.Common.Gui.Plugin; using Core.Common.TestUtil; using NUnit.Framework; @@ -38,31 +40,52 @@ [TestFixture] public class StabilityPointStructuresCalculationContextExportInfoTest { - [Test] - public void Initialized_Always_ExpectedPropertiesSet() + private StabilityPointStructuresPlugin plugin; + private ExportInfo info; + private MockRepository mocks; + + [SetUp] + public void SetUp() { - // Setup - using (var plugin = new StabilityPointStructuresPlugin()) + mocks = new MockRepository(); + var mainWindow = mocks.Stub(); + var gui = mocks.Stub(); + gui.Stub(g => g.MainWindow).Return(mainWindow); + mocks.Replay(gui); + mocks.Replay(mainWindow); + + plugin = new StabilityPointStructuresPlugin { - // Call - ExportInfo info = GetExportInfo(plugin); + Gui = gui + }; - // Assert - Assert.IsNotNull(info.CreateFileExporter); - Assert.IsNotNull(info.IsEnabled); - Assert.AreEqual("Riskeer berekeningenconfiguratie", info.Name); - Assert.AreEqual("xml", info.Extension); - Assert.AreEqual("Algemeen", info.Category); - TestHelper.AssertImagesAreEqual(CoreCommonGuiResources.ExportIcon, info.Image); - Assert.IsNotNull(info.GetExportPath); - } + info = plugin.GetExportInfos().First(ei => ei.DataType == typeof(StabilityPointStructuresCalculationContext)); } + [TearDown] + public void TearDown() + { + plugin.Dispose(); + mocks.VerifyAll(); + } + [Test] + public void Initialized_Always_ExpectedPropertiesSet() + { + // Assert + Assert.IsNotNull(info.CreateFileExporter); + Assert.IsNotNull(info.IsEnabled); + Assert.AreEqual("Riskeer berekeningenconfiguratie", info.Name); + Assert.AreEqual("xml", info.Extension); + Assert.AreEqual("Algemeen", info.Category); + TestHelper.AssertImagesAreEqual(CoreCommonGuiResources.ExportIcon, info.Image); + Assert.IsNotNull(info.GetExportPath); + } + + [Test] public void CreateFileExporter_Always_ReturnFileExporter() { // Setup - var mocks = new MockRepository(); var assessmentSection = mocks.Stub(); mocks.ReplayAll(); @@ -71,25 +94,17 @@ new StabilityPointStructuresFailureMechanism(), assessmentSection); - using (var plugin = new StabilityPointStructuresPlugin()) - { - ExportInfo info = GetExportInfo(plugin); + // Call + IFileExporter fileExporter = info.CreateFileExporter(context, "test"); - // Call - IFileExporter fileExporter = info.CreateFileExporter(context, "test"); - - // Assert - Assert.IsInstanceOf(fileExporter); - } - - mocks.VerifyAll(); + // Assert + Assert.IsInstanceOf(fileExporter); } [Test] public void IsEnabled_Always_ReturnTrue() { // Setup - var mocks = new MockRepository(); var assessmentSection = mocks.Stub(); mocks.ReplayAll(); @@ -98,23 +113,11 @@ new StabilityPointStructuresFailureMechanism(), assessmentSection); - using (var plugin = new StabilityPointStructuresPlugin()) - { - ExportInfo info = GetExportInfo(plugin); + // Call + bool isEnabled = info.IsEnabled(context); - // Call - bool isEnabled = info.IsEnabled(context); - - // Assert - Assert.IsTrue(isEnabled); - } - - mocks.VerifyAll(); + // Assert + Assert.IsTrue(isEnabled); } - - private static ExportInfo GetExportInfo(PluginBase plugin) - { - return plugin.GetExportInfos().First(ei => ei.DataType == typeof(StabilityPointStructuresCalculationContext)); - } } } \ No newline at end of file Index: Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/ExportInfos/StabilityPointStructuresCalculationGroupContextExportInfoTest.cs =================================================================== diff -u -rd2233d09b25a96914d3af5b58a03fc8bffa52c41 -r277b8107bf8ffad7dad7fa6dbb75cdb23a0feee2 --- Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/ExportInfos/StabilityPointStructuresCalculationGroupContextExportInfoTest.cs (.../StabilityPointStructuresCalculationGroupContextExportInfoTest.cs) (revision d2233d09b25a96914d3af5b58a03fc8bffa52c41) +++ Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/ExportInfos/StabilityPointStructuresCalculationGroupContextExportInfoTest.cs (.../StabilityPointStructuresCalculationGroupContextExportInfoTest.cs) (revision 277b8107bf8ffad7dad7fa6dbb75cdb23a0feee2) @@ -21,6 +21,8 @@ using System.Linq; using Core.Common.Base.IO; +using Core.Common.Gui; +using Core.Common.Gui.Forms.MainWindow; using Core.Common.Gui.Plugin; using Core.Common.TestUtil; using NUnit.Framework; @@ -38,31 +40,52 @@ [TestFixture] public class StabilityPointStructuresCalculationGroupContextExportInfoTest { - [Test] - public void Initialized_Always_ExpectedPropertiesSet() + private StabilityPointStructuresPlugin plugin; + private ExportInfo info; + private MockRepository mocks; + + [SetUp] + public void SetUp() { - // Setup - using (var plugin = new StabilityPointStructuresPlugin()) + mocks = new MockRepository(); + var mainWindow = mocks.Stub(); + var gui = mocks.Stub(); + gui.Stub(g => g.MainWindow).Return(mainWindow); + mocks.Replay(gui); + mocks.Replay(mainWindow); + + plugin = new StabilityPointStructuresPlugin { - // Call - ExportInfo info = GetExportInfo(plugin); + Gui = gui + }; - // Assert - Assert.IsNotNull(info.CreateFileExporter); - Assert.IsNotNull(info.IsEnabled); - Assert.AreEqual("Riskeer berekeningenconfiguratie", info.Name); - Assert.AreEqual("xml", info.Extension); - Assert.AreEqual("Algemeen", info.Category); - TestHelper.AssertImagesAreEqual(CoreCommonGuiResources.ExportIcon, info.Image); - Assert.IsNotNull(info.GetExportPath); - } + info = plugin.GetExportInfos().First(ei => ei.DataType == typeof(StabilityPointStructuresCalculationGroupContext)); } + [TearDown] + public void TearDown() + { + plugin.Dispose(); + mocks.VerifyAll(); + } + [Test] + public void Initialized_Always_ExpectedPropertiesSet() + { + // Assert + Assert.IsNotNull(info.CreateFileExporter); + Assert.IsNotNull(info.IsEnabled); + Assert.AreEqual("Riskeer berekeningenconfiguratie", info.Name); + Assert.AreEqual("xml", info.Extension); + Assert.AreEqual("Algemeen", info.Category); + TestHelper.AssertImagesAreEqual(CoreCommonGuiResources.ExportIcon, info.Image); + Assert.IsNotNull(info.GetExportPath); + } + + [Test] public void CreateFileExporter_Always_ReturnFileExporter() { // Setup - var mocks = new MockRepository(); var assessmentSection = mocks.Stub(); mocks.ReplayAll(); @@ -71,25 +94,17 @@ new StabilityPointStructuresFailureMechanism(), assessmentSection); - using (var plugin = new StabilityPointStructuresPlugin()) - { - ExportInfo info = GetExportInfo(plugin); + // Call + IFileExporter fileExporter = info.CreateFileExporter(context, "test"); - // Call - IFileExporter fileExporter = info.CreateFileExporter(context, "test"); - - // Assert - Assert.IsInstanceOf(fileExporter); - } - - mocks.VerifyAll(); + // Assert + Assert.IsInstanceOf(fileExporter); } [Test] public void IsEnabled_CalculationGroupNoChildren_ReturnFalse() { // Setup - var mocks = new MockRepository(); var assessmentSection = mocks.Stub(); mocks.ReplayAll(); @@ -98,18 +113,11 @@ new StabilityPointStructuresFailureMechanism(), assessmentSection); - using (var plugin = new StabilityPointStructuresPlugin()) - { - ExportInfo info = GetExportInfo(plugin); + // Call + bool isEnabled = info.IsEnabled(context); - // Call - bool isEnabled = info.IsEnabled(context); - - // Assert - Assert.IsFalse(isEnabled); - } - - mocks.VerifyAll(); + // Assert + Assert.IsFalse(isEnabled); } [Test] @@ -118,7 +126,6 @@ public void IsEnabled_CalculationGroupWithChildren_ReturnTrue(bool hasNestedGroup, bool hasCalculation) { // Setup - var mocks = new MockRepository(); var assessmentSection = mocks.Stub(); mocks.ReplayAll(); @@ -139,23 +146,11 @@ new StabilityPointStructuresFailureMechanism(), assessmentSection); - using (var plugin = new StabilityPointStructuresPlugin()) - { - ExportInfo info = GetExportInfo(plugin); + // Call + bool isEnabled = info.IsEnabled(context); - // Call - bool isEnabled = info.IsEnabled(context); - - // Assert - Assert.IsTrue(isEnabled); - } - - mocks.VerifyAll(); + // Assert + Assert.IsTrue(isEnabled); } - - private static ExportInfo GetExportInfo(PluginBase plugin) - { - return plugin.GetExportInfos().First(ei => ei.DataType == typeof(StabilityPointStructuresCalculationGroupContext)); - } } } \ No newline at end of file Index: Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/StabilityPointStructuresPluginTest.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r277b8107bf8ffad7dad7fa6dbb75cdb23a0feee2 --- Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/StabilityPointStructuresPluginTest.cs (.../StabilityPointStructuresPluginTest.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/StabilityPointStructuresPluginTest.cs (.../StabilityPointStructuresPluginTest.cs) (revision 277b8107bf8ffad7dad7fa6dbb75cdb23a0feee2) @@ -22,9 +22,12 @@ using System.Linq; using Core.Common.Base; using Core.Common.Controls.TreeView; +using Core.Common.Gui; +using Core.Common.Gui.Forms.MainWindow; using Core.Common.Gui.Plugin; using Core.Common.Gui.TestUtil; using NUnit.Framework; +using Rhino.Mocks; using Riskeer.Common.Data.Calculation; using Riskeer.Common.Forms.PresentationObjects; using Riskeer.Common.Forms.PropertyClasses; @@ -176,8 +179,17 @@ public void GetExportInfos_ReturnsSupportedExportInfos() { // Setup - using (var plugin = new StabilityPointStructuresPlugin()) + var mocks = new MockRepository(); + var mainWindow = mocks.Stub(); + var gui = mocks.Stub(); + gui.Stub(g => g.MainWindow).Return(mainWindow); + mocks.ReplayAll(); + + using (var plugin = new StabilityPointStructuresPlugin { + Gui = gui + }) + { // Call ExportInfo[] exportInfos = plugin.GetExportInfos().ToArray(); @@ -186,6 +198,8 @@ Assert.IsTrue(exportInfos.Any(tni => tni.DataType == typeof(StabilityPointStructuresCalculationGroupContext))); Assert.IsTrue(exportInfos.Any(tni => tni.DataType == typeof(StabilityPointStructuresCalculationContext))); } + + mocks.VerifyAll(); } } } \ No newline at end of file Index: Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs =================================================================== diff -u -r203ec3098b2fefad9c87c54b3839a961de59f698 -r277b8107bf8ffad7dad7fa6dbb75cdb23a0feee2 --- Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs (.../StabilityStoneCoverPlugin.cs) (revision 203ec3098b2fefad9c87c54b3839a961de59f698) +++ Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs (.../StabilityStoneCoverPlugin.cs) (revision 277b8107bf8ffad7dad7fa6dbb75cdb23a0feee2) @@ -455,6 +455,8 @@ TreeViewControl treeViewControl) { CalculationGroup group = nodeData.WrappedData; + IInquiryHelper inquiryHelper = GetInquiryHelper(); + var builder = new RiskeerContextMenuBuilder(Gui.Get(nodeData, treeViewControl)); bool isNestedGroup = parentData is StabilityStoneCoverWaveConditionsCalculationGroupContext; @@ -487,7 +489,7 @@ builder.AddRenameItem(); } - builder.AddUpdateForeshoreProfileOfCalculationsItem(calculations, GetInquiryHelper(), + builder.AddUpdateForeshoreProfileOfCalculationsItem(calculations, inquiryHelper, SynchronizeCalculationWithForeshoreProfileHelper.UpdateForeshoreProfileDerivedCalculationInput) .AddSeparator() .AddValidateAllCalculationsInGroupItem(nodeData, Index: Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Plugin.Test/ExportInfos/StabilityStoneCoverWaveConditionsCalculationContextConfigurationExportInfoTest.cs =================================================================== diff -u -rd2233d09b25a96914d3af5b58a03fc8bffa52c41 -r277b8107bf8ffad7dad7fa6dbb75cdb23a0feee2 --- Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Plugin.Test/ExportInfos/StabilityStoneCoverWaveConditionsCalculationContextConfigurationExportInfoTest.cs (.../StabilityStoneCoverWaveConditionsCalculationContextConfigurationExportInfoTest.cs) (revision d2233d09b25a96914d3af5b58a03fc8bffa52c41) +++ Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Plugin.Test/ExportInfos/StabilityStoneCoverWaveConditionsCalculationContextConfigurationExportInfoTest.cs (.../StabilityStoneCoverWaveConditionsCalculationContextConfigurationExportInfoTest.cs) (revision 277b8107bf8ffad7dad7fa6dbb75cdb23a0feee2) @@ -22,6 +22,8 @@ using System; using System.Linq; using Core.Common.Base.IO; +using Core.Common.Gui; +using Core.Common.Gui.Forms.MainWindow; using Core.Common.Gui.Plugin; using Core.Common.TestUtil; using NUnit.Framework; @@ -38,36 +40,53 @@ [TestFixture] public class StabilityStoneCoverWaveConditionsCalculationContextConfigurationExportInfoTest { - private ExportInfo exportInfo; + private StabilityStoneCoverPlugin plugin; + private ExportInfo info; + private MockRepository mocks; [SetUp] - public void Setup() + public void SetUp() { - using (var plugin = new StabilityStoneCoverPlugin()) + mocks = new MockRepository(); + var mainWindow = mocks.Stub(); + var gui = mocks.Stub(); + gui.Stub(g => g.MainWindow).Return(mainWindow); + mocks.Replay(gui); + mocks.Replay(mainWindow); + + plugin = new StabilityStoneCoverPlugin { - exportInfo = plugin.GetExportInfos() - .Single(ei => ei.DataType == typeof(StabilityStoneCoverWaveConditionsCalculationContext) - && ei.Name.Equals("Riskeer berekeningenconfiguratie")); - } + Gui = gui + }; + + info = plugin.GetExportInfos() + .Single(ei => ei.DataType == typeof(StabilityStoneCoverWaveConditionsCalculationContext) + && ei.Name.Equals("Riskeer berekeningenconfiguratie")); } + [TearDown] + public void TearDown() + { + plugin.Dispose(); + mocks.VerifyAll(); + } + [Test] public void Initialized_Always_ExpectedPropertiesSet() { // Assert - Assert.AreEqual("xml", exportInfo.Extension); - Assert.IsNotNull(exportInfo.CreateFileExporter); - Assert.IsNotNull(exportInfo.IsEnabled); - Assert.AreEqual("Algemeen", exportInfo.Category); - TestHelper.AssertImagesAreEqual(CoreCommonGuiResources.ExportIcon, exportInfo.Image); - Assert.IsNotNull(exportInfo.GetExportPath); + Assert.AreEqual("xml", info.Extension); + Assert.IsNotNull(info.CreateFileExporter); + Assert.IsNotNull(info.IsEnabled); + Assert.AreEqual("Algemeen", info.Category); + TestHelper.AssertImagesAreEqual(CoreCommonGuiResources.ExportIcon, info.Image); + Assert.IsNotNull(info.GetExportPath); } [Test] public void CreateFileExporter_Always_ReturnFileExporter() { // Setup - var mocks = new MockRepository(); var assessmentSection = mocks.Stub(); mocks.ReplayAll(); @@ -85,18 +104,16 @@ assessmentSection); // Call - IFileExporter fileExporter = exportInfo.CreateFileExporter(context, "test"); + IFileExporter fileExporter = info.CreateFileExporter(context, "test"); // Assert Assert.IsInstanceOf(fileExporter); - mocks.VerifyAll(); } [Test] public void IsEnabled_Always_ReturnTrue() { // Setup - var mocks = new MockRepository(); var assessmentSection = mocks.Stub(); mocks.ReplayAll(); @@ -106,11 +123,10 @@ assessmentSection); // Call - bool isEnabled = exportInfo.IsEnabled(context); + bool isEnabled = info.IsEnabled(context); // Assert Assert.IsTrue(isEnabled); - mocks.VerifyAll(); } } } \ No newline at end of file Index: Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Plugin.Test/ExportInfos/StabilityStoneCoverWaveConditionsCalculationContextWaveConditionsExportInfoTest.cs =================================================================== diff -u -r203ec3098b2fefad9c87c54b3839a961de59f698 -r277b8107bf8ffad7dad7fa6dbb75cdb23a0feee2 --- Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Plugin.Test/ExportInfos/StabilityStoneCoverWaveConditionsCalculationContextWaveConditionsExportInfoTest.cs (.../StabilityStoneCoverWaveConditionsCalculationContextWaveConditionsExportInfoTest.cs) (revision 203ec3098b2fefad9c87c54b3839a961de59f698) +++ Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Plugin.Test/ExportInfos/StabilityStoneCoverWaveConditionsCalculationContextWaveConditionsExportInfoTest.cs (.../StabilityStoneCoverWaveConditionsCalculationContextWaveConditionsExportInfoTest.cs) (revision 277b8107bf8ffad7dad7fa6dbb75cdb23a0feee2) @@ -21,6 +21,8 @@ using System.Linq; using Core.Common.Base.IO; +using Core.Common.Gui; +using Core.Common.Gui.Forms.MainWindow; using Core.Common.Gui.Plugin; using Core.Common.TestUtil; using NUnit.Framework; @@ -38,36 +40,53 @@ [TestFixture] public class StabilityStoneCoverWaveConditionsCalculationContextWaveConditionsExportInfoTest { - private ExportInfo exportInfo; + private StabilityStoneCoverPlugin plugin; + private ExportInfo info; + private MockRepository mocks; [SetUp] - public void Setup() + public void SetUp() { - using (var plugin = new StabilityStoneCoverPlugin()) + mocks = new MockRepository(); + var mainWindow = mocks.Stub(); + var gui = mocks.Stub(); + gui.Stub(g => g.MainWindow).Return(mainWindow); + mocks.Replay(gui); + mocks.Replay(mainWindow); + + plugin = new StabilityStoneCoverPlugin { - exportInfo = plugin.GetExportInfos() - .Single(ei => ei.DataType == typeof(StabilityStoneCoverWaveConditionsCalculationContext) - && ei.Name.Equals("Berekende belastingen bij verschillende waterstanden")); - } + Gui = gui + }; + + info = plugin.GetExportInfos() + .Single(ei => ei.DataType == typeof(StabilityStoneCoverWaveConditionsCalculationContext) + && ei.Name.Equals("Berekende belastingen bij verschillende waterstanden")); } + [TearDown] + public void TearDown() + { + plugin.Dispose(); + mocks.VerifyAll(); + } + [Test] public void Initialized_Always_ExpectedPropertiesSet() { // Assert - Assert.AreEqual("csv", exportInfo.Extension); - Assert.IsNotNull(exportInfo.CreateFileExporter); - Assert.IsNotNull(exportInfo.IsEnabled); - Assert.AreEqual("Algemeen", exportInfo.Category); - TestHelper.AssertImagesAreEqual(CoreCommonGuiResources.ExportIcon, exportInfo.Image); - Assert.IsNotNull(exportInfo.GetExportPath); + Assert.AreEqual("csv", info.Extension); + Assert.IsNotNull(info.CreateFileExporter); + Assert.IsNotNull(info.IsEnabled); + Assert.AreEqual("Algemeen", info.Category); + TestHelper.AssertImagesAreEqual(CoreCommonGuiResources.ExportIcon, info.Image); + Assert.IsNotNull(info.GetExportPath); } [Test] public void CreateFileExporter_Always_ReturnFileExporter() { // Setup - var mocks = new MockRepository(); var assessmentSection = mocks.Stub(); mocks.ReplayAll(); @@ -77,18 +96,16 @@ assessmentSection); // Call - IFileExporter fileExporter = exportInfo.CreateFileExporter(context, "test"); + IFileExporter fileExporter = info.CreateFileExporter(context, "test"); // Assert Assert.IsInstanceOf(fileExporter); - mocks.VerifyAll(); } [Test] public void IsEnabled_CalculationWithoutOutput_ReturnFalse() { // Setup - var mocks = new MockRepository(); var assessmentSection = mocks.Stub(); mocks.ReplayAll(); @@ -98,18 +115,16 @@ assessmentSection); // Call - bool isEnabled = exportInfo.IsEnabled(context); + bool isEnabled = info.IsEnabled(context); // Assert Assert.IsFalse(isEnabled); - mocks.VerifyAll(); } [Test] public void IsEnabled_CalculationWithOutput_ReturnTrue() { // Setup - var mocks = new MockRepository(); var assessmentSection = mocks.Stub(); mocks.ReplayAll(); @@ -123,11 +138,10 @@ assessmentSection); // Call - bool isEnabled = exportInfo.IsEnabled(context); + bool isEnabled = info.IsEnabled(context); // Assert Assert.IsTrue(isEnabled); - mocks.VerifyAll(); } } } \ No newline at end of file Index: Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Plugin.Test/ExportInfos/StabilityStoneCoverWaveConditionsCalculationGroupContextConfigurationExportInfoTest.cs =================================================================== diff -u -rd2233d09b25a96914d3af5b58a03fc8bffa52c41 -r277b8107bf8ffad7dad7fa6dbb75cdb23a0feee2 --- Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Plugin.Test/ExportInfos/StabilityStoneCoverWaveConditionsCalculationGroupContextConfigurationExportInfoTest.cs (.../StabilityStoneCoverWaveConditionsCalculationGroupContextConfigurationExportInfoTest.cs) (revision d2233d09b25a96914d3af5b58a03fc8bffa52c41) +++ Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Plugin.Test/ExportInfos/StabilityStoneCoverWaveConditionsCalculationGroupContextConfigurationExportInfoTest.cs (.../StabilityStoneCoverWaveConditionsCalculationGroupContextConfigurationExportInfoTest.cs) (revision 277b8107bf8ffad7dad7fa6dbb75cdb23a0feee2) @@ -21,6 +21,8 @@ using System.Linq; using Core.Common.Base.IO; +using Core.Common.Gui; +using Core.Common.Gui.Forms.MainWindow; using Core.Common.Gui.Plugin; using Core.Common.TestUtil; using NUnit.Framework; @@ -37,36 +39,53 @@ [TestFixture] public class StabilityStoneCoverWaveConditionsCalculationGroupContextConfigurationExportInfoTest { - private ExportInfo exportInfo; + private StabilityStoneCoverPlugin plugin; + private ExportInfo info; + private MockRepository mocks; [SetUp] - public void Setup() + public void SetUp() { - using (var plugin = new StabilityStoneCoverPlugin()) + mocks = new MockRepository(); + var mainWindow = mocks.Stub(); + var gui = mocks.Stub(); + gui.Stub(g => g.MainWindow).Return(mainWindow); + mocks.Replay(gui); + mocks.Replay(mainWindow); + + plugin = new StabilityStoneCoverPlugin { - exportInfo = plugin.GetExportInfos() - .Single(ei => ei.DataType == typeof(StabilityStoneCoverWaveConditionsCalculationGroupContext) - && ei.Name.Equals("Riskeer berekeningenconfiguratie")); - } + Gui = gui + }; + + info = plugin.GetExportInfos() + .Single(ei => ei.DataType == typeof(StabilityStoneCoverWaveConditionsCalculationGroupContext) + && ei.Name.Equals("Riskeer berekeningenconfiguratie")); } + [TearDown] + public void TearDown() + { + plugin.Dispose(); + mocks.VerifyAll(); + } + [Test] public void Initialized_Always_ExpectedPropertiesSet() { // Assert - Assert.AreEqual("xml", exportInfo.Extension); - Assert.IsNotNull(exportInfo.CreateFileExporter); - Assert.IsNotNull(exportInfo.IsEnabled); - Assert.AreEqual("Algemeen", exportInfo.Category); - TestHelper.AssertImagesAreEqual(CoreCommonGuiResources.ExportIcon, exportInfo.Image); - Assert.IsNotNull(exportInfo.GetExportPath); + Assert.AreEqual("xml", info.Extension); + Assert.IsNotNull(info.CreateFileExporter); + Assert.IsNotNull(info.IsEnabled); + Assert.AreEqual("Algemeen", info.Category); + TestHelper.AssertImagesAreEqual(CoreCommonGuiResources.ExportIcon, info.Image); + Assert.IsNotNull(info.GetExportPath); } [Test] public void CreateFileExporter_Always_ReturnFileExporter() { // Setup - var mocks = new MockRepository(); var assessmentSection = mocks.Stub(); mocks.ReplayAll(); @@ -76,7 +95,7 @@ assessmentSection); // Call - IFileExporter fileExporter = exportInfo.CreateFileExporter(context, "test"); + IFileExporter fileExporter = info.CreateFileExporter(context, "test"); // Assert Assert.IsInstanceOf(fileExporter); @@ -86,7 +105,6 @@ public void IsEnabled_CalculationGroupNoChildren_ReturnFalse() { // Setup - var mocks = new MockRepository(); var assessmentSection = mocks.Stub(); mocks.ReplayAll(); @@ -96,12 +114,10 @@ assessmentSection); // Call - bool isEnabled = exportInfo.IsEnabled(context); + bool isEnabled = info.IsEnabled(context); // Assert Assert.IsFalse(isEnabled); - - mocks.VerifyAll(); } [Test] @@ -110,7 +126,6 @@ public void IsEnabled_CalculationGroupWithChildren_ReturnTrue(bool hasNestedGroup, bool hasCalculation) { // Setup - var mocks = new MockRepository(); var assessmentSection = mocks.Stub(); mocks.ReplayAll(); @@ -132,7 +147,7 @@ assessmentSection); // Call - bool isEnabled = exportInfo.IsEnabled(context); + bool isEnabled = info.IsEnabled(context); // Assert Assert.IsTrue(isEnabled); Index: Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Plugin.Test/ExportInfos/StabilityStoneCoverWaveConditionsCalculationGroupContextWaveConditionsExportInfoTest.cs =================================================================== diff -u -r203ec3098b2fefad9c87c54b3839a961de59f698 -r277b8107bf8ffad7dad7fa6dbb75cdb23a0feee2 --- Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Plugin.Test/ExportInfos/StabilityStoneCoverWaveConditionsCalculationGroupContextWaveConditionsExportInfoTest.cs (.../StabilityStoneCoverWaveConditionsCalculationGroupContextWaveConditionsExportInfoTest.cs) (revision 203ec3098b2fefad9c87c54b3839a961de59f698) +++ Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Plugin.Test/ExportInfos/StabilityStoneCoverWaveConditionsCalculationGroupContextWaveConditionsExportInfoTest.cs (.../StabilityStoneCoverWaveConditionsCalculationGroupContextWaveConditionsExportInfoTest.cs) (revision 277b8107bf8ffad7dad7fa6dbb75cdb23a0feee2) @@ -21,6 +21,8 @@ using System.Linq; using Core.Common.Base.IO; +using Core.Common.Gui; +using Core.Common.Gui.Forms.MainWindow; using Core.Common.Gui.Plugin; using Core.Common.TestUtil; using NUnit.Framework; @@ -38,36 +40,53 @@ [TestFixture] public class StabilityStoneCoverWaveConditionsCalculationGroupContextWaveConditionsExportInfoTest { - private ExportInfo exportInfo; + private StabilityStoneCoverPlugin plugin; + private ExportInfo info; + private MockRepository mocks; [SetUp] - public void Setup() + public void SetUp() { - using (var plugin = new StabilityStoneCoverPlugin()) + mocks = new MockRepository(); + var mainWindow = mocks.Stub(); + var gui = mocks.Stub(); + gui.Stub(g => g.MainWindow).Return(mainWindow); + mocks.Replay(gui); + mocks.Replay(mainWindow); + + plugin = new StabilityStoneCoverPlugin { - exportInfo = plugin.GetExportInfos() - .Single(ei => ei.DataType == typeof(StabilityStoneCoverWaveConditionsCalculationGroupContext) - && ei.Name.Equals("Berekende belastingen bij verschillende waterstanden")); - } + Gui = gui + }; + + info = plugin.GetExportInfos() + .Single(ei => ei.DataType == typeof(StabilityStoneCoverWaveConditionsCalculationGroupContext) + && ei.Name.Equals("Berekende belastingen bij verschillende waterstanden")); } + [TearDown] + public void TearDown() + { + plugin.Dispose(); + mocks.VerifyAll(); + } + [Test] public void Initialized_Always_ExpectedPropertiesSet() { // Assert - Assert.AreEqual("csv", exportInfo.Extension); - Assert.IsNotNull(exportInfo.CreateFileExporter); - Assert.IsNotNull(exportInfo.IsEnabled); - Assert.AreEqual("Algemeen", exportInfo.Category); - TestHelper.AssertImagesAreEqual(CoreCommonGuiResources.ExportIcon, exportInfo.Image); - Assert.IsNotNull(exportInfo.GetExportPath); + Assert.AreEqual("csv", info.Extension); + Assert.IsNotNull(info.CreateFileExporter); + Assert.IsNotNull(info.IsEnabled); + Assert.AreEqual("Algemeen", info.Category); + TestHelper.AssertImagesAreEqual(CoreCommonGuiResources.ExportIcon, info.Image); + Assert.IsNotNull(info.GetExportPath); } [Test] public void CreateFileExporter_Always_ReturnFileExporter() { // Setup - var mocks = new MockRepository(); var assessmentSection = mocks.Stub(); mocks.ReplayAll(); @@ -77,19 +96,16 @@ var context = new StabilityStoneCoverWaveConditionsCalculationGroupContext(calculationGroup, null, failureMechanism, assessmentSection); // Call - IFileExporter fileExporter = exportInfo.CreateFileExporter(context, "test"); + IFileExporter fileExporter = info.CreateFileExporter(context, "test"); // Assert Assert.IsInstanceOf(fileExporter); - - mocks.VerifyAll(); } [Test] public void IsEnabled_NoCalculations_ReturnFalse() { // Setup - var mocks = new MockRepository(); var assessmentSection = mocks.Stub(); mocks.ReplayAll(); @@ -99,19 +115,16 @@ var context = new StabilityStoneCoverWaveConditionsCalculationGroupContext(calculationGroup, null, failureMechanism, assessmentSection); // Call - bool isEnabled = exportInfo.IsEnabled(context); + bool isEnabled = info.IsEnabled(context); // Assert Assert.IsFalse(isEnabled); - - mocks.VerifyAll(); } [Test] public void IsEnabled_CalculationWithoutOutput_ReturnFalse() { // Setup - var mocks = new MockRepository(); var assessmentSection = mocks.Stub(); mocks.ReplayAll(); @@ -122,19 +135,16 @@ var context = new StabilityStoneCoverWaveConditionsCalculationGroupContext(calculationGroup, null, failureMechanism, assessmentSection); // Call - bool isEnabled = exportInfo.IsEnabled(context); + bool isEnabled = info.IsEnabled(context); // Assert Assert.IsFalse(isEnabled); - - mocks.VerifyAll(); } [Test] public void IsEnabled_CalculationWithOutput_ReturnTrue() { // Setup - var mocks = new MockRepository(); var assessmentSection = mocks.Stub(); mocks.ReplayAll(); @@ -148,12 +158,10 @@ var context = new StabilityStoneCoverWaveConditionsCalculationGroupContext(calculationGroup, null, failureMechanism, assessmentSection); // Call - bool isEnabled = exportInfo.IsEnabled(context); + bool isEnabled = info.IsEnabled(context); // Assert Assert.IsTrue(isEnabled); - - mocks.VerifyAll(); } [Test] @@ -162,7 +170,6 @@ public void IsEnabled_CalculationWithOrWithoutOutputInSubFolder_ReturnExpectedEnabledState(bool hasOutput) { // Setup - var mocks = new MockRepository(); var assessmentSection = mocks.Stub(); mocks.ReplayAll(); @@ -190,12 +197,10 @@ var context = new StabilityStoneCoverWaveConditionsCalculationGroupContext(calculationGroup, null, failureMechanism, assessmentSection); // Call - bool isEnabled = exportInfo.IsEnabled(context); + bool isEnabled = info.IsEnabled(context); // Assert Assert.AreEqual(hasOutput, isEnabled); - - mocks.VerifyAll(); } } } \ No newline at end of file Index: Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Plugin.Test/StabilityStoneCoverPluginTest.cs =================================================================== diff -u -rdaa52ecefa36c40b4e66e821bfecd0c6dc4344c5 -r277b8107bf8ffad7dad7fa6dbb75cdb23a0feee2 --- Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Plugin.Test/StabilityStoneCoverPluginTest.cs (.../StabilityStoneCoverPluginTest.cs) (revision daa52ecefa36c40b4e66e821bfecd0c6dc4344c5) +++ Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Plugin.Test/StabilityStoneCoverPluginTest.cs (.../StabilityStoneCoverPluginTest.cs) (revision 277b8107bf8ffad7dad7fa6dbb75cdb23a0feee2) @@ -22,9 +22,12 @@ using System.Linq; using Core.Common.Base; using Core.Common.Controls.TreeView; +using Core.Common.Gui; +using Core.Common.Gui.Forms.MainWindow; using Core.Common.Gui.Plugin; using Core.Common.Gui.TestUtil; using NUnit.Framework; +using Rhino.Mocks; using Riskeer.Common.Forms.PresentationObjects; using Riskeer.Revetment.Forms.Views; using Riskeer.StabilityStoneCover.Data; @@ -120,8 +123,17 @@ public void GetExportInfos_ReturnsSupportedExportInfos() { // Setup - using (var plugin = new StabilityStoneCoverPlugin()) + var mocks = new MockRepository(); + var mainWindow = mocks.Stub(); + var gui = mocks.Stub(); + gui.Stub(g => g.MainWindow).Return(mainWindow); + mocks.ReplayAll(); + + using (var plugin = new StabilityStoneCoverPlugin { + Gui = gui + }) + { // Call ExportInfo[] exportInfos = plugin.GetExportInfos().ToArray(); @@ -130,6 +142,8 @@ Assert.AreEqual(2, exportInfos.Count(ei => ei.DataType == typeof(StabilityStoneCoverWaveConditionsCalculationGroupContext))); Assert.AreEqual(2, exportInfos.Count(ei => ei.DataType == typeof(StabilityStoneCoverWaveConditionsCalculationContext))); } + + mocks.VerifyAll(); } [Test] Index: Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs =================================================================== diff -u -r203ec3098b2fefad9c87c54b3839a961de59f698 -r277b8107bf8ffad7dad7fa6dbb75cdb23a0feee2 --- Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs (.../WaveImpactAsphaltCoverPlugin.cs) (revision 203ec3098b2fefad9c87c54b3839a961de59f698) +++ Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs (.../WaveImpactAsphaltCoverPlugin.cs) (revision 277b8107bf8ffad7dad7fa6dbb75cdb23a0feee2) @@ -458,6 +458,8 @@ object parentData, TreeViewControl treeViewControl) { CalculationGroup group = nodeData.WrappedData; + IInquiryHelper inquiryHelper = GetInquiryHelper(); + var builder = new RiskeerContextMenuBuilder(Gui.Get(nodeData, treeViewControl)); bool isNestedGroup = parentData is WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext; @@ -491,7 +493,7 @@ builder.AddRenameItem(); } - builder.AddUpdateForeshoreProfileOfCalculationsItem(calculations, GetInquiryHelper(), + builder.AddUpdateForeshoreProfileOfCalculationsItem(calculations, inquiryHelper, SynchronizeCalculationWithForeshoreProfileHelper.UpdateForeshoreProfileDerivedCalculationInput) .AddSeparator() .AddValidateAllCalculationsInGroupItem(nodeData, Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/ExportInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextConfigurationExportInfoTest.cs =================================================================== diff -u -rd2233d09b25a96914d3af5b58a03fc8bffa52c41 -r277b8107bf8ffad7dad7fa6dbb75cdb23a0feee2 --- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/ExportInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextConfigurationExportInfoTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationContextConfigurationExportInfoTest.cs) (revision d2233d09b25a96914d3af5b58a03fc8bffa52c41) +++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/ExportInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextConfigurationExportInfoTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationContextConfigurationExportInfoTest.cs) (revision 277b8107bf8ffad7dad7fa6dbb75cdb23a0feee2) @@ -22,6 +22,8 @@ using System; using System.Linq; using Core.Common.Base.IO; +using Core.Common.Gui; +using Core.Common.Gui.Forms.MainWindow; using Core.Common.Gui.Plugin; using Core.Common.TestUtil; using NUnit.Framework; @@ -38,36 +40,53 @@ [TestFixture] public class WaveImpactAsphaltCoverWaveConditionsCalculationContextConfigurationExportInfoTest { - private ExportInfo exportInfo; + private WaveImpactAsphaltCoverPlugin plugin; + private ExportInfo info; + private MockRepository mocks; [SetUp] - public void Setup() + public void SetUp() { - using (var plugin = new WaveImpactAsphaltCoverPlugin()) + mocks = new MockRepository(); + var mainWindow = mocks.Stub(); + var gui = mocks.Stub(); + gui.Stub(g => g.MainWindow).Return(mainWindow); + mocks.Replay(gui); + mocks.Replay(mainWindow); + + plugin = new WaveImpactAsphaltCoverPlugin { - exportInfo = plugin.GetExportInfos() - .Single(ei => ei.DataType == typeof(WaveImpactAsphaltCoverWaveConditionsCalculationContext) - && ei.Name.Equals("Riskeer berekeningenconfiguratie")); - } + Gui = gui + }; + + info = plugin.GetExportInfos() + .Single(ei => ei.DataType == typeof(WaveImpactAsphaltCoverWaveConditionsCalculationContext) + && ei.Name.Equals("Riskeer berekeningenconfiguratie")); } + [TearDown] + public void TearDown() + { + plugin.Dispose(); + mocks.VerifyAll(); + } + [Test] public void Initialized_Always_ExpectedPropertiesSet() { // Assert - Assert.AreEqual("xml", exportInfo.Extension); - Assert.IsNotNull(exportInfo.CreateFileExporter); - Assert.IsNotNull(exportInfo.IsEnabled); - Assert.AreEqual("Algemeen", exportInfo.Category); - TestHelper.AssertImagesAreEqual(CoreCommonGuiResources.ExportIcon, exportInfo.Image); - Assert.IsNotNull(exportInfo.GetExportPath); + Assert.AreEqual("xml", info.Extension); + Assert.IsNotNull(info.CreateFileExporter); + Assert.IsNotNull(info.IsEnabled); + Assert.AreEqual("Algemeen", info.Category); + TestHelper.AssertImagesAreEqual(CoreCommonGuiResources.ExportIcon, info.Image); + Assert.IsNotNull(info.GetExportPath); } [Test] public void CreateFileExporter_Always_ReturnFileExporter() { // Setup - var mocks = new MockRepository(); var assessmentSection = mocks.Stub(); mocks.ReplayAll(); @@ -85,18 +104,16 @@ assessmentSection); // Call - IFileExporter fileExporter = exportInfo.CreateFileExporter(context, "test"); + IFileExporter fileExporter = info.CreateFileExporter(context, "test"); // Assert Assert.IsInstanceOf(fileExporter); - mocks.VerifyAll(); } [Test] public void IsEnabled_Always_ReturnTrue() { // Setup - var mocks = new MockRepository(); var assessmentSection = mocks.Stub(); mocks.ReplayAll(); @@ -106,11 +123,10 @@ assessmentSection); // Call - bool isEnabled = exportInfo.IsEnabled(context); + bool isEnabled = info.IsEnabled(context); // Assert Assert.IsTrue(isEnabled); - mocks.VerifyAll(); } } } \ No newline at end of file Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/ExportInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextWaveConditionsExportInfoTest.cs =================================================================== diff -u -r203ec3098b2fefad9c87c54b3839a961de59f698 -r277b8107bf8ffad7dad7fa6dbb75cdb23a0feee2 --- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/ExportInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextWaveConditionsExportInfoTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationContextWaveConditionsExportInfoTest.cs) (revision 203ec3098b2fefad9c87c54b3839a961de59f698) +++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/ExportInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextWaveConditionsExportInfoTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationContextWaveConditionsExportInfoTest.cs) (revision 277b8107bf8ffad7dad7fa6dbb75cdb23a0feee2) @@ -21,6 +21,8 @@ using System.Linq; using Core.Common.Base.IO; +using Core.Common.Gui; +using Core.Common.Gui.Forms.MainWindow; using Core.Common.Gui.Plugin; using Core.Common.TestUtil; using NUnit.Framework; @@ -38,36 +40,53 @@ [TestFixture] public class WaveImpactAsphaltCoverWaveConditionsCalculationContextWaveConditionsExportInfoTest { - private ExportInfo exportInfo; + private WaveImpactAsphaltCoverPlugin plugin; + private ExportInfo info; + private MockRepository mocks; [SetUp] - public void Setup() + public void SetUp() { - using (var plugin = new WaveImpactAsphaltCoverPlugin()) + mocks = new MockRepository(); + var mainWindow = mocks.Stub(); + var gui = mocks.Stub(); + gui.Stub(g => g.MainWindow).Return(mainWindow); + mocks.Replay(gui); + mocks.Replay(mainWindow); + + plugin = new WaveImpactAsphaltCoverPlugin { - exportInfo = plugin.GetExportInfos() - .Single(ei => ei.DataType == typeof(WaveImpactAsphaltCoverWaveConditionsCalculationContext) - && ei.Name.Equals("Berekende belastingen bij verschillende waterstanden")); - } + Gui = gui + }; + + info = plugin.GetExportInfos() + .Single(ei => ei.DataType == typeof(WaveImpactAsphaltCoverWaveConditionsCalculationContext) + && ei.Name.Equals("Berekende belastingen bij verschillende waterstanden")); } + [TearDown] + public void TearDown() + { + plugin.Dispose(); + mocks.VerifyAll(); + } + [Test] public void Initialized_Always_ExpectedPropertiesSet() { // Assert - Assert.AreEqual("csv", exportInfo.Extension); - Assert.IsNotNull(exportInfo.CreateFileExporter); - Assert.IsNotNull(exportInfo.IsEnabled); - Assert.AreEqual("Algemeen", exportInfo.Category); - TestHelper.AssertImagesAreEqual(CoreCommonGuiResources.ExportIcon, exportInfo.Image); - Assert.IsNotNull(exportInfo.GetExportPath); + Assert.AreEqual("csv", info.Extension); + Assert.IsNotNull(info.CreateFileExporter); + Assert.IsNotNull(info.IsEnabled); + Assert.AreEqual("Algemeen", info.Category); + TestHelper.AssertImagesAreEqual(CoreCommonGuiResources.ExportIcon, info.Image); + Assert.IsNotNull(info.GetExportPath); } [Test] public void CreateFileExporter_Always_ReturnFileExporter() { // Setup - var mocks = new MockRepository(); var assessmentSection = mocks.Stub(); mocks.ReplayAll(); @@ -77,18 +96,16 @@ assessmentSection); // Call - IFileExporter fileExporter = exportInfo.CreateFileExporter(context, "test"); + IFileExporter fileExporter = info.CreateFileExporter(context, "test"); // Assert Assert.IsInstanceOf(fileExporter); - mocks.VerifyAll(); } [Test] public void IsEnabled_CalculationWithoutOutput_IsEnabledFalse() { // Setup - var mocks = new MockRepository(); var assessmentSection = mocks.Stub(); mocks.ReplayAll(); @@ -98,18 +115,16 @@ assessmentSection); // Call - bool isEnabled = exportInfo.IsEnabled(context); + bool isEnabled = info.IsEnabled(context); // Assert Assert.IsFalse(isEnabled); - mocks.VerifyAll(); } [Test] public void IsEnabled_CalculationWithOutput_IsEnabledTrue() { // Setup - var mocks = new MockRepository(); var assessmentSection = mocks.Stub(); mocks.ReplayAll(); @@ -125,11 +140,10 @@ new WaveImpactAsphaltCoverFailureMechanism(), assessmentSection); // Call - bool isEnabled = exportInfo.IsEnabled(context); + bool isEnabled = info.IsEnabled(context); // Assert Assert.IsTrue(isEnabled); - mocks.VerifyAll(); } } } \ No newline at end of file Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/ExportInfos/WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextConfigurationExportInfoTest.cs =================================================================== diff -u -rd2233d09b25a96914d3af5b58a03fc8bffa52c41 -r277b8107bf8ffad7dad7fa6dbb75cdb23a0feee2 --- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/ExportInfos/WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextConfigurationExportInfoTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextConfigurationExportInfoTest.cs) (revision d2233d09b25a96914d3af5b58a03fc8bffa52c41) +++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/ExportInfos/WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextConfigurationExportInfoTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextConfigurationExportInfoTest.cs) (revision 277b8107bf8ffad7dad7fa6dbb75cdb23a0feee2) @@ -21,9 +21,10 @@ using System.Linq; using Core.Common.Base.IO; +using Core.Common.Gui; +using Core.Common.Gui.Forms.MainWindow; using Core.Common.Gui.Plugin; using Core.Common.TestUtil; -using Core.Common.Util; using NUnit.Framework; using Rhino.Mocks; using Riskeer.Common.Data.AssessmentSection; @@ -38,36 +39,53 @@ [TestFixture] public class WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextConfigurationExportInfoTest { - private ExportInfo exportInfo; + private WaveImpactAsphaltCoverPlugin plugin; + private ExportInfo info; + private MockRepository mocks; [SetUp] - public void Setup() + public void SetUp() { - using (var plugin = new WaveImpactAsphaltCoverPlugin()) + mocks = new MockRepository(); + var mainWindow = mocks.Stub(); + var gui = mocks.Stub(); + gui.Stub(g => g.MainWindow).Return(mainWindow); + mocks.Replay(gui); + mocks.Replay(mainWindow); + + plugin = new WaveImpactAsphaltCoverPlugin { - exportInfo = plugin.GetExportInfos() - .Single(ei => ei.DataType == typeof(WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext) - && ei.Name.Equals("Riskeer berekeningenconfiguratie")); - } + Gui = gui + }; + + info = plugin.GetExportInfos() + .Single(ei => ei.DataType == typeof(WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext) + && ei.Name.Equals("Riskeer berekeningenconfiguratie")); } + [TearDown] + public void TearDown() + { + plugin.Dispose(); + mocks.VerifyAll(); + } + [Test] public void Initialized_Always_ExpectedPropertiesSet() { // Assert - Assert.AreEqual("xml", exportInfo.Extension); - Assert.IsNotNull(exportInfo.CreateFileExporter); - Assert.IsNotNull(exportInfo.IsEnabled); - Assert.AreEqual("Algemeen", exportInfo.Category); - TestHelper.AssertImagesAreEqual(CoreCommonGuiResources.ExportIcon, exportInfo.Image); - Assert.IsNotNull(exportInfo.GetExportPath); + Assert.AreEqual("xml", info.Extension); + Assert.IsNotNull(info.CreateFileExporter); + Assert.IsNotNull(info.IsEnabled); + Assert.AreEqual("Algemeen", info.Category); + TestHelper.AssertImagesAreEqual(CoreCommonGuiResources.ExportIcon, info.Image); + Assert.IsNotNull(info.GetExportPath); } [Test] public void CreateFileExporter_Always_ReturnFileExporter() { // Setup - var mocks = new MockRepository(); var assessmentSection = mocks.Stub(); mocks.ReplayAll(); @@ -77,7 +95,7 @@ assessmentSection); // Call - IFileExporter fileExporter = exportInfo.CreateFileExporter(context, "test"); + IFileExporter fileExporter = info.CreateFileExporter(context, "test"); // Assert Assert.IsInstanceOf(fileExporter); @@ -87,7 +105,6 @@ public void IsEnabled_CalculationGroupNoChildren_ReturnFalse() { // Setup - var mocks = new MockRepository(); var assessmentSection = mocks.Stub(); mocks.ReplayAll(); @@ -97,7 +114,7 @@ assessmentSection); // Call - bool isEnabled = exportInfo.IsEnabled(context); + bool isEnabled = info.IsEnabled(context); // Assert Assert.IsFalse(isEnabled); @@ -109,7 +126,6 @@ public void IsEnabled_CalculationGroupWithChildren_ReturnTrue(bool hasNestedGroup, bool hasCalculation) { // Setup - var mocks = new MockRepository(); var assessmentSection = mocks.Stub(); mocks.ReplayAll(); @@ -131,7 +147,7 @@ assessmentSection); // Call - bool isEnabled = exportInfo.IsEnabled(context); + bool isEnabled = info.IsEnabled(context); // Assert Assert.IsTrue(isEnabled); Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/ExportInfos/WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextWaveConditionsExportInfoTest.cs =================================================================== diff -u -r203ec3098b2fefad9c87c54b3839a961de59f698 -r277b8107bf8ffad7dad7fa6dbb75cdb23a0feee2 --- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/ExportInfos/WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextWaveConditionsExportInfoTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextWaveConditionsExportInfoTest.cs) (revision 203ec3098b2fefad9c87c54b3839a961de59f698) +++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/ExportInfos/WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextWaveConditionsExportInfoTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextWaveConditionsExportInfoTest.cs) (revision 277b8107bf8ffad7dad7fa6dbb75cdb23a0feee2) @@ -21,6 +21,8 @@ using System.Linq; using Core.Common.Base.IO; +using Core.Common.Gui; +using Core.Common.Gui.Forms.MainWindow; using Core.Common.Gui.Plugin; using Core.Common.TestUtil; using NUnit.Framework; @@ -38,36 +40,53 @@ [TestFixture] public class WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextWaveConditionsExportInfoTest { - private ExportInfo exportInfo; + private WaveImpactAsphaltCoverPlugin plugin; + private ExportInfo info; + private MockRepository mocks; [SetUp] - public void Setup() + public void SetUp() { - using (var plugin = new WaveImpactAsphaltCoverPlugin()) + mocks = new MockRepository(); + var mainWindow = mocks.Stub(); + var gui = mocks.Stub(); + gui.Stub(g => g.MainWindow).Return(mainWindow); + mocks.Replay(gui); + mocks.Replay(mainWindow); + + plugin = new WaveImpactAsphaltCoverPlugin { - exportInfo = plugin.GetExportInfos() - .Single(ei => ei.DataType == typeof(WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext) - && ei.Name.Equals("Berekende belastingen bij verschillende waterstanden")); - } + Gui = gui + }; + + info = plugin.GetExportInfos() + .Single(ei => ei.DataType == typeof(WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext) + && ei.Name.Equals("Berekende belastingen bij verschillende waterstanden")); } + [TearDown] + public void TearDown() + { + plugin.Dispose(); + mocks.VerifyAll(); + } + [Test] public void Initialized_Always_ExpectedPropertiesSet() { // Assert - Assert.AreEqual("csv", exportInfo.Extension); - Assert.IsNotNull(exportInfo.CreateFileExporter); - Assert.IsNotNull(exportInfo.IsEnabled); - Assert.AreEqual("Algemeen", exportInfo.Category); - TestHelper.AssertImagesAreEqual(CoreCommonGuiResources.ExportIcon, exportInfo.Image); - Assert.IsNotNull(exportInfo.GetExportPath); + Assert.AreEqual("csv", info.Extension); + Assert.IsNotNull(info.CreateFileExporter); + Assert.IsNotNull(info.IsEnabled); + Assert.AreEqual("Algemeen", info.Category); + TestHelper.AssertImagesAreEqual(CoreCommonGuiResources.ExportIcon, info.Image); + Assert.IsNotNull(info.GetExportPath); } [Test] public void CreateFileExporter_Always_ReturnFileExporter() { // Setup - var mocks = new MockRepository(); var assessmentSection = mocks.Stub(); mocks.ReplayAll(); @@ -77,19 +96,16 @@ var context = new WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext(calculationGroup, null, failureMechanism, assessmentSection); // Call - IFileExporter fileExporter = exportInfo.CreateFileExporter(context, "test"); + IFileExporter fileExporter = info.CreateFileExporter(context, "test"); // Assert Assert.IsInstanceOf(fileExporter); - - mocks.VerifyAll(); } [Test] public void IsEnabled_NoWaveImpactAsphaltCoverWaveConditionsCalculation_ReturnFalse() { // Setup - var mocks = new MockRepository(); var assessmentSection = mocks.Stub(); mocks.ReplayAll(); @@ -99,11 +115,10 @@ var context = new WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext(calculationGroup, null, failureMechanism, assessmentSection); // Call - bool isEnabled = exportInfo.IsEnabled(context); + bool isEnabled = info.IsEnabled(context); // Assert Assert.IsFalse(isEnabled); - mocks.VerifyAll(); } [Test] @@ -112,7 +127,6 @@ public void IsEnabled_CalculationWithOrWithoutOutput_ReturnExpectedEnabledState(bool hasOutput) { // Setup - var mocks = new MockRepository(); var assessmentSection = mocks.Stub(); mocks.ReplayAll(); @@ -135,11 +149,10 @@ var context = new WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext(calculationGroup, null, failureMechanism, assessmentSection); // Call - bool isEnabled = exportInfo.IsEnabled(context); + bool isEnabled = info.IsEnabled(context); // Assert Assert.AreEqual(hasOutput, isEnabled); - mocks.VerifyAll(); } [Test] @@ -148,7 +161,6 @@ public void IsEnabled_CalculationInSubFolder_ReturnExpectedEnabledState(bool hasOutput) { // Setup - var mocks = new MockRepository(); var assessmentSection = mocks.Stub(); mocks.ReplayAll(); @@ -180,11 +192,10 @@ var context = new WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext(calculationGroup, null, failureMechanism, assessmentSection); // Call - bool isEnabled = exportInfo.IsEnabled(context); + bool isEnabled = info.IsEnabled(context); // Assert Assert.AreEqual(hasOutput, isEnabled); - mocks.VerifyAll(); } } } \ No newline at end of file Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/WaveImpactAsphaltCoverPluginTest.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r277b8107bf8ffad7dad7fa6dbb75cdb23a0feee2 --- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/WaveImpactAsphaltCoverPluginTest.cs (.../WaveImpactAsphaltCoverPluginTest.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/WaveImpactAsphaltCoverPluginTest.cs (.../WaveImpactAsphaltCoverPluginTest.cs) (revision 277b8107bf8ffad7dad7fa6dbb75cdb23a0feee2) @@ -22,9 +22,12 @@ using System.Linq; using Core.Common.Base; using Core.Common.Controls.TreeView; +using Core.Common.Gui; +using Core.Common.Gui.Forms.MainWindow; using Core.Common.Gui.Plugin; using Core.Common.Gui.TestUtil; using NUnit.Framework; +using Rhino.Mocks; using Riskeer.Common.Data.Calculation; using Riskeer.Common.Forms.PresentationObjects; using Riskeer.Revetment.Data; @@ -135,8 +138,17 @@ public void GetExportInfos_ReturnsSupportedExportInfos() { // Setup - using (var plugin = new WaveImpactAsphaltCoverPlugin()) + var mocks = new MockRepository(); + var mainWindow = mocks.Stub(); + var gui = mocks.Stub(); + gui.Stub(g => g.MainWindow).Return(mainWindow); + mocks.ReplayAll(); + + using (var plugin = new WaveImpactAsphaltCoverPlugin { + Gui = gui + }) + { // Call ExportInfo[] exportInfos = plugin.GetExportInfos().ToArray(); @@ -145,6 +157,8 @@ Assert.AreEqual(2, exportInfos.Count(ei => ei.DataType == typeof(WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext))); Assert.AreEqual(2, exportInfos.Count(ei => ei.DataType == typeof(WaveImpactAsphaltCoverWaveConditionsCalculationContext))); } + + mocks.VerifyAll(); } [Test]