[geos-commits] r3115 - in trunk/tests/unit: capi io

[svn_geos at osgeo.org]

Author: mloskot
Date: 2010-10-15 08:20:02 -0700 (Fri, 15 Oct 2010)
New Revision: 3115

Modified:
   trunk/tests/unit/capi/GEOSGeom_create.cpp
   trunk/tests/unit/capi/GEOSGeom_extractUniquePointsTest.cpp
   trunk/tests/unit/io/WKTReaderTest.cpp
Log:
Visual C++ warnings cleanup

Modified: trunk/tests/unit/capi/GEOSGeom_create.cpp
===================================================================
--- trunk/tests/unit/capi/GEOSGeom_create.cpp	2010-10-15 15:19:27 UTC (rev 3114)
+++ trunk/tests/unit/capi/GEOSGeom_create.cpp	2010-10-15 15:20:02 UTC (rev 3115)
@@ -64,9 +64,9 @@
     void object::test<1>()
     {
         geom1_ = GEOSGeom_createEmptyPoint_r(handle_);
-        ensure(GEOSisEmpty_r(handle_, geom1_));
-	ensure_equals(GEOSGeomTypeId_r(handle_, geom1_), GEOS_POINT);
-	GEOSGeom_destroy(geom1_); geom1_=0;
+        ensure(0 != GEOSisEmpty_r(handle_, geom1_));
+        ensure_equals(GEOSGeomTypeId_r(handle_, geom1_), GEOS_POINT);
+        GEOSGeom_destroy(geom1_); geom1_=0;
     }
 
     // EMPTY linestring
@@ -75,9 +75,9 @@
     void object::test<2>()
     {
         geom1_ = GEOSGeom_createEmptyLineString_r(handle_);
-        ensure(GEOSisEmpty_r(handle_, geom1_));
-	ensure_equals(GEOSGeomTypeId_r(handle_, geom1_), GEOS_LINESTRING);
-	GEOSGeom_destroy(geom1_); geom1_=0;
+        ensure(0 != GEOSisEmpty_r(handle_, geom1_));
+        ensure_equals(GEOSGeomTypeId_r(handle_, geom1_), GEOS_LINESTRING);
+        GEOSGeom_destroy(geom1_); geom1_=0;
     }
     
 
@@ -87,9 +87,9 @@
     void object::test<3>()
     {
         geom1_ = GEOSGeom_createEmptyPolygon_r(handle_);
-        ensure(GEOSisEmpty_r(handle_, geom1_));
-	ensure_equals(GEOSGeomTypeId_r(handle_, geom1_), GEOS_POLYGON);
-	GEOSGeom_destroy(geom1_); geom1_=0;
+        ensure(0 != GEOSisEmpty_r(handle_, geom1_));
+        ensure_equals(GEOSGeomTypeId_r(handle_, geom1_), GEOS_POLYGON);
+        GEOSGeom_destroy(geom1_); geom1_=0;
     }
 
     // EMPTY multipoint
@@ -98,9 +98,9 @@
     void object::test<4>()
     {
         geom1_ = GEOSGeom_createEmptyCollection_r(handle_, GEOS_MULTIPOINT);
-        ensure(GEOSisEmpty_r(handle_, geom1_));
-	ensure_equals(GEOSGeomTypeId_r(handle_, geom1_), GEOS_MULTIPOINT);
-	GEOSGeom_destroy(geom1_); geom1_=0;
+        ensure(0 != GEOSisEmpty_r(handle_, geom1_));
+        ensure_equals(GEOSGeomTypeId_r(handle_, geom1_), GEOS_MULTIPOINT);
+        GEOSGeom_destroy(geom1_); geom1_=0;
     }
 
     // EMPTY multilinestring
@@ -109,9 +109,9 @@
     void object::test<5>()
     {
         geom1_ = GEOSGeom_createEmptyCollection_r(handle_, GEOS_MULTILINESTRING);
-        ensure(GEOSisEmpty_r(handle_, geom1_));
-	ensure_equals(GEOSGeomTypeId_r(handle_, geom1_), GEOS_MULTILINESTRING);
-	GEOSGeom_destroy(geom1_); geom1_=0;
+        ensure(0 != GEOSisEmpty_r(handle_, geom1_));
+        ensure_equals(GEOSGeomTypeId_r(handle_, geom1_), GEOS_MULTILINESTRING);
+        GEOSGeom_destroy(geom1_); geom1_=0;
     }
 
     // EMPTY multipolygon
