[prev in list] [next in list] [prev in thread] [next in thread]
List: fdo-commits
Subject: [fdo-commits] r7526 - in trunk/Providers/WMS: Managed/UnitTest Src/UnitTest
From: svn_fdo () osgeo ! org
Date: 2016-11-16 7:32:51
Message-ID: 20161116073251.2BE173903DD () trac ! osgeo ! org
[Download RAW message or body]
Author: christinebao
Date: 2016-11-15 23:32:50 -0800 (Tue, 15 Nov 2016)
New Revision: 7526
Modified:
trunk/Providers/WMS/Managed/UnitTest/unit_test.csproj
trunk/Providers/WMS/Src/UnitTest/WmsTestCustomCommands.h
Log:
Fix WMS managed unit test to use 64bit.
Modified: trunk/Providers/WMS/Managed/UnitTest/unit_test.csproj
===================================================================
--- trunk/Providers/WMS/Managed/UnitTest/unit_test.csproj 2016-11-16 06:42:01 UTC \
(rev 7525)
+++ trunk/Providers/WMS/Managed/UnitTest/unit_test.csproj 2016-11-16 07:32:50 UTC \
(rev 7526) @@ -41,7 +41,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
- <Prefer32Bit>true</Prefer32Bit>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@@ -50,28 +50,28 @@
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
- <Prefer32Bit>true</Prefer32Bit>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
- <Reference Include="OSGeo.FDO, Version=3.3.8078.0, Culture=neutral, \
processorArchitecture=x86"> + <Reference Include="OSGeo.FDO">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\..\Fdo\Managed\bin\win32\debug\OSGeo.FDO.dll</HintPath>
+ <HintPath>..\..\..\..\Fdo\Managed\Bin\Win64\Debug\OSGeo.FDO.dll</HintPath>
</Reference>
- <Reference Include="OSGeo.FDO.Common, Version=3.3.8078.0, Culture=neutral, \
processorArchitecture=x86"> + <Reference Include="OSGeo.FDO.Common">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\..\Fdo\Managed\bin\win32\debug\OSGeo.FDO.Common.dll</HintPath>
+ <HintPath>..\..\..\..\Fdo\Managed\Bin\Win64\Debug\OSGeo.FDO.Common.dll</HintPath>
</Reference>
- <Reference Include="OSGeo.FDO.Geometry, Version=3.3.8078.0, Culture=neutral, \
processorArchitecture=x86"> + <Reference Include="OSGeo.FDO.Geometry">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\..\Fdo\Managed\bin\win32\debug\OSGeo.FDO.Geometry.dll</HintPath>
+ <HintPath>..\..\..\..\Fdo\Managed\Bin\Win64\Debug\OSGeo.FDO.Geometry.dll</HintPath>
</Reference>
- <Reference Include="OSGeo.FDO.Providers.WMS.Overrides, Version=3.2.6195.0, \
Culture=neutral, processorArchitecture=x86"> + <Reference \
Include="OSGeo.FDO.Providers.WMS.Overrides"> \
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\bin\debug\OSGeo.FDO.Providers.WMS.Overrides.dll</HintPath>
+ <HintPath>..\bin\debug64\OSGeo.FDO.Providers.WMS.Overrides.dll</HintPath>
</Reference>
- <Reference Include="OSGeo.FDO.Spatial, Version=3.3.8078.0, Culture=neutral, \
processorArchitecture=x86"> + <Reference Include="OSGeo.FDO.Spatial">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\..\Fdo\Managed\bin\win32\debug\OSGeo.FDO.Spatial.dll</HintPath>
+ <HintPath>..\..\..\..\Fdo\Managed\Bin\Win64\Debug\OSGeo.FDO.Spatial.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
@@ -108,44 +108,44 @@
-->
<PropertyGroup>
<PreBuildEvent>
- Copy $(FDO)\Unmanaged\Bin\Win32\Debug\FDO.dll .\
- Copy $(FDO)\Unmanaged\Bin\Win32\Debug\FDOMessage.dll .\
- Copy $(FDO)\Unmanaged\Bin\Win32\Debug\FDOCommon.dll .\
- Copy $(FDO)\Unmanaged\Bin\Win32\Debug\FDOGeometry.dll .\
- Copy $(FDO)\Unmanaged\Bin\Win32\Debug\FDOSpatial.dll .\
+ Copy $(FDO)\Unmanaged\Bin\Win64\Debug\FDO.dll .\
+ Copy $(FDO)\Unmanaged\Bin\Win64\Debug\FDOMessage.dll .\
+ Copy $(FDO)\Unmanaged\Bin\Win64\Debug\FDOCommon.dll .\
+ Copy $(FDO)\Unmanaged\Bin\Win64\Debug\FDOGeometry.dll .\
+ Copy $(FDO)\Unmanaged\Bin\Win64\Debug\FDOSpatial.dll .\
- Copy ..\..\..\..\..\..\Providers\WMS\Bin\Win32\Debug\WMSProvider.dll .\
- Copy ..\..\..\..\..\..\Providers\WMS\Bin\Win32\Debug\WMSProvider.pdb .\
+ Copy ..\..\..\..\..\..\Providers\WMS\Bin\Win64\Debug\WMSProvider.dll .\
+ Copy ..\..\..\..\..\..\Providers\WMS\Bin\Win64\Debug\WMSProvider.pdb .\
- Copy ..\..\..\..\..\..\Providers\WMS\Bin\Win32\Debug\WMSMessage.dll .\
+ Copy ..\..\..\..\..\..\Providers\WMS\Bin\Win64\Debug\WMSMessage.dll .\
- Copy ..\..\..\..\..\..\Providers\WMS\Bin\Win32\Debug\WMSOverrides.dll .\
- Copy ..\..\..\..\..\..\Providers\WMS\Bin\Win32\Debug\WMSOverrides.pdb .\
+ Copy ..\..\..\..\..\..\Providers\WMS\Bin\Win64\Debug\WMSOverrides.dll .\
+ Copy ..\..\..\..\..\..\Providers\WMS\Bin\Win64\Debug\WMSOverrides.pdb .\
- Copy $(FDOTHIRDPARTY)\apache\xerces\Build\Win32\VC9\Debug\xerces-c_3_1D.dll .\
- Copy $(FDOTHIRDPARTY)\apache\xerces\Build\Win32\VC9\Debug\xerces-c_3_1D.pdb .\
+ Copy $(FDOTHIRDPARTY)\apache\xerces\Build\Win64\VC9\Debug\xerces-c_3_1D.dll .\
+ Copy $(FDOTHIRDPARTY)\apache\xerces\Build\Win64\VC9\Debug\xerces-c_3_1D.pdb .\
- Copy $(FDOTHIRDPARTY)\apache\xalan\Build\Win32\vc9\Debug\Xalan-C_1_11D.dll .\
- Copy $(FDOTHIRDPARTY)\apache\xalan\Build\Win32\vc9\Debug\Xalan-C_1_11D.pdb .\
+ Copy $(FDOTHIRDPARTY)\apache\xalan\Build\Win64\vc9\Debug\Xalan-C_1_11D.dll .\
+ Copy $(FDOTHIRDPARTY)\apache\xalan\Build\Win64\vc9\Debug\Xalan-C_1_11D.pdb .\
- Copy $(FDOTHIRDPARTY)\apache\xalan\Build\Win32\vc9\Debug\XalanMessages_1_11D.dll \
.\
- Copy $(FDOTHIRDPARTY)\apache\xalan\Build\Win32\vc9\Debug\XalanMessages_1_11D.pdb \
.\ + Copy $(FDOTHIRDPARTY)\apache\xalan\Build\Win64\vc9\Debug\XalanMessages_1_11D.dll \
.\ + Copy $(FDOTHIRDPARTY)\apache\xalan\Build\Win64\vc9\Debug\XalanMessages_1_11D.pdb \
.\
- Copy $(FDOTHIRDPARTY)\boost\stage\win32\debug\lib\boost_date_time-vc140-mt-gd-1_59.dll \
.\
- Copy $(FDOTHIRDPARTY)\boost\stage\win32\debug\lib\boost_thread-vc140-mt-gd-1_59.dll \
.\
- Copy $(FDOTHIRDPARTY)\boost\stage\win32\debug\lib\boost_system-vc140-mt-gd-1_59.dll \
.\
- Copy $(FDOTHIRDPARTY)\boost\stage\win32\debug\lib\boost_chrono-vc140-mt-gd-1_59.dll \
.\
- Copy $(FDOTHIRDPARTY)\boost\stage\win32\debug\lib\boost_program_options-vc140-mt-gd-1_59.dll \
.\ + Copy $(FDOTHIRDPARTY)\boost\stage\Win64\debug\lib\boost_date_time-vc140-mt-gd-1_59.dll \
.\ + Copy $(FDOTHIRDPARTY)\boost\stage\Win64\debug\lib\boost_thread-vc140-mt-gd-1_59.dll \
.\ + Copy $(FDOTHIRDPARTY)\boost\stage\Win64\debug\lib\boost_system-vc140-mt-gd-1_59.dll \
.\ + Copy $(FDOTHIRDPARTY)\boost\stage\Win64\debug\lib\boost_chrono-vc140-mt-gd-1_59.dll \
.\ + Copy $(FDOTHIRDPARTY)\boost\stage\Win64\debug\lib\boost_program_options-vc140-mt-gd-1_59.dll \
.\
- Copy $(FDOTHIRDPARTY)\gdal\bin\win32\debug\gdal110.dll .\
+ Copy $(FDOTHIRDPARTY)\gdal\bin\Win64\debug\gdal110.dll .\
- Copy ..\..\..\..\..\..\Utilities\OWS\bin\win32\debug\OWS.dll .\
+ Copy ..\..\..\..\..\..\Utilities\OWS\bin\Win64\debug\OWS.dll .\
- Copy $(FDO)\Unmanaged\Bin\Win32\Debug\FDO.pdb .\
- Copy $(FDO)\Unmanaged\Bin\Win32\Debug\FDOMessage.pdb .\
- Copy $(FDO)\Unmanaged\Bin\Win32\Debug\FDOCommon.pdb .\
- Copy $(FDO)\Unmanaged\Bin\Win32\Debug\FDOGeometry.pdb .\
- Copy $(FDO)\Unmanaged\Bin\Win32\Debug\FDOSpatial.pdb .\
+ Copy $(FDO)\Unmanaged\Bin\Win64\Debug\FDO.pdb .\
+ Copy $(FDO)\Unmanaged\Bin\Win64\Debug\FDOMessage.pdb .\
+ Copy $(FDO)\Unmanaged\Bin\Win64\Debug\FDOCommon.pdb .\
+ Copy $(FDO)\Unmanaged\Bin\Win64\Debug\FDOGeometry.pdb .\
+ Copy $(FDO)\Unmanaged\Bin\Win64\Debug\FDOSpatial.pdb .\
Copy ..\..\..\..\..\..\Providers\WMS\Managed\UnitTest\*.xml .\
</PreBuildEvent>
Modified: trunk/Providers/WMS/Src/UnitTest/WmsTestCustomCommands.h
===================================================================
--- trunk/Providers/WMS/Src/UnitTest/WmsTestCustomCommands.h 2016-11-16 06:42:01 UTC \
(rev 7525)
+++ trunk/Providers/WMS/Src/UnitTest/WmsTestCustomCommands.h 2016-11-16 07:32:50 UTC \
(rev 7526) @@ -36,8 +36,7 @@
CPPUNIT_TEST (testSpacialFeatureClassName);
CPPUNIT_TEST (testInvalidParamForStyle);
- CPPUNIT_TEST (testInvalidParamForCRS);
- CPPUNIT_TEST (testGetFeatureInfo);
+ CPPUNIT_TEST (testInvalidParamForCRS);
#if 0
// NOTE: disabled because the server cannot connect
@@ -45,6 +44,7 @@
CPPUNIT_TEST(testGetFeatureStyles);
CPPUNIT_TEST(testGetFeatureCRSNames);
CPPUNIT_TEST(testGetFeatureInfoFormats);
+ CPPUNIT_TEST(testGetFeatureInfo);
#endif
_______________________________________________
fdo-commits mailing list
fdo-commits@lists.osgeo.org
http://lists.osgeo.org/mailman/listinfo/fdo-commits
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic