Skip to content

Commit 1a64822

Browse files
committedDec 20, 2016
Improve some asserts for more meaningful output in case of error
1 parent 2f0f6a9 commit 1a64822

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed
 

‎tests/src/python/test_qgscolorschemeregistry.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,45 +28,45 @@ def testCreateInstance(self):
2828
def testInstanceHasDefaultScheme(self):
2929
"""Test global color scheme registry has default schemes"""
3030
registry = QgsColorSchemeRegistry.instance()
31-
self.assertTrue(len(registry.schemes()) > 0)
31+
self.assertGreater(len(registry.schemes()), 0)
3232

3333
def testCreateEmpty(self):
3434
"""Test creating an empty color scheme registry"""
3535
registry = QgsColorSchemeRegistry()
36-
self.assertTrue(len(registry.schemes()) == 0)
36+
self.assertGreater(len(registry.schemes()), 0)
3737

3838
def testAddScheme(self):
3939
"""Test adding a scheme to a registry"""
4040
registry = QgsColorSchemeRegistry()
41-
self.assertTrue(len(registry.schemes()) == 0)
41+
self.assertEqual(len(registry.schemes()), 0)
4242
recentScheme = QgsRecentColorScheme()
4343
registry.addColorScheme(recentScheme)
44-
self.assertTrue(len(registry.schemes()) == 1)
44+
self.assertEqual(len(registry.schemes()), 1)
4545

4646
def testAddDefaultScheme(self):
4747
"""Test adding default schemes to a registry"""
4848
registry = QgsColorSchemeRegistry()
49-
self.assertTrue(len(registry.schemes()) == 0)
49+
self.assertEqual(len(registry.schemes()), 0)
5050
registry.addDefaultSchemes()
51-
self.assertTrue(len(registry.schemes()) > 0)
51+
self.assertGreater(len(registry.schemes()), 0)
5252

5353
def testPopulateFromInstance(self):
5454
"""Test adding schemes from global instance"""
5555
registry = QgsColorSchemeRegistry()
56-
self.assertTrue(len(registry.schemes()) == 0)
56+
self.assertEqual(len(registry.schemes()), 0)
5757
registry.populateFromInstance()
5858
self.assertEqual(len(registry.schemes()), len(QgsColorSchemeRegistry.instance().schemes()))
5959

6060
def testRemoveScheme(self):
6161
"""Test removing a scheme from a registry"""
6262
registry = QgsColorSchemeRegistry()
63-
self.assertTrue(len(registry.schemes()) == 0)
63+
self.assertEqual(len(registry.schemes()), 0)
6464
recentScheme = QgsRecentColorScheme()
6565
registry.addColorScheme(recentScheme)
66-
self.assertTrue(len(registry.schemes()) == 1)
66+
self.assertEqual(len(registry.schemes()), 1)
6767
# remove the scheme
6868
registry.removeColorScheme(recentScheme)
69-
self.assertTrue(len(registry.schemes()) == 0)
69+
self.assertEqual(len(registry.schemes()), 0)
7070
# try removing a scheme not in the registry
7171
self.assertFalse(registry.removeColorScheme(recentScheme))
7272

‎tests/src/python/test_qgsexpression.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ def tearDown(self):
6060
def testCanBeRegistered(self):
6161
QgsExpression.registerFunction(self.testfun)
6262
index = QgsExpression.functionIndex('testfun')
63-
self.assertTrue(not index == -1)
63+
self.assertNotEqual(index, -1)
6464

6565
def testAutoCountsCorrectArgs(self):
6666
function = self.autocount
@@ -81,11 +81,11 @@ def testAutoArgsAreExpanded(self):
8181
def testCanUnregisterFunction(self):
8282
QgsExpression.registerFunction(self.testfun)
8383
index = QgsExpression.functionIndex('testfun')
84-
self.assertTrue(not index == -1)
84+
self.assertNotEqual(index, -1)
8585
error = QgsExpression.unregisterFunction('testfun')
8686
self.assertTrue(error)
8787
index = QgsExpression.functionIndex('testfun')
88-
self.assertTrue(index == -1)
88+
self.assertEqual(index, -1)
8989

9090
def testCanEvaluateFunction(self):
9191
QgsExpression.registerFunction(self.testfun)

0 commit comments

Comments
 (0)
Please sign in to comment.