[mapguide-commits] r1371 - trunk/MgDev/Server/src/UnitTesting
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Sun Mar 25 12:19:03 EDT 2007
Author: stevedang
Date: 2007-03-25 12:19:03 -0400 (Sun, 25 Mar 2007)
New Revision: 1371
Modified:
trunk/MgDev/Server/src/UnitTesting/TestKmlService.cpp
trunk/MgDev/Server/src/UnitTesting/TestKmlService.h
trunk/MgDev/Server/src/UnitTesting/TestMappingService.cpp
trunk/MgDev/Server/src/UnitTesting/TestMappingService.h
trunk/MgDev/Server/src/UnitTesting/TestRenderingService.cpp
trunk/MgDev/Server/src/UnitTesting/TestRenderingService.h
Log:
Update KML/Mapping/Rendering unit tests to use new APIs implemented for RFC 9.
Modified: trunk/MgDev/Server/src/UnitTesting/TestKmlService.cpp
===================================================================
--- trunk/MgDev/Server/src/UnitTesting/TestKmlService.cpp 2007-03-25 15:54:09 UTC (rev 1370)
+++ trunk/MgDev/Server/src/UnitTesting/TestKmlService.cpp 2007-03-25 16:19:03 UTC (rev 1371)
@@ -16,13 +16,11 @@
//
#include "MapGuideCommon.h"
-#include "MapGuideCommon.h"
+#include "TestKmlService.h"
#include "ServiceManager.h"
-#include "ServerMappingService.h"
#include "ServerResourceService.h"
#include "ServerSiteService.h"
#include "../Common/Manager/FdoConnectionManager.h"
-#include "TestKmlService.h"
const STRING TEST_LOCALE = L"en";
@@ -31,6 +29,7 @@
TestKmlService::TestKmlService()
{
+ // Initialize service objects.
MgServiceManager* serviceManager = MgServiceManager::GetInstance();
m_svcResource = dynamic_cast<MgResourceService*>(
@@ -41,10 +40,22 @@
serviceManager->RequestService(MgServiceType::KmlService));
assert(m_svcKml != NULL);
- m_svcSite = dynamic_cast<MgServerSiteService*>(
+ // Initialize a site connection.
+ Ptr<MgServerSiteService> svcSite = dynamic_cast<MgServerSiteService*>(
serviceManager->RequestService(MgServiceType::SiteService));
- assert(m_svcSite != NULL);
+ assert(svcSite != NULL);
+ Ptr<MgUserInformation> userInfo = new MgUserInformation(
+ L"Administrator", L"admin");
+ userInfo->SetLocale(TEST_LOCALE);
+ MgUserInformation::SetCurrentUserInfo(userInfo);
+
+ STRING session = svcSite->CreateSession();
+ assert(!session.empty());
+ userInfo->SetMgSessionId(session);
+
+ m_siteConnection = new MgSiteConnection();
+ m_siteConnection->Open(userInfo);
}
@@ -77,16 +88,6 @@
}
#endif
- //set user info
- Ptr<MgUserInformation> userInfo = new MgUserInformation(L"Administrator", L"admin");
- userInfo->SetLocale(TEST_LOCALE);
- MgUserInformation::SetCurrentUserInfo(userInfo);
-
- //create a session
- STRING session = m_svcSite->CreateSession();
- CPPUNIT_ASSERT(!session.empty());
- userInfo->SetMgSessionId(session);
-
//publish the map definition
Ptr<MgResourceIdentifier> mapres = new MgResourceIdentifier(L"Library://UnitTests/Maps/Sheboygan.MapDefinition");
Ptr<MgByteSource> mdfsrc = new MgByteSource(L"../UnitTestFiles/UT_Sheboygan.mdf", false);
@@ -155,11 +156,6 @@
{
try
{
- //set user info
- Ptr<MgUserInformation> userInfo = new MgUserInformation(L"Administrator", L"admin");
- userInfo->SetLocale(TEST_LOCALE);
- MgUserInformation::SetCurrentUserInfo(userInfo);
-
//delete the map definition
Ptr<MgResourceIdentifier> mapres = new MgResourceIdentifier(L"Library://UnitTests/Maps/Sheboygan.MapDefinition");
m_svcResource->DeleteResource(mapres);
@@ -211,13 +207,10 @@
{
try
{
- //get root
- Ptr<MgSiteConnection> conn = new MgSiteConnection();
-
//create map object
Ptr<MgResourceIdentifier> mdfres = new MgResourceIdentifier(L"Library://UnitTests/Maps/Sheboygan.MapDefinition");
- Ptr<MgMap> map = new MgMap();
- map->Create(m_svcResource, mdfres, L"UnitTestSheboygan");
+ Ptr<MgMap> map = new MgMap(m_siteConnection);
+ map->Create(mdfres, L"UnitTestSheboygan");
//set other params
double dpi = 96;
@@ -253,8 +246,8 @@
{
//create map object
Ptr<MgResourceIdentifier> mdfres = new MgResourceIdentifier(L"Library://UnitTests/Maps/Sheboygan.MapDefinition");
- Ptr<MgMap> map = new MgMap();
- map->Create(m_svcResource, mdfres, L"UnitTestSheboygan");
+ Ptr<MgMap> map = new MgMap(m_siteConnection);
+ map->Create(mdfres, L"UnitTestSheboygan");
//set other params
double dpi = 96;
Modified: trunk/MgDev/Server/src/UnitTesting/TestKmlService.h
===================================================================
--- trunk/MgDev/Server/src/UnitTesting/TestKmlService.h 2007-03-25 15:54:09 UTC (rev 1370)
+++ trunk/MgDev/Server/src/UnitTesting/TestKmlService.h 2007-03-25 16:19:03 UTC (rev 1371)
@@ -15,7 +15,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-#ifndef _TestKmlService_H
+#ifndef TestKmlService_H_
#define TestKmlService_H_
#include <cppunit/extensions/HelperMacros.h>
@@ -54,8 +54,8 @@
STRING LoadFromFile(CREFSTRING filename);
bool CompareContent(MgByteReader* reader, CREFSTRING referenceFile);
+ Ptr<MgSiteConnection> m_siteConnection;
Ptr<MgResourceService> m_svcResource;
- Ptr<MgServerSiteService> m_svcSite;
Ptr<MgKmlService> m_svcKml;
};
Modified: trunk/MgDev/Server/src/UnitTesting/TestMappingService.cpp
===================================================================
--- trunk/MgDev/Server/src/UnitTesting/TestMappingService.cpp 2007-03-25 15:54:09 UTC (rev 1370)
+++ trunk/MgDev/Server/src/UnitTesting/TestMappingService.cpp 2007-03-25 16:19:03 UTC (rev 1371)
@@ -16,11 +16,11 @@
//
#include "MapGuideCommon.h"
-#include "MapGuideCommon.h"
#include "TestMappingService.h"
#include "ServiceManager.h"
-#include "ServerMappingService.h"
#include "ServerResourceService.h"
+#include "ServerMappingService.h"
+#include "ServerSiteService.h"
#include "../Common/Manager/FdoConnectionManager.h"
const STRING TEST_LOCALE = L"en";
@@ -30,15 +30,33 @@
TestMappingService::TestMappingService()
{
+ // Initialize service objects.
MgServiceManager* serviceManager = MgServiceManager::GetInstance();
m_svcResource = dynamic_cast<MgResourceService*>(
serviceManager->RequestService(MgServiceType::ResourceService));
assert(m_svcResource != NULL);
- m_svcNapping = dynamic_cast<MgMappingService*>(
+ m_svcMapping = dynamic_cast<MgMappingService*>(
serviceManager->RequestService(MgServiceType::MappingService));
- assert(m_svcNapping != NULL);
+ assert(m_svcMapping != NULL);
+
+ // Initialize a site connection.
+ Ptr<MgServerSiteService> svcSite = dynamic_cast<MgServerSiteService*>(
+ serviceManager->RequestService(MgServiceType::SiteService));
+ assert(svcSite != NULL);
+
+ Ptr<MgUserInformation> userInfo = new MgUserInformation(
+ L"Administrator", L"admin");
+ userInfo->SetLocale(TEST_LOCALE);
+ MgUserInformation::SetCurrentUserInfo(userInfo);
+
+ STRING session = svcSite->CreateSession();
+ assert(!session.empty());
+ userInfo->SetMgSessionId(session);
+
+ m_siteConnection = new MgSiteConnection();
+ m_siteConnection->Open(userInfo);
}
@@ -231,18 +249,15 @@
{
try
{
- //get root
- Ptr<MgSiteConnection> conn = new MgSiteConnection();
-
//make a runtime map
Ptr<MgResourceIdentifier> mdfres = new MgResourceIdentifier(L"Library://UnitTests/Maps/Sheboygan.MapDefinition");
- Ptr<MgMap> map = new MgMap();
- map->Create(m_svcResource, mdfres, L"UnitTestSheboygan");
+ Ptr<MgMap> map = new MgMap(m_siteConnection);
+ map->Create(mdfres, L"UnitTestSheboygan");
Ptr<MgDwfVersion> version = new MgDwfVersion();
//call the API
- Ptr<MgByteReader> emap = m_svcNapping->GenerateMap(map, L"blurple", L"clump", version);
+ Ptr<MgByteReader> emap = m_svcMapping->GenerateMap(map, L"blurple", L"clump", version);
}
catch(MgException* e)
{
@@ -261,18 +276,15 @@
{
try
{
- //get root
- Ptr<MgSiteConnection> conn = new MgSiteConnection();
-
//make a runtime map
Ptr<MgResourceIdentifier> mdfres = new MgResourceIdentifier(L"Library://UnitTests/Maps/Sheboygan.MapDefinition");
- Ptr<MgMap> map = new MgMap();
- map->Create(m_svcResource, mdfres, L"UnitTestSheboygan");
+ Ptr<MgMap> map = new MgMap(m_siteConnection);
+ map->Create(mdfres, L"UnitTestSheboygan");
Ptr<MgDwfVersion> version = new MgDwfVersion();
//call the API
- Ptr<MgByteReader> emapupdate = m_svcNapping->GenerateMapUpdate(map, 42, version);
+ Ptr<MgByteReader> emapupdate = m_svcMapping->GenerateMapUpdate(map, 42, version);
INT64 len = emapupdate->GetLength();
@@ -295,31 +307,28 @@
{
try
{
- // get root
- Ptr<MgSiteConnection> conn = new MgSiteConnection();
-
// make a runtime map
Ptr<MgResourceIdentifier> mapRes1 = new MgResourceIdentifier(L"Library://UnitTests/Maps/Sheboygan.MapDefinition");
- Ptr<MgMap> map1 = new MgMap();
- map1->Create(m_svcResource, mapRes1, L"UnitTestSheboygan1");
+ Ptr<MgMap> map1 = new MgMap(m_siteConnection);
+ map1->Create(mapRes1, L"UnitTestSheboygan1");
map1->SetViewScale(200e+6);
// make another runtime map
Ptr<MgResourceIdentifier> mapRes2 = new MgResourceIdentifier(L"Library://UnitTests/Maps/Sheboygan.MapDefinition");
- Ptr<MgMap> map2 = new MgMap();
- map2->Create(m_svcResource, mapRes2, L"UnitTestSheboygan2");
+ Ptr<MgMap> map2 = new MgMap(m_siteConnection);
+ map2->Create(mapRes2, L"UnitTestSheboygan2");
map2->SetViewScale(100e+6);
// make yet another runtime map
Ptr<MgResourceIdentifier> mapRes3 = new MgResourceIdentifier(L"Library://UnitTests/Maps/Sheboygan.MapDefinition");
- Ptr<MgMap> map3 = new MgMap();
- map3->Create(m_svcResource, mapRes3, L"UnitTestSheboygan3");
+ Ptr<MgMap> map3 = new MgMap(m_siteConnection);
+ map3->Create(mapRes3, L"UnitTestSheboygan3");
map3->SetViewScale(20e+6);
// make a 4th runtime map
Ptr<MgResourceIdentifier> mapRes4 = new MgResourceIdentifier(L"Library://UnitTests/Maps/Sheboygan.MapDefinition");
- Ptr<MgMap> map4 = new MgMap();
- map4->Create(m_svcResource, mapRes4, L"UnitTestSheboygan4");
+ Ptr<MgMap> map4 = new MgMap(m_siteConnection);
+ map4->Create(mapRes4, L"UnitTestSheboygan4");
map4->SetViewScale(20e+6);
// Create the DwfVersion
@@ -356,7 +365,7 @@
mapPlots->Add(mapPlot4);
// call the API
- Ptr<MgByteReader> eplot = m_svcNapping->GenerateMultiPlot(mapPlots, version);
+ Ptr<MgByteReader> eplot = m_svcMapping->GenerateMultiPlot(mapPlots, version);
INT64 len = eplot->GetLength();
@@ -382,13 +391,10 @@
{
try
{
- // get root
- Ptr<MgSiteConnection> conn = new MgSiteConnection();
-
// make a runtime map
Ptr<MgResourceIdentifier> mapRes1 = new MgResourceIdentifier(L"Library://UnitTests/Maps/Sheboygan.MapDefinition");
- Ptr<MgMap> map1 = new MgMap();
- map1->Create(m_svcResource, mapRes1, L"UnitTestSheboygan1");
+ Ptr<MgMap> map1 = new MgMap(m_siteConnection);
+ map1->Create(mapRes1, L"UnitTestSheboygan1");
map1->SetViewScale(400e+6);
Ptr<MgDwfVersion> version = new MgDwfVersion();
@@ -404,8 +410,8 @@
Ptr<MgLayout> layout = new MgLayout(allElementsLayout, L"TestTitle", MgUnitType::USEnglish);
// call the API
- Ptr<MgByteReader> eplot = m_svcNapping->GeneratePlot(map1, plotSpec, NULL, version);
- //Ptr<MgByteReader> eplot = m_svcNapping->GeneratePlot(map1, plotSpec, layout, version);
+ Ptr<MgByteReader> eplot = m_svcMapping->GeneratePlot(map1, plotSpec, NULL, version);
+ //Ptr<MgByteReader> eplot = m_svcMapping->GeneratePlot(map1, plotSpec, layout, version);
INT64 len = eplot->GetLength();
@@ -431,13 +437,10 @@
{
try
{
- // get root
- Ptr<MgSiteConnection> conn = new MgSiteConnection();
-
// make a runtime map
Ptr<MgResourceIdentifier> mapRes1 = new MgResourceIdentifier(L"Library://UnitTests/Maps/Sheboygan.MapDefinition");
- Ptr<MgMap> map1 = new MgMap();
- map1->Create(m_svcResource, mapRes1, L"UnitTestSheboygan1");
+ Ptr<MgMap> map1 = new MgMap(m_siteConnection);
+ map1->Create(mapRes1, L"UnitTestSheboygan1");
map1->SetViewScale(400e+6);
Ptr<MgDwfVersion> version = new MgDwfVersion();
@@ -453,7 +456,7 @@
Ptr<MgLayout> layout = new MgLayout(allElementsLayout, L"TestTitle", MgUnitType::USEnglish);
// call the API
- Ptr<MgByteReader> eplot = m_svcNapping->GeneratePlot(map1, center, scale, plotSpec, layout, version);
+ Ptr<MgByteReader> eplot = m_svcMapping->GeneratePlot(map1, center, scale, plotSpec, layout, version);
INT64 len = eplot->GetLength();
@@ -479,13 +482,10 @@
{
try
{
- // get root
- Ptr<MgSiteConnection> conn = new MgSiteConnection();
-
// make a runtime map
Ptr<MgResourceIdentifier> mapRes1 = new MgResourceIdentifier(L"Library://UnitTests/Maps/Sheboygan.MapDefinition");
- Ptr<MgMap> map1 = new MgMap();
- map1->Create(m_svcResource, mapRes1, L"UnitTestSheboygan1");
+ Ptr<MgMap> map1 = new MgMap(m_siteConnection);
+ map1->Create(mapRes1, L"UnitTestSheboygan1");
map1->SetViewScale(400e+6);
Ptr<MgDwfVersion> version = new MgDwfVersion();
@@ -501,7 +501,7 @@
Ptr<MgLayout> layout = new MgLayout(allElementsLayout, L"TestTitle", MgUnitType::USEnglish);
// call the API
- Ptr<MgByteReader> eplot = m_svcNapping->GeneratePlot(map1, extents, false, plotSpec, layout, version);
+ Ptr<MgByteReader> eplot = m_svcMapping->GeneratePlot(map1, extents, false, plotSpec, layout, version);
INT64 len = eplot->GetLength();
@@ -527,13 +527,10 @@
{
try
{
- // get root
- Ptr<MgSiteConnection> conn = new MgSiteConnection();
-
// make a runtime map
Ptr<MgResourceIdentifier> mapRes1 = new MgResourceIdentifier(L"Library://UnitTests/Maps/Sheboygan.MapDefinition");
- Ptr<MgMap> map1 = new MgMap();
- map1->Create(m_svcResource, mapRes1, L"UnitTestSheboygan1");
+ Ptr<MgMap> map1 = new MgMap(m_siteConnection);
+ map1->Create(mapRes1, L"UnitTestSheboygan1");
map1->SetViewScale(400e+6);
Ptr<MgDwfVersion> version = new MgDwfVersion();
@@ -549,7 +546,7 @@
Ptr<MgLayout> layout = new MgLayout(allElementsLayout, L"TestTitle", MgUnitType::USEnglish);
// call the API
- Ptr<MgByteReader> eplot = m_svcNapping->GeneratePlot(map1, extents, true, plotSpec, NULL, version);
+ Ptr<MgByteReader> eplot = m_svcMapping->GeneratePlot(map1, extents, true, plotSpec, NULL, version);
INT64 len = eplot->GetLength();
@@ -575,13 +572,10 @@
{
try
{
- // get root
- Ptr<MgSiteConnection> conn = new MgSiteConnection();
-
// make a runtime map
Ptr<MgResourceIdentifier> mapRes1 = new MgResourceIdentifier(L"Library://UnitTests/Maps/Sheboygan.MapDefinition");
- Ptr<MgMap> map1 = new MgMap();
- map1->Create(m_svcResource, mapRes1, L"UnitTestSheboygan1");
+ Ptr<MgMap> map1 = new MgMap(m_siteConnection);
+ map1->Create(mapRes1, L"UnitTestSheboygan1");
map1->SetViewScale(200e+6);
Ptr<MgDwfVersion> version = new MgDwfVersion();
@@ -590,7 +584,7 @@
double dMapScale = 200e+6;
// call the API
- Ptr<MgByteReader> eplot = m_svcNapping->GenerateLegendPlot(map1, dMapScale, plotSpec, version);
+ Ptr<MgByteReader> eplot = m_svcMapping->GenerateLegendPlot(map1, dMapScale, plotSpec, version);
INT64 len = eplot->GetLength();
@@ -616,13 +610,10 @@
{
try
{
- // get root
- Ptr<MgSiteConnection> conn = new MgSiteConnection();
-
// make a runtime map
Ptr<MgResourceIdentifier> mdfres = new MgResourceIdentifier(L"Library://UnitTests/Maps/Sheboygan.MapDefinition");
- Ptr<MgMap> map = new MgMap();
- map->Create(m_svcResource, mdfres, L"UnitTestSheboygan");
+ Ptr<MgMap> map = new MgMap(m_siteConnection);
+ map->Create(mdfres, L"UnitTestSheboygan");
Ptr<MgCoordinate> c1 = new MgCoordinateXY(-180,0);
Ptr<MgCoordinate> c2 = new MgCoordinateXY(0,90);
@@ -641,7 +632,7 @@
map->SetDisplayHeight(600);
// call the API
- Ptr<MgByteReader> features = m_svcNapping->QueryFeatures(map, L"Parcels", L"Display"/*MgCoordinateSpace::Display*/);
+ Ptr<MgByteReader> features = m_svcMapping->QueryFeatures(map, L"Parcels", L"Display"/*MgCoordinateSpace::Display*/);
// delete result from QueryFeatures test
Ptr<MgResourceIdentifier> qfres1 = new MgResourceIdentifier(L"Library://UnitTests/Data/Parcels.FeatureSource");
Modified: trunk/MgDev/Server/src/UnitTesting/TestMappingService.h
===================================================================
--- trunk/MgDev/Server/src/UnitTesting/TestMappingService.h 2007-03-25 15:54:09 UTC (rev 1370)
+++ trunk/MgDev/Server/src/UnitTesting/TestMappingService.h 2007-03-25 16:19:03 UTC (rev 1371)
@@ -15,7 +15,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-#ifndef _TESTMAPPINGSERVICE_H
+#ifndef TESTMAPPINGSERVICE_H_
#define TESTMAPPINGSERVICE_H_
#include <cppunit/extensions/HelperMacros.h>
@@ -63,8 +63,9 @@
void PublishTheResources();
+ Ptr<MgSiteConnection> m_siteConnection;
Ptr<MgResourceService> m_svcResource;
- Ptr<MgMappingService> m_svcNapping;
+ Ptr<MgMappingService> m_svcMapping;
};
#endif // TESTMAPPINGSERVICE_H_
Modified: trunk/MgDev/Server/src/UnitTesting/TestRenderingService.cpp
===================================================================
--- trunk/MgDev/Server/src/UnitTesting/TestRenderingService.cpp 2007-03-25 15:54:09 UTC (rev 1370)
+++ trunk/MgDev/Server/src/UnitTesting/TestRenderingService.cpp 2007-03-25 16:19:03 UTC (rev 1371)
@@ -18,6 +18,7 @@
#include "MapGuideCommon.h"
#include "TestRenderingService.h"
#include "ServiceManager.h"
+#include "ServerSiteService.h"
#include "../Common/Manager/FdoConnectionManager.h"
#include "SAX2Parser.h"
@@ -28,13 +29,33 @@
TestRenderingService::TestRenderingService()
{
+ // Initialize service objects.
MgServiceManager* serviceManager = MgServiceManager::GetInstance();
- m_svcResource = dynamic_cast<MgResourceService*>(serviceManager->RequestService(MgServiceType::ResourceService));
+ m_svcResource = dynamic_cast<MgResourceService*>(
+ serviceManager->RequestService(MgServiceType::ResourceService));
assert(m_svcResource != NULL);
- m_svcRendering = dynamic_cast<MgRenderingService*>(serviceManager->RequestService(MgServiceType::RenderingService));
+ m_svcRendering = dynamic_cast<MgRenderingService*>(
+ serviceManager->RequestService(MgServiceType::RenderingService));
assert(m_svcRendering != NULL);
+
+ // Initialize a site connection.
+ Ptr<MgServerSiteService> svcSite = dynamic_cast<MgServerSiteService*>(
+ serviceManager->RequestService(MgServiceType::SiteService));
+ assert(svcSite != NULL);
+
+ Ptr<MgUserInformation> userInfo = new MgUserInformation(
+ L"Administrator", L"admin");
+ userInfo->SetLocale(TEST_LOCALE);
+ MgUserInformation::SetCurrentUserInfo(userInfo);
+
+ STRING session = svcSite->CreateSession();
+ assert(!session.empty());
+ userInfo->SetMgSessionId(session);
+
+ m_siteConnection = new MgSiteConnection();
+ m_siteConnection->Open(userInfo);
}
@@ -67,11 +88,6 @@
}
#endif
- // set user info
- Ptr<MgUserInformation> userInfo = new MgUserInformation(L"Administrator", L"admin");
- userInfo->SetLocale(TEST_LOCALE);
- MgUserInformation::SetCurrentUserInfo(userInfo);
-
// publish the map definition
Ptr<MgResourceIdentifier> mapres1 = new MgResourceIdentifier(L"Library://UnitTests/Maps/Sheboygan.MapDefinition");
Ptr<MgByteSource> mdfsrc1 = new MgByteSource(L"../UnitTestFiles/UT_Sheboygan.mdf", false);
@@ -268,11 +284,6 @@
{
try
{
- // set user info
- Ptr<MgUserInformation> userInfo = new MgUserInformation(L"Administrator", L"admin");
- userInfo->SetLocale(TEST_LOCALE);
- MgUserInformation::SetCurrentUserInfo(userInfo);
-
// delete the map definition
Ptr<MgResourceIdentifier> mapres1 = new MgResourceIdentifier(L"Library://UnitTests/Maps/Sheboygan.MapDefinition");
m_svcResource->DeleteResource(mapres1);
@@ -373,9 +384,6 @@
{
try
{
- // get root
- Ptr<MgSiteConnection> conn = new MgSiteConnection();
-
// make a runtime map
Ptr<MgMap> map = CreateTestMap();
@@ -405,9 +413,6 @@
{
try
{
- // get root
- Ptr<MgSiteConnection> conn = new MgSiteConnection();
-
// make a runtime map
Ptr<MgMap> map = CreateTestMap();
@@ -437,9 +442,6 @@
{
try
{
- // get root
- Ptr<MgSiteConnection> conn = new MgSiteConnection();
-
// make a runtime map
Ptr<MgMap> map = CreateTestMap();
@@ -471,9 +473,6 @@
{
try
{
- // get root
- Ptr<MgSiteConnection> conn = new MgSiteConnection();
-
// make a runtime map
Ptr<MgMap> map = CreateTestMap();
@@ -511,8 +510,8 @@
MgMap* TestRenderingService::CreateTestMap()
{
Ptr<MgResourceIdentifier> mdfres = new MgResourceIdentifier(L"Library://UnitTests/Maps/Sheboygan.MapDefinition");
- MgMap* map = new MgMap();
- map->Create(m_svcResource, mdfres, L"UnitTestSheboygan");
+ MgMap* map = new MgMap(m_siteConnection);
+ map->Create(mdfres, L"UnitTestSheboygan");
Ptr<MgCoordinate> coordNewCenter = new MgCoordinateXY(-87.733253, 43.746199);
Ptr<MgPoint> ptNewCenter = new MgPoint(coordNewCenter);
@@ -710,13 +709,10 @@
{
try
{
- // get root
- Ptr<MgSiteConnection> conn = new MgSiteConnection();
-
// make a runtime map
Ptr<MgResourceIdentifier> mdfres = new MgResourceIdentifier(L"Library://UnitTests/Maps/Capitals.MapDefinition");
- Ptr<MgMap> map = new MgMap();
- map->Create(m_svcResource, mdfres, L"UnitTestSymbology");
+ Ptr<MgMap> map = new MgMap(m_siteConnection);
+ map->Create(mdfres, L"UnitTestSymbology");
INT32 pixels = 512;
@@ -750,13 +746,10 @@
{
try
{
- // get root
- Ptr<MgSiteConnection> conn = new MgSiteConnection();
-
// make a runtime map
Ptr<MgResourceIdentifier> mdfres = new MgResourceIdentifier(L"Library://UnitTests/Maps/CapitalsParam.MapDefinition");
- Ptr<MgMap> map = new MgMap();
- map->Create(m_svcResource, mdfres, L"UnitTestSymbology");
+ Ptr<MgMap> map = new MgMap(m_siteConnection);
+ map->Create(mdfres, L"UnitTestSymbology");
INT32 pixels = 512;
@@ -790,13 +783,10 @@
{
try
{
- // get root
- Ptr<MgSiteConnection> conn = new MgSiteConnection();
-
// make a runtime map
Ptr<MgResourceIdentifier> mdfres = new MgResourceIdentifier(L"Library://UnitTests/Maps/Lines.MapDefinition");
- Ptr<MgMap> map = new MgMap();
- map->Create(m_svcResource, mdfres, L"UnitTestSymbology");
+ Ptr<MgMap> map = new MgMap(m_siteConnection);
+ map->Create(mdfres, L"UnitTestSymbology");
INT32 pixels = 512;
@@ -830,13 +820,10 @@
{
try
{
- // get root
- Ptr<MgSiteConnection> conn = new MgSiteConnection();
-
// make a runtime map
Ptr<MgResourceIdentifier> mdfres = new MgResourceIdentifier(L"Library://UnitTests/Maps/LinesCrossTick.MapDefinition");
- Ptr<MgMap> map = new MgMap();
- map->Create(m_svcResource, mdfres, L"UnitTestSymbology");
+ Ptr<MgMap> map = new MgMap(m_siteConnection);
+ map->Create(mdfres, L"UnitTestSymbology");
INT32 pixels = 512;
Modified: trunk/MgDev/Server/src/UnitTesting/TestRenderingService.h
===================================================================
--- trunk/MgDev/Server/src/UnitTesting/TestRenderingService.h 2007-03-25 15:54:09 UTC (rev 1370)
+++ trunk/MgDev/Server/src/UnitTesting/TestRenderingService.h 2007-03-25 16:19:03 UTC (rev 1371)
@@ -64,6 +64,8 @@
MgPolygon* CreateSelectionPolygon(MgMap* map, double width, double height);
private:
+
+ Ptr<MgSiteConnection> m_siteConnection;
Ptr<MgResourceService> m_svcResource;
Ptr<MgRenderingService> m_svcRendering;
};
More information about the mapguide-commits
mailing list