More test updates

qgis · May 14, 2020 · 8db6179 · 8db6179
1 parent de2550f
commit 8db6179
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 13 deletions.
diff --git a/tests/src/python/featuresourcetestbase.py b/tests/src/python/featuresourcetestbase.py
@@ -42,6 +42,12 @@ class FeatureSourceTestCase(object):
 
     '''
 
+    def enable_datetime_checks(self):
+        return True
+
+    def enable_time_checks(self):
+        return True
+
     def testCrs(self):
         self.assertEqual(self.source.sourceCrs().authid(), 'EPSG:4326')
 
@@ -289,13 +295,16 @@ def runGetFeatureTests(self, source):
                           [1, 2])
 
         # datetime
-        self.assert_query(source, '"dt" <= make_datetime(2020, 5, 4, 12, 13, 14)', [1, 5])
-        self.assert_query(source, '"dt" < make_date(2020, 5, 4)', [1])
+        if self.enable_datetime_checks():
+            self.assert_query(source, '"dt" <= make_datetime(2020, 5, 4, 12, 13, 14)', [1, 5])
+            self.assert_query(source, '"dt" < make_date(2020, 5, 4)', [1])
         self.assert_query(source, '"date" <= make_datetime(2020, 5, 4, 12, 13, 14)', [1, 2, 5])
         self.assert_query(source, '"date" >= make_date(2020, 5, 4)', [2, 4])
-        self.assert_query(source, '"time" >= make_time(12, 14, 14)', [2, 4])
-        self.assert_query(source, '"dt" + make_interval(days:=1) <= make_datetime(2020, 5, 4, 12, 13, 14)', [1])
-        self.assert_query(source, '"dt" + make_interval(days:=0.01) <= make_datetime(2020, 5, 4, 12, 13, 14)', [1, 5])
+        if self.enable_time_checks():
+            self.assert_query(source, '"time" >= make_time(12, 14, 14)', [2, 4])
+        if self.enable_datetime_checks():
+            self.assert_query(source, '"dt" + make_interval(days:=1) <= make_datetime(2020, 5, 4, 12, 13, 14)', [1])
+            self.assert_query(source, '"dt" + make_interval(days:=0.01) <= make_datetime(2020, 5, 4, 12, 13, 14)', [1, 5])
 
         # combination of an uncompilable expression and limit
 
@@ -769,26 +778,32 @@ def testUniqueValues(self):
         assert set(['Apple', 'Honey', 'Orange', 'Pear', NULL]) == set(
             self.source.uniqueValues(self.source.fields().lookupField('name'))), 'Got {}'.format(
             set(self.source.uniqueValues(self.source.fields().lookupField('name'))))
-        self.assertEqual(set(self.source.uniqueValues(self.source.fields().lookupField('dt'))),
-                         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]))
+        if self.enable_datetime_checks():
+            self.assertEqual(set(self.source.uniqueValues(self.source.fields().lookupField('dt'))),
+                             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]))
         self.assertEqual(set(self.source.uniqueValues(self.source.fields().lookupField('date'))),
                          set([QDate(2020, 5, 3), QDate(2020, 5, 4), QDate(2021, 5, 4), QDate(2020, 5, 2), NULL]))
-        self.assertEqual(set(self.source.uniqueValues(self.source.fields().lookupField('time'))),
-                         set([QTime(12, 14, 14), QTime(13, 13, 14), QTime(12, 13, 14), QTime(12, 13, 1), NULL]))
+        if self.enable_time_checks():
+            self.assertEqual(set(self.source.uniqueValues(self.source.fields().lookupField('time'))),
+                             set([QTime(12, 14, 14), QTime(13, 13, 14), QTime(12, 13, 14), QTime(12, 13, 1), NULL]))
 
     def testMinimumValue(self):
         self.assertEqual(self.source.minimumValue(self.source.fields().lookupField('cnt')), -200)
         self.assertEqual(self.source.minimumValue(self.source.fields().lookupField('name')), 'Apple')
-        self.assertEqual(self.source.minimumValue(self.source.fields().lookupField('dt')), QDateTime(QDate(2020, 5, 3), QTime(12, 13, 14)))
+        if self.enable_datetime_checks():
+            self.assertEqual(self.source.minimumValue(self.source.fields().lookupField('dt')), QDateTime(QDate(2020, 5, 3), QTime(12, 13, 14)))
         self.assertEqual(self.source.minimumValue(self.source.fields().lookupField('date')), QDate(2020, 5, 2))
-        self.assertEqual(self.source.minimumValue(self.source.fields().lookupField('time')), QTime(12, 13, 1))
+        if self.enable_time_checks():
+            self.assertEqual(self.source.minimumValue(self.source.fields().lookupField('time')), QTime(12, 13, 1))
 
     def testMaximumValue(self):
         self.assertEqual(self.source.maximumValue(self.source.fields().lookupField('cnt')), 400)
         self.assertEqual(self.source.maximumValue(self.source.fields().lookupField('name')), 'Pear')
-        self.assertEqual(self.source.maximumValue(self.source.fields().lookupField('dt')), QDateTime(QDate(2021, 5, 4), QTime(13, 13, 14)))
+        if self.enable_datetime_checks():
+            self.assertEqual(self.source.maximumValue(self.source.fields().lookupField('dt')), QDateTime(QDate(2021, 5, 4), QTime(13, 13, 14)))
         self.assertEqual(self.source.maximumValue(self.source.fields().lookupField('date')), QDate(2021, 5, 4))
-        self.assertEqual(self.source.maximumValue(self.source.fields().lookupField('time')), QTime(13, 13, 14))
+        if self.enable_time_checks():
+            self.assertEqual(self.source.maximumValue(self.source.fields().lookupField('time')), QTime(13, 13, 14))
 
     def testAllFeatureIds(self):
         ids = set([f.id() for f in self.source.getFeatures()])

diff --git a/tests/src/python/test_qgsvectorlayer.py b/tests/src/python/test_qgsvectorlayer.py
@@ -205,6 +205,12 @@ def setUpClass(cls):
         # Create test layer for FeatureSourceTestCase
         cls.source = cls.getSource()
 
+    def enable_datetime_checks(self):
+        return False
+
+    def enable_time_checks(self):
+        return False
+
 
 class TestQgsVectorLayer(unittest.TestCase, FeatureSourceTestCase):
 

diff --git a/tests/testdata/provider/shapefile.dbf b/tests/testdata/provider/shapefile.dbf