From aa3dded49e964779345d16c41a5f1195797b2ef1 Mon Sep 17 00:00:00 2001 From: Stefan Wehrmeyer Date: Wed, 18 Dec 2013 11:33:45 +0100 Subject: [PATCH] Put actual unicode character into test data --- test/sample_data.py | 16 ++++++++++------ test/test_persistence.py | 10 +++++----- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/test/sample_data.py b/test/sample_data.py index defa3f0..d79d4c8 100644 --- a/test/sample_data.py +++ b/test/sample_data.py @@ -1,34 +1,38 @@ +# -*- encoding: utf-8 -*- from datetime import datetime +TEST_CITY_1 = u'B€rkeley' +TEST_CITY_2 = u'G€lway' + TEST_DATA = [ { 'date': datetime(2011, 1, 1), 'temperature': 1, - 'place': 'Galway' + 'place': TEST_CITY_2 }, { 'date': datetime(2011, 1, 2), 'temperature': -1, - 'place': 'Galway' + 'place': TEST_CITY_2 }, { 'date': datetime(2011, 1, 3), 'temperature': 0, - 'place': 'Galway' + 'place': TEST_CITY_2 }, { 'date': datetime(2011, 1, 1), 'temperature': 6, - 'place': 'Berkeley' + 'place': TEST_CITY_1 }, { 'date': datetime(2011, 1, 2), 'temperature': 8, - 'place': 'Berkeley' + 'place': TEST_CITY_1 }, { 'date': datetime(2011, 1, 3), 'temperature': 5, - 'place': 'Berkeley' + 'place': TEST_CITY_1 } ] diff --git a/test/test_persistence.py b/test/test_persistence.py index 18dc714..20d18ba 100644 --- a/test/test_persistence.py +++ b/test/test_persistence.py @@ -4,7 +4,7 @@ from datetime import datetime from dataset import connect from dataset.util import DatasetException -from sample_data import TEST_DATA +from sample_data import TEST_DATA, TEST_CITY_1 from sqlalchemy.exc import IntegrityError @@ -185,9 +185,9 @@ class TableTestCase(unittest.TestCase): assert d is None, d def test_find(self): - ds = list(self.tbl.find(place='Berkeley')) + ds = list(self.tbl.find(place=TEST_CITY_1)) assert len(ds) == 3, ds - ds = list(self.tbl.find(place='Berkeley', _limit=2)) + ds = list(self.tbl.find(place=TEST_CITY_1, _limit=2)) assert len(ds) == 2, ds def test_distinct(self): @@ -229,11 +229,11 @@ class TableTestCase(unittest.TestCase): res = self.tbl.update({ 'date': date, 'temperature': -10, - 'place': 'Berkeley'}, + 'place': TEST_CITY_1}, ['place', 'date'] ) assert res, 'update should return True' - m = self.tbl.find_one(place='Berkeley', date=date) + m = self.tbl.find_one(place=TEST_CITY_1, date=date) assert m['temperature'] == -10, 'new temp. should be -10 but is %d' % m['temperature'] def test_create_column(self):