[Boost-commit] svn:boost r76519 - trunk/libs/geometry/test/io/wkt

Subject: [Boost-commit] svn:boost r76519 - trunk/libs/geometry/test/io/wkt
From: barend.gehrels_at_[hidden]
Date: 2012-01-15 10:16:21

Author: barendgehrels
Date: 2012-01-15 10:16:20 EST (Sun, 15 Jan 2012)
New Revision: 76519
URL: http://svn.boost.org/trac/boost/changeset/76519

Log:
Fixed WKT test (for empty_input exception and paths)
Text files modified: 
   trunk/libs/geometry/test/io/wkt/io_wkt_tests.sln |    10 ----------                              
   trunk/libs/geometry/test/io/wkt/wkt.cpp          |     9 ++++++---                               
   trunk/libs/geometry/test/io/wkt/wkt.vcproj       |     8 ++++----                                
   3 files changed, 10 insertions(+), 17 deletions(-)

Modified: trunk/libs/geometry/test/io/wkt/io_wkt_tests.sln
==============================================================================
--- trunk/libs/geometry/test/io/wkt/io_wkt_tests.sln	(original)
+++ trunk/libs/geometry/test/io/wkt/io_wkt_tests.sln	2012-01-15 10:16:20 EST (Sun, 15 Jan 2012)
@@ -2,8 +2,6 @@
 # Visual C++ Express 2005
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wkt", "wkt.vcproj", "{1FA2ADE2-F649-4245-951E-A8F5935E7127}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "multi_wkt", "multi_wkt.vcproj", "{CA8D5E44-7D8F-44A1-900C-35C28890299B}"
-EndProject
 Global
         GlobalSection(SolutionConfigurationPlatforms) = preSolution
                 Debug|Win32 = Debug|Win32
@@ -14,14 +12,6 @@
                 {1FA2ADE2-F649-4245-951E-A8F5935E7127}.Debug|Win32.Build.0 = Debug|Win32
                 {1FA2ADE2-F649-4245-951E-A8F5935E7127}.Release|Win32.ActiveCfg = Release|Win32
                 {1FA2ADE2-F649-4245-951E-A8F5935E7127}.Release|Win32.Build.0 = Release|Win32
-		{F2A680B0-F6FC-479E-9988-24CF6851C13C}.Debug|Win32.ActiveCfg = Debug|Win32
-		{F2A680B0-F6FC-479E-9988-24CF6851C13C}.Debug|Win32.Build.0 = Debug|Win32
-		{F2A680B0-F6FC-479E-9988-24CF6851C13C}.Release|Win32.ActiveCfg = Release|Win32
-		{F2A680B0-F6FC-479E-9988-24CF6851C13C}.Release|Win32.Build.0 = Release|Win32
-		{CA8D5E44-7D8F-44A1-900C-35C28890299B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{CA8D5E44-7D8F-44A1-900C-35C28890299B}.Debug|Win32.Build.0 = Debug|Win32
-		{CA8D5E44-7D8F-44A1-900C-35C28890299B}.Release|Win32.ActiveCfg = Release|Win32
-		{CA8D5E44-7D8F-44A1-900C-35C28890299B}.Release|Win32.Build.0 = Release|Win32
         EndGlobalSection
         GlobalSection(SolutionProperties) = preSolution
                 HideSolutionNode = FALSE

Modified: trunk/libs/geometry/test/io/wkt/wkt.cpp
==============================================================================
--- trunk/libs/geometry/test/io/wkt/wkt.cpp	(original)
+++ trunk/libs/geometry/test/io/wkt/wkt.cpp	2012-01-15 10:16:20 EST (Sun, 15 Jan 2012)
@@ -51,9 +51,12 @@
     */
 
     BOOST_CHECK_EQUAL(bg::num_points(geometry), n);
-    BOOST_CHECK_CLOSE(double(bg::length(geometry)), len, 0.0001);
-    BOOST_CHECK_CLOSE(double(bg::area(geometry)), ar, 0.0001);
-    BOOST_CHECK_CLOSE(double(bg::perimeter(geometry)), peri, 0.0001);
+    if (n > 0)
+    {
+        BOOST_CHECK_CLOSE(double(bg::length(geometry)), len, 0.0001);
+        BOOST_CHECK_CLOSE(double(bg::area(geometry)), ar, 0.0001);
+        BOOST_CHECK_CLOSE(double(bg::perimeter(geometry)), peri, 0.0001);
+    }
 
     // String comparison: only for int/double/float etc
     // GMP/CLN add +e01, L0, etc

Modified: trunk/libs/geometry/test/io/wkt/wkt.vcproj
==============================================================================
--- trunk/libs/geometry/test/io/wkt/wkt.vcproj	(original)
+++ trunk/libs/geometry/test/io/wkt/wkt.vcproj	2012-01-15 10:16:20 EST (Sun, 15 Jan 2012)
@@ -20,7 +20,7 @@
                         OutputDirectory="$(SolutionDir)$(ConfigurationName)"
                         IntermediateDirectory="$(ConfigurationName)\wkt"
                         ConfigurationType="1"
-			InheritedPropertySheets="..\..\..\..\boost.vsprops"
+			InheritedPropertySheets="..\..\boost.vsprops"
                         CharacterSet="1"
 			>
                         <Tool
@@ -41,7 +41,7 @@
                         <Tool
                                 Name="VCCLCompilerTool"
                                 Optimization="0"
-				AdditionalIncludeDirectories="../../../../../../..;../../../.."
+				AdditionalIncludeDirectories="../../../../..;../.."
                                 PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
                                 ExceptionHandling="2"
                                 RuntimeLibrary="1"
@@ -93,7 +93,7 @@
                         OutputDirectory="$(SolutionDir)$(ConfigurationName)"
                         IntermediateDirectory="$(ConfigurationName)\wkt"
                         ConfigurationType="1"
-			InheritedPropertySheets="..\..\..\..\boost.vsprops"
+			InheritedPropertySheets="..\..\boost.vsprops"
                         CharacterSet="1"
                         WholeProgramOptimization="1"
 			>
@@ -114,7 +114,7 @@
                         />
                         <Tool
                                 Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="../../../../../../..;../../../.."
+				AdditionalIncludeDirectories="../../../../..;../.."
                                 PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
                                 ExceptionHandling="2"
                                 UsePrecompiledHeader="0"