[prev in list] [next in list] [prev in thread] [next in thread]
List: fdo-commits
Subject: [fdo-commits] r7031 - trunk/Providers/SHP/Src/UnitTest
From: svn_fdo () osgeo ! org
Date: 2014-03-18 13:00:05
Message-ID: 20140318130007.A7FF3390427 () trac ! osgeo ! org
[Download RAW message or body]
Author: jng
Date: 2014-03-18 06:00:03 -0700 (Tue, 18 Mar 2014)
New Revision: 7031
Modified:
trunk/Providers/SHP/Src/UnitTest/ConnectTests.h
trunk/Providers/SHP/Src/UnitTest/FidelityTests.h
trunk/Providers/SHP/Src/UnitTest/FileAccessTests.h
trunk/Providers/SHP/Src/UnitTest/FilterTests.h
trunk/Providers/SHP/Src/UnitTest/IndexTests.h
trunk/Providers/SHP/Src/UnitTest/OverridesTest.h
trunk/Providers/SHP/Src/UnitTest/SchemaTests.h
trunk/Providers/SHP/Src/UnitTest/SelectTests.cpp
trunk/Providers/SHP/Src/UnitTest/SelectTests.h
trunk/Providers/SHP/Src/UnitTest/SpatialFilterTests.h
Log:
#883: Improve unit test stability for SHP. Tests that use data not in the open source \
tree have been ifdef'd out via the ADSK_FDO symbol. Reviewed by Greg Boone.
Modified: trunk/Providers/SHP/Src/UnitTest/ConnectTests.h
===================================================================
--- trunk/Providers/SHP/Src/UnitTest/ConnectTests.h 2014-03-18 12:57:56 UTC (rev \
7030)
+++ trunk/Providers/SHP/Src/UnitTest/ConnectTests.h 2014-03-18 13:00:03 UTC (rev \
7031) @@ -35,7 +35,9 @@
CPPUNIT_TEST (dual_connect);
CPPUNIT_TEST (connect_no_slash);
CPPUNIT_TEST (connect_back_slash);
+#ifdef ADSK_FDO
CPPUNIT_TEST (connect_double_slash);
+#endif
CPPUNIT_TEST (connect_wrong_params);
CPPUNIT_TEST (connect_wrong_params2);
CPPUNIT_TEST (connect_params1);
Modified: trunk/Providers/SHP/Src/UnitTest/FidelityTests.h
===================================================================
--- trunk/Providers/SHP/Src/UnitTest/FidelityTests.h 2014-03-18 12:57:56 UTC (rev \
7030)
+++ trunk/Providers/SHP/Src/UnitTest/FidelityTests.h 2014-03-18 13:00:03 UTC (rev \
7031) @@ -28,9 +28,11 @@
public ShpTests
{
CPPUNIT_TEST_SUITE (FidelityTests);
+#ifdef ADSK_FDO
CPPUNIT_TEST (ontario);
CPPUNIT_TEST (lakes);
CPPUNIT_TEST (nanboku);
+#endif
CPPUNIT_TEST (ignore_states);
CPPUNIT_TEST_SUITE_END ();
Modified: trunk/Providers/SHP/Src/UnitTest/FileAccessTests.h
===================================================================
--- trunk/Providers/SHP/Src/UnitTest/FileAccessTests.h 2014-03-18 12:57:56 UTC (rev \
7030)
+++ trunk/Providers/SHP/Src/UnitTest/FileAccessTests.h 2014-03-18 13:00:03 UTC (rev \
7031) @@ -27,10 +27,12 @@
public ShpTests
{
CPPUNIT_TEST_SUITE (FileAccessTests);
+#ifdef ADSK_FDO
CPPUNIT_TEST (open_shp);
CPPUNIT_TEST (open_dbf);
CPPUNIT_TEST (open_shx);
CPPUNIT_TEST (object);
+#endif
CPPUNIT_TEST (create_shx);
CPPUNIT_TEST (only_shp);
CPPUNIT_TEST (delete_shp);
Modified: trunk/Providers/SHP/Src/UnitTest/FilterTests.h
===================================================================
--- trunk/Providers/SHP/Src/UnitTest/FilterTests.h 2014-03-18 12:57:56 UTC (rev 7030)
+++ trunk/Providers/SHP/Src/UnitTest/FilterTests.h 2014-03-18 13:00:03 UTC (rev 7031)
@@ -35,6 +35,7 @@
public ShpTests
{
CPPUNIT_TEST_SUITE (FilterTests);
+#ifdef ADSK_FDO
CPPUNIT_TEST (equal);
CPPUNIT_TEST (less);
CPPUNIT_TEST (greater);
@@ -49,6 +50,7 @@
CPPUNIT_TEST (computed);
CPPUNIT_TEST (computed_geometry);
CPPUNIT_TEST (non_existent_featid);
+#endif
CPPUNIT_TEST (featid_optimizer_tests );
// CPPUNIT_TEST (featid_performance_tests);
CPPUNIT_TEST_SUITE_END ();
Modified: trunk/Providers/SHP/Src/UnitTest/IndexTests.h
===================================================================
--- trunk/Providers/SHP/Src/UnitTest/IndexTests.h 2014-03-18 12:57:56 UTC (rev 7030)
+++ trunk/Providers/SHP/Src/UnitTest/IndexTests.h 2014-03-18 13:00:03 UTC (rev 7031)
@@ -30,7 +30,9 @@
CPPUNIT_TEST (create);
CPPUNIT_TEST (populate);
CPPUNIT_TEST (query);
+#ifdef ADSK_FDO
CPPUNIT_TEST (check_z);
+#endif
CPPUNIT_TEST (check_limits);
CPPUNIT_TEST (check_remove);
CPPUNIT_TEST (check_defragment);
Modified: trunk/Providers/SHP/Src/UnitTest/OverridesTest.h
===================================================================
--- trunk/Providers/SHP/Src/UnitTest/OverridesTest.h 2014-03-18 12:57:56 UTC (rev \
7030)
+++ trunk/Providers/SHP/Src/UnitTest/OverridesTest.h 2014-03-18 13:00:03 UTC (rev \
7031) @@ -32,7 +32,9 @@
CPPUNIT_TEST( TestSimple );
CPPUNIT_TEST( TestSetConfiguration );
CPPUNIT_TEST( TestSetEmptyConfiguration );
+#ifdef ADSK_FDO
CPPUNIT_TEST( TestReadWithOverrides );
+#endif
CPPUNIT_TEST( TestWriteWithOverrides );
CPPUNIT_TEST_SUITE_END();
Modified: trunk/Providers/SHP/Src/UnitTest/SchemaTests.h
===================================================================
--- trunk/Providers/SHP/Src/UnitTest/SchemaTests.h 2014-03-18 12:57:56 UTC (rev 7030)
+++ trunk/Providers/SHP/Src/UnitTest/SchemaTests.h 2014-03-18 13:00:03 UTC (rev 7031)
@@ -34,7 +34,9 @@
CPPUNIT_TEST (apply_schema);
CPPUNIT_TEST (apply_nameless);
CPPUNIT_TEST (create_nameless);
+#ifdef ADSK_FDO
CPPUNIT_TEST (schema_mapping_defaults_test);
+#endif
CPPUNIT_TEST (schema_mapping_no_defaults_test);
CPPUNIT_TEST (add_class);
CPPUNIT_TEST (apply_two);
Modified: trunk/Providers/SHP/Src/UnitTest/SelectTests.cpp
===================================================================
--- trunk/Providers/SHP/Src/UnitTest/SelectTests.cpp 2014-03-18 12:57:56 UTC (rev \
7030)
+++ trunk/Providers/SHP/Src/UnitTest/SelectTests.cpp 2014-03-18 13:00:03 UTC (rev \
7031) @@ -967,7 +967,9 @@
// directories/filenames/geometrycolumn name:
wchar_t* testData[][3] =
{
+#ifdef ADSK_FDO
{ L"../../TestData/Zones", L"ZONES", L"Geometry" },
+#endif
{ L"../../TestData/World", L"world_adm0", L"Geometry" },
//NO POLYGON DATA: { L"../../TestData/Testing", L"TestModify", \
L"Geometry" },
//DUPLICATE FIELD NAME CAUSES EXCEPTION: { L"../../TestData/States", \
L"statesp020", L"Geometry" }, @@ -983,8 +985,10 @@
{ L"../../TestData/Sheboygan", L"Soils", L"Geometry" },
//NO POLYGON DATA: { L"../../TestData/Sheboygan", L"Trees", L"Geometry" \
},
{ L"../../TestData/Sheboygan", L"VotingDistricts", L"Geometry" },
+#ifdef ADSK_FDO
{ L"../../TestData/Ontario", L"lakes", L"Geometry" },
{ L"../../TestData/Ontario", L"ontario", L"Geometry" },
+#endif
//NO POLYGON DATA: { L"../../TestData/Ontario", L"roads", L"Geometry" \
},
//NO POLYGON DATA: { L"../../TestData/Ontario", L"ShpMixedDecimals", \
L"Geometry" },
{ L"../../TestData/Oahu", L"coundist01_n83", L"Geometry" },
Modified: trunk/Providers/SHP/Src/UnitTest/SelectTests.h
===================================================================
--- trunk/Providers/SHP/Src/UnitTest/SelectTests.h 2014-03-18 12:57:56 UTC (rev 7030)
+++ trunk/Providers/SHP/Src/UnitTest/SelectTests.h 2014-03-18 13:00:03 UTC (rev 7031)
@@ -32,18 +32,26 @@
public ShpTests
{
CPPUNIT_TEST_SUITE (SelectTests);
+#ifdef ADSK_FDO
CPPUNIT_TEST (select);
+#endif
CPPUNIT_TEST (get_spatial_contexts);
+#ifdef ADSK_FDO
CPPUNIT_TEST (get_class_definition);
CPPUNIT_TEST (requery);
CPPUNIT_TEST (select_subset);
+#endif
CPPUNIT_TEST (select_all);
CPPUNIT_TEST (select_mixed_decimals);
CPPUNIT_TEST (get_spatial_context_text);
+#ifdef ADSK_FDO
CPPUNIT_TEST (select_only_geometry);
+#endif
CPPUNIT_TEST (select_hawaii);
CPPUNIT_TEST (select_states);
+#ifdef ADSK_FDO
CPPUNIT_TEST (select_date_time);
+#endif
CPPUNIT_TEST (select_large_geometries);
CPPUNIT_TEST (analyze_polygons);
CPPUNIT_TEST (select_with_aggregates_should_fail);
Modified: trunk/Providers/SHP/Src/UnitTest/SpatialFilterTests.h
===================================================================
--- trunk/Providers/SHP/Src/UnitTest/SpatialFilterTests.h 2014-03-18 12:57:56 UTC \
(rev 7030)
+++ trunk/Providers/SHP/Src/UnitTest/SpatialFilterTests.h 2014-03-18 13:00:03 UTC \
(rev 7031) @@ -33,8 +33,10 @@
CPPUNIT_TEST (Within);
CPPUNIT_TEST (Inside);
CPPUNIT_TEST (Intersects);
+#ifdef ADSK_FDO
CPPUNIT_TEST (PerformanceTests_Roads);
CPPUNIT_TEST (PerformanceTests_Lakes);
+#endif
CPPUNIT_TEST (Crosses);
CPPUNIT_TEST (Touches);
CPPUNIT_TEST (Bogus);
_______________________________________________
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