[mapguide-commits] r7042 - branches/2.4/MgDev/Server/src/UnitTesting
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Mon Sep 24 22:04:23 PDT 2012
Author: jng
Date: 2012-09-24 22:04:23 -0700 (Mon, 24 Sep 2012)
New Revision: 7042
Modified:
branches/2.4/MgDev/Server/src/UnitTesting/TestRenderingService.cpp
branches/2.4/MgDev/Server/src/UnitTesting/TestRenderingService.h
Log:
#2128: Parameterize the rendering output tests, allowing us to give all supported image formats a good workout.
Modified: branches/2.4/MgDev/Server/src/UnitTesting/TestRenderingService.cpp
===================================================================
--- branches/2.4/MgDev/Server/src/UnitTesting/TestRenderingService.cpp 2012-09-21 14:45:33 UTC (rev 7041)
+++ branches/2.4/MgDev/Server/src/UnitTesting/TestRenderingService.cpp 2012-09-25 05:04:23 UTC (rev 7042)
@@ -469,7 +469,7 @@
}
-void TestRenderingService::TestCase_RenderDynamicOverlay()
+void TestRenderingService::TestCase_RenderDynamicOverlay(CREFSTRING imageFormat, CREFSTRING extension)
{
try
{
@@ -483,16 +483,16 @@
// for (int i=0; i<10; i++)
// {
- Ptr<MgByteReader> rdr1 = m_svcRendering->RenderDynamicOverlay(map, NULL, L"PNG");
- rdr1->ToFile(L"../UnitTestFiles/RenderDynamicOverlay75k.png");
+ Ptr<MgByteReader> rdr1 = m_svcRendering->RenderDynamicOverlay(map, NULL, imageFormat);
+ rdr1->ToFile(GetPath(L"../UnitTestFiles/RenderDynamicOverlay75k", imageFormat, extension));
// }
map->SetViewScale(12000.0);
// for (int i=0; i<100; i++)
// {
- Ptr<MgByteReader> rdr2 = m_svcRendering->RenderDynamicOverlay(map, NULL, L"PNG");
- rdr2->ToFile(L"../UnitTestFiles/RenderDynamicOverlay12k.png");
+ Ptr<MgByteReader> rdr2 = m_svcRendering->RenderDynamicOverlay(map, NULL, imageFormat);
+ rdr2->ToFile(GetPath(L"../UnitTestFiles/RenderDynamicOverlay12k", imageFormat, extension));
// }
// clock_t t1 = clock();
@@ -511,7 +511,7 @@
}
-void TestRenderingService::TestCase_RenderMap()
+void TestRenderingService::TestCase_RenderMap(CREFSTRING imageFormat, CREFSTRING extension)
{
try
{
@@ -520,12 +520,12 @@
// 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/RenderMap75k.png");
+ Ptr<MgByteReader> rdr1 = m_svcRendering->RenderMap(map, NULL, imageFormat);
+ rdr1->ToFile(GetPath(L"../UnitTestFiles/RenderMap75k", imageFormat, extension));
map->SetViewScale(12000.0);
- Ptr<MgByteReader> rdr2 = m_svcRendering->RenderMap(map, NULL, L"PNG");
- rdr2->ToFile(L"../UnitTestFiles/RenderMap12k.png");
+ Ptr<MgByteReader> rdr2 = m_svcRendering->RenderMap(map, NULL, imageFormat);
+ rdr2->ToFile(GetPath(L"../UnitTestFiles/RenderMap12k", imageFormat, extension));
}
catch (MgException* e)
{
@@ -539,7 +539,7 @@
}
}
-void TestRenderingService::TestCase_RenderMapWithWatermark()
+void TestRenderingService::TestCase_RenderMapWithWatermark(CREFSTRING imageFormat, CREFSTRING extension)
{
try
{
@@ -548,12 +548,12 @@
// 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");
+ Ptr<MgByteReader> rdr1 = m_svcRendering->RenderMap(map, NULL, imageFormat);
+ rdr1->ToFile(GetPath(L"../UnitTestFiles/RenderMapWithWatermark75k", imageFormat, extension));
map->SetViewScale(12000.0);
- Ptr<MgByteReader> rdr2 = m_svcRendering->RenderMap(map, NULL, L"PNG");
- rdr2->ToFile(L"../UnitTestFiles/RenderMapWithWatermark12k.png");
+ Ptr<MgByteReader> rdr2 = m_svcRendering->RenderMap(map, NULL, imageFormat);
+ rdr2->ToFile(GetPath(L"../UnitTestFiles/RenderMapWithWatermark12k", imageFormat, extension));
}
catch (MgException* e)
{
@@ -568,7 +568,7 @@
}
-void TestRenderingService::TestCase_RenderLegend()
+void TestRenderingService::TestCase_RenderLegend(CREFSTRING imageFormat, CREFSTRING extension)
{
try
{
@@ -579,12 +579,12 @@
Ptr<MgColor> bgc = new MgColor(255, 255, 255, 255);
map->SetViewScale(75000.0);
- Ptr<MgByteReader> rdr1 = m_svcRendering->RenderMapLegend(map, 200, 400, bgc, L"PNG");
- rdr1->ToFile(L"../UnitTestFiles/RenderLegend75k.png");
+ Ptr<MgByteReader> rdr1 = m_svcRendering->RenderMapLegend(map, 200, 400, bgc, imageFormat);
+ rdr1->ToFile(GetPath(L"../UnitTestFiles/RenderLegend75k", imageFormat, extension));
map->SetViewScale(12000.0);
- Ptr<MgByteReader> rdr2 = m_svcRendering->RenderMapLegend(map, 200, 400, bgc, L"PNG");
- rdr2->ToFile(L"../UnitTestFiles/RenderLegend12k.png");
+ Ptr<MgByteReader> rdr2 = m_svcRendering->RenderMapLegend(map, 200, 400, bgc, imageFormat);
+ rdr2->ToFile(GetPath(L"../UnitTestFiles/RenderLegend12k", imageFormat, extension));
// add a layer group
Ptr<MgLayerGroupCollection> layerGroups = map->GetLayerGroups();
@@ -607,18 +607,18 @@
//Re-draw at 75k. Layer group should not be there because it has no visible layers
map->SetViewScale(75000.0);
- Ptr<MgByteReader> rdr3 = m_svcRendering->RenderMapLegend(map, 200, 400, bgc, L"PNG");
- rdr3->ToFile(L"../UnitTestFiles/RenderLegend75kWithEmptyLayerGroup.png");
+ Ptr<MgByteReader> rdr3 = m_svcRendering->RenderMapLegend(map, 200, 400, bgc, imageFormat);
+ rdr3->ToFile(GetPath(L"../UnitTestFiles/RenderLegend75kWithEmptyLayerGroup", imageFormat, extension));
//Re-draw at 14000. Layer group should still not be there because it has no visible layers
map->SetViewScale(14000.0);
- Ptr<MgByteReader> rdr4 = m_svcRendering->RenderMapLegend(map, 200, 400, bgc, L"PNG");
- rdr4->ToFile(L"../UnitTestFiles/RenderLegend14kWithEmptyLayerGroup.png");
+ Ptr<MgByteReader> rdr4 = m_svcRendering->RenderMapLegend(map, 200, 400, bgc, imageFormat);
+ rdr4->ToFile(GetPath(L"../UnitTestFiles/RenderLegend14kWithEmptyLayerGroup", imageFormat, extension));
//Re-draw at 12000. Layer group should now be there because its child layer (Parcels) should be visible
map->SetViewScale(12000.0);
- Ptr<MgByteReader> rdr5 = m_svcRendering->RenderMapLegend(map, 200, 400, bgc, L"PNG");
- rdr5->ToFile(L"../UnitTestFiles/RenderLegend12kWithLayerGroup.png");
+ Ptr<MgByteReader> rdr5 = m_svcRendering->RenderMapLegend(map, 200, 400, bgc, imageFormat);
+ rdr5->ToFile(GetPath(L"../UnitTestFiles/RenderLegend12kWithLayerGroup", imageFormat, extension));
}
catch (MgException* e)
{
@@ -732,7 +732,7 @@
}
-void TestRenderingService::TestCase_SymbologyPoints()
+void TestRenderingService::TestCase_SymbologyPoints(CREFSTRING imageFormat, CREFSTRING extension)
{
try
{
@@ -757,8 +757,8 @@
map->SetViewScale(scale);
// call the API
- Ptr<MgByteReader> rdr = m_svcRendering->RenderMap(map, NULL, L"PNG");
- rdr->ToFile(L"../UnitTestFiles/SymbologyPoints.png");
+ Ptr<MgByteReader> rdr = m_svcRendering->RenderMap(map, NULL, imageFormat);
+ rdr->ToFile(GetPath(L"../UnitTestFiles/SymbologyPoints", imageFormat, extension));
}
catch (MgException* e)
{
@@ -769,7 +769,7 @@
}
-void TestRenderingService::TestCase_SymbologyPointsParam()
+void TestRenderingService::TestCase_SymbologyPointsParam(CREFSTRING imageFormat, CREFSTRING extension)
{
try
{
@@ -794,8 +794,8 @@
map->SetViewScale(scale);
// call the API
- Ptr<MgByteReader> rdr = m_svcRendering->RenderMap(map, NULL, L"PNG");
- rdr->ToFile(L"../UnitTestFiles/SymbologyPointsParam.png");
+ Ptr<MgByteReader> rdr = m_svcRendering->RenderMap(map, NULL, imageFormat);
+ rdr->ToFile(GetPath(L"../UnitTestFiles/SymbologyPointsParam", imageFormat, extension));
}
catch (MgException* e)
{
@@ -806,7 +806,7 @@
}
-void TestRenderingService::TestCase_SymbologyLines()
+void TestRenderingService::TestCase_SymbologyLines(CREFSTRING imageFormat, CREFSTRING extension)
{
try
{
@@ -831,8 +831,8 @@
map->SetViewScale(scale);
// call the API
- Ptr<MgByteReader> rdr = m_svcRendering->RenderMap(map, NULL, L"PNG");
- rdr->ToFile(L"../UnitTestFiles/SymbologyLines.png");
+ Ptr<MgByteReader> rdr = m_svcRendering->RenderMap(map, NULL, imageFormat);
+ rdr->ToFile(GetPath(L"../UnitTestFiles/SymbologyLines", imageFormat, extension));
}
catch (MgException* e)
{
@@ -843,7 +843,7 @@
}
-void TestRenderingService::TestCase_SymbologyLinesCrossTick()
+void TestRenderingService::TestCase_SymbologyLinesCrossTick(CREFSTRING imageFormat, CREFSTRING extension)
{
try
{
@@ -868,8 +868,8 @@
map->SetViewScale(scale);
// call the API
- Ptr<MgByteReader> rdr = m_svcRendering->RenderMap(map, NULL, L"PNG");
- rdr->ToFile(L"../UnitTestFiles/SymbologyLinesCrossTick.png");
+ Ptr<MgByteReader> rdr = m_svcRendering->RenderMap(map, NULL, imageFormat);
+ rdr->ToFile(GetPath(L"../UnitTestFiles/SymbologyLinesCrossTick", imageFormat, extension));
}
catch (MgException* e)
{
@@ -880,7 +880,7 @@
}
-void TestRenderingService::TestCase_Annotation1()
+void TestRenderingService::TestCase_Annotation1(CREFSTRING imageFormat, CREFSTRING extension)
{
try
{
@@ -905,8 +905,8 @@
map->SetViewScale(scale);
// call the API
- Ptr<MgByteReader> rdr = m_svcRendering->RenderMap(map, NULL, L"PNG");
- rdr->ToFile(L"../UnitTestFiles/Annotation1.png");
+ Ptr<MgByteReader> rdr = m_svcRendering->RenderMap(map, NULL, imageFormat);
+ rdr->ToFile(GetPath(L"../UnitTestFiles/Annotation1", imageFormat, extension));
}
catch (MgException* e)
{
@@ -917,7 +917,7 @@
}
-void TestRenderingService::TestCase_Annotation2()
+void TestRenderingService::TestCase_Annotation2(CREFSTRING imageFormat, CREFSTRING extension)
{
try
{
@@ -942,8 +942,8 @@
map->SetViewScale(scale);
// call the API
- Ptr<MgByteReader> rdr = m_svcRendering->RenderMap(map, NULL, L"PNG");
- rdr->ToFile(L"../UnitTestFiles/Annotation2.png");
+ Ptr<MgByteReader> rdr = m_svcRendering->RenderMap(map, NULL, imageFormat);
+ rdr->ToFile(GetPath(L"../UnitTestFiles/Annotation2", imageFormat, extension));
}
catch (MgException* e)
{
@@ -954,7 +954,7 @@
}
-void TestRenderingService::TestCase_Annotation3()
+void TestRenderingService::TestCase_Annotation3(CREFSTRING imageFormat, CREFSTRING extension)
{
try
{
@@ -979,8 +979,8 @@
map->SetViewScale(scale);
// call the API
- Ptr<MgByteReader> rdr = m_svcRendering->RenderMap(map, NULL, L"PNG");
- rdr->ToFile(L"../UnitTestFiles/Annotation3.png");
+ Ptr<MgByteReader> rdr = m_svcRendering->RenderMap(map, NULL, imageFormat);
+ rdr->ToFile(GetPath(L"../UnitTestFiles/Annotation3", imageFormat, extension));
}
catch (MgException* e)
{
@@ -991,7 +991,7 @@
}
-void TestRenderingService::TestCase_SymbologyPolygons()
+void TestRenderingService::TestCase_SymbologyPolygons(CREFSTRING imageFormat, CREFSTRING extension)
{
try
{
@@ -1008,8 +1008,8 @@
map->SetDisplayHeight(1024);
map->SetViewScale(12000.0);
- Ptr<MgByteReader> rdr2 = m_svcRendering->RenderMap(map, NULL, L"PNG");
- rdr2->ToFile(L"../UnitTestFiles/SymbologyPolygons.png");
+ Ptr<MgByteReader> rdr2 = m_svcRendering->RenderMap(map, NULL, imageFormat);
+ rdr2->ToFile(GetPath(L"../UnitTestFiles/SymbologyPolygons", imageFormat, extension));
}
catch (MgException* e)
{
@@ -1019,6 +1019,16 @@
}
}
+STRING TestRenderingService::GetPath(CREFSTRING basePath, CREFSTRING imageFormat, CREFSTRING extension)
+{
+ STRING ret;
+ ret += basePath;
+ ret += L"_";
+ ret += imageFormat;
+ ret += L".";
+ ret += extension;
+ return ret;
+}
//void TestRenderingService::TestCase_RendererPerformance()
//{
Modified: branches/2.4/MgDev/Server/src/UnitTesting/TestRenderingService.h
===================================================================
--- branches/2.4/MgDev/Server/src/UnitTesting/TestRenderingService.h 2012-09-21 14:45:33 UTC (rev 7041)
+++ branches/2.4/MgDev/Server/src/UnitTesting/TestRenderingService.h 2012-09-25 05:04:23 UTC (rev 7042)
@@ -25,20 +25,66 @@
CPPUNIT_TEST_SUITE(TestRenderingService);
CPPUNIT_TEST(TestStart); // This must be the very first unit test
- CPPUNIT_TEST(TestCase_SymbologyPoints);
- CPPUNIT_TEST(TestCase_SymbologyPointsParam);
- CPPUNIT_TEST(TestCase_SymbologyLines);
- CPPUNIT_TEST(TestCase_SymbologyLinesCrossTick);
- CPPUNIT_TEST(TestCase_SymbologyPolygons);
+ CPPUNIT_TEST(TestCase_SymbologyPointsPNG);
+ CPPUNIT_TEST(TestCase_SymbologyPointsParamPNG);
+ CPPUNIT_TEST(TestCase_SymbologyLinesPNG);
+ CPPUNIT_TEST(TestCase_SymbologyLinesCrossTickPNG);
+ CPPUNIT_TEST(TestCase_SymbologyPolygonsPNG);
- CPPUNIT_TEST(TestCase_Annotation1);
- CPPUNIT_TEST(TestCase_Annotation2);
- CPPUNIT_TEST(TestCase_Annotation3);
+ CPPUNIT_TEST(TestCase_Annotation1PNG);
+ CPPUNIT_TEST(TestCase_Annotation2PNG);
+ CPPUNIT_TEST(TestCase_Annotation3PNG);
- CPPUNIT_TEST(TestCase_RenderDynamicOverlay);
- CPPUNIT_TEST(TestCase_RenderMap);
- CPPUNIT_TEST(TestCase_RenderMapWithWatermark);
- CPPUNIT_TEST(TestCase_RenderLegend);
+ CPPUNIT_TEST(TestCase_RenderDynamicOverlayPNG);
+ CPPUNIT_TEST(TestCase_RenderMapPNG);
+ CPPUNIT_TEST(TestCase_RenderMapWithWatermarkPNG);
+ CPPUNIT_TEST(TestCase_RenderLegendPNG);
+
+ CPPUNIT_TEST(TestCase_SymbologyPointsPNG8);
+ CPPUNIT_TEST(TestCase_SymbologyPointsParamPNG8);
+ CPPUNIT_TEST(TestCase_SymbologyLinesPNG8);
+ CPPUNIT_TEST(TestCase_SymbologyLinesCrossTickPNG8);
+ CPPUNIT_TEST(TestCase_SymbologyPolygonsPNG8);
+
+ CPPUNIT_TEST(TestCase_Annotation1PNG8);
+ CPPUNIT_TEST(TestCase_Annotation2PNG8);
+ CPPUNIT_TEST(TestCase_Annotation3PNG8);
+
+ CPPUNIT_TEST(TestCase_RenderDynamicOverlayPNG8);
+ CPPUNIT_TEST(TestCase_RenderMapPNG8);
+ CPPUNIT_TEST(TestCase_RenderMapWithWatermarkPNG8);
+ CPPUNIT_TEST(TestCase_RenderLegendPNG8);
+
+ CPPUNIT_TEST(TestCase_SymbologyPointsGIF);
+ CPPUNIT_TEST(TestCase_SymbologyPointsParamGIF);
+ CPPUNIT_TEST(TestCase_SymbologyLinesGIF);
+ CPPUNIT_TEST(TestCase_SymbologyLinesCrossTickGIF);
+ CPPUNIT_TEST(TestCase_SymbologyPolygonsGIF);
+
+ CPPUNIT_TEST(TestCase_Annotation1GIF);
+ CPPUNIT_TEST(TestCase_Annotation2GIF);
+ CPPUNIT_TEST(TestCase_Annotation3GIF);
+
+ CPPUNIT_TEST(TestCase_RenderDynamicOverlayGIF);
+ CPPUNIT_TEST(TestCase_RenderMapGIF);
+ CPPUNIT_TEST(TestCase_RenderMapWithWatermarkGIF);
+ CPPUNIT_TEST(TestCase_RenderLegendGIF);
+
+ CPPUNIT_TEST(TestCase_SymbologyPointsJPG);
+ CPPUNIT_TEST(TestCase_SymbologyPointsParamJPG);
+ CPPUNIT_TEST(TestCase_SymbologyLinesJPG);
+ CPPUNIT_TEST(TestCase_SymbologyLinesCrossTickJPG);
+ CPPUNIT_TEST(TestCase_SymbologyPolygonsJPG);
+
+ CPPUNIT_TEST(TestCase_Annotation1JPG);
+ CPPUNIT_TEST(TestCase_Annotation2JPG);
+ CPPUNIT_TEST(TestCase_Annotation3JPG);
+
+ CPPUNIT_TEST(TestCase_RenderDynamicOverlayJPG);
+ CPPUNIT_TEST(TestCase_RenderMapJPG);
+ CPPUNIT_TEST(TestCase_RenderMapWithWatermarkJPG);
+ CPPUNIT_TEST(TestCase_RenderLegendJPG);
+
CPPUNIT_TEST(TestCase_QueryFeatures);
//CPPUNIT_TEST(TestCase_RendererPerformance);
@@ -55,28 +101,87 @@
void TestStart();
void TestEnd();
- void TestCase_RenderDynamicOverlay();
- void TestCase_RenderMap();
- void TestCase_RenderMapWithWatermark();
- void TestCase_RenderLegend();
- void TestCase_QueryFeatures();
+ void TestCase_QueryFeatures();
- void TestCase_SymbologyPoints();
- void TestCase_SymbologyPointsParam();
- void TestCase_SymbologyLines();
- void TestCase_SymbologyLinesCrossTick();
- void TestCase_SymbologyPolygons();
+ //Parameterized versions that all format-specific tests call into
+ void TestCase_RenderDynamicOverlay(CREFSTRING imageFormat, CREFSTRING extension);
+ void TestCase_RenderMap(CREFSTRING imageFormat, CREFSTRING extension);
+ void TestCase_RenderMapWithWatermark(CREFSTRING imageFormat, CREFSTRING extension);
+ void TestCase_RenderLegend(CREFSTRING imageFormat, CREFSTRING extension);
+
+ void TestCase_SymbologyPoints(CREFSTRING imageFormat, CREFSTRING extension);
+ void TestCase_SymbologyPointsParam(CREFSTRING imageFormat, CREFSTRING extension);
+ void TestCase_SymbologyLines(CREFSTRING imageFormat, CREFSTRING extension);
+ void TestCase_SymbologyLinesCrossTick(CREFSTRING imageFormat, CREFSTRING extension);
+ void TestCase_SymbologyPolygons(CREFSTRING imageFormat, CREFSTRING extension);
- void TestCase_Annotation1();
- void TestCase_Annotation2();
- void TestCase_Annotation3();
+ void TestCase_Annotation1(CREFSTRING imageFormat, CREFSTRING extension);
+ void TestCase_Annotation2(CREFSTRING imageFormat, CREFSTRING extension);
+ void TestCase_Annotation3(CREFSTRING imageFormat, CREFSTRING extension);
+ //PNG output tests
+ void TestCase_RenderDynamicOverlayPNG() { TestCase_RenderDynamicOverlay(L"PNG", L"png"); }
+ void TestCase_RenderMapPNG() { TestCase_RenderMap(L"PNG", L"png"); }
+ void TestCase_RenderMapWithWatermarkPNG() { TestCase_RenderMapWithWatermark(L"PNG", L"png"); }
+ void TestCase_RenderLegendPNG() { TestCase_RenderLegend(L"PNG", L"png"); }
+ void TestCase_SymbologyPointsPNG() { TestCase_SymbologyPoints(L"PNG", L"png"); }
+ void TestCase_SymbologyPointsParamPNG() { TestCase_SymbologyPointsParam(L"PNG", L"png"); }
+ void TestCase_SymbologyLinesPNG() { TestCase_SymbologyLines(L"PNG", L"png"); }
+ void TestCase_SymbologyLinesCrossTickPNG() { TestCase_SymbologyLinesCrossTick(L"PNG", L"png"); }
+ void TestCase_SymbologyPolygonsPNG() { TestCase_SymbologyPolygons(L"PNG", L"png"); }
+ void TestCase_Annotation1PNG() { TestCase_Annotation1(L"PNG", L"png"); }
+ void TestCase_Annotation2PNG() { TestCase_Annotation2(L"PNG", L"png"); }
+ void TestCase_Annotation3PNG() { TestCase_Annotation3(L"PNG", L"png"); }
+
+ //PNG8 output tests
+ void TestCase_RenderDynamicOverlayPNG8() { TestCase_RenderDynamicOverlay(L"PNG8", L"png"); }
+ void TestCase_RenderMapPNG8() { TestCase_RenderMap(L"PNG8", L"png"); }
+ void TestCase_RenderMapWithWatermarkPNG8() { TestCase_RenderMapWithWatermark(L"PNG8", L"png"); }
+ void TestCase_RenderLegendPNG8() { TestCase_RenderLegend(L"PNG8", L"png"); }
+ void TestCase_SymbologyPointsPNG8() { TestCase_SymbologyPoints(L"PNG8", L"png"); }
+ void TestCase_SymbologyPointsParamPNG8() { TestCase_SymbologyPointsParam(L"PNG8", L"png"); }
+ void TestCase_SymbologyLinesPNG8() { TestCase_SymbologyLines(L"PNG8", L"png"); }
+ void TestCase_SymbologyLinesCrossTickPNG8() { TestCase_SymbologyLinesCrossTick(L"PNG8", L"png"); }
+ void TestCase_SymbologyPolygonsPNG8() { TestCase_SymbologyPolygons(L"PNG8", L"png"); }
+ void TestCase_Annotation1PNG8() { TestCase_Annotation1(L"PNG8", L"png"); }
+ void TestCase_Annotation2PNG8() { TestCase_Annotation2(L"PNG8", L"png"); }
+ void TestCase_Annotation3PNG8() { TestCase_Annotation3(L"PNG8", L"png"); }
+
+ //GIF output tests
+ void TestCase_RenderDynamicOverlayGIF() { TestCase_RenderDynamicOverlay(L"GIF", L"gif"); }
+ void TestCase_RenderMapGIF() { TestCase_RenderMap(L"GIF", L"gif"); }
+ void TestCase_RenderMapWithWatermarkGIF() { TestCase_RenderMapWithWatermark(L"GIF", L"gif"); }
+ void TestCase_RenderLegendGIF() { TestCase_RenderLegend(L"GIF", L"gif"); }
+ void TestCase_SymbologyPointsGIF() { TestCase_SymbologyPoints(L"GIF", L"gif"); }
+ void TestCase_SymbologyPointsParamGIF() { TestCase_SymbologyPointsParam(L"GIF", L"gif"); }
+ void TestCase_SymbologyLinesGIF() { TestCase_SymbologyLines(L"GIF", L"gif"); }
+ void TestCase_SymbologyLinesCrossTickGIF() { TestCase_SymbologyLinesCrossTick(L"GIF", L"gif"); }
+ void TestCase_SymbologyPolygonsGIF() { TestCase_SymbologyPolygons(L"GIF", L"gif"); }
+ void TestCase_Annotation1GIF() { TestCase_Annotation1(L"GIF", L"gif"); }
+ void TestCase_Annotation2GIF() { TestCase_Annotation2(L"GIF", L"gif"); }
+ void TestCase_Annotation3GIF() { TestCase_Annotation3(L"GIF", L"gif"); }
+
+ //JPG output tests
+ void TestCase_RenderDynamicOverlayJPG() { TestCase_RenderDynamicOverlay(L"JPG", L"jpg"); }
+ void TestCase_RenderMapJPG() { TestCase_RenderMap(L"JPG", L"jpg"); }
+ void TestCase_RenderMapWithWatermarkJPG() { TestCase_RenderMapWithWatermark(L"JPG", L"jpg"); }
+ void TestCase_RenderLegendJPG() { TestCase_RenderLegend(L"JPG", L"jpg"); }
+ void TestCase_SymbologyPointsJPG() { TestCase_SymbologyPoints(L"JPG", L"jpg"); }
+ void TestCase_SymbologyPointsParamJPG() { TestCase_SymbologyPointsParam(L"JPG", L"jpg"); }
+ void TestCase_SymbologyLinesJPG() { TestCase_SymbologyLines(L"JPG", L"jpg"); }
+ void TestCase_SymbologyLinesCrossTickJPG() { TestCase_SymbologyLinesCrossTick(L"JPG", L"jpg"); }
+ void TestCase_SymbologyPolygonsJPG() { TestCase_SymbologyPolygons(L"JPG", L"jpg"); }
+ void TestCase_Annotation1JPG() { TestCase_Annotation1(L"JPG", L"jpg"); }
+ void TestCase_Annotation2JPG() { TestCase_Annotation2(L"JPG", L"jpg"); }
+ void TestCase_Annotation3JPG() { TestCase_Annotation3(L"JPG", L"jpg"); }
+
//void TestCase_RendererPerformance();
private:
MgMap* CreateTestMap();
MgMap* CreateTestMapWithWatermark();
MgPolygon* CreateSelectionPolygon(MgMap* map, double width, double height);
+ static STRING GetPath(CREFSTRING basePath, CREFSTRING imageFormat, CREFSTRING extension);
private:
Ptr<MgSiteConnection> m_siteConnection;
More information about the mapguide-commits
mailing list