sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

more tests for #1859, and make note of bug #1873

Browse source
This commit is contained in:
Dane Springmeyer 2013-05-29 13:27:47 -07:00
parent 1b9c4a63af
commit 080f500af3
1 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
tests/python_tests/filter_test.py
View file

@ -286,8 +286,8 @@ truthyness = [
[0.0,False,float], [0.0,False,float],
[123.123,True,float], [123.123,True,float],
[.1,True,float], [.1,True,float],
[False,False,int], # TODO - should become bool [False,False,int], # TODO - should become bool: https://github.com/mapnik/mapnik/issues/1873
[True,True,int], # TODO - should become bool [True,True,int], # TODO - should become bool: https://github.com/mapnik/mapnik/issues/1873
[None,False,None], [None,False,None],
[2147483648,True,int], [2147483648,True,int],
[922337203685477580,True,int] [922337203685477580,True,int]
@ -357,7 +357,21 @@ def test_filtering_nulls_and_empty_strings():
eq_(mapnik.Expression("[prop4] = ''").to_bool(f),False) eq_(mapnik.Expression("[prop4] = ''").to_bool(f),False)
eq_(mapnik.Expression("[prop4] != null or [prop4] != ''").to_bool(f),True) eq_(mapnik.Expression("[prop4] != null or [prop4] != ''").to_bool(f),True)
eq_(mapnik.Expression("[prop4] != null and [prop4] != ''").to_bool(f),False) eq_(mapnik.Expression("[prop4] != null and [prop4] != ''").to_bool(f),False)
f["prop5"] = False
eq_(f["prop5"],False)
eq_(mapnik.Expression("[prop5]").to_bool(f),False)
eq_(mapnik.Expression("! [prop5]").to_bool(f),True)
eq_(mapnik.Expression("[prop5] != null").to_bool(f),True)
eq_(mapnik.Expression("[prop5] = null").to_bool(f),False)
eq_(mapnik.Expression("[prop5] != ''").to_bool(f),True)
eq_(mapnik.Expression("[prop5] = ''").to_bool(f),False)
eq_(mapnik.Expression("[prop5] != null or [prop5] != ''").to_bool(f),True)
eq_(mapnik.Expression("[prop5] != null and [prop5] != ''").to_bool(f),True)
# note, we need to do [prop5] != 0 here instead of false due to this bug:
# https://github.com/mapnik/mapnik/issues/1873
eq_(mapnik.Expression("[prop5] != null and [prop5] != '' and [prop5] != 0").to_bool(f),False)
if __name__ == "__main__": if __name__ == "__main__":
[eval(run)() for run in dir() if 'test_' in run] test_filtering_nulls_and_empty_strings()
#[eval(run)() for run in dir() if 'test_' in run]