[mapguide-commits] r8440 - in trunk/MgDev/Server/src: Core PostBuild UnitTesting
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Mon Nov 10 02:20:35 PST 2014
Author: jng
Date: 2014-11-10 02:20:35 -0800 (Mon, 10 Nov 2014)
New Revision: 8440
Added:
trunk/MgDev/Server/src/UnitTesting/TestDrawingService.cpp
trunk/MgDev/Server/src/UnitTesting/TestDrawingService.h
Modified:
trunk/MgDev/Server/src/Core/Makefile.am
trunk/MgDev/Server/src/PostBuild/PostBuild.mak
trunk/MgDev/Server/src/UnitTesting/UnitTesting.cpp
trunk/MgDev/Server/src/UnitTesting/UnitTesting.vcxproj
Log:
#2500: Add Drawing Service tests to the server test suite to hopefully catch this defect on Linux. This test suite passes on Windows.
Modified: trunk/MgDev/Server/src/Core/Makefile.am
===================================================================
--- trunk/MgDev/Server/src/Core/Makefile.am 2014-11-06 02:24:35 UTC (rev 8439)
+++ trunk/MgDev/Server/src/Core/Makefile.am 2014-11-10 10:20:35 UTC (rev 8440)
@@ -195,6 +195,8 @@
@cp -f ../../../UnitTest/TestData/ResourceService/Shuttle.zip ../UnitTestFiles/World.mgp
@cp -f ../../../UnitTest/TestData/ResourceService/World_Countries.sdf ../UnitTestFiles
@cp -f ../../../UnitTest/TestData/ResourceService/TEST.LayerDefinition ../UnitTestFiles
+ @cp -f ../../../UnitTest/TestData/DrawingService/SpaceShip.dwf ../UnitTestFiles
+ @cp -f ../../../UnitTest/TestData/DrawingService/SpaceShipDrawingSource.xml ../UnitTestFiles
@cp -f ../../../UnitTest/TestData/FeatureService/SDF/TEST.FeatureSource ../UnitTestFiles
@cp -f ../../../UnitTest/TestData/FeatureService/SDF/TEST.sdf ../UnitTestFiles
@cp -f ../../../UnitTest/TestData/FeatureService/SDF/Sheboygan_Parcels.FeatureSource ../UnitTestFiles
Modified: trunk/MgDev/Server/src/PostBuild/PostBuild.mak
===================================================================
--- trunk/MgDev/Server/src/PostBuild/PostBuild.mak 2014-11-06 02:24:35 UTC (rev 8439)
+++ trunk/MgDev/Server/src/PostBuild/PostBuild.mak 2014-11-10 10:20:35 UTC (rev 8440)
@@ -212,6 +212,10 @@
..\..\bin\UnitTestFiles\World.mgp \
..\..\bin\UnitTestFiles\World_Countries.sdf \
..\..\bin\UnitTestFiles\Shuttle.zip \
+ ..\..\bin\UnitTestFiles\test.dwf \
+ ..\..\bin\UnitTestFiles\SpaceShip.dwf \
+ ..\..\bin\UnitTestFiles\MapGuideDrawingSource.xml \
+ ..\..\bin\UnitTestFiles\SpaceShipDrawingSource.xml \
..\..\bin\UnitTestFiles\Redding_Parcels.FeatureSource \
..\..\bin\UnitTestFiles\Redding_Parcels.shp \
..\..\bin\UnitTestFiles\Redding_Parcels.dbf \
@@ -484,6 +488,10 @@
..\..\bin\UnitTestFiles\World.mgp \
..\..\bin\UnitTestFiles\World_Countries.sdf \
..\..\bin\UnitTestFiles\Shuttle.zip \
+ ..\..\bin\UnitTestFiles\test.dwf \
+ ..\..\bin\UnitTestFiles\SpaceShip.dwf \
+ ..\..\bin\UnitTestFiles\MapGuideDrawingSource.xml \
+ ..\..\bin\UnitTestFiles\SpaceShipDrawingSource.xml \
..\..\bin\UnitTestFiles\Redding_Parcels.FeatureSource \
..\..\bin\UnitTestFiles\Redding_Parcels.shp \
..\..\bin\UnitTestFiles\Redding_Parcels.dbf \
@@ -756,6 +764,10 @@
..\..\bin\UnitTestFiles\World.mgp \
..\..\bin\UnitTestFiles\World_Countries.sdf \
..\..\bin\UnitTestFiles\Shuttle.zip \
+ ..\..\bin\UnitTestFiles\test.dwf \
+ ..\..\bin\UnitTestFiles\SpaceShip.dwf \
+ ..\..\bin\UnitTestFiles\MapGuideDrawingSource.xml \
+ ..\..\bin\UnitTestFiles\SpaceShipDrawingSource.xml \
..\..\bin\UnitTestFiles\Redding_Parcels.FeatureSource \
..\..\bin\UnitTestFiles\Redding_Parcels.shp \
..\..\bin\UnitTestFiles\Redding_Parcels.dbf \
@@ -1028,6 +1040,10 @@
..\..\bin\UnitTestFiles\World.mgp \
..\..\bin\UnitTestFiles\World_Countries.sdf \
..\..\bin\UnitTestFiles\Shuttle.zip \
+ ..\..\bin\UnitTestFiles\test.dwf \
+ ..\..\bin\UnitTestFiles\SpaceShip.dwf \
+ ..\..\bin\UnitTestFiles\MapGuideDrawingSource.xml \
+ ..\..\bin\UnitTestFiles\SpaceShipDrawingSource.xml \
..\..\bin\UnitTestFiles\Redding_Parcels.FeatureSource \
..\..\bin\UnitTestFiles\Redding_Parcels.shp \
..\..\bin\UnitTestFiles\Redding_Parcels.dbf \
@@ -1173,6 +1189,10 @@
if EXIST ..\..\bin\UnitTestFiles\World.mgp del /F ..\..\bin\UnitTestFiles\World.mgp
if EXIST ..\..\bin\UnitTestFiles\World_Countries.sdf del /F ..\..\bin\UnitTestFiles\World_Countries.sdf
if EXIST ..\..\bin\UnitTestFiles\Shuttle.zip del /F ..\..\bin\UnitTestFiles\Shuttle.zip
+ if EXIST ..\..\bin\UnitTestFiles\test.dwf del /F ..\..\bin\UnitTestFiles\test.dwf
+ if EXIST ..\..\bin\UnitTestFiles\SpaceShip.dwf del /F ..\..\bin\UnitTestFiles\SpaceShip.dwf
+ if EXIST ..\..\bin\UnitTestFiles\MapGuideDrawingSource.xml del /F ..\..\bin\UnitTestFiles\MapGuideDrawingSource.xml
+ if EXIST ..\..\bin\UnitTestFiles\SpaceShipDrawingSource.xml del /F ..\..\bin\UnitTestFiles\SpaceShipDrawingSource.xml
if EXIST ..\..\bin\UnitTestFiles\Redding_Parcels.FeatureSource del /F ..\..\bin\UnitTestFiles\Redding_Parcels.FeatureSource
if EXIST ..\..\bin\UnitTestFiles\Redding_Parcels.shp del /F ..\..\bin\UnitTestFiles\Redding_Parcels.shp
if EXIST ..\..\bin\UnitTestFiles\Redding_Parcels.dbf del /F ..\..\bin\UnitTestFiles\Redding_Parcels.dbf
@@ -1313,6 +1333,10 @@
if EXIST ..\..\bin\UnitTestFiles\World.mgp del /F ..\..\bin\UnitTestFiles\World.mgp
if EXIST ..\..\bin\UnitTestFiles\World_Countries.sdf del /F ..\..\bin\UnitTestFiles\World_Countries.sdf
if EXIST ..\..\bin\UnitTestFiles\Shuttle.zip del /F ..\..\bin\UnitTestFiles\Shuttle.zip
+ if EXIST ..\..\bin\UnitTestFiles\test.dwf del /F ..\..\bin\UnitTestFiles\test.dwf
+ if EXIST ..\..\bin\UnitTestFiles\SpaceShip.dwf del /F ..\..\bin\UnitTestFiles\SpaceShip.dwf
+ if EXIST ..\..\bin\UnitTestFiles\MapGuideDrawingSource.xml del /F ..\..\bin\UnitTestFiles\MapGuideDrawingSource.xml
+ if EXIST ..\..\bin\UnitTestFiles\SpaceShipDrawingSource.xml del /F ..\..\bin\UnitTestFiles\SpaceShipDrawingSource.xml
if EXIST ..\..\bin\UnitTestFiles\Redding_Parcels.FeatureSource del /F ..\..\bin\UnitTestFiles\Redding_Parcels.FeatureSource
if EXIST ..\..\bin\UnitTestFiles\Redding_Parcels.shp del /F ..\..\bin\UnitTestFiles\Redding_Parcels.shp
if EXIST ..\..\bin\UnitTestFiles\Redding_Parcels.dbf del /F ..\..\bin\UnitTestFiles\Redding_Parcels.dbf
@@ -1453,6 +1477,10 @@
if EXIST ..\..\bin\UnitTestFiles\World.mgp del /F ..\..\bin\UnitTestFiles\World.mgp
if EXIST ..\..\bin\UnitTestFiles\World_Countries.sdf del /F ..\..\bin\UnitTestFiles\World_Countries.sdf
if EXIST ..\..\bin\UnitTestFiles\Shuttle.zip del /F ..\..\bin\UnitTestFiles\Shuttle.zip
+ if EXIST ..\..\bin\UnitTestFiles\test.dwf del /F ..\..\bin\UnitTestFiles\test.dwf
+ if EXIST ..\..\bin\UnitTestFiles\SpaceShip.dwf del /F ..\..\bin\UnitTestFiles\SpaceShip.dwf
+ if EXIST ..\..\bin\UnitTestFiles\MapGuideDrawingSource.xml del /F ..\..\bin\UnitTestFiles\MapGuideDrawingSource.xml
+ if EXIST ..\..\bin\UnitTestFiles\SpaceShipDrawingSource.xml del /F ..\..\bin\UnitTestFiles\SpaceShipDrawingSource.xml
if EXIST ..\..\bin\UnitTestFiles\Redding_Parcels.FeatureSource del /F ..\..\bin\UnitTestFiles\Redding_Parcels.FeatureSource
if EXIST ..\..\bin\UnitTestFiles\Redding_Parcels.shp del /F ..\..\bin\UnitTestFiles\Redding_Parcels.shp
if EXIST ..\..\bin\UnitTestFiles\Redding_Parcels.dbf del /F ..\..\bin\UnitTestFiles\Redding_Parcels.dbf
@@ -1591,6 +1619,10 @@
if EXIST ..\..\bin\UnitTestFiles\World.mgp del /F ..\..\bin\UnitTestFiles\World.mgp
if EXIST ..\..\bin\UnitTestFiles\World_Countries.sdf del /F ..\..\bin\UnitTestFiles\World_Countries.sdf
if EXIST ..\..\bin\UnitTestFiles\Shuttle.zip del /F ..\..\bin\UnitTestFiles\Shuttle.zip
+ if EXIST ..\..\bin\UnitTestFiles\test.dwf del /F ..\..\bin\UnitTestFiles\test.dwf
+ if EXIST ..\..\bin\UnitTestFiles\SpaceShip.dwf del /F ..\..\bin\UnitTestFiles\SpaceShip.dwf
+ if EXIST ..\..\bin\UnitTestFiles\MapGuideDrawingSource.xml del /F ..\..\bin\UnitTestFiles\MapGuideDrawingSource.xml
+ if EXIST ..\..\bin\UnitTestFiles\SpaceShipDrawingSource.xml del /F ..\..\bin\UnitTestFiles\SpaceShipDrawingSource.xml
if EXIST ..\..\bin\UnitTestFiles\Redding_Parcels.FeatureSource del /F ..\..\bin\UnitTestFiles\Redding_Parcels.FeatureSource
if EXIST ..\..\bin\UnitTestFiles\Redding_Parcels.shp del /F ..\..\bin\UnitTestFiles\Redding_Parcels.shp
if EXIST ..\..\bin\UnitTestFiles\Redding_Parcels.dbf del /F ..\..\bin\UnitTestFiles\Redding_Parcels.dbf
@@ -1849,6 +1881,10 @@
..\..\bin\UnitTestFiles\World.mgp \
..\..\bin\UnitTestFiles\World_Countries.sdf \
..\..\bin\UnitTestFiles\Shuttle.zip \
+ ..\..\bin\UnitTestFiles\test.dwf \
+ ..\..\bin\UnitTestFiles\SpaceShip.dwf \
+ ..\..\bin\UnitTestFiles\MapGuideDrawingSource.xml \
+ ..\..\bin\UnitTestFiles\SpaceShipDrawingSource.xml \
..\..\bin\UnitTestFiles\Redding_Parcels.FeatureSource \
..\..\bin\UnitTestFiles\Redding_Parcels.shp \
..\..\bin\UnitTestFiles\Redding_Parcels.dbf \
@@ -2114,6 +2150,10 @@
..\..\bin\UnitTestFiles\World.mgp \
..\..\bin\UnitTestFiles\World_Countries.sdf \
..\..\bin\UnitTestFiles\Shuttle.zip \
+ ..\..\bin\UnitTestFiles\test.dwf \
+ ..\..\bin\UnitTestFiles\SpaceShip.dwf \
+ ..\..\bin\UnitTestFiles\MapGuideDrawingSource.xml \
+ ..\..\bin\UnitTestFiles\SpaceShipDrawingSource.xml \
..\..\bin\UnitTestFiles\Redding_Parcels.FeatureSource \
..\..\bin\UnitTestFiles\Redding_Parcels.shp \
..\..\bin\UnitTestFiles\Redding_Parcels.dbf \
@@ -2379,6 +2419,10 @@
..\..\bin\UnitTestFiles\World.mgp \
..\..\bin\UnitTestFiles\World_Countries.sdf \
..\..\bin\UnitTestFiles\Shuttle.zip \
+ ..\..\bin\UnitTestFiles\test.dwf \
+ ..\..\bin\UnitTestFiles\SpaceShip.dwf \
+ ..\..\bin\UnitTestFiles\MapGuideDrawingSource.xml \
+ ..\..\bin\UnitTestFiles\SpaceShipDrawingSource.xml \
..\..\bin\UnitTestFiles\Redding_Parcels.FeatureSource \
..\..\bin\UnitTestFiles\Redding_Parcels.shp \
..\..\bin\UnitTestFiles\Redding_Parcels.dbf \
@@ -2644,6 +2688,10 @@
..\..\bin\UnitTestFiles\World.mgp \
..\..\bin\UnitTestFiles\World_Countries.sdf \
..\..\bin\UnitTestFiles\Shuttle.zip \
+ ..\..\bin\UnitTestFiles\test.dwf \
+ ..\..\bin\UnitTestFiles\SpaceShip.dwf \
+ ..\..\bin\UnitTestFiles\MapGuideDrawingSource.xml \
+ ..\..\bin\UnitTestFiles\SpaceShipDrawingSource.xml \
..\..\bin\UnitTestFiles\Redding_Parcels.FeatureSource \
..\..\bin\UnitTestFiles\Redding_Parcels.shp \
..\..\bin\UnitTestFiles\Redding_Parcels.dbf \
@@ -2782,6 +2830,10 @@
if EXIST ..\..\bin\UnitTestFiles\World.mgp del /F ..\..\bin\UnitTestFiles\World.mgp
if EXIST ..\..\bin\UnitTestFiles\World_Countries.sdf del /F ..\..\bin\UnitTestFiles\World_Countries.sdf
if EXIST ..\..\bin\UnitTestFiles\Shuttle.zip del /F ..\..\bin\UnitTestFiles\Shuttle.zip
+ if EXIST ..\..\bin\UnitTestFiles\test.dwf del /F ..\..\bin\UnitTestFiles\test.dwf
+ if EXIST ..\..\bin\UnitTestFiles\SpaceShip.dwf del /F ..\..\bin\UnitTestFiles\SpaceShip.dwf
+ if EXIST ..\..\bin\UnitTestFiles\MapGuideDrawingSource.xml del /F ..\..\bin\UnitTestFiles\MapGuideDrawingSource.xml
+ if EXIST ..\..\bin\UnitTestFiles\SpaceShipDrawingSource.xml del /F ..\..\bin\UnitTestFiles\SpaceShipDrawingSource.xml
if EXIST ..\..\bin\UnitTestFiles\Redding_Parcels.FeatureSource del /F ..\..\bin\UnitTestFiles\Redding_Parcels.FeatureSource
if EXIST ..\..\bin\UnitTestFiles\Redding_Parcels.shp del /F ..\..\bin\UnitTestFiles\Redding_Parcels.shp
if EXIST ..\..\bin\UnitTestFiles\Redding_Parcels.dbf del /F ..\..\bin\UnitTestFiles\Redding_Parcels.dbf
@@ -2915,6 +2967,10 @@
if EXIST ..\..\bin\UnitTestFiles\World.mgp del /F ..\..\bin\UnitTestFiles\World.mgp
if EXIST ..\..\bin\UnitTestFiles\World_Countries.sdf del /F ..\..\bin\UnitTestFiles\World_Countries.sdf
if EXIST ..\..\bin\UnitTestFiles\Shuttle.zip del /F ..\..\bin\UnitTestFiles\Shuttle.zip
+ if EXIST ..\..\bin\UnitTestFiles\test.dwf del /F ..\..\bin\UnitTestFiles\test.dwf
+ if EXIST ..\..\bin\UnitTestFiles\SpaceShip.dwf del /F ..\..\bin\UnitTestFiles\SpaceShip.dwf
+ if EXIST ..\..\bin\UnitTestFiles\MapGuideDrawingSource.xml del /F ..\..\bin\UnitTestFiles\MapGuideDrawingSource.xml
+ if EXIST ..\..\bin\UnitTestFiles\SpaceShipDrawingSource.xml del /F ..\..\bin\UnitTestFiles\SpaceShipDrawingSource.xml
if EXIST ..\..\bin\UnitTestFiles\Redding_Parcels.FeatureSource del /F ..\..\bin\UnitTestFiles\Redding_Parcels.FeatureSource
if EXIST ..\..\bin\UnitTestFiles\Redding_Parcels.shp del /F ..\..\bin\UnitTestFiles\Redding_Parcels.shp
if EXIST ..\..\bin\UnitTestFiles\Redding_Parcels.dbf del /F ..\..\bin\UnitTestFiles\Redding_Parcels.dbf
@@ -3048,6 +3104,10 @@
if EXIST ..\..\bin\UnitTestFiles\World.mgp del /F ..\..\bin\UnitTestFiles\World.mgp
if EXIST ..\..\bin\UnitTestFiles\World_Countries.sdf del /F ..\..\bin\UnitTestFiles\World_Countries.sdf
if EXIST ..\..\bin\UnitTestFiles\Shuttle.zip del /F ..\..\bin\UnitTestFiles\Shuttle.zip
+ if EXIST ..\..\bin\UnitTestFiles\test.dwf del /F ..\..\bin\UnitTestFiles\test.dwf
+ if EXIST ..\..\bin\UnitTestFiles\SpaceShip.dwf del /F ..\..\bin\UnitTestFiles\SpaceShip.dwf
+ if EXIST ..\..\bin\UnitTestFiles\MapGuideDrawingSource.xml del /F ..\..\bin\UnitTestFiles\MapGuideDrawingSource.xml
+ if EXIST ..\..\bin\UnitTestFiles\SpaceShipDrawingSource.xml del /F ..\..\bin\UnitTestFiles\SpaceShipDrawingSource.xml
if EXIST ..\..\bin\UnitTestFiles\Redding_Parcels.FeatureSource del /F ..\..\bin\UnitTestFiles\Redding_Parcels.FeatureSource
if EXIST ..\..\bin\UnitTestFiles\Redding_Parcels.shp del /F ..\..\bin\UnitTestFiles\Redding_Parcels.shp
if EXIST ..\..\bin\UnitTestFiles\Redding_Parcels.dbf del /F ..\..\bin\UnitTestFiles\Redding_Parcels.dbf
@@ -3179,6 +3239,10 @@
if EXIST ..\..\bin\UnitTestFiles\World.mgp del /F ..\..\bin\UnitTestFiles\World.mgp
if EXIST ..\..\bin\UnitTestFiles\World_Countries.sdf del /F ..\..\bin\UnitTestFiles\World_Countries.sdf
if EXIST ..\..\bin\UnitTestFiles\Shuttle.zip del /F ..\..\bin\UnitTestFiles\Shuttle.zip
+ if EXIST ..\..\bin\UnitTestFiles\test.dwf del /F ..\..\bin\UnitTestFiles\test.dwf
+ if EXIST ..\..\bin\UnitTestFiles\SpaceShip.dwf del /F ..\..\bin\UnitTestFiles\SpaceShip.dwf
+ if EXIST ..\..\bin\UnitTestFiles\MapGuideDrawingSource.xml del /F ..\..\bin\UnitTestFiles\MapGuideDrawingSource.xml
+ if EXIST ..\..\bin\UnitTestFiles\SpaceShipDrawingSource.xml del /F ..\..\bin\UnitTestFiles\SpaceShipDrawingSource.xml
if EXIST ..\..\bin\UnitTestFiles\Redding_Parcels.FeatureSource del /F ..\..\bin\UnitTestFiles\Redding_Parcels.FeatureSource
if EXIST ..\..\bin\UnitTestFiles\Redding_Parcels.shp del /F ..\..\bin\UnitTestFiles\Redding_Parcels.shp
if EXIST ..\..\bin\UnitTestFiles\Redding_Parcels.dbf del /F ..\..\bin\UnitTestFiles\Redding_Parcels.dbf
@@ -3235,6 +3299,10 @@
"..\..\..\UnitTest\TestData\ResourceService\SampleRepositoryHeader.xml" :
"..\..\..\UnitTest\TestData\ResourceService\SampleRepositoryContent.xml" :
"..\..\..\UnitTest\TestData\ResourceService\Shuttle.zip" :
+"..\..\..\UnitTest\TestData\DrawingService\test.dwf" :
+"..\..\..\UnitTest\TestData\DrawingService\SpaceShip.dwf" :
+"..\..\..\UnitTest\TestData\DrawingService\MapGuideDrawingSource.xml" :
+"..\..\..\UnitTest\TestData\DrawingService\SpaceShipDrawingSource.xml" :
"..\..\..\UnitTest\TestData\ResourceService\World_Countries.sdf" :
"..\..\..\UnitTest\TestData\ResourceService\TEST.LayerDefinition" :
"..\..\..\UnitTest\TestData\FeatureService\SDF\TEST.FeatureSource" :
@@ -3350,6 +3418,22 @@
if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
if EXIST "..\..\..\UnitTest\TestData\ResourceService\Shuttle.zip" xcopy /r /d /y "..\..\..\UnitTest\TestData\ResourceService\Shuttle.zip" ..\..\bin\UnitTestFiles\
+..\..\bin\UnitTestFiles\test.dwf : "..\..\..\UnitTest\TestData\DrawingService\test.dwf"
+ if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
+ if EXIST "..\..\..\UnitTest\TestData\DrawingService\test.dwf" xcopy /r /d /y "..\..\..\UnitTest\TestData\DrawingService\test.dwf" ..\..\bin\UnitTestFiles\
+
+..\..\bin\UnitTestFiles\SpaceShip.dwf : "..\..\..\UnitTest\TestData\DrawingService\SpaceShip.dwf"
+ if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
+ if EXIST "..\..\..\UnitTest\TestData\DrawingService\SpaceShip.dwf" xcopy /r /d /y "..\..\..\UnitTest\TestData\DrawingService\SpaceShip.dwf" ..\..\bin\UnitTestFiles\
+
+..\..\bin\UnitTestFiles\MapGuideDrawingSource.xml : "..\..\..\UnitTest\TestData\DrawingService\MapGuideDrawingSource.xml"
+ if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
+ if EXIST "..\..\..\UnitTest\TestData\DrawingService\MapGuideDrawingSource.xml" xcopy /r /d /y "..\..\..\UnitTest\TestData\DrawingService\MapGuideDrawingSource.xml" ..\..\bin\UnitTestFiles\
+
+..\..\bin\UnitTestFiles\SpaceShipDrawingSource.xml : "..\..\..\UnitTest\TestData\DrawingService\SpaceShipDrawingSource.xml"
+ if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
+ if EXIST "..\..\..\UnitTest\TestData\DrawingService\SpaceShipDrawingSource.xml" xcopy /r /d /y "..\..\..\UnitTest\TestData\DrawingService\SpaceShipDrawingSource.xml" ..\..\bin\UnitTestFiles\
+
..\..\bin\UnitTestFiles\World.mgp : "..\..\..\UnitTest\TestData\ResourceService\Shuttle.zip"
if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
if EXIST "..\..\..\UnitTest\TestData\ResourceService\Shuttle.zip" copy /y "..\..\..\UnitTest\TestData\ResourceService\Shuttle.zip" ..\..\bin\UnitTestFiles\World.mgp
Added: trunk/MgDev/Server/src/UnitTesting/TestDrawingService.cpp
===================================================================
--- trunk/MgDev/Server/src/UnitTesting/TestDrawingService.cpp (rev 0)
+++ trunk/MgDev/Server/src/UnitTesting/TestDrawingService.cpp 2014-11-10 10:20:35 UTC (rev 8440)
@@ -0,0 +1,290 @@
+//
+// Copyright (C) 2004-2014 by Autodesk, Inc.
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of version 2.1 of the GNU Lesser
+// General Public License as published by the Free Software Foundation.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+//
+
+#include "MapGuideCommon.h"
+#include "TestDrawingService.h"
+#include "CppUnitExtensions.h"
+#include "ServiceManager.h"
+
+const STRING TEST_LOCALE = L"en";
+
+CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(TestDrawingService, "TestDrawingService");
+
+TestDrawingService::TestDrawingService()
+{
+ // Initialize service objects.
+ MgServiceManager* serviceManager = MgServiceManager::GetInstance();
+
+ m_svcDrawing = dynamic_cast<MgDrawingService*>(serviceManager->RequestService(MgServiceType::DrawingService));
+ assert(m_svcDrawing != NULL);
+}
+
+TestDrawingService::~TestDrawingService() { }
+
+void TestDrawingService::setUp() { }
+
+void TestDrawingService::tearDown() { }
+
+void TestDrawingService::TestStart()
+{
+ try
+ {
+ MgServiceManager* serviceManager = MgServiceManager::GetInstance();
+ Ptr<MgResourceService> resSvc = dynamic_cast<MgResourceService*>(serviceManager->RequestService(MgServiceType::ResourceService));
+ assert(resSvc != NULL);
+
+ //Set the user information for the current thread to be administrator
+ MgUserInformation::SetCurrentUserInfo(NULL);
+ Ptr<MgUserInformation> userInfo = new MgUserInformation(L"Administrator", L"admin");
+ userInfo->SetLocale(TEST_LOCALE);
+ MgUserInformation::SetCurrentUserInfo(userInfo);
+
+ MgResourceIdentifier resourceIdentifier1(L"Library://UnitTests/Drawings/SpaceShip.DrawingSource");
+
+ Ptr<MgByteSource> contentSource1 = new MgByteSource(L"../UnitTestFiles/SpaceShipDrawingSource.xml");
+ Ptr<MgByteReader> contentReader1 = contentSource1->GetReader();
+ resSvc->SetResource(&resourceIdentifier1, contentReader1, NULL);
+
+ Ptr<MgByteSource> dataSource1 = new MgByteSource(L"../UnitTestFiles/SpaceShip.dwf");
+ Ptr<MgByteReader> dataReader1 = dataSource1->GetReader();
+ resSvc->SetResourceData(&resourceIdentifier1, L"SpaceShip.dwf", L"File", dataReader1);
+ }
+ catch(MgException* e)
+ {
+ STRING message = e->GetDetails(TEST_LOCALE);
+ SAFE_RELEASE(e);
+ CPPUNIT_FAIL(MG_WCHAR_TO_CHAR(message.c_str()));
+ }
+}
+
+void TestDrawingService::TestEnd()
+{
+ try
+ {
+ MgServiceManager* serviceManager = MgServiceManager::GetInstance();
+ Ptr<MgResourceService> resSvc = dynamic_cast<MgResourceService*>(serviceManager->RequestService(MgServiceType::ResourceService));
+ assert(resSvc != NULL);
+
+ //Set the user information for the current thread to be administrator
+ MgUserInformation::SetCurrentUserInfo(NULL);
+ Ptr<MgUserInformation> userInfo = new MgUserInformation(L"Administrator", L"admin");
+ userInfo->SetLocale(TEST_LOCALE);
+ MgUserInformation::SetCurrentUserInfo(userInfo);
+
+ MgResourceIdentifier resourceIdentifier1(L"Library://UnitTests/Drawings/SpaceShip.DrawingSource");
+
+ resSvc->DeleteResource(&resourceIdentifier1);
+ }
+ catch(MgException* e)
+ {
+ STRING message = e->GetDetails(TEST_LOCALE);
+ SAFE_RELEASE(e);
+ CPPUNIT_FAIL(MG_WCHAR_TO_CHAR(message.c_str()));
+ }
+}
+
+void TestDrawingService::TestCase_DescribeDrawing()
+{
+ try
+ {
+ Ptr<MgResourceIdentifier> resId1 = new MgResourceIdentifier(L"Library://UnitTests/Drawings/SpaceShip.DrawingSource");
+ Ptr<MgByteReader> rdr1 = m_svcDrawing->DescribeDrawing(resId1);
+ CPPUNIT_ASSERT(MgMimeType::Xml == rdr1->GetMimeType());
+ }
+ catch (MgException* e)
+ {
+ STRING message = e->GetDetails(TEST_LOCALE);
+ SAFE_RELEASE(e);
+ CPPUNIT_FAIL(MG_WCHAR_TO_CHAR(message.c_str()));
+ }
+ catch (...)
+ {
+ throw;
+ }
+}
+
+void TestDrawingService::TestCase_EnumerateSections()
+{
+ try
+ {
+ Ptr<MgResourceIdentifier> resId1 = new MgResourceIdentifier(L"Library://UnitTests/Drawings/SpaceShip.DrawingSource");
+ Ptr<MgByteReader> rdr1 = m_svcDrawing->EnumerateSections(resId1);
+ CPPUNIT_ASSERT(MgMimeType::Xml == rdr1->GetMimeType());
+ }
+ catch (MgException* e)
+ {
+ STRING message = e->GetDetails(TEST_LOCALE);
+ SAFE_RELEASE(e);
+ CPPUNIT_FAIL(MG_WCHAR_TO_CHAR(message.c_str()));
+ }
+ catch (...)
+ {
+ throw;
+ }
+}
+
+void TestDrawingService::TestCase_EnumerateSectionResources()
+{
+ try
+ {
+ Ptr<MgResourceIdentifier> resId1 = new MgResourceIdentifier(L"Library://UnitTests/Drawings/SpaceShip.DrawingSource");
+ CPPUNIT_ASSERT_THROW_MG(m_svcDrawing->EnumerateSectionResources(resId1, L"foo"), MgDwfSectionNotFoundException*);
+
+ STRING sect1 = L"com.autodesk.dwf.ePlot_9E2723744244DB8C44482263E654F764";
+ Ptr<MgByteReader> rdr1 = m_svcDrawing->EnumerateSectionResources(resId1, sect1);
+ CPPUNIT_ASSERT(MgMimeType::Xml == rdr1->GetMimeType());
+ }
+ catch (MgException* e)
+ {
+ STRING message = e->GetDetails(TEST_LOCALE);
+ SAFE_RELEASE(e);
+ CPPUNIT_FAIL(MG_WCHAR_TO_CHAR(message.c_str()));
+ }
+ catch (...)
+ {
+ throw;
+ }
+}
+
+void TestDrawingService::TestCase_GetCoordinateSpace()
+{
+ try
+ {
+ Ptr<MgResourceIdentifier> resId1 = new MgResourceIdentifier(L"Library://UnitTests/Drawings/SpaceShip.DrawingSource");
+ STRING cs1 = m_svcDrawing->GetCoordinateSpace(resId1);
+ CPPUNIT_ASSERT(!cs1.empty());
+ }
+ catch (MgException* e)
+ {
+ STRING message = e->GetDetails(TEST_LOCALE);
+ SAFE_RELEASE(e);
+ CPPUNIT_FAIL(MG_WCHAR_TO_CHAR(message.c_str()));
+ }
+ catch (...)
+ {
+ throw;
+ }
+}
+
+void TestDrawingService::TestCase_EnumerateLayers()
+{
+ try
+ {
+ Ptr<MgResourceIdentifier> resId1 = new MgResourceIdentifier(L"Library://UnitTests/Drawings/SpaceShip.DrawingSource");
+ STRING sect1 = L"com.autodesk.dwf.ePlot_9E2723744244DB8C44482263E654F764";
+ Ptr<MgStringCollection> str1 = m_svcDrawing->EnumerateLayers(resId1, sect1);
+ CPPUNIT_ASSERT(str1->GetCount() > 0);
+ }
+ catch (MgException* e)
+ {
+ STRING message = e->GetDetails(TEST_LOCALE);
+ SAFE_RELEASE(e);
+ CPPUNIT_FAIL(MG_WCHAR_TO_CHAR(message.c_str()));
+ }
+ catch (...)
+ {
+ throw;
+ }
+}
+
+void TestDrawingService::TestCase_GetDrawing()
+{
+ try
+ {
+ Ptr<MgResourceIdentifier> resId1 = new MgResourceIdentifier(L"Library://UnitTests/Drawings/SpaceShip.DrawingSource");
+ Ptr<MgByteReader> rdr1 = m_svcDrawing->GetDrawing(resId1);
+ CPPUNIT_ASSERT(NULL != rdr1.p);
+ }
+ catch (MgException* e)
+ {
+ STRING message = e->GetDetails(TEST_LOCALE);
+ SAFE_RELEASE(e);
+ CPPUNIT_FAIL(MG_WCHAR_TO_CHAR(message.c_str()));
+ }
+ catch (...)
+ {
+ throw;
+ }
+}
+
+void TestDrawingService::TestCase_GetLayer()
+{
+ try
+ {
+ Ptr<MgResourceIdentifier> resId1 = new MgResourceIdentifier(L"Library://UnitTests/Drawings/SpaceShip.DrawingSource");
+ STRING sect1 = L"com.autodesk.dwf.ePlot_9E2723744244DB8C44482263E654F764";
+ Ptr<MgStringCollection> dwfLayers = m_svcDrawing->EnumerateLayers(resId1, sect1);
+ for (INT32 i = 0; i < dwfLayers->GetCount(); i++)
+ {
+ Ptr<MgByteReader> rdr = m_svcDrawing->GetLayer(resId1, sect1, dwfLayers->GetItem(i));
+ }
+ }
+ catch (MgException* e)
+ {
+ STRING message = e->GetDetails(TEST_LOCALE);
+ SAFE_RELEASE(e);
+ CPPUNIT_FAIL(MG_WCHAR_TO_CHAR(message.c_str()));
+ }
+ catch (...)
+ {
+ throw;
+ }
+}
+
+void TestDrawingService::TestCase_GetSection()
+{
+ try
+ {
+ Ptr<MgResourceIdentifier> resId1 = new MgResourceIdentifier(L"Library://UnitTests/Drawings/SpaceShip.DrawingSource");
+ STRING sect1 = L"com.autodesk.dwf.ePlot_9E2723744244DB8C44482263E654F764";
+ Ptr<MgByteReader> rdr = m_svcDrawing->GetSection(resId1, sect1);
+ }
+ catch (MgException* e)
+ {
+ STRING message = e->GetDetails(TEST_LOCALE);
+ SAFE_RELEASE(e);
+ CPPUNIT_FAIL(MG_WCHAR_TO_CHAR(message.c_str()));
+ }
+ catch (...)
+ {
+ throw;
+ }
+}
+
+void TestDrawingService::TestCase_GetSectionResource()
+{
+ try
+ {
+ Ptr<MgResourceIdentifier> resId1 = new MgResourceIdentifier(L"Library://UnitTests/Drawings/SpaceShip.DrawingSource");
+ STRING res1 = L"com.autodesk.dwf.ePlot_9E2723744244DB8C44482263E654F764\\4AA701C2E18DD99948F3C0D4FDFAC165.png";
+ Ptr<MgByteReader> rdr1 = m_svcDrawing->GetSectionResource(resId1, res1);
+ CPPUNIT_ASSERT(rdr1->GetMimeType() == MgMimeType::Png);
+ STRING res2 = L"com.autodesk.dwf.ePlot_9E2723744244DB8C44482263E654F764\\descriptor.xml";
+ Ptr<MgByteReader> rdr2 = m_svcDrawing->GetSectionResource(resId1, res2);
+ CPPUNIT_ASSERT(rdr2->GetMimeType() == MgMimeType::Xml);
+ }
+ catch (MgException* e)
+ {
+ STRING message = e->GetDetails(TEST_LOCALE);
+ SAFE_RELEASE(e);
+ CPPUNIT_FAIL(MG_WCHAR_TO_CHAR(message.c_str()));
+ }
+ catch (...)
+ {
+ throw;
+ }
+}
\ No newline at end of file
Added: trunk/MgDev/Server/src/UnitTesting/TestDrawingService.h
===================================================================
--- trunk/MgDev/Server/src/UnitTesting/TestDrawingService.h (rev 0)
+++ trunk/MgDev/Server/src/UnitTesting/TestDrawingService.h 2014-11-10 10:20:35 UTC (rev 8440)
@@ -0,0 +1,64 @@
+//
+// Copyright (C) 2004-2014 by Autodesk, Inc.
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of version 2.1 of the GNU Lesser
+// General Public License as published by the Free Software Foundation.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+//
+
+#ifndef _TESTDRAWINGSERVICE_H
+#define _TESTDRAWINGSERVICE_H
+
+#include <cppunit/extensions/HelperMacros.h>
+
+class TestDrawingService : public CppUnit::TestFixture
+{
+ CPPUNIT_TEST_SUITE(TestDrawingService);
+ CPPUNIT_TEST(TestStart); // This must be the very first unit test
+
+ CPPUNIT_TEST(TestCase_DescribeDrawing);
+ CPPUNIT_TEST(TestCase_EnumerateSections);
+ CPPUNIT_TEST(TestCase_EnumerateSectionResources);
+ CPPUNIT_TEST(TestCase_GetCoordinateSpace);
+ CPPUNIT_TEST(TestCase_EnumerateLayers);
+ CPPUNIT_TEST(TestCase_GetDrawing);
+ CPPUNIT_TEST(TestCase_GetLayer);
+ CPPUNIT_TEST(TestCase_GetSection);
+ CPPUNIT_TEST(TestCase_GetSectionResource);
+
+ CPPUNIT_TEST(TestEnd); // This must be the very last unit test
+ CPPUNIT_TEST_SUITE_END();
+
+public:
+ TestDrawingService();
+ ~TestDrawingService();
+
+ void setUp();
+ void tearDown();
+ void TestStart();
+ void TestEnd();
+
+ void TestCase_DescribeDrawing();
+ void TestCase_EnumerateSections();
+ void TestCase_EnumerateSectionResources();
+ void TestCase_GetCoordinateSpace();
+ void TestCase_EnumerateLayers();
+ void TestCase_GetDrawing();
+ void TestCase_GetLayer();
+ void TestCase_GetSection();
+ void TestCase_GetSectionResource();
+
+private:
+ Ptr<MgDrawingService> m_svcDrawing;
+};
+
+#endif // _TESTDRAWINGSERVICE_H
Modified: trunk/MgDev/Server/src/UnitTesting/UnitTesting.cpp
===================================================================
--- trunk/MgDev/Server/src/UnitTesting/UnitTesting.cpp 2014-11-06 02:24:35 UTC (rev 8439)
+++ trunk/MgDev/Server/src/UnitTesting/UnitTesting.cpp 2014-11-10 10:20:35 UTC (rev 8440)
@@ -47,6 +47,7 @@
ACE_DEBUG((LM_INFO, ACE_TEXT(">>>>> Running all unit tests - Excluding Performance. <<<<<\n\n")));
runner.addTest(CppUnit::TestFactoryRegistry::getRegistry("TestCoordinateSystem").makeTest());
#endif
+ runner.addTest(CppUnit::TestFactoryRegistry::getRegistry("TestDrawingService").makeTest());
runner.addTest(CppUnit::TestFactoryRegistry::getRegistry("TestFeatureService").makeTest());
runner.addTest(CppUnit::TestFactoryRegistry::getRegistry("TestGeometry").makeTest());
runner.addTest(CppUnit::TestFactoryRegistry::getRegistry("TestLogManager").makeTest());
@@ -68,6 +69,7 @@
else if(ACE_OS::strcasecmp(MG_WCHAR_TO_TCHAR(test), ACE_TEXT("AllExceptCoordSys")) == 0)
{
ACE_DEBUG((LM_INFO, ACE_TEXT(">>>>> Running all unit tests - Excluding Performance and CoordinateSystem. <<<<<\n\n")));
+ runner.addTest(CppUnit::TestFactoryRegistry::getRegistry("TestDrawingService").makeTest());
runner.addTest(CppUnit::TestFactoryRegistry::getRegistry("TestFeatureService").makeTest());
runner.addTest(CppUnit::TestFactoryRegistry::getRegistry("TestGeometry").makeTest());
runner.addTest(CppUnit::TestFactoryRegistry::getRegistry("TestLogManager").makeTest());
@@ -99,6 +101,7 @@
#endif
ACE_OS::printf(" AllExceptCoordSys\n");
ACE_OS::printf(" CoordinateSystem\n");
+ ACE_OS::printf(" DrawingService\n");
ACE_OS::printf(" FeatureService\n");
ACE_OS::printf(" Geometry\n");
ACE_OS::printf(" KmlService\n");
@@ -126,6 +129,11 @@
ACE_DEBUG((LM_INFO, ACE_TEXT(">>>>> Running only Coordinate System tests. <<<<<\n\n")));
runner.addTest(CppUnit::TestFactoryRegistry::getRegistry("TestCoordinateSystem").makeTest());
}
+ else if(ACE_OS::strcasecmp(MG_WCHAR_TO_TCHAR(test), ACE_TEXT("DrawingService")) == 0)
+ {
+ ACE_DEBUG((LM_INFO, ACE_TEXT(">>>>> Running only Drawing Service tests. <<<<<\n\n")));
+ runner.addTest(CppUnit::TestFactoryRegistry::getRegistry("TestDrawingService").makeTest());
+ }
else if(ACE_OS::strcasecmp(MG_WCHAR_TO_TCHAR(test), ACE_TEXT("FeatureService")) == 0)
{
ACE_DEBUG((LM_INFO, ACE_TEXT(">>>>> Running only Feature Service tests. <<<<<\n\n")));
Modified: trunk/MgDev/Server/src/UnitTesting/UnitTesting.vcxproj
===================================================================
--- trunk/MgDev/Server/src/UnitTesting/UnitTesting.vcxproj 2014-11-06 02:24:35 UTC (rev 8439)
+++ trunk/MgDev/Server/src/UnitTesting/UnitTesting.vcxproj 2014-11-10 10:20:35 UTC (rev 8440)
@@ -200,6 +200,7 @@
<ItemGroup>
<ClInclude Include="CppUnitExtensions.h" />
<ClInclude Include="TestCoordinateSystem.h" />
+ <ClInclude Include="TestDrawingService.h" />
<ClInclude Include="TestFeatureService.h" />
<ClInclude Include="TestGeometry.h" />
<ClInclude Include="TestKmlService.h" />
@@ -223,6 +224,7 @@
</ItemGroup>
<ItemGroup>
<ClCompile Include="TestCoordinateSystem.cpp" />
+ <ClCompile Include="TestDrawingService.cpp" />
<ClCompile Include="TestFeatureService.cpp" />
<ClCompile Include="TestGeometry.cpp" />
<ClCompile Include="TestKmlService.cpp" />
More information about the mapguide-commits
mailing list