Changeset 2057

Show
Ignore:
Timestamp:
11/23/05 06:38:00 (6 years ago)
Author:
strk
Message:

Reworked regress tests to avoid multiple database creations

Location:
trunk/regress
Files:
3 added
4 removed
7 modified

Legend:

Unmodified
Added
Removed

  • trunk/regress/lwgeom_regress_expected

    r2027 r2057  
    8810431 
    990.528602749909894 
     10DROP TABLE 

  • trunk/regress/lwgeom_regress.sql

    r2027 r2057  
    100100SELECT mem_size(collect(force_2d(force_4d(force_3dm(force_3dz(force_2d(geometry(wkb_ndr)))))))) from test_data; 
    101101SELECT line_locate_point('LINESTRING(709243.393033887 163969.752725768,708943.240904444 163974.593889146,708675.634380651 163981.832927298)', 'POINT(705780 15883)'); 
     102 
     103DROP TABLE test_data; 

  • trunk/regress/Makefile

    r1496 r2057  
    11TMPDIR?=/tmp 
    22 
    3 test: test-common test-index test-lwgeom test-ogc 
     3test: test-common test-index test-lwgeom test-ogc test-lrs 
    44 
    55test-lwgeom: 
    6         @./run_lwgeom_regress 
     6        @./run_test lwgeom_regress 
     7 
     8test-index: 
     9        @./run_test regress_index 
     10 
     11test-ogc: 
     12        @./run_test regress_ogc 
     13 
     14test-lrs: 
     15        @./run_test regress_lrs 
    716 
    817test-common: 
    9         @./run_regress 
     18        @./run_test regress 
    1019 
    11 test-index: 
    12         @./run_index_regress 
    13  
    14 test-ogc: 
    15         @./run_ogc_regress 
    1620 
    1721clean: 

  • trunk/regress/regress_expected

    r2055 r2057  
    149149147|POINT(1 2 3 0) 
    150150144|LINESTRING(-5 -5,0 0,1 1,4 4) 
    151 2d| 
    152 3dz| 
    153 PNTM_1|GEOMETRYCOLLECTIONM EMPTY 
    154 PNTM_2|POINTM(1 2 3) 
    155 PNTM_3|POINTM(1 2 3) 
    156 PNTM_4|POINTM(1 2 3) 
    157 PNTM_5|GEOMETRYCOLLECTIONM EMPTY 
    158 MPNT_1|GEOMETRYCOLLECTIONM(POINT(1 2 2)) 
    159 MPNT_2|GEOMETRYCOLLECTIONM(POINT(2 2 5)) 
    160 MPNT_3|GEOMETRYCOLLECTIONM EMPTY 
    161 MPNT_4|GEOMETRYCOLLECTIONM(POINT(1 2 8),POINT(2 2 5)) 
    162 COLL_1| 
    163 LINEZM_1|GEOMETRYCOLLECTION(LINESTRING(0 8 80 2,0 0 0 10)) 
    164 LINEZM_2|GEOMETRYCOLLECTION(LINESTRING(0 8 20 2,0 0 100 10)) 
    165 LINEZM_3|GEOMETRYCOLLECTION(LINESTRING(0 8 80 2,0 0 0 10,8 0 0 2)) 
    166 LINEZM_4|GEOMETRYCOLLECTION(LINESTRING(0 9 90 2,0 1 10 18),LINESTRING(1 0 0 18,9 0 0 2)) 
    167 LINEZM_5|GEOMETRYCOLLECTION(LINESTRING(0 9 90 2,0 1 10 18),LINESTRING(5.5 4.5 4.5 18,9.5 0.5 0.5 2)) 
     151DROP TABLE 

  • trunk/regress/regress_index_expected

    r1117 r2057  
    883618|POINT(130.447205 131.655289) 
    997245|POINT(128.10466 130.94133) 
     10DROP TABLE 

  • trunk/regress/regress_index.sql

    r1117 r2057  
    1414 select num,astext(the_geom) from test where the_geom && 'BOX3D(125 125,135 135)'::box3d  order by num; 
    1515 
    16  
     16DROP TABLE test; 

  • trunk/regress/regress.sql

    r2055 r2057  
    246246select '144', asewkt(linemerge('GEOMETRYCOLLECTION(LINESTRING(0 0, 1 1), LINESTRING(4 4, 1 1), LINESTRING(-5 -5, 0 0))'::geometry)); 
    247247 
    248 -------------------------------- 
    249 -- LRS functions 
    250 -------------------------------- 
    251  
    252 -- No M value 
    253 select '2d',asewkt(locate_along_measure('POINT(1 2)', 1)); 
    254 select '3dz',asewkt(locate_along_measure('POINT(1 2 3)', 1)); 
    255  
    256 -- Points 
    257 select 'PNTM_1',asewkt(locate_along_measure('POINTM(1 2 3)', 1)); 
    258 select 'PNTM_2',asewkt(locate_along_measure('POINTM(1 2 3)', 3)); 
    259 select 'PNTM_3',asewkt(locate_between_measures('POINTM(1 2 3)', 2, 3)); 
    260 select 'PNTM_4',asewkt(locate_between_measures('POINTM(1 2 3)', 3, 4)); 
    261 select 'PNTM_5',asewkt(locate_between_measures('POINTM(1 2 4.00001)', 3, 4)); 
    262  
    263 -- Multipoints 
    264 select 'MPNT_1',asewkt(locate_between_measures('MULTIPOINTM(1 2 2)', 2, 5)); 
    265 select 'MPNT_2', asewkt(locate_between_measures('MULTIPOINTM(1 2 8, 2 2 5, 2 1 0)', 2, 5)); 
    266 select 'MPNT_3', asewkt(locate_between_measures('MULTIPOINTM(1 2 8, 2 2 5.1, 2 1 0)', 2, 5)); 
    267 select 'MPNT_4', asewkt(locate_between_measures('MULTIPOINTM(1 2 8, 2 2 5, 2 1 0)', 4, 8)); 
    268  
    269  
    270 -- Collections 
    271 select 'COLL_1', asewkt(locate_between_measures('GEOMETRYCOLLECTION(MULTIPOINTM(1 2 8, 2 2 5.0, 2 1 0),MULTIPOINT(0 0 1))', 2, 5)); 
    272  
    273 -- Linestrings 
    274 select 'LINEZM_1', asewkt(locate_between_measures('LINESTRING(0 10 100 0, 0 0 0 10)', 2, 18)); 
    275 select 'LINEZM_2', asewkt(locate_between_measures('LINESTRING(0 10 0 0, 0 0 100 10)', 2, 18)); 
    276 select 'LINEZM_3', asewkt(locate_between_measures('LINESTRING(0 10 100 0, 0 0 0 10, 10 0 0 0)', 2, 18)); 
    277 select 'LINEZM_4', asewkt(locate_between_measures('LINESTRING(0 10 100 0, 0 0 0 20, 10 0 0 0)', 2, 18)); 
    278 select 'LINEZM_5', asewkt(locate_between_measures('LINESTRING(0 10 100 0, 0 0 0 20, 0 10 10 40, 10 0 0 0)', 2, 18)); 
     248-- Drop test table 
     249DROP table test;