@@ -120,9 +120,9 @@
     void object::test<6>()
     {
         geom1_ = GEOSGeom_createEmptyCollection_r(handle_, GEOS_MULTIPOLYGON);
-        ensure(GEOSisEmpty_r(handle_, geom1_));
-	ensure_equals(GEOSGeomTypeId_r(handle_, geom1_), GEOS_MULTIPOLYGON);
-	GEOSGeom_destroy(geom1_); geom1_=0;
+        ensure(0 != GEOSisEmpty_r(handle_, geom1_));
+        ensure_equals(GEOSGeomTypeId_r(handle_, geom1_), GEOS_MULTIPOLYGON);
+        GEOSGeom_destroy(geom1_); geom1_=0;
     }
 
     // EMPTY collection
@@ -131,9 +131,9 @@
     void object::test<7>()
     {
         geom1_ = GEOSGeom_createEmptyCollection_r(handle_, GEOS_GEOMETRYCOLLECTION);
-        ensure(GEOSisEmpty_r(handle_, geom1_));
-	ensure_equals(GEOSGeomTypeId_r(handle_, geom1_), GEOS_GEOMETRYCOLLECTION);
-	GEOSGeom_destroy(geom1_); geom1_=0;
+        ensure(0 != GEOSisEmpty_r(handle_, geom1_));
+        ensure_equals(GEOSGeomTypeId_r(handle_, geom1_), GEOS_GEOMETRYCOLLECTION);
+        GEOSGeom_destroy(geom1_); geom1_=0;
     }
 
 

Modified: trunk/tests/unit/capi/GEOSGeom_extractUniquePointsTest.cpp
===================================================================
--- trunk/tests/unit/capi/GEOSGeom_extractUniquePointsTest.cpp	2010-10-15 15:19:27 UTC (rev 3114)
+++ trunk/tests/unit/capi/GEOSGeom_extractUniquePointsTest.cpp	2010-10-15 15:20:02 UTC (rev 3115)
@@ -73,7 +73,7 @@
         geom1_ = GEOSGeomFromWKT_r(handle_, "POLYGON EMPTY");
         /* ensure_equals(GEOSGetNumGeometries_r(handle_, geom2_), 0); */
         geom3_ = GEOSGeom_extractUniquePoints_r(handle_, geom1_);
-        ensure(GEOSisEmpty_r(handle_, geom3_));
+        ensure(0 != GEOSisEmpty_r(handle_, geom3_));
     }
 
     template<>
@@ -84,7 +84,7 @@
         geom2_ = GEOSGeomFromWKT_r(handle_, "MULTIPOINT(0 0, 1 1)");
         /* ensure_equals(GEOSGetNumGeometries_r(handle_, geom2_), 0); */
         geom3_ = GEOSGeom_extractUniquePoints_r(handle_, geom1_);
-        ensure(GEOSEquals_r(handle_, geom3_, geom2_));
+        ensure(0 != GEOSEquals_r(handle_, geom3_, geom2_));
     }
 
     template<>
@@ -95,7 +95,7 @@
         geom2_ = GEOSGeomFromWKT_r(handle_, "MULTIPOINT(0 0, 1 1, 2 2, 5 5, 0 2)");
         geom3_ = GEOSGeom_extractUniquePoints_r(handle_, geom1_);
         /* ensure_equals(GEOSGetNumGeometries_r(handle_, geom2_), 0); */
-        ensure(GEOSEquals_r(handle_, geom3_, geom2_));
+        ensure(0 != GEOSEquals_r(handle_, geom3_, geom2_));
     }
 
  

Modified: trunk/tests/unit/io/WKTReaderTest.cpp
===================================================================
--- trunk/tests/unit/io/WKTReaderTest.cpp	2010-10-15 15:19:27 UTC (rev 3114)
+++ trunk/tests/unit/io/WKTReaderTest.cpp	2010-10-15 15:20:02 UTC (rev 3115)
@@ -132,6 +132,7 @@
             ensure( !"Didn't get expected exception" );
         } catch (const geos::util::IllegalArgumentException& ex) {
             ensure( "Did get expected exception" );
+            ex.what();
         } catch (...) {
             ensure( !"Got unexpected exception" );
 	}