[mapguide-commits] r9663 - sandbox/jng/catch2/Server/src/UnitTesting
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Mon Jul 13 08:06:55 PDT 2020
Author: jng
Date: 2020-07-13 08:06:55 -0700 (Mon, 13 Jul 2020)
New Revision: 9663
Removed:
sandbox/jng/catch2/Server/src/UnitTesting/CppUnitExtensions.h
Modified:
sandbox/jng/catch2/Server/src/UnitTesting/TestPerformance.cpp
sandbox/jng/catch2/Server/src/UnitTesting/TestServiceFactory.cpp
sandbox/jng/catch2/Server/src/UnitTesting/TestServiceFactory.h
sandbox/jng/catch2/Server/src/UnitTesting/UnitTesting.cpp
sandbox/jng/catch2/Server/src/UnitTesting/UnitTesting.vcxproj
Log:
Remove references to cppunit and make test data setup/teardown conditional on whether the suite in question is to be run
Deleted: sandbox/jng/catch2/Server/src/UnitTesting/CppUnitExtensions.h
===================================================================
--- sandbox/jng/catch2/Server/src/UnitTesting/CppUnitExtensions.h 2020-07-13 14:35:45 UTC (rev 9662)
+++ sandbox/jng/catch2/Server/src/UnitTesting/CppUnitExtensions.h 2020-07-13 15:06:55 UTC (rev 9663)
@@ -1,78 +0,0 @@
-//
-// Copyright (C) 2004-2011 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 _CPPUNIT_EXTENSIONS_H
-#define _CPPUNIT_EXTENSIONS_H
-
-/** Asserts that the given expression throws an exception of the specified type.
- * \ingroup Assertions
- * Example of usage:
- * \code
- * std::out_of_range exception;
- * std::vector<int> v;
- * CPPUNIT_ASSERT_THROW_EX( v.at( 50 ), std::out_of_range, exception );
- * \endcode
- */
-# define CPPUNIT_ASSERT_THROW_EX( expression, ExceptionType, exception ) \
- do { \
- bool cpputExceptionThrown_ = false; \
- try { \
- expression; \
- } catch ( ExceptionType & ex_) { \
- cpputExceptionThrown_ = true; \
- exception = ex_; \
- } \
- \
- if ( cpputExceptionThrown_ ) \
- break; \
- \
- CPPUNIT_NS::Asserter::fail( \
- "Expected exception: " #ExceptionType \
- " not thrown.", \
- CPPUNIT_SOURCELINE() ); \
- } while ( false )
-
-
-/** Asserts that the given expression throws an MgException of the specified type.
- * \ingroup Assertions
- * Example of usage:
- * \code
- * MgLogManager* pMgLogManager = MgLogManager::GetInstance();
- * CPPUNIT_ASSERT_THROW_MG(mgr->DeleteLog(L""), MgNullArgumentException*);
- * \endcode
- */
-# define CPPUNIT_ASSERT_THROW_MG( expression, MgExceptionType ) \
- do { \
- Ptr<MgException> exception; \
- bool cpputExceptionThrown_ = false; \
- try { \
- expression; \
- } catch ( MgExceptionType & ex_) { \
- cpputExceptionThrown_ = true; \
- exception = ex_; \
- } \
- \
- if ( cpputExceptionThrown_ ) \
- break; \
- \
- CPPUNIT_NS::Asserter::fail( \
- "Expected exception: " #MgExceptionType \
- " not thrown.", \
- CPPUNIT_SOURCELINE() ); \
- } while ( false )
-
-#endif // _CPPUNIT_EXTENSIONS_H
Modified: sandbox/jng/catch2/Server/src/UnitTesting/TestPerformance.cpp
===================================================================
--- sandbox/jng/catch2/Server/src/UnitTesting/TestPerformance.cpp 2020-07-13 14:35:45 UTC (rev 9662)
+++ sandbox/jng/catch2/Server/src/UnitTesting/TestPerformance.cpp 2020-07-13 15:06:55 UTC (rev 9663)
@@ -16,7 +16,6 @@
//
#include "MapGuideCommon.h"
-#include "CppUnitExtensions.h"
#include "ServiceManager.h"
#include "FdoConnectionManager.h"
#include "Services/FeatureService.h"
Modified: sandbox/jng/catch2/Server/src/UnitTesting/TestServiceFactory.cpp
===================================================================
--- sandbox/jng/catch2/Server/src/UnitTesting/TestServiceFactory.cpp 2020-07-13 14:35:45 UTC (rev 9662)
+++ sandbox/jng/catch2/Server/src/UnitTesting/TestServiceFactory.cpp 2020-07-13 15:06:55 UTC (rev 9663)
@@ -21,9 +21,37 @@
#define CATCH_CONFIG_EXTERNAL_INTERFACES
#include "catch.hpp"
-
const STRING TestServiceFactory::TEST_LOCALE = L"en";
+std::set<std::string> TestServiceFactory::sm_suitesToRun;
+
+bool TestServiceFactory::IsRunningSuite(const std::string& suite)
+{
+ return sm_suitesToRun.find(suite) != sm_suitesToRun.end();
+}
+
+void TestServiceFactory::GetCatch2Tags(std::string& testOrTags)
+{
+ bool bFirst = true;
+ for (auto const& item : sm_suitesToRun)
+ {
+ if (bFirst)
+ {
+ bFirst = false;
+ }
+ else
+ {
+ testOrTags += ",";
+ }
+ testOrTags += item;
+ }
+}
+
+void TestServiceFactory::AddSuiteToRun(const std::string& suite)
+{
+ sm_suitesToRun.insert(suite);
+}
+
MgSiteConnection* TestServiceFactory::CreateSiteConnection(MgServerSiteService* svcSite)
{
STRING session;
@@ -187,12 +215,14 @@
}
#endif
- printf("************************************\n");
- printf("******* Setting up test data *******\n");
- printf("************************************\n");
+ printf("*******************************************\n");
+ printf("******* Setting up test environment *******\n");
+ printf("*******************************************\n");
// TestMisc setup
+ if (TestServiceFactory::IsRunningSuite("[Misc]"))
{
+ printf("Setting up data for suite: Misc\n");
//Reusing Mapping Service test data
try
{
@@ -290,7 +320,9 @@
}
// TestMdfModel setup
+ if (TestServiceFactory::IsRunningSuite("[MdfModel]"))
{
+ printf("Setting up data for suite: MdfModel\n");
try
{
// set user info
@@ -347,7 +379,9 @@
}
// TestGeometry setup
+ if (TestServiceFactory::IsRunningSuite("[Geometry]"))
{
+ printf("Setting up data for suite: Geometry\n");
try
{
MgResourceIdentifier resourceIdentifier1(L"Library://UnitTests/Data/Sheboygan_Parcels.FeatureSource");
@@ -378,7 +412,9 @@
}
// TestDrawingService setup
+ if (TestServiceFactory::IsRunningSuite("[DrawingService]"))
{
+ printf("Setting up data for suite: DrawingService\n");
try
{
MgResourceIdentifier resourceIdentifier1(L"Library://UnitTests/Drawings/SpaceShip.DrawingSource");
@@ -400,7 +436,9 @@
}
// TestKmlService setup
+ if (TestServiceFactory::IsRunningSuite("[KmlService]"))
{
+ printf("Setting up data for suite: KmlService\n");
try
{
//publish the map definition
@@ -467,7 +505,9 @@
}
// TestMappingService setup
+ if (TestServiceFactory::IsRunningSuite("[MappingService]"))
{
+ printf("Setting up data for suite: MappingService\n");
try
{
//publish the map definition
@@ -603,7 +643,9 @@
}
// TestRenderingService setup
+ if (TestServiceFactory::IsRunningSuite("[RenderingService]"))
{
+ printf("Setting up data for suite: RenderingService\n");
try
{
// publish the map definition
@@ -944,7 +986,9 @@
}
// TestTileService setup
+ if (TestServiceFactory::IsRunningSuite("[TileService]"))
{
+ printf("Setting up data for suite: TileService\n");
try
{
// ------------------------------------------------------
@@ -1049,7 +1093,9 @@
}
// TestProfilingService setup
+ if (TestServiceFactory::IsRunningSuite("[ProfilingService]"))
{
+ printf("Setting up data for suite: ProfilingService\n");
try
{
// publish the map definition
@@ -1290,7 +1336,9 @@
}
// TestFeatureService setup
+ if (TestServiceFactory::IsRunningSuite("[FeatureService]"))
{
+ printf("Setting up data for suite: FeatureService\n");
try
{
MgResourceIdentifier resourceIdentifier1(L"Library://UnitTests/Data/Sheboygan_Parcels.FeatureSource");
@@ -1435,7 +1483,9 @@
}
// TestPerformance setup
+ if (TestServiceFactory::IsRunningSuite("[Performance]"))
{
+ printf("Setting up data for suite: Performance\n");
try
{
MgResourceIdentifier resourceIdentifier1(L"Library://UnitTests/Data/Sheboygan_Parcels.FeatureSource");
@@ -1474,12 +1524,14 @@
printf("Tearing down test data\n");
- printf("**************************************\n");
- printf("******* Tearing down test data *******\n");
- printf("**************************************\n");
+ printf("***************************************\n");
+ printf("**** Tearing down test environment ****\n");
+ printf("***************************************\n");
// TestMisc teardown
+ if (TestServiceFactory::IsRunningSuite("[Misc]"))
{
+ printf("Tearing down data for suite: Misc\n");
try
{
//set user info
@@ -1546,7 +1598,9 @@
}
// TestMdfModel teardown
+ if (TestServiceFactory::IsRunningSuite("[MdfModel]"))
{
+ printf("Tearing down data for suite: MdfModel\n");
try
{
// set user info
@@ -1588,7 +1642,9 @@
}
// TestGeometry teardown
+ if (TestServiceFactory::IsRunningSuite("[Geometry]"))
{
+ printf("Tearing down data for suite: Geometry\n");
try
{
Ptr<MgResourceIdentifier> fsres1 = new MgResourceIdentifier(L"Library://UnitTests/Data/Sheboygan_Parcels.FeatureSource");
@@ -1607,7 +1663,9 @@
}
// TestDrawingService teardown
+ if (TestServiceFactory::IsRunningSuite("[DrawingService]"))
{
+ printf("Tearing down data for suite: DrawingService\n");
try
{
MgResourceIdentifier resourceIdentifier1(L"Library://UnitTests/Drawings/SpaceShip.DrawingSource");
@@ -1623,7 +1681,9 @@
}
// TestKmlService teardown
+ if (TestServiceFactory::IsRunningSuite("[KmlService]"))
{
+ printf("Tearing down data for suite: KmlService\n");
try
{
//delete the map definition
@@ -1663,7 +1723,9 @@
}
// TestMappingService teardown
+ if (TestServiceFactory::IsRunningSuite("[MappingService]"))
{
+ printf("Tearing down data for suite: MappingService\n");
try
{
//delete the map definition
@@ -1744,7 +1806,9 @@
}
// TestProfilingService teardown
+ if (TestServiceFactory::IsRunningSuite("[ProfilingService]"))
{
+ printf("Tearing down data for suite: ProfilingService\n");
try
{
// delete the map definition
@@ -1858,7 +1922,10 @@
}
// TestRenderingService teardown
+ if (TestServiceFactory::IsRunningSuite("[RenderingService]"))
{
+ printf("Tearing down data for suite: RenderingService\n");
+
// delete the map definition
Ptr<MgResourceIdentifier> mapres1 = new MgResourceIdentifier(L"Library://UnitTests/Maps/Sheboygan.MapDefinition");
svcResource->DeleteResource(mapres1);
@@ -1993,7 +2060,9 @@
}
// TestTileService teardown
+ if (TestServiceFactory::IsRunningSuite("[TileService]"))
{
+ printf("Tearing down data for suite: TileService\n");
try
{
// ------------------------------------------------------
@@ -2058,7 +2127,9 @@
}
// TestResourceService teardown
+ if (TestServiceFactory::IsRunningSuite("[ResourceService]"))
{
+ printf("Tearing down data for suite: ResourceService\n");
try
{
// delete the drawing source definition
@@ -2078,7 +2149,10 @@
}
// TestFeatureService teardown
+ if (TestServiceFactory::IsRunningSuite("[FeatureService]"))
{
+ printf("Tearing down data for suite: FeatureService\n");
+
// delete the feature sources definition
Ptr<MgResourceIdentifier> fsres1 = new MgResourceIdentifier(L"Library://UnitTests/Data/Sheboygan_Parcels.FeatureSource");
svcResource->DeleteResource(fsres1);
@@ -2113,7 +2187,10 @@
}
// TestPerformance teardown
+ if (TestServiceFactory::IsRunningSuite("[Performance]"))
{
+ printf("Tearing down data for suite: Performance\n");
+
// delete the feature sources definition
Ptr<MgResourceIdentifier> mapres1 = new MgResourceIdentifier(L"Library://UnitTests/Data/Sheboygan_Parcels.FeatureSource");
svcResource->DeleteResource(mapres1);
Modified: sandbox/jng/catch2/Server/src/UnitTesting/TestServiceFactory.h
===================================================================
--- sandbox/jng/catch2/Server/src/UnitTesting/TestServiceFactory.h 2020-07-13 14:35:45 UTC (rev 9662)
+++ sandbox/jng/catch2/Server/src/UnitTesting/TestServiceFactory.h 2020-07-13 15:06:55 UTC (rev 9663)
@@ -24,6 +24,9 @@
#include "ServerSiteService.h"
#include "FoundationDefs.h"
+#include <string>
+#include <set>
+
class TestServiceFactory
{
public:
@@ -50,6 +53,15 @@
static MgMappingService* CreateMappingService();
static MgProfilingService* CreateProfilingService();
+
+ static void AddSuiteToRun(const std::string& suite);
+
+ static void GetCatch2Tags(std::string& testOrTags);
+
+ static bool IsRunningSuite(const std::string& suite);
+
+private:
+ static std::set<std::string> sm_suitesToRun;
};
#endif
Modified: sandbox/jng/catch2/Server/src/UnitTesting/UnitTesting.cpp
===================================================================
--- sandbox/jng/catch2/Server/src/UnitTesting/UnitTesting.cpp 2020-07-13 14:35:45 UTC (rev 9662)
+++ sandbox/jng/catch2/Server/src/UnitTesting/UnitTesting.cpp 2020-07-13 15:06:55 UTC (rev 9663)
@@ -18,6 +18,7 @@
#include "MapGuideCommon.h"
#include "UnitTesting.h"
#include "FoundationDefs.h"
+#include "TestServiceFactory.h"
#define CATCH_CONFIG_RUNNER
#include "catch.hpp"
@@ -35,26 +36,26 @@
{
if (test == L"all")
{
- session.configData().testsOrTags.push_back("[CoordinateSystem]");
- session.configData().testsOrTags.push_back("[DrawingService]");
- session.configData().testsOrTags.push_back("[FeatureService]");
- session.configData().testsOrTags.push_back("[Geometry]");
- session.configData().testsOrTags.push_back("[KmlService]");
- session.configData().testsOrTags.push_back("[LogManager]");
- session.configData().testsOrTags.push_back("[MappingService]");
- session.configData().testsOrTags.push_back("[MdfModel]");
- session.configData().testsOrTags.push_back("[Misc]");
- session.configData().testsOrTags.push_back("[Performance]");
- session.configData().testsOrTags.push_back("[RenderingService]");
- session.configData().testsOrTags.push_back("[ResourceService]");
- session.configData().testsOrTags.push_back("[ServerAdminService]");
- session.configData().testsOrTags.push_back("[ServerManager]");
- session.configData().testsOrTags.push_back("[ServiceManager]");
- session.configData().testsOrTags.push_back("[SiteManager]");
- session.configData().testsOrTags.push_back("[SiteService]");
- session.configData().testsOrTags.push_back("[TileService]");
- session.configData().testsOrTags.push_back("[ProfilingService]");
- session.configData().testsOrTags.push_back("[TransformMesh]");
+ TestServiceFactory::AddSuiteToRun("[CoordinateSystem]");
+ TestServiceFactory::AddSuiteToRun("[DrawingService]");
+ TestServiceFactory::AddSuiteToRun("[FeatureService]");
+ TestServiceFactory::AddSuiteToRun("[Geometry]");
+ TestServiceFactory::AddSuiteToRun("[KmlService]");
+ TestServiceFactory::AddSuiteToRun("[LogManager]");
+ TestServiceFactory::AddSuiteToRun("[MappingService]");
+ TestServiceFactory::AddSuiteToRun("[MdfModel]");
+ TestServiceFactory::AddSuiteToRun("[Misc]");
+ TestServiceFactory::AddSuiteToRun("[Performance]");
+ TestServiceFactory::AddSuiteToRun("[RenderingService]");
+ TestServiceFactory::AddSuiteToRun("[ResourceService]");
+ TestServiceFactory::AddSuiteToRun("[ServerAdminService]");
+ TestServiceFactory::AddSuiteToRun("[ServerManager]");
+ TestServiceFactory::AddSuiteToRun("[ServiceManager]");
+ TestServiceFactory::AddSuiteToRun("[SiteManager]");
+ TestServiceFactory::AddSuiteToRun("[SiteService]");
+ TestServiceFactory::AddSuiteToRun("[TileService]");
+ TestServiceFactory::AddSuiteToRun("[ProfilingService]");
+ TestServiceFactory::AddSuiteToRun("[TransformMesh]");
}
else if (test == L"list")
{
@@ -92,7 +93,7 @@
std::string testToRun = "[";
testToRun += MgUtil::WideCharToMultiByte(test);
testToRun += "]";
- session.configData().testsOrTags.push_back(testToRun);
+ TestServiceFactory::AddSuiteToRun(testToRun);
}
}
@@ -99,6 +100,9 @@
int nResult = 0;
if (bRunTests)
{
+ std::string testsOrTags;
+ TestServiceFactory::GetCatch2Tags(testsOrTags);
+ session.configData().testsOrTags.push_back(testsOrTags);
nResult = session.run();
}
return nResult;
Modified: sandbox/jng/catch2/Server/src/UnitTesting/UnitTesting.vcxproj
===================================================================
--- sandbox/jng/catch2/Server/src/UnitTesting/UnitTesting.vcxproj 2020-07-13 14:35:45 UTC (rev 9662)
+++ sandbox/jng/catch2/Server/src/UnitTesting/UnitTesting.vcxproj 2020-07-13 15:06:55 UTC (rev 9663)
@@ -94,7 +94,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\Common;..\Common\Cache;..\Common\Manager;..\Services\Feature;..\Services\Kml;..\Services\Mapping;..\Services\Rendering;..\Services\Resource;..\Services\ServerAdmin;..\Services\Site;..\Services\Tile;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;..\..\..\Common\MdfModel;..\..\..\Common\MdfParser;..\..\..\Common\Renderers;..\..\..\Common\Stylization;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\CppUnit-1.9.14\include;..\..\..\Oem\catch2;..\..\..\Oem\dbxml\xerces-c-src\src;..\..\..\Oem\FDO\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\Common;..\Common\Cache;..\Common\Manager;..\Services\Feature;..\Services\Kml;..\Services\Mapping;..\Services\Rendering;..\Services\Resource;..\Services\ServerAdmin;..\Services\Site;..\Services\Tile;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;..\..\..\Common\MdfModel;..\..\..\Common\MdfParser;..\..\..\Common\Renderers;..\..\..\Common\Stylization;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\catch2;..\..\..\Oem\dbxml\xerces-c-src\src;..\..\..\Oem\FDO\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -104,9 +104,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACEd.lib;cppunitd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>ACEd.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgUnitTestingd.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);..\..\..\Oem\CppUnit-1.9.14\lib\$(Configuration);..\..\..\Oem\FDO\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);..\..\..\Oem\FDO\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgUnitTestingd.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -120,7 +120,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\Common;..\Common\Cache;..\Common\Manager;..\Services\Feature;..\Services\Kml;..\Services\Mapping;..\Services\Rendering;..\Services\Resource;..\Services\ServerAdmin;..\Services\Site;..\Services\Tile;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;..\..\..\Common\MdfModel;..\..\..\Common\MdfParser;..\..\..\Common\Renderers;..\..\..\Common\Stylization;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\CppUnit-1.9.14\include;..\..\..\Oem\catch2;..\..\..\Oem\dbxml\xerces-c-src\src;..\..\..\Oem\FDO\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\Common;..\Common\Cache;..\Common\Manager;..\Services\Feature;..\Services\Kml;..\Services\Mapping;..\Services\Rendering;..\Services\Resource;..\Services\ServerAdmin;..\Services\Site;..\Services\Tile;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;..\..\..\Common\MdfModel;..\..\..\Common\MdfParser;..\..\..\Common\Renderers;..\..\..\Common\Stylization;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\catch2;..\..\..\Oem\dbxml\xerces-c-src\src;..\..\..\Oem\FDO\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -130,9 +130,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACEd.lib;cppunitd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>ACEd.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgUnitTestingd.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);..\..\..\Oem\CppUnit-1.9.14\lib64\$(Configuration);..\..\..\Oem\FDO\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);..\..\..\Oem\FDO\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgUnitTestingd.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -146,7 +146,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\Common;..\Common\Cache;..\Common\Manager;..\Services\Feature;..\Services\Kml;..\Services\Mapping;..\Services\Rendering;..\Services\Resource;..\Services\ServerAdmin;..\Services\Site;..\Services\Tile;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;..\..\..\Common\MdfModel;..\..\..\Common\MdfParser;..\..\..\Common\Renderers;..\..\..\Common\Stylization;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\CppUnit-1.9.14\include;..\..\..\Oem\catch2;..\..\..\Oem\dbxml\xerces-c-src\src;..\..\..\Oem\FDO\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\Common;..\Common\Cache;..\Common\Manager;..\Services\Feature;..\Services\Kml;..\Services\Mapping;..\Services\Rendering;..\Services\Resource;..\Services\ServerAdmin;..\Services\Site;..\Services\Tile;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;..\..\..\Common\MdfModel;..\..\..\Common\MdfParser;..\..\..\Common\Renderers;..\..\..\Common\Stylization;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\catch2;..\..\..\Oem\dbxml\xerces-c-src\src;..\..\..\Oem\FDO\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -155,9 +155,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACE.lib;cppunit.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>ACE.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgUnitTesting.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);..\..\..\Oem\CppUnit-1.9.14\lib\$(Configuration);..\..\..\Oem\FDO\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);..\..\..\Oem\FDO\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgUnitTesting.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -173,7 +173,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\Common;..\Common\Cache;..\Common\Manager;..\Services\Feature;..\Services\Kml;..\Services\Mapping;..\Services\Rendering;..\Services\Resource;..\Services\ServerAdmin;..\Services\Site;..\Services\Tile;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;..\..\..\Common\MdfModel;..\..\..\Common\MdfParser;..\..\..\Common\Renderers;..\..\..\Common\Stylization;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\CppUnit-1.9.14\include;..\..\..\Oem\catch2;..\..\..\Oem\dbxml\xerces-c-src\src;..\..\..\Oem\FDO\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\Common;..\Common\Cache;..\Common\Manager;..\Services\Feature;..\Services\Kml;..\Services\Mapping;..\Services\Rendering;..\Services\Resource;..\Services\ServerAdmin;..\Services\Site;..\Services\Tile;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;..\..\..\Common\MdfModel;..\..\..\Common\MdfParser;..\..\..\Common\Renderers;..\..\..\Common\Stylization;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\catch2;..\..\..\Oem\dbxml\xerces-c-src\src;..\..\..\Oem\FDO\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -182,9 +182,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACE.lib;cppunit.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>ACE.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgUnitTesting.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);..\..\..\Oem\CppUnit-1.9.14\lib64\$(Configuration);..\..\..\Oem\FDO\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);..\..\..\Oem\FDO\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgUnitTesting.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -199,7 +199,6 @@
</ItemDefinitionGroup>
<ItemGroup>
<ClInclude Include="CatchHelperMacros.h" />
- <ClInclude Include="CppUnitExtensions.h" />
<ClInclude Include="TestServiceFactory.h" />
<ClInclude Include="TestLogManagerThread.h" />
<ClInclude Include="UnitTesting.h" />
More information about the mapguide-commits
mailing list