From 983cc3c0ec3668a473c3b8b3e8a90aa2e25b6f27 Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Sun, 2 Jun 2013 13:44:58 -0700 Subject: [PATCH] fix postgis tests after null/empty string change - refs #1859 --- tests/python_tests/postgis_test.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/python_tests/postgis_test.py b/tests/python_tests/postgis_test.py index 37cf33f39..3da601afd 100644 --- a/tests/python_tests/postgis_test.py +++ b/tests/python_tests/postgis_test.py @@ -574,7 +574,8 @@ if 'postgis' in mapnik.DatasourceCache.plugin_names() \ eq_(mapnik.Expression("[name] = true").evaluate(feat),False) eq_(mapnik.Expression("[name] = false").evaluate(feat),False) eq_(mapnik.Expression("[name] != 'name'").evaluate(feat),True) - eq_(mapnik.Expression("[name] != ''").evaluate(feat),True) + # https://github.com/mapnik/mapnik/issues/1859 + eq_(mapnik.Expression("[name] != ''").evaluate(feat),False) eq_(mapnik.Expression("[name] != null").evaluate(feat),False) eq_(mapnik.Expression("[name] != true").evaluate(feat),True) eq_(mapnik.Expression("[name] != false").evaluate(feat),True) @@ -620,7 +621,8 @@ if 'postgis' in mapnik.DatasourceCache.plugin_names() \ eq_(mapnik.Expression("[bool_field] = true").evaluate(feat),False) eq_(mapnik.Expression("[bool_field] = false").evaluate(feat),False) eq_(mapnik.Expression("[bool_field] != 'name'").evaluate(feat),True) # in 2.1.x used to be False - eq_(mapnik.Expression("[bool_field] != ''").evaluate(feat),True) # in 2.1.x used to be False + # https://github.com/mapnik/mapnik/issues/1859 + eq_(mapnik.Expression("[bool_field] != ''").evaluate(feat),False) eq_(mapnik.Expression("[bool_field] != null").evaluate(feat),False) eq_(mapnik.Expression("[bool_field] != true").evaluate(feat),True) # in 2.1.x used to be False eq_(mapnik.Expression("[bool_field] != false").evaluate(feat),True) # in 2.1.x used to be False