Index: Core/Components/test/Core.Components.BruTile.TestUtil.Test/TestTileSourceFactoryTest.cs =================================================================== diff -u -rfcf14f1da32f6de8d99c7f446ec27fbe30a6abe8 -r5d1ba8e775518ad95b38ec59c147d939bca4ee49 --- Core/Components/test/Core.Components.BruTile.TestUtil.Test/TestTileSourceFactoryTest.cs (.../TestTileSourceFactoryTest.cs) (revision fcf14f1da32f6de8d99c7f446ec27fbe30a6abe8) +++ Core/Components/test/Core.Components.BruTile.TestUtil.Test/TestTileSourceFactoryTest.cs (.../TestTileSourceFactoryTest.cs) (revision 5d1ba8e775518ad95b38ec59c147d939bca4ee49) @@ -100,6 +100,21 @@ } [Test] + public void GetWellKnownTileSources_NotInitialized_ThrowsNotSupportedException() + { + // Setup + WmtsMapData mapData = WmtsMapData.CreateUnconnectedMapData(); + var factory = new TestTileSourceFactory(mapData); + + // Call + TestDelegate test = () => factory.GetKnownTileSources(KnownTileSource.BingHybrid); + + // Assert + string message = Assert.Throws(test).Message; + Assert.AreEqual("use TestTileSourceFactory() to set the expected well known tile source", message); + } + + [Test] public void GetWellKnownTileSources_FromConfiguredWellKnownTileSourceMapData_ReturnTileSource() { // Setup Index: Core/Components/test/Core.Components.BruTile.TestUtil/TestTileSourceFactory.cs =================================================================== diff -u -rfcf14f1da32f6de8d99c7f446ec27fbe30a6abe8 -r5d1ba8e775518ad95b38ec59c147d939bca4ee49 --- Core/Components/test/Core.Components.BruTile.TestUtil/TestTileSourceFactory.cs (.../TestTileSourceFactory.cs) (revision fcf14f1da32f6de8d99c7f446ec27fbe30a6abe8) +++ Core/Components/test/Core.Components.BruTile.TestUtil/TestTileSourceFactory.cs (.../TestTileSourceFactory.cs) (revision 5d1ba8e775518ad95b38ec59c147d939bca4ee49) @@ -19,6 +19,7 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. +using System; using System.Collections.Generic; using BruTile; using BruTile.Predefined; @@ -70,6 +71,10 @@ public ITileSource GetKnownTileSources(KnownTileSource knownTileSource) { + if (wellKnownTileSource == null) + { + throw new NotSupportedException("use TestTileSourceFactory() to set the expected well known tile source"); + } return wellKnownTileSource; } } Index: Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/BackgroundDataTestDataGeneratorTest.cs =================================================================== diff -u -r26af58f85567c97bc68cc744a25334c2bd0b0fca -r5d1ba8e775518ad95b38ec59c147d939bca4ee49 --- Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/BackgroundDataTestDataGeneratorTest.cs (.../BackgroundDataTestDataGeneratorTest.cs) (revision 26af58f85567c97bc68cc744a25334c2bd0b0fca) +++ Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/BackgroundDataTestDataGeneratorTest.cs (.../BackgroundDataTestDataGeneratorTest.cs) (revision 5d1ba8e775518ad95b38ec59c147d939bca4ee49) @@ -75,7 +75,7 @@ // Assert Assert.AreEqual(BackgroundMapDataType.WellKnown, backgroundData.BackgroundMapDataType); - Assert.AreEqual("BingAerial", backgroundData.Name); + Assert.AreEqual("Bing Maps - Satelliet", backgroundData.Name); Assert.IsTrue(backgroundData.IsConfigured); Assert.IsTrue(backgroundData.IsVisible); Assert.AreEqual(0, backgroundData.Transparency.Value); Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Ringtoets.Common.Forms.Test.csproj =================================================================== diff -u -r650ed7277d1de02c544ed73e34ea7bd997d320fc -r5d1ba8e775518ad95b38ec59c147d939bca4ee49 --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Ringtoets.Common.Forms.Test.csproj (.../Ringtoets.Common.Forms.Test.csproj) (revision 650ed7277d1de02c544ed73e34ea7bd997d320fc) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Ringtoets.Common.Forms.Test.csproj (.../Ringtoets.Common.Forms.Test.csproj) (revision 5d1ba8e775518ad95b38ec59c147d939bca4ee49) @@ -39,6 +39,7 @@ MinimumRecommendedRules.ruleset + ..\..\..\..\packages\NUnit.3.6.0\lib\net40\nunit.framework.dll True Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/RingtoetsMapControlTest.cs =================================================================== diff -u -r26af58f85567c97bc68cc744a25334c2bd0b0fca -r5d1ba8e775518ad95b38ec59c147d939bca4ee49 --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/RingtoetsMapControlTest.cs (.../RingtoetsMapControlTest.cs) (revision 26af58f85567c97bc68cc744a25334c2bd0b0fca) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/RingtoetsMapControlTest.cs (.../RingtoetsMapControlTest.cs) (revision 5d1ba8e775518ad95b38ec59c147d939bca4ee49) @@ -19,11 +19,14 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using System; using System.Collections.Generic; +using System.Linq; +using BruTile; +using BruTile.Predefined; using Core.Common.Base; using Core.Common.Base.Data; using Core.Common.Gui.TestUtil.Settings; +using Core.Components.BruTile.Configurations; using Core.Components.BruTile.TestUtil; using Core.Components.DotSpatial.Forms; using Core.Components.Gis.Data; @@ -38,6 +41,20 @@ [TestFixture] public class RingtoetsMapControlTest { + private static IEnumerable BackgroundTypes + { + get + { + yield return new TestCaseData(BackgroundDataTestDataGenerator.GetWellKnownBackgroundMapData(), + BackgroundDataTestDataGenerator.GetWmtsBackgroundMapData(WmtsMapData.CreateDefaultPdokMapData())) + .SetName("WellKnownToWmts"); + + yield return new TestCaseData(BackgroundDataTestDataGenerator.GetWmtsBackgroundMapData(WmtsMapData.CreateDefaultPdokMapData()), + BackgroundDataTestDataGenerator.GetWellKnownBackgroundMapData()) + .SetName("WmtsToWellKnown"); + } + } + [Test] public void Constructor_ExpectedValues() { @@ -106,10 +123,25 @@ // Given var mocks = new MockRepository(); var observer = mocks.StrictMock(); + var tileSourceFactory = mocks.StrictMock(); + + var testWellKnownTileSource = new TestWellKnownTileSource(new WellKnownTileSourceMapData(WellKnownTileSource.BingAerial)); + if (originalBackgroundData.BackgroundMapDataType == BackgroundMapDataType.WellKnown && newBackgroundData.BackgroundMapDataType == BackgroundMapDataType.Wmts) + { + tileSourceFactory.Expect(tsf => tsf.GetKnownTileSources(KnownTileSource.BingAerial)).Return(testWellKnownTileSource); + tileSourceFactory.Expect(tsf => tsf.GetWmtsTileSources(newBackgroundData.Parameters[BackgroundDataIdentifiers.SourceCapabilitiesUrl])) + .Return(Enumerable.Empty()); + } + else if (originalBackgroundData.BackgroundMapDataType == BackgroundMapDataType.Wmts && newBackgroundData.BackgroundMapDataType == BackgroundMapDataType.WellKnown) + { + tileSourceFactory.Expect(tsf => tsf.GetWmtsTileSources(originalBackgroundData.Parameters[BackgroundDataIdentifiers.SourceCapabilitiesUrl])) + .Return(Enumerable.Empty()); + tileSourceFactory.Expect(tsf => tsf.GetKnownTileSources(KnownTileSource.BingAerial)).Return(testWellKnownTileSource); + } mocks.ReplayAll(); using (new UseCustomSettingsHelper(new TestSettingsHelper())) - using (new UseCustomTileSourceFactoryConfig(WmtsMapData.CreateDefaultPdokMapData())) + using (new UseCustomTileSourceFactoryConfig(tileSourceFactory)) { var control = new RingtoetsMapControl { @@ -175,19 +207,5 @@ mocks.VerifyAll(); } } - - private static IEnumerable BackgroundTypes - { - get - { - yield return new TestCaseData(BackgroundDataTestDataGenerator.GetWellKnownBackgroundMapData(), - BackgroundDataTestDataGenerator.GetWmtsBackgroundMapData(WmtsMapData.CreateDefaultPdokMapData())) - .SetName("WellKnownToWmts"); - - yield return new TestCaseData(BackgroundDataTestDataGenerator.GetWmtsBackgroundMapData(WmtsMapData.CreateDefaultPdokMapData()), - BackgroundDataTestDataGenerator.GetWellKnownBackgroundMapData()) - .SetName("WmtsToWellKnown"); - } - } } } \ No newline at end of file