Skip to content

Commit 8db6179

Browse files
nyalldawsonnyalldawson
committedMay 14, 2020
More test updates
·
ltr-3_40final-3_14_0
1 parent de2550f commit 8db6179

File tree

3 files changed

+34
-13
lines changed

3 files changed

+34
-13
lines changed
 

‎tests/src/python/featuresourcetestbase.py

Lines changed: 28 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,12 @@ class FeatureSourceTestCase(object):
4242
4343
'''
4444

45+
def enable_datetime_checks(self):
46+
return True
47+
48+
def enable_time_checks(self):
49+
return True
50+
4551
def testCrs(self):
4652
self.assertEqual(self.source.sourceCrs().authid(), 'EPSG:4326')
4753

@@ -289,13 +295,16 @@ def runGetFeatureTests(self, source):
289295
[1, 2])
290296

291297
# datetime
292-
self.assert_query(source, '"dt" <= make_datetime(2020, 5, 4, 12, 13, 14)', [1, 5])
293-
self.assert_query(source, '"dt" < make_date(2020, 5, 4)', [1])
298+
if self.enable_datetime_checks():
299+
self.assert_query(source, '"dt" <= make_datetime(2020, 5, 4, 12, 13, 14)', [1, 5])
300+
self.assert_query(source, '"dt" < make_date(2020, 5, 4)', [1])
294301
self.assert_query(source, '"date" <= make_datetime(2020, 5, 4, 12, 13, 14)', [1, 2, 5])
295302
self.assert_query(source, '"date" >= make_date(2020, 5, 4)', [2, 4])
296-
self.assert_query(source, '"time" >= make_time(12, 14, 14)', [2, 4])
297-
self.assert_query(source, '"dt" + make_interval(days:=1) <= make_datetime(2020, 5, 4, 12, 13, 14)', [1])
298-
self.assert_query(source, '"dt" + make_interval(days:=0.01) <= make_datetime(2020, 5, 4, 12, 13, 14)', [1, 5])
303+
if self.enable_time_checks():
304+
self.assert_query(source, '"time" >= make_time(12, 14, 14)', [2, 4])
305+
if self.enable_datetime_checks():
306+
self.assert_query(source, '"dt" + make_interval(days:=1) <= make_datetime(2020, 5, 4, 12, 13, 14)', [1])
307+
self.assert_query(source, '"dt" + make_interval(days:=0.01) <= make_datetime(2020, 5, 4, 12, 13, 14)', [1, 5])
299308

300309
# combination of an uncompilable expression and limit
301310

@@ -769,26 +778,32 @@ def testUniqueValues(self):
769778
assert set(['Apple', 'Honey', 'Orange', 'Pear', NULL]) == set(
770779
self.source.uniqueValues(self.source.fields().lookupField('name'))), 'Got {}'.format(
771780
set(self.source.uniqueValues(self.source.fields().lookupField('name'))))
772-
self.assertEqual(set(self.source.uniqueValues(self.source.fields().lookupField('dt'))),
773-
set([QDateTime(2021, 5, 4, 13, 13, 14), QDateTime(2020, 5, 4, 12, 14, 14), QDateTime(2020, 5, 4, 12, 13, 14), QDateTime(2020, 5, 3, 12, 13, 14), NULL]))
781+
if self.enable_datetime_checks():
782+
self.assertEqual(set(self.source.uniqueValues(self.source.fields().lookupField('dt'))),
783+
set([QDateTime(2021, 5, 4, 13, 13, 14), QDateTime(2020, 5, 4, 12, 14, 14), QDateTime(2020, 5, 4, 12, 13, 14), QDateTime(2020, 5, 3, 12, 13, 14), NULL]))
774784
self.assertEqual(set(self.source.uniqueValues(self.source.fields().lookupField('date'))),
775785
set([QDate(2020, 5, 3), QDate(2020, 5, 4), QDate(2021, 5, 4), QDate(2020, 5, 2), NULL]))
776-
self.assertEqual(set(self.source.uniqueValues(self.source.fields().lookupField('time'))),
777-
set([QTime(12, 14, 14), QTime(13, 13, 14), QTime(12, 13, 14), QTime(12, 13, 1), NULL]))
786+
if self.enable_time_checks():
787+
self.assertEqual(set(self.source.uniqueValues(self.source.fields().lookupField('time'))),
788+
set([QTime(12, 14, 14), QTime(13, 13, 14), QTime(12, 13, 14), QTime(12, 13, 1), NULL]))
778789

779790
def testMinimumValue(self):
780791
self.assertEqual(self.source.minimumValue(self.source.fields().lookupField('cnt')), -200)
781792
self.assertEqual(self.source.minimumValue(self.source.fields().lookupField('name')), 'Apple')
782-
self.assertEqual(self.source.minimumValue(self.source.fields().lookupField('dt')), QDateTime(QDate(2020, 5, 3), QTime(12, 13, 14)))
793+
if self.enable_datetime_checks():
794+
self.assertEqual(self.source.minimumValue(self.source.fields().lookupField('dt')), QDateTime(QDate(2020, 5, 3), QTime(12, 13, 14)))
783795
self.assertEqual(self.source.minimumValue(self.source.fields().lookupField('date')), QDate(2020, 5, 2))
784-
self.assertEqual(self.source.minimumValue(self.source.fields().lookupField('time')), QTime(12, 13, 1))
796+
if self.enable_time_checks():
797+
self.assertEqual(self.source.minimumValue(self.source.fields().lookupField('time')), QTime(12, 13, 1))
785798

786799
def testMaximumValue(self):
787800
self.assertEqual(self.source.maximumValue(self.source.fields().lookupField('cnt')), 400)
788801
self.assertEqual(self.source.maximumValue(self.source.fields().lookupField('name')), 'Pear')
789-
self.assertEqual(self.source.maximumValue(self.source.fields().lookupField('dt')), QDateTime(QDate(2021, 5, 4), QTime(13, 13, 14)))
802+
if self.enable_datetime_checks():
803+
self.assertEqual(self.source.maximumValue(self.source.fields().lookupField('dt')), QDateTime(QDate(2021, 5, 4), QTime(13, 13, 14)))
790804
self.assertEqual(self.source.maximumValue(self.source.fields().lookupField('date')), QDate(2021, 5, 4))
791-
self.assertEqual(self.source.maximumValue(self.source.fields().lookupField('time')), QTime(13, 13, 14))
805+
if self.enable_time_checks():
806+
self.assertEqual(self.source.maximumValue(self.source.fields().lookupField('time')), QTime(13, 13, 14))
792807

793808
def testAllFeatureIds(self):
794809
ids = set([f.id() for f in self.source.getFeatures()])

‎tests/src/python/test_qgsvectorlayer.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,12 @@ def setUpClass(cls):
205205
# Create test layer for FeatureSourceTestCase
206206
cls.source = cls.getSource()
207207

208+
def enable_datetime_checks(self):
209+
return False
210+
211+
def enable_time_checks(self):
212+
return False
213+
208214

209215
class TestQgsVectorLayer(unittest.TestCase, FeatureSourceTestCase):
210216

‎tests/testdata/provider/shapefile.dbf

387 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)
Please sign in to comment.