@@ -353,20 +353,16 @@ fn test_within_city() {
353353
354354 // Make sure the first is what we expect it to be
355355 let item = iter. next ( ) . unwrap ( ) . unwrap ( ) ;
356- assert_eq ! (
357- item. ip_net,
358- IpNetwork :: V4 ( "2.125.160.216/29" . parse( ) . unwrap( ) )
359- ) ;
360- assert_eq ! ( item. info. continent. unwrap( ) . code, Some ( "EU" ) ) ;
361- assert_eq ! ( item. info. country. unwrap( ) . iso_code, Some ( "GB" ) ) ;
356+ assert_eq ! ( item. ip_net, IpNetwork :: V4 ( "2.2.3.0/24" . parse( ) . unwrap( ) ) ) ;
357+ assert_eq ! ( item. info. city. unwrap( ) . geoname_id, Some ( 2655045 ) ) ;
362358
363359 let mut n = 1 ;
364360 while let Some ( _) = iter. next ( ) {
365361 n += 1 ;
366362 }
367363
368364 // Make sure we had the expected number
369- assert_eq ! ( n, 273 ) ;
365+ assert_eq ! ( n, 243 ) ;
370366
371367 // A second run through this time a specific network
372368 let specific = IpNetwork :: V4 ( "81.2.69.0/24" . parse ( ) . unwrap ( ) ) ;
@@ -386,26 +382,6 @@ fn test_within_city() {
386382 }
387383}
388384
389- #[ test]
390- fn test_within_broken_database ( ) {
391- use super :: geoip2:: City ;
392- use ipnetwork:: IpNetwork ;
393-
394- let r = Reader :: open_readfile ( "test-data/test-data/GeoIP2-City-Test-Broken-Double-Format.mmdb" )
395- . ok ( )
396- . unwrap ( ) ;
397-
398- let ip_net = IpNetwork :: V6 ( "::/0" . parse ( ) . unwrap ( ) ) ;
399- let mut iter = r. within :: < City > ( ip_net) . unwrap ( ) ;
400- match iter. next ( ) . unwrap ( ) {
401- Err ( e) => assert_eq ! (
402- e,
403- MaxMindDBError :: InvalidDatabaseError ( "double of size 7" . to_string( ) )
404- ) ,
405- Ok ( _) => panic ! ( "Error expected" ) ,
406- } ;
407- }
408-
409385fn check_metadata < T : AsRef < [ u8 ] > > ( reader : & Reader < T > , ip_version : usize , record_size : usize ) {
410386 let metadata = & reader. metadata ;
411387
0 commit comments