Changeset 562
- Timestamp:
- 11/26/04 12:03:16 (4 years ago)
- Location:
- trunk
- Files:
-
- 1 added
- 8 modified
-
MANIFEST (modified) (1 diff)
-
lib/OpenGuides/Test.pm (added)
-
t/25_write_geo_data.t (modified) (10 diffs)
-
t/26_geo_data_search_form.t (modified) (5 diffs)
-
t/27_geo_data_edit_form.t (modified) (5 diffs)
-
t/33_supersearch_advanced_search.t (modified) (3 diffs)
-
t/33_supersearch_advanced_search_utm.t (modified) (3 diffs)
-
t/34_supersearch_paging.t (modified) (3 diffs)
-
t/66_bug_latlong_representation.t (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/MANIFEST
r548 r562 18 18 lib/OpenGuides/SuperSearch.pm 19 19 lib/OpenGuides/Template.pm 20 lib/OpenGuides/Test.pm 20 21 lib/OpenGuides/Utils.pm 21 22 lib/OpenGuides.pm -
trunk/t/25_write_geo_data.t
r560 r562 3 3 use Config::Tiny; 4 4 use OpenGuides; 5 use OpenGuides::Test; 5 6 use Test::More; 6 7 … … 55 56 is( $guide->locator->y_field, "os_y", "correct y field" ); 56 57 57 write_data(58 guide => $guide,59 node => "Crabtree Tavern",60 os_x => 523465,61 os_y => 177490,62 categories => "Pubs",63 );58 OpenGuides::Test->write_data( 59 guide => $guide, 60 node => "Crabtree Tavern", 61 os_x => 523465, 62 os_y => 177490, 63 categories => "Pubs", 64 ); 64 65 my %data = $guide->wiki->retrieve_node( "Crabtree Tavern" ); 65 66 is( $data{metadata}{os_x}[0], 523465, "os_x stored correctly" ); … … 68 69 ok( defined $data{metadata}{longitude}[0], "longitude stored" ); 69 70 70 write_data(71 guide => $guide,72 node => "El Sombrero",73 latitude => 51.368,74 longitude => -0.097,75 categories => "Restaurants",76 );71 OpenGuides::Test->write_data( 72 guide => $guide, 73 node => "El Sombrero", 74 latitude => 51.368, 75 longitude => -0.097, 76 categories => "Restaurants", 77 ); 77 78 %data = $guide->wiki->retrieve_node( "El Sombrero" ); 78 79 ok( defined $data{metadata}{os_x}[0], "os_x stored" ); … … 85 86 eval { 86 87 local $SIG{__WARN__} = sub { die $_[0]; }; 87 write_data(88 guide => $guide,89 node => "Locationless Page 1",90 );88 OpenGuides::Test->write_data( 89 guide => $guide, 90 node => "Locationless Page 1", 91 ); 91 92 }; 92 93 is( $@, "", … … 106 107 is( $guide->locator->y_field, "osie_y", "correct y field" ); 107 108 108 write_data(109 guide => $guide,110 node => "I Made This Place Up",111 osie_x => 100000,112 osie_y => 200000,113 );109 OpenGuides::Test->write_data( 110 guide => $guide, 111 node => "I Made This Place Up", 112 osie_x => 100000, 113 osie_y => 200000, 114 ); 114 115 %data = $guide->wiki->retrieve_node( "I Made This Place Up" ); 115 116 is( $data{metadata}{osie_x}[0], 100000, "osie_x stored correctly" ); … … 118 119 ok( defined $data{metadata}{longitude}[0], "longitude stored" ); 119 120 120 write_data(121 guide => $guide,122 node => "Brambles Coffee Shop",123 latitude => 54.6434,124 longitude => -5.6731,125 );121 OpenGuides::Test->write_data( 122 guide => $guide, 123 node => "Brambles Coffee Shop", 124 latitude => 54.6434, 125 longitude => -5.6731, 126 ); 126 127 %data = $guide->wiki->retrieve_node( "Brambles Coffee Shop" ); 127 128 ok( defined $data{metadata}{osie_x}[0], "osie_x stored" ); … … 134 135 eval { 135 136 local $SIG{__WARN__} = sub { die $_[0]; }; 136 write_data(137 guide => $guide,138 node => "Locationless Page 2",139 );137 OpenGuides::Test->write_data( 138 guide => $guide, 139 node => "Locationless Page 2", 140 ); 140 141 }; 141 142 is( $@, "", … … 156 157 is( $guide->locator->y_field, "northing", "correct y field" ); 157 158 158 write_data(159 guide => $guide,160 node => "London Aquarium",161 latitude => 51.502,162 longitude => -0.118,163 );159 OpenGuides::Test->write_data( 160 guide => $guide, 161 node => "London Aquarium", 162 latitude => 51.502, 163 longitude => -0.118, 164 ); 164 165 %data = $guide->wiki->retrieve_node( "London Aquarium" ); 165 166 ok( defined $data{metadata}{easting}[0], "easting stored" ); … … 172 173 eval { 173 174 local $SIG{__WARN__} = sub { die $_[0]; }; 174 write_data(175 guide => $guide,176 node => "Locationless Page 3",177 );175 OpenGuides::Test->write_data( 176 guide => $guide, 177 node => "Locationless Page 3", 178 ); 178 179 }; 179 180 is( $@, "", … … 186 187 ok( !defined $data{metadata}{osie_x}[0], "...nor osie_x" ); 187 188 ok( !defined $data{metadata}{osie_y}[0], "...nor osie_y" ); 188 189 190 sub write_data {191 my %args = @_;192 193 # Set up CGI parameters ready for a node write.194 # Most of these are in here to avoid uninitialised value warnings.195 my $q = CGI->new( "" );196 $q->param( -name => "content", -value => "foo" );197 $q->param( -name => "categories", -value => $args{categories} || "" );198 $q->param( -name => "locales", -value => "" );199 $q->param( -name => "phone", -value => "" );200 $q->param( -name => "fax", -value => "" );201 $q->param( -name => "website", -value => "" );202 $q->param( -name => "hours_text", -value => "" );203 $q->param( -name => "address", -value => "" );204 $q->param( -name => "postcode", -value => "" );205 $q->param( -name => "map_link", -value => "" );206 $q->param( -name => "os_x", -value => $args{os_x} || "" );207 $q->param( -name => "os_y", -value => $args{os_y} || "" );208 $q->param( -name => "osie_x", -value => $args{osie_x} || "" );209 $q->param( -name => "osie_y", -value => $args{osie_y} || "" );210 $q->param( -name => "latitude", -value => $args{latitude} || "" );211 $q->param( -name => "longitude", -value => $args{longitude} || "" );212 $q->param( -name => "username", -value => "Kake" );213 $q->param( -name => "comment", -value => "foo" );214 $q->param( -name => "edit_type", -value => "Normal edit" );215 $ENV{REMOTE_ADDR} = "127.0.0.1";216 217 $args{guide}->commit_node(218 return_output => 1,219 id => $args{node},220 cgi_obj => $q,221 );222 } -
trunk/t/26_geo_data_search_form.t
r559 r562 3 3 use Config::Tiny; 4 4 use OpenGuides; 5 use OpenGuides::Test; 5 6 use Test::More; 6 7 … … 59 60 my $guide = OpenGuides->new( config => $config ); 60 61 61 write_data(62 guide=> $guide,63 node=> "Banana Leaf",64 os_x=> 532125,65 os_y=> 165504,66 );62 OpenGuides::Test->write_data( 63 guide => $guide, 64 node => "Banana Leaf", 65 os_x => 532125, 66 os_y => 165504, 67 ); 67 68 68 69 # Display the node, check that the distance search form defaults to OS co-ords … … 93 94 $guide = OpenGuides->new( config => $config ); 94 95 95 write_data(96 guide=> $guide,97 node=> "I Made This Place Up",98 osie_x=> 100000,99 osie_y=> 200000,100 );96 OpenGuides::Test->write_data( 97 guide => $guide, 98 node => "I Made This Place Up", 99 osie_x => 100000, 100 osie_y => 200000, 101 ); 101 102 102 103 # Display node, check distance search form. … … 125 126 $guide = OpenGuides->new( config => $config ); 126 127 127 write_data(128 guide=> $guide,129 node=> "London Aquarium",130 latitude=> 51.502,131 longitude=> -0.118,132 );128 OpenGuides::Test->write_data( 129 guide => $guide, 130 node => "London Aquarium", 131 latitude => 51.502, 132 longitude => -0.118, 133 ); 133 134 134 135 # Display node, check distance search form. … … 150 151 { name => "longitude", value => "-0.118" }, 151 152 "...includes input 'longitude' with correct value"); 152 153 154 155 sub write_data {156 my %args = @_;157 158 # Set up CGI parameters ready for a node write.159 # Most of these are in here to avoid uninitialised value warnings.160 my $q = CGI->new( "" );161 $q->param( -name => "content", -value => "foo" );162 $q->param( -name => "categories", -value => $args{categories} || "" );163 $q->param( -name => "locales", -value => "" );164 $q->param( -name => "phone", -value => "" );165 $q->param( -name => "fax", -value => "" );166 $q->param( -name => "website", -value => "" );167 $q->param( -name => "hours_text", -value => "" );168 $q->param( -name => "address", -value => "" );169 $q->param( -name => "postcode", -value => "" );170 $q->param( -name => "map_link", -value => "" );171 $q->param( -name => "os_x", -value => $args{os_x} || "" );172 $q->param( -name => "os_y", -value => $args{os_y} || "" );173 $q->param( -name => "osie_x", -value => $args{osie_x} || "" );174 $q->param( -name => "osie_y", -value => $args{osie_y} || "" );175 $q->param( -name => "latitude", -value => $args{latitude} || "" );176 $q->param( -name => "longitude", -value => $args{longitude} || "" );177 $q->param( -name => "username", -value => "Kake" );178 $q->param( -name => "comment", -value => "foo" );179 $q->param( -name => "edit_type", -value => "Normal edit" );180 $ENV{REMOTE_ADDR} = "127.0.0.1";181 182 $args{guide}->commit_node(183 return_output => 1,184 id => $args{node},185 cgi_obj => $q,186 );187 } -
trunk/t/27_geo_data_edit_form.t
r559 r562 3 3 use Config::Tiny; 4 4 use OpenGuides; 5 use OpenGuides::Test; 5 6 use Test::More; 6 7 … … 62 63 my $wiki = $guide->wiki; 63 64 # Write some data. 64 write_data(65 guide => $guide,66 node => "Crabtree Tavern",67 os_x => 523465,68 os_y => 177490,69 categories => "Pubs",70 );65 OpenGuides::Test->write_data( 66 guide => $guide, 67 node => "Crabtree Tavern", 68 os_x => 523465, 69 os_y => 177490, 70 categories => "Pubs", 71 ); 71 72 my %data = $guide->wiki->retrieve_node( "Crabtree Tavern" ); 72 73 # Set up the coord_field vars. … … 105 106 $wiki = $guide->wiki; 106 107 # Write some data. 107 write_data(108 guide => $guide,109 node => "I Made This Place Up",110 osie_x => 100000,111 osie_y => 200000,112 );108 OpenGuides::Test->write_data( 109 guide => $guide, 110 node => "I Made This Place Up", 111 osie_x => 100000, 112 osie_y => 200000, 113 ); 113 114 %data = $guide->wiki->retrieve_node( "I Made This Place Up" ); 114 115 # Set up the coord_field vars. … … 146 147 $wiki = $guide->wiki; 147 148 # Write some data. 148 write_data(149 guide=> $guide,150 node=> "London Aquarium",151 latitude=> 51.502,152 longitude=> -0.118,153 );149 OpenGuides::Test->write_data( 150 guide => $guide, 151 node => "London Aquarium", 152 latitude => 51.502, 153 longitude => -0.118, 154 ); 154 155 %data = $guide->wiki->retrieve_node( "London Aquarium" ); 155 156 # Set up the coord_field vars. … … 180 181 like( $output, qr|Longitude:|s, 181 182 "...'Longitude:' label included" ); 182 183 184 sub write_data {185 my %args = @_;186 187 # Set up CGI parameters ready for a node write.188 # Most of these are in here to avoid uninitialised value warnings.189 my $q = CGI->new( "" );190 $q->param( -name => "content", -value => "foo" );191 $q->param( -name => "categories", -value => $args{categories} || "" );192 $q->param( -name => "locales", -value => "" );193 $q->param( -name => "phone", -value => "" );194 $q->param( -name => "fax", -value => "" );195 $q->param( -name => "website", -value => "" );196 $q->param( -name => "hours_text", -value => "" );197 $q->param( -name => "address", -value => "" );198 $q->param( -name => "postcode", -value => "" );199 $q->param( -name => "map_link", -value => "" );200 $q->param( -name => "os_x", -value => $args{os_x} || "" );201 $q->param( -name => "os_y", -value => $args{os_y} || "" );202 $q->param( -name => "osie_x", -value => $args{osie_x} || "" );203 $q->param( -name => "osie_y", -value => $args{osie_y} || "" );204 $q->param( -name => "latitude", -value => $args{latitude} || "" );205 $q->param( -name => "longitude", -value => $args{longitude} || "" );206 $q->param( -name => "username", -value => "Kake" );207 $q->param( -name => "comment", -value => "foo" );208 $q->param( -name => "edit_type", -value => "Normal edit" );209 $ENV{REMOTE_ADDR} = "127.0.0.1";210 211 $args{guide}->commit_node(212 return_output => 1,213 id => $args{node},214 cgi_obj => $q,215 );216 } -
trunk/t/33_supersearch_advanced_search.t
r559 r562 4 4 use Config::Tiny; 5 5 use OpenGuides::SuperSearch; 6 use OpenGuides::Test; 6 7 use Test::More; 7 8 … … 44 45 45 46 # Write some data. 46 write_data(47 guide => $guide,48 node => "Crabtree Tavern",49 os_x => 523465,50 os_y => 177490,51 categories => "Pubs",52 );47 OpenGuides::Test->write_data( 48 guide => $guide, 49 node => "Crabtree Tavern", 50 os_x => 523465, 51 os_y => 177490, 52 categories => "Pubs", 53 ); 53 54 54 write_data(55 guide => $guide,56 node => "Blue Anchor",57 os_x => 522909,58 os_y => 178232,59 categories => "Pubs",60 );55 OpenGuides::Test->write_data( 56 guide => $guide, 57 node => "Blue Anchor", 58 os_x => 522909, 59 os_y => 178232, 60 categories => "Pubs", 61 ); 61 62 62 write_data(63 guide => $guide,64 node => "Star Tavern",65 os_x => 528107,66 os_y => 179347,67 categories => "Pubs",68 );63 OpenGuides::Test->write_data( 64 guide => $guide, 65 node => "Star Tavern", 66 os_x => 528107, 67 os_y => 179347, 68 categories => "Pubs", 69 ); 69 70 70 write_data(71 guide => $guide,72 node => "Hammersmith Bridge",73 os_x => 522983,74 os_y => 178118,75 );71 OpenGuides::Test->write_data( 72 guide => $guide, 73 node => "Hammersmith Bridge", 74 os_x => 522983, 75 os_y => 178118, 76 ); 76 77 77 78 # Sanity check. … … 179 180 is_deeply( \@found, [ "Blue Anchor", "Crabtree Tavern", ], 180 181 "...works with OS co-ords too" ); 181 182 183 sub write_data {184 my %args = @_;185 186 # Set up CGI parameters ready for a node write.187 # Most of these are in here to avoid uninitialised value warnings.188 my $q = CGI->new( "" );189 $q->param( -name => "content", -value => "foo" );190 $q->param( -name => "categories", -value => $args{categories} || "" );191 $q->param( -name => "locales", -value => "" );192 $q->param( -name => "phone", -value => "" );193 $q->param( -name => "fax", -value => "" );194 $q->param( -name => "website", -value => "" );195 $q->param( -name => "hours_text", -value => "" );196 $q->param( -name => "address", -value => "" );197 $q->param( -name => "postcode", -value => "" );198 $q->param( -name => "map_link", -value => "" );199 $q->param( -name => "os_x", -value => $args{os_x} );200 $q->param( -name => "os_y", -value => $args{os_y} );201 $q->param( -name => "username", -value => "Kake" );202 $q->param( -name => "comment", -value => "foo" );203 $q->param( -name => "edit_type", -value => "Normal edit" );204 $ENV{REMOTE_ADDR} = "127.0.0.1";205 206 $args{guide}->commit_node(207 return_output => 1,208 id => $args{node},209 cgi_obj => $q,210 );211 } -
trunk/t/33_supersearch_advanced_search_utm.t
r559 r562 3 3 use Config::Tiny; 4 4 use OpenGuides::SuperSearch; 5 use OpenGuides::Test; 5 6 use Test::More; 6 7 … … 44 45 45 46 # Write some data. 46 write_data(47 guide => $guide,48 node => "Crabtree Tavern",49 latitude => 51.482385,50 longitude => -0.221743,51 categories => "Pubs",52 );47 OpenGuides::Test->write_data( 48 guide => $guide, 49 node => "Crabtree Tavern", 50 latitude => 51.482385, 51 longitude => -0.221743, 52 categories => "Pubs", 53 ); 53 54 54 write_data(55 guide => $guide,56 node => "Blue Anchor",57 latitude => 51.489176,58 longitude => -0.229488,59 categories => "Pubs",60 );55 OpenGuides::Test->write_data( 56 guide => $guide, 57 node => "Blue Anchor", 58 latitude => 51.489176, 59 longitude => -0.229488, 60 categories => "Pubs", 61 ); 61 62 62 write_data(63 guide => $guide,64 node => "Star Tavern",65 latitude => 51.498043,66 longitude => -0.154247,67 categories => "Pubs",68 );63 OpenGuides::Test->write_data( 64 guide => $guide, 65 node => "Star Tavern", 66 latitude => 51.498043, 67 longitude => -0.154247, 68 categories => "Pubs", 69 ); 69 70 70 write_data(71 guide => $guide,72 node => "Hammersmith Bridge",73 latitude => 51.488135,74 longitude => -0.228463,75 );71 OpenGuides::Test->write_data( 72 guide => $guide, 73 node => "Hammersmith Bridge", 74 latitude => 51.488135, 75 longitude => -0.228463, 76 ); 76 77 77 78 # Sanity check. … … 129 130 is_deeply( \@found, [ "Blue Anchor", "Crabtree Tavern", ], 130 131 "distance search in combination with text search works" ); 131 132 133 sub write_data {134 my %args = @_;135 136 # Set up CGI parameters ready for a node write.137 # Most of these are in here to avoid uninitialised value warnings.138 my $q = CGI->new( "" );139 $q->param( -name => "content", -value => "foo" );140 $q->param( -name => "categories", -value => $args{categories} || "" );141 $q->param( -name => "locales", -value => "" );142 $q->param( -name => "phone", -value => "" );143 $q->param( -name => "fax", -value => "" );144 $q->param( -name => "website", -value => "" );145 $q->param( -name => "hours_text", -value => "" );146 $q->param( -name => "address", -value => "" );147 $q->param( -name => "postcode", -value => "" );148 $q->param( -name => "map