Index: Riskeer/HeightStructures/src/Riskeer.HeightStructures.Data/HeightStructuresFailureMechanismAssemblyFactory.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -re7f074df2c06a1c0b7d628f75dd87f0552d11e08 --- Riskeer/HeightStructures/src/Riskeer.HeightStructures.Data/HeightStructuresFailureMechanismAssemblyFactory.cs (.../HeightStructuresFailureMechanismAssemblyFactory.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/HeightStructures/src/Riskeer.HeightStructures.Data/HeightStructuresFailureMechanismAssemblyFactory.cs (.../HeightStructuresFailureMechanismAssemblyFactory.cs) (revision e7f074df2c06a1c0b7d628f75dd87f0552d11e08) @@ -22,14 +22,14 @@ using System; using System.Collections.Generic; using System.Linq; -using Riskeer.Common.Data.AssemblyTool; -using Riskeer.Common.Data.AssessmentSection; -using Riskeer.Common.Data.Exceptions; -using Riskeer.Common.Primitives; using Riskeer.AssemblyTool.Data; using Riskeer.AssemblyTool.KernelWrapper.Calculators; using Riskeer.AssemblyTool.KernelWrapper.Calculators.Assembly; using Riskeer.AssemblyTool.KernelWrapper.Kernels; +using Riskeer.Common.Data.AssemblyTool; +using Riskeer.Common.Data.AssessmentSection; +using Riskeer.Common.Data.Exceptions; +using Riskeer.Common.Primitives; using RiskeerCommonDataResources = Riskeer.Common.Data.Properties.Resources; namespace Riskeer.HeightStructures.Data Index: Riskeer/HeightStructures/src/Riskeer.HeightStructures.Forms/PropertyClasses/HeightStructureProperties.cs =================================================================== diff -u -r9ee2919e72df0efa6252fc4323b76155a259d682 -re7f074df2c06a1c0b7d628f75dd87f0552d11e08 --- Riskeer/HeightStructures/src/Riskeer.HeightStructures.Forms/PropertyClasses/HeightStructureProperties.cs (.../HeightStructureProperties.cs) (revision 9ee2919e72df0efa6252fc4323b76155a259d682) +++ Riskeer/HeightStructures/src/Riskeer.HeightStructures.Forms/PropertyClasses/HeightStructureProperties.cs (.../HeightStructureProperties.cs) (revision e7f074df2c06a1c0b7d628f75dd87f0552d11e08) @@ -40,7 +40,7 @@ private const int idPropertyIndex = 1; private const int namePropertyIndex = 2; private const int locationPropertyIndex = 3; - + private const int structureNormalOrientationPropertyIndex = 4; private const int levelCrestStructurePropertyIndex = 5; private const int widthFlowAperturesPropertyIndex = 6; @@ -51,7 +51,7 @@ private const int storageStructureAreaPropertyIndex = 10; private const int allowedLevelIncreaseStoragePropertyIndex = 11; - + [PropertyOrder(idPropertyIndex)] [ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_General))] [ResourcesDisplayName(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Id_DisplayName))] Index: Riskeer/HeightStructures/src/Riskeer.HeightStructures.Forms/PropertyClasses/HeightStructuresInputContextProperties.cs =================================================================== diff -u -rdf50652c669ae9c392e5d82bb11df4b32ab5746e -re7f074df2c06a1c0b7d628f75dd87f0552d11e08 --- Riskeer/HeightStructures/src/Riskeer.HeightStructures.Forms/PropertyClasses/HeightStructuresInputContextProperties.cs (.../HeightStructuresInputContextProperties.cs) (revision df50652c669ae9c392e5d82bb11df4b32ab5746e) +++ Riskeer/HeightStructures/src/Riskeer.HeightStructures.Forms/PropertyClasses/HeightStructuresInputContextProperties.cs (.../HeightStructuresInputContextProperties.cs) (revision e7f074df2c06a1c0b7d628f75dd87f0552d11e08) @@ -164,7 +164,7 @@ #region General data - [ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_General), + [ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_General), generalCategoryIndex, totalNrOfCategories)] public override SelectableHydraulicBoundaryLocation SelectedHydraulicBoundaryLocation { @@ -178,7 +178,7 @@ } } - [ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_General), + [ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_General), generalCategoryIndex, totalNrOfCategories)] public override HeightStructure Structure { @@ -192,7 +192,7 @@ } } - [ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_General), + [ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_General), generalCategoryIndex, totalNrOfCategories)] public override Point2D StructureLocation { @@ -206,7 +206,7 @@ #region Incoming flow - [ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_Schematization_Incoming_flow), + [ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_Schematization_Incoming_flow), schematizationIncomingFlowCategoryIndex, totalNrOfCategories)] public override RoundedDouble StructureNormalOrientation { @@ -263,7 +263,7 @@ #region Ground erosion - [ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_Schematization_Ground_erosion), + [ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_Schematization_Ground_erosion), schematizationGroundErosionCategoryIndex, totalNrOfCategories)] public override VariationCoefficientLogNormalDistributionProperties CriticalOvertoppingDischarge { @@ -273,7 +273,7 @@ } } - [ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_Schematization_Ground_erosion), + [ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_Schematization_Ground_erosion), schematizationGroundErosionCategoryIndex, totalNrOfCategories)] public override LogNormalDistributionProperties FlowWidthAtBottomProtection { @@ -283,7 +283,7 @@ } } - [ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_Schematization_Ground_erosion), + [ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_Schematization_Ground_erosion), schematizationGroundErosionCategoryIndex, totalNrOfCategories)] public override double FailureProbabilityStructureWithErosion { @@ -301,7 +301,7 @@ #region Storage structure - [ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_Schematization_Storage_structure), + [ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_Schematization_Storage_structure), schematizationStorageStructureCategoryIndex, totalNrOfCategories)] public override VariationCoefficientLogNormalDistributionProperties StorageStructureArea { @@ -311,7 +311,7 @@ } } - [ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_Schematization_Storage_structure), + [ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_Schematization_Storage_structure), schematizationStorageStructureCategoryIndex, totalNrOfCategories)] public override LogNormalDistributionProperties AllowedLevelIncreaseStorage { @@ -325,7 +325,7 @@ #region Foreshore profile - [ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_Foreshore), + [ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_Foreshore), foreshoreCategoryIndex, totalNrOfCategories)] public override ForeshoreProfile ForeshoreProfile { @@ -341,7 +341,7 @@ [DynamicPropertyOrder] [TypeConverter(typeof(ExpandableObjectConverter))] - [ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_Foreshore), + [ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_Foreshore), foreshoreCategoryIndex, totalNrOfCategories)] public override UseBreakWaterProperties UseBreakWater { @@ -353,7 +353,7 @@ [DynamicPropertyOrder] [TypeConverter(typeof(ExpandableObjectConverter))] - [ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_Foreshore), + [ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_Foreshore), foreshoreCategoryIndex, totalNrOfCategories)] public override UseForeshoreProperties UseForeshore { Index: Riskeer/HeightStructures/src/Riskeer.HeightStructures.Forms/Views/HeightStructuresFailureMechanismSectionResultRow.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -re7f074df2c06a1c0b7d628f75dd87f0552d11e08 --- Riskeer/HeightStructures/src/Riskeer.HeightStructures.Forms/Views/HeightStructuresFailureMechanismSectionResultRow.cs (.../HeightStructuresFailureMechanismSectionResultRow.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/HeightStructures/src/Riskeer.HeightStructures.Forms/Views/HeightStructuresFailureMechanismSectionResultRow.cs (.../HeightStructuresFailureMechanismSectionResultRow.cs) (revision e7f074df2c06a1c0b7d628f75dd87f0552d11e08) @@ -22,14 +22,14 @@ using System; using System.ComponentModel; using Core.Common.Controls.DataGrid; +using Riskeer.AssemblyTool.Data; using Riskeer.Common.Data.AssessmentSection; using Riskeer.Common.Data.Exceptions; using Riskeer.Common.Forms.Helpers; using Riskeer.Common.Forms.TypeConverters; using Riskeer.Common.Forms.Views; using Riskeer.Common.Primitives; using Riskeer.HeightStructures.Data; -using Riskeer.AssemblyTool.Data; namespace Riskeer.HeightStructures.Forms.Views { Index: Riskeer/HeightStructures/src/Riskeer.HeightStructures.Service/HeightStructuresDataSynchronizationService.cs =================================================================== diff -u -rae6913dc9e65387cd005077a2f056b5cd2fd159f -re7f074df2c06a1c0b7d628f75dd87f0552d11e08 --- Riskeer/HeightStructures/src/Riskeer.HeightStructures.Service/HeightStructuresDataSynchronizationService.cs (.../HeightStructuresDataSynchronizationService.cs) (revision ae6913dc9e65387cd005077a2f056b5cd2fd159f) +++ Riskeer/HeightStructures/src/Riskeer.HeightStructures.Service/HeightStructuresDataSynchronizationService.cs (.../HeightStructuresDataSynchronizationService.cs) (revision e7f074df2c06a1c0b7d628f75dd87f0552d11e08) @@ -150,7 +150,7 @@ foreach (StructuresCalculation calculation in failureMechanism.Calculations.Cast>()) { affectedItems.AddRange(RiskeerCommonDataSynchronizationService.ClearCalculationOutput(calculation) - .Concat(ClearHydraulicBoundaryLocation(calculation.InputParameters))); + .Concat(ClearHydraulicBoundaryLocation(calculation.InputParameters))); } return affectedItems; Index: Riskeer/HeightStructures/test/Riskeer.HeightStructures.Data.Test/HeightStructuresFailureMechanismAssemblyFactoryTest.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -re7f074df2c06a1c0b7d628f75dd87f0552d11e08 --- Riskeer/HeightStructures/test/Riskeer.HeightStructures.Data.Test/HeightStructuresFailureMechanismAssemblyFactoryTest.cs (.../HeightStructuresFailureMechanismAssemblyFactoryTest.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/HeightStructures/test/Riskeer.HeightStructures.Data.Test/HeightStructuresFailureMechanismAssemblyFactoryTest.cs (.../HeightStructuresFailureMechanismAssemblyFactoryTest.cs) (revision e7f074df2c06a1c0b7d628f75dd87f0552d11e08) @@ -24,18 +24,18 @@ using Core.Common.TestUtil; using NUnit.Framework; using Rhino.Mocks; -using Riskeer.Common.Data.AssemblyTool; -using Riskeer.Common.Data.AssessmentSection; -using Riskeer.Common.Data.Exceptions; -using Riskeer.Common.Data.FailureMechanism; -using Riskeer.Common.Data.TestUtil; -using Riskeer.Common.Primitives; using Riskeer.AssemblyTool.Data; using Riskeer.AssemblyTool.Data.TestUtil; using Riskeer.AssemblyTool.KernelWrapper.Calculators; using Riskeer.AssemblyTool.KernelWrapper.Calculators.Assembly; using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators; using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators.Assembly; +using Riskeer.Common.Data.AssemblyTool; +using Riskeer.Common.Data.AssessmentSection; +using Riskeer.Common.Data.Exceptions; +using Riskeer.Common.Data.FailureMechanism; +using Riskeer.Common.Data.TestUtil; +using Riskeer.Common.Primitives; namespace Riskeer.HeightStructures.Data.Test { Index: Riskeer/HeightStructures/test/Riskeer.HeightStructures.Forms.Test/Factories/HeightStructuresAssemblyMapDataFeaturesFactoryTest.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -re7f074df2c06a1c0b7d628f75dd87f0552d11e08 --- Riskeer/HeightStructures/test/Riskeer.HeightStructures.Forms.Test/Factories/HeightStructuresAssemblyMapDataFeaturesFactoryTest.cs (.../HeightStructuresAssemblyMapDataFeaturesFactoryTest.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/HeightStructures/test/Riskeer.HeightStructures.Forms.Test/Factories/HeightStructuresAssemblyMapDataFeaturesFactoryTest.cs (.../HeightStructuresAssemblyMapDataFeaturesFactoryTest.cs) (revision e7f074df2c06a1c0b7d628f75dd87f0552d11e08) @@ -25,15 +25,15 @@ using Core.Components.Gis.Features; using NUnit.Framework; using Rhino.Mocks; +using Riskeer.AssemblyTool.Data; +using Riskeer.AssemblyTool.KernelWrapper.Calculators; +using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators; +using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators.Assembly; using Riskeer.Common.Data.AssessmentSection; using Riskeer.Common.Data.TestUtil; using Riskeer.Common.Forms.TestUtil; using Riskeer.HeightStructures.Data; using Riskeer.HeightStructures.Forms.Factories; -using Riskeer.AssemblyTool.Data; -using Riskeer.AssemblyTool.KernelWrapper.Calculators; -using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators; -using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators.Assembly; namespace Riskeer.HeightStructures.Forms.Test.Factories { Index: Riskeer/HeightStructures/test/Riskeer.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismResultViewTest.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -re7f074df2c06a1c0b7d628f75dd87f0552d11e08 --- Riskeer/HeightStructures/test/Riskeer.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismResultViewTest.cs (.../HeightStructuresFailureMechanismResultViewTest.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/HeightStructures/test/Riskeer.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismResultViewTest.cs (.../HeightStructuresFailureMechanismResultViewTest.cs) (revision e7f074df2c06a1c0b7d628f75dd87f0552d11e08) @@ -26,6 +26,10 @@ using NUnit.Extensions.Forms; using NUnit.Framework; using Rhino.Mocks; +using Riskeer.AssemblyTool.Data; +using Riskeer.AssemblyTool.KernelWrapper.Calculators; +using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators; +using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators.Assembly; using Riskeer.Common.Data.AssessmentSection; using Riskeer.Common.Data.Structures; using Riskeer.Common.Data.TestUtil; @@ -35,10 +39,6 @@ using Riskeer.Common.Primitives; using Riskeer.HeightStructures.Data; using Riskeer.HeightStructures.Forms.Views; -using Riskeer.AssemblyTool.Data; -using Riskeer.AssemblyTool.KernelWrapper.Calculators; -using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators; -using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators.Assembly; namespace Riskeer.HeightStructures.Forms.Test.Views { Index: Riskeer/HeightStructures/test/Riskeer.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismSectionResultRowTest.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -re7f074df2c06a1c0b7d628f75dd87f0552d11e08 --- Riskeer/HeightStructures/test/Riskeer.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismSectionResultRowTest.cs (.../HeightStructuresFailureMechanismSectionResultRowTest.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/HeightStructures/test/Riskeer.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismSectionResultRowTest.cs (.../HeightStructuresFailureMechanismSectionResultRowTest.cs) (revision e7f074df2c06a1c0b7d628f75dd87f0552d11e08) @@ -27,6 +27,10 @@ using Core.Common.TestUtil; using NUnit.Framework; using Rhino.Mocks; +using Riskeer.AssemblyTool.Data; +using Riskeer.AssemblyTool.KernelWrapper.Calculators; +using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators; +using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators.Assembly; using Riskeer.Common.Data.AssessmentSection; using Riskeer.Common.Data.Calculation; using Riskeer.Common.Data.FailureMechanism; @@ -40,10 +44,6 @@ using Riskeer.HeightStructures.Data; using Riskeer.HeightStructures.Data.TestUtil; using Riskeer.HeightStructures.Forms.Views; -using Riskeer.AssemblyTool.Data; -using Riskeer.AssemblyTool.KernelWrapper.Calculators; -using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators; -using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators.Assembly; namespace Riskeer.HeightStructures.Forms.Test.Views { Index: Riskeer/HeightStructures/test/Riskeer.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismViewTest.cs =================================================================== diff -u -r528b27af049364e9311a2bef5aeea3aeaa2e9725 -re7f074df2c06a1c0b7d628f75dd87f0552d11e08 --- Riskeer/HeightStructures/test/Riskeer.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismViewTest.cs (.../HeightStructuresFailureMechanismViewTest.cs) (revision 528b27af049364e9311a2bef5aeea3aeaa2e9725) +++ Riskeer/HeightStructures/test/Riskeer.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismViewTest.cs (.../HeightStructuresFailureMechanismViewTest.cs) (revision e7f074df2c06a1c0b7d628f75dd87f0552d11e08) @@ -32,6 +32,10 @@ using Core.Components.Gis.Geometries; using NUnit.Framework; using Rhino.Mocks; +using Riskeer.AssemblyTool.Data; +using Riskeer.AssemblyTool.KernelWrapper.Calculators; +using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators; +using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators.Assembly; using Riskeer.Common.Data.AssessmentSection; using Riskeer.Common.Data.FailureMechanism; using Riskeer.Common.Data.Hydraulics; @@ -42,10 +46,6 @@ using Riskeer.HeightStructures.Data; using Riskeer.HeightStructures.Data.TestUtil; using Riskeer.HeightStructures.Forms.Views; -using Riskeer.AssemblyTool.Data; -using Riskeer.AssemblyTool.KernelWrapper.Calculators; -using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators; -using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators.Assembly; namespace Riskeer.HeightStructures.Forms.Test.Views { Index: Riskeer/HeightStructures/test/Riskeer.HeightStructures.Integration.Test/HeightStructuresCalculationActivityIntegrationTest.cs =================================================================== diff -u -rde2a41facaef85d77289bbf08d1c69440ecb50bd -re7f074df2c06a1c0b7d628f75dd87f0552d11e08 --- Riskeer/HeightStructures/test/Riskeer.HeightStructures.Integration.Test/HeightStructuresCalculationActivityIntegrationTest.cs (.../HeightStructuresCalculationActivityIntegrationTest.cs) (revision de2a41facaef85d77289bbf08d1c69440ecb50bd) +++ Riskeer/HeightStructures/test/Riskeer.HeightStructures.Integration.Test/HeightStructuresCalculationActivityIntegrationTest.cs (.../HeightStructuresCalculationActivityIntegrationTest.cs) (revision e7f074df2c06a1c0b7d628f75dd87f0552d11e08) @@ -36,12 +36,12 @@ using Riskeer.HeightStructures.Data; using Riskeer.HeightStructures.Data.TestUtil; using Riskeer.HeightStructures.Service; -using Riskeer.Integration.TestUtil; using Riskeer.HydraRing.Calculation.Calculator.Factory; using Riskeer.HydraRing.Calculation.Data.Input; using Riskeer.HydraRing.Calculation.Data.Input.Structures; using Riskeer.HydraRing.Calculation.TestUtil.Calculator; using Riskeer.Integration.Data; +using Riskeer.Integration.TestUtil; namespace Riskeer.HeightStructures.Integration.Test { Index: Riskeer/HeightStructures/test/Riskeer.HeightStructures.Integration.Test/HeightStructuresScenariosViewIntegrationTest.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -re7f074df2c06a1c0b7d628f75dd87f0552d11e08 --- Riskeer/HeightStructures/test/Riskeer.HeightStructures.Integration.Test/HeightStructuresScenariosViewIntegrationTest.cs (.../HeightStructuresScenariosViewIntegrationTest.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/HeightStructures/test/Riskeer.HeightStructures.Integration.Test/HeightStructuresScenariosViewIntegrationTest.cs (.../HeightStructuresScenariosViewIntegrationTest.cs) (revision e7f074df2c06a1c0b7d628f75dd87f0552d11e08) @@ -37,8 +37,8 @@ using Riskeer.HeightStructures.Forms.Views; using Riskeer.HeightStructures.IO; using Riskeer.HeightStructures.Plugin.FileImporters; -using Riskeer.Integration.TestUtil; using Riskeer.Integration.Data; +using Riskeer.Integration.TestUtil; namespace Riskeer.HeightStructures.Integration.Test { Index: Riskeer/HeightStructures/test/Riskeer.HeightStructures.Plugin.Test/UpdateInfos/HeightStructuresContextUpdateInfoTest.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -re7f074df2c06a1c0b7d628f75dd87f0552d11e08 --- Riskeer/HeightStructures/test/Riskeer.HeightStructures.Plugin.Test/UpdateInfos/HeightStructuresContextUpdateInfoTest.cs (.../HeightStructuresContextUpdateInfoTest.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/HeightStructures/test/Riskeer.HeightStructures.Plugin.Test/UpdateInfos/HeightStructuresContextUpdateInfoTest.cs (.../HeightStructuresContextUpdateInfoTest.cs) (revision e7f074df2c06a1c0b7d628f75dd87f0552d11e08) @@ -47,17 +47,6 @@ private UpdateInfo updateInfo; private HeightStructuresPlugin plugin; - public override void Setup() - { - plugin = new HeightStructuresPlugin(); - updateInfo = plugin.GetUpdateInfos().First(i => i.DataType == typeof(HeightStructuresContext)); - } - - public override void TearDown() - { - plugin.Dispose(); - } - [Test] public void Name_Always_ReturnExpectedName() { @@ -264,5 +253,16 @@ Assert.IsInstanceOf(importer); mocks.VerifyAll(); } + + public override void Setup() + { + plugin = new HeightStructuresPlugin(); + updateInfo = plugin.GetUpdateInfos().First(i => i.DataType == typeof(HeightStructuresContext)); + } + + public override void TearDown() + { + plugin.Dispose(); + } } } \ No newline at end of file