Some general test improvements

m-kuhn · m-kuhn · commit e3e5487f8361 · 2016-04-14T12:15:12.000+02:00
diff --git a/tests/src/python/test_qgsblendmodes.py b/tests/src/python/test_qgsblendmodes.py
@@ -44,8 +44,7 @@
 from qgis.testing.mocked import get_iface
 
 from utilities import unitTestDataPath
-# Convenience instances in case you may need them
-start_app()
+
 TEST_DATA_DIR = unitTestDataPath()
 
 
diff --git a/tests/src/python/test_qgssinglesymbolrenderer.py b/tests/src/python/test_qgssinglesymbolrenderer.py
@@ -37,13 +37,10 @@
                        QgsFillSymbolV2,
                        QgsFeatureRequest
                        )
-from qgis.testing import start_app, unittest
+from qgis.testing import unittest
 from qgis.testing.mocked import get_iface
 from utilities import unitTestDataPath
 
-# Convenience instances in case you may need them
-# not used in this test
-start_app()
 TEST_DATA_DIR = unitTestDataPath()
 
 
@@ -68,9 +65,6 @@ def setUp(self):
         self.mapsettings.setExtent(QgsRectangle(-163, 22, -70, 52))
         self.mapsettings.setLayers(rendered_layers)
 
-    def tearDown(self):
-        QgsMapLayerRegistry.instance().removeAllMapLayers()
-
     def testOrderBy(self):
         self.renderer.setOrderBy(QgsFeatureRequest.OrderBy([QgsFeatureRequest.OrderByClause('Value', False)]))
         self.renderer.setOrderByEnabled(True)
@@ -79,12 +73,11 @@ def testOrderBy(self):
         renderchecker = QgsMultiRenderChecker()
         renderchecker.setMapSettings(self.mapsettings)
         renderchecker.setControlName('expected_singlesymbol_orderby')
-        result = renderchecker.runTest('singlesymbol_orderby')
-        assert result
+        self.assertTrue(renderchecker.runTest('singlesymbol_orderby'))
 
         # disable order by and retest
         self.renderer.setOrderByEnabled(False)
-        result = renderchecker.runTest('single')
+        self.assertTrue(renderchecker.runTest('single'))
 
 
 if __name__ == '__main__':
