Tests for QgsHistoryEntry::isValid()

nyalldawson · nyalldawson · commit eb33b2e684bd · 2023-04-22T20:55:59.000+10:00
diff --git a/src/gui/history/qgshistoryentry.cpp b/src/gui/history/qgshistoryentry.cpp
@@ -33,5 +33,5 @@ QgsHistoryEntry::QgsHistoryEntry( const QVariantMap &entry )
 
 bool QgsHistoryEntry::isValid() const
 {
-  return !providerId.isEmpty();
+  return !providerId.isEmpty() || !entry.isEmpty() || timestamp.isValid();
 }
diff --git a/tests/src/python/test_qgshistoryproviderregistry.py b/tests/src/python/test_qgshistoryproviderregistry.py
@@ -41,14 +41,21 @@ def test_entry(self):
         """
         Test QgsHistoryEntry
         """
+        entry = QgsHistoryEntry()
+        self.assertFalse(entry.isValid())
+
         entry = QgsHistoryEntry('my provider', QDateTime(2021, 1, 2, 3, 4, 5), {'somevar': 5})
+        self.assertTrue(entry.isValid())
+
         self.assertEqual(entry.providerId, 'my provider')
         self.assertEqual(entry.timestamp, QDateTime(2021, 1, 2, 3, 4, 5))
         self.assertEqual(entry.entry, {'somevar': 5})
 
         self.assertEqual(str(entry), '<QgsHistoryEntry: my provider 2021-01-02T03:04:05>')
 
         entry = QgsHistoryEntry({'somevar': 7})
+        self.assertTrue(entry.isValid())
+
         self.assertFalse(entry.providerId)
         self.assertEqual(entry.timestamp.date(), QDateTime.currentDateTime().date())
         self.assertEqual(entry.entry, {'somevar': 7})

Original file line number	Diff line number	Diff line change
`@@ -33,5 +33,5 @@ QgsHistoryEntry::QgsHistoryEntry( const QVariantMap &entry )`
`33`	`33`
`34`	`34`	`bool QgsHistoryEntry::isValid() const`
`35`	`35`	`{`
`36`		`- return !providerId.isEmpty();`
	`36`	`+ return !providerId.isEmpty() \|\| !entry.isEmpty() \|\| timestamp.isValid();`
`37`	`37`	`}`