[mapguide-commits] r5302 - in trunk/MgDev: Server/src/PostBuild
Server/src/UnitTesting UnitTest/TestData/MappingService
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Wed Oct 20 04:55:48 EDT 2010
Author: hubu
Date: 2010-10-20 01:55:48 -0700 (Wed, 20 Oct 2010)
New Revision: 5302
Added:
trunk/MgDev/UnitTest/TestData/MappingService/UT_PoweredByMapGuide.wdf
trunk/MgDev/UnitTest/TestData/MappingService/UT_SheboyganWithWatermark.mdf
Modified:
trunk/MgDev/Server/src/PostBuild/PostBuild.mak
trunk/MgDev/Server/src/UnitTesting/TestRenderingService.cpp
trunk/MgDev/Server/src/UnitTesting/TestRenderingService.h
Log:
On behalf of: Spark Liu
Adding unit test for rendering watermark in rendering service.
A new map definition and watermark definition is added for testing watermark rendering.
The watermark is a "Powered by MapGuide" text with tile position.
The output of rendering will be put at "UnitTestFiles\RenderMapWithWatermark12k.png" and "UnitTestFiles\RenderMapWithWatermark75k.png".
Modified: trunk/MgDev/Server/src/PostBuild/PostBuild.mak
===================================================================
--- trunk/MgDev/Server/src/PostBuild/PostBuild.mak 2010-10-20 08:22:09 UTC (rev 5301)
+++ trunk/MgDev/Server/src/PostBuild/PostBuild.mak 2010-10-20 08:55:48 UTC (rev 5302)
@@ -177,6 +177,8 @@
..\..\bin\UnitTestFiles\UT_NoLegend.pl \
..\..\bin\UnitTestFiles\UT_SymbolMart.sl \
..\..\bin\UnitTestFiles\UT_Symbols.dwf \
+ ..\..\bin\UnitTestFiles\UT_SheboyganWithWatermark.mdf \
+ ..\..\bin\UnitTestFiles\UT_PoweredByMapGuide.wdf \
..\..\bin\UnitTestFiles\UT_Sheboygan.mdf \
..\..\bin\UnitTestFiles\UT_HydrographicPolygons.sdf \
..\..\bin\UnitTestFiles\UT_HydrographicPolygons.fs \
@@ -426,6 +428,8 @@
..\..\bin\UnitTestFiles\UT_NoLegend.pl \
..\..\bin\UnitTestFiles\UT_SymbolMart.sl \
..\..\bin\UnitTestFiles\UT_Symbols.dwf \
+ ..\..\bin\UnitTestFiles\UT_SheboyganWithWatermark.mdf \
+ ..\..\bin\UnitTestFiles\UT_PoweredByMapGuide.wdf \
..\..\bin\UnitTestFiles\UT_Sheboygan.mdf \
..\..\bin\UnitTestFiles\UT_HydrographicPolygons.sdf \
..\..\bin\UnitTestFiles\UT_HydrographicPolygons.fs \
@@ -675,6 +679,8 @@
..\..\bin\UnitTestFiles\UT_NoLegend.pl \
..\..\bin\UnitTestFiles\UT_SymbolMart.sl \
..\..\bin\UnitTestFiles\UT_Symbols.dwf \
+ ..\..\bin\UnitTestFiles\UT_SheboyganWithWatermark.mdf \
+ ..\..\bin\UnitTestFiles\UT_PoweredByMapGuide.wdf \
..\..\bin\UnitTestFiles\UT_Sheboygan.mdf \
..\..\bin\UnitTestFiles\UT_HydrographicPolygons.sdf \
..\..\bin\UnitTestFiles\UT_HydrographicPolygons.fs \
@@ -924,6 +930,8 @@
..\..\bin\UnitTestFiles\UT_NoLegend.pl \
..\..\bin\UnitTestFiles\UT_SymbolMart.sl \
..\..\bin\UnitTestFiles\UT_Symbols.dwf \
+ ..\..\bin\UnitTestFiles\UT_SheboyganWithWatermark.mdf \
+ ..\..\bin\UnitTestFiles\UT_PoweredByMapGuide.wdf \
..\..\bin\UnitTestFiles\UT_Sheboygan.mdf \
..\..\bin\UnitTestFiles\UT_HydrographicPolygons.sdf \
..\..\bin\UnitTestFiles\UT_HydrographicPolygons.fs \
@@ -1046,6 +1054,8 @@
if EXIST ..\..\bin\UnitTestFiles\UT_NoLegend.pl del /F ..\..\bin\UnitTestFiles\UT_NoLegend.pl
if EXIST ..\..\bin\UnitTestFiles\UT_SymbolMart.sl del /F ..\..\bin\UnitTestFiles\UT_SymbolMart.sl
if EXIST ..\..\bin\UnitTestFiles\UT_Symbols.dwf del /F ..\..\bin\UnitTestFiles\UT_Symbols.dwf
+ if EXIST ..\..\bin\UnitTestFiles\UT_SheboyganWithWatermark.mdf del /F ..\..\bin\UnitTestFiles\UT_SheboyganWithWatermark.mdf
+ if EXIST ..\..\bin\UnitTestFiles\UT_PoweredByMapGuide.wdf del /F ..\..\bin\UnitTestFiles\UT_PoweredByMapGuide.wdf
if EXIST ..\..\bin\UnitTestFiles\UT_Sheboygan.mdf del /F ..\..\bin\UnitTestFiles\UT_Sheboygan.mdf
if EXIST ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.sdf del /F ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.sdf
if EXIST ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.fs del /F ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.fs
@@ -1163,6 +1173,8 @@
if EXIST ..\..\bin\UnitTestFiles\UT_NoLegend.pl del /F ..\..\bin\UnitTestFiles\UT_NoLegend.pl
if EXIST ..\..\bin\UnitTestFiles\UT_SymbolMart.sl del /F ..\..\bin\UnitTestFiles\UT_SymbolMart.sl
if EXIST ..\..\bin\UnitTestFiles\UT_Symbols.dwf del /F ..\..\bin\UnitTestFiles\UT_Symbols.dwf
+ if EXIST ..\..\bin\UnitTestFiles\UT_SheboyganWithWatermark.mdf del /F ..\..\bin\UnitTestFiles\UT_SheboyganWithWatermark.mdf
+ if EXIST ..\..\bin\UnitTestFiles\UT_PoweredByMapGuide.wdf del /F ..\..\bin\UnitTestFiles\UT_PoweredByMapGuide.wdf
if EXIST ..\..\bin\UnitTestFiles\UT_Sheboygan.mdf del /F ..\..\bin\UnitTestFiles\UT_Sheboygan.mdf
if EXIST ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.sdf del /F ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.sdf
if EXIST ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.fs del /F ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.fs
@@ -1280,6 +1292,8 @@
if EXIST ..\..\bin\UnitTestFiles\UT_NoLegend.pl del /F ..\..\bin\UnitTestFiles\UT_NoLegend.pl
if EXIST ..\..\bin\UnitTestFiles\UT_SymbolMart.sl del /F ..\..\bin\UnitTestFiles\UT_SymbolMart.sl
if EXIST ..\..\bin\UnitTestFiles\UT_Symbols.dwf del /F ..\..\bin\UnitTestFiles\UT_Symbols.dwf
+ if EXIST ..\..\bin\UnitTestFiles\UT_SheboyganWithWatermark.mdf del /F ..\..\bin\UnitTestFiles\UT_SheboyganWithWatermark.mdf
+ if EXIST ..\..\bin\UnitTestFiles\UT_PoweredByMapGuide.wdf del /F ..\..\bin\UnitTestFiles\UT_PoweredByMapGuide.wdf
if EXIST ..\..\bin\UnitTestFiles\UT_Sheboygan.mdf del /F ..\..\bin\UnitTestFiles\UT_Sheboygan.mdf
if EXIST ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.sdf del /F ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.sdf
if EXIST ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.fs del /F ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.fs
@@ -1396,6 +1410,8 @@
if EXIST ..\..\bin\UnitTestFiles\UT_NoLegend.pl del /F ..\..\bin\UnitTestFiles\UT_NoLegend.pl
if EXIST ..\..\bin\UnitTestFiles\UT_SymbolMart.sl del /F ..\..\bin\UnitTestFiles\UT_SymbolMart.sl
if EXIST ..\..\bin\UnitTestFiles\UT_Symbols.dwf del /F ..\..\bin\UnitTestFiles\UT_Symbols.dwf
+ if EXIST ..\..\bin\UnitTestFiles\UT_SheboyganWithWatermark.mdf del /F ..\..\bin\UnitTestFiles\UT_SheboyganWithWatermark.mdf
+ if EXIST ..\..\bin\UnitTestFiles\UT_PoweredByMapGuide.wdf del /F ..\..\bin\UnitTestFiles\UT_PoweredByMapGuide.wdf
if EXIST ..\..\bin\UnitTestFiles\UT_Sheboygan.mdf del /F ..\..\bin\UnitTestFiles\UT_Sheboygan.mdf
if EXIST ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.sdf del /F ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.sdf
if EXIST ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.fs del /F ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.fs
@@ -1485,6 +1501,8 @@
"..\..\..\UnitTest\TestData\MappingService\UT_NoLegend.pl" :
"..\..\..\UnitTest\TestData\MappingService\UT_SymbolMart.sl" :
"..\..\..\UnitTest\TestData\MappingService\UT_Symbols.dwf" :
+"..\..\..\UnitTest\TestData\MappingService\UT_SheboyganWithWatermark.mdf" :
+"..\..\..\UnitTest\TestData\MappingService\UT_PoweredByMapGuide.wdf" :
"..\..\..\UnitTest\TestData\MappingService\UT_Sheboygan.mdf" :
"..\..\..\UnitTest\TestData\MappingService\UT_HydrographicPolygons.sdf" :
"..\..\..\UnitTest\TestData\MappingService\UT_HydrographicPolygons.fs" :
@@ -1646,6 +1664,14 @@
if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
if EXIST "..\..\..\UnitTest\TestData\MappingService\UT_Symbols.dwf" xcopy /r /d /y "..\..\..\UnitTest\TestData\MappingService\UT_Symbols.dwf" ..\..\bin\UnitTestFiles\
+..\..\bin\UnitTestFiles\UT_SheboyganWithWatermark.mdf : "..\..\..\UnitTest\TestData\MappingService\UT_SheboyganWithWatermark.mdf"
+ if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
+ if EXIST "..\..\..\UnitTest\TestData\MappingService\UT_SheboyganWithWatermark.mdf" xcopy /r /d /y "..\..\..\UnitTest\TestData\MappingService\UT_SheboyganWithWatermark.mdf" ..\..\bin\UnitTestFiles\
+
+..\..\bin\UnitTestFiles\UT_PoweredByMapGuide.wdf : "..\..\..\UnitTest\TestData\MappingService\UT_PoweredByMapGuide.wdf"
+ if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
+ if EXIST "..\..\..\UnitTest\TestData\MappingService\UT_PoweredByMapGuide.wdf" xcopy /r /d /y "..\..\..\UnitTest\TestData\MappingService\UT_PoweredByMapGuide.wdf" ..\..\bin\UnitTestFiles\
+
..\..\bin\UnitTestFiles\UT_Sheboygan.mdf : "..\..\..\UnitTest\TestData\MappingService\UT_Sheboygan.mdf"
if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
if EXIST "..\..\..\UnitTest\TestData\MappingService\UT_Sheboygan.mdf" xcopy /r /d /y "..\..\..\UnitTest\TestData\MappingService\UT_Sheboygan.mdf" ..\..\bin\UnitTestFiles\
Modified: trunk/MgDev/Server/src/UnitTesting/TestRenderingService.cpp
===================================================================
--- trunk/MgDev/Server/src/UnitTesting/TestRenderingService.cpp 2010-10-20 08:22:09 UTC (rev 5301)
+++ trunk/MgDev/Server/src/UnitTesting/TestRenderingService.cpp 2010-10-20 08:55:48 UTC (rev 5302)
@@ -312,6 +312,19 @@
Ptr<MgByteReader> sdrdr5 = sdsrc5->GetReader();
m_svcResource->SetResource(sdres5, sdrdr5, NULL);
+ // For watermark test
+ // publish the map definition
+ Ptr<MgResourceIdentifier> mapres12 = new MgResourceIdentifier(L"Library://UnitTests/Maps/SheboyganWithWatermark.MapDefinition");
+ Ptr<MgByteSource> mdfsrc12 = new MgByteSource(L"../UnitTestFiles/UT_SheboyganWithWatermark.mdf", false);
+ Ptr<MgByteReader> mdfrdr12 = mdfsrc12->GetReader();
+ m_svcResource->SetResource(mapres12, mdfrdr12, NULL);
+
+ // publish the watermark definition
+ Ptr<MgResourceIdentifier> wdfres1 = new MgResourceIdentifier(L"Library://UnitTests/Watermarks/PoweredByMapGuide.WatermarkDefinition");
+ Ptr<MgByteSource> wdfsrc1 = new MgByteSource(L"../UnitTestFiles/UT_PoweredByMapGuide.wdf", false);
+ Ptr<MgByteReader> wdfrdr1 = wdfsrc1->GetReader();
+ m_svcResource->SetResource(wdfres1, wdfrdr1, NULL);
+
}
catch (MgException* e)
{
@@ -420,6 +433,11 @@
m_svcResource->DeleteResource(ldfres11);
Ptr<MgResourceIdentifier> sdres5 = new MgResourceIdentifier(L"Library://UnitTests/Symbols/AreaSymbol.SymbolDefinition");
m_svcResource->DeleteResource(sdres5);
+
+ Ptr<MgResourceIdentifier> mapres12 = new MgResourceIdentifier(L"Library://UnitTests/Maps/SheboyganWithWatermark.MapDefinition");
+ m_svcResource->DeleteResource(mapres12);
+ Ptr<MgResourceIdentifier> wdfres1 = new MgResourceIdentifier(L"Library://UnitTests/Watermarks/PoweredByMapGuide.WatermarkDefinition");
+ m_svcResource->DeleteResource(wdfres1);
#ifdef _DEBUG
MgFdoConnectionManager* pFdoConnectionManager = MgFdoConnectionManager::GetInstance();
@@ -521,7 +539,35 @@
}
}
+void TestRenderingService::TestCase_RenderMapWithWatermark()
+{
+ try
+ {
+ // make a runtime map
+ Ptr<MgMap> map = CreateTestMapWithWatermark();
+ // call the API using scales of 75000 and 12000
+ map->SetViewScale(75000.0);
+ Ptr<MgByteReader> rdr1 = m_svcRendering->RenderMap(map, NULL, L"PNG");
+ rdr1->ToFile(L"../UnitTestFiles/RenderMapWithWatermark75k.png");
+
+ map->SetViewScale(12000.0);
+ Ptr<MgByteReader> rdr2 = m_svcRendering->RenderMap(map, NULL, L"PNG");
+ rdr2->ToFile(L"../UnitTestFiles/RenderMapWithWatermark12k.png");
+ }
+ catch (MgException* e)
+ {
+ STRING message = e->GetDetails(TEST_LOCALE);
+ SAFE_RELEASE(e);
+ CPPUNIT_FAIL(MG_WCHAR_TO_CHAR(message.c_str()));
+ }
+ catch (...)
+ {
+ throw;
+ }
+}
+
+
void TestRenderingService::TestCase_RenderLegend()
{
try
@@ -624,7 +670,23 @@
}
}
+MgMap* TestRenderingService::CreateTestMapWithWatermark()
+{
+ Ptr<MgResourceIdentifier> mdfres = new MgResourceIdentifier(L"Library://UnitTests/Maps/SheboyganWithWatermark.MapDefinition");
+ MgMap* map = new MgMap(m_siteConnection);
+ map->Create(mdfres, L"UnitTestSheboyganWithWatermark");
+ Ptr<MgCoordinate> coordNewCenter = new MgCoordinateXY(-87.733253, 43.746199);
+ Ptr<MgPoint> ptNewCenter = new MgPoint(coordNewCenter);
+ map->SetViewCenter(ptNewCenter);
+ map->SetViewScale(75000.0);
+ map->SetDisplayDpi(96);
+ map->SetDisplayWidth(1024);
+ map->SetDisplayHeight(1024);
+
+ return map;
+}
+
MgMap* TestRenderingService::CreateTestMap()
{
Ptr<MgResourceIdentifier> mdfres = new MgResourceIdentifier(L"Library://UnitTests/Maps/Sheboygan.MapDefinition");
Modified: trunk/MgDev/Server/src/UnitTesting/TestRenderingService.h
===================================================================
--- trunk/MgDev/Server/src/UnitTesting/TestRenderingService.h 2010-10-20 08:22:09 UTC (rev 5301)
+++ trunk/MgDev/Server/src/UnitTesting/TestRenderingService.h 2010-10-20 08:55:48 UTC (rev 5302)
@@ -37,6 +37,7 @@
CPPUNIT_TEST(TestCase_RenderDynamicOverlay);
CPPUNIT_TEST(TestCase_RenderMap);
+ CPPUNIT_TEST(TestCase_RenderMapWithWatermark);
CPPUNIT_TEST(TestCase_RenderLegend);
CPPUNIT_TEST(TestCase_QueryFeatures);
@@ -56,6 +57,7 @@
void TestCase_RenderDynamicOverlay();
void TestCase_RenderMap();
+ void TestCase_RenderMapWithWatermark();
void TestCase_RenderLegend();
void TestCase_QueryFeatures();
@@ -73,6 +75,7 @@
private:
MgMap* CreateTestMap();
+ MgMap* CreateTestMapWithWatermark();
MgPolygon* CreateSelectionPolygon(MgMap* map, double width, double height);
private:
Added: trunk/MgDev/UnitTest/TestData/MappingService/UT_PoweredByMapGuide.wdf
===================================================================
--- trunk/MgDev/UnitTest/TestData/MappingService/UT_PoweredByMapGuide.wdf (rev 0)
+++ trunk/MgDev/UnitTest/TestData/MappingService/UT_PoweredByMapGuide.wdf 2010-10-20 08:55:48 UTC (rev 5302)
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<WatermarkDefinition xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xsi:noNamespaceSchemaLocation="WatermarkDefinition-2.3.0.xsd" version="2.3.0">
+ <Content>
+ <SimpleSymbolDefinition>
+ <Name>Watermark Text</Name>
+ <Graphics>
+ <Text>
+ <Content>'Powered by
+MapGuide'</Content>
+ <FontName>'Times New Roman'</FontName>
+ <Bold>True</Bold>
+ <Italic>True</Italic>
+ <Underlined>True</Underlined>
+ <Height>6.35</Height>
+ <HorizontalAlignment>'Left'</HorizontalAlignment>
+ <TextColor>0xFF800000</TextColor>
+ </Text>
+ </Graphics>
+ <PointUsage />
+ <ParameterDefinition />
+ </SimpleSymbolDefinition>
+ </Content>
+ <Appearance>
+ <Transparency>34</Transparency>
+ </Appearance>
+ <Position>
+ <TilePosition>
+ <TileWidth>300</TileWidth>
+ <TileHeight>300</TileHeight>
+ <HorizontalPosition>
+ <Offset>20</Offset>
+ <Unit>Pixels</Unit>
+ <Alignment>Left</Alignment>
+ </HorizontalPosition>
+ <VerticalPosition>
+ <Offset>20</Offset>
+ <Unit>Pixels</Unit>
+ <Alignment>Top</Alignment>
+ </VerticalPosition>
+ </TilePosition>
+ </Position>
+</WatermarkDefinition>
\ No newline at end of file
Property changes on: trunk/MgDev/UnitTest/TestData/MappingService/UT_PoweredByMapGuide.wdf
___________________________________________________________________
Added: svn:eol-style
+ native
Added: trunk/MgDev/UnitTest/TestData/MappingService/UT_SheboyganWithWatermark.mdf
===================================================================
--- trunk/MgDev/UnitTest/TestData/MappingService/UT_SheboyganWithWatermark.mdf (rev 0)
+++ trunk/MgDev/UnitTest/TestData/MappingService/UT_SheboyganWithWatermark.mdf 2010-10-20 08:55:48 UTC (rev 5302)
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<MapDefinition xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="MapDefinition-2.3.0.xsd" version="2.3.0">
+ <Name>New Map</Name>
+ <CoordinateSystem>GEOGCS["WGS84 Lat/Long's, Degrees, -180 ==> +180",DATUM["D_WGS_1984",SPHEROID["World_Geodetic_System_of_1984",6378137,298.257222932867]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]]</CoordinateSystem>
+ <Extents>
+ <MinX>-87.770746109180749</MinX>
+ <MaxX>-87.6957605384125</MaxX>
+ <MinY>43.686899685828813</MinY>
+ <MaxY>43.805498742206247</MaxY>
+ </Extents>
+ <BackgroundColor>FFFFFFFF</BackgroundColor>
+ <MapLayer>
+ <Name>Rail</Name>
+ <ResourceId>Library://UnitTests/Layers/Rail.LayerDefinition</ResourceId>
+ <Selectable>true</Selectable>
+ <ShowInLegend>true</ShowInLegend>
+ <LegendLabel>Rail</LegendLabel>
+ <ExpandInLegend>true</ExpandInLegend>
+ <Visible>true</Visible>
+ <Group />
+ </MapLayer>
+ <MapLayer>
+ <Name>HydrographicPolygons</Name>
+ <ResourceId>Library://UnitTests/Layers/HydrographicPolygons.LayerDefinition</ResourceId>
+ <Selectable>true</Selectable>
+ <ShowInLegend>true</ShowInLegend>
+ <LegendLabel>HydrographicPolygons</LegendLabel>
+ <ExpandInLegend>true</ExpandInLegend>
+ <Visible>true</Visible>
+ <Group />
+ </MapLayer>
+ <MapLayer>
+ <Name>Parcels</Name>
+ <ResourceId>Library://UnitTests/Layers/Parcels.LayerDefinition</ResourceId>
+ <Selectable>true</Selectable>
+ <ShowInLegend>true</ShowInLegend>
+ <LegendLabel>Parcels</LegendLabel>
+ <ExpandInLegend>true</ExpandInLegend>
+ <Visible>true</Visible>
+ <Group />
+ </MapLayer>
+ <Watermarks>
+ <Watermark>
+ <Name>Watermark example</Name>
+ <ResourceId>Library://UnitTests/Watermarks/PoweredByMapGuide.WatermarkDefinition</ResourceId>
+ </Watermark>
+</Watermarks>
+</MapDefinition>
Property changes on: trunk/MgDev/UnitTest/TestData/MappingService/UT_SheboyganWithWatermark.mdf
___________________________________________________________________
Added: svn:eol-style
+ native
More information about the mapguide-commits
mailing list