Index: Core/Common/test/Core.Common.Controls.Test/DataGrid/DataGridViewControlTest.cs =================================================================== diff -u -r3d088548dfdebfd5c3adbbd67075b42e134f5c03 -rdd0ee44b3b6b22f58ed82e3352aece504f447745 --- Core/Common/test/Core.Common.Controls.Test/DataGrid/DataGridViewControlTest.cs (.../DataGridViewControlTest.cs) (revision 3d088548dfdebfd5c3adbbd67075b42e134f5c03) +++ Core/Common/test/Core.Common.Controls.Test/DataGrid/DataGridViewControlTest.cs (.../DataGridViewControlTest.cs) (revision dd0ee44b3b6b22f58ed82e3352aece504f447745) @@ -27,10 +27,8 @@ using System.Windows.Forms; using Core.Common.Base.Data; using Core.Common.Controls.DataGrid; -using Core.Common.Controls.Test.Properties; using Core.Common.TestUtil; using Core.Common.Util; -using Core.Common.Util.Attributes; using NUnit.Extensions.Forms; using NUnit.Framework; @@ -983,10 +981,10 @@ }); // Call - TestDelegate call = () => control.GetRowFromIndex(5); + void Call() => control.GetRowFromIndex(5); // Assert - Assert.Throws(call); + Assert.Throws(Call); } } @@ -1086,10 +1084,10 @@ }); // Call - TestDelegate call = () => control.GetCell(5, 0); + void Call() => control.GetCell(5, 0); // Assert - Assert.Throws(call); + Assert.Throws(Call); } } @@ -1110,10 +1108,10 @@ }); // Call - TestDelegate call = () => control.GetCell(0, 5); + void Call() => control.GetCell(0, 5); // Assert - Assert.Throws(call); + Assert.Throws(Call); } } @@ -1163,10 +1161,10 @@ }); // Call - TestDelegate call = () => control.GetColumnFromIndex(5); + void Call() => control.GetColumnFromIndex(5); // Assert - Assert.Throws(call); + Assert.Throws(Call); } } @@ -1284,11 +1282,11 @@ DataGridViewCell firstcell = control.CurrentRow.HeaderCell; // Call - TestDelegate test = () => control.SetCurrentCell(firstcell); + void Call() => control.SetCurrentCell(firstcell); // Assert const string message = "Unable to set the cell active."; - var exception = TestHelper.AssertThrowsArgumentExceptionAndTestMessage(test, message); + var exception = TestHelper.AssertThrowsArgumentExceptionAndTestMessage(Call, message); Assert.AreEqual("cell", exception.ParamName); Assert.IsInstanceOf(exception.InnerException); } @@ -1315,11 +1313,11 @@ dataGridViewRow.Visible = false; // Call - TestDelegate test = () => control.SetCurrentCell(dataGridViewRow.Cells[0]); + void Call() => control.SetCurrentCell(dataGridViewRow.Cells[0]); // Assert const string message = "Unable to set the cell active."; - var exception = TestHelper.AssertThrowsArgumentExceptionAndTestMessage(test, message); + var exception = TestHelper.AssertThrowsArgumentExceptionAndTestMessage(Call, message); Assert.AreEqual("cell", exception.ParamName); Assert.IsInstanceOf(exception.InnerException); } @@ -1422,14 +1420,6 @@ } } - private enum TestEnum - { - NoDisplayName, - - [ResourcesDisplayName(typeof(Resources), nameof(Resources.DataGridViewControlTest_DisplayNameValueDisplayName))] - DisplayName - } - private class TestDataGridViewRow { public TestDataGridViewRow(RoundedDouble testRoundedDouble) Index: Core/Common/test/Core.Common.Controls.Test/Properties/Resources.Designer.cs =================================================================== diff -u -r3d088548dfdebfd5c3adbbd67075b42e134f5c03 -rdd0ee44b3b6b22f58ed82e3352aece504f447745 --- Core/Common/test/Core.Common.Controls.Test/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 3d088548dfdebfd5c3adbbd67075b42e134f5c03) +++ Core/Common/test/Core.Common.Controls.Test/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision dd0ee44b3b6b22f58ed82e3352aece504f447745) @@ -80,14 +80,5 @@ resourceCulture = value; } } - - /// - /// Looks up a localized string similar to Display name. - /// - internal static string DataGridViewControlTest_DisplayNameValueDisplayName { - get { - return ResourceManager.GetString("DataGridViewControlTest_DisplayNameValueDisplayName", resourceCulture); - } - } } } Index: Core/Common/test/Core.Common.Controls.Test/Properties/Resources.resx =================================================================== diff -u -r96c96a5f55735cb1d019a5fd8677200e2079284d -rdd0ee44b3b6b22f58ed82e3352aece504f447745 --- Core/Common/test/Core.Common.Controls.Test/Properties/Resources.resx (.../Resources.resx) (revision 96c96a5f55735cb1d019a5fd8677200e2079284d) +++ Core/Common/test/Core.Common.Controls.Test/Properties/Resources.resx (.../Resources.resx) (revision dd0ee44b3b6b22f58ed82e3352aece504f447745) @@ -117,7 +117,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Display name - \ No newline at end of file Index: Core/Common/test/Core.Common.Util.Test/Reflection/TypeUtilsTest.cs =================================================================== diff -u -r3d088548dfdebfd5c3adbbd67075b42e134f5c03 -rdd0ee44b3b6b22f58ed82e3352aece504f447745 --- Core/Common/test/Core.Common.Util.Test/Reflection/TypeUtilsTest.cs (.../TypeUtilsTest.cs) (revision 3d088548dfdebfd5c3adbbd67075b42e134f5c03) +++ Core/Common/test/Core.Common.Util.Test/Reflection/TypeUtilsTest.cs (.../TypeUtilsTest.cs) (revision dd0ee44b3b6b22f58ed82e3352aece504f447745) @@ -25,9 +25,7 @@ using System.Linq; using System.Reflection; using Core.Common.TestUtil; -using Core.Common.Util.Attributes; using Core.Common.Util.Reflection; -using Core.Common.Util.Test.Properties; using NUnit.Framework; namespace Core.Common.Util.Test.Reflection @@ -52,13 +50,13 @@ public void GetDisplayName_EnumWithResourcesAttribute_ResourceText() { // Setup - const TestEnum value = TestEnum.HasDisplayName; + const TestEnum value = TestEnum.DisplayName; // Call string result = TypeUtils.GetDisplayName(value); // Assert - Assert.AreEqual(Resources.EnumStringResource, result); + Assert.AreEqual("Display name", result); } [Test] @@ -68,22 +66,22 @@ const TestEnum value = (TestEnum) 999; // Call - TestDelegate call = () => TypeUtils.GetDisplayName(value); + void Call() => TypeUtils.GetDisplayName(value); // Assert const string message = "The value of argument 'enumValue' (999) is invalid for Enum type 'TestEnum'."; - var exception = TestHelper.AssertThrowsArgumentExceptionAndTestMessage(call, message); + var exception = TestHelper.AssertThrowsArgumentExceptionAndTestMessage(Call, message); Assert.AreEqual("enumValue", exception.ParamName); } [Test] public void Implements_TypeNull_ThrowArgumentNullException() { // Call - TestDelegate call = () => GetType().Implements(null); + void Call() => GetType().Implements(null); // Assert - string paramName = Assert.Throws(call).ParamName; + string paramName = Assert.Throws(Call).ParamName; Assert.AreEqual("type", paramName); } @@ -154,10 +152,10 @@ public void GetField_InstanceNull_ThrowArgumentNullException() { // Call - TestDelegate call = () => TypeUtils.GetField(null, "A"); + void Call() => TypeUtils.GetField(null, "A"); // Assert - string paramName = Assert.Throws(call).ParamName; + string paramName = Assert.Throws(Call).ParamName; Assert.AreEqual("instance", paramName); } @@ -168,10 +166,10 @@ var testClass = new TestClass(22); // Call - TestDelegate call = () => TypeUtils.GetField(testClass, null); + void Call() => TypeUtils.GetField(testClass, null); // Assert - Assert.Throws(call); + Assert.Throws(Call); } [Test] @@ -239,20 +237,20 @@ var testClass = new TestClass(0); // Call - TestDelegate call = () => TypeUtils.GetField(testClass, "nonExistingField"); + void Call() => TypeUtils.GetField(testClass, "nonExistingField"); // Assert - Assert.Throws(call); + Assert.Throws(Call); } [Test] public void GetProperty_InstanceNull_ThrowArgumentNullException() { // Call - TestDelegate call = () => TypeUtils.GetProperty(null, "A"); + void Call() => TypeUtils.GetProperty(null, "A"); // Assert - string paramName = Assert.Throws(call).ParamName; + string paramName = Assert.Throws(Call).ParamName; Assert.AreEqual("instance", paramName); } @@ -263,10 +261,10 @@ var testClass = new TestClass(22); // Call - TestDelegate call = () => TypeUtils.GetProperty(testClass, null); + void Call() => TypeUtils.GetProperty(testClass, null); // Assert - Assert.Throws(call); + Assert.Throws(Call); } [Test] @@ -334,20 +332,20 @@ var testClass = new TestClass(0); // Call - TestDelegate call = () => TypeUtils.GetProperty(testClass, "nonExistingProperty"); + void Call() => TypeUtils.GetProperty(testClass, "nonExistingProperty"); // Assert - Assert.Throws(call); + Assert.Throws(Call); } [Test] public void SetField_InstanceNull_ThrowArgumentNullException() { // Call - TestDelegate call = () => TypeUtils.SetField(null, "A", "B"); + void Call() => TypeUtils.SetField(null, "A", "B"); // Assert - string paramName = Assert.Throws(call).ParamName; + string paramName = Assert.Throws(Call).ParamName; Assert.AreEqual("obj", paramName); } @@ -358,10 +356,10 @@ var testClass = new TestClass(22); // Call - TestDelegate call = () => TypeUtils.SetField(testClass, null, "B"); + void Call() => TypeUtils.SetField(testClass, null, "B"); // Assert - Assert.Throws(call); + Assert.Throws(Call); } [Test] @@ -384,10 +382,10 @@ var testClass = new TestClass(22); // Call - TestDelegate call = () => TypeUtils.SetField(testClass, "privateInt", new object()); + void Call() => TypeUtils.SetField(testClass, "privateInt", new object()); // Assert - Assert.Throws(call); + Assert.Throws(Call); } [Test] @@ -410,10 +408,10 @@ var testClass = new TestClass(0); // Call - TestDelegate call = () => TypeUtils.SetField(testClass, "nonExistingField", 0); + void Call() => TypeUtils.SetField(testClass, "nonExistingField", 0); // Assert - Assert.Throws(call); + Assert.Throws(Call); } [Test] @@ -433,21 +431,21 @@ public void TypedCallPrivateMethod_InstanceNull_ThrowArgumentNullException() { // Call - TestDelegate call = () => TypeUtils.CallPrivateMethod(null, "A"); + void Call() => TypeUtils.CallPrivateMethod(null, "A"); // Assert - string paramName = Assert.Throws(call).ParamName; + string paramName = Assert.Throws(Call).ParamName; Assert.AreEqual("instance", paramName); } [Test] public void CallPrivateMethod_InstanceNull_ThrowArgumentNullException() { // Call - TestDelegate call = () => TypeUtils.CallPrivateMethod(null, "A"); + void Call() => TypeUtils.CallPrivateMethod(null, "A"); // Assert - string paramName = Assert.Throws(call).ParamName; + string paramName = Assert.Throws(Call).ParamName; Assert.AreEqual("instance", paramName); } @@ -471,10 +469,10 @@ var instance = new TestClass(); // Call - TestDelegate call = () => TypeUtils.CallPrivateMethod(instance, "IDontExist", 1); + void Call() => TypeUtils.CallPrivateMethod(instance, "IDontExist", 1); // Assert - Assert.Throws(call); + Assert.Throws(Call); } [Test] @@ -484,10 +482,10 @@ var instance = new TestClass(); // Call - TestDelegate call = () => TypeUtils.CallPrivateMethod(instance, "PrivateMethod"); + void Call() => TypeUtils.CallPrivateMethod(instance, "PrivateMethod"); // Assert - Assert.Throws(call); + Assert.Throws(Call); } [Test] @@ -497,10 +495,10 @@ var instance = new TestClass(); // Call - TestDelegate call = () => TypeUtils.CallPrivateMethod(instance, null, 1); + void Call() => TypeUtils.CallPrivateMethod(instance, null, 1); // Assert - Assert.Throws(call); + Assert.Throws(Call); } [Test] @@ -510,10 +508,10 @@ var instance = new TestClass(); // Call - TestDelegate call = () => TypeUtils.CallPrivateMethod(instance, "PrivateMethod", 1); + void Call() => TypeUtils.CallPrivateMethod(instance, "PrivateMethod", 1); // Assert - Assert.DoesNotThrow(call); + Assert.DoesNotThrow(Call); } [Test] @@ -523,10 +521,10 @@ var instance = new TestClass(); // Call - TestDelegate call = () => TypeUtils.CallPrivateMethod(instance, "IDontExist", 1); + void Call() => TypeUtils.CallPrivateMethod(instance, "IDontExist", 1); // Assert - Assert.Throws(call); + Assert.Throws(Call); } [Test] @@ -536,10 +534,10 @@ var instance = new TestClass(); // Call - TestDelegate call = () => TypeUtils.CallPrivateMethod(instance, "PrivateMethod"); + void Call() => TypeUtils.CallPrivateMethod(instance, "PrivateMethod"); // Assert - Assert.Throws(call); + Assert.Throws(Call); } [Test] @@ -549,20 +547,20 @@ var instance = new TestClass(); // Call - TestDelegate call = () => TypeUtils.CallPrivateMethod(instance, null, 1); + void Call() => TypeUtils.CallPrivateMethod(instance, null, 1); // Assert - Assert.Throws(call); + Assert.Throws(Call); } [Test] public void SetPrivatePropertyValue_InstanceNull_ThrowArgumentNullException() { // Call - TestDelegate call = () => TypeUtils.SetPrivatePropertyValue(null, "A", "B"); + void Call() => TypeUtils.SetPrivatePropertyValue(null, "A", "B"); // Assert - string paramName = Assert.Throws(call).ParamName; + string paramName = Assert.Throws(Call).ParamName; Assert.AreEqual("instance", paramName); } @@ -573,10 +571,10 @@ var instance = new TestClass(); // Call - TestDelegate call = () => TypeUtils.SetPrivatePropertyValue(instance, null, "B"); + void Call() => TypeUtils.SetPrivatePropertyValue(instance, null, "B"); // Assert - Assert.Throws(call); + Assert.Throws(Call); } [Test] @@ -589,10 +587,10 @@ Assert.AreEqual(0.0, testClass.PublicPropertyPrivateSetter); // Call - TestDelegate call = () => TypeUtils.SetPrivatePropertyValue(testClass, "IDonNotExist", 1.2); + void Call() => TypeUtils.SetPrivatePropertyValue(testClass, "IDonNotExist", 1.2); // Assert - Assert.Throws(call); + Assert.Throws(Call); } [Test] @@ -615,10 +613,10 @@ public void GetPropertyAttributes_PropertyNameNull_ThrowArgumentNullException() { // Call - TestDelegate call = () => TypeUtils.GetPropertyAttributes(null); + void Call() => TypeUtils.GetPropertyAttributes(null); // Assert - string paramName = Assert.Throws(call).ParamName; + string paramName = Assert.Throws(Call).ParamName; Assert.AreEqual("propertyName", paramName); } @@ -635,14 +633,6 @@ Assert.AreEqual("attribute 2", attributes.ElementAt(1).Name); } - private enum TestEnum - { - NoDisplayName, - - [ResourcesDisplayName(typeof(Resources), nameof(Resources.EnumStringResource))] - HasDisplayName - } - private class TestClass { /// Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssessmentSectionAssemblyGroupsView.Designer.cs =================================================================== diff -u -r2190e91a6a95bf2e998c9c77bba2ab9ac107f3a7 -rdd0ee44b3b6b22f58ed82e3352aece504f447745 --- Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssessmentSectionAssemblyGroupsView.Designer.cs (.../AssessmentSectionAssemblyGroupsView.Designer.cs) (revision 2190e91a6a95bf2e998c9c77bba2ab9ac107f3a7) +++ Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssessmentSectionAssemblyGroupsView.Designer.cs (.../AssessmentSectionAssemblyGroupsView.Designer.cs) (revision dd0ee44b3b6b22f58ed82e3352aece504f447745) @@ -25,7 +25,6 @@ { partial class AssessmentSectionAssemblyGroupsView { - /// /// Required designer variable. /// @@ -56,10 +55,8 @@ this.Name = "AssessmentSectionAssemblyGroupsView"; resources.ApplyResources(this, "$this"); this.ResumeLayout(false); - } - - + #endregion private AssemblyGroupsTable assemblyGroupsTable; Index: Riskeer/Integration/test/Riskeer.Integration.Forms.Test/PresentationObjects/AssessmentSectionAssemblyGroupsContextTest.cs =================================================================== diff -u -rf30a80996d462acca84a59aec486868d40d57c79 -rdd0ee44b3b6b22f58ed82e3352aece504f447745 --- Riskeer/Integration/test/Riskeer.Integration.Forms.Test/PresentationObjects/AssessmentSectionAssemblyGroupsContextTest.cs (.../AssessmentSectionAssemblyGroupsContextTest.cs) (revision f30a80996d462acca84a59aec486868d40d57c79) +++ Riskeer/Integration/test/Riskeer.Integration.Forms.Test/PresentationObjects/AssessmentSectionAssemblyGroupsContextTest.cs (.../AssessmentSectionAssemblyGroupsContextTest.cs) (revision dd0ee44b3b6b22f58ed82e3352aece504f447745) @@ -23,7 +23,6 @@ using NUnit.Framework; using Rhino.Mocks; using Riskeer.Common.Data.AssessmentSection; -using Riskeer.Common.Data.TestUtil; using Riskeer.Integration.Forms.PresentationObjects; namespace Riskeer.Integration.Forms.Test.PresentationObjects @@ -32,11 +31,11 @@ public class AssessmentSectionAssemblyGroupsContextTest { [Test] - public void Constructor_ValidParameters_ExpectedValues() + public void Constructor_ExpectedValues() { // Setup var mocks = new MockRepository(); - IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(null, mocks); + var assessmentSection = mocks.Stub(); mocks.ReplayAll(); // Call Index: Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/AssemblyGroupRowTest.cs =================================================================== diff -u -r1d28de98daddf0f744f11cc1c1cdb5f1a6a2b966 -rdd0ee44b3b6b22f58ed82e3352aece504f447745 --- Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/AssemblyGroupRowTest.cs (.../AssemblyGroupRowTest.cs) (revision 1d28de98daddf0f744f11cc1c1cdb5f1a6a2b966) +++ Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/AssemblyGroupRowTest.cs (.../AssemblyGroupRowTest.cs) (revision dd0ee44b3b6b22f58ed82e3352aece504f447745) @@ -40,9 +40,9 @@ var random = new Random(39); // Call - void Call() => new AssemblyGroupRow(null, - Color.FromKnownColor(random.NextEnumValue()), - random.NextEnumValue()); + void Call() => new AssemblyGroupRow(null, + Color.FromKnownColor(random.NextEnumValue()), + random.NextEnumValue()); // Assert string paramName = Assert.Throws(Call).ParamName; @@ -56,38 +56,28 @@ var random = new Random(39); double lowerBoundary = random.NextDouble(); double upperBoundary = random.NextDouble(); - var group = random.NextEnumValue(); + var group = random.NextEnumValue(); var color = Color.FromKnownColor(random.NextEnumValue()); var assemblyGroupBoundaries = new TestAssemblyGroupBoundaries(lowerBoundary, upperBoundary); // Call - var groupRow = new AssemblyGroupRow(assemblyGroupBoundaries, color, group); + var groupRow = new AssemblyGroupRow(assemblyGroupBoundaries, color, group); // Assert Assert.AreEqual(group, groupRow.Group); Assert.AreEqual(color, groupRow.Color); Assert.AreEqual(lowerBoundary, groupRow.LowerBoundary); Assert.AreEqual(upperBoundary, groupRow.UpperBoundary); - TestHelper.AssertTypeConverter, - EnumTypeConverter>(nameof(AssemblyGroupRow.Group)); - TestHelper.AssertTypeConverter, - NoProbabilityValueDoubleConverter>( - nameof(AssemblyGroupRow.LowerBoundary)); - TestHelper.AssertTypeConverter, - NoProbabilityValueDoubleConverter>( - nameof(AssemblyGroupRow.UpperBoundary)); + TestHelper.AssertTypeConverter, EnumTypeConverter>(nameof(AssemblyGroupRow.Group)); + TestHelper.AssertTypeConverter, NoProbabilityValueDoubleConverter>(nameof(AssemblyGroupRow.LowerBoundary)); + TestHelper.AssertTypeConverter, NoProbabilityValueDoubleConverter>(nameof(AssemblyGroupRow.UpperBoundary)); } private class TestAssemblyGroupBoundaries : AssemblyGroupBoundaries { public TestAssemblyGroupBoundaries(double lowerBoundary, double upperBoundary) : base(lowerBoundary, upperBoundary) {} } - - private enum TestAssemblyGroup - { - I = 1 - } } } \ No newline at end of file Index: Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/AssemblyGroupsTableTest.cs =================================================================== diff -u -r8a1b49047c14830b2f78391a3aa1dd887df3e868 -rdd0ee44b3b6b22f58ed82e3352aece504f447745 --- Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/AssemblyGroupsTableTest.cs (.../AssemblyGroupsTableTest.cs) (revision 8a1b49047c14830b2f78391a3aa1dd887df3e868) +++ Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/AssemblyGroupsTableTest.cs (.../AssemblyGroupsTableTest.cs) (revision dd0ee44b3b6b22f58ed82e3352aece504f447745) @@ -42,7 +42,7 @@ public void Constructor_InitializesWithColumns() { // Call - using (var table = new AssemblyGroupsTable()) + using (var table = new AssemblyGroupsTable()) { // Assert Assert.IsInstanceOf(table); @@ -77,9 +77,9 @@ public void SetData_NoDataAlreadySet_SetNewData() { // Setup - using (var table = new AssemblyGroupsTable()) + using (var table = new AssemblyGroupsTable()) { - Tuple[] groups = + Tuple[] groups = { CreateAssessmentSectionAssemblyGroup(), CreateAssessmentSectionAssemblyGroup(), @@ -98,9 +98,9 @@ public void SetData_SetNullDataAfterDataAlreadySet_ClearsData() { // Setup - using (var table = new AssemblyGroupsTable()) + using (var table = new AssemblyGroupsTable()) { - Tuple[] groups = + Tuple[] groups = { CreateAssessmentSectionAssemblyGroup(), CreateAssessmentSectionAssemblyGroup(), @@ -120,14 +120,14 @@ public void SetData_SetNewDataAfterDataAlreadySet_ClearDataAndAddNewData() { // Setup - using (var table = new AssemblyGroupsTable()) + using (var table = new AssemblyGroupsTable()) { table.SetData(new[] { CreateAssessmentSectionAssemblyGroup() }); - Tuple[] newGroups = + Tuple[] newGroups = { CreateAssessmentSectionAssemblyGroup(), CreateAssessmentSectionAssemblyGroup(), @@ -146,9 +146,9 @@ public void SetData_WithData_ExpectedValuesInTable() { // Setup - using (var table = new AssemblyGroupsTable()) + using (var table = new AssemblyGroupsTable()) { - Tuple[] groups = + Tuple[] groups = { CreateAssessmentSectionAssemblyGroup(), CreateAssessmentSectionAssemblyGroup(), @@ -162,7 +162,7 @@ Assert.AreEqual(groups.Length, table.Rows.Count); for (var i = 0; i < table.Rows.Count; i++) { - Tuple group = groups[i]; + Tuple group = groups[i]; DataGridViewCellCollection rowCells = table.Rows[i].Cells; Assert.AreEqual(group.Item3, rowCells[groupColumnIndex].Value); @@ -173,23 +173,18 @@ } } - private static Tuple CreateAssessmentSectionAssemblyGroup() + private static Tuple CreateAssessmentSectionAssemblyGroup() { var random = new Random(39); - return new Tuple(new TestAssemblyGroupBoundaries(random.NextDouble(), random.NextDouble()), - Color.FromKnownColor(random.NextEnumValue()), - random.NextEnumValue()); + return new Tuple(new TestAssemblyGroupBoundaries(random.NextDouble(), random.NextDouble()), + Color.FromKnownColor(random.NextEnumValue()), + random.NextEnumValue()); } private class TestAssemblyGroupBoundaries : AssemblyGroupBoundaries { public TestAssemblyGroupBoundaries(double lowerBoundary, double upperBoundary) : base(lowerBoundary, upperBoundary) {} } - - private enum TestAssemblyGroup - { - I = 1 - } } } \ No newline at end of file Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/AssessmentSectionAssemblyGroupsContextTreeNodeInfoTest.cs =================================================================== diff -u -r6b51c71ea0bf9ce7f0877c88bee7da9eb534e9cb -rdd0ee44b3b6b22f58ed82e3352aece504f447745 --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/AssessmentSectionAssemblyGroupsContextTreeNodeInfoTest.cs (.../AssessmentSectionAssemblyGroupsContextTreeNodeInfoTest.cs) (revision 6b51c71ea0bf9ce7f0877c88bee7da9eb534e9cb) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/AssessmentSectionAssemblyGroupsContextTreeNodeInfoTest.cs (.../AssessmentSectionAssemblyGroupsContextTreeNodeInfoTest.cs) (revision dd0ee44b3b6b22f58ed82e3352aece504f447745) @@ -27,8 +27,6 @@ using Core.Gui.ContextMenu; using NUnit.Framework; using Rhino.Mocks; -using Riskeer.Common.Data.AssessmentSection; -using Riskeer.Common.Data.TestUtil; using Riskeer.Common.Forms.Properties; using Riskeer.Common.Plugin.TestUtil; using Riskeer.Integration.Forms.PresentationObjects; @@ -105,10 +103,7 @@ { // Setup var mocks = new MockRepository(); - IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(null, mocks); - var context = new AssessmentSectionAssemblyGroupsContext(assessmentSection); - var menuBuilder = mocks.StrictMock(); using (mocks.Ordered()) @@ -122,7 +117,7 @@ using (var treeViewControl = new TreeViewControl()) { IGui gui = StubFactory.CreateGuiStub(mocks); - gui.Stub(cmp => cmp.Get(context, treeViewControl)).Return(menuBuilder); + gui.Stub(cmp => cmp.Get(null, treeViewControl)).Return(menuBuilder); mocks.ReplayAll(); using (var plugin = new RiskeerPlugin()) @@ -132,7 +127,7 @@ plugin.Gui = gui; // Call - info.ContextMenuStrip(context, null, treeViewControl); + info.ContextMenuStrip(null, null, treeViewControl); } }