Index: Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/BackgroundDataTestDataGeneratorTest.cs
===================================================================
diff -u
--- Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/BackgroundDataTestDataGeneratorTest.cs (revision 0)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/BackgroundDataTestDataGeneratorTest.cs (revision 0c0f67f67e9e0928a5dd756914167d1d23615187)
@@ -0,0 +1,30 @@
+// Copyright (C) Stichting Deltares 2016. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see .
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using NUnit.Framework;
+
+namespace Ringtoets.Common.Data.TestUtil.Test
+{
+ [TestFixture]
+ public class BackgroundDataTestDataGeneratorTest
+ {
+ }
+}
\ No newline at end of file
Index: Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/Ringtoets.Common.Data.TestUtil.Test.csproj
===================================================================
diff -u -r6a5d7b40b7ba4dcb73e393075338352d194e97c2 -r0c0f67f67e9e0928a5dd756914167d1d23615187
--- Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/Ringtoets.Common.Data.TestUtil.Test.csproj (.../Ringtoets.Common.Data.TestUtil.Test.csproj) (revision 6a5d7b40b7ba4dcb73e393075338352d194e97c2)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/Ringtoets.Common.Data.TestUtil.Test.csproj (.../Ringtoets.Common.Data.TestUtil.Test.csproj) (revision 0c0f67f67e9e0928a5dd756914167d1d23615187)
@@ -54,6 +54,7 @@
Properties\GlobalAssembly.cs
+
Index: Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/BackgroundDataTestDataGenerator.cs
===================================================================
diff -u
--- Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/BackgroundDataTestDataGenerator.cs (revision 0)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/BackgroundDataTestDataGenerator.cs (revision 0c0f67f67e9e0928a5dd756914167d1d23615187)
@@ -0,0 +1,58 @@
+// Copyright (C) Stichting Deltares 2016. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see .
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using Core.Components.Gis.Data;
+using Ringtoets.Common.Data.AssessmentSection;
+
+namespace Ringtoets.Common.Data.TestUtil
+{
+ public static class BackgroundDataTestDataGenerator
+ {
+ public static BackgroundData GetWmtsBackgroundMapData(WmtsMapData wmtsMapData)
+ {
+ var backgroundMapData = new BackgroundData
+ {
+ Name = wmtsMapData.Name,
+ IsVisible = wmtsMapData.IsVisible,
+ IsConfigured = wmtsMapData.IsConfigured,
+ Transparency = wmtsMapData.Transparency,
+ BackgroundMapDataType = BackgroundMapDataType.Wmts
+ };
+
+ if (wmtsMapData.IsConfigured)
+ {
+ backgroundMapData.Parameters["SourceCapabilitiesUrl"] = wmtsMapData.SourceCapabilitiesUrl;
+ backgroundMapData.Parameters["SelectedCapabilityIdentifier"] = wmtsMapData.SelectedCapabilityIdentifier;
+ backgroundMapData.Parameters["PreferredFormat"] = wmtsMapData.PreferredFormat;
+ }
+
+ return backgroundMapData;
+ }
+
+ public static BackgroundData GetWellKnownBackgroundMapData()
+ {
+ return new BackgroundData
+ {
+ BackgroundMapDataType = BackgroundMapDataType.WellKnown
+ };
+ }
+ }
+}
Fisheye: Tag 0c0f67f67e9e0928a5dd756914167d1d23615187 refers to a dead (removed) revision in file `Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/BackgroundMapDataTestDataGenerator.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Index: Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/Ringtoets.Common.Data.TestUtil.csproj
===================================================================
diff -u -rb519fc798c63691f04bb8008b562a94ed9232d51 -r0c0f67f67e9e0928a5dd756914167d1d23615187
--- Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/Ringtoets.Common.Data.TestUtil.csproj (.../Ringtoets.Common.Data.TestUtil.csproj) (revision b519fc798c63691f04bb8008b562a94ed9232d51)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/Ringtoets.Common.Data.TestUtil.csproj (.../Ringtoets.Common.Data.TestUtil.csproj) (revision 0c0f67f67e9e0928a5dd756914167d1d23615187)
@@ -54,7 +54,7 @@
Properties\GlobalAssembly.cs
-
+
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/RingtoetsBackgroundMapDataFactoryTest.cs
===================================================================
diff -u -r250899bf76acee45d411a95377d8a021a0977a75 -r0c0f67f67e9e0928a5dd756914167d1d23615187
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/RingtoetsBackgroundMapDataFactoryTest.cs (.../RingtoetsBackgroundMapDataFactoryTest.cs) (revision 250899bf76acee45d411a95377d8a021a0977a75)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/RingtoetsBackgroundMapDataFactoryTest.cs (.../RingtoetsBackgroundMapDataFactoryTest.cs) (revision 0c0f67f67e9e0928a5dd756914167d1d23615187)
@@ -47,7 +47,7 @@
public void CreateBackgroundMapData_BackgroundMapDataTypeWellKnown_ReturnNull()
{
// Setup
- BackgroundData backgroundData = BackgroundMapDataTestDataGenerator.GetWellKnownBackgroundMapData();
+ BackgroundData backgroundData = BackgroundDataTestDataGenerator.GetWellKnownBackgroundMapData();
// Call
WmtsMapData mapData = RingtoetsBackgroundMapDataFactory.CreateBackgroundMapData(backgroundData);
@@ -61,7 +61,7 @@
{
// Setup
WmtsMapData wmtsMapData = WmtsMapData.CreateDefaultPdokMapData();
- BackgroundData backgroundData = BackgroundMapDataTestDataGenerator.GetWmtsBackgroundMapData(wmtsMapData);
+ BackgroundData backgroundData = BackgroundDataTestDataGenerator.GetWmtsBackgroundMapData(wmtsMapData);
// Call
WmtsMapData mapData = RingtoetsBackgroundMapDataFactory.CreateBackgroundMapData(backgroundData);
@@ -81,7 +81,7 @@
{
// Setup
WmtsMapData wmtsMapData = WmtsMapData.CreateUnconnectedMapData();
- BackgroundData backgroundData = BackgroundMapDataTestDataGenerator.GetWmtsBackgroundMapData(wmtsMapData);
+ BackgroundData backgroundData = BackgroundDataTestDataGenerator.GetWmtsBackgroundMapData(wmtsMapData);
// Call
WmtsMapData mapData = RingtoetsBackgroundMapDataFactory.CreateBackgroundMapData(backgroundData);
@@ -123,7 +123,7 @@
{
// Setup
WmtsMapData wmtsMapData = WmtsMapData.CreateDefaultPdokMapData();
- BackgroundData backgroundData = BackgroundMapDataTestDataGenerator.GetWellKnownBackgroundMapData();
+ BackgroundData backgroundData = BackgroundDataTestDataGenerator.GetWellKnownBackgroundMapData();
string originalName = wmtsMapData.Name;
bool originalVisibility = wmtsMapData.IsVisible;
@@ -147,7 +147,7 @@
{
// Setup
WmtsMapData wmtsMapData = WmtsMapData.CreateDefaultPdokMapData();
- BackgroundData backgroundData = BackgroundMapDataTestDataGenerator.GetWmtsBackgroundMapData(wmtsMapData);
+ BackgroundData backgroundData = BackgroundDataTestDataGenerator.GetWmtsBackgroundMapData(wmtsMapData);
string originalSourceCapabilitiesUrl = backgroundData.Parameters["SourceCapabilitiesUrl"];
string originalSelectedCapabilityIdentifier = backgroundData.Parameters["SelectedCapabilityIdentifier"];
@@ -171,7 +171,7 @@
{
// Given
WmtsMapData wmtsMapData = WmtsMapData.CreateDefaultPdokMapData();
- BackgroundData backgroundData = BackgroundMapDataTestDataGenerator.GetWmtsBackgroundMapData(wmtsMapData);
+ BackgroundData backgroundData = BackgroundDataTestDataGenerator.GetWmtsBackgroundMapData(wmtsMapData);
// Precondition
Assert.IsNotNull(wmtsMapData.SourceCapabilitiesUrl);
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/BackgroundDataTreeNodeInfoTest.cs
===================================================================
diff -u -r0e50500bb017c821970b286992f14b03dca0e69d -r0c0f67f67e9e0928a5dd756914167d1d23615187
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/BackgroundDataTreeNodeInfoTest.cs (.../BackgroundDataTreeNodeInfoTest.cs) (revision 0e50500bb017c821970b286992f14b03dca0e69d)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/BackgroundDataTreeNodeInfoTest.cs (.../BackgroundDataTreeNodeInfoTest.cs) (revision 0c0f67f67e9e0928a5dd756914167d1d23615187)
@@ -119,7 +119,7 @@
public void ForeColor_ConnectedMapData_ReturnControlText()
{
WmtsMapData mapData = WmtsMapData.CreateDefaultPdokMapData();
- BackgroundData backgroundData = BackgroundMapDataTestDataGenerator.GetWmtsBackgroundMapData(mapData);
+ BackgroundData backgroundData = BackgroundDataTestDataGenerator.GetWmtsBackgroundMapData(mapData);
using (var plugin = new RingtoetsPlugin())
{
@@ -137,7 +137,7 @@
public void ForeColor_UnconnectedMapData_ReturnGrayText()
{
WmtsMapData mapData = WmtsMapData.CreateUnconnectedMapData();
- BackgroundData backgroundData = BackgroundMapDataTestDataGenerator.GetWmtsBackgroundMapData(mapData);
+ BackgroundData backgroundData = BackgroundDataTestDataGenerator.GetWmtsBackgroundMapData(mapData);
using (var plugin = new RingtoetsPlugin())
{
@@ -251,7 +251,7 @@
backgroundMapDataObserver.Expect(o => o.UpdateObserver());
WmtsMapData mapData = WmtsMapData.CreateUnconnectedMapData();
- BackgroundData backgroundData = BackgroundMapDataTestDataGenerator.GetWmtsBackgroundMapData(mapData);
+ BackgroundData backgroundData = BackgroundDataTestDataGenerator.GetWmtsBackgroundMapData(mapData);
using (var treeViewControl = new TreeViewControl())
using (var plugin = new RingtoetsPlugin())
@@ -362,7 +362,7 @@
WmtsMapData mapData = WmtsMapData.CreateUnconnectedMapData();
WmtsMapData newMapData = WmtsMapData.CreateDefaultPdokMapData();
- var newBackgroundMapdata = BackgroundMapDataTestDataGenerator.GetWmtsBackgroundMapData(newMapData);
+ var newBackgroundMapdata = BackgroundDataTestDataGenerator.GetWmtsBackgroundMapData(newMapData);
var assessmentSection = new ObservableTestAssessmentSectionStub();
@@ -487,8 +487,8 @@
var backgroundMapDataObserver = mockRepository.StrictMock();
WmtsMapData mapData = WmtsMapData.CreateUnconnectedMapData();
- BackgroundData backgroundData = BackgroundMapDataTestDataGenerator.GetWmtsBackgroundMapData(mapData);
- BackgroundData newBackgroundData = BackgroundMapDataTestDataGenerator.GetWmtsBackgroundMapData(WmtsMapData.CreateDefaultPdokMapData());
+ BackgroundData backgroundData = BackgroundDataTestDataGenerator.GetWmtsBackgroundMapData(mapData);
+ BackgroundData newBackgroundData = BackgroundDataTestDataGenerator.GetWmtsBackgroundMapData(WmtsMapData.CreateDefaultPdokMapData());
using (var treeViewControl = new TreeViewControl())
using (var plugin = new RingtoetsPlugin())