[prev in list] [next in list] [prev in thread] [next in thread]
List: fdo-commits
Subject: [fdo-commits] r4863 - in trunk: Providers/ArcSDE/Src
From: svn_fdo () osgeo ! org
Date: 2009-07-28 20:16:53
Message-ID: 20090728201653.C2CF4E01248 () lists ! osgeo ! org
[Download RAW message or body]
Author: brentrobinson
Date: 2009-07-28 16:16:52 -0400 (Tue, 28 Jul 2009)
New Revision: 4863
Added:
trunk/Providers/ArcSDE/Src/UnitTest/ExpressionFunction.cpp
trunk/Providers/ArcSDE/Src/UnitTest/ExpressionFunction.h
Modified:
trunk/Providers/ArcSDE/Src/ArcSDE.sln
trunk/Providers/ArcSDE/Src/UnitTest/Makefile.am
trunk/Providers/ArcSDE/Src/UnitTest/UnitTest.vcproj
trunk/Utilities/TestCommon/Src/TestCommonExpressionFunction.cpp
Log:
Ticket#540: Added XYZM function tests to the ArcSDE Provider unit tests.
Modified: trunk/Providers/ArcSDE/Src/ArcSDE.sln
===================================================================
--- trunk/Providers/ArcSDE/Src/ArcSDE.sln 2009-07-27 15:52:22 UTC (rev 4862)
+++ trunk/Providers/ArcSDE/Src/ArcSDE.sln 2009-07-28 20:16:52 UTC (rev 4863)
@@ -4,9 +4,9 @@
ProjectSection(ProjectDependencies) = postProject
{B840E617-C94F-4E23-BEBA-4A9F3FBD92DB} = {B840E617-C94F-4E23-BEBA-4A9F3FBD92DB}
{34FF1437-0853-44D4-B786-48ACB3AACBB5} = {34FF1437-0853-44D4-B786-48ACB3AACBB5}
+ {9037A345-04EB-418C-98D0-3D5B19FC9D55} = {9037A345-04EB-418C-98D0-3D5B19FC9D55}
+ {F427CD47-243B-4770-B25B-366445061E35} = {F427CD47-243B-4770-B25B-366445061E35}
{79FCD9D7-26AD-458E-821B-64D343D7247E} = {79FCD9D7-26AD-458E-821B-64D343D7247E}
- {F427CD47-243B-4770-B25B-366445061E35} = {F427CD47-243B-4770-B25B-366445061E35}
- {9037A345-04EB-418C-98D0-3D5B19FC9D55} = {9037A345-04EB-418C-98D0-3D5B19FC9D55}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Message", \
"Message\ArcSDEMessage.vcproj", "{B840E617-C94F-4E23-BEBA-4A9F3FBD92DB}" @@ -15,25 \
+15,26 @@ EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UnitTest", \
"UnitTest\UnitTest.vcproj", "{02AF5684-A940-41EE-A372-E1639768414A}" \
ProjectSection(ProjectDependencies) = postProject \
+ {31607A09-F8CA-43B3-9195-C1D5FB18E0D7} = {31607A09-F8CA-43B3-9195-C1D5FB18E0D7} \
+ {B840E617-C94F-4E23-BEBA-4A9F3FBD92DB} = {B840E617-C94F-4E23-BEBA-4A9F3FBD92DB} \
+ {9037A345-04EB-418C-98D0-3D5B19FC9D55} = {9037A345-04EB-418C-98D0-3D5B19FC9D55} \
+ {F427CD47-243B-4770-B25B-366445061E35} = {F427CD47-243B-4770-B25B-366445061E35} \
+ {6C04EF62-A3C2-4C4C-9BAB-30BE6AFC5762} = {6C04EF62-A3C2-4C4C-9BAB-30BE6AFC5762} \
{79FCD9D7-26AD-458E-821B-64D343D7247E} = \
{79FCD9D7-26AD-458E-821B-64D343D7247E}
- {6C04EF62-A3C2-4C4C-9BAB-30BE6AFC5762} = {6C04EF62-A3C2-4C4C-9BAB-30BE6AFC5762}
- {F427CD47-243B-4770-B25B-366445061E35} = {F427CD47-243B-4770-B25B-366445061E35}
- {9037A345-04EB-418C-98D0-3D5B19FC9D55} = {9037A345-04EB-418C-98D0-3D5B19FC9D55}
- {B840E617-C94F-4E23-BEBA-4A9F3FBD92DB} = {B840E617-C94F-4E23-BEBA-4A9F3FBD92DB}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Provider91", \
"Provider\ArcSDEProvider91.vcproj", "{79FCD9D7-26AD-458E-821B-64D343D7247E}" \
ProjectSection(ProjectDependencies) = postProject
- {9037A345-04EB-418C-98D0-3D5B19FC9D55} = {9037A345-04EB-418C-98D0-3D5B19FC9D55}
{B840E617-C94F-4E23-BEBA-4A9F3FBD92DB} = {B840E617-C94F-4E23-BEBA-4A9F3FBD92DB}
{34FF1437-0853-44D4-B786-48ACB3AACBB5} = {34FF1437-0853-44D4-B786-48ACB3AACBB5}
+ {9037A345-04EB-418C-98D0-3D5B19FC9D55} = {9037A345-04EB-418C-98D0-3D5B19FC9D55}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Provider92", \
"Provider\ArcSDEProvider92.vcproj", "{F427CD47-243B-4770-B25B-366445061E35}" \
ProjectSection(ProjectDependencies) = postProject
- {9037A345-04EB-418C-98D0-3D5B19FC9D55} = {9037A345-04EB-418C-98D0-3D5B19FC9D55}
{B840E617-C94F-4E23-BEBA-4A9F3FBD92DB} = {B840E617-C94F-4E23-BEBA-4A9F3FBD92DB}
{34FF1437-0853-44D4-B786-48ACB3AACBB5} = {34FF1437-0853-44D4-B786-48ACB3AACBB5}
+ {9037A345-04EB-418C-98D0-3D5B19FC9D55} = {9037A345-04EB-418C-98D0-3D5B19FC9D55}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ExpressionEngine", \
"..\..\..\Utilities\ExpressionEngine\ExpressionEngine.vcproj", \
"{34FF1437-0853-44D4-B786-48ACB3AACBB5}" @@ -41,96 +42,174 @@
{9037A345-04EB-418C-98D0-3D5B19FC9D55} = {9037A345-04EB-418C-98D0-3D5B19FC9D55}
EndProjectSection
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestCommon", \
"..\..\..\Utilities\TestCommon\TestCommon.vcproj", \
"{31607A09-F8CA-43B3-9195-C1D5FB18E0D7}" +EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
+ Debug|x64 = Debug|x64
Debug91Only|Win32 = Debug91Only|Win32
+ Debug91Only|x64 = Debug91Only|x64
Debug92Only|Win32 = Debug92Only|Win32
+ Debug92Only|x64 = Debug92Only|x64
Release|Win32 = Release|Win32
+ Release|x64 = Release|x64
Release91Only|Win32 = Release91Only|Win32
+ Release91Only|x64 = Release91Only|x64
Release92Only|Win32 = Release92Only|Win32
+ Release92Only|x64 = Release92Only|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{6C04EF62-A3C2-4C4C-9BAB-30BE6AFC5762}.Debug|Win32.ActiveCfg = Debug|Win32
{6C04EF62-A3C2-4C4C-9BAB-30BE6AFC5762}.Debug|Win32.Build.0 = Debug|Win32
+ {6C04EF62-A3C2-4C4C-9BAB-30BE6AFC5762}.Debug|x64.ActiveCfg = Debug|Win32
{6C04EF62-A3C2-4C4C-9BAB-30BE6AFC5762}.Debug91Only|Win32.ActiveCfg = \
Debug91Only|Win32 {6C04EF62-A3C2-4C4C-9BAB-30BE6AFC5762}.Debug91Only|Win32.Build.0 = \
Debug91Only|Win32 + {6C04EF62-A3C2-4C4C-9BAB-30BE6AFC5762}.Debug91Only|x64.ActiveCfg \
= Debug91Only|Win32 \
{6C04EF62-A3C2-4C4C-9BAB-30BE6AFC5762}.Debug92Only|Win32.ActiveCfg = \
Debug92Only|Win32 {6C04EF62-A3C2-4C4C-9BAB-30BE6AFC5762}.Debug92Only|Win32.Build.0 = \
Debug92Only|Win32 + {6C04EF62-A3C2-4C4C-9BAB-30BE6AFC5762}.Debug92Only|x64.ActiveCfg \
= Debug92Only|Win32 {6C04EF62-A3C2-4C4C-9BAB-30BE6AFC5762}.Release|Win32.ActiveCfg = \
Release|Win32 {6C04EF62-A3C2-4C4C-9BAB-30BE6AFC5762}.Release|Win32.Build.0 = \
Release|Win32 + {6C04EF62-A3C2-4C4C-9BAB-30BE6AFC5762}.Release|x64.ActiveCfg = \
Release|Win32 {6C04EF62-A3C2-4C4C-9BAB-30BE6AFC5762}.Release91Only|Win32.ActiveCfg = \
Release91Only|Win32 \
{6C04EF62-A3C2-4C4C-9BAB-30BE6AFC5762}.Release91Only|Win32.Build.0 = \
Release91Only|Win32 + {6C04EF62-A3C2-4C4C-9BAB-30BE6AFC5762}.Release91Only|x64.ActiveCfg \
= Release91Only|Win32 \
{6C04EF62-A3C2-4C4C-9BAB-30BE6AFC5762}.Release92Only|Win32.ActiveCfg = \
Release92Only|Win32 \
{6C04EF62-A3C2-4C4C-9BAB-30BE6AFC5762}.Release92Only|Win32.Build.0 = \
Release92Only|Win32 + {6C04EF62-A3C2-4C4C-9BAB-30BE6AFC5762}.Release92Only|x64.ActiveCfg \
= Release92Only|Win32 {B840E617-C94F-4E23-BEBA-4A9F3FBD92DB}.Debug|Win32.ActiveCfg = \
Debug|Win32 {B840E617-C94F-4E23-BEBA-4A9F3FBD92DB}.Debug|Win32.Build.0 = Debug|Win32
+ {B840E617-C94F-4E23-BEBA-4A9F3FBD92DB}.Debug|x64.ActiveCfg = Debug|Win32
{B840E617-C94F-4E23-BEBA-4A9F3FBD92DB}.Debug91Only|Win32.ActiveCfg = \
Debug91Only|Win32 {B840E617-C94F-4E23-BEBA-4A9F3FBD92DB}.Debug91Only|Win32.Build.0 = \
Debug91Only|Win32 + {B840E617-C94F-4E23-BEBA-4A9F3FBD92DB}.Debug91Only|x64.ActiveCfg \
= Debug91Only|Win32 \
{B840E617-C94F-4E23-BEBA-4A9F3FBD92DB}.Debug92Only|Win32.ActiveCfg = \
Debug92Only|Win32 {B840E617-C94F-4E23-BEBA-4A9F3FBD92DB}.Debug92Only|Win32.Build.0 = \
Debug92Only|Win32 + {B840E617-C94F-4E23-BEBA-4A9F3FBD92DB}.Debug92Only|x64.ActiveCfg \
= Debug92Only|Win32 {B840E617-C94F-4E23-BEBA-4A9F3FBD92DB}.Release|Win32.ActiveCfg = \
Release|Win32 {B840E617-C94F-4E23-BEBA-4A9F3FBD92DB}.Release|Win32.Build.0 = \
Release|Win32 + {B840E617-C94F-4E23-BEBA-4A9F3FBD92DB}.Release|x64.ActiveCfg = \
Release|Win32 {B840E617-C94F-4E23-BEBA-4A9F3FBD92DB}.Release91Only|Win32.ActiveCfg = \
Release91Only|Win32 \
{B840E617-C94F-4E23-BEBA-4A9F3FBD92DB}.Release91Only|Win32.Build.0 = \
Release91Only|Win32 + {B840E617-C94F-4E23-BEBA-4A9F3FBD92DB}.Release91Only|x64.ActiveCfg \
= Release91Only|Win32 \
{B840E617-C94F-4E23-BEBA-4A9F3FBD92DB}.Release92Only|Win32.ActiveCfg = \
Release92Only|Win32 \
{B840E617-C94F-4E23-BEBA-4A9F3FBD92DB}.Release92Only|Win32.Build.0 = \
Release92Only|Win32 + {B840E617-C94F-4E23-BEBA-4A9F3FBD92DB}.Release92Only|x64.ActiveCfg \
= Release92Only|Win32 {9037A345-04EB-418C-98D0-3D5B19FC9D55}.Debug|Win32.ActiveCfg = \
Debug|Win32 {9037A345-04EB-418C-98D0-3D5B19FC9D55}.Debug|Win32.Build.0 = Debug|Win32
+ {9037A345-04EB-418C-98D0-3D5B19FC9D55}.Debug|x64.ActiveCfg = Debug|x64
+ {9037A345-04EB-418C-98D0-3D5B19FC9D55}.Debug|x64.Build.0 = Debug|x64
{9037A345-04EB-418C-98D0-3D5B19FC9D55}.Debug91Only|Win32.ActiveCfg = \
Debug91Only|Win32 {9037A345-04EB-418C-98D0-3D5B19FC9D55}.Debug91Only|Win32.Build.0 = \
Debug91Only|Win32 + {9037A345-04EB-418C-98D0-3D5B19FC9D55}.Debug91Only|x64.ActiveCfg \
= Debug91Only|Win32 \
{9037A345-04EB-418C-98D0-3D5B19FC9D55}.Debug92Only|Win32.ActiveCfg = \
Debug92Only|Win32 {9037A345-04EB-418C-98D0-3D5B19FC9D55}.Debug92Only|Win32.Build.0 = \
Debug92Only|Win32 + {9037A345-04EB-418C-98D0-3D5B19FC9D55}.Debug92Only|x64.ActiveCfg \
= Debug92Only|Win32 {9037A345-04EB-418C-98D0-3D5B19FC9D55}.Release|Win32.ActiveCfg = \
Release|Win32 {9037A345-04EB-418C-98D0-3D5B19FC9D55}.Release|Win32.Build.0 = \
Release|Win32 + {9037A345-04EB-418C-98D0-3D5B19FC9D55}.Release|x64.ActiveCfg = \
Release|x64 + {9037A345-04EB-418C-98D0-3D5B19FC9D55}.Release|x64.Build.0 = \
Release|x64 {9037A345-04EB-418C-98D0-3D5B19FC9D55}.Release91Only|Win32.ActiveCfg = \
Release91Only|Win32 \
{9037A345-04EB-418C-98D0-3D5B19FC9D55}.Release91Only|Win32.Build.0 = \
Release91Only|Win32 + {9037A345-04EB-418C-98D0-3D5B19FC9D55}.Release91Only|x64.ActiveCfg \
= Release91Only|Win32 \
{9037A345-04EB-418C-98D0-3D5B19FC9D55}.Release92Only|Win32.ActiveCfg = \
Release92Only|Win32 \
{9037A345-04EB-418C-98D0-3D5B19FC9D55}.Release92Only|Win32.Build.0 = \
Release92Only|Win32 + {9037A345-04EB-418C-98D0-3D5B19FC9D55}.Release92Only|x64.ActiveCfg \
= Release92Only|Win32 {02AF5684-A940-41EE-A372-E1639768414A}.Debug|Win32.ActiveCfg = \
Debug|Win32 {02AF5684-A940-41EE-A372-E1639768414A}.Debug|Win32.Build.0 = Debug|Win32
+ {02AF5684-A940-41EE-A372-E1639768414A}.Debug|x64.ActiveCfg = Debug|Win32
{02AF5684-A940-41EE-A372-E1639768414A}.Debug91Only|Win32.ActiveCfg = \
Debug91Only|Win32 {02AF5684-A940-41EE-A372-E1639768414A}.Debug91Only|Win32.Build.0 = \
Debug91Only|Win32 + {02AF5684-A940-41EE-A372-E1639768414A}.Debug91Only|x64.ActiveCfg \
= Debug91Only|Win32 \
{02AF5684-A940-41EE-A372-E1639768414A}.Debug92Only|Win32.ActiveCfg = \
Debug92Only|Win32 {02AF5684-A940-41EE-A372-E1639768414A}.Debug92Only|Win32.Build.0 = \
Debug92Only|Win32 + {02AF5684-A940-41EE-A372-E1639768414A}.Debug92Only|x64.ActiveCfg \
= Debug92Only|Win32 {02AF5684-A940-41EE-A372-E1639768414A}.Release|Win32.ActiveCfg = \
Release|Win32 {02AF5684-A940-41EE-A372-E1639768414A}.Release|Win32.Build.0 = \
Release|Win32 + {02AF5684-A940-41EE-A372-E1639768414A}.Release|x64.ActiveCfg = \
Release|Win32 {02AF5684-A940-41EE-A372-E1639768414A}.Release91Only|Win32.ActiveCfg = \
Release91Only|Win32 \
{02AF5684-A940-41EE-A372-E1639768414A}.Release91Only|Win32.Build.0 = \
Release91Only|Win32 + {02AF5684-A940-41EE-A372-E1639768414A}.Release91Only|x64.ActiveCfg \
= Release91Only|Win32 \
{02AF5684-A940-41EE-A372-E1639768414A}.Release92Only|Win32.ActiveCfg = \
Release92Only|Win32 \
{02AF5684-A940-41EE-A372-E1639768414A}.Release92Only|Win32.Build.0 = \
Release92Only|Win32 + {02AF5684-A940-41EE-A372-E1639768414A}.Release92Only|x64.ActiveCfg \
= Release92Only|Win32 {79FCD9D7-26AD-458E-821B-64D343D7247E}.Debug|Win32.ActiveCfg = \
Debug|Win32 {79FCD9D7-26AD-458E-821B-64D343D7247E}.Debug|Win32.Build.0 = Debug|Win32
+ {79FCD9D7-26AD-458E-821B-64D343D7247E}.Debug|x64.ActiveCfg = Debug|Win32
{79FCD9D7-26AD-458E-821B-64D343D7247E}.Debug91Only|Win32.ActiveCfg = \
Debug91Only|Win32 {79FCD9D7-26AD-458E-821B-64D343D7247E}.Debug91Only|Win32.Build.0 = \
Debug91Only|Win32 + {79FCD9D7-26AD-458E-821B-64D343D7247E}.Debug91Only|x64.ActiveCfg \
= Debug91Only|Win32 \
{79FCD9D7-26AD-458E-821B-64D343D7247E}.Debug92Only|Win32.ActiveCfg = \
Debug92Only|Win32 + {79FCD9D7-26AD-458E-821B-64D343D7247E}.Debug92Only|x64.ActiveCfg \
= Debug92Only|Win32 {79FCD9D7-26AD-458E-821B-64D343D7247E}.Release|Win32.ActiveCfg = \
Release|Win32 {79FCD9D7-26AD-458E-821B-64D343D7247E}.Release|Win32.Build.0 = \
Release|Win32 + {79FCD9D7-26AD-458E-821B-64D343D7247E}.Release|x64.ActiveCfg = \
Release|Win32 {79FCD9D7-26AD-458E-821B-64D343D7247E}.Release91Only|Win32.ActiveCfg = \
Release91Only|Win32 \
{79FCD9D7-26AD-458E-821B-64D343D7247E}.Release91Only|Win32.Build.0 = \
Release91Only|Win32 + {79FCD9D7-26AD-458E-821B-64D343D7247E}.Release91Only|x64.ActiveCfg \
= Release91Only|Win32 \
{79FCD9D7-26AD-458E-821B-64D343D7247E}.Release92Only|Win32.ActiveCfg = \
Release92Only|Win32 + {79FCD9D7-26AD-458E-821B-64D343D7247E}.Release92Only|x64.ActiveCfg \
= Release92Only|Win32 {F427CD47-243B-4770-B25B-366445061E35}.Debug|Win32.ActiveCfg = \
Debug|Win32 {F427CD47-243B-4770-B25B-366445061E35}.Debug|Win32.Build.0 = Debug|Win32
+ {F427CD47-243B-4770-B25B-366445061E35}.Debug|x64.ActiveCfg = Debug|Win32
{F427CD47-243B-4770-B25B-366445061E35}.Debug91Only|Win32.ActiveCfg = \
Debug91Only|Win32 + {F427CD47-243B-4770-B25B-366445061E35}.Debug91Only|x64.ActiveCfg \
= Debug91Only|Win32 \
{F427CD47-243B-4770-B25B-366445061E35}.Debug92Only|Win32.ActiveCfg = \
Debug92Only|Win32 {F427CD47-243B-4770-B25B-366445061E35}.Debug92Only|Win32.Build.0 = \
Debug92Only|Win32 + {F427CD47-243B-4770-B25B-366445061E35}.Debug92Only|x64.ActiveCfg \
= Debug92Only|Win32 {F427CD47-243B-4770-B25B-366445061E35}.Release|Win32.ActiveCfg = \
Release|Win32 {F427CD47-243B-4770-B25B-366445061E35}.Release|Win32.Build.0 = \
Release|Win32 + {F427CD47-243B-4770-B25B-366445061E35}.Release|x64.ActiveCfg = \
Release|Win32 {F427CD47-243B-4770-B25B-366445061E35}.Release91Only|Win32.ActiveCfg = \
Release91Only|Win32 + {F427CD47-243B-4770-B25B-366445061E35}.Release91Only|x64.ActiveCfg \
= Release91Only|Win32 \
{F427CD47-243B-4770-B25B-366445061E35}.Release92Only|Win32.ActiveCfg = \
Release92Only|Win32 \
{F427CD47-243B-4770-B25B-366445061E35}.Release92Only|Win32.Build.0 = \
Release92Only|Win32 + {F427CD47-243B-4770-B25B-366445061E35}.Release92Only|x64.ActiveCfg \
= Release92Only|Win32 {34FF1437-0853-44D4-B786-48ACB3AACBB5}.Debug|Win32.ActiveCfg = \
Debug|Win32 {34FF1437-0853-44D4-B786-48ACB3AACBB5}.Debug|Win32.Build.0 = Debug|Win32
+ {34FF1437-0853-44D4-B786-48ACB3AACBB5}.Debug|x64.ActiveCfg = Debug|x64
+ {34FF1437-0853-44D4-B786-48ACB3AACBB5}.Debug|x64.Build.0 = Debug|x64
{34FF1437-0853-44D4-B786-48ACB3AACBB5}.Debug91Only|Win32.ActiveCfg = Debug|Win32
{34FF1437-0853-44D4-B786-48ACB3AACBB5}.Debug91Only|Win32.Build.0 = Debug|Win32
+ {34FF1437-0853-44D4-B786-48ACB3AACBB5}.Debug91Only|x64.ActiveCfg = Debug|x64
+ {34FF1437-0853-44D4-B786-48ACB3AACBB5}.Debug91Only|x64.Build.0 = Debug|x64
{34FF1437-0853-44D4-B786-48ACB3AACBB5}.Debug92Only|Win32.ActiveCfg = Debug|Win32
{34FF1437-0853-44D4-B786-48ACB3AACBB5}.Debug92Only|Win32.Build.0 = Debug|Win32
+ {34FF1437-0853-44D4-B786-48ACB3AACBB5}.Debug92Only|x64.ActiveCfg = Debug|x64
+ {34FF1437-0853-44D4-B786-48ACB3AACBB5}.Debug92Only|x64.Build.0 = Debug|x64
{34FF1437-0853-44D4-B786-48ACB3AACBB5}.Release|Win32.ActiveCfg = Release|Win32
{34FF1437-0853-44D4-B786-48ACB3AACBB5}.Release|Win32.Build.0 = Release|Win32
+ {34FF1437-0853-44D4-B786-48ACB3AACBB5}.Release|x64.ActiveCfg = Release|x64
+ {34FF1437-0853-44D4-B786-48ACB3AACBB5}.Release|x64.Build.0 = Release|x64
{34FF1437-0853-44D4-B786-48ACB3AACBB5}.Release91Only|Win32.ActiveCfg = \
Release|Win32 {34FF1437-0853-44D4-B786-48ACB3AACBB5}.Release91Only|Win32.Build.0 = \
Release|Win32 + {34FF1437-0853-44D4-B786-48ACB3AACBB5}.Release91Only|x64.ActiveCfg = \
Release|x64 + {34FF1437-0853-44D4-B786-48ACB3AACBB5}.Release91Only|x64.Build.0 = \
Release|x64 {34FF1437-0853-44D4-B786-48ACB3AACBB5}.Release92Only|Win32.ActiveCfg = \
Release|Win32 {34FF1437-0853-44D4-B786-48ACB3AACBB5}.Release92Only|Win32.Build.0 = \
Release|Win32 + {34FF1437-0853-44D4-B786-48ACB3AACBB5}.Release92Only|x64.ActiveCfg = \
Release|x64 + {34FF1437-0853-44D4-B786-48ACB3AACBB5}.Release92Only|x64.Build.0 = \
Release|x64 + {31607A09-F8CA-43B3-9195-C1D5FB18E0D7}.Debug|Win32.ActiveCfg = \
Debug|Win32 + {31607A09-F8CA-43B3-9195-C1D5FB18E0D7}.Debug|Win32.Build.0 = \
Debug|Win32 + {31607A09-F8CA-43B3-9195-C1D5FB18E0D7}.Debug|x64.ActiveCfg = Debug|x64
+ {31607A09-F8CA-43B3-9195-C1D5FB18E0D7}.Debug|x64.Build.0 = Debug|x64
+ {31607A09-F8CA-43B3-9195-C1D5FB18E0D7}.Debug91Only|Win32.ActiveCfg = Debug|x64
+ {31607A09-F8CA-43B3-9195-C1D5FB18E0D7}.Debug91Only|x64.ActiveCfg = Debug|x64
+ {31607A09-F8CA-43B3-9195-C1D5FB18E0D7}.Debug91Only|x64.Build.0 = Debug|x64
+ {31607A09-F8CA-43B3-9195-C1D5FB18E0D7}.Debug92Only|Win32.ActiveCfg = Debug|x64
+ {31607A09-F8CA-43B3-9195-C1D5FB18E0D7}.Debug92Only|x64.ActiveCfg = Debug|x64
+ {31607A09-F8CA-43B3-9195-C1D5FB18E0D7}.Debug92Only|x64.Build.0 = Debug|x64
+ {31607A09-F8CA-43B3-9195-C1D5FB18E0D7}.Release|Win32.ActiveCfg = Release|Win32
+ {31607A09-F8CA-43B3-9195-C1D5FB18E0D7}.Release|Win32.Build.0 = Release|Win32
+ {31607A09-F8CA-43B3-9195-C1D5FB18E0D7}.Release|x64.ActiveCfg = Release|x64
+ {31607A09-F8CA-43B3-9195-C1D5FB18E0D7}.Release|x64.Build.0 = Release|x64
+ {31607A09-F8CA-43B3-9195-C1D5FB18E0D7}.Release91Only|Win32.ActiveCfg = Release|x64
+ {31607A09-F8CA-43B3-9195-C1D5FB18E0D7}.Release91Only|x64.ActiveCfg = Release|x64
+ {31607A09-F8CA-43B3-9195-C1D5FB18E0D7}.Release91Only|x64.Build.0 = Release|x64
+ {31607A09-F8CA-43B3-9195-C1D5FB18E0D7}.Release92Only|Win32.ActiveCfg = Release|x64
+ {31607A09-F8CA-43B3-9195-C1D5FB18E0D7}.Release92Only|x64.ActiveCfg = Release|x64
+ {31607A09-F8CA-43B3-9195-C1D5FB18E0D7}.Release92Only|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Added: trunk/Providers/ArcSDE/Src/UnitTest/ExpressionFunction.cpp
===================================================================
--- trunk/Providers/ArcSDE/Src/UnitTest/ExpressionFunction.cpp \
(rev 0)
+++ trunk/Providers/ArcSDE/Src/UnitTest/ExpressionFunction.cpp 2009-07-28 20:16:52 \
UTC (rev 4863) @@ -0,0 +1,430 @@
+/*
+ * Copyright (C) 2004-2006 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 "Pch.h"
+#include "ExpressionFunction.h"
+
+CPPUNIT_TEST_SUITE_REGISTRATION(TestExpressionFunction);
+CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(TestExpressionFunction, \
"TestExpressionFunction"); +
+
+// ----------------------------------------------------------------------------
+// -- Test Setup Functions --
+// ----------------------------------------------------------------------------
+
+TestExpressionFunction::TestExpressionFunction ()
+{
+}
+
+TestExpressionFunction::~TestExpressionFunction ()
+{
+}
+
+void TestExpressionFunction::Connect ()
+
+// +---------------------------------------------------------------------------
+// | The function establishes the connection to the data store used in the
+// | executed test suites.
+// +---------------------------------------------------------------------------
+
+{
+ m_connection = ArcSDETests::GetConnection ();
+ m_connection->SetConnectionString (ArcSDETestConfig::ConnStringMetadcov());
+ m_connection->Open ();
+}
+
+void TestExpressionFunction::RunAllExpFctTests()
+{
+ bool error_found = false;
+
+ // Executing the geometry functions.
+
+ printf("\n");
+ printf("\n");
+ printf(" >>> ... Testing Geometry Functions \n");
+ printf("\n");
+
+ try {
+
+ TestXYZMFunction();
+
+ } // try ...
+
+ catch ( ... ) {
+
+ error_found = true;
+
+ } // catch ...
+
+ if (error_found)
+ throw FdoException::Create(L"Unit tests executed with errors");
+
+}
+
+void TestExpressionFunction::setUp ()
+
+// +---------------------------------------------------------------------------
+// | The function represents the class setup function.
+// +---------------------------------------------------------------------------
+
+{
+
+ // Declare and initialize all necessary local variables.
+
+ FdoStringP datastore_name;
+
+
+ try {
+
+ // The following creates the data base used for the tests, opens a con-
+ // nnection to it and applies a test schema.
+
+ printf("\n");
+ printf(">>>>>>>>>>>>>>>>>>>>>>>>>>>>><<<<<<<<<<<<<<<<<<<<<<<<<<<<< \n");
+ printf(" EXPRESSION FUNCTION UNIT TESTS \n");
+ printf(" Status: Started \n");
+ printf(">>>>>>>>>>>>>>>>>>>>>>>>>>>>><<<<<<<<<<<<<<<<<<<<<<<<<<<<< \n");
+ printf("\n");
+
+ printf(" >>> Establishing necessary connection \n");
+ Connect();
+ printf(" >>> Predeleting Test Schema \n");
+ DropTestSchema(L"ExprFct");
+ printf(" >>> Establishing test environment \n");
+ CreateSC();
+ SetupUnitTestEnvironment(m_connection);
+
+ printf(" >>> Testing ... \n");
+ printf("\n");
+ printf(".......................................................... \n");
+ printf("\n");
+
+ } // try ...
+
+ catch (FdoException *exp) {
+
+ printf(" >>> Removing test schema \n");
+ DropTestSchema(L"ExprFct");
+ printf(" >>> Disconnecting \n");
+ CloseConnection();
+ printf(" >>> Exception: %ls\n", exp->GetExceptionMessage());
+
+ printf("\n");
+ printf(">>>>>>>>>>>>>>>>>>>>>>>>>>>>><<<<<<<<<<<<<<<<<<<<<<<<<<<<< \n");
+ printf(" EXPRESSION FUNCTION UNIT TESTS \n");
+ printf(" Status: Failure in test setup \n");
+ printf(">>>>>>>>>>>>>>>>>>>>>>>>>>>>><<<<<<<<<<<<<<<<<<<<<<<<<<<<< \n");
+ printf("\n");
+
+ throw exp;
+
+ } // catch ...
+
+ catch ( ... ) {
+
+ printf(" >>> Removing test schema \n");
+ DropTestSchema(L"ExprFct");
+ printf(" >>> Disconnecting \n");
+ CloseConnection();
+
+ printf("\n");
+ printf(">>>>>>>>>>>>>>>>>>>>>>>>>>>>><<<<<<<<<<<<<<<<<<<<<<<<<<<<< \n");
+ printf(" EXPRESSION FUNCTION UNIT TESTS \n");
+ printf(" Status: Failure in test setup \n");
+ printf(">>>>>>>>>>>>>>>>>>>>>>>>>>>>><<<<<<<<<<<<<<<<<<<<<<<<<<<<< \n");
+ printf("\n");
+
+ throw;
+
+ } // catch ...
+} // setUp ()
+
+void TestExpressionFunction::tearDown ()
+
+// +---------------------------------------------------------------------------
+// | The function represents the class tear-down function.
+// +---------------------------------------------------------------------------
+
+{
+
+ // Declare and initialize all necessary local variables.
+
+ bool is_disconnected = false;
+
+ try {
+
+ printf("\n");
+ printf(".......................................................... \n");
+ printf("\n");
+ printf(" >>> Testing completed \n");
+
+ printf(" >>> Disconnecting \n");
+ is_disconnected = true;
+ CloseConnection();
+
+ printf("\n");
+ printf(">>>>>>>>>>>>>>>>>>>>>>>>>>>>><<<<<<<<<<<<<<<<<<<<<<<<<<<<< \n");
+ printf(" EXPRESSION FUNCTION UNIT TESTS \n");
+ printf(" Status: Tests successfully executed \n");
+ printf(">>>>>>>>>>>>>>>>>>>>>>>>>>>>><<<<<<<<<<<<<<<<<<<<<<<<<<<<< \n");
+ printf("\n");
+
+ } // try ...
+
+ catch (FdoException *exp) {
+
+ printf(" >>> Exception: %ls\n", exp->GetExceptionMessage());
+
+ if (!is_disconnected) {
+
+ printf(" >>> Disconnecting \n");
+ CloseConnection();
+
+ } // if (!is_disconnected) ...
+
+ printf("\n");
+ printf(">>>>>>>>>>>>>>>>>>>>>>>>>>>>><<<<<<<<<<<<<<<<<<<<<<<<<<<<< \n");
+ printf(" EXPRESSION FUNCTION UNIT TESTS \n");
+ printf(" Status: Failure in test tear down \n");
+ printf(">>>>>>>>>>>>>>>>>>>>>>>>>>>>><<<<<<<<<<<<<<<<<<<<<<<<<<<<< \n");
+ printf("\n");
+
+ throw exp;
+
+ } // catch (FdoExcpetion ...
+
+ catch ( ... ) {
+
+ if (!is_disconnected) {
+
+ printf(" >>> Disconnecting \n");
+ CloseConnection();
+
+ } // if (!is_disconnected) ...
+
+ printf("\n");
+ printf(">>>>>>>>>>>>>>>>>>>>>>>>>>>>><<<<<<<<<<<<<<<<<<<<<<<<<<<<< \n");
+ printf(" EXPRESSION FUNCTION UNIT TESTS \n");
+ printf(" Status: Failure in test tear down \n");
+ printf(">>>>>>>>>>>>>>>>>>>>>>>>>>>>><<<<<<<<<<<<<<<<<<<<<<<<<<<<< \n");
+ printf("\n");
+
+ throw;
+
+ } // catch ...
+
+} // tearDown ()
+
+void TestExpressionFunction::DropTestSchema ( FdoString* schema_name)
+// +---------------------------------------------------------------------------
+// | The function drops the test data store.
+// +---------------------------------------------------------------------------
+
+{
+
+ printf(" >>> ... dropping feature schema '%ls' \n",
+ schema_name);
+
+ try
+ {
+ FdoPtr<FdoIDestroySchema> destroy = \
(FdoIDestroySchema*)m_connection->CreateCommand (FdoCommandType_DestroySchema); + \
destroy->SetSchemaName ( schema_name ); + destroy->Execute ();
+ }
+ catch ( ... )
+ {
+ }
+} // DropTestDataStore ()
+
+
+void TestExpressionFunction::CreateSC()
+{
+ // Create spatial context:
+ mSC = L"TestSC_GeomXYZMFunc";
+ // Need particular extents to prevent coordinate drift for integer coordinates.
+ CreateOrUpdateSpatialContext(m_connection, mSC, -35314400, -28428600, \
900684611074.099, 900691496874.099, L"26943"); +}
+
+void TestExpressionFunction::CreateOrUpdateSpatialContext(FdoIConnection *conn, \
FdoStringP& scName, double dXMin, double dYMin, double dXMax, double dYMax, \
FdoString* scCoordSys) +{
+ // Determine if the spatial context already exists:
+ FdoPtr<FdoIGetSpatialContexts> getSCs = \
(FdoIGetSpatialContexts*)conn->CreateCommand(FdoCommandType_GetSpatialContexts); + \
FdoPtr<FdoISpatialContextReader> scReader = getSCs->Execute(); + bool bExists = \
false; + bool bIdentical = false;
+ while (scReader->ReadNext())
+ {
+ if (0==wcscmp(scReader->GetName(), scName))
+ {
+ bExists = true;
+ break;
+ }
+ }
+
+ if ( !bExists )
+ {
+ getSCs = (FdoIGetSpatialContexts*)conn->CreateCommand(FdoCommandType_GetSpatialContexts);
+ scReader = getSCs->Execute();
+
+ while (scReader->ReadNext())
+ {
+ if (0==wcscmp(scReader->GetCoordinateSystem(), scCoordSys))
+ {
+ FdoPtr<FdoFgfGeometryFactory> gf = \
FdoFgfGeometryFactory::GetInstance(); + FdoPtr<FdoByteArray> bytes = \
scReader->GetExtent(); + FdoPtr<FdoIGeometry> geomObj = \
gf->CreateGeometryFromFgf(bytes); + FdoPtr<FdoIEnvelope> env = \
geomObj->GetEnvelope(); + double eXMin = env->GetMinX();
+ double eYMin = env->GetMinY();
+ double eXMax = env->GetMaxX();
+ double eYMax = env->GetMaxY();
+
+ if ( mSDETests.fuzzyEqual(dXMin,eXMin) && \
mSDETests.fuzzyEqual(dYMin,eYMin) && mSDETests.fuzzyEqual(dXMax,eXMax) && \
mSDETests.fuzzyEqual(dYMax,eYMax) ) + {
+ scName = scReader->GetName();
+ bExists = true;
+ bIdentical = true;
+ break;
+ }
+ }
+ }
+ }
+ scReader = NULL;
+
+ if ( !bIdentical )
+ {
+ // Create the spatial context (or update it if it already exists):
+ FdoPtr<FdoICreateSpatialContext> createSC = \
(FdoICreateSpatialContext*)conn->CreateCommand(FdoCommandType_CreateSpatialContext); \
+ createSC->SetName(scName); + mSDETests.set_extent(createSC, dXMin, \
dYMin, dXMax, dYMax); + createSC->SetCoordinateSystem(scCoordSys);
+ createSC->SetUpdateExisting(bExists);
+ try
+ {
+ createSC->Execute();
+ }
+ catch (FdoException *ex)
+ {
+ ex->Release();
+ }
+ }
+}
+
+
+FdoFeatureClass *TestExpressionFunction::CreateFdoFeatureClass (
+ FdoString *class_name,
+ bool has_elevation,
+ bool has_measure)
+
+// +---------------------------------------------------------------------------
+// | The function creates a predefined feature class with the caller identify-
+// | ing class name.
+// +---------------------------------------------------------------------------
+
+{
+
+ // Declare and initialize all necessary local variables.
+
+ FdoFeatureClass *the_class = NULL;
+
+ FdoDataPropertyDefinition *data_property_definition = NULL;
+
+ FdoGeometricPropertyDefinition *geometric_property_definition = NULL;
+
+ FdoPropertyDefinitionCollection *data_property_definitions = NULL;
+
+ FdoDataPropertyDefinitionCollection *id_property_definitions = NULL;
+
+ try {
+
+ // Create the class and set the abstract property.
+
+ the_class = FdoFeatureClass::Create(class_name, class_name);
+ the_class->SetIsAbstract(false);
+
+ // Define each of the class properties and add it to the proper collection.
+ // If the property identifies the primary key add it to the class' primary
+ // key collection.
+
+ data_property_definitions = the_class->GetProperties();
+ id_property_definitions = the_class->GetIdentityProperties();
+
+ data_property_definition =
+ CreateDataProperty(L"featid", GetFeatIdType(), 0, 0, false);
+ data_property_definition->SetIsAutoGenerated(true);
+ data_property_definitions->Add(data_property_definition);
+ id_property_definitions->Add(data_property_definition);
+ FDO_SAFE_RELEASE(data_property_definition);
+
+ data_property_definition =
+ CreateDataProperty(L"i32_val", FdoDataType_Int32, 0, 0, true);
+ data_property_definitions->Add(data_property_definition);
+ FDO_SAFE_RELEASE(data_property_definition);
+
+ data_property_definition =
+ CreateDataProperty(L"id", FdoDataType_Int32, 0, 0, true);
+ data_property_definitions->Add(data_property_definition);
+ FDO_SAFE_RELEASE(data_property_definition);
+
+ geometric_property_definition = CreateGeometricProperty(L"RDBMS_GEOM", \
has_elevation, has_measure); + \
geometric_property_definition->SetSpatialContextAssociation( mSC ); + \
data_property_definitions->Add(geometric_property_definition); + \
the_class->SetGeometryProperty(geometric_property_definition); + \
FDO_SAFE_RELEASE(geometric_property_definition); +
+ FDO_SAFE_RELEASE(id_property_definitions);
+ FDO_SAFE_RELEASE(data_property_definitions);
+
+
+ the_class->SetBaseClass(NULL);
+
+ // Return a handle to the created class.
+
+ return the_class;
+
+ } // try ...
+
+ catch ( ... ) {
+
+ FDO_SAFE_RELEASE(geometric_property_definition);
+ FDO_SAFE_RELEASE(data_property_definition);
+ FDO_SAFE_RELEASE(id_property_definitions);
+ FDO_SAFE_RELEASE(data_property_definitions);
+
+ throw;
+
+ } // catch ...
+
+} // CreateFdoFeatureClass ()
+
+void TestExpressionFunction::AddFeature (FdoIConnection * /*current_connection*/,
+ FdoString * /*class_name*/,
+ int /*index*/)
+{
+}
+
+double TestExpressionFunction::GetNullOrdinate()
+{
+ return 0;
+}
+
+double TestExpressionFunction::GetNaNOrdinate()
+{
+ return 0;
+}
+
Added: trunk/Providers/ArcSDE/Src/UnitTest/ExpressionFunction.h
===================================================================
--- trunk/Providers/ArcSDE/Src/UnitTest/ExpressionFunction.h \
(rev 0)
+++ trunk/Providers/ArcSDE/Src/UnitTest/ExpressionFunction.h 2009-07-28 20:16:52 UTC \
(rev 4863) @@ -0,0 +1,94 @@
+/*
+ * Copyright (C) 2004-2006 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 TESTEXPRESSIONFUNCTION_H
+#define TESTEXPRESSIONFUNCTION_H
+
+#include <cppunit/TestCase.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include <TestCommonExpressionFunctionW.h>
+#include "ArcSDETests.h"
+
+
+// =============================================================================
+// | The file contains the definition of the class FdoExpressionFunctionTest. It
+// | defines the expression function tests
+// =============================================================================
+
+
+// ---------------------------------------------------------------------------
+// Constants
+// ---------------------------------------------------------------------------
+
+class TestExpressionFunction : public TestCommonExpressionFunctionW
+{
+
+ CPPUNIT_TEST_SUB_SUITE(TestExpressionFunction, TestCommonExpressionFunctionW);
+ CPPUNIT_TEST_SUITE_END();
+
+public:
+ TestExpressionFunction ();
+ virtual ~TestExpressionFunction ();
+
+protected:
+
+ // Connect:
+ // The function establishes the connection to the data store used in
+ // the executed test suites.
+
+ virtual void Connect ();
+
+
+ // ========================= GEOMETRY FUNCTIONS ==========================
+
+ // TestXYZMFunction:
+ // The function executes the test for the expression engine functions
+ // X, Y, Z and M.
+
+ void RunAllExpFctTests();
+
+ virtual void setUp();
+
+ virtual void tearDown();
+
+ virtual void DropTestSchema( FdoString* schema_name );
+
+ virtual void CreateSC();
+
+ // Create or update a spatial context:
+ void CreateOrUpdateSpatialContext(FdoIConnection *conn, FdoStringP& scName, \
double dXMin, double dYMin, double dXMax, double dYMax, FdoString* scCoordSys); +
+ virtual FdoFeatureClass *CreateFdoFeatureClass (FdoString *class_name,
+ bool has_elevation = true,
+ bool has_measure = false);
+
+ virtual void AddFeature (FdoIConnection *current_connection,
+ FdoString *class_name,
+ int index);
+
+ virtual double GetNullOrdinate();
+
+ virtual double GetNaNOrdinate();
+
+ ArcSDETests mSDETests;
+
+ FdoStringP mSC;
+
+}; // class TestExpressionFunction
+
+#endif
Modified: trunk/Providers/ArcSDE/Src/UnitTest/Makefile.am
===================================================================
--- trunk/Providers/ArcSDE/Src/UnitTest/Makefile.am 2009-07-27 15:52:22 UTC (rev \
4862)
+++ trunk/Providers/ArcSDE/Src/UnitTest/Makefile.am 2009-07-28 20:16:52 UTC (rev \
4863) @@ -47,6 +47,7 @@
BasicArcSDETests.cpp \
BasicInsertTests.cpp \
BasicUpdateTests.cpp \
+ ExpressionFunction.cpp \
LongTransactionExternalTests.cpp \
SpatialContextTests.cpp \
SQLTests.cpp \
@@ -64,6 +65,7 @@
BasicSchemaTests.h \
BasicTransactionTests.h \
BasicUpdateTests.h \
+ ExpressionFunction.h \
LockTests.h \
LongTransactionExternalTests.h \
LongTransactionTests.h \
@@ -83,6 +85,7 @@
-I$(FDOTHIRDPARTY)/linux/cppunit/include \
-I$(FDOUTILITIES)/Common/Inc \
-I$(FDOUTILITIES)/ExpressionEngine/Inc \
+ -I$(FDOUTILITIES)/TestCommon/Inc \
-I../../Inc
@@ -93,6 +96,7 @@
$(BUILD_USING_SDE91) \
$(BUILD_USING_SDE92) \
$(FDOUTILITIES)/Common/libProvidersCommon.la \
+ $(FDOUTILITIES)/TestCommon/libTestCommon.la \
-lpthread_nonshared \
-lpthread
Modified: trunk/Providers/ArcSDE/Src/UnitTest/UnitTest.vcproj
===================================================================
--- trunk/Providers/ArcSDE/Src/UnitTest/UnitTest.vcproj 2009-07-27 15:52:22 UTC (rev \
4862)
+++ trunk/Providers/ArcSDE/Src/UnitTest/UnitTest.vcproj 2009-07-28 20:16:52 UTC (rev \
4863) @@ -44,7 +44,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\Provider;"$(SDEHOME)\include";"$( \
FDO)\Unmanaged\inc";"$(FDOTHIRDPARTY)\cppunit\include";..\..\inc;" \
$(FDOUTILITIES)\Common\inc";"$(FDOUTILITIES)\ExpressionEngine\inc"" \
+ AdditionalIncludeDirectories="..\Provider;"$(SDEHOME)\include";"$( \
FDO)\Unmanaged\inc";"$(FDOTHIRDPARTY)\cppunit\include";..\..\inc;" \
$(FDOUTILITIES)\Common\inc";"$(FDOUTILITIES)\ExpressionEngine\inc";"$(FDOUTILITIES)\TestCommon\inc""
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_SDEVER_ARCUNITTEST=$(SDEVER_ARCUNITTEST)"
GeneratePreprocessedFile="0"
KeepComments="false"
@@ -132,7 +132,7 @@
Optimization="2"
InlineFunctionExpansion="1"
OmitFramePointers="true"
- AdditionalIncludeDirectories="..\Provider;"$(SDEHOME)\include";"$( \
FDO)\Unmanaged\inc";"$(FDOTHIRDPARTY)\cppunit\include";..\..\inc;" \
$(FDOUTILITIES)\Common\inc";"$(FDOUTILITIES)\ExpressionEngine\inc"" \
+ AdditionalIncludeDirectories="..\Provider;"$(SDEHOME)\include";"$( \
FDO)\Unmanaged\inc";"$(FDOTHIRDPARTY)\cppunit\include";..\..\inc;" \
$(FDOUTILITIES)\Common\inc";"$(FDOUTILITIES)\ExpressionEngine\inc";"$(FDOUTILITIES)\TestCommon\inc""
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_SDEVER_ARCUNITTEST=$(SDEVER_ARCUNITTEST)"
StringPooling="true"
RuntimeLibrary="2"
@@ -220,7 +220,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\Provider;"$(SDEHOME)\include";"$( \
FDO)\Unmanaged\inc";"$(FDOTHIRDPARTY)\cppunit\include";..\..\inc;" \
$(FDOUTILITIES)\Common\inc";"$(FDOUTILITIES)\ExpressionEngine\inc"" \
+ AdditionalIncludeDirectories="..\Provider;"$(SDEHOME)\include";"$( \
FDO)\Unmanaged\inc";"$(FDOTHIRDPARTY)\cppunit\include";..\..\inc;" \
$(FDOUTILITIES)\Common\inc";"$(FDOUTILITIES)\ExpressionEngine\inc";"$(FDOUTILITIES)\TestCommon\inc""
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_SDEVER_ARCUNITTEST=$(SDEVER_ARCUNITTEST)"
GeneratePreprocessedFile="0"
KeepComments="false"
@@ -308,7 +308,7 @@
Optimization="2"
InlineFunctionExpansion="1"
OmitFramePointers="true"
- AdditionalIncludeDirectories="..\Provider;"$(SDEHOME)\include";"$( \
FDO)\Unmanaged\inc";"$(FDOTHIRDPARTY)\cppunit\include";..\..\inc;" \
$(FDOUTILITIES)\Common\inc";"$(FDOUTILITIES)\ExpressionEngine\inc"" \
+ AdditionalIncludeDirectories="..\Provider;"$(SDEHOME)\include";"$( \
FDO)\Unmanaged\inc";"$(FDOTHIRDPARTY)\cppunit\include";..\..\inc;" \
$(FDOUTILITIES)\Common\inc";"$(FDOUTILITIES)\ExpressionEngine\inc";"$(FDOUTILITIES)\TestCommon\inc""
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_SDEVER_ARCUNITTEST=$(SDEVER_ARCUNITTEST)"
StringPooling="true"
RuntimeLibrary="2"
@@ -396,7 +396,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\Provider;"$(SDEHOME)\include";"$( \
FDO)\Unmanaged\inc";"$(FDOTHIRDPARTY)\cppunit\include";..\..\inc;" \
$(FDOUTILITIES)\Common\inc";"$(FDOUTILITIES)\ExpressionEngine\inc"" \
+ AdditionalIncludeDirectories="..\Provider;"$(SDEHOME)\include";"$( \
FDO)\Unmanaged\inc";"$(FDOTHIRDPARTY)\cppunit\include";..\..\inc;" \
$(FDOUTILITIES)\Common\inc";"$(FDOUTILITIES)\ExpressionEngine\inc";"$(FDOUTILITIES)\TestCommon\inc""
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_SDEVER_ARCUNITTEST=$(SDEVER_ARCUNITTEST)"
GeneratePreprocessedFile="0"
KeepComments="false"
@@ -484,7 +484,7 @@
Optimization="2"
InlineFunctionExpansion="1"
OmitFramePointers="true"
- AdditionalIncludeDirectories="..\Provider;"$(SDEHOME)\include";"$( \
FDO)\Unmanaged\inc";"$(FDOTHIRDPARTY)\cppunit\include";..\..\inc;" \
$(FDOUTILITIES)\Common\inc";"$(FDOUTILITIES)\ExpressionEngine\inc"" \
+ AdditionalIncludeDirectories="..\Provider;"$(SDEHOME)\include";"$( \
FDO)\Unmanaged\inc";"$(FDOTHIRDPARTY)\cppunit\include";..\..\inc;" \
$(FDOUTILITIES)\Common\inc";"$(FDOUTILITIES)\ExpressionEngine\inc";"$(FDOUTILITIES)\TestCommon\inc""
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_SDEVER_ARCUNITTEST=$(SDEVER_ARCUNITTEST)"
StringPooling="true"
RuntimeLibrary="2"
@@ -589,6 +589,10 @@
>
</File>
<File
+ RelativePath=".\ExpressionFunction.cpp"
+ >
+ </File>
+ <File
RelativePath="LockTests.cpp"
>
</File>
@@ -718,6 +722,10 @@
>
</File>
<File
+ RelativePath=".\ExpressionFunction.h"
+ >
+ </File>
+ <File
RelativePath="LockTests.h"
>
</File>
@@ -1323,7 +1331,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Copying thirdparty dlls"
- CommandLine="copy $(FDOTHIRDPARTY)\cppunit\Lib\Win32\testrunnerd.dll \
$(OutDir)
copy $(FDOTHIRDPARTY)\cppunit\Lib\Win32\cppunitd_dll.dll \
$(OutDir)
copy \
$(FDOTHIRDPARTY)\apache\xml-xalan\c\Build\Win32\VC9\Debug\Xalan-C_1_7_0D.dll \
$(OutDir)
copy \
$(FDOTHIRDPARTY)\apache\xml-xalan\c\Build\Win32\VC9\Debug\XalanMessages_1_7_0D.dll \
$(OutDir)
copy \
$(FDOTHIRDPARTY)\apache\xml-xerces\c\Build\Win32\VC9\Debug\xerces-c_2_5_0.dll \
$(OutDir)
echo "delete me \
please">$(OutDir)\CopyThirdparty.ilk
" + CommandLine="copy \
$(FDOTHIRDPARTY)\cppunit\Lib\Win32\testrunnerd.dll $(OutDir)
copy \
$(FDOTHIRDPARTY)\cppunit\Lib\Win32\cppunitd_dll.dll $(OutDir)
copy \
$(FDOTHIRDPARTY)\apache\xml-xalan\c\Build\Win32\VC9\Debug\Xalan-C_1_7_0D.dll \
$(OutDir)
copy \
$(FDOTHIRDPARTY)\apache\xml-xalan\c\Build\Win32\VC9\Debug\XalanMessages_1_7_0D.dll \
$(OutDir)
copy \
$(FDOTHIRDPARTY)\apache\xml-xerces\c\Build\Win32\VC9\Debug\xerces-c_2_5_0D.dll \
$(OutDir)
echo "delete me \
please">$(OutDir)\CopyThirdparty.ilk
" \
AdditionalDependencies="$(FDOTHIRDPARTY)\cppunit\Lib\Win32\testrunnerd.dll;$(FDOTHIRDP \
ARTY)\cppunit\Lib\Win32\cppunitd_dll.dll;$(FDOTHIRDPARTY)\apache\xml-xalan\c\Build\Win \
32\VC9\Debug\Xalan-C_1_7_0D.dll;$(FDOTHIRDPARTY)\apache\xml-xalan\c\Build\Win32\VC9\De \
bug\XalanMessages_1_7_0D.dll;$(FDOTHIRDPARTY)\apache\xml-xerces\c\Build\Win32\VC9\Debug\xerces-c_2_5_0D.dll"
Outputs="$(OutDir)\CopyThirdparty.ilk"
/>
Modified: trunk/Utilities/TestCommon/Src/TestCommonExpressionFunction.cpp
===================================================================
--- trunk/Utilities/TestCommon/Src/TestCommonExpressionFunction.cpp 2009-07-27 \
15:52:22 UTC (rev 4862)
+++ trunk/Utilities/TestCommon/Src/TestCommonExpressionFunction.cpp 2009-07-28 \
20:16:52 UTC (rev 4863) @@ -2790,6 +2790,6 @@
bool TestCommonExpressionFunction::IsNullOrdinate( double ordinate)
{
- return (ordinate == GetNullOrdinate()) || (ordinate != ordinate);
+ return (ordinate == TestCommonExpressionFunction::GetNullOrdinate()) || \
(ordinate != ordinate); }
_______________________________________________
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