@@ -39,6 +39,7 @@ def test_reader_inspect
3939 modes . each do |mode |
4040 filename = 'test/data/test-data/MaxMind-DB-test-ipv4-24.mmdb'
4141 reader = MaxMind ::DB . new ( filename , mode : mode )
42+
4243 assert_instance_of ( String , reader . inspect )
4344 end
4445 end
@@ -157,10 +158,11 @@ def test_decoder
157158 'test/data/test-data/MaxMind-DB-test-decoder.mmdb'
158159 )
159160 record = reader . get ( '::1.1.1.0' )
161+
160162 assert_equal ( [ 1 , 2 , 3 ] , record [ 'array' ] )
161- assert_equal ( true , record [ 'boolean' ] )
163+ assert ( record [ 'boolean' ] )
162164 assert_equal ( "\x00 \x00 \x00 *" . b , record [ 'bytes' ] )
163- assert_equal ( 42.123456 , record [ 'double' ] )
165+ assert_in_delta ( 42.123456 , record [ 'double' ] )
164166 assert_in_delta ( 1.1 , record [ 'float' ] )
165167 assert_equal ( -268_435_456 , record [ 'int32' ] )
166168 assert_equal (
@@ -184,6 +186,7 @@ def test_metadata_pointers
184186 reader = MaxMind ::DB . new (
185187 'test/data/test-data/MaxMind-DB-test-metadata-pointers.mmdb'
186188 )
189+
187190 assert_equal ( 'Lots of pointers in metadata' , reader . metadata . database_type )
188191 reader . close
189192 end
@@ -192,6 +195,7 @@ def test_no_ipv4_search_tree
192195 reader = MaxMind ::DB . new (
193196 'test/data/test-data/MaxMind-DB-no-ipv4-search-tree.mmdb'
194197 )
198+
195199 assert_equal ( '::0/64' , reader . get ( '1.1.1.1' ) )
196200 assert_equal ( '::0/64' , reader . get ( '192.1.1.1' ) )
197201 reader . close
@@ -244,15 +248,15 @@ def test_ip_validation
244248 e = assert_raises ArgumentError do
245249 reader . get ( 'not_ip' )
246250 end
247- assert ( e . message . include? ( 'invalid address' ) )
251+ assert_includes ( e . message , 'invalid address' )
248252 reader . close
249253 end
250254
251255 def test_missing_database
252256 e = assert_raises SystemCallError do
253257 MaxMind ::DB . new ( 'file-does-not-exist.mmdb' )
254258 end
255- assert ( e . message . include? ( 'No such file or directory' ) )
259+ assert_includes ( e . message , 'No such file or directory' )
256260 end
257261
258262 def test_nondatabase
@@ -269,14 +273,14 @@ def test_too_many_constructor_args
269273 e = assert_raises ArgumentError do
270274 MaxMind ::DB . new ( 'README.md' , { } , 'blah' )
271275 end
272- assert ( e . message . include? ( 'wrong number of arguments' ) )
276+ assert_includes ( e . message , 'wrong number of arguments' )
273277 end
274278
275279 def test_no_constructor_args
276280 e = assert_raises ArgumentError do
277281 MaxMind ::DB . new
278282 end
279- assert ( e . message . include? ( 'wrong number of arguments' ) )
283+ assert_includes ( e . message , 'wrong number of arguments' )
280284 end
281285
282286 def test_too_many_get_args
@@ -286,7 +290,7 @@ def test_too_many_get_args
286290 e = assert_raises ArgumentError do
287291 reader . get ( '1.1.1.1' , 'blah' )
288292 end
289- assert ( e . message . include? ( 'wrong number of arguments' ) )
293+ assert_includes ( e . message , 'wrong number of arguments' )
290294 reader . close
291295 end
292296
@@ -297,7 +301,7 @@ def test_no_get_args
297301 e = assert_raises ArgumentError do
298302 reader . get
299303 end
300- assert ( e . message . include? ( 'wrong number of arguments' ) )
304+ assert_includes ( e . message , 'wrong number of arguments' )
301305 reader . close
302306 end
303307
@@ -308,7 +312,7 @@ def test_metadata_args
308312 e = assert_raises ArgumentError do
309313 reader . metadata ( 'hi' )
310314 end
311- assert ( e . message . include? ( 'wrong number of arguments' ) )
315+ assert_includes ( e . message , 'wrong number of arguments' )
312316 reader . close
313317 end
314318
@@ -353,6 +357,7 @@ def test_closed_metadata
353357 'test/data/test-data/MaxMind-DB-test-decoder.mmdb'
354358 )
355359 reader . close
360+
356361 assert_equal (
357362 { 'en' => 'MaxMind DB Decoder Test database - contains every MaxMind DB data type' } ,
358363 reader . metadata . description ,
@@ -474,6 +479,7 @@ def check_metadata(reader, ip_version, record_size)
474479 def check_ipv4 ( reader , filename )
475480 6 . times do |i |
476481 address = "1.1.1.#{ 2 **i } "
482+
477483 assert_equal (
478484 { 'ip' => address } ,
479485 reader . get ( address ) ,
@@ -492,6 +498,7 @@ def check_ipv4(reader, filename)
492498 }
493499 pairs . each do |key_address , value_address |
494500 data = { 'ip' => value_address }
501+
495502 assert_equal (
496503 data ,
497504 reader . get ( key_address ) ,
@@ -511,6 +518,7 @@ def check_ipv6(reader, filename)
511518 subnets = [
512519 '::1:ffff:ffff' , '::2:0:0' , '::2:0:40' , '::2:0:50' , '::2:0:58' ,
513520 ]
521+
514522 subnets . each do |address |
515523 assert_equal (
516524 { 'ip' => address } ,
@@ -529,6 +537,7 @@ def check_ipv6(reader, filename)
529537 '::2:0:57' => '::2:0:50' ,
530538 '::2:0:59' => '::2:0:58' ,
531539 }
540+
532541 pairs . each do |key_address , value_address |
533542 assert_equal (
534543 { 'ip' => value_address } ,
0 commit comments