Index: Riskeer/Common/src/Riskeer.Common.Forms/Factories/AssemblyMapDataFactory.cs
===================================================================
diff -u -r79e08dab2ccc7817a35c79d422d6915c427ed908 -r0fd89ca862752d22af9e6543f05f891ef7c6380a
--- Riskeer/Common/src/Riskeer.Common.Forms/Factories/AssemblyMapDataFactory.cs (.../AssemblyMapDataFactory.cs) (revision 79e08dab2ccc7817a35c79d422d6915c427ed908)
+++ Riskeer/Common/src/Riskeer.Common.Forms/Factories/AssemblyMapDataFactory.cs (.../AssemblyMapDataFactory.cs) (revision 0fd89ca862752d22af9e6543f05f891ef7c6380a)
@@ -34,25 +34,20 @@
private const LineDashStyle lineDashStyle = LineDashStyle.Solid;
///
- /// Creates a with default styling for assembly results.
+ /// Creates a with default styling for failure mechanism section assembly results.
///
/// The created .
- public static MapLineData CreateAssemblyMapData()
+ public static MapLineData CreateFailureMechanismSectionAssemblyMapData()
{
- return CreateAssemblyMapLineData(Resources.AssemblyCategoryPerSection_DisplayName, true);
- }
-
- private static MapLineData CreateAssemblyMapLineData(string name, bool isVisible)
- {
- return new MapLineData(name, new LineStyle
+ return new MapLineData(Resources.AssemblyCategoryPerSection_DisplayName, new LineStyle
{
Width = lineWidth,
DashStyle = lineDashStyle
},
MapThemeFactory.CreateDisplayFailureMechanismAssemblyCategoryGroupMapTheme())
{
SelectedMetaDataAttribute = Resources.AssemblyGroup_DisplayName,
- IsVisible = isVisible
+ IsVisible = true
};
}
}
Index: Riskeer/Common/src/Riskeer.Common.Forms/MapLayers/NonCalculatableFailureMechanismSectionResultsMapLayer.cs
===================================================================
diff -u -r8658d36cc32a7af5ea898721e85abe5985b52fb1 -r0fd89ca862752d22af9e6543f05f891ef7c6380a
--- Riskeer/Common/src/Riskeer.Common.Forms/MapLayers/NonCalculatableFailureMechanismSectionResultsMapLayer.cs (.../NonCalculatableFailureMechanismSectionResultsMapLayer.cs) (revision 8658d36cc32a7af5ea898721e85abe5985b52fb1)
+++ Riskeer/Common/src/Riskeer.Common.Forms/MapLayers/NonCalculatableFailureMechanismSectionResultsMapLayer.cs (.../NonCalculatableFailureMechanismSectionResultsMapLayer.cs) (revision 0fd89ca862752d22af9e6543f05f891ef7c6380a)
@@ -67,7 +67,7 @@
CreateObservers();
- MapData = AssemblyMapDataFactory.CreateAssemblyMapData();
+ MapData = AssemblyMapDataFactory.CreateFailureMechanismSectionAssemblyMapData();
SetFeatures();
}
Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/Factories/AssemblyMapDataFactoryTest.cs
===================================================================
diff -u -rdcf0daecff8fe9d5f20f78226b88a8da9f8f2c96 -r0fd89ca862752d22af9e6543f05f891ef7c6380a
--- Riskeer/Common/test/Riskeer.Common.Forms.Test/Factories/AssemblyMapDataFactoryTest.cs (.../AssemblyMapDataFactoryTest.cs) (revision dcf0daecff8fe9d5f20f78226b88a8da9f8f2c96)
+++ Riskeer/Common/test/Riskeer.Common.Forms.Test/Factories/AssemblyMapDataFactoryTest.cs (.../AssemblyMapDataFactoryTest.cs) (revision 0fd89ca862752d22af9e6543f05f891ef7c6380a)
@@ -32,23 +32,18 @@
public class AssemblyMapDataFactoryTest
{
[Test]
- public void CreateAssemblyMapData_ReturnsEmptyMapLineDataWithExpectedStyling()
+ public void CreateFailureMechanismSectionAssemblyMapData_Always_ReturnsEmptyMapLineDataWithExpectedStyling()
{
// Call
- MapLineData data = AssemblyMapDataFactory.CreateAssemblyMapData();
+ MapLineData data = AssemblyMapDataFactory.CreateFailureMechanismSectionAssemblyMapData();
// Assert
- AssertAssemblyMapLineData("Duidingsklasse per vak", true, data);
+ CollectionAssert.IsEmpty(data.Features);
+ Assert.AreEqual("Duidingsklasse per vak", data.Name);
+ Assert.AreEqual(true, data.IsVisible);
+ Assert.AreEqual("Duidingsklasse", data.SelectedMetaDataAttribute);
+ RiskeerMapDataFactoryTestHelper.AssertEqualStyle(data.Style, Color.Empty, 6, LineDashStyle.Solid);
+ MapThemeTestHelper.AssertDisplayFailureMechanismSectionAssemblyGroupMapTheme(data.Theme);
}
-
- private static void AssertAssemblyMapLineData(string expectedName, bool expectedVisibility, MapLineData actualMapLineData)
- {
- CollectionAssert.IsEmpty(actualMapLineData.Features);
- Assert.AreEqual(expectedName, actualMapLineData.Name);
- Assert.AreEqual(expectedVisibility, actualMapLineData.IsVisible);
- Assert.AreEqual("Duidingsklasse", actualMapLineData.SelectedMetaDataAttribute);
- RiskeerMapDataFactoryTestHelper.AssertEqualStyle(actualMapLineData.Style, Color.Empty, 6, LineDashStyle.Solid);
- MapThemeTestHelper.AssertDisplayFailureMechanismSectionAssemblyGroupMapTheme(actualMapLineData.Theme);
- }
}
}
\ No newline at end of file