Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/BackgroundMapDataContainerTest.cs =================================================================== diff -u -r9f3f7c10efcf38e5b49973744e52307ddda3c0f7 -r3014d0ced22c45300938639e7958ea0850485240 --- Ringtoets/Common/test/Ringtoets.Common.Data.Test/BackgroundMapDataContainerTest.cs (.../BackgroundMapDataContainerTest.cs) (revision 9f3f7c10efcf38e5b49973744e52307ddda3c0f7) +++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/BackgroundMapDataContainerTest.cs (.../BackgroundMapDataContainerTest.cs) (revision 3014d0ced22c45300938639e7958ea0850485240) @@ -38,7 +38,7 @@ var container = new BackgroundMapDataContainer(); // Assert - Assert.IsNull(container.BackgroundMapData); + Assert.IsNull(container.MapData); Assert.IsTrue(container.IsVisible); Assert.AreEqual(2, container.Transparency.NumberOfDecimalPlaces); Assert.AreEqual(0, container.Transparency.Value); @@ -54,23 +54,22 @@ var container = new BackgroundMapDataContainer(); // Call - container.Transparency = (RoundedDouble)newValue; + container.Transparency = (RoundedDouble) newValue; // Assert Assert.AreEqual(newValue, container.Transparency); } - [Test] - public void Transparency_WithBackgroundMapData_MapDataTransparencyUpdated() + public void Transparency_WithMapData_MapDataTransparencyUpdated() { // Setup var mocks = new MockRepository(); var backgroundMapData = mocks.Stub("A"); mocks.ReplayAll(); var container = new BackgroundMapDataContainer(); - container.BackgroundMapData = backgroundMapData; + container.MapData = backgroundMapData; // Call container.Transparency = (RoundedDouble) 0.5; @@ -92,15 +91,14 @@ var container = new BackgroundMapDataContainer(); // Call - TestDelegate call = () => container.Transparency = (RoundedDouble)invalidTransparency; + TestDelegate call = () => container.Transparency = (RoundedDouble) invalidTransparency; // Assert var message = "De transparantie moet in het bereik [0.0, 1.0] liggen."; string paramName = TestHelper.AssertThrowsArgumentExceptionAndTestMessage(call, message).ParamName; Assert.AreEqual("value", paramName); } - [Test] [TestCase(true)] [TestCase(false)] @@ -116,11 +114,10 @@ Assert.AreEqual(newValue, container.IsVisible); } - [Test] [TestCase(true)] [TestCase(false)] - public void IsVisible_WithBackgroundMapData_MapDataIsVisibleUpdated(bool isVisible) + public void IsVisible_WithMapData_MapDataIsVisibleUpdated(bool isVisible) { // Setup var mocks = new MockRepository(); @@ -129,7 +126,7 @@ var container = new BackgroundMapDataContainer { - BackgroundMapData = imageBasedMapData + MapData = imageBasedMapData }; // Call @@ -143,7 +140,7 @@ [Test] [TestCase(true, 0.5)] [TestCase(false, 0.8)] - public void BackgroundMapData_SetNewValue_GetNewValueAndInitializePreconfiguration(bool isVisible, double transparency) + public void MapData_SetNewValue_GetNewValueAndInitializePreconfiguration(bool isVisible, double transparency) { // Setup var mocks = new MockRepository(); @@ -153,16 +150,16 @@ var container = new BackgroundMapDataContainer { IsVisible = isVisible, - Transparency = (RoundedDouble)transparency + Transparency = (RoundedDouble) transparency }; // Call - container.BackgroundMapData = imageBasedMapData; + container.MapData = imageBasedMapData; // Assert Assert.AreEqual(container.Transparency, imageBasedMapData.Transparency); Assert.AreEqual(container.IsVisible, imageBasedMapData.IsVisible); - Assert.AreSame(imageBasedMapData, container.BackgroundMapData); + Assert.AreSame(imageBasedMapData, container.MapData); mocks.VerifyAll(); } }