[mapguide-commits] r4233 - in trunk/MgDev: Server/src/PostBuild
Server/src/UnitTesting UnitTest/TestData/ResourceService
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Fri Sep 18 01:31:10 EDT 2009
Author: leaf
Date: 2009-09-18 01:31:10 -0400 (Fri, 18 Sep 2009)
New Revision: 4233
Added:
trunk/MgDev/UnitTest/TestData/ResourceService/TEST.LayerDefinition
Modified:
trunk/MgDev/Server/src/PostBuild/PostBuild.mak
trunk/MgDev/Server/src/UnitTesting/TestResourceService.cpp
trunk/MgDev/Server/src/UnitTesting/TestResourceService.h
trunk/MgDev/Server/src/UnitTesting/TestSiteService.cpp
trunk/MgDev/Server/src/UnitTesting/TestSiteService.h
Log:
Add some server unit test. Submit code on behalf of Christine Bao.
Modified: trunk/MgDev/Server/src/PostBuild/PostBuild.mak
===================================================================
--- trunk/MgDev/Server/src/PostBuild/PostBuild.mak 2009-09-17 22:31:48 UTC (rev 4232)
+++ trunk/MgDev/Server/src/PostBuild/PostBuild.mak 2009-09-18 05:31:10 UTC (rev 4233)
@@ -96,7 +96,7 @@
xcopy /r /d /y /s ..\..\..\Oem\FDO\bin\Release ..\..\bin\debug\FDO\
CopyFdoProvidersDebug : ..\..\..\Oem\FDO\ProviderList\ServerCommunity\providers.xml
- xcopy /r /d /y "..\..\..\Oem\FDO\ProviderList\ServerCommunity\providers.xml" ..\..\bin\debug\FDO\
+ xcopy /r /y "..\..\..\Oem\FDO\ProviderList\ServerCommunity\providers.xml" ..\..\bin\debug\FDO\
CopySchemaDebug : ..\..\..\Common\Schema\*.xsd
if NOT EXIST ..\..\bin\debug\Schema\nul mkdir ..\..\bin\debug\Schema
@@ -160,6 +160,7 @@
..\..\bin\UnitTestFiles\LibraryRepositoryContent.xml \
..\..\bin\UnitTestFiles\SampleRepositoryHeader.xml \
..\..\bin\UnitTestFiles\SampleRepositoryContent.xml \
+ ..\..\bin\UnitTestFiles\TEST.LayerDefinition \
..\..\bin\UnitTestFiles\TEST.FeatureSource \
..\..\bin\UnitTestFiles\TEST.sdf \
..\..\bin\UnitTestFiles\UT_BaseMap.mdf \
@@ -343,7 +344,7 @@
xcopy /r /d /y /s ..\..\..\Oem\FDO\bin\release64 ..\..\bin\debug64\FDO\
CopyFdoProvidersDebug64 : ..\..\..\Oem\FDO\ProviderList\ServerCommunity\providers.xml
- xcopy /r /d /y "..\..\..\Oem\FDO\ProviderList\ServerCommunity\providers.xml" ..\..\bin\debug64\FDO\
+ xcopy /r /y "..\..\..\Oem\FDO\ProviderList\ServerCommunity\providers.xml" ..\..\bin\debug64\FDO\
CopySchemaDebug64 : ..\..\..\Common\Schema\*.xsd
if NOT EXIST ..\..\bin\debug64\Schema\nul mkdir ..\..\bin\debug64\Schema
@@ -407,6 +408,7 @@
..\..\bin\UnitTestFiles\LibraryRepositoryContent.xml \
..\..\bin\UnitTestFiles\SampleRepositoryHeader.xml \
..\..\bin\UnitTestFiles\SampleRepositoryContent.xml \
+ ..\..\bin\UnitTestFiles\TEST.LayerDefinition \
..\..\bin\UnitTestFiles\TEST.FeatureSource \
..\..\bin\UnitTestFiles\TEST.sdf \
..\..\bin\UnitTestFiles\UT_BaseMap.mdf \
@@ -590,7 +592,7 @@
xcopy /r /d /y /s ..\..\..\Oem\FDO\bin\Release ..\..\bin\release\FDO\
CopyFdoProvidersRelease : ..\..\..\Oem\FDO\ProviderList\ServerCommunity\providers.xml
- xcopy /r /d /y "..\..\..\Oem\FDO\ProviderList\ServerCommunity\providers.xml" ..\..\bin\release\FDO\
+ xcopy /r /y "..\..\..\Oem\FDO\ProviderList\ServerCommunity\providers.xml" ..\..\bin\release\FDO\
CopySchemaRelease : ..\..\..\Common\Schema\*.xsd
if NOT EXIST ..\..\bin\release\Schema\nul mkdir ..\..\bin\release\Schema
@@ -654,6 +656,7 @@
..\..\bin\UnitTestFiles\LibraryRepositoryContent.xml \
..\..\bin\UnitTestFiles\SampleRepositoryHeader.xml \
..\..\bin\UnitTestFiles\SampleRepositoryContent.xml \
+ ..\..\bin\UnitTestFiles\TEST.LayerDefinition \
..\..\bin\UnitTestFiles\TEST.FeatureSource \
..\..\bin\UnitTestFiles\TEST.sdf \
..\..\bin\UnitTestFiles\UT_BaseMap.mdf \
@@ -837,7 +840,7 @@
xcopy /r /d /y /s ..\..\..\Oem\FDO\bin\release64 ..\..\bin\release64\FDO\
CopyFdoProvidersRelease64 : ..\..\..\Oem\FDO\ProviderList\ServerCommunity\providers.xml
- xcopy /r /d /y "..\..\..\Oem\FDO\ProviderList\ServerCommunity\providers.xml" ..\..\bin\release64\FDO\
+ xcopy /r /y "..\..\..\Oem\FDO\ProviderList\ServerCommunity\providers.xml" ..\..\bin\release64\FDO\
CopySchemaRelease64 : ..\..\..\Common\Schema\*.xsd
if NOT EXIST ..\..\bin\release64\Schema\nul mkdir ..\..\bin\release64\Schema
@@ -901,6 +904,7 @@
..\..\bin\UnitTestFiles\LibraryRepositoryContent.xml \
..\..\bin\UnitTestFiles\SampleRepositoryHeader.xml \
..\..\bin\UnitTestFiles\SampleRepositoryContent.xml \
+ ..\..\bin\UnitTestFiles\TEST.LayerDefinition \
..\..\bin\UnitTestFiles\TEST.FeatureSource \
..\..\bin\UnitTestFiles\TEST.sdf \
..\..\bin\UnitTestFiles\UT_BaseMap.mdf \
@@ -1021,6 +1025,7 @@
if EXIST ..\..\bin\UnitTestFiles\LibraryRepositoryContent.xml del /F ..\..\bin\UnitTestFiles\LibraryRepositoryContent.xml
if EXIST ..\..\bin\UnitTestFiles\SampleRepositoryHeader.xml del /F ..\..\bin\UnitTestFiles\SampleRepositoryHeader.xml
if EXIST ..\..\bin\UnitTestFiles\SampleRepositoryContent.xml del /F ..\..\bin\UnitTestFiles\SampleRepositoryContent.xml
+ if EXIST ..\..\bin\UnitTestFiles\TEST.LayerDefinition del /F ..\..\bin\UnitTestFiles\TEST.LayerDefinition
if EXIST ..\..\bin\UnitTestFiles\TEST.FeatureSource del /F ..\..\bin\UnitTestFiles\TEST.FeatureSource
if EXIST ..\..\bin\UnitTestFiles\TEST.sdf del /F ..\..\bin\UnitTestFiles\TEST.sdf
if EXIST ..\..\bin\UnitTestFiles\UT_BaseMap.mdf del /F ..\..\bin\UnitTestFiles\UT_BaseMap.mdf
@@ -1136,6 +1141,7 @@
if EXIST ..\..\bin\UnitTestFiles\LibraryRepositoryContent.xml del /F ..\..\bin\UnitTestFiles\LibraryRepositoryContent.xml
if EXIST ..\..\bin\UnitTestFiles\SampleRepositoryHeader.xml del /F ..\..\bin\UnitTestFiles\SampleRepositoryHeader.xml
if EXIST ..\..\bin\UnitTestFiles\SampleRepositoryContent.xml del /F ..\..\bin\UnitTestFiles\SampleRepositoryContent.xml
+ if EXIST ..\..\bin\UnitTestFiles\TEST.LayerDefinition del /F ..\..\bin\UnitTestFiles\TEST.LayerDefinition
if EXIST ..\..\bin\UnitTestFiles\TEST.FeatureSource del /F ..\..\bin\UnitTestFiles\TEST.FeatureSource
if EXIST ..\..\bin\UnitTestFiles\TEST.sdf del /F ..\..\bin\UnitTestFiles\TEST.sdf
if EXIST ..\..\bin\UnitTestFiles\UT_BaseMap.mdf del /F ..\..\bin\UnitTestFiles\UT_BaseMap.mdf
@@ -1251,6 +1257,7 @@
if EXIST ..\..\bin\UnitTestFiles\LibraryRepositoryContent.xml del /F ..\..\bin\UnitTestFiles\LibraryRepositoryContent.xml
if EXIST ..\..\bin\UnitTestFiles\SampleRepositoryHeader.xml del /F ..\..\bin\UnitTestFiles\SampleRepositoryHeader.xml
if EXIST ..\..\bin\UnitTestFiles\SampleRepositoryContent.xml del /F ..\..\bin\UnitTestFiles\SampleRepositoryContent.xml
+ if EXIST ..\..\bin\UnitTestFiles\TEST.LayerDefinition del /F ..\..\bin\UnitTestFiles\TEST.LayerDefinition
if EXIST ..\..\bin\UnitTestFiles\TEST.FeatureSource del /F ..\..\bin\UnitTestFiles\TEST.FeatureSource
if EXIST ..\..\bin\UnitTestFiles\TEST.sdf del /F ..\..\bin\UnitTestFiles\TEST.sdf
if EXIST ..\..\bin\UnitTestFiles\UT_BaseMap.mdf del /F ..\..\bin\UnitTestFiles\UT_BaseMap.mdf
@@ -1365,6 +1372,7 @@
if EXIST ..\..\bin\UnitTestFiles\LibraryRepositoryContent.xml del /F ..\..\bin\UnitTestFiles\LibraryRepositoryContent.xml
if EXIST ..\..\bin\UnitTestFiles\SampleRepositoryHeader.xml del /F ..\..\bin\UnitTestFiles\SampleRepositoryHeader.xml
if EXIST ..\..\bin\UnitTestFiles\SampleRepositoryContent.xml del /F ..\..\bin\UnitTestFiles\SampleRepositoryContent.xml
+ if EXIST ..\..\bin\UnitTestFiles\TEST.LayerDefinition del /F ..\..\bin\UnitTestFiles\TEST.LayerDefinition
if EXIST ..\..\bin\UnitTestFiles\TEST.FeatureSource del /F ..\..\bin\UnitTestFiles\TEST.FeatureSource
if EXIST ..\..\bin\UnitTestFiles\TEST.sdf del /F ..\..\bin\UnitTestFiles\TEST.sdf
if EXIST ..\..\bin\UnitTestFiles\UT_BaseMap.mdf del /F ..\..\bin\UnitTestFiles\UT_BaseMap.mdf
@@ -1449,6 +1457,7 @@
"..\..\..\UnitTest\TestData\ResourceService\SampleRepositoryContent.xml" :
"..\..\..\UnitTest\TestData\ResourceService\Shuttle.zip" :
"..\..\..\UnitTest\TestData\ResourceService\World_Countries.sdf" :
+"..\..\..\UnitTest\TestData\ResourceService\TEST.LayerDefinition" :
"..\..\..\UnitTest\TestData\FeatureService\SDF\TEST.FeatureSource" :
"..\..\..\UnitTest\TestData\FeatureService\SDF\TEST.sdf" :
"..\..\..\UnitTest\TestData\FeatureService\SDF\Sheboygan_Parcels.FeatureSource" :
@@ -1548,6 +1557,10 @@
if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
if EXIST "..\..\..\UnitTest\TestData\ResourceService\World_Countries.sdf" xcopy /r /d /y "..\..\..\UnitTest\TestData\ResourceService\World_Countries.sdf" ..\..\bin\UnitTestFiles\
+..\..\bin\UnitTestFiles\TEST.LayerDefinition : "..\..\..\UnitTest\TestData\ResourceService\TEST.LayerDefinition"
+ if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
+ if EXIST "..\..\..\UnitTest\TestData\ResourceService\TEST.LayerDefinition" xcopy /r /d /y "..\..\..\UnitTest\TestData\ResourceService\TEST.LayerDefinition" ..\..\bin\UnitTestFiles\
+
..\..\bin\UnitTestFiles\TEST.FeatureSource : "..\..\..\UnitTest\TestData\FeatureService\SDF\TEST.FeatureSource"
if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
if EXIST "..\..\..\UnitTest\TestData\FeatureService\SDF\TEST.FeatureSource" xcopy /r /d /y "..\..\..\UnitTest\TestData\FeatureService\SDF\TEST.FeatureSource" ..\..\bin\UnitTestFiles\
Modified: trunk/MgDev/Server/src/UnitTesting/TestResourceService.cpp
===================================================================
--- trunk/MgDev/Server/src/UnitTesting/TestResourceService.cpp 2009-09-17 22:31:48 UTC (rev 4232)
+++ trunk/MgDev/Server/src/UnitTesting/TestResourceService.cpp 2009-09-18 05:31:10 UTC (rev 4233)
@@ -39,6 +39,7 @@
MgResourceIdentifier resourceIdentifier2(L"Library://UnitTests/Data/test-2.FeatureSource"); // Used in copy and move
MgResourceIdentifier resourceIdentifier3(L"Library://UnitTests/Data/World.DrawingSource"); // Added by package
MgResourceIdentifier resourceNotExist(L"Library://UnitTests/Data/resourcedoesnotexist.FeatureSource");
+MgResourceIdentifier resourceIdentifier4(L"Library://UnitTests/Layer/test-1.LayerDefinition"); // For cascade move resource
STRING resourceDataName = L"World_Countries.sdf";
STRING resourceDataName2 = L"New_World_Countries.sdf";
@@ -47,12 +48,14 @@
STRING repositoryHeaderFileName = L"..\\UnitTestFiles\\SampleRepositoryHeader.xml";
STRING repositoryContentFileName = L"..\\UnitTestFiles\\SampleRepositoryContent.xml";
STRING resourceContentFileName = L"..\\UnitTestFiles\\TEST.FeatureSource";
+STRING resourceContentFileName2 = L"..\\UnitTestFiles\\TEST.LayerDefinition";
STRING dataFileName = L"..\\UnitTestFiles\\World_Countries.sdf";
STRING packageName = L"..\\UnitTestFiles\\Shuttle.zip";
#else
STRING repositoryHeaderFileName = L"../UnitTestFiles/SampleRepositoryHeader.xml";
STRING repositoryContentFileName = L"../UnitTestFiles/SampleRepositoryContent.xml";
STRING resourceContentFileName = L"../UnitTestFiles/TEST.FeatureSource";
+STRING resourceContentFileName2 = L"../UnitTestFiles/TEST.LayerDefinition";
STRING dataFileName = L"../UnitTestFiles/World_Countries.sdf";
STRING packageName = L"../UnitTestFiles/Shuttle.zip";
#endif
@@ -696,6 +699,11 @@
contentSource = new MgByteSource(resourceContentFileName);
contentReader = contentSource->GetReader();
pService->SetResource(&resourceIdentifier, contentReader, NULL);
+
+ //Add another resource layer definition, which references to the feature source. This is for cascade MoveResource test.
+ contentSource = new MgByteSource(resourceContentFileName2);
+ contentReader = contentSource->GetReader();
+ pService->SetResource(&resourceIdentifier4, contentReader, NULL);
}
//Try to add resource while not an admin
@@ -751,16 +759,27 @@
//Try to use NULL arguments
- CPPUNIT_ASSERT_THROW_MG(pService->MoveResource(NULL, NULL, true), MgNullArgumentException*);
- CPPUNIT_ASSERT_THROW_MG(pService->MoveResource(&resourceIdentifier, NULL, true), MgNullArgumentException*);
- CPPUNIT_ASSERT_THROW_MG(pService->MoveResource(NULL, &resourceIdentifier, true), MgNullArgumentException*);
+ CPPUNIT_ASSERT_THROW_MG(pService->MoveResource(NULL, NULL, true, false), MgNullArgumentException*);
+ CPPUNIT_ASSERT_THROW_MG(pService->MoveResource(&resourceIdentifier, NULL, true, true), MgNullArgumentException*);
+ CPPUNIT_ASSERT_THROW_MG(pService->MoveResource(NULL, &resourceIdentifier, true, false), MgNullArgumentException*);
//Try to move a resource that doesn't exist
- CPPUNIT_ASSERT_THROW_MG(pService->MoveResource(&resourceNotExist, &resourceIdentifier2, false), MgResourceNotFoundException*);
+ CPPUNIT_ASSERT_THROW_MG(pService->MoveResource(&resourceNotExist, &resourceIdentifier2, false, true), MgResourceNotFoundException*);
- //Move the resource that was added earlier
- pService->MoveResource(&resourceIdentifier, &resourceIdentifier2, false);
+ //Move the resource that was added earlier with cascade = true, and check referencing resource.
+ pService->MoveResource(&resourceIdentifier, &resourceIdentifier2, false, true);
+ Ptr<MgByteReader> byteReader = pService->GetResourceContent(&resourceIdentifier4, L"");
+ STRING referenceContent = byteReader->ToString();
+ STRING featureIdTag = L"<ResourceId>Library://UnitTests/Data/test-2.FeatureSource</ResourceId>";
+ CPPUNIT_ASSERT(referenceContent.find(featureIdTag) != STRING::npos);
+ //Move the resource again with cascade = false, and check referencing resource.
+ pService->MoveResource(&resourceIdentifier2, &resourceIdentifier, false, false);
+ byteReader = pService->GetResourceContent(&resourceIdentifier4, L"");
+ referenceContent = byteReader->ToString();
+ featureIdTag = L"<ResourceId>Library://UnitTests/Data/test-2.FeatureSource</ResourceId>";
+ CPPUNIT_ASSERT(referenceContent.find(featureIdTag) != STRING::npos);
+
//Try to move the resource into itself (ie. itself)
CPPUNIT_ASSERT_THROW_MG(pService->MoveResource(&resourceIdentifier, &resourceIdentifier, false), MgInvalidArgumentException*);
}
@@ -818,14 +837,14 @@
//Try to use NULL arguments
CPPUNIT_ASSERT_THROW_MG(pService->CopyResource(NULL, NULL, true), MgNullArgumentException*);
- CPPUNIT_ASSERT_THROW_MG(pService->CopyResource(&resourceIdentifier2, NULL, true), MgNullArgumentException*);
- CPPUNIT_ASSERT_THROW_MG(pService->CopyResource(NULL, &resourceIdentifier, true), MgNullArgumentException*);
+ CPPUNIT_ASSERT_THROW_MG(pService->CopyResource(&resourceIdentifier, NULL, true), MgNullArgumentException*);
+ CPPUNIT_ASSERT_THROW_MG(pService->CopyResource(NULL, &resourceIdentifier2, true), MgNullArgumentException*);
//Try to use source & destination as the same thing
- CPPUNIT_ASSERT_THROW_MG(pService->CopyResource(&resourceIdentifier, &resourceIdentifier, false), MgInvalidArgumentException*);
+ CPPUNIT_ASSERT_THROW_MG(pService->CopyResource(&resourceIdentifier2, &resourceIdentifier2, false), MgInvalidArgumentException*);
- //Copy the moved resource back to its original location
- pService->CopyResource(&resourceIdentifier2, &resourceIdentifier, false);
+ //Copy the moved resource to another location
+ pService->CopyResource(&resourceIdentifier, &resourceIdentifier2, false);
//Try to copy a resource to one that should now exist
CPPUNIT_ASSERT_THROW_MG(pService->CopyResource(&resourceIdentifier2, &resourceIdentifier, false), MgDuplicateResourceException*);
@@ -898,6 +917,59 @@
///----------------------------------------------------------------------------
/// Test Case Description:
///
+/// This test case gets the contents of a collection of resources
+///----------------------------------------------------------------------------
+void TestResourceService::TestCase_GetResourceContents()
+{
+ try
+ {
+ MgServiceManager* serviceManager = MgServiceManager::GetInstance();
+ if(serviceManager == 0)
+ {
+ throw new MgNullReferenceException(L"TestResourceService.TestCase_GetResourceContents", __LINE__, __WFILE__, NULL, L"", NULL);
+ }
+
+ Ptr<MgResourceService> pService = dynamic_cast<MgResourceService*>(serviceManager->RequestService(MgServiceType::ResourceService));
+ if (pService == 0)
+ {
+ throw new MgServiceNotAvailableException(L"TestResourceService.TestCase_GetResourceContents", __LINE__, __WFILE__, NULL, L"", NULL);
+ }
+
+ // Set the user information for the current thread to be administrator.
+ Ptr<MgUserInformation> adminUserInfo = new MgUserInformation(adminName, adminPass);
+ MgUserInformation::SetCurrentUserInfo(adminUserInfo);
+
+ //Try to get the contents using NULL arguments
+ CPPUNIT_ASSERT_THROW_MG(pService->GetResourceContents(NULL, NULL), MgNullArgumentException*);
+
+ //Try to get the content of a resource that doesn't exist
+ Ptr<MgStringCollection> resourceNotExistCol = new MgStringCollection();
+ resourceNotExistCol->Add(resourceNotExist.ToString());
+ resourceNotExistCol->Add(resourceIdentifier.ToString());
+ CPPUNIT_ASSERT_THROW_MG(pService->GetResourceContents(resourceNotExistCol, NULL), MgResourceNotFoundException*);
+
+ //Get the content of the resource that was added in TestCase_SetResource
+ Ptr<MgStringCollection> resourceIds = new MgStringCollection();
+ resourceIds->Add(resourceIdentifier.ToString());
+ resourceIds->Add(resourceIdentifier4.ToString());
+ Ptr<MgStringCollection> ret = pService->GetResourceContents(resourceIds, NULL);
+ CPPUNIT_ASSERT(ret->GetCount() == 2);
+ for(int i = 0; i < ret->GetCount(); i ++)
+ {
+ CPPUNIT_ASSERT(!ret->GetItem(i).empty());
+ }
+ }
+ catch(MgException* e)
+ {
+ STRING message = e->GetDetails(TEST_LOCALE);
+ SAFE_RELEASE(e);
+ CPPUNIT_FAIL(MG_WCHAR_TO_CHAR(message.c_str()));
+ }
+}
+
+///----------------------------------------------------------------------------
+/// Test Case Description:
+///
/// This test case gets the header of the resource
///----------------------------------------------------------------------------
void TestResourceService::TestCase_GetResourceHeader()
Modified: trunk/MgDev/Server/src/UnitTesting/TestResourceService.h
===================================================================
--- trunk/MgDev/Server/src/UnitTesting/TestResourceService.h 2009-09-17 22:31:48 UTC (rev 4232)
+++ trunk/MgDev/Server/src/UnitTesting/TestResourceService.h 2009-09-18 05:31:10 UTC (rev 4233)
@@ -39,6 +39,7 @@
CPPUNIT_TEST(TestCase_MoveResource);
CPPUNIT_TEST(TestCase_CopyResource);
CPPUNIT_TEST(TestCase_GetResourceContent);
+ CPPUNIT_TEST(TestCase_GetResourceContents);
CPPUNIT_TEST(TestCase_GetResourceHeader);
CPPUNIT_TEST(TestCase_EnumerateReferences);
CPPUNIT_TEST(TestCase_ChangeResourceOwner);
@@ -79,6 +80,7 @@
void TestCase_MoveResource();
void TestCase_CopyResource();
void TestCase_GetResourceContent();
+ void TestCase_GetResourceContents();
void TestCase_GetResourceHeader();
void TestCase_EnumerateReferences();
void TestCase_ChangeResourceOwner();
Modified: trunk/MgDev/Server/src/UnitTesting/TestSiteService.cpp
===================================================================
--- trunk/MgDev/Server/src/UnitTesting/TestSiteService.cpp 2009-09-17 22:31:48 UTC (rev 4232)
+++ trunk/MgDev/Server/src/UnitTesting/TestSiteService.cpp 2009-09-18 05:31:10 UTC (rev 4233)
@@ -1209,13 +1209,13 @@
MgServiceManager* serviceManager = MgServiceManager::GetInstance();
if(serviceManager == 0)
{
- throw new MgNullReferenceException(L"TestSiteService.TestCase_CreateSession", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgNullReferenceException(L"TestSiteService.TestCase_DestroySession", __LINE__, __WFILE__, NULL, L"", NULL);
}
Ptr<MgServerSiteService> pService = dynamic_cast<MgServerSiteService*>(serviceManager->RequestService(MgServiceType::SiteService));
if (pService == 0)
{
- throw new MgServiceNotAvailableException(L"TestSiteService.TestCase_CreateSession", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgServiceNotAvailableException(L"TestSiteService.TestCase_DestroySession", __LINE__, __WFILE__, NULL, L"", NULL);
}
Ptr<MgUserInformation> userInfo;
@@ -1255,3 +1255,39 @@
throw;
}
}
+
+///----------------------------------------------------------------------------
+/// Test Case Description:
+///
+/// This test case get server session timeout.
+///----------------------------------------------------------------------------
+void TestSiteService::TestCase_GetSessionTimeout()
+{
+ try
+ {
+ MgServiceManager* serviceManager = MgServiceManager::GetInstance();
+ if(serviceManager == 0)
+ {
+ throw new MgNullReferenceException(L"TestSiteService.TestCase_GetSessionTimeout", __LINE__, __WFILE__, NULL, L"", NULL);
+ }
+
+ Ptr<MgServerSiteService> pService = dynamic_cast<MgServerSiteService*>(serviceManager->RequestService(MgServiceType::SiteService));
+ if (pService == 0)
+ {
+ throw new MgServiceNotAvailableException(L"TestSiteService.TestCase_GetSessionTimeout", __LINE__, __WFILE__, NULL, L"", NULL);
+ }
+
+ INT32 timeoutValue = pService->GetSessionTimeout();
+ CPPUNIT_ASSERT(timeoutValue == 1200);
+ }
+ catch(MgException* e)
+ {
+ STRING message = e->GetStackTrace(userLocale);
+ SAFE_RELEASE(e);
+ CPPUNIT_FAIL(MG_WCHAR_TO_CHAR(message.c_str()));
+ }
+ catch(...)
+ {
+ throw;
+ }
+}
Modified: trunk/MgDev/Server/src/UnitTesting/TestSiteService.h
===================================================================
--- trunk/MgDev/Server/src/UnitTesting/TestSiteService.h 2009-09-17 22:31:48 UTC (rev 4232)
+++ trunk/MgDev/Server/src/UnitTesting/TestSiteService.h 2009-09-18 05:31:10 UTC (rev 4233)
@@ -56,6 +56,7 @@
CPPUNIT_TEST(TestCase_Authenticate);
CPPUNIT_TEST(TestCase_CreateSession);
CPPUNIT_TEST(TestCase_DestroySession);
+ CPPUNIT_TEST(TestCase_GetSessionTimeout);
CPPUNIT_TEST(TestEnd); // This must be the very last unit test
CPPUNIT_TEST_SUITE_END();
@@ -100,6 +101,7 @@
void TestCase_Authenticate();
void TestCase_CreateSession();
void TestCase_DestroySession();
+ void TestCase_GetSessionTimeout();
};
#endif // _TESTSITESERVICE_H
Added: trunk/MgDev/UnitTest/TestData/ResourceService/TEST.LayerDefinition
===================================================================
--- trunk/MgDev/UnitTest/TestData/ResourceService/TEST.LayerDefinition (rev 0)
+++ trunk/MgDev/UnitTest/TestData/ResourceService/TEST.LayerDefinition 2009-09-18 05:31:10 UTC (rev 4233)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<LayerDefinition xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="LayerDefinition-1.3.0.xsd" version="1.3.0">
+ <VectorLayerDefinition>
+ <ResourceId>Library://UnitTests/Data/test-1.FeatureSource</ResourceId>
+ <FeatureName>SDF_2_Schema:TEST</FeatureName>
+ <FeatureNameType>FeatureClass</FeatureNameType>
+ <Geometry>Data</Geometry>
+ <VectorScaleRange>
+ <LineTypeStyle>
+ <LineRule>
+ <LegendLabel></LegendLabel>
+ <LineSymbolization2D>
+ <LineStyle>Solid</LineStyle>
+ <Thickness>0.0</Thickness>
+ <Color>ff000000</Color>
+ <Unit>Centimeters</Unit>
+ <SizeContext>DeviceUnits</SizeContext>
+ </LineSymbolization2D>
+ </LineRule>
+ <ShowInLegend>true</ShowInLegend>
+ </LineTypeStyle>
+ </VectorScaleRange>
+ </VectorLayerDefinition>
+</LayerDefinition>
More information about the mapguide-commits
mailing list