[mapguide-commits] r10027 - trunk/MgDev/Server/src/UnitTesting
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Thu Feb 9 03:58:28 PST 2023
Author: jng
Date: 2023-02-09 03:58:27 -0800 (Thu, 09 Feb 2023)
New Revision: 10027
Modified:
trunk/MgDev/Server/src/UnitTesting/TestMappingService.cpp
trunk/MgDev/Server/src/UnitTesting/TestProfilingService.cpp
trunk/MgDev/Server/src/UnitTesting/TestRenderingService.cpp
trunk/MgDev/Server/src/UnitTesting/TestServiceFactory.cpp
trunk/MgDev/Server/src/UnitTesting/TestTileService.cpp
Log:
Store all baseline results under a top-level "Baselines" directory and all results under a top-level "Results" directory
Fixes #2861
Modified: trunk/MgDev/Server/src/UnitTesting/TestMappingService.cpp
===================================================================
--- trunk/MgDev/Server/src/UnitTesting/TestMappingService.cpp 2023-02-09 10:44:17 UTC (rev 10026)
+++ trunk/MgDev/Server/src/UnitTesting/TestMappingService.cpp 2023-02-09 11:58:27 UTC (rev 10027)
@@ -55,81 +55,81 @@
//call the API
Ptr<MgByteReader> rtMap = m_svcMapping->CreateRuntimeMap(mdfres, L"UnitTestSheboygan1", m_session, format, 16, 16, 0, 25, schemaVersion);
Ptr<MgByteSink> sink = new MgByteSink(rtMap);
- sink->ToFile(L"../UnitTestFiles/RuntimeMapBarebones.xml");
+ sink->ToFile(L"../UnitTestFiles/Results/RuntimeMapBarebones.xml");
rtMap = m_svcMapping->CreateRuntimeMap(mdfres, L"UnitTestSheboygan2", m_session, format, 16, 16, 1, 25, schemaVersion);
sink = new MgByteSink(rtMap);
- sink->ToFile(L"../UnitTestFiles/RuntimeMapLayersAndGroups" + suffix + L".xml");
+ sink->ToFile(L"../UnitTestFiles/Results/RuntimeMapLayersAndGroups" + suffix + L".xml");
rtMap = m_svcMapping->CreateRuntimeMap(mdfres, L"UnitTestSheboygan3", m_session, format, 16, 16, (1 | 2), 25, schemaVersion);
sink = new MgByteSink(rtMap);
- sink->ToFile(L"../UnitTestFiles/RuntimeMapLayersAndGroupsWithIconsPNG16x16" + suffix + L".xml");
+ sink->ToFile(L"../UnitTestFiles/Results/RuntimeMapLayersAndGroupsWithIconsPNG16x16" + suffix + L".xml");
rtMap = m_svcMapping->CreateRuntimeMap(mdfres, L"UnitTestSheboygan4", m_session, format, 16, 16, (1 | 2 | 4), 25, schemaVersion);
sink = new MgByteSink(rtMap);
- sink->ToFile(L"../UnitTestFiles/RuntimeMapLayersAndGroupsWithIconsAndFeatureSourcePNG16x16" + suffix + L".xml");
+ sink->ToFile(L"../UnitTestFiles/Results/RuntimeMapLayersAndGroupsWithIconsAndFeatureSourcePNG16x16" + suffix + L".xml");
rtMap = m_svcMapping->CreateRuntimeMap(mdfres, L"UnitTestSheboygan5", m_session, format, 32, 32, (1 | 2), 25, schemaVersion);
sink = new MgByteSink(rtMap);
- sink->ToFile(L"../UnitTestFiles/RuntimeMapLayersAndGroupsWithIconsPNG32x32" + suffix + L".xml");
+ sink->ToFile(L"../UnitTestFiles/Results/RuntimeMapLayersAndGroupsWithIconsPNG32x32" + suffix + L".xml");
rtMap = m_svcMapping->CreateRuntimeMap(mdfres, L"UnitTestSheboygan6", m_session, format, 32, 32, (1 | 2 | 4), 25, schemaVersion);
sink = new MgByteSink(rtMap);
- sink->ToFile(L"../UnitTestFiles/RuntimeMapLayersAndGroupsWithIconsAndFeatureSourcePNG32x32" + suffix + L".xml");
+ sink->ToFile(L"../UnitTestFiles/Results/RuntimeMapLayersAndGroupsWithIconsAndFeatureSourcePNG32x32" + suffix + L".xml");
format = MgImageFormats::Gif;
rtMap = m_svcMapping->CreateRuntimeMap(mdfres, L"UnitTestSheboygan3", m_session, format, 16, 16, (1 | 2), 25, schemaVersion);
sink = new MgByteSink(rtMap);
- sink->ToFile(L"../UnitTestFiles/RuntimeMapLayersAndGroupsWithIconsGIF16x16" + suffix + L".xml");
+ sink->ToFile(L"../UnitTestFiles/Results/RuntimeMapLayersAndGroupsWithIconsGIF16x16" + suffix + L".xml");
rtMap = m_svcMapping->CreateRuntimeMap(mdfres, L"UnitTestSheboygan4", m_session, format, 16, 16, (1 | 2 | 4), 25, schemaVersion);
sink = new MgByteSink(rtMap);
- sink->ToFile(L"../UnitTestFiles/RuntimeMapLayersAndGroupsWithIconsAndFeatureSourceGIF16x16" + suffix + L".xml");
+ sink->ToFile(L"../UnitTestFiles/Results/RuntimeMapLayersAndGroupsWithIconsAndFeatureSourceGIF16x16" + suffix + L".xml");
rtMap = m_svcMapping->CreateRuntimeMap(mdfres, L"UnitTestSheboygan5", m_session, format, 32, 32, (1 | 2), 25, schemaVersion);
sink = new MgByteSink(rtMap);
- sink->ToFile(L"../UnitTestFiles/RuntimeMapLayersAndGroupsWithIconsGIF32x32" + suffix + L".xml");
+ sink->ToFile(L"../UnitTestFiles/Results/RuntimeMapLayersAndGroupsWithIconsGIF32x32" + suffix + L".xml");
rtMap = m_svcMapping->CreateRuntimeMap(mdfres, L"UnitTestSheboygan6", m_session, format, 32, 32, (1 | 2 | 4), 25, schemaVersion);
sink = new MgByteSink(rtMap);
- sink->ToFile(L"../UnitTestFiles/RuntimeMapLayersAndGroupsWithIconsAndFeatureSourceGIF32x32" + suffix + L".xml");
+ sink->ToFile(L"../UnitTestFiles/Results/RuntimeMapLayersAndGroupsWithIconsAndFeatureSourceGIF32x32" + suffix + L".xml");
format = MgImageFormats::Jpeg;
rtMap = m_svcMapping->CreateRuntimeMap(mdfres, L"UnitTestSheboygan3", m_session, format, 16, 16, (1 | 2), 25, schemaVersion);
sink = new MgByteSink(rtMap);
- sink->ToFile(L"../UnitTestFiles/RuntimeMapLayersAndGroupsWithIconsJPEG16x16" + suffix + L".xml");
+ sink->ToFile(L"../UnitTestFiles/Results/RuntimeMapLayersAndGroupsWithIconsJPEG16x16" + suffix + L".xml");
rtMap = m_svcMapping->CreateRuntimeMap(mdfres, L"UnitTestSheboygan4", m_session, format, 16, 16, (1 | 2 | 4), 25, schemaVersion);
sink = new MgByteSink(rtMap);
- sink->ToFile(L"../UnitTestFiles/RuntimeMapLayersAndGroupsWithIconsAndFeatureSourceJPEG16x16" + suffix + L".xml");
+ sink->ToFile(L"../UnitTestFiles/Results/RuntimeMapLayersAndGroupsWithIconsAndFeatureSourceJPEG16x16" + suffix + L".xml");
rtMap = m_svcMapping->CreateRuntimeMap(mdfres, L"UnitTestSheboygan5", m_session, format, 32, 32, (1 | 2), 25, schemaVersion);
sink = new MgByteSink(rtMap);
- sink->ToFile(L"../UnitTestFiles/RuntimeMapLayersAndGroupsWithIconsJPEG32x32" + suffix + L".xml");
+ sink->ToFile(L"../UnitTestFiles/Results/RuntimeMapLayersAndGroupsWithIconsJPEG32x32" + suffix + L".xml");
rtMap = m_svcMapping->CreateRuntimeMap(mdfres, L"UnitTestSheboygan6", m_session, format, 32, 32, (1 | 2 | 4), 25, schemaVersion);
sink = new MgByteSink(rtMap);
- sink->ToFile(L"../UnitTestFiles/RuntimeMapLayersAndGroupsWithIconsAndFeatureSourceJPEG32x32" + suffix + L".xml");
+ sink->ToFile(L"../UnitTestFiles/Results/RuntimeMapLayersAndGroupsWithIconsAndFeatureSourceJPEG32x32" + suffix + L".xml");
format = MgImageFormats::Png8;
rtMap = m_svcMapping->CreateRuntimeMap(mdfres, L"UnitTestSheboygan3", m_session, format, 16, 16, (1 | 2), 25, schemaVersion);
sink = new MgByteSink(rtMap);
- sink->ToFile(L"../UnitTestFiles/RuntimeMapLayersAndGroupsWithIconsPNG816x16" + suffix + L".xml");
+ sink->ToFile(L"../UnitTestFiles/Results/RuntimeMapLayersAndGroupsWithIconsPNG816x16" + suffix + L".xml");
rtMap = m_svcMapping->CreateRuntimeMap(mdfres, L"UnitTestSheboygan4", m_session, format, 16, 16, (1 | 2 | 4), 25, schemaVersion);
sink = new MgByteSink(rtMap);
- sink->ToFile(L"../UnitTestFiles/RuntimeMapLayersAndGroupsWithIconsAndFeatureSourcePNG816x16" + suffix + L".xml");
+ sink->ToFile(L"../UnitTestFiles/Results/RuntimeMapLayersAndGroupsWithIconsAndFeatureSourcePNG816x16" + suffix + L".xml");
rtMap = m_svcMapping->CreateRuntimeMap(mdfres, L"UnitTestSheboygan5", m_session, format, 32, 32, (1 | 2), 25, schemaVersion);
sink = new MgByteSink(rtMap);
- sink->ToFile(L"../UnitTestFiles/RuntimeMapLayersAndGroupsWithIconsPNG832x32" + suffix + L".xml");
+ sink->ToFile(L"../UnitTestFiles/Results/RuntimeMapLayersAndGroupsWithIconsPNG832x32" + suffix + L".xml");
rtMap = m_svcMapping->CreateRuntimeMap(mdfres, L"UnitTestSheboygan6", m_session, format, 32, 32, (1 | 2 | 4), 25, schemaVersion);
sink = new MgByteSink(rtMap);
- sink->ToFile(L"../UnitTestFiles/RuntimeMapLayersAndGroupsWithIconsAndFeatureSourcePNG832x32" + suffix + L".xml");
+ sink->ToFile(L"../UnitTestFiles/Results/RuntimeMapLayersAndGroupsWithIconsAndFeatureSourcePNG832x32" + suffix + L".xml");
if (schemaVersion >= MG_API_VERSION(4, 0, 0))
{
@@ -136,15 +136,15 @@
Ptr<MgResourceIdentifier> tsdRes = new MgResourceIdentifier(L"Library://UnitTests/TileSets/XYZ.TileSetDefinition");
rtMap = m_svcMapping->CreateRuntimeMap(tsdRes, L"UnitTestSheboygan7", m_session, format, 32, 32, (1 | 2 | 4), 25, schemaVersion);
sink = new MgByteSink(rtMap);
- sink->ToFile(L"../UnitTestFiles/RuntimeMapFromTileSetLayersAndGroupsWithIconsAndFeatureSourcePNG832x32" + suffix + L".xml");
+ sink->ToFile(L"../UnitTestFiles/Results/RuntimeMapFromTileSetLayersAndGroupsWithIconsAndFeatureSourcePNG832x32" + suffix + L".xml");
rtMap = m_svcMapping->CreateRuntimeMap(mdfLinkedRes, L"UnitTestSheboygan8", m_session, format, 32, 32, (1 | 2 | 4), 25, schemaVersion);
sink = new MgByteSink(rtMap);
- sink->ToFile(L"../UnitTestFiles/RuntimeMapFromLinkedTileSetLayersAndGroupsWithIconsAndFeatureSourcePNG832x32" + suffix + L".xml");
+ sink->ToFile(L"../UnitTestFiles/Results/RuntimeMapFromLinkedTileSetLayersAndGroupsWithIconsAndFeatureSourcePNG832x32" + suffix + L".xml");
rtMap = m_svcMapping->CreateRuntimeMap(mdfLinkedXYZRes, L"UnitTestSheboygan9", m_session, format, 32, 32, (1 | 2 | 4), 25, schemaVersion);
sink = new MgByteSink(rtMap);
- sink->ToFile(L"../UnitTestFiles/RuntimeMapFromLinkedXYZTileSetLayersAndGroupsWithIconsAndFeatureSourcePNG832x32" + suffix + L".xml");
+ sink->ToFile(L"../UnitTestFiles/Results/RuntimeMapFromLinkedXYZTileSetLayersAndGroupsWithIconsAndFeatureSourcePNG832x32" + suffix + L".xml");
}
}
catch(MgException* e)
@@ -179,81 +179,81 @@
rtMap = m_svcMapping->DescribeRuntimeMap(map, format, 16, 16, 0, 25);
Ptr<MgByteSink> sink = new MgByteSink(rtMap);
- sink->ToFile(L"../UnitTestFiles/DescribeRuntimeMapBarebones.xml");
+ sink->ToFile(L"../UnitTestFiles/Results/DescribeRuntimeMapBarebones.xml");
rtMap = m_svcMapping->DescribeRuntimeMap(map, format, 16, 16, 1, 25);
sink = new MgByteSink(rtMap);
- sink->ToFile(L"../UnitTestFiles/DescribeRuntimeMapLayersAndGroups.xml");
+ sink->ToFile(L"../UnitTestFiles/Results/DescribeRuntimeMapLayersAndGroups.xml");
rtMap = m_svcMapping->DescribeRuntimeMap(map, format, 16, 16, (1 | 2), 25);
sink = new MgByteSink(rtMap);
- sink->ToFile(L"../UnitTestFiles/DescribeRuntimeMapLayersAndGroupsWithIconsPNG16x16.xml");
+ sink->ToFile(L"../UnitTestFiles/Results/DescribeRuntimeMapLayersAndGroupsWithIconsPNG16x16.xml");
rtMap = m_svcMapping->DescribeRuntimeMap(map, format, 16, 16, (1 | 2 | 4), 25);
sink = new MgByteSink(rtMap);
- sink->ToFile(L"../UnitTestFiles/DescribeRuntimeMapLayersAndGroupsWithIconsAndFeatureSourcePNG16x16.xml");
+ sink->ToFile(L"../UnitTestFiles/Results/DescribeRuntimeMapLayersAndGroupsWithIconsAndFeatureSourcePNG16x16.xml");
rtMap = m_svcMapping->DescribeRuntimeMap(map, format, 32, 32, (1 | 2), 25);
sink = new MgByteSink(rtMap);
- sink->ToFile(L"../UnitTestFiles/DescribeRuntimeMapLayersAndGroupsWithIconsPNG32x32.xml");
+ sink->ToFile(L"../UnitTestFiles/Results/DescribeRuntimeMapLayersAndGroupsWithIconsPNG32x32.xml");
rtMap = m_svcMapping->DescribeRuntimeMap(map, format, 32, 32, (1 | 2 | 4), 25);
sink = new MgByteSink(rtMap);
- sink->ToFile(L"../UnitTestFiles/DescribeRuntimeMapLayersAndGroupsWithIconsAndFeatureSourcePNG32x32.xml");
+ sink->ToFile(L"../UnitTestFiles/Results/DescribeRuntimeMapLayersAndGroupsWithIconsAndFeatureSourcePNG32x32.xml");
format = MgImageFormats::Gif;
rtMap = m_svcMapping->DescribeRuntimeMap(map, format, 16, 16, (1 | 2), 25);
sink = new MgByteSink(rtMap);
- sink->ToFile(L"../UnitTestFiles/DescribeRuntimeMapLayersAndGroupsWithIconsGIF16x16.xml");
+ sink->ToFile(L"../UnitTestFiles/Results/DescribeRuntimeMapLayersAndGroupsWithIconsGIF16x16.xml");
rtMap = m_svcMapping->DescribeRuntimeMap(map, format, 16, 16, (1 | 2 | 4), 25);
sink = new MgByteSink(rtMap);
- sink->ToFile(L"../UnitTestFiles/DescribeRuntimeMapLayersAndGroupsWithIconsAndFeatureSourceGIF16x16.xml");
+ sink->ToFile(L"../UnitTestFiles/Results/DescribeRuntimeMapLayersAndGroupsWithIconsAndFeatureSourceGIF16x16.xml");
rtMap = m_svcMapping->DescribeRuntimeMap(map, format, 32, 32, (1 | 2), 25);
sink = new MgByteSink(rtMap);
- sink->ToFile(L"../UnitTestFiles/DescribeRuntimeMapLayersAndGroupsWithIconsGIF32x32.xml");
+ sink->ToFile(L"../UnitTestFiles/Results/DescribeRuntimeMapLayersAndGroupsWithIconsGIF32x32.xml");
rtMap = m_svcMapping->DescribeRuntimeMap(map, format, 32, 32, (1 | 2 | 4), 25);
sink = new MgByteSink(rtMap);
- sink->ToFile(L"../UnitTestFiles/DescribeRuntimeMapLayersAndGroupsWithIconsAndFeatureSourceGIF32x32.xml");
+ sink->ToFile(L"../UnitTestFiles/Results/DescribeRuntimeMapLayersAndGroupsWithIconsAndFeatureSourceGIF32x32.xml");
format = MgImageFormats::Jpeg;
rtMap = m_svcMapping->DescribeRuntimeMap(map, format, 16, 16, (1 | 2), 25);
sink = new MgByteSink(rtMap);
- sink->ToFile(L"../UnitTestFiles/DescribeRuntimeMapLayersAndGroupsWithIconsJPEG16x16.xml");
+ sink->ToFile(L"../UnitTestFiles/Results/DescribeRuntimeMapLayersAndGroupsWithIconsJPEG16x16.xml");
rtMap = m_svcMapping->DescribeRuntimeMap(map, format, 16, 16, (1 | 2 | 4), 25);
sink = new MgByteSink(rtMap);
- sink->ToFile(L"../UnitTestFiles/DescribeRuntimeMapLayersAndGroupsWithIconsAndFeatureSourceJPEG16x16.xml");
+ sink->ToFile(L"../UnitTestFiles/Results/DescribeRuntimeMapLayersAndGroupsWithIconsAndFeatureSourceJPEG16x16.xml");
rtMap = m_svcMapping->DescribeRuntimeMap(map, format, 32, 32, (1 | 2), 25);
sink = new MgByteSink(rtMap);
- sink->ToFile(L"../UnitTestFiles/DescribeRuntimeMapLayersAndGroupsWithIconsJPEG32x32.xml");
+ sink->ToFile(L"../UnitTestFiles/Results/DescribeRuntimeMapLayersAndGroupsWithIconsJPEG32x32.xml");
rtMap = m_svcMapping->DescribeRuntimeMap(map, format, 32, 32, (1 | 2 | 4), 25);
sink = new MgByteSink(rtMap);
- sink->ToFile(L"../UnitTestFiles/DescribeRuntimeMapLayersAndGroupsWithIconsAndFeatureSourceJPEG32x32.xml");
+ sink->ToFile(L"../UnitTestFiles/Results/DescribeRuntimeMapLayersAndGroupsWithIconsAndFeatureSourceJPEG32x32.xml");
format = MgImageFormats::Png8;
rtMap = m_svcMapping->DescribeRuntimeMap(map, format, 16, 16, (1 | 2), 25);
sink = new MgByteSink(rtMap);
- sink->ToFile(L"../UnitTestFiles/DescribeRuntimeMapLayersAndGroupsWithIconsPNG816x16.xml");
+ sink->ToFile(L"../UnitTestFiles/Results/DescribeRuntimeMapLayersAndGroupsWithIconsPNG816x16.xml");
rtMap = m_svcMapping->DescribeRuntimeMap(map, format, 16, 16, (1 | 2 | 4), 25);
sink = new MgByteSink(rtMap);
- sink->ToFile(L"../UnitTestFiles/DescribeRuntimeMapLayersAndGroupsWithIconsAndFeatureSourcePNG816x16.xml");
+ sink->ToFile(L"../UnitTestFiles/Results/DescribeRuntimeMapLayersAndGroupsWithIconsAndFeatureSourcePNG816x16.xml");
rtMap = m_svcMapping->DescribeRuntimeMap(map, format, 32, 32, (1 | 2), 25);
sink = new MgByteSink(rtMap);
- sink->ToFile(L"../UnitTestFiles/DescribeRuntimeMapLayersAndGroupsWithIconsPNG832x32.xml");
+ sink->ToFile(L"../UnitTestFiles/Results/DescribeRuntimeMapLayersAndGroupsWithIconsPNG832x32.xml");
rtMap = m_svcMapping->DescribeRuntimeMap(map, format, 32, 32, (1 | 2 | 4), 25);
sink = new MgByteSink(rtMap);
- sink->ToFile(L"../UnitTestFiles/DescribeRuntimeMapLayersAndGroupsWithIconsAndFeatureSourcePNG832x32.xml");
+ sink->ToFile(L"../UnitTestFiles/Results/DescribeRuntimeMapLayersAndGroupsWithIconsAndFeatureSourcePNG832x32.xml");
}
catch(MgException* e)
{
@@ -281,13 +281,13 @@
STRING format = MgImageFormats::Png;
Ptr<MgByteReader> rtMap = m_svcMapping->CreateRuntimeMap(mdfId, L"TestCase_CreateAndDescribeLinkedRuntimeMap", m_session, format, 16, 16, 0, 25);
Ptr<MgByteSink> sink = new MgByteSink(rtMap);
- sink->ToFile(L"../UnitTestFiles/TestCase_CreateLinkedRuntimeMap.xml");
+ sink->ToFile(L"../UnitTestFiles/Results/TestCase_CreateLinkedRuntimeMap.xml");
Ptr<MgMap> map = new MgMap(m_siteConnection);
map->Open(L"TestCase_CreateAndDescribeLinkedRuntimeMap");
rtMap = m_svcMapping->DescribeRuntimeMap(map, format, 16, 16, 0, 25);
sink = new MgByteSink(rtMap);
- sink->ToFile(L"../UnitTestFiles/TestCase_DescribeLinkedRuntimeMap.xml");
+ sink->ToFile(L"../UnitTestFiles/Results/TestCase_DescribeLinkedRuntimeMap.xml");
}
catch(MgException* e)
{
@@ -681,19 +681,19 @@
Ptr<MgResourceIdentifier> ldf = new MgResourceIdentifier(L"Library://UnitTests/Layers/Parcels.LayerDefinition");
Ptr<MgByteReader> rdr = m_svcMapping->GenerateLegendImage(ldf, 10000.0, 16, 16, MgImageFormats::Png, 3, 0);
Ptr<MgByteSink> sink = new MgByteSink(rdr);
- sink->ToFile(L"../UnitTestFiles/GenerateLegendImage_Parcels_16x16_PNG.png");
+ sink->ToFile(L"../UnitTestFiles/Results/GenerateLegendImage_Parcels_16x16_PNG.png");
rdr = m_svcMapping->GenerateLegendImage(ldf, 10000.0, 16, 16, MgImageFormats::Png8, 3, 0);
sink = new MgByteSink(rdr);
- sink->ToFile(L"../UnitTestFiles/GenerateLegendImage_Parcels_16x16_PNG8.png");
+ sink->ToFile(L"../UnitTestFiles/Results/GenerateLegendImage_Parcels_16x16_PNG8.png");
rdr = m_svcMapping->GenerateLegendImage(ldf, 10000.0, 16, 16, MgImageFormats::Jpeg, 3, 0);
sink = new MgByteSink(rdr);
- sink->ToFile(L"../UnitTestFiles/GenerateLegendImage_Parcels_16x16_JPG.jpg");
+ sink->ToFile(L"../UnitTestFiles/Results/GenerateLegendImage_Parcels_16x16_JPG.jpg");
rdr = m_svcMapping->GenerateLegendImage(ldf, 10000.0, 16, 16, MgImageFormats::Gif, 3, 0);
sink = new MgByteSink(rdr);
- sink->ToFile(L"../UnitTestFiles/GenerateLegendImage_Parcels_16x16_GIF.gif");
+ sink->ToFile(L"../UnitTestFiles/Results/GenerateLegendImage_Parcels_16x16_GIF.gif");
}
catch (MgException* e)
{
@@ -723,125 +723,125 @@
Ptr<MgByteReader> rdr = m_svcMapping->GenerateLegendImage(ldfId, 1000.0, 16, 16, MgImageFormats::Png, 1, 0);
Ptr<MgByteSink> sink = new MgByteSink(rdr);
- sink->ToFile(L"../UnitTestFiles/RotatedPoint_Square_0_16x16.png");
+ sink->ToFile(L"../UnitTestFiles/Results/RotatedPoint_Square_0_16x16.png");
rdr = m_svcMapping->GenerateLegendImage(ldfId, 1000.0, 16, 16, MgImageFormats::Png, 1, 1);
sink = new MgByteSink(rdr);
- sink->ToFile(L"../UnitTestFiles/RotatedPoint_Square_45_16x16.png");
+ sink->ToFile(L"../UnitTestFiles/Results/RotatedPoint_Square_45_16x16.png");
rdr = m_svcMapping->GenerateLegendImage(ldfId, 1000.0, 16, 16, MgImageFormats::Png, 1, 2);
sink = new MgByteSink(rdr);
- sink->ToFile(L"../UnitTestFiles/RotatedPoint_Square_25_16x16.png");
+ sink->ToFile(L"../UnitTestFiles/Results/RotatedPoint_Square_25_16x16.png");
rdr = m_svcMapping->GenerateLegendImage(ldfId, 1000.0, 16, 16, MgImageFormats::Png, 1, 3);
sink = new MgByteSink(rdr);
- sink->ToFile(L"../UnitTestFiles/RotatedPoint_Star_0_16x16.png");
+ sink->ToFile(L"../UnitTestFiles/Results/RotatedPoint_Star_0_16x16.png");
rdr = m_svcMapping->GenerateLegendImage(ldfId, 1000.0, 16, 16, MgImageFormats::Png, 1, 4);
sink = new MgByteSink(rdr);
- sink->ToFile(L"../UnitTestFiles/RotatedPoint_Star_45_16x16.png");
+ sink->ToFile(L"../UnitTestFiles/Results/RotatedPoint_Star_45_16x16.png");
rdr = m_svcMapping->GenerateLegendImage(ldfId, 1000.0, 16, 16, MgImageFormats::Png, 1, 5);
sink = new MgByteSink(rdr);
- sink->ToFile(L"../UnitTestFiles/RotatedPoint_Star_25_16x16.png");
+ sink->ToFile(L"../UnitTestFiles/Results/RotatedPoint_Star_25_16x16.png");
rdr = m_svcMapping->GenerateLegendImage(ldfId, 1000.0, 16, 16, MgImageFormats::Png, 1, 6);
sink = new MgByteSink(rdr);
- sink->ToFile(L"../UnitTestFiles/RotatedPoint_Triangle_0_16x16.png");
+ sink->ToFile(L"../UnitTestFiles/Results/RotatedPoint_Triangle_0_16x16.png");
rdr = m_svcMapping->GenerateLegendImage(ldfId, 1000.0, 16, 16, MgImageFormats::Png, 1, 7);
sink = new MgByteSink(rdr);
- sink->ToFile(L"../UnitTestFiles/RotatedPoint_Triangle_45_16x16.png");
+ sink->ToFile(L"../UnitTestFiles/Results/RotatedPoint_Triangle_45_16x16.png");
rdr = m_svcMapping->GenerateLegendImage(ldfId, 1000.0, 16, 16, MgImageFormats::Png, 1, 8);
sink = new MgByteSink(rdr);
- sink->ToFile(L"../UnitTestFiles/RotatedPoint_Triangle_25_16x16.png");
+ sink->ToFile(L"../UnitTestFiles/Results/RotatedPoint_Triangle_25_16x16.png");
rdr = m_svcMapping->GenerateLegendImage(ldfId, 1000.0, 16, 16, MgImageFormats::Png, 1, 9);
sink = new MgByteSink(rdr);
- sink->ToFile(L"../UnitTestFiles/RotatedPoint_Cross_0_16x16.png");
+ sink->ToFile(L"../UnitTestFiles/Results/RotatedPoint_Cross_0_16x16.png");
rdr = m_svcMapping->GenerateLegendImage(ldfId, 1000.0, 16, 16, MgImageFormats::Png, 1, 10);
sink = new MgByteSink(rdr);
- sink->ToFile(L"../UnitTestFiles/RotatedPoint_Cross_45_16x16.png");
+ sink->ToFile(L"../UnitTestFiles/Results/RotatedPoint_Cross_45_16x16.png");
rdr = m_svcMapping->GenerateLegendImage(ldfId, 1000.0, 16, 16, MgImageFormats::Png, 1, 11);
sink = new MgByteSink(rdr);
- sink->ToFile(L"../UnitTestFiles/RotatedPoint_Cross_25_16x16.png");
+ sink->ToFile(L"../UnitTestFiles/Results/RotatedPoint_Cross_25_16x16.png");
rdr = m_svcMapping->GenerateLegendImage(ldfId, 1000.0, 16, 16, MgImageFormats::Png, 1, 12);
sink = new MgByteSink(rdr);
- sink->ToFile(L"../UnitTestFiles/RotatedPoint_XMark_0_16x16.png");
+ sink->ToFile(L"../UnitTestFiles/Results/RotatedPoint_XMark_0_16x16.png");
rdr = m_svcMapping->GenerateLegendImage(ldfId, 1000.0, 16, 16, MgImageFormats::Png, 1, 13);
sink = new MgByteSink(rdr);
- sink->ToFile(L"../UnitTestFiles/RotatedPoint_XMark_45_16x16.png");
+ sink->ToFile(L"../UnitTestFiles/Results/RotatedPoint_XMark_45_16x16.png");
rdr = m_svcMapping->GenerateLegendImage(ldfId, 1000.0, 16, 16, MgImageFormats::Png, 1, 14);
sink = new MgByteSink(rdr);
- sink->ToFile(L"../UnitTestFiles/RotatedPoint_XMark_25_16x16.png");
+ sink->ToFile(L"../UnitTestFiles/Results/RotatedPoint_XMark_25_16x16.png");
//Now try 32x16 to see if the rotation handling is acceptable with non-square sizes
rdr = m_svcMapping->GenerateLegendImage(ldfId, 1000.0, 32, 16, MgImageFormats::Png, 1, 0);
sink = new MgByteSink(rdr);
- sink->ToFile(L"../UnitTestFiles/RotatedPoint_Square_0_32x16.png");
+ sink->ToFile(L"../UnitTestFiles/Results/RotatedPoint_Square_0_32x16.png");
rdr = m_svcMapping->GenerateLegendImage(ldfId, 1000.0, 32, 16, MgImageFormats::Png, 1, 1);
sink = new MgByteSink(rdr);
- sink->ToFile(L"../UnitTestFiles/RotatedPoint_Square_45_32x16.png");
+ sink->ToFile(L"../UnitTestFiles/Results/RotatedPoint_Square_45_32x16.png");
rdr = m_svcMapping->GenerateLegendImage(ldfId, 1000.0, 32, 16, MgImageFormats::Png, 1, 2);
sink = new MgByteSink(rdr);
- sink->ToFile(L"../UnitTestFiles/RotatedPoint_Square_25_32x16.png");
+ sink->ToFile(L"../UnitTestFiles/Results/RotatedPoint_Square_25_32x16.png");
rdr = m_svcMapping->GenerateLegendImage(ldfId, 1000.0, 32, 16, MgImageFormats::Png, 1, 3);
sink = new MgByteSink(rdr);
- sink->ToFile(L"../UnitTestFiles/RotatedPoint_Star_0_32x16.png");
+ sink->ToFile(L"../UnitTestFiles/Results/RotatedPoint_Star_0_32x16.png");
rdr = m_svcMapping->GenerateLegendImage(ldfId, 1000.0, 32, 16, MgImageFormats::Png, 1, 4);
sink = new MgByteSink(rdr);
- sink->ToFile(L"../UnitTestFiles/RotatedPoint_Star_45_32x16.png");
+ sink->ToFile(L"../UnitTestFiles/Results/RotatedPoint_Star_45_32x16.png");
rdr = m_svcMapping->GenerateLegendImage(ldfId, 1000.0, 32, 16, MgImageFormats::Png, 1, 5);
sink = new MgByteSink(rdr);
- sink->ToFile(L"../UnitTestFiles/RotatedPoint_Star_25_32x16.png");
+ sink->ToFile(L"../UnitTestFiles/Results/RotatedPoint_Star_25_32x16.png");
rdr = m_svcMapping->GenerateLegendImage(ldfId, 1000.0, 32, 16, MgImageFormats::Png, 1, 6);
sink = new MgByteSink(rdr);
- sink->ToFile(L"../UnitTestFiles/RotatedPoint_Triangle_0_32x16.png");
+ sink->ToFile(L"../UnitTestFiles/Results/RotatedPoint_Triangle_0_32x16.png");
rdr = m_svcMapping->GenerateLegendImage(ldfId, 1000.0, 32, 16, MgImageFormats::Png, 1, 7);
sink = new MgByteSink(rdr);
- sink->ToFile(L"../UnitTestFiles/RotatedPoint_Triangle_45_32x16.png");
+ sink->ToFile(L"../UnitTestFiles/Results/RotatedPoint_Triangle_45_32x16.png");
rdr = m_svcMapping->GenerateLegendImage(ldfId, 1000.0, 32, 16, MgImageFormats::Png, 1, 8);
sink = new MgByteSink(rdr);
- sink->ToFile(L"../UnitTestFiles/RotatedPoint_Triangle_25_32x16.png");
+ sink->ToFile(L"../UnitTestFiles/Results/RotatedPoint_Triangle_25_32x16.png");
rdr = m_svcMapping->GenerateLegendImage(ldfId, 1000.0, 32, 16, MgImageFormats::Png, 1, 9);
sink = new MgByteSink(rdr);
- sink->ToFile(L"../UnitTestFiles/RotatedPoint_Cross_0_32x16.png");
+ sink->ToFile(L"../UnitTestFiles/Results/RotatedPoint_Cross_0_32x16.png");
rdr = m_svcMapping->GenerateLegendImage(ldfId, 1000.0, 32, 16, MgImageFormats::Png, 1, 10);
sink = new MgByteSink(rdr);
- sink->ToFile(L"../UnitTestFiles/RotatedPoint_Cross_45_32x16.png");
+ sink->ToFile(L"../UnitTestFiles/Results/RotatedPoint_Cross_45_32x16.png");
rdr = m_svcMapping->GenerateLegendImage(ldfId, 1000.0, 32, 16, MgImageFormats::Png, 1, 11);
sink = new MgByteSink(rdr);
- sink->ToFile(L"../UnitTestFiles/RotatedPoint_Cross_25_32x16.png");
+ sink->ToFile(L"../UnitTestFiles/Results/RotatedPoint_Cross_25_32x16.png");
rdr = m_svcMapping->GenerateLegendImage(ldfId, 1000.0, 32, 16, MgImageFormats::Png, 1, 12);
sink = new MgByteSink(rdr);
- sink->ToFile(L"../UnitTestFiles/RotatedPoint_XMark_0_32x16.png");
+ sink->ToFile(L"../UnitTestFiles/Results/RotatedPoint_XMark_0_32x16.png");
rdr = m_svcMapping->GenerateLegendImage(ldfId, 1000.0, 32, 16, MgImageFormats::Png, 1, 13);
sink = new MgByteSink(rdr);
- sink->ToFile(L"../UnitTestFiles/RotatedPoint_XMark_45_32x16.png");
+ sink->ToFile(L"../UnitTestFiles/Results/RotatedPoint_XMark_45_32x16.png");
rdr = m_svcMapping->GenerateLegendImage(ldfId, 1000.0, 32, 16, MgImageFormats::Png, 1, 14);
sink = new MgByteSink(rdr);
- sink->ToFile(L"../UnitTestFiles/RotatedPoint_XMark_25_32x16.png");
+ sink->ToFile(L"../UnitTestFiles/Results/RotatedPoint_XMark_25_32x16.png");
}
catch (MgException* e)
{
@@ -897,19 +897,19 @@
Ptr<MgByteReader> rdr = layer->GenerateLegendImage(10000.0, 16, 16, MgImageFormats::Png, 3, 0);
Ptr<MgByteSink> sink = new MgByteSink(rdr);
- sink->ToFile(L"../UnitTestFiles/GenerateLegendImageConvenience_Parcels_16x16_PNG.png");
+ sink->ToFile(L"../UnitTestFiles/Results/GenerateLegendImageConvenience_Parcels_16x16_PNG.png");
rdr = layer->GenerateLegendImage(10000.0, 16, 16, MgImageFormats::Png8, 3, 0);
sink = new MgByteSink(rdr);
- sink->ToFile(L"../UnitTestFiles/GenerateLegendImageConvenience_Parcels_16x16_PNG8.png");
+ sink->ToFile(L"../UnitTestFiles/Results/GenerateLegendImageConvenience_Parcels_16x16_PNG8.png");
rdr = layer->GenerateLegendImage(10000.0, 16, 16, MgImageFormats::Jpeg, 3, 0);
sink = new MgByteSink(rdr);
- sink->ToFile(L"../UnitTestFiles/GenerateLegendImageConvenience_Parcels_16x16_JPG.jpg");
+ sink->ToFile(L"../UnitTestFiles/Results/GenerateLegendImageConvenience_Parcels_16x16_JPG.jpg");
rdr = layer->GenerateLegendImage(10000.0, 16, 16, MgImageFormats::Gif, 3, 0);
sink = new MgByteSink(rdr);
- sink->ToFile(L"../UnitTestFiles/GenerateLegendImageConvenience_Parcels_16x16_GIF.gif");
+ sink->ToFile(L"../UnitTestFiles/Results/GenerateLegendImageConvenience_Parcels_16x16_GIF.gif");
}
catch (MgException* e)
{
@@ -970,7 +970,7 @@
INT32 rules = layer->GetCompositeThemeCategoryCount(10000.0, ctype);
for (INT32 offset = rulesProcessed; offset < (rulesProcessed + rules); offset++)
{
- STRING prefix = L"../UnitTestFiles/GenerateLegendImageConvenience_MultiCTS_type";
+ STRING prefix = L"../UnitTestFiles/Results/GenerateLegendImageConvenience_MultiCTS_type";
STRING sNum;
MgUtil::Int32ToString(ctype, sNum);
prefix += sNum;
@@ -1064,7 +1064,7 @@
INT32 rules = layer->GetCompositeThemeCategoryCount(10000.0, ctype);
for (INT32 offset = rulesProcessed; offset < (rulesProcessed + rules); offset++)
{
- STRING prefix = L"../UnitTestFiles/GenerateLegendImageConvenience_MultiCTSWithTheme_type";
+ STRING prefix = L"../UnitTestFiles/Results/GenerateLegendImageConvenience_MultiCTSWithTheme_type";
STRING sType;
MgUtil::Int32ToString(ctype, sType);
prefix += sType;
@@ -1149,125 +1149,125 @@
Ptr<MgByteReader> rdr = layer->GenerateLegendImage(1000.0, 16, 16, MgImageFormats::Png, 1, 0);
Ptr<MgByteSink> sink = new MgByteSink(rdr);
- sink->ToFile(L"../UnitTestFiles/RotatedPointConvenience_Square_0_16x16.png");
+ sink->ToFile(L"../UnitTestFiles/Results/RotatedPointConvenience_Square_0_16x16.png");
rdr = layer->GenerateLegendImage(1000.0, 16, 16, MgImageFormats::Png, 1, 1);
sink = new MgByteSink(rdr);
- sink->ToFile(L"../UnitTestFiles/RotatedPointConvenience_Square_45_16x16.png");
+ sink->ToFile(L"../UnitTestFiles/Results/RotatedPointConvenience_Square_45_16x16.png");
rdr = layer->GenerateLegendImage(1000.0, 16, 16, MgImageFormats::Png, 1, 2);
sink = new MgByteSink(rdr);
- sink->ToFile(L"../UnitTestFiles/RotatedPointConvenience_Square_25_16x16.png");
+ sink->ToFile(L"../UnitTestFiles/Results/RotatedPointConvenience_Square_25_16x16.png");
rdr = layer->GenerateLegendImage(1000.0, 16, 16, MgImageFormats::Png, 1, 3);
sink = new MgByteSink(rdr);
- sink->ToFile(L"../UnitTestFiles/RotatedPointConvenience_Star_0_16x16.png");
+ sink->ToFile(L"../UnitTestFiles/Results/RotatedPointConvenience_Star_0_16x16.png");
rdr = layer->GenerateLegendImage(1000.0, 16, 16, MgImageFormats::Png, 1, 4);
sink = new MgByteSink(rdr);
- sink->ToFile(L"../UnitTestFiles/RotatedPointConvenience_Star_45_16x16.png");
+ sink->ToFile(L"../UnitTestFiles/Results/RotatedPointConvenience_Star_45_16x16.png");
rdr = layer->GenerateLegendImage(1000.0, 16, 16, MgImageFormats::Png, 1, 5);
sink = new MgByteSink(rdr);
- sink->ToFile(L"../UnitTestFiles/RotatedPointConvenience_Star_25_16x16.png");
+ sink->ToFile(L"../UnitTestFiles/Results/RotatedPointConvenience_Star_25_16x16.png");
rdr = layer->GenerateLegendImage(1000.0, 16, 16, MgImageFormats::Png, 1, 6);
sink = new MgByteSink(rdr);
- sink->ToFile(L"../UnitTestFiles/RotatedPointConvenience_Triangle_0_16x16.png");
+ sink->ToFile(L"../UnitTestFiles/Results/RotatedPointConvenience_Triangle_0_16x16.png");
rdr = layer->GenerateLegendImage(1000.0, 16, 16, MgImageFormats::Png, 1, 7);
sink = new MgByteSink(rdr);
- sink->ToFile(L"../UnitTestFiles/RotatedPointConvenience_Triangle_45_16x16.png");
+ sink->ToFile(L"../UnitTestFiles/Results/RotatedPointConvenience_Triangle_45_16x16.png");
rdr = layer->GenerateLegendImage(1000.0, 16, 16, MgImageFormats::Png, 1, 8);
sink = new MgByteSink(rdr);
- sink->ToFile(L"../UnitTestFiles/RotatedPointConvenience_Triangle_25_16x16.png");
+ sink->ToFile(L"../UnitTestFiles/Results/RotatedPointConvenience_Triangle_25_16x16.png");
rdr = layer->GenerateLegendImage(1000.0, 16, 16, MgImageFormats::Png, 1, 9);
sink = new MgByteSink(rdr);
- sink->ToFile(L"../UnitTestFiles/RotatedPointConvenience_Cross_0_16x16.png");
+ sink->ToFile(L"../UnitTestFiles/Results/RotatedPointConvenience_Cross_0_16x16.png");
rdr = layer->GenerateLegendImage(1000.0, 16, 16, MgImageFormats::Png, 1, 10);
sink = new MgByteSink(rdr);
- sink->ToFile(L"../UnitTestFiles/RotatedPointConvenience_Cross_45_16x16.png");
+ sink->ToFile(L"../UnitTestFiles/Results/RotatedPointConvenience_Cross_45_16x16.png");
rdr = layer->GenerateLegendImage(1000.0, 16, 16, MgImageFormats::Png, 1, 11);
sink = new MgByteSink(rdr);
- sink->ToFile(L"../UnitTestFiles/RotatedPointConvenience_Cross_25_16x16.png");
+ sink->ToFile(L"../UnitTestFiles/Results/RotatedPointConvenience_Cross_25_16x16.png");
rdr = layer->GenerateLegendImage(1000.0, 16, 16, MgImageFormats::Png, 1, 12);
sink = new MgByteSink(rdr);
- sink->ToFile(L"../UnitTestFiles/RotatedPointConvenience_XMark_0_16x16.png");
+ sink->ToFile(L"../UnitTestFiles/Results/RotatedPointConvenience_XMark_0_16x16.png");
rdr = layer->GenerateLegendImage(1000.0, 16, 16, MgImageFormats::Png, 1, 13);
sink = new MgByteSink(rdr);
- sink->ToFile(L"../UnitTestFiles/RotatedPointConvenience_XMark_45_16x16.png");
+ sink->ToFile(L"../UnitTestFiles/Results/RotatedPointConvenience_XMark_45_16x16.png");
rdr = layer->GenerateLegendImage(1000.0, 16, 16, MgImageFormats::Png, 1, 14);
sink = new MgByteSink(rdr);
- sink->ToFile(L"../UnitTestFiles/RotatedPointConvenience_XMark_25_16x16.png");
+ sink->ToFile(L"../UnitTestFiles/Results/RotatedPointConvenience_XMark_25_16x16.png");
//Now try 32x16 to see if the rotation handling is acceptable with non-square sizes
rdr = layer->GenerateLegendImage(1000.0, 32, 16, MgImageFormats::Png, 1, 0);
sink = new MgByteSink(rdr);
- sink->ToFile(L"../UnitTestFiles/RotatedPointConvenience_Square_0_32x16.png");
+ sink->ToFile(L"../UnitTestFiles/Results/RotatedPointConvenience_Square_0_32x16.png");
rdr = layer->GenerateLegendImage(1000.0, 32, 16, MgImageFormats::Png, 1, 1);
sink = new MgByteSink(rdr);
- sink->ToFile(L"../UnitTestFiles/RotatedPointConvenience_Square_45_32x16.png");
+ sink->ToFile(L"../UnitTestFiles/Results/RotatedPointConvenience_Square_45_32x16.png");
rdr = layer->GenerateLegendImage(1000.0, 32, 16, MgImageFormats::Png, 1, 2);
sink = new MgByteSink(rdr);
- sink->ToFile(L"../UnitTestFiles/RotatedPointConvenience_Square_25_32x16.png");
+ sink->ToFile(L"../UnitTestFiles/Results/RotatedPointConvenience_Square_25_32x16.png");
rdr = layer->GenerateLegendImage(1000.0, 32, 16, MgImageFormats::Png, 1, 3);
sink = new MgByteSink(rdr);
- sink->ToFile(L"../UnitTestFiles/RotatedPointConvenience_Star_0_32x16.png");
+ sink->ToFile(L"../UnitTestFiles/Results/RotatedPointConvenience_Star_0_32x16.png");
rdr = layer->GenerateLegendImage(1000.0, 32, 16, MgImageFormats::Png, 1, 4);
sink = new MgByteSink(rdr);
- sink->ToFile(L"../UnitTestFiles/RotatedPointConvenience_Star_45_32x16.png");
+ sink->ToFile(L"../UnitTestFiles/Results/RotatedPointConvenience_Star_45_32x16.png");
rdr = layer->GenerateLegendImage(1000.0, 32, 16, MgImageFormats::Png, 1, 5);
sink = new MgByteSink(rdr);
- sink->ToFile(L"../UnitTestFiles/RotatedPointConvenience_Star_25_32x16.png");
+ sink->ToFile(L"../UnitTestFiles/Results/RotatedPointConvenience_Star_25_32x16.png");
rdr = layer->GenerateLegendImage(1000.0, 32, 16, MgImageFormats::Png, 1, 6);
sink = new MgByteSink(rdr);
- sink->ToFile(L"../UnitTestFiles/RotatedPointConvenience_Triangle_0_32x16.png");
+ sink->ToFile(L"../UnitTestFiles/Results/RotatedPointConvenience_Triangle_0_32x16.png");
rdr = layer->GenerateLegendImage(1000.0, 32, 16, MgImageFormats::Png, 1, 7);
sink = new MgByteSink(rdr);
- sink->ToFile(L"../UnitTestFiles/RotatedPointConvenience_Triangle_45_32x16.png");
+ sink->ToFile(L"../UnitTestFiles/Results/RotatedPointConvenience_Triangle_45_32x16.png");
rdr = layer->GenerateLegendImage(1000.0, 32, 16, MgImageFormats::Png, 1, 8);
sink = new MgByteSink(rdr);
- sink->ToFile(L"../UnitTestFiles/RotatedPointConvenience_Triangle_25_32x16.png");
+ sink->ToFile(L"../UnitTestFiles/Results/RotatedPointConvenience_Triangle_25_32x16.png");
rdr = layer->GenerateLegendImage(1000.0, 32, 16, MgImageFormats::Png, 1, 9);
sink = new MgByteSink(rdr);
- sink->ToFile(L"../UnitTestFiles/RotatedPointConvenience_Cross_0_32x16.png");
+ sink->ToFile(L"../UnitTestFiles/Results/RotatedPointConvenience_Cross_0_32x16.png");
rdr = layer->GenerateLegendImage(1000.0, 32, 16, MgImageFormats::Png, 1, 10);
sink = new MgByteSink(rdr);
- sink->ToFile(L"../UnitTestFiles/RotatedPointConvenience_Cross_45_32x16.png");
+ sink->ToFile(L"../UnitTestFiles/Results/RotatedPointConvenience_Cross_45_32x16.png");
rdr = layer->GenerateLegendImage(1000.0, 32, 16, MgImageFormats::Png, 1, 11);
sink = new MgByteSink(rdr);
- sink->ToFile(L"../UnitTestFiles/RotatedPointConvenience_Cross_25_32x16.png");
+ sink->ToFile(L"../UnitTestFiles/Results/RotatedPointConvenience_Cross_25_32x16.png");
rdr = layer->GenerateLegendImage(1000.0, 32, 16, MgImageFormats::Png, 1, 12);
sink = new MgByteSink(rdr);
- sink->ToFile(L"../UnitTestFiles/RotatedPointConvenience_XMark_0_32x16.png");
+ sink->ToFile(L"../UnitTestFiles/Results/RotatedPointConvenience_XMark_0_32x16.png");
rdr = layer->GenerateLegendImage(1000.0, 32, 16, MgImageFormats::Png, 1, 13);
sink = new MgByteSink(rdr);
- sink->ToFile(L"../UnitTestFiles/RotatedPointConvenience_XMark_45_32x16.png");
+ sink->ToFile(L"../UnitTestFiles/Results/RotatedPointConvenience_XMark_45_32x16.png");
rdr = layer->GenerateLegendImage(1000.0, 32, 16, MgImageFormats::Png, 1, 14);
sink = new MgByteSink(rdr);
- sink->ToFile(L"../UnitTestFiles/RotatedPointConvenience_XMark_25_32x16.png");
+ sink->ToFile(L"../UnitTestFiles/Results/RotatedPointConvenience_XMark_25_32x16.png");
}
catch (MgException* e)
{
@@ -1375,7 +1375,7 @@
// Have to manually verify this file atm. There should be no fill in the hole
Ptr<MgByteSink> byteSink = new MgByteSink(eplot);
- byteSink->ToFile(L"../UnitTestFiles/UT_PlotHole.dwf");
+ byteSink->ToFile(L"../UnitTestFiles/Results/UT_PlotHole.dwf");
}
catch (MgException* e)
{
Modified: trunk/MgDev/Server/src/UnitTesting/TestProfilingService.cpp
===================================================================
--- trunk/MgDev/Server/src/UnitTesting/TestProfilingService.cpp 2023-02-09 10:44:17 UTC (rev 10026)
+++ trunk/MgDev/Server/src/UnitTesting/TestProfilingService.cpp 2023-02-09 11:58:27 UTC (rev 10027)
@@ -100,19 +100,19 @@
// profile rendering normal map
Ptr<MgByteReader> rdr1 = svcProfiling->ProfileRenderDynamicOverlay(map, nullptr, options);
- rdr1->ToFile(L"../UnitTestFiles/ProfileRenderDynamicOverlay_Normal.xml");
+ rdr1->ToFile(L"../UnitTestFiles/Results/ProfileRenderDynamicOverlay_Normal.xml");
// profile rendering normal map with selection
Ptr<MgByteReader> rdr2 = svcProfiling->ProfileRenderDynamicOverlay(map, selectionOnMap, options);
- rdr2->ToFile(L"../UnitTestFiles/ProfileRenderDynamicOverlay_Selection.xml");
+ rdr2->ToFile(L"../UnitTestFiles/Results/ProfileRenderDynamicOverlay_Selection.xml");
// profile rendering map with watermark
Ptr<MgByteReader> rdr3 = svcProfiling->ProfileRenderDynamicOverlay(mapWithWatermark, nullptr, options);
- rdr3->ToFile(L"../UnitTestFiles/ProfileRenderDynamicOverlay_Watermark.xml");
+ rdr3->ToFile(L"../UnitTestFiles/Results/ProfileRenderDynamicOverlay_Watermark.xml");
// profile rendering map with both watermark and selection
Ptr<MgByteReader> rdr4 = svcProfiling->ProfileRenderDynamicOverlay(mapWithWatermark, selectionOnMapWithWatermark, options);
- rdr4->ToFile(L"../UnitTestFiles/ProfileRenderDynamicOverlay_Watermark_Selection.xml");
+ rdr4->ToFile(L"../UnitTestFiles/Results/ProfileRenderDynamicOverlay_Watermark_Selection.xml");
}
catch (MgException* e)
{
@@ -150,19 +150,19 @@
// profile rendering normal map
Ptr<MgByteReader> rdr1 = svcProfiling->ProfileRenderMap(map, nullptr, coordNewCenter, 75000, 1024, 1024, bgc, L"PNG", false);
- rdr1->ToFile(L"../UnitTestFiles/ProfileRenderMap_Normal.xml");
+ rdr1->ToFile(L"../UnitTestFiles/Results/ProfileRenderMap_Normal.xml");
// profile rendering normal map with selection
Ptr<MgByteReader> rdr2 = svcProfiling->ProfileRenderMap(map, selectionOnMap, coordNewCenter, 75000, 1024, 1024, bgc, L"PNG", false);
- rdr2->ToFile(L"../UnitTestFiles/ProfileRenderMap_Selection.xml");
+ rdr2->ToFile(L"../UnitTestFiles/Results/ProfileRenderMap_Selection.xml");
// profile rendering normal map with watermark
Ptr<MgByteReader> rdr3 = svcProfiling->ProfileRenderMap(mapWithWatermark, nullptr, coordNewCenter, 75000, 1024, 1024, bgc, L"PNG", false);
- rdr3->ToFile(L"../UnitTestFiles/ProfileRenderMap_Watermark.xml");
+ rdr3->ToFile(L"../UnitTestFiles/Results/ProfileRenderMap_Watermark.xml");
// profile rendering normal map with watermark
Ptr<MgByteReader> rdr4 = svcProfiling->ProfileRenderMap(mapWithWatermark, selectionOnMapWithWatermark, coordNewCenter, 75000, 1024, 1024, bgc, L"PNG", false);
- rdr4->ToFile(L"../UnitTestFiles/ProfileRenderMap_Watermark_Selection.xml");
+ rdr4->ToFile(L"../UnitTestFiles/Results/ProfileRenderMap_Watermark_Selection.xml");
}
catch (MgException* e)
{
Modified: trunk/MgDev/Server/src/UnitTesting/TestRenderingService.cpp
===================================================================
--- trunk/MgDev/Server/src/UnitTesting/TestRenderingService.cpp 2023-02-09 10:44:17 UTC (rev 10026)
+++ trunk/MgDev/Server/src/UnitTesting/TestRenderingService.cpp 2023-02-09 11:58:27 UTC (rev 10027)
@@ -210,7 +210,7 @@
// for (int i=0; i<10; i++)
// {
Ptr<MgByteReader> rdr1 = m_svcRendering->RenderDynamicOverlay(map, nullptr, imageFormat);
- rdr1->ToFile(GetPath(L"../UnitTestFiles/RenderDynamicOverlay75k", imageFormat, extension));
+ rdr1->ToFile(GetPath(L"../UnitTestFiles/Results/RenderDynamicOverlay75k", imageFormat, extension));
// }
map->SetViewScale(12000.0);
@@ -218,7 +218,7 @@
// for (int i=0; i<100; i++)
// {
Ptr<MgByteReader> rdr2 = m_svcRendering->RenderDynamicOverlay(map, nullptr, imageFormat);
- rdr2->ToFile(GetPath(L"../UnitTestFiles/RenderDynamicOverlay12k", imageFormat, extension));
+ rdr2->ToFile(GetPath(L"../UnitTestFiles/Results/RenderDynamicOverlay12k", imageFormat, extension));
// }
// clock_t t1 = clock();
@@ -255,7 +255,7 @@
// {
//EXPECT: Tiled layers rendered with transparent background for applicable formats
Ptr<MgByteReader> rdr1 = m_svcRendering->RenderDynamicOverlay(map, nullptr, renderOpts);
- rdr1->ToFile(GetPath(L"../UnitTestFiles/RenderDynamicOverlayTiled_WithBase12k", imageFormat, extension));
+ rdr1->ToFile(GetPath(L"../UnitTestFiles/Results/RenderDynamicOverlayTiled_WithBase12k", imageFormat, extension));
// }
Ptr<MgRenderingOptions> renderOpts2 = new MgRenderingOptions(imageFormat, MgRenderingOptions::RenderLayers, nullptr);
@@ -264,7 +264,7 @@
// {
//EXPECT: Nothing, with transparent background for applicable formats
Ptr<MgByteReader> rdr2 = m_svcRendering->RenderDynamicOverlay(map, nullptr, renderOpts2);
- rdr2->ToFile(GetPath(L"../UnitTestFiles/RenderDynamicOverlayTiled_NoBase12k", imageFormat, extension));
+ rdr2->ToFile(GetPath(L"../UnitTestFiles/Results/RenderDynamicOverlayTiled_NoBase12k", imageFormat, extension));
// }
// clock_t t1 = clock();
@@ -295,11 +295,11 @@
// call the API using scales of 75000 and 12000
map->SetViewScale(75000.0);
Ptr<MgByteReader> rdr1 = m_svcRendering->RenderMap(map, nullptr, imageFormat);
- rdr1->ToFile(GetPath(L"../UnitTestFiles/RenderMap75k", imageFormat, extension));
+ rdr1->ToFile(GetPath(L"../UnitTestFiles/Results/RenderMap75k", imageFormat, extension));
map->SetViewScale(12000.0);
Ptr<MgByteReader> rdr2 = m_svcRendering->RenderMap(map, nullptr, imageFormat);
- rdr2->ToFile(GetPath(L"../UnitTestFiles/RenderMap12k", imageFormat, extension));
+ rdr2->ToFile(GetPath(L"../UnitTestFiles/Results/RenderMap12k", imageFormat, extension));
}
catch (MgException* e)
{
@@ -361,30 +361,30 @@
map->SetViewCenter(centerPt);
Ptr<MgByteReader> rdr1 = m_svcRendering->RenderMap(map, sel, imageFormat); //This just funnels the 4-arg version w/ keepSelection = true
- rdr1->ToFile(GetPath(L"../UnitTestFiles/RenderMapWithSelection_rdr1", imageFormat, extension));
+ rdr1->ToFile(GetPath(L"../UnitTestFiles/Results/RenderMapWithSelection_rdr1", imageFormat, extension));
Ptr<MgByteReader> rdr2 = m_svcRendering->RenderMap(map, sel, imageFormat, false);
- rdr2->ToFile(GetPath(L"../UnitTestFiles/RenderMapWithSelection_rdr2", imageFormat, extension));
+ rdr2->ToFile(GetPath(L"../UnitTestFiles/Results/RenderMapWithSelection_rdr2", imageFormat, extension));
Ptr<MgByteReader> rdr3 = m_svcRendering->RenderMap(map, sel, imageFormat, true, true);
- rdr3->ToFile(GetPath(L"../UnitTestFiles/RenderMapWithSelection_rdr3", imageFormat, extension));
+ rdr3->ToFile(GetPath(L"../UnitTestFiles/Results/RenderMapWithSelection_rdr3", imageFormat, extension));
Ptr<MgByteReader> rdr4 = m_svcRendering->RenderMap(map, sel, extents, width, height, bgColor, imageFormat);
- rdr4->ToFile(GetPath(L"../UnitTestFiles/RenderMapWithSelection_rdr4", imageFormat, extension)); //This just funnels to the version below w/ keepSelection = true
+ rdr4->ToFile(GetPath(L"../UnitTestFiles/Results/RenderMapWithSelection_rdr4", imageFormat, extension)); //This just funnels to the version below w/ keepSelection = true
Ptr<MgByteReader> rdr5 = m_svcRendering->RenderMap(map, sel, extents, width, height, bgColor, imageFormat, false);
- rdr5->ToFile(GetPath(L"../UnitTestFiles/RenderMapWithSelection_rdr5", imageFormat, extension));
+ rdr5->ToFile(GetPath(L"../UnitTestFiles/Results/RenderMapWithSelection_rdr5", imageFormat, extension));
Ptr<MgByteReader> rdr6 = m_svcRendering->RenderMap(map, sel, center, 5000.0, width, height, bgColor, imageFormat);
- rdr6->ToFile(GetPath(L"../UnitTestFiles/RenderMapWithSelection_rdr6", imageFormat, extension));
+ rdr6->ToFile(GetPath(L"../UnitTestFiles/Results/RenderMapWithSelection_rdr6", imageFormat, extension));
Ptr<MgByteReader> rdr7 = m_svcRendering->RenderMap(map, sel, center, 5000.0, width, height, bgColor, imageFormat, false);
- rdr7->ToFile(GetPath(L"../UnitTestFiles/RenderMapWithSelection_rdr7", imageFormat, extension));
+ rdr7->ToFile(GetPath(L"../UnitTestFiles/Results/RenderMapWithSelection_rdr7", imageFormat, extension));
//This is the new overload introduced with 3.0, it should render selections with the color we specify
Ptr<MgColor> selColor = new MgColor(255, 0, 0);
Ptr<MgByteReader> rdr8 = m_svcRendering->RenderMap(map, sel, center, 5000.0, width, height, bgColor, imageFormat, true, selColor);
- rdr8->ToFile(GetPath(L"../UnitTestFiles/RenderMapWithSelection_rdr8", imageFormat, extension));
+ rdr8->ToFile(GetPath(L"../UnitTestFiles/Results/RenderMapWithSelection_rdr8", imageFormat, extension));
}
catch (MgException* e)
{
@@ -410,11 +410,11 @@
// call the API using scales of 75000 and 12000
map->SetViewScale(75000.0);
Ptr<MgByteReader> rdr1 = m_svcRendering->RenderMap(map, nullptr, imageFormat);
- rdr1->ToFile(GetPath(L"../UnitTestFiles/RenderMapWithWatermark75k", imageFormat, extension));
+ rdr1->ToFile(GetPath(L"../UnitTestFiles/Results/RenderMapWithWatermark75k", imageFormat, extension));
map->SetViewScale(12000.0);
Ptr<MgByteReader> rdr2 = m_svcRendering->RenderMap(map, nullptr, imageFormat);
- rdr2->ToFile(GetPath(L"../UnitTestFiles/RenderMapWithWatermark12k", imageFormat, extension));
+ rdr2->ToFile(GetPath(L"../UnitTestFiles/Results/RenderMapWithWatermark12k", imageFormat, extension));
}
catch (MgException* e)
{
@@ -444,11 +444,11 @@
map->SetViewScale(75000.0);
Ptr<MgByteReader> rdr1 = m_svcRendering->RenderMapLegend(map, 200, 400, bgc, imageFormat);
- rdr1->ToFile(GetPath(L"../UnitTestFiles/RenderLegend75k", imageFormat, extension));
+ rdr1->ToFile(GetPath(L"../UnitTestFiles/Results/RenderLegend75k", imageFormat, extension));
map->SetViewScale(12000.0);
Ptr<MgByteReader> rdr2 = m_svcRendering->RenderMapLegend(map, 200, 400, bgc, imageFormat);
- rdr2->ToFile(GetPath(L"../UnitTestFiles/RenderLegend12k", imageFormat, extension));
+ rdr2->ToFile(GetPath(L"../UnitTestFiles/Results/RenderLegend12k", imageFormat, extension));
// add a layer group
Ptr<MgLayerGroupCollection> layerGroups = map->GetLayerGroups();
@@ -496,17 +496,17 @@
//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, imageFormat);
- rdr3->ToFile(GetPath(L"../UnitTestFiles/RenderLegend75kWithEmptyLayerGroup", imageFormat, extension));
+ rdr3->ToFile(GetPath(L"../UnitTestFiles/Results/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, imageFormat);
- rdr4->ToFile(GetPath(L"../UnitTestFiles/RenderLegend14kWithEmptyLayerGroup", imageFormat, extension));
+ rdr4->ToFile(GetPath(L"../UnitTestFiles/Results/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, imageFormat);
- rdr5->ToFile(GetPath(L"../UnitTestFiles/RenderLegend12kWithLayerGroup", imageFormat, extension));
+ rdr5->ToFile(GetPath(L"../UnitTestFiles/Results/RenderLegend12kWithLayerGroup", imageFormat, extension));
}
catch (MgException* e)
{
@@ -560,7 +560,7 @@
// Call the API
Ptr<MgByteReader> rdr3 = m_svcRendering->RenderMapLegend(map, 200, 400, bgc, imageFormat);
- rdr3->ToFile(GetPath(L"../UnitTestFiles/RenderLegendEmptyGroups", imageFormat, extension));
+ rdr3->ToFile(GetPath(L"../UnitTestFiles/Results/RenderLegendEmptyGroups", imageFormat, extension));
}
catch (MgException* e)
{
@@ -586,12 +586,12 @@
map->SetViewScale(75000.0);
Ptr<MgByteReader> rdr1 = m_svcRendering->RenderDynamicOverlay(map, nullptr, imageFormat);
- rdr1->ToFile(GetPath(L"../UnitTestFiles/StylizationFunc_75k", imageFormat, extension));
+ rdr1->ToFile(GetPath(L"../UnitTestFiles/Results/StylizationFunc_75k", imageFormat, extension));
// call the API using a scale of 12000
map->SetViewScale(12000);
Ptr<MgByteReader> rdr2 = m_svcRendering->RenderDynamicOverlay(map, nullptr, imageFormat);
- rdr2->ToFile(GetPath(L"../UnitTestFiles/StylizationFunc_12k", imageFormat, extension));
+ rdr2->ToFile(GetPath(L"../UnitTestFiles/Results/StylizationFunc_12k", imageFormat, extension));
// Move around
Ptr<MgCoordinate> coordNewCenter = new MgCoordinateXY(-87.733753, 43.746899);
@@ -598,7 +598,7 @@
Ptr<MgPoint> ptNewCenter = new MgPoint(coordNewCenter);
map->SetViewCenter(ptNewCenter);
Ptr<MgByteReader> rdr3 = m_svcRendering->RenderDynamicOverlay(map, nullptr, imageFormat);
- rdr3->ToFile(GetPath(L"../UnitTestFiles/StylizationFunc_12k_Moved", imageFormat, extension));
+ rdr3->ToFile(GetPath(L"../UnitTestFiles/Results/StylizationFunc_12k_Moved", imageFormat, extension));
}
catch (MgException* e)
{
@@ -635,7 +635,7 @@
map->SetViewScale(75000.0);
Ptr<MgByteReader> rdr1 = m_svcRendering->RenderMapLegend(map, 200, 400, bgc, imageFormat);
- rdr1->ToFile(GetPath(L"../UnitTestFiles/RenderLegendMultiFTS", imageFormat, extension));
+ rdr1->ToFile(GetPath(L"../UnitTestFiles/Results/RenderLegendMultiFTS", imageFormat, extension));
}
catch (MgException* e)
{
@@ -672,7 +672,7 @@
map->SetViewScale(75000.0);
Ptr<MgByteReader> rdr1 = m_svcRendering->RenderMapLegend(map, 200, 400, bgc, imageFormat);
- rdr1->ToFile(GetPath(L"../UnitTestFiles/RenderLegendMultiCTS", imageFormat, extension));
+ rdr1->ToFile(GetPath(L"../UnitTestFiles/Results/RenderLegendMultiCTS", imageFormat, extension));
}
catch (MgException* e)
{
@@ -709,7 +709,7 @@
map->SetViewScale(75000.0);
Ptr<MgByteReader> rdr1 = m_svcRendering->RenderMapLegend(map, 200, 400, bgc, imageFormat);
- rdr1->ToFile(GetPath(L"../UnitTestFiles/RenderLegendMultiFTSWithTheme", imageFormat, extension));
+ rdr1->ToFile(GetPath(L"../UnitTestFiles/Results/RenderLegendMultiFTSWithTheme", imageFormat, extension));
}
catch (MgException* e)
{
@@ -746,7 +746,7 @@
map->SetViewScale(75000.0);
Ptr<MgByteReader> rdr1 = m_svcRendering->RenderMapLegend(map, 200, 400, bgc, imageFormat);
- rdr1->ToFile(GetPath(L"../UnitTestFiles/RenderLegendMultiCTSWithTheme", imageFormat, extension));
+ rdr1->ToFile(GetPath(L"../UnitTestFiles/Results/RenderLegendMultiCTSWithTheme", imageFormat, extension));
}
catch (MgException* e)
{
@@ -783,7 +783,7 @@
map->SetViewScale(75000.0);
Ptr<MgByteReader> rdr1 = m_svcRendering->RenderMapLegend(map, 200, 400, bgc, imageFormat);
- rdr1->ToFile(GetPath(L"../UnitTestFiles/RenderLegendMultiFTSSingleCTS", imageFormat, extension));
+ rdr1->ToFile(GetPath(L"../UnitTestFiles/Results/RenderLegendMultiFTSSingleCTS", imageFormat, extension));
}
catch (MgException* e)
{
@@ -821,7 +821,7 @@
map->SetViewScale(75000.0);
Ptr<MgByteReader> rdr1 = m_svcRendering->RenderMapLegend(map, 200, 400, bgc, imageFormat);
- rdr1->ToFile(GetPath(L"../UnitTestFiles/RenderLegendSingleFTSMultiCTS", imageFormat, extension));
+ rdr1->ToFile(GetPath(L"../UnitTestFiles/Results/RenderLegendSingleFTSMultiCTS", imageFormat, extension));
}
catch (MgException* e)
{
@@ -865,12 +865,12 @@
Ptr<MgColor> selColor = new MgColor(0, 0, 255);
Ptr<MgRenderingOptions> renderOpts = new MgRenderingOptions(imageFormat, MgRenderingOptions::RenderLayers | MgRenderingOptions::RenderBaseLayers, selColor);
Ptr<MgByteReader> img = m_svcRendering->RenderDynamicOverlay(map, nullptr, renderOpts);
- img->ToFile(GetPath(L"../UnitTestFiles/LayerWatermarkOn", imageFormat, extension));
+ img->ToFile(GetPath(L"../UnitTestFiles/Results/LayerWatermarkOn", imageFormat, extension));
layer->SetVisible(false);
map->Save();
img = m_svcRendering->RenderDynamicOverlay(map, nullptr, renderOpts);
- img->ToFile(GetPath(L"../UnitTestFiles/LayerWatermarkOff", imageFormat, extension));
+ img->ToFile(GetPath(L"../UnitTestFiles/Results/LayerWatermarkOff", imageFormat, extension));
}
catch (MgException* e)
{
@@ -904,7 +904,7 @@
Ptr<MgByteReader> br1 = fi1->ToXml();
Ptr<MgByteSink> sink1 = new MgByteSink(br1);
- sink1->ToFile(L"../UnitTestFiles/QueryFeatures75k.xml");
+ sink1->ToFile(L"../UnitTestFiles/Results/QueryFeatures75k.xml");
// call the API using a scale of 12000
map->SetViewScale(12000.0);
@@ -917,7 +917,7 @@
Ptr<MgByteReader> br2 = fi2->ToXml();
Ptr<MgByteSink> sink2 = new MgByteSink(br2);
- sink2->ToFile(L"../UnitTestFiles/QueryFeatures12k.xml");
+ sink2->ToFile(L"../UnitTestFiles/Results/QueryFeatures12k.xml");
}
catch (MgException* e)
{
@@ -962,7 +962,7 @@
// call the API
Ptr<MgByteReader> rdr = m_svcRendering->RenderMap(map, nullptr, imageFormat);
- rdr->ToFile(GetPath(L"../UnitTestFiles/SymbologyPoints", imageFormat, extension));
+ rdr->ToFile(GetPath(L"../UnitTestFiles/Results/SymbologyPoints", imageFormat, extension));
}
catch (MgException* e)
{
@@ -1003,7 +1003,7 @@
// call the API
Ptr<MgByteReader> rdr = m_svcRendering->RenderMap(map, nullptr, imageFormat);
- rdr->ToFile(GetPath(L"../UnitTestFiles/SymbologyPointsParam", imageFormat, extension));
+ rdr->ToFile(GetPath(L"../UnitTestFiles/Results/SymbologyPointsParam", imageFormat, extension));
}
catch (MgException* e)
{
@@ -1044,7 +1044,7 @@
// call the API
Ptr<MgByteReader> rdr = m_svcRendering->RenderMap(map, nullptr, imageFormat);
- rdr->ToFile(GetPath(L"../UnitTestFiles/SymbologyLines", imageFormat, extension));
+ rdr->ToFile(GetPath(L"../UnitTestFiles/Results/SymbologyLines", imageFormat, extension));
}
catch (MgException* e)
{
@@ -1085,7 +1085,7 @@
// call the API
Ptr<MgByteReader> rdr = m_svcRendering->RenderMap(map, nullptr, imageFormat);
- rdr->ToFile(GetPath(L"../UnitTestFiles/SymbologyLinesCrossTick", imageFormat, extension));
+ rdr->ToFile(GetPath(L"../UnitTestFiles/Results/SymbologyLinesCrossTick", imageFormat, extension));
}
catch (MgException* e)
{
@@ -1126,7 +1126,7 @@
// call the API
Ptr<MgByteReader> rdr = m_svcRendering->RenderMap(map, nullptr, imageFormat);
- rdr->ToFile(GetPath(L"../UnitTestFiles/Annotation1", imageFormat, extension));
+ rdr->ToFile(GetPath(L"../UnitTestFiles/Results/Annotation1", imageFormat, extension));
}
catch (MgException* e)
{
@@ -1167,7 +1167,7 @@
// call the API
Ptr<MgByteReader> rdr = m_svcRendering->RenderMap(map, nullptr, imageFormat);
- rdr->ToFile(GetPath(L"../UnitTestFiles/Annotation2", imageFormat, extension));
+ rdr->ToFile(GetPath(L"../UnitTestFiles/Results/Annotation2", imageFormat, extension));
}
catch (MgException* e)
{
@@ -1208,7 +1208,7 @@
// call the API
Ptr<MgByteReader> rdr = m_svcRendering->RenderMap(map, nullptr, imageFormat);
- rdr->ToFile(GetPath(L"../UnitTestFiles/Annotation3", imageFormat, extension));
+ rdr->ToFile(GetPath(L"../UnitTestFiles/Results/Annotation3", imageFormat, extension));
}
catch (MgException* e)
{
@@ -1241,7 +1241,7 @@
map->SetViewScale(12000.0);
Ptr<MgByteReader> rdr2 = m_svcRendering->RenderMap(map, nullptr, imageFormat);
- rdr2->ToFile(GetPath(L"../UnitTestFiles/SymbologyPolygons", imageFormat, extension));
+ rdr2->ToFile(GetPath(L"../UnitTestFiles/Results/SymbologyPolygons", imageFormat, extension));
}
catch (MgException* e)
{
@@ -1259,7 +1259,7 @@
Ptr<MgMap> map = CreateLabelJustifyMap(L"Left");
Ptr<MgByteReader> image = svcRendering->RenderMap(map, nullptr, imageFormat);
- image->ToFile(GetPath(L"../UnitTestFiles/LabelJustifyLeft", imageFormat, extension));
+ image->ToFile(GetPath(L"../UnitTestFiles/Results/LabelJustifyLeft", imageFormat, extension));
}
catch (MgException* e)
{
@@ -1277,7 +1277,7 @@
Ptr<MgMap> map = CreateLabelJustifyMap(L"Right");
Ptr<MgByteReader> image = svcRendering->RenderMap(map, nullptr, imageFormat);
- image->ToFile(GetPath(L"../UnitTestFiles/LabelJustifyRight", imageFormat, extension));
+ image->ToFile(GetPath(L"../UnitTestFiles/Results/LabelJustifyRight", imageFormat, extension));
}
catch (MgException* e)
{
@@ -1295,7 +1295,7 @@
Ptr<MgMap> map = CreateLabelJustifyMap(L"Center");
Ptr<MgByteReader> image = svcRendering->RenderMap(map, nullptr, imageFormat);
- image->ToFile(GetPath(L"../UnitTestFiles/LabelJustifyCenter", imageFormat, extension));
+ image->ToFile(GetPath(L"../UnitTestFiles/Results/LabelJustifyCenter", imageFormat, extension));
}
catch (MgException* e)
{
@@ -1318,10 +1318,10 @@
Ptr<MgByteReader> tile5_6_baseline = m_svcRendering->RenderTile(map, L"BaseLayers", 5, 6, MgTileParameters::tileWidth, MgTileParameters::tileHeight, MgTileParameters::tileDPI, imageFormat);
Ptr<MgByteReader> tile5_7_baseline = m_svcRendering->RenderTile(map, L"BaseLayers", 5, 7, MgTileParameters::tileWidth, MgTileParameters::tileHeight, MgTileParameters::tileDPI, imageFormat);
- tile4_6_baseline->ToFile(GetPath(L"../UnitTestFiles/RenderTile_4_6_Baseline", imageFormat, extension));
- tile4_7_baseline->ToFile(GetPath(L"../UnitTestFiles/RenderTile_4_7_Baseline", imageFormat, extension));
- tile5_6_baseline->ToFile(GetPath(L"../UnitTestFiles/RenderTile_5_6_Baseline", imageFormat, extension));
- tile5_7_baseline->ToFile(GetPath(L"../UnitTestFiles/RenderTile_5_7_Baseline", imageFormat, extension));
+ tile4_6_baseline->ToFile(GetPath(L"../UnitTestFiles/Results/RenderTile_4_6_Baseline", imageFormat, extension));
+ tile4_7_baseline->ToFile(GetPath(L"../UnitTestFiles/Results/RenderTile_4_7_Baseline", imageFormat, extension));
+ tile5_6_baseline->ToFile(GetPath(L"../UnitTestFiles/Results/RenderTile_5_6_Baseline", imageFormat, extension));
+ tile5_7_baseline->ToFile(GetPath(L"../UnitTestFiles/Results/RenderTile_5_7_Baseline", imageFormat, extension));
MgRenderingService* renderSvc = dynamic_cast<MgRenderingService*>(m_svcRendering.p);
REQUIRE(nullptr != renderSvc);
@@ -1329,7 +1329,7 @@
// Render a 2x2 metatile which should cover the same tiles as the baseline test.
INT32 metaTileFactor = 2;
Ptr<MgMetatile> metaTile = renderSvc->RenderMetatile(map, L"BaseLayers", 4, 6, MgTileParameters::tileWidth, MgTileParameters::tileHeight, MgTileParameters::tileDPI, imageFormat, MgConfigProperties::DefaultRenderingServicePropertyTileExtentOffset, metaTileFactor);
- //metaTile->ToFile(L"../UnitTestFiles/RenderTile_Metatile at 4_6.png");
+ //metaTile->ToFile(L"../UnitTestFiles/Results/RenderTile_Metatile at 4_6.png");
//REQUIRE(metaTile->IsRewindable());
//metaTile->Rewind();
Ptr<MgByteReader> tile4_6 = renderSvc->RenderTileFromMetaTile(map, metaTile, 0, 0);
@@ -1338,10 +1338,10 @@
Ptr<MgByteReader> tile5_7 = renderSvc->RenderTileFromMetaTile(map, metaTile, 1, 1);
- tile4_6->ToFile(GetPath(L"../UnitTestFiles/RenderTile_4_6_Metatiled", imageFormat, extension));
- tile4_7->ToFile(GetPath(L"../UnitTestFiles/RenderTile_4_7_Metatiled", imageFormat, extension));
- tile5_6->ToFile(GetPath(L"../UnitTestFiles/RenderTile_5_6_Metatiled", imageFormat, extension));
- tile5_7->ToFile(GetPath(L"../UnitTestFiles/RenderTile_5_7_Metatiled", imageFormat, extension));
+ tile4_6->ToFile(GetPath(L"../UnitTestFiles/Results/RenderTile_4_6_Metatiled", imageFormat, extension));
+ tile4_7->ToFile(GetPath(L"../UnitTestFiles/Results/RenderTile_4_7_Metatiled", imageFormat, extension));
+ tile5_6->ToFile(GetPath(L"../UnitTestFiles/Results/RenderTile_5_6_Metatiled", imageFormat, extension));
+ tile5_7->ToFile(GetPath(L"../UnitTestFiles/Results/RenderTile_5_7_Metatiled", imageFormat, extension));
}
catch (MgException* e)
{
@@ -1373,10 +1373,10 @@
Ptr<MgByteReader> tile_16798_23892_baseline = m_svcRendering->RenderTileXYZ(map, L"BaseLayers", 16798, 23892, 16, MgTileParameters::tileDPI, imageFormat, MgConfigProperties::DefaultRenderingServicePropertyTileExtentOffset, retinaScale);
Ptr<MgByteReader> tile_16799_23892_baseline = m_svcRendering->RenderTileXYZ(map, L"BaseLayers", 16799, 23892, 16, MgTileParameters::tileDPI, imageFormat, MgConfigProperties::DefaultRenderingServicePropertyTileExtentOffset, retinaScale);
- tile_16798_23891_baseline->ToFile(GetPath(L"../UnitTestFiles/RenderTileXYZ_16798_23891_16_Baseline" + retinaSuffix, imageFormat, extension));
- tile_16799_23891_baseline->ToFile(GetPath(L"../UnitTestFiles/RenderTileXYZ_16799_23891_16_Baseline" + retinaSuffix, imageFormat, extension));
- tile_16798_23892_baseline->ToFile(GetPath(L"../UnitTestFiles/RenderTileXYZ_16798_23892_16_Baseline" + retinaSuffix, imageFormat, extension));
- tile_16799_23892_baseline->ToFile(GetPath(L"../UnitTestFiles/RenderTileXYZ_16799_23892_16_Baseline" + retinaSuffix, imageFormat, extension));
+ tile_16798_23891_baseline->ToFile(GetPath(L"../UnitTestFiles/Results/RenderTileXYZ_16798_23891_16_Baseline" + retinaSuffix, imageFormat, extension));
+ tile_16799_23891_baseline->ToFile(GetPath(L"../UnitTestFiles/Results/RenderTileXYZ_16799_23891_16_Baseline" + retinaSuffix, imageFormat, extension));
+ tile_16798_23892_baseline->ToFile(GetPath(L"../UnitTestFiles/Results/RenderTileXYZ_16798_23892_16_Baseline" + retinaSuffix, imageFormat, extension));
+ tile_16799_23892_baseline->ToFile(GetPath(L"../UnitTestFiles/Results/RenderTileXYZ_16799_23892_16_Baseline" + retinaSuffix, imageFormat, extension));
MgRenderingService* renderSvc = dynamic_cast<MgRenderingService*>(m_svcRendering.p);
REQUIRE(nullptr != renderSvc);
@@ -1384,7 +1384,7 @@
// Render a 2x2 metatile which should cover the same tiles as the baseline test.
INT32 metaTileFactor = 2;
Ptr<MgMetatile> metaTile = renderSvc->RenderMetatileXYZ(map, L"BaseLayers", 16798, 23891, 16, MgTileParameters::tileDPI, imageFormat, MgConfigProperties::DefaultRenderingServicePropertyTileExtentOffset, metaTileFactor, retinaScale);
- //metaTile->ToFile(L"../UnitTestFiles/RenderTileXYZ_Metatile at 16798_23891_16.png");
+ //metaTile->ToFile(L"../UnitTestFiles/Results/RenderTileXYZ_Metatile at 16798_23891_16.png");
//REQUIRE(metaTile->IsRewindable());
//metaTile->Rewind();
Ptr<MgByteReader> tile_16798_23891 = renderSvc->RenderTileFromMetaTile(map, metaTile, 0, 0);
@@ -1392,10 +1392,10 @@
Ptr<MgByteReader> tile_16798_23892 = renderSvc->RenderTileFromMetaTile(map, metaTile, 0, 1);
Ptr<MgByteReader> tile_16799_23892 = renderSvc->RenderTileFromMetaTile(map, metaTile, 1, 1);
- tile_16798_23891->ToFile(GetPath(L"../UnitTestFiles/RenderTileXYZ_16798_23891_16_Metatiled" + retinaSuffix, imageFormat, extension));
- tile_16799_23891->ToFile(GetPath(L"../UnitTestFiles/RenderTileXYZ_16799_23891_16_Metatiled" + retinaSuffix, imageFormat, extension));
- tile_16798_23892->ToFile(GetPath(L"../UnitTestFiles/RenderTileXYZ_16798_23892_16_Metatiled" + retinaSuffix, imageFormat, extension));
- tile_16799_23892->ToFile(GetPath(L"../UnitTestFiles/RenderTileXYZ_16799_23892_16_Metatiled" + retinaSuffix, imageFormat, extension));
+ tile_16798_23891->ToFile(GetPath(L"../UnitTestFiles/Results/RenderTileXYZ_16798_23891_16_Metatiled" + retinaSuffix, imageFormat, extension));
+ tile_16799_23891->ToFile(GetPath(L"../UnitTestFiles/Results/RenderTileXYZ_16799_23891_16_Metatiled" + retinaSuffix, imageFormat, extension));
+ tile_16798_23892->ToFile(GetPath(L"../UnitTestFiles/Results/RenderTileXYZ_16798_23892_16_Metatiled" + retinaSuffix, imageFormat, extension));
+ tile_16799_23892->ToFile(GetPath(L"../UnitTestFiles/Results/RenderTileXYZ_16799_23892_16_Metatiled" + retinaSuffix, imageFormat, extension));
}
catch (MgException* e)
{
@@ -1418,10 +1418,10 @@
Ptr<MgByteReader> tile5_6 = m_svcRendering->RenderTile(map, L"BaseLayers", 5, 6, 300, 300, 96, imageFormat);
Ptr<MgByteReader> tile5_7 = m_svcRendering->RenderTile(map, L"BaseLayers", 5, 7, 300, 300, 96, imageFormat);
- tile4_6->ToFile(GetPath(L"../UnitTestFiles/RenderTile_4_6_300x300 at 96", imageFormat, extension));
- tile4_7->ToFile(GetPath(L"../UnitTestFiles/RenderTile_4_7_300x300 at 96", imageFormat, extension));
- tile5_6->ToFile(GetPath(L"../UnitTestFiles/RenderTile_5_6_300x300 at 96", imageFormat, extension));
- tile5_7->ToFile(GetPath(L"../UnitTestFiles/RenderTile_5_7_300x300 at 96", imageFormat, extension));
+ tile4_6->ToFile(GetPath(L"../UnitTestFiles/Results/RenderTile_4_6_300x300 at 96", imageFormat, extension));
+ tile4_7->ToFile(GetPath(L"../UnitTestFiles/Results/RenderTile_4_7_300x300 at 96", imageFormat, extension));
+ tile5_6->ToFile(GetPath(L"../UnitTestFiles/Results/RenderTile_5_6_300x300 at 96", imageFormat, extension));
+ tile5_7->ToFile(GetPath(L"../UnitTestFiles/Results/RenderTile_5_7_300x300 at 96", imageFormat, extension));
Ptr<MgByteReader> tile11_11 = m_svcRendering->RenderTile(map, L"BaseLayers", 11, 11, 256, 256, 96, imageFormat);
Ptr<MgByteReader> tile11_12 = m_svcRendering->RenderTile(map, L"BaseLayers", 11, 12, 256, 256, 96, imageFormat);
@@ -1428,10 +1428,10 @@
Ptr<MgByteReader> tile12_11 = m_svcRendering->RenderTile(map, L"BaseLayers", 12, 11, 256, 256, 96, imageFormat);
Ptr<MgByteReader> tile12_12 = m_svcRendering->RenderTile(map, L"BaseLayers", 12, 12, 256, 256, 96, imageFormat);
- tile11_11->ToFile(GetPath(L"../UnitTestFiles/RenderTile_11_11_256x256 at 96", imageFormat, extension));
- tile11_12->ToFile(GetPath(L"../UnitTestFiles/RenderTile_11_12_256x256 at 96", imageFormat, extension));
- tile12_11->ToFile(GetPath(L"../UnitTestFiles/RenderTile_12_11_256x256 at 96", imageFormat, extension));
- tile12_12->ToFile(GetPath(L"../UnitTestFiles/RenderTile_12_12_256x256 at 96", imageFormat, extension));
+ tile11_11->ToFile(GetPath(L"../UnitTestFiles/Results/RenderTile_11_11_256x256 at 96", imageFormat, extension));
+ tile11_12->ToFile(GetPath(L"../UnitTestFiles/Results/RenderTile_11_12_256x256 at 96", imageFormat, extension));
+ tile12_11->ToFile(GetPath(L"../UnitTestFiles/Results/RenderTile_12_11_256x256 at 96", imageFormat, extension));
+ tile12_12->ToFile(GetPath(L"../UnitTestFiles/Results/RenderTile_12_12_256x256 at 96", imageFormat, extension));
}
catch (MgException* e)
{
@@ -1453,10 +1453,10 @@
Ptr<MgByteReader> tileBL = m_svcRendering->RenderTileXYZ(map, L"BaseLayers", 2099, 2986, 13, 96, imageFormat);
Ptr<MgByteReader> tileBR = m_svcRendering->RenderTileXYZ(map, L"BaseLayers", 2100, 2986, 13, 96, imageFormat);
- tileTL->ToFile(GetPath(L"../UnitTestFiles/RenderTileXYZ_TopLeft", imageFormat, extension));
- tileTR->ToFile(GetPath(L"../UnitTestFiles/RenderTileXYZ_TopRight", imageFormat, extension));
- tileBL->ToFile(GetPath(L"../UnitTestFiles/RenderTileXYZ_BottomLeft", imageFormat, extension));
- tileBR->ToFile(GetPath(L"../UnitTestFiles/RenderTileXYZ_BottomRight", imageFormat, extension));
+ tileTL->ToFile(GetPath(L"../UnitTestFiles/Results/RenderTileXYZ_TopLeft", imageFormat, extension));
+ tileTR->ToFile(GetPath(L"../UnitTestFiles/Results/RenderTileXYZ_TopRight", imageFormat, extension));
+ tileBL->ToFile(GetPath(L"../UnitTestFiles/Results/RenderTileXYZ_BottomLeft", imageFormat, extension));
+ tileBR->ToFile(GetPath(L"../UnitTestFiles/Results/RenderTileXYZ_BottomRight", imageFormat, extension));
}
catch (MgException* e)
{
@@ -1480,10 +1480,10 @@
Ptr<MgByteReader> imgBL = m_svcRendering->RenderTileXYZ(map, L"BaseLayers", 16797, 23894, 16, 96, MgImageFormats::Png);
Ptr<MgByteReader> imgBR = m_svcRendering->RenderTileXYZ(map, L"BaseLayers", 16798, 23894, 16, 96, MgImageFormats::Png);
- imgTL->ToFile(L"../UnitTestFiles/RenderTileUTFGrid_TopLeft_ImageBaseline.png");
- imgTR->ToFile(L"../UnitTestFiles/RenderTileUTFGrid_TopRight_ImageBaseline.png");
- imgBL->ToFile(L"../UnitTestFiles/RenderTileUTFGrid_BottomLeft_ImageBaseline.png");
- imgBR->ToFile(L"../UnitTestFiles/RenderTileUTFGrid_BottomRight_ImageBaseline.png");
+ imgTL->ToFile(L"../UnitTestFiles/Results/RenderTileUTFGrid_TopLeft_ImageBaseline.png");
+ imgTR->ToFile(L"../UnitTestFiles/Results/RenderTileUTFGrid_TopRight_ImageBaseline.png");
+ imgBL->ToFile(L"../UnitTestFiles/Results/RenderTileUTFGrid_BottomLeft_ImageBaseline.png");
+ imgBR->ToFile(L"../UnitTestFiles/Results/RenderTileUTFGrid_BottomRight_ImageBaseline.png");
//Now render the utf grids at the same place
Ptr<MgByteReader> utfTL = m_svcRendering->RenderTileUTFGrid(map, L"BaseLayers", 16797, 23893, 16, 96);
@@ -1491,10 +1491,10 @@
Ptr<MgByteReader> utfBL = m_svcRendering->RenderTileUTFGrid(map, L"BaseLayers", 16797, 23894, 16, 96);
Ptr<MgByteReader> utfBR = m_svcRendering->RenderTileUTFGrid(map, L"BaseLayers", 16798, 23894, 16, 96);
- utfTL->ToFile(L"../UnitTestFiles/RenderTileUTFGrid_TopLeft.utfgrid");
- utfTR->ToFile(L"../UnitTestFiles/RenderTileUTFGrid_TopRight.utfgrid");
- utfBL->ToFile(L"../UnitTestFiles/RenderTileUTFGrid_BottomLeft.utfgrid");
- utfBR->ToFile(L"../UnitTestFiles/RenderTileUTFGrid_BottomRight.utfgrid");
+ utfTL->ToFile(L"../UnitTestFiles/Results/RenderTileUTFGrid_TopLeft.utfgrid");
+ utfTR->ToFile(L"../UnitTestFiles/Results/RenderTileUTFGrid_TopRight.utfgrid");
+ utfBL->ToFile(L"../UnitTestFiles/Results/RenderTileUTFGrid_BottomLeft.utfgrid");
+ utfBR->ToFile(L"../UnitTestFiles/Results/RenderTileUTFGrid_BottomRight.utfgrid");
}
catch (MgException* e)
{
@@ -1518,10 +1518,10 @@
Ptr<MgByteReader> imgBL = m_svcRendering->RenderTileXYZ(map, L"BaseLayers", 16797, 23894, 16, 96, MgImageFormats::Png);
Ptr<MgByteReader> imgBR = m_svcRendering->RenderTileXYZ(map, L"BaseLayers", 16798, 23894, 16, 96, MgImageFormats::Png);
- imgTL->ToFile(L"../UnitTestFiles/RenderTileMVT_TL_ImageBaseline.png");
- imgTR->ToFile(L"../UnitTestFiles/RenderTileMVT_TR_ImageBaseline.png");
- imgBL->ToFile(L"../UnitTestFiles/RenderTileMVT_BL_ImageBaseline.png");
- imgBR->ToFile(L"../UnitTestFiles/RenderTileMVT_BR_ImageBaseline.png");
+ imgTL->ToFile(L"../UnitTestFiles/Results/RenderTileMVT_TL_ImageBaseline.png");
+ imgTR->ToFile(L"../UnitTestFiles/Results/RenderTileMVT_TR_ImageBaseline.png");
+ imgBL->ToFile(L"../UnitTestFiles/Results/RenderTileMVT_BL_ImageBaseline.png");
+ imgBR->ToFile(L"../UnitTestFiles/Results/RenderTileMVT_BR_ImageBaseline.png");
//Now render the MVT tiles at the same place
Ptr<MgByteReader> mvtTL = m_svcRendering->RenderTileMVT(map, L"BaseLayers", 16797, 23893, 16, 96);
@@ -1539,10 +1539,10 @@
REQUIRE(mvtBL->GetLength() > 0);
REQUIRE(mvtBR->GetLength() > 0);
- mvtTL->ToFile(L"../UnitTestFiles/RenderTileMVT_TL.mvt");
- mvtTR->ToFile(L"../UnitTestFiles/RenderTileMVT_TR.mvt");
- mvtBL->ToFile(L"../UnitTestFiles/RenderTileMVT_BL.mvt");
- mvtBR->ToFile(L"../UnitTestFiles/RenderTileMVT_UR.mvt");
+ mvtTL->ToFile(L"../UnitTestFiles/Results/RenderTileMVT_TL.mvt");
+ mvtTR->ToFile(L"../UnitTestFiles/Results/RenderTileMVT_TR.mvt");
+ mvtBL->ToFile(L"../UnitTestFiles/Results/RenderTileMVT_BL.mvt");
+ mvtBR->ToFile(L"../UnitTestFiles/Results/RenderTileMVT_UR.mvt");
mvtTL->Rewind();
mvtTR->Rewind();
@@ -1775,7 +1775,7 @@
Ptr<MgColor> bg = new MgColor(255, 255, 255);
Ptr<MgByteReader> rdr1 = m_svcRendering->RenderMap(map, nullptr, env, mw, mh, bg, imageFormat);
- rdr1->ToFile(GetPath(L"../UnitTestFiles/RenderMapBig", imageFormat, extension));
+ rdr1->ToFile(GetPath(L"../UnitTestFiles/Results/RenderMapBig", imageFormat, extension));
}
catch (MgException* e)
{
Modified: trunk/MgDev/Server/src/UnitTesting/TestServiceFactory.cpp
===================================================================
--- trunk/MgDev/Server/src/UnitTesting/TestServiceFactory.cpp 2023-02-09 10:44:17 UTC (rev 10026)
+++ trunk/MgDev/Server/src/UnitTesting/TestServiceFactory.cpp 2023-02-09 11:58:27 UTC (rev 10027)
@@ -183,6 +183,8 @@
// The whole test run starting
void testRunStarting(Catch::TestRunInfo const& testRunInfo) override {
+ MgFileUtil::CreateDirectory(L"../UnitTestFiles/Baselines", false);
+ MgFileUtil::CreateDirectory(L"../UnitTestFiles/Results", false);
Ptr<MgResourceService> svcResource = TestServiceFactory::CreateResourceService();
Modified: trunk/MgDev/Server/src/UnitTesting/TestTileService.cpp
===================================================================
--- trunk/MgDev/Server/src/UnitTesting/TestTileService.cpp 2023-02-09 10:44:17 UTC (rev 10026)
+++ trunk/MgDev/Server/src/UnitTesting/TestTileService.cpp 2023-02-09 11:58:27 UTC (rev 10027)
@@ -1607,7 +1607,7 @@
Ptr<MgByteReader> content = m_svcTile->GetTileProviders();
Ptr<MgByteSink> sink = new MgByteSink(content);
- sink->ToFile(L"../UnitTestFiles/GetTileProviders_Result.xml");
+ sink->ToFile(L"../UnitTestFiles/Results/GetTileProviders_Result.xml");
}
catch (MgException* e)
{
@@ -1639,7 +1639,7 @@
tsId = new MgResourceIdentifier(L"Library://UnitTests/TileSets/Sheboygan_OrigSize.TileSetDefinition");
m_svcTile->ClearCache(tsId);
tile = m_svcTile->GetTile(tsId, L"BaseLayers", col, row, scale);
- tile->ToFile(L"../UnitTestFiles/GetMetatileSingle_Baseline.png");
+ tile->ToFile(L"../UnitTestFiles/Results/GetMetatileSingle_Baseline.png");
INT32 metaTileFactor = 4;
//Render full 4x4 tiles to check we're generating the same file paths from metatile
@@ -1656,7 +1656,7 @@
Ptr<MgRenderingService> renderSvc = dynamic_cast<MgRenderingService*>(m_siteConnection->CreateService(MgServiceType::RenderingService));
REQUIRE(nullptr != renderSvc);
- MgFileUtil::CreateDirectory(L"../UnitTestFiles/GetMetatileSingle_Baseline");
+ MgFileUtil::CreateDirectory(L"../UnitTestFiles/Baselines/GetMetatileSingle");
Ptr<MgMetatile> metaTile = renderSvc->RenderMetatile(map, L"BaseLayers", col, row, MgTileParameters::tileWidth, MgTileParameters::tileHeight, MgTileParameters::tileDPI, MgImageFormats::Png, MgConfigProperties::DefaultRenderingServicePropertyTileExtentOffset, metaTileFactor);
Ptr<MgByteReader> mtContent = metaTile->GetImage();
@@ -1667,7 +1667,7 @@
{
Ptr<MgByteReader> img = renderSvc->RenderTileFromMetaTile(map, metaTile, x, y);
INT64 tileLen = img->GetLength();
- STRING fileName = L"../UnitTestFiles/GetMetatileSingle_Baseline/";
+ STRING fileName = L"../UnitTestFiles/Baselines/GetMetatileSingle/";
STRING s;
MgUtil::Int32ToString(y, s);
fileName += s;
@@ -1682,7 +1682,7 @@
tsId = new MgResourceIdentifier(L"Library://UnitTests/TileSets/Sheboygan_Metatiled.TileSetDefinition");
m_svcTile->ClearCache(tsId);
tile = m_svcTile->GetTile(tsId, L"BaseLayers", col, row, scale);
- tile->ToFile(L"../UnitTestFiles/GetMetatileSingle.png");
+ tile->ToFile(L"../UnitTestFiles/Results/GetMetatileSingle.png");
}
catch (MgException* e)
{
@@ -1714,7 +1714,7 @@
tsId = new MgResourceIdentifier(L"Library://UnitTests/TileSets/XYZ.TileSetDefinition");
m_svcTile->ClearCache(tsId);
tile = m_svcTile->GetTile(tsId, L"BaseLayers", x, y, z);
- tile->ToFile(L"../UnitTestFiles/GetMetatileXYZSingle_Baseline.png");
+ tile->ToFile(L"../UnitTestFiles/Results/GetMetatileXYZSingle_Baseline.png");
INT32 metaTileFactor = 4;
//Render full 4x4 tiles to check we're generating the same file paths from metatile
@@ -1734,7 +1734,7 @@
Ptr<MgRenderingService> renderSvc = dynamic_cast<MgRenderingService*>(m_siteConnection->CreateService(MgServiceType::RenderingService));
REQUIRE(nullptr != renderSvc);
- MgFileUtil::CreateDirectory(L"../UnitTestFiles/GetMetatileSingleXYZ_Baseline");
+ MgFileUtil::CreateDirectory(L"../UnitTestFiles/Baselines/GetMetatileSingleXYZ");
//NOTE: When rendering the XYZ tile we need to flip x/y
INT32 mtX = y;
@@ -1750,7 +1750,7 @@
{
Ptr<MgByteReader> img = renderSvc->RenderTileFromMetaTile(map, metaTile, x1, y1);
INT64 tileLen = img->GetLength();
- STRING fileName = L"../UnitTestFiles/GetMetatileSingleXYZ_Baseline/";
+ STRING fileName = L"../UnitTestFiles/Baselines/GetMetatileSingleXYZ/";
STRING s;
MgUtil::Int32ToString(y1 + y, s);
fileName += s;
@@ -1765,7 +1765,7 @@
tsId = new MgResourceIdentifier(L"Library://UnitTests/TileSets/XYZ_Metatiled.TileSetDefinition");
m_svcTile->ClearCache(tsId);
tile = m_svcTile->GetTile(tsId, L"BaseLayers", x, y, z);
- tile->ToFile(L"../UnitTestFiles/GetMetatileXYZSingle.png");
+ tile->ToFile(L"../UnitTestFiles/Results/GetMetatileXYZSingle.png");
}
catch (MgException* e)
More information about the mapguide-commits
mailing list