mirror of
https://github.com/qgis/QGIS.git
synced 2025-04-13 00:03:09 -04:00
Replace calls to deprecated assertEquals method
This commit is contained in:
Matthias Kuhn
parent
4335a77b7b
commit
c1687abc80
@ -190,39 +190,39 @@ class ParameterFileTest(unittest.TestCase):
|
||||
def testSetValue(self):
|
||||
parameter = ParameterFile('myName', 'myDesc')
|
||||
self.assertTrue(parameter.setValue('myFile.png'))
|
||||
self.assertEquals(parameter.value, 'myFile.png')
|
||||
self.assertEqual(parameter.value, 'myFile.png')
|
||||
|
||||
def testOptional(self):
|
||||
optionalParameter = ParameterFile('myName', 'myDesc', optional=True)
|
||||
self.assertTrue(optionalParameter.setValue('myFile.png'))
|
||||
self.assertEquals(optionalParameter.value, 'myFile.png')
|
||||
self.assertEqual(optionalParameter.value, 'myFile.png')
|
||||
|
||||
self.assertTrue(optionalParameter.setValue(""))
|
||||
self.assertEquals(optionalParameter.value, '')
|
||||
self.assertEqual(optionalParameter.value, '')
|
||||
|
||||
self.assertTrue(optionalParameter.setValue(None))
|
||||
self.assertEquals(optionalParameter.value, None)
|
||||
self.assertEqual(optionalParameter.value, None)
|
||||
|
||||
requiredParameter = ParameterFile('myName', 'myDesc', optional=False)
|
||||
self.assertTrue(requiredParameter.setValue('myFile.png'))
|
||||
self.assertEquals(requiredParameter.value, 'myFile.png')
|
||||
self.assertEqual(requiredParameter.value, 'myFile.png')
|
||||
|
||||
self.assertFalse(requiredParameter.setValue(''))
|
||||
self.assertEquals(requiredParameter.value, 'myFile.png')
|
||||
self.assertEqual(requiredParameter.value, 'myFile.png')
|
||||
|
||||
self.assertFalse(requiredParameter.setValue(' '))
|
||||
self.assertEquals(requiredParameter.value, 'myFile.png')
|
||||
self.assertEqual(requiredParameter.value, 'myFile.png')
|
||||
|
||||
self.assertFalse(requiredParameter.setValue(None))
|
||||
self.assertEquals(requiredParameter.value, 'myFile.png')
|
||||
self.assertEqual(requiredParameter.value, 'myFile.png')
|
||||
|
||||
def testSetValueWithExtension(self):
|
||||
parameter = ParameterFile('myName', 'myDesc', ext="png")
|
||||
self.assertTrue(parameter.setValue('myFile.png'))
|
||||
self.assertEquals(parameter.value, 'myFile.png')
|
||||
self.assertEqual(parameter.value, 'myFile.png')
|
||||
|
||||
self.assertFalse(parameter.setValue('myFile.bmp'))
|
||||
self.assertEquals(parameter.value, 'myFile.png')
|
||||
self.assertEqual(parameter.value, 'myFile.png')
|
||||
|
||||
def testGetValueAsCommandLineParameter(self):
|
||||
parameter = ParameterFile('myName', 'myDesc')
|
||||
@ -237,13 +237,13 @@ class TestParameterFixedTable(unittest.TestCase):
|
||||
['a0', 'a1', 'a2'],
|
||||
['b0', 'b1', 'b2']
|
||||
]
|
||||
self.assertEquals(ParameterFixedTable.tableToString(table), 'a0,a1,a2,b0,b1,b2')
|
||||
self.assertEqual(ParameterFixedTable.tableToString(table), 'a0,a1,a2,b0,b1,b2')
|
||||
|
||||
table = [['a0']]
|
||||
self.assertEquals(ParameterFixedTable.tableToString(table), 'a0')
|
||||
self.assertEqual(ParameterFixedTable.tableToString(table), 'a0')
|
||||
|
||||
table = [[]]
|
||||
self.assertEquals(ParameterFixedTable.tableToString(table), '')
|
||||
self.assertEqual(ParameterFixedTable.tableToString(table), '')
|
||||
|
||||
def testSetStringValue(self):
|
||||
parameter = ParameterFixedTable('myName', 'myDesc')
|
||||
@ -345,7 +345,7 @@ class ParameterNumberTest(unittest.TestCase):
|
||||
def testSetValue(self):
|
||||
parameter = ParameterNumber('myName', 'myDescription')
|
||||
self.assertTrue(parameter.setValue(5))
|
||||
self.assertEquals(parameter.value, 5)
|
||||
self.assertEqual(parameter.value, 5)
|
||||
|
||||
def testSetValueOnlyValidNumbers(self):
|
||||
parameter = ParameterNumber('myName', 'myDescription')
|
||||
|
||||
@ -82,7 +82,7 @@ class TestCase(_TestCase):
|
||||
geom1 = feats[1].geometry().geometry().asWkt(precision)
|
||||
else:
|
||||
geom1 = None
|
||||
_TestCase.assertEquals(
|
||||
_TestCase.assertEqual(
|
||||
self,
|
||||
geom0,
|
||||
geom1,
|
||||
|
||||
@ -258,77 +258,77 @@ class ProviderTestCase(object):
|
||||
def runOrderByTests(self):
|
||||
request = QgsFeatureRequest().addOrderBy('cnt')
|
||||
values = [f['cnt'] for f in self.provider.getFeatures(request)]
|
||||
self.assertEquals(values, [-200, 100, 200, 300, 400])
|
||||
self.assertEqual(values, [-200, 100, 200, 300, 400])
|
||||
|
||||
request = QgsFeatureRequest().addOrderBy('cnt', False)
|
||||
values = [f['cnt'] for f in self.provider.getFeatures(request)]
|
||||
self.assertEquals(values, [400, 300, 200, 100, -200])
|
||||
self.assertEqual(values, [400, 300, 200, 100, -200])
|
||||
|
||||
request = QgsFeatureRequest().addOrderBy('name')
|
||||
values = [f['name'] for f in self.provider.getFeatures(request)]
|
||||
self.assertEquals(values, ['Apple', 'Honey', 'Orange', 'Pear', NULL])
|
||||
self.assertEqual(values, ['Apple', 'Honey', 'Orange', 'Pear', NULL])
|
||||
|
||||
request = QgsFeatureRequest().addOrderBy('name', True, True)
|
||||
values = [f['name'] for f in self.provider.getFeatures(request)]
|
||||
self.assertEquals(values, [NULL, 'Apple', 'Honey', 'Orange', 'Pear'])
|
||||
self.assertEqual(values, [NULL, 'Apple', 'Honey', 'Orange', 'Pear'])
|
||||
|
||||
request = QgsFeatureRequest().addOrderBy('name', False)
|
||||
values = [f['name'] for f in self.provider.getFeatures(request)]
|
||||
self.assertEquals(values, [NULL, 'Pear', 'Orange', 'Honey', 'Apple'])
|
||||
self.assertEqual(values, [NULL, 'Pear', 'Orange', 'Honey', 'Apple'])
|
||||
|
||||
request = QgsFeatureRequest().addOrderBy('name', False, False)
|
||||
values = [f['name'] for f in self.provider.getFeatures(request)]
|
||||
self.assertEquals(values, ['Pear', 'Orange', 'Honey', 'Apple', NULL])
|
||||
self.assertEqual(values, ['Pear', 'Orange', 'Honey', 'Apple', NULL])
|
||||
|
||||
# Case sensitivity
|
||||
request = QgsFeatureRequest().addOrderBy('name2')
|
||||
values = [f['name2'] for f in self.provider.getFeatures(request)]
|
||||
self.assertEquals(values, ['Apple', 'Honey', 'NuLl', 'oranGe', 'PEaR'])
|
||||
self.assertEqual(values, ['Apple', 'Honey', 'NuLl', 'oranGe', 'PEaR'])
|
||||
|
||||
# Combination with LIMIT
|
||||
request = QgsFeatureRequest().addOrderBy('pk', False).setLimit(2)
|
||||
values = [f['pk'] for f in self.provider.getFeatures(request)]
|
||||
self.assertEquals(values, [5, 4])
|
||||
self.assertEqual(values, [5, 4])
|
||||
|
||||
# A slightly more complex expression
|
||||
request = QgsFeatureRequest().addOrderBy('pk*2', False)
|
||||
values = [f['pk'] for f in self.provider.getFeatures(request)]
|
||||
self.assertEquals(values, [5, 4, 3, 2, 1])
|
||||
self.assertEqual(values, [5, 4, 3, 2, 1])
|
||||
|
||||
# Order reversing expression
|
||||
request = QgsFeatureRequest().addOrderBy('pk*-1', False)
|
||||
values = [f['pk'] for f in self.provider.getFeatures(request)]
|
||||
self.assertEquals(values, [1, 2, 3, 4, 5])
|
||||
self.assertEqual(values, [1, 2, 3, 4, 5])
|
||||
|
||||
# Type dependent expression
|
||||
request = QgsFeatureRequest().addOrderBy('num_char*2', False)
|
||||
values = [f['pk'] for f in self.provider.getFeatures(request)]
|
||||
self.assertEquals(values, [5, 4, 3, 2, 1])
|
||||
self.assertEqual(values, [5, 4, 3, 2, 1])
|
||||
|
||||
# Order by guaranteed to fail
|
||||
request = QgsFeatureRequest().addOrderBy('not a valid expression*', False)
|
||||
values = [f['pk'] for f in self.provider.getFeatures(request)]
|
||||
self.assertEquals(set(values), set([5, 4, 3, 2, 1]))
|
||||
self.assertEqual(set(values), set([5, 4, 3, 2, 1]))
|
||||
|
||||
# Multiple order bys and boolean
|
||||
request = QgsFeatureRequest().addOrderBy('pk > 2').addOrderBy('pk', False)
|
||||
values = [f['pk'] for f in self.provider.getFeatures(request)]
|
||||
self.assertEquals(values, [2, 1, 5, 4, 3])
|
||||
self.assertEqual(values, [2, 1, 5, 4, 3])
|
||||
|
||||
# Multiple order bys, one bad, and a limit
|
||||
request = QgsFeatureRequest().addOrderBy('pk', False).addOrderBy('not a valid expression*', False).setLimit(2)
|
||||
values = [f['pk'] for f in self.provider.getFeatures(request)]
|
||||
self.assertEquals(values, [5, 4])
|
||||
self.assertEqual(values, [5, 4])
|
||||
|
||||
# Bad expression first
|
||||
request = QgsFeatureRequest().addOrderBy('not a valid expression*', False).addOrderBy('pk', False).setLimit(2)
|
||||
values = [f['pk'] for f in self.provider.getFeatures(request)]
|
||||
self.assertEquals(values, [5, 4])
|
||||
self.assertEqual(values, [5, 4])
|
||||
|
||||
# Combination with subset of attributes
|
||||
request = QgsFeatureRequest().addOrderBy('num_char', False).setSubsetOfAttributes(['pk'], self.vl.fields())
|
||||
values = [f['pk'] for f in self.vl.getFeatures(request)]
|
||||
self.assertEquals(values, [5, 4, 3, 2, 1])
|
||||
self.assertEqual(values, [5, 4, 3, 2, 1])
|
||||
|
||||
def testGetFeaturesFidTests(self):
|
||||
fids = [f.id() for f in self.provider.getFeatures()]
|
||||
|
||||
@ -121,8 +121,8 @@ class TestPyQgsShapefileProvider(unittest.TestCase, ProviderTestCase):
|
||||
|
||||
ids = [f.id() for f in vl.getFeatures(QgsFeatureRequest().setFilterExpression('pk=1'))]
|
||||
vl.setSelectedFeatures(ids)
|
||||
self.assertEquals(vl.selectedFeaturesIds(), ids)
|
||||
self.assertEquals(vl.pendingFeatureCount(), 5)
|
||||
self.assertEqual(vl.selectedFeaturesIds(), ids)
|
||||
self.assertEqual(vl.pendingFeatureCount(), 5)
|
||||
self.assertTrue(vl.startEditing())
|
||||
self.assertTrue(vl.deleteFeature(3))
|
||||
self.assertTrue(vl.commitChanges())
|
||||
|
||||
@ -352,9 +352,9 @@ class TestPyQgsWFSProvider(unittest.TestCase, ProviderTestCase):
|
||||
|
||||
vl = QgsVectorLayer(u"url='http://" + endpoint + u"' typename='my:typename' version='1.0.0'", u'test', u'WFS')
|
||||
assert vl.isValid()
|
||||
self.assertEquals(vl.wkbType(), QgsWKBTypes.Point)
|
||||
self.assertEquals(len(vl.fields()), 4)
|
||||
self.assertEquals(vl.featureCount(), 0)
|
||||
self.assertEqual(vl.wkbType(), QgsWKBTypes.Point)
|
||||
self.assertEqual(len(vl.fields()), 4)
|
||||
self.assertEqual(vl.featureCount(), 0)
|
||||
reference = QgsGeometry.fromRect(
|
||||
QgsRectangle(-71.123, 66.33, -65.32, 78.3))
|
||||
vl_extent = QgsGeometry.fromRect(vl.extent())
|
||||
@ -380,23 +380,23 @@ class TestPyQgsWFSProvider(unittest.TestCase, ProviderTestCase):
|
||||
</wfs:FeatureCollection>""")
|
||||
|
||||
values = [f['INTFIELD'] for f in vl.getFeatures()]
|
||||
self.assertEquals(values, [1])
|
||||
self.assertEqual(values, [1])
|
||||
|
||||
values = [f['GEOMETRY'] for f in vl.getFeatures()]
|
||||
self.assertEquals(values, [2])
|
||||
self.assertEqual(values, [2])
|
||||
|
||||
values = [f['longfield'] for f in vl.getFeatures()]
|
||||
self.assertEquals(values, [1234567890123])
|
||||
self.assertEqual(values, [1234567890123])
|
||||
|
||||
values = [f['stringfield'] for f in vl.getFeatures()]
|
||||
self.assertEquals(values, ['foo'])
|
||||
self.assertEqual(values, ['foo'])
|
||||
|
||||
got = [f.geometry() for f in vl.getFeatures()][0].geometry()
|
||||
self.assertEquals((got.x(), got.y()), (2.0, 49.0))
|
||||
self.assertEqual((got.x(), got.y()), (2.0, 49.0))
|
||||
|
||||
self.assertEquals(vl.featureCount(), 1)
|
||||
self.assertEqual(vl.featureCount(), 1)
|
||||
|
||||
self.assertEquals(vl.dataProvider().capabilities(), 0)
|
||||
self.assertEqual(vl.dataProvider().capabilities(), 0)
|
||||
|
||||
(ret, _) = vl.dataProvider().addFeatures([QgsFeature()])
|
||||
assert not ret
|
||||
@ -451,20 +451,20 @@ class TestPyQgsWFSProvider(unittest.TestCase, ProviderTestCase):
|
||||
vl = QgsVectorLayer(u"url='http://" + endpoint + u"' typename='my:typename' version='1.0.0'", u'test', u'WFS')
|
||||
assert vl.isValid()
|
||||
|
||||
self.assertEquals(vl.dataProvider().capabilities(),
|
||||
QgsVectorDataProvider.AddFeatures +
|
||||
QgsVectorDataProvider.ChangeAttributeValues +
|
||||
QgsVectorDataProvider.ChangeGeometries +
|
||||
QgsVectorDataProvider.DeleteFeatures)
|
||||
self.assertEqual(vl.dataProvider().capabilities(),
|
||||
QgsVectorDataProvider.AddFeatures +
|
||||
QgsVectorDataProvider.ChangeAttributeValues +
|
||||
QgsVectorDataProvider.ChangeGeometries +
|
||||
QgsVectorDataProvider.DeleteFeatures)
|
||||
|
||||
(ret, _) = vl.dataProvider().addFeatures([QgsFeature()])
|
||||
assert not ret
|
||||
|
||||
self.assertEquals(vl.featureCount(), 0)
|
||||
self.assertEqual(vl.featureCount(), 0)
|
||||
|
||||
assert not vl.dataProvider().deleteFeatures([0])
|
||||
|
||||
self.assertEquals(vl.featureCount(), 0)
|
||||
self.assertEqual(vl.featureCount(), 0)
|
||||
|
||||
assert not vl.dataProvider().changeGeometryValues({0: QgsGeometry.fromWkt('Point (3 50)')})
|
||||
|
||||
@ -490,21 +490,21 @@ class TestPyQgsWFSProvider(unittest.TestCase, ProviderTestCase):
|
||||
f.setGeometry(QgsGeometry.fromWkt('Point (2 49)'))
|
||||
(ret, fl) = vl.dataProvider().addFeatures([f])
|
||||
assert ret
|
||||
self.assertEquals(fl[0].id(), 1)
|
||||
self.assertEqual(fl[0].id(), 1)
|
||||
|
||||
self.assertEquals(vl.featureCount(), 1)
|
||||
self.assertEqual(vl.featureCount(), 1)
|
||||
|
||||
values = [f['intfield'] for f in vl.getFeatures()]
|
||||
self.assertEquals(values, [1])
|
||||
self.assertEqual(values, [1])
|
||||
|
||||
values = [f['longfield'] for f in vl.getFeatures()]
|
||||
self.assertEquals(values, [1234567890123])
|
||||
self.assertEqual(values, [1234567890123])
|
||||
|
||||
values = [f['stringfield'] for f in vl.getFeatures()]
|
||||
self.assertEquals(values, ['foo'])
|
||||
self.assertEqual(values, ['foo'])
|
||||
|
||||
got = [f.geometry() for f in vl.getFeatures()][0].geometry()
|
||||
self.assertEquals((got.x(), got.y()), (2.0, 49.0))
|
||||
self.assertEqual((got.x(), got.y()), (2.0, 49.0))
|
||||
|
||||
# Test changeGeometryValues
|
||||
with open(sanitize(endpoint, '?SERVICE=WFS&POSTDATA=<Transaction xmlns="http://www.opengis.net/wfs" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.0.0" service="WFS" xsi:schemaLocation="http://my http://fake_qgis_http_endpoint?REQUEST=DescribeFeatureType&VERSION=1.0.0&TYPENAME=my:typename" xmlns:my="http://my" xmlns:gml="http://www.opengis.net/gml"><Update xmlns="http://www.opengis.net/wfs" typeName="my:typename"><Property xmlns="http://www.opengis.net/wfs"><Name xmlns="http://www.opengis.net/wfs">geometryProperty</Name><Value xmlns="http://www.opengis.net/wfs"><gml:Point srsName="EPSG:4326"><gml:coordinates cs="," ts=" ">3,50</gml:coordinates></gml:Point></Value></Property><Filter xmlns="http://www.opengis.net/ogc"><FeatureId xmlns="http://www.opengis.net/ogc" fid="typename.1"/></Filter></Update></Transaction>'), 'wb') as f:
|
||||
@ -522,16 +522,16 @@ class TestPyQgsWFSProvider(unittest.TestCase, ProviderTestCase):
|
||||
assert ret
|
||||
|
||||
got = [f.geometry() for f in vl.getFeatures()][0].geometry()
|
||||
self.assertEquals((got.x(), got.y()), (3.0, 50.0))
|
||||
self.assertEqual((got.x(), got.y()), (3.0, 50.0))
|
||||
|
||||
values = [f['intfield'] for f in vl.getFeatures()]
|
||||
self.assertEquals(values, [1])
|
||||
self.assertEqual(values, [1])
|
||||
|
||||
values = [f['longfield'] for f in vl.getFeatures()]
|
||||
self.assertEquals(values, [1234567890123])
|
||||
self.assertEqual(values, [1234567890123])
|
||||
|
||||
values = [f['stringfield'] for f in vl.getFeatures()]
|
||||
self.assertEquals(values, ['foo'])
|
||||
self.assertEqual(values, ['foo'])
|
||||
|
||||
# Test changeAttributeValues
|
||||
with open(sanitize(endpoint, '?SERVICE=WFS&POSTDATA=<Transaction xmlns="http://www.opengis.net/wfs" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.0.0" service="WFS" xsi:schemaLocation="http://my http://fake_qgis_http_endpoint?REQUEST=DescribeFeatureType&VERSION=1.0.0&TYPENAME=my:typename" xmlns:my="http://my" xmlns:gml="http://www.opengis.net/gml"><Update xmlns="http://www.opengis.net/wfs" typeName="my:typename"><Property xmlns="http://www.opengis.net/wfs"><Name xmlns="http://www.opengis.net/wfs">intfield</Name><Value xmlns="http://www.opengis.net/wfs">2</Value></Property><Property xmlns="http://www.opengis.net/wfs"><Name xmlns="http://www.opengis.net/wfs">longfield</Name><Value xmlns="http://www.opengis.net/wfs">3</Value></Property><Property xmlns="http://www.opengis.net/wfs"><Name xmlns="http://www.opengis.net/wfs">stringfield</Name><Value xmlns="http://www.opengis.net/wfs">bar</Value></Property><Filter xmlns="http://www.opengis.net/ogc"><FeatureId xmlns="http://www.opengis.net/ogc" fid="typename.1"/></Filter></Update></Transaction>'), 'wb') as f:
|
||||
@ -547,16 +547,16 @@ class TestPyQgsWFSProvider(unittest.TestCase, ProviderTestCase):
|
||||
assert vl.dataProvider().changeAttributeValues({1: {0: 2, 1: 3, 2: "bar"}})
|
||||
|
||||
values = [f['intfield'] for f in vl.getFeatures()]
|
||||
self.assertEquals(values, [2])
|
||||
self.assertEqual(values, [2])
|
||||
|
||||
values = [f['longfield'] for f in vl.getFeatures()]
|
||||
self.assertEquals(values, [3])
|
||||
self.assertEqual(values, [3])
|
||||
|
||||
values = [f['stringfield'] for f in vl.getFeatures()]
|
||||
self.assertEquals(values, ['bar'])
|
||||
self.assertEqual(values, ['bar'])
|
||||
|
||||
got = [f.geometry() for f in vl.getFeatures()][0].geometry()
|
||||
self.assertEquals((got.x(), got.y()), (3.0, 50.0))
|
||||
self.assertEqual((got.x(), got.y()), (3.0, 50.0))
|
||||
|
||||
# Test deleteFeatures
|
||||
with open(sanitize(endpoint, '?SERVICE=WFS&POSTDATA=<Transaction xmlns="http://www.opengis.net/wfs" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.0.0" service="WFS" xsi:schemaLocation="http://my http://fake_qgis_http_endpoint?REQUEST=DescribeFeatureType&VERSION=1.0.0&TYPENAME=my:typename" xmlns:my="http://my" xmlns:gml="http://www.opengis.net/gml"><Delete xmlns="http://www.opengis.net/wfs" typeName="my:typename"><Filter xmlns="http://www.opengis.net/ogc"><FeatureId xmlns="http://www.opengis.net/ogc" fid="typename.1"/></Filter></Delete></Transaction>'), 'wb') as f:
|
||||
@ -571,7 +571,7 @@ class TestPyQgsWFSProvider(unittest.TestCase, ProviderTestCase):
|
||||
""")
|
||||
assert vl.dataProvider().deleteFeatures([1])
|
||||
|
||||
self.assertEquals(vl.featureCount(), 0)
|
||||
self.assertEqual(vl.featureCount(), 0)
|
||||
|
||||
def testWFS20Paging(self):
|
||||
"""Test WFS 2.0 paging"""
|
||||
@ -642,7 +642,7 @@ class TestPyQgsWFSProvider(unittest.TestCase, ProviderTestCase):
|
||||
# Create test layer
|
||||
vl = QgsVectorLayer(u"url='http://" + endpoint + u"' typename='my:typename'", u'test', u'WFS')
|
||||
assert vl.isValid()
|
||||
self.assertEquals(vl.wkbType(), QgsWKBTypes.Point)
|
||||
self.assertEqual(vl.wkbType(), QgsWKBTypes.Point)
|
||||
|
||||
with open(sanitize(endpoint, '?SERVICE=WFS&REQUEST=GetFeature&VERSION=2.0.0&TYPENAMES=my:typename&STARTINDEX=1&COUNT=1&SRSNAME=urn:ogc:def:crs:EPSG::4326'), 'wb') as f:
|
||||
f.write("""
|
||||
@ -667,7 +667,7 @@ class TestPyQgsWFSProvider(unittest.TestCase, ProviderTestCase):
|
||||
</wfs:FeatureCollection>""")
|
||||
|
||||
values = [f['id'] for f in vl.getFeatures()]
|
||||
self.assertEquals(values, [1, 2])
|
||||
self.assertEqual(values, [1, 2])
|
||||
|
||||
# Suppress GetFeature responses to demonstrate that the cache is used
|
||||
os.unlink(sanitize(endpoint, '?SERVICE=WFS&REQUEST=GetFeature&VERSION=2.0.0&TYPENAMES=my:typename&STARTINDEX=0&COUNT=1&SRSNAME=urn:ogc:def:crs:EPSG::4326'))
|
||||
@ -675,15 +675,15 @@ class TestPyQgsWFSProvider(unittest.TestCase, ProviderTestCase):
|
||||
os.unlink(sanitize(endpoint, '?SERVICE=WFS&REQUEST=GetFeature&VERSION=2.0.0&TYPENAMES=my:typename&STARTINDEX=2&COUNT=1&SRSNAME=urn:ogc:def:crs:EPSG::4326'))
|
||||
|
||||
values = [f['id'] for f in vl.getFeatures()]
|
||||
self.assertEquals(values, [1, 2])
|
||||
self.assertEqual(values, [1, 2])
|
||||
|
||||
# No need for hits since the download went to its end
|
||||
self.assertEquals(vl.featureCount(), 2)
|
||||
self.assertEqual(vl.featureCount(), 2)
|
||||
|
||||
vl.dataProvider().reloadData()
|
||||
|
||||
# Hits not working
|
||||
self.assertEquals(vl.featureCount(), 0)
|
||||
self.assertEqual(vl.featureCount(), 0)
|
||||
|
||||
vl.dataProvider().reloadData()
|
||||
|
||||
@ -695,7 +695,7 @@ class TestPyQgsWFSProvider(unittest.TestCase, ProviderTestCase):
|
||||
xmlns:my="http://my"
|
||||
numberMatched="2" numberReturned="0" timeStamp="2016-03-25T14:51:48.998Z">
|
||||
</wfs:FeatureCollection>""")
|
||||
self.assertEquals(vl.featureCount(), 2)
|
||||
self.assertEqual(vl.featureCount(), 2)
|
||||
|
||||
def testWFSGetOnlyFeaturesInViewExtent(self):
|
||||
"""Test 'get only features in view extent' """
|
||||
@ -751,7 +751,7 @@ class TestPyQgsWFSProvider(unittest.TestCase, ProviderTestCase):
|
||||
# Create test layer
|
||||
vl = QgsVectorLayer(u"url='http://" + endpoint + u"' typename='my:typename' retrictToRequestBBOX=1", u'test', u'WFS')
|
||||
assert vl.isValid()
|
||||
self.assertEquals(vl.wkbType(), QgsWKBTypes.Point)
|
||||
self.assertEqual(vl.wkbType(), QgsWKBTypes.Point)
|
||||
|
||||
last_url = sanitize(endpoint, '?SERVICE=WFS&REQUEST=GetFeature&VERSION=1.1.0&TYPENAME=my:typename&MAXFEATURES=2&SRSNAME=urn:ogc:def:crs:EPSG::4326&BBOX=60,-70,80,-60')
|
||||
with open(last_url, 'wb') as f:
|
||||
@ -771,7 +771,7 @@ class TestPyQgsWFSProvider(unittest.TestCase, ProviderTestCase):
|
||||
extent = QgsRectangle(-70, 60, -60, 80)
|
||||
request = QgsFeatureRequest().setFilterRect(extent)
|
||||
values = [f['id'] for f in vl.getFeatures(request)]
|
||||
self.assertEquals(values, [2])
|
||||
self.assertEqual(values, [2])
|
||||
|
||||
# To show that if we zoom-in, we won't issue a new request
|
||||
with open(last_url, 'wb') as f:
|
||||
@ -791,7 +791,7 @@ class TestPyQgsWFSProvider(unittest.TestCase, ProviderTestCase):
|
||||
extent = QgsRectangle(-66, 62, -62, 78)
|
||||
request = QgsFeatureRequest().setFilterRect(extent)
|
||||
values = [f['id'] for f in vl.getFeatures(request)]
|
||||
self.assertEquals(values, [2])
|
||||
self.assertEqual(values, [2])
|
||||
|
||||
# Move to a neighbouring area, and reach the download limit
|
||||
last_url = sanitize(endpoint, '?SERVICE=WFS&REQUEST=GetFeature&VERSION=1.1.0&TYPENAME=my:typename&MAXFEATURES=2&SRSNAME=urn:ogc:def:crs:EPSG::4326&BBOX=65,-70,90,-60')
|
||||
@ -816,7 +816,7 @@ class TestPyQgsWFSProvider(unittest.TestCase, ProviderTestCase):
|
||||
extent = QgsRectangle(-70, 65, -60, 90)
|
||||
request = QgsFeatureRequest().setFilterRect(extent)
|
||||
values = [f['id'] for f in vl.getFeatures(request)]
|
||||
self.assertEquals(values, [2, 3])
|
||||
self.assertEqual(values, [2, 3])
|
||||
|
||||
# Zoom-in again, and bring more features
|
||||
last_url = sanitize(endpoint, '?SERVICE=WFS&REQUEST=GetFeature&VERSION=1.1.0&TYPENAME=my:typename&MAXFEATURES=2&SRSNAME=urn:ogc:def:crs:EPSG::4326&BBOX=66,-69,89,-61')
|
||||
@ -841,7 +841,7 @@ class TestPyQgsWFSProvider(unittest.TestCase, ProviderTestCase):
|
||||
extent = QgsRectangle(-69, 66, -61, 89)
|
||||
request = QgsFeatureRequest().setFilterRect(extent)
|
||||
values = [f['id'] for f in vl.getFeatures(request)]
|
||||
self.assertEquals(values, [2, 3, 4])
|
||||
self.assertEqual(values, [2, 3, 4])
|
||||
|
||||
# Test RESULTTYPE=hits
|
||||
last_url = sanitize(endpoint, '?SERVICE=WFS&REQUEST=GetFeature&VERSION=1.1.0&TYPENAME=my:typename&RESULTTYPE=hits')
|
||||
@ -850,7 +850,7 @@ class TestPyQgsWFSProvider(unittest.TestCase, ProviderTestCase):
|
||||
<wfs:FeatureCollection xmlns:wfs="http://www.opengis.net/wfs"
|
||||
numberOfFeatures="10" timeStamp="2016-03-25T14:51:48.998Z"/>""")
|
||||
|
||||
self.assertEquals(vl.featureCount(), 10)
|
||||
self.assertEqual(vl.featureCount(), 10)
|
||||
|
||||
# Combine BBOX and FILTER
|
||||
last_url = sanitize(endpoint, """?SERVICE=WFS&REQUEST=GetFeature&VERSION=1.1.0&TYPENAME=my:typename&MAXFEATURES=2&SRSNAME=urn:ogc:def:crs:EPSG::4326&FILTER=<ogc:Filter xmlns:ogc="http://www.opengis.net/ogc" xmlns:gml="http://www.opengis.net/gml">
|
||||
@ -887,7 +887,7 @@ class TestPyQgsWFSProvider(unittest.TestCase, ProviderTestCase):
|
||||
extent = QgsRectangle(-69, 66, -61, 89)
|
||||
request = QgsFeatureRequest().setFilterRect(extent)
|
||||
values = [f['id'] for f in vl.getFeatures(request)]
|
||||
self.assertEquals(values, [101])
|
||||
self.assertEqual(values, [101])
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
|
||||
@ -51,7 +51,7 @@ class TestQgsLogger(unittest.TestCase):
|
||||
'This is critical\n']
|
||||
myMessage = ('Expected:\n---\n%s\n---\nGot:\n---\n%s\n---\n' %
|
||||
(myExpectedText, myText))
|
||||
self.assertEquals(myText, myExpectedText, myMessage)
|
||||
self.assertEqual(myText, myExpectedText, myMessage)
|
||||
finally:
|
||||
pass
|
||||
os.remove(myFilename)
|
||||
|
||||
@ -73,7 +73,7 @@ class TestQgsRasterLayer(unittest.TestCase):
|
||||
myValues = str(myIntValues)
|
||||
myExpectedValues = '[127, 141, 112, 72, 86, 126, 156, 211, 170]'
|
||||
myMessage = 'Expected: %s\nGot: %s' % (myValues, myExpectedValues)
|
||||
self.assertEquals(myValues, myExpectedValues, myMessage)
|
||||
self.assertEqual(myValues, myExpectedValues, myMessage)
|
||||
|
||||
def testTransparency(self):
|
||||
myPath = os.path.join(unitTestDataPath('raster'),
|
||||
|
||||
@ -163,7 +163,7 @@ class TestQgsRectangle(unittest.TestCase):
|
||||
myResult = rect1.toString()
|
||||
myMessage = ('Expected: %s\nGot: %s\n' %
|
||||
(myExpectedResult, myResult))
|
||||
self.assertEquals(myResult, myExpectedResult, myMessage)
|
||||
self.assertEqual(myResult, myExpectedResult, myMessage)
|
||||
|
||||
rect1 = QgsRectangle(0.0, 0.0, 5.0, 5.0)
|
||||
rect1.unionRect(rect2)
|
||||
|
||||
@ -98,9 +98,9 @@ class TestQgsRelationEditWidget(unittest.TestCase):
|
||||
"""
|
||||
self.createWrapper(self.vl_a, '"name"=\'Erich Gamma\'')
|
||||
|
||||
self.assertEquals(self.table_view.model().rowCount(), 1)
|
||||
self.assertEqual(self.table_view.model().rowCount(), 1)
|
||||
|
||||
self.assertEquals(1, len([f for f in self.vl_b.getFeatures()]))
|
||||
self.assertEqual(1, len([f for f in self.vl_b.getFeatures()]))
|
||||
|
||||
fid = next(self.vl_b.getFeatures(QgsFeatureRequest().setFilterExpression('"name"=\'Design Patterns. Elements of Reusable Object-Oriented Software\''))).id()
|
||||
|
||||
@ -110,12 +110,12 @@ class TestQgsRelationEditWidget(unittest.TestCase):
|
||||
btn.click()
|
||||
|
||||
# This is the important check that the feature is deleted
|
||||
self.assertEquals(0, len([f for f in self.vl_b.getFeatures()]))
|
||||
self.assertEqual(0, len([f for f in self.vl_b.getFeatures()]))
|
||||
|
||||
# This is actually more checking that the database on delete action is properly set on the relation
|
||||
self.assertEquals(0, len([f for f in self.vl_link.getFeatures()]))
|
||||
self.assertEqual(0, len([f for f in self.vl_link.getFeatures()]))
|
||||
|
||||
self.assertEquals(self.table_view.model().rowCount(), 0)
|
||||
self.assertEqual(self.table_view.model().rowCount(), 0)
|
||||
|
||||
def test_list(self):
|
||||
"""
|
||||
@ -123,7 +123,7 @@ class TestQgsRelationEditWidget(unittest.TestCase):
|
||||
"""
|
||||
wrapper = self.createWrapper(self.vl_b) # NOQA
|
||||
|
||||
self.assertEquals(self.table_view.model().rowCount(), 4)
|
||||
self.assertEqual(self.table_view.model().rowCount(), 4)
|
||||
|
||||
@unittest.expectedFailure(os.environ['QT_VERSION'] == '4' and os.environ['TRAVIS_OS_NAME'] == 'linux') # It's probably not related to this variables at all, but that's the closest we can get to the real source of this problem at the moment...
|
||||
def test_add_feature(self):
|
||||
@ -132,19 +132,19 @@ class TestQgsRelationEditWidget(unittest.TestCase):
|
||||
"""
|
||||
self.createWrapper(self.vl_a, '"name"=\'Douglas Adams\'')
|
||||
|
||||
self.assertEquals(self.table_view.model().rowCount(), 0)
|
||||
self.assertEqual(self.table_view.model().rowCount(), 0)
|
||||
|
||||
self.vltools.setValues([None, 'The Hitchhiker\'s Guide to the Galaxy'])
|
||||
btn = self.widget.findChild(QToolButton, 'mAddFeatureButton')
|
||||
btn.click()
|
||||
|
||||
# Book entry has been created
|
||||
self.assertEquals(2, len([f for f in self.vl_b.getFeatures()]))
|
||||
self.assertEqual(2, len([f for f in self.vl_b.getFeatures()]))
|
||||
|
||||
# Link entry has been created
|
||||
self.assertEquals(5, len([f for f in self.vl_link.getFeatures()]))
|
||||
self.assertEqual(5, len([f for f in self.vl_link.getFeatures()]))
|
||||
|
||||
self.assertEquals(self.table_view.model().rowCount(), 1)
|
||||
self.assertEqual(self.table_view.model().rowCount(), 1)
|
||||
|
||||
def test_link_feature(self):
|
||||
"""
|
||||
@ -175,7 +175,7 @@ class TestQgsRelationEditWidget(unittest.TestCase):
|
||||
link_feature = next(self.vl_link.getFeatures(QgsFeatureRequest().setFilterExpression('"fk_book"={}'.format(f[0]))))
|
||||
self.assertIsNotNone(link_feature[0])
|
||||
|
||||
self.assertEquals(self.table_view.model().rowCount(), 1)
|
||||
self.assertEqual(self.table_view.model().rowCount(), 1)
|
||||
|
||||
def test_unlink_feature(self):
|
||||
"""
|
||||
@ -185,7 +185,7 @@ class TestQgsRelationEditWidget(unittest.TestCase):
|
||||
wdg = wrapper.widget() # NOQA
|
||||
|
||||
# All authors are listed
|
||||
self.assertEquals(self.table_view.model().rowCount(), 4)
|
||||
self.assertEqual(self.table_view.model().rowCount(), 4)
|
||||
|
||||
it = self.vl_a.getFeatures(
|
||||
QgsFeatureRequest().setFilterExpression('"name" IN (\'Richard Helm\', \'Ralph Johnson\')'))
|
||||
@ -196,9 +196,9 @@ class TestQgsRelationEditWidget(unittest.TestCase):
|
||||
btn.click()
|
||||
|
||||
# This is actually more checking that the database on delete action is properly set on the relation
|
||||
self.assertEquals(2, len([f for f in self.vl_link.getFeatures()]))
|
||||
self.assertEqual(2, len([f for f in self.vl_link.getFeatures()]))
|
||||
|
||||
self.assertEquals(2, self.table_view.model().rowCount())
|
||||
self.assertEqual(2, self.table_view.model().rowCount())
|
||||
|
||||
def startTransaction(self):
|
||||
"""
|
||||
|
||||
@ -315,7 +315,7 @@ class TestQgsServer(unittest.TestCase):
|
||||
}
|
||||
qs = '&'.join([u"%s=%s" % (k, v) for k, v in parms.iteritems()])
|
||||
h, r = self.server.handleRequest(qs)
|
||||
self.assertEquals(-1, h.find('Content-Type: text/xml; charset=utf-8'), "Header: %s\nResponse:\n%s" % (h, r))
|
||||
self.assertEqual(-1, h.find('Content-Type: text/xml; charset=utf-8'), "Header: %s\nResponse:\n%s" % (h, r))
|
||||
self.assertNotEquals(-1, h.find('Content-Type: image/png'), "Header: %s\nResponse:\n%s" % (h, r))
|
||||
|
||||
|
||||
|
||||
@ -278,7 +278,7 @@ class TestQgsServerAccessControl(unittest.TestCase):
|
||||
self._img_diff_error(response, headers, "WMS_GetLegendGraphic_Country", 250, QSize(10, 10))
|
||||
|
||||
response, headers = self._get_restricted(query_string)
|
||||
self.assertEquals(
|
||||
self.assertEqual(
|
||||
headers.get("Content-Type"), "text/xml; charset=utf-8",
|
||||
"Content type for GetMap is wrong: %s" % headers.get("Content-Type"))
|
||||
self.assertTrue(
|
||||
@ -334,7 +334,7 @@ class TestQgsServerAccessControl(unittest.TestCase):
|
||||
"SRS": "EPSG:3857"
|
||||
}.items()])
|
||||
response, headers = self._get_restricted(query_string)
|
||||
self.assertEquals(
|
||||
self.assertEqual(
|
||||
headers.get("Content-Type"), "text/xml; charset=utf-8",
|
||||
"Content type for GetMap is wrong: %s" % headers.get("Content-Type"))
|
||||
self.assertTrue(
|
||||
@ -653,7 +653,7 @@ class TestQgsServerAccessControl(unittest.TestCase):
|
||||
}.items()])
|
||||
|
||||
response, headers = self._get_fullaccess(query_string)
|
||||
self.assertEquals(
|
||||
self.assertEqual(
|
||||
headers.get("Content-Type"), "image/tiff",
|
||||
"Content type for GetMap is wrong: %s" % headers.get("Content-Type"))
|
||||
self.assertTrue(
|
||||
@ -661,7 +661,7 @@ class TestQgsServerAccessControl(unittest.TestCase):
|
||||
"Image for GetCoverage is wrong")
|
||||
|
||||
response, headers = self._get_restricted(query_string)
|
||||
self.assertEquals(
|
||||
self.assertEqual(
|
||||
headers.get("Content-Type"), "image/tiff",
|
||||
"Content type for GetMap is wrong: %s" % headers.get("Content-Type"))
|
||||
self.assertTrue(
|
||||
@ -683,7 +683,7 @@ class TestQgsServerAccessControl(unittest.TestCase):
|
||||
}.items()])
|
||||
|
||||
response, headers = self._get_restricted(query_string)
|
||||
self.assertEquals(
|
||||
self.assertEqual(
|
||||
headers.get("Content-Type"), "text/xml; charset=utf-8",
|
||||
"Content type for GetMap is wrong: %s" % headers.get("Content-Type"))
|
||||
self.assertTrue(
|
||||
@ -698,7 +698,7 @@ class TestQgsServerAccessControl(unittest.TestCase):
|
||||
self._test_colors({1: "blue"})
|
||||
|
||||
response, headers = self._post_fullaccess(data.format(color="red"))
|
||||
self.assertEquals(
|
||||
self.assertEqual(
|
||||
headers.get("Content-Type"), "text/xml; charset=utf-8",
|
||||
"Content type for Insert is wrong: %s" % headers.get("Content-Type"))
|
||||
self.assertTrue(
|
||||
@ -707,7 +707,7 @@ class TestQgsServerAccessControl(unittest.TestCase):
|
||||
self._test_colors({2: "red"})
|
||||
|
||||
response, headers = self._post_restricted(data.format(color="blue"))
|
||||
self.assertEquals(
|
||||
self.assertEqual(
|
||||
headers.get("Content-Type"), "text/xml; charset=utf-8",
|
||||
"Content type for Insert is wrong: %s" % headers.get("Content-Type"))
|
||||
self.assertTrue(
|
||||
@ -716,7 +716,7 @@ class TestQgsServerAccessControl(unittest.TestCase):
|
||||
"WFS/Transactions Insert succeed\n%s" % response)
|
||||
|
||||
response, headers = self._post_restricted(data.format(color="red"), "LAYER_PERM=no")
|
||||
self.assertEquals(
|
||||
self.assertEqual(
|
||||
headers.get("Content-Type"), "text/xml; charset=utf-8",
|
||||
"Content type for Insert is wrong: %s" % headers.get("Content-Type"))
|
||||
self.assertTrue(
|
||||
@ -725,7 +725,7 @@ class TestQgsServerAccessControl(unittest.TestCase):
|
||||
"WFS/Transactions Insert succeed\n%s" % response)
|
||||
|
||||
response, headers = self._post_restricted(data.format(color="yellow"), "LAYER_PERM=yes")
|
||||
self.assertEquals(
|
||||
self.assertEqual(
|
||||
headers.get("Content-Type"), "text/xml; charset=utf-8",
|
||||
"Content type for Insert is wrong: %s" % headers.get("Content-Type"))
|
||||
self.assertTrue(
|
||||
@ -738,7 +738,7 @@ class TestQgsServerAccessControl(unittest.TestCase):
|
||||
self._test_colors({1: "blue"})
|
||||
|
||||
response, headers = self._post_restricted(data.format(color="yellow"))
|
||||
self.assertEquals(
|
||||
self.assertEqual(
|
||||
headers.get("Content-Type"), "text/xml; charset=utf-8",
|
||||
"Content type for GetMap is wrong: %s" % headers.get("Content-Type"))
|
||||
self.assertTrue(
|
||||
@ -748,7 +748,7 @@ class TestQgsServerAccessControl(unittest.TestCase):
|
||||
self._test_colors({1: "blue"})
|
||||
|
||||
response, headers = self._post_fullaccess(data.format(color="red"))
|
||||
self.assertEquals(
|
||||
self.assertEqual(
|
||||
headers.get("Content-Type"), "text/xml; charset=utf-8",
|
||||
"Content type for Update is wrong: %s" % headers.get("Content-Type"))
|
||||
self.assertTrue(
|
||||
@ -757,7 +757,7 @@ class TestQgsServerAccessControl(unittest.TestCase):
|
||||
self._test_colors({1: "red"})
|
||||
|
||||
response, headers = self._post_restricted(data.format(color="blue"))
|
||||
self.assertEquals(
|
||||
self.assertEqual(
|
||||
headers.get("Content-Type"), "text/xml; charset=utf-8",
|
||||
"Content type for Update is wrong: %s" % headers.get("Content-Type"))
|
||||
self.assertTrue(
|
||||
@ -767,7 +767,7 @@ class TestQgsServerAccessControl(unittest.TestCase):
|
||||
self._test_colors({1: "red"})
|
||||
|
||||
response, headers = self._post_restricted(data.format(color="yellow"), "LAYER_PERM=no")
|
||||
self.assertEquals(
|
||||
self.assertEqual(
|
||||
headers.get("Content-Type"), "text/xml; charset=utf-8",
|
||||
"Content type for Update is wrong: %s" % headers.get("Content-Type"))
|
||||
self.assertTrue(
|
||||
@ -777,7 +777,7 @@ class TestQgsServerAccessControl(unittest.TestCase):
|
||||
self._test_colors({1: "red"})
|
||||
|
||||
response, headers = self._post_restricted(data.format(color="yellow"), "LAYER_PERM=yes")
|
||||
self.assertEquals(
|
||||
self.assertEqual(
|
||||
headers.get("Content-Type"), "text/xml; charset=utf-8",
|
||||
"Content type for Update is wrong: %s" % headers.get("Content-Type"))
|
||||
self.assertTrue(
|
||||
@ -790,7 +790,7 @@ class TestQgsServerAccessControl(unittest.TestCase):
|
||||
self._test_colors({1: "blue"})
|
||||
|
||||
response, headers = self._post_fullaccess(data)
|
||||
self.assertEquals(
|
||||
self.assertEqual(
|
||||
headers.get("Content-Type"), "text/xml; charset=utf-8",
|
||||
"Content type for GetMap is wrong: %s" % headers.get("Content-Type"))
|
||||
self.assertTrue(
|
||||
@ -802,7 +802,7 @@ class TestQgsServerAccessControl(unittest.TestCase):
|
||||
self._test_colors({1: "blue"})
|
||||
|
||||
response, headers = self._post_restricted(data)
|
||||
self.assertEquals(
|
||||
self.assertEqual(
|
||||
headers.get("Content-Type"), "text/xml; charset=utf-8",
|
||||
"Content type for GetMap is wrong: %s" % headers.get("Content-Type"))
|
||||
self.assertTrue(
|
||||
@ -815,7 +815,7 @@ class TestQgsServerAccessControl(unittest.TestCase):
|
||||
self._test_colors({1: "red"})
|
||||
|
||||
response, headers = self._post_restricted(data, "LAYER_PERM=no")
|
||||
self.assertEquals(
|
||||
self.assertEqual(
|
||||
headers.get("Content-Type"), "text/xml; charset=utf-8",
|
||||
"Content type for GetMap is wrong: %s" % headers.get("Content-Type"))
|
||||
self.assertTrue(
|
||||
@ -824,7 +824,7 @@ class TestQgsServerAccessControl(unittest.TestCase):
|
||||
"WFS/Transactions Delete succeed\n%s" % response)
|
||||
|
||||
response, headers = self._post_restricted(data, "LAYER_PERM=yes")
|
||||
self.assertEquals(
|
||||
self.assertEqual(
|
||||
headers.get("Content-Type"), "text/xml; charset=utf-8",
|
||||
"Content type for GetMap is wrong: %s" % headers.get("Content-Type"))
|
||||
self.assertTrue(
|
||||
@ -1375,7 +1375,7 @@ class TestQgsServerAccessControl(unittest.TestCase):
|
||||
for line in data[0].split("\n"):
|
||||
if line != "":
|
||||
header = line.split(":")
|
||||
self.assertEquals(len(header), 2, line)
|
||||
self.assertEqual(len(header), 2, line)
|
||||
headers[str(header[0])] = str(header[1]).strip()
|
||||
|
||||
return data[1], headers
|
||||
@ -1427,7 +1427,7 @@ class TestQgsServerAccessControl(unittest.TestCase):
|
||||
return control.compareImages(control_image), control.report()
|
||||
|
||||
def _img_diff_error(self, response, headers, image, max_diff=10, max_size_diff=QSize()):
|
||||
self.assertEquals(
|
||||
self.assertEqual(
|
||||
headers.get("Content-Type"), "image/png",
|
||||
"Content type is wrong: %s" % headers.get("Content-Type"))
|
||||
test, report = self._img_diff(response, image, max_diff, max_size_diff)
|
||||
|
||||
@ -109,7 +109,7 @@ class TestQgsVectorLayer(unittest.TestCase):
|
||||
myPath = os.path.join(unitTestDataPath(), 'lines.shp')
|
||||
myLayer = QgsVectorLayer(myPath, 'Lines', 'ogr')
|
||||
myCount = myLayer.featureCount()
|
||||
self.assertEquals(myCount, 6)
|
||||
self.assertEqual(myCount, 6)
|
||||
|
||||
# ADD FEATURE
|
||||
|
||||
@ -119,18 +119,18 @@ class TestQgsVectorLayer(unittest.TestCase):
|
||||
feat.setGeometry(QgsGeometry.fromPoint(QgsPoint(1, 2)))
|
||||
|
||||
def checkAfter():
|
||||
self.assertEquals(layer.pendingFeatureCount(), 1)
|
||||
self.assertEqual(layer.pendingFeatureCount(), 1)
|
||||
|
||||
# check select+nextFeature
|
||||
f = next(layer.getFeatures())
|
||||
self.assertEquals(f.geometry().asPoint(), QgsPoint(1, 2))
|
||||
self.assertEqual(f.geometry().asPoint(), QgsPoint(1, 2))
|
||||
|
||||
# check feature at id
|
||||
f2 = next(layer.getFeatures(QgsFeatureRequest(f.id())))
|
||||
self.assertEquals(f2.geometry().asPoint(), QgsPoint(1, 2))
|
||||
self.assertEqual(f2.geometry().asPoint(), QgsPoint(1, 2))
|
||||
|
||||
def checkBefore():
|
||||
self.assertEquals(layer.pendingFeatureCount(), 0)
|
||||
self.assertEqual(layer.pendingFeatureCount(), 0)
|
||||
|
||||
# check select+nextFeature
|
||||
with self.assertRaises(StopIteration):
|
||||
@ -146,7 +146,7 @@ class TestQgsVectorLayer(unittest.TestCase):
|
||||
self.assertTrue(layer.addFeature(feat))
|
||||
|
||||
checkAfter()
|
||||
self.assertEquals(layer.dataProvider().featureCount(), 0)
|
||||
self.assertEqual(layer.dataProvider().featureCount(), 0)
|
||||
|
||||
# now try undo/redo
|
||||
layer.undoStack().undo()
|
||||
@ -157,7 +157,7 @@ class TestQgsVectorLayer(unittest.TestCase):
|
||||
self.assertTrue(layer.commitChanges())
|
||||
|
||||
checkAfter()
|
||||
self.assertEquals(layer.dataProvider().featureCount(), 1)
|
||||
self.assertEqual(layer.dataProvider().featureCount(), 1)
|
||||
|
||||
# DELETE FEATURE
|
||||
|
||||
@ -166,7 +166,7 @@ class TestQgsVectorLayer(unittest.TestCase):
|
||||
fid = 1
|
||||
|
||||
def checkAfter():
|
||||
self.assertEquals(layer.pendingFeatureCount(), 0)
|
||||
self.assertEqual(layer.pendingFeatureCount(), 0)
|
||||
|
||||
# check select+nextFeature
|
||||
with self.assertRaises(StopIteration):
|
||||
@ -177,18 +177,18 @@ class TestQgsVectorLayer(unittest.TestCase):
|
||||
next(layer.getFeatures(QgsFeatureRequest(fid)))
|
||||
|
||||
def checkBefore():
|
||||
self.assertEquals(layer.pendingFeatureCount(), 1)
|
||||
self.assertEqual(layer.pendingFeatureCount(), 1)
|
||||
|
||||
# check select+nextFeature
|
||||
fi = layer.getFeatures()
|
||||
f = next(fi)
|
||||
self.assertEquals(f.geometry().asPoint(), QgsPoint(100, 200))
|
||||
self.assertEqual(f.geometry().asPoint(), QgsPoint(100, 200))
|
||||
with self.assertRaises(StopIteration):
|
||||
next(fi)
|
||||
|
||||
# check feature at id
|
||||
f2 = next(layer.getFeatures(QgsFeatureRequest(fid)))
|
||||
self.assertEquals(f2.id(), fid)
|
||||
self.assertEqual(f2.id(), fid)
|
||||
|
||||
checkBefore()
|
||||
|
||||
@ -210,12 +210,12 @@ class TestQgsVectorLayer(unittest.TestCase):
|
||||
layer.undoStack().redo()
|
||||
checkAfter()
|
||||
|
||||
self.assertEquals(layer.dataProvider().featureCount(), 1)
|
||||
self.assertEqual(layer.dataProvider().featureCount(), 1)
|
||||
|
||||
self.assertTrue(layer.commitChanges())
|
||||
|
||||
checkAfter()
|
||||
self.assertEquals(layer.dataProvider().featureCount(), 0)
|
||||
self.assertEqual(layer.dataProvider().featureCount(), 0)
|
||||
|
||||
def test_DeleteFeatureAfterAddFeature(self):
|
||||
|
||||
@ -224,14 +224,14 @@ class TestQgsVectorLayer(unittest.TestCase):
|
||||
feat.setGeometry(QgsGeometry.fromPoint(QgsPoint(1, 2)))
|
||||
|
||||
def checkBefore():
|
||||
self.assertEquals(layer.pendingFeatureCount(), 0)
|
||||
self.assertEqual(layer.pendingFeatureCount(), 0)
|
||||
|
||||
# check select+nextFeature
|
||||
with self.assertRaises(StopIteration):
|
||||
next(layer.getFeatures())
|
||||
|
||||
def checkAfter1():
|
||||
self.assertEquals(layer.pendingFeatureCount(), 1)
|
||||
self.assertEqual(layer.pendingFeatureCount(), 1)
|
||||
|
||||
def checkAfter2():
|
||||
checkBefore() # should be the same state: no features
|
||||
@ -259,7 +259,7 @@ class TestQgsVectorLayer(unittest.TestCase):
|
||||
self.assertTrue(layer.commitChanges())
|
||||
checkAfter2()
|
||||
|
||||
self.assertEquals(layer.dataProvider().featureCount(), 0)
|
||||
self.assertEqual(layer.dataProvider().featureCount(), 0)
|
||||
|
||||
# CHANGE ATTRIBUTE
|
||||
|
||||
@ -271,16 +271,16 @@ class TestQgsVectorLayer(unittest.TestCase):
|
||||
# check select+nextFeature
|
||||
fi = layer.getFeatures()
|
||||
f = next(fi)
|
||||
self.assertEquals(f[0], "good")
|
||||
self.assertEqual(f[0], "good")
|
||||
|
||||
# check feature at id
|
||||
f2 = next(layer.getFeatures(QgsFeatureRequest(f.id())))
|
||||
self.assertEquals(f2[0], "good")
|
||||
self.assertEqual(f2[0], "good")
|
||||
|
||||
def checkBefore():
|
||||
# check select+nextFeature
|
||||
f = next(layer.getFeatures())
|
||||
self.assertEquals(f[0], "test")
|
||||
self.assertEqual(f[0], "test")
|
||||
|
||||
checkBefore()
|
||||
|
||||
@ -311,22 +311,22 @@ class TestQgsVectorLayer(unittest.TestCase):
|
||||
newF.setAttributes(["hello", 42])
|
||||
|
||||
def checkAfter():
|
||||
self.assertEquals(len(layer.pendingFields()), 2)
|
||||
self.assertEqual(len(layer.pendingFields()), 2)
|
||||
# check feature
|
||||
fi = layer.getFeatures()
|
||||
f = next(fi)
|
||||
attrs = f.attributes()
|
||||
self.assertEquals(len(attrs), 2)
|
||||
self.assertEquals(attrs[0], "hello")
|
||||
self.assertEquals(attrs[1], 12)
|
||||
self.assertEqual(len(attrs), 2)
|
||||
self.assertEqual(attrs[0], "hello")
|
||||
self.assertEqual(attrs[1], 12)
|
||||
|
||||
with self.assertRaises(StopIteration):
|
||||
next(fi)
|
||||
|
||||
# check feature at id
|
||||
f2 = next(layer.getFeatures(QgsFeatureRequest(f.id())))
|
||||
self.assertEquals(f2[0], "hello")
|
||||
self.assertEquals(f2[1], 12)
|
||||
self.assertEqual(f2[0], "hello")
|
||||
self.assertEqual(f2[1], 12)
|
||||
|
||||
def checkBefore():
|
||||
# check feature
|
||||
@ -364,15 +364,15 @@ class TestQgsVectorLayer(unittest.TestCase):
|
||||
def checkAfter():
|
||||
# check select+nextFeature
|
||||
f = next(layer.getFeatures())
|
||||
self.assertEquals(f.geometry().asPoint(), QgsPoint(300, 400))
|
||||
self.assertEqual(f.geometry().asPoint(), QgsPoint(300, 400))
|
||||
# check feature at id
|
||||
f2 = next(layer.getFeatures(QgsFeatureRequest(f.id())))
|
||||
self.assertEquals(f2.geometry().asPoint(), QgsPoint(300, 400))
|
||||
self.assertEqual(f2.geometry().asPoint(), QgsPoint(300, 400))
|
||||
|
||||
def checkBefore():
|
||||
# check select+nextFeature
|
||||
f = next(layer.getFeatures())
|
||||
self.assertEquals(f.geometry().asPoint(), QgsPoint(100, 200))
|
||||
self.assertEqual(f.geometry().asPoint(), QgsPoint(100, 200))
|
||||
|
||||
# try to change geometry without editing mode
|
||||
self.assertFalse(layer.changeGeometry(fid, QgsGeometry.fromPoint(QgsPoint(300, 400))))
|
||||
@ -403,18 +403,18 @@ class TestQgsVectorLayer(unittest.TestCase):
|
||||
def checkAfter():
|
||||
# check select+nextFeature
|
||||
f = next(layer.getFeatures())
|
||||
self.assertEquals(f.geometry().asPoint(), QgsPoint(300, 400))
|
||||
self.assertEquals(f[0], "changed")
|
||||
self.assertEqual(f.geometry().asPoint(), QgsPoint(300, 400))
|
||||
self.assertEqual(f[0], "changed")
|
||||
# check feature at id
|
||||
f2 = next(layer.getFeatures(QgsFeatureRequest(f.id())))
|
||||
self.assertEquals(f2.geometry().asPoint(), QgsPoint(300, 400))
|
||||
self.assertEquals(f2[0], "changed")
|
||||
self.assertEqual(f2.geometry().asPoint(), QgsPoint(300, 400))
|
||||
self.assertEqual(f2[0], "changed")
|
||||
|
||||
def checkBefore():
|
||||
# check select+nextFeature
|
||||
f = next(layer.getFeatures())
|
||||
self.assertEquals(f.geometry().asPoint(), QgsPoint(100, 200))
|
||||
self.assertEquals(f[0], "test")
|
||||
self.assertEqual(f.geometry().asPoint(), QgsPoint(100, 200))
|
||||
self.assertEqual(f[0], "test")
|
||||
|
||||
checkBefore()
|
||||
|
||||
@ -445,13 +445,13 @@ class TestQgsVectorLayer(unittest.TestCase):
|
||||
newF.setAttributes(["hello", 42])
|
||||
|
||||
def checkAfter():
|
||||
self.assertEquals(len(layer.pendingFields()), 2)
|
||||
self.assertEqual(len(layer.pendingFields()), 2)
|
||||
# check feature
|
||||
f = next(layer.getFeatures())
|
||||
self.assertEquals(f.geometry().asPoint(), QgsPoint(2, 2))
|
||||
self.assertEqual(f.geometry().asPoint(), QgsPoint(2, 2))
|
||||
# check feature at id
|
||||
f2 = next(layer.getFeatures(QgsFeatureRequest(f.id())))
|
||||
self.assertEquals(f2.geometry().asPoint(), QgsPoint(2, 2))
|
||||
self.assertEqual(f2.geometry().asPoint(), QgsPoint(2, 2))
|
||||
|
||||
def checkBefore():
|
||||
# check feature
|
||||
@ -490,37 +490,37 @@ class TestQgsVectorLayer(unittest.TestCase):
|
||||
def checkBefore():
|
||||
# check fields
|
||||
flds = layer.pendingFields()
|
||||
self.assertEquals(len(flds), 2)
|
||||
self.assertEquals(flds[0].name(), "fldtxt")
|
||||
self.assertEquals(flds[1].name(), "fldint")
|
||||
self.assertEqual(len(flds), 2)
|
||||
self.assertEqual(flds[0].name(), "fldtxt")
|
||||
self.assertEqual(flds[1].name(), "fldint")
|
||||
|
||||
# check feature
|
||||
f = next(layer.getFeatures())
|
||||
attrs = f.attributes()
|
||||
self.assertEquals(len(attrs), 2)
|
||||
self.assertEquals(attrs[0], "test")
|
||||
self.assertEquals(attrs[1], 123)
|
||||
self.assertEqual(len(attrs), 2)
|
||||
self.assertEqual(attrs[0], "test")
|
||||
self.assertEqual(attrs[1], 123)
|
||||
|
||||
def checkAfter():
|
||||
# check fields
|
||||
flds = layer.pendingFields()
|
||||
self.assertEquals(len(flds), 3)
|
||||
self.assertEquals(flds[0].name(), "fldtxt")
|
||||
self.assertEquals(flds[1].name(), "fldint")
|
||||
self.assertEquals(flds[2].name(), "fld1")
|
||||
self.assertEqual(len(flds), 3)
|
||||
self.assertEqual(flds[0].name(), "fldtxt")
|
||||
self.assertEqual(flds[1].name(), "fldint")
|
||||
self.assertEqual(flds[2].name(), "fld1")
|
||||
|
||||
# check feature
|
||||
f = next(layer.getFeatures())
|
||||
attrs = f.attributes()
|
||||
self.assertEquals(len(attrs), 3)
|
||||
self.assertEquals(attrs[0], "test")
|
||||
self.assertEquals(attrs[1], 123)
|
||||
self.assertEqual(len(attrs), 3)
|
||||
self.assertEqual(attrs[0], "test")
|
||||
self.assertEqual(attrs[1], 123)
|
||||
self.assertTrue(attrs[2] is None)
|
||||
|
||||
# check feature at id
|
||||
f2 = next(layer.getFeatures(QgsFeatureRequest(f.id())))
|
||||
self.assertEquals(f2[0], "test")
|
||||
self.assertEquals(f2[1], 123)
|
||||
self.assertEqual(f2[0], "test")
|
||||
self.assertEqual(f2[1], 123)
|
||||
self.assertTrue(f2[2] is None)
|
||||
|
||||
# for nt in layer.dataProvider().nativeTypes():
|
||||
@ -558,24 +558,24 @@ class TestQgsVectorLayer(unittest.TestCase):
|
||||
fld1 = QgsField("fld1", QVariant.Int, "integer")
|
||||
|
||||
def checkBefore():
|
||||
self.assertEquals(len(layer.pendingFields()), 2)
|
||||
self.assertEqual(len(layer.pendingFields()), 2)
|
||||
# check feature
|
||||
with self.assertRaises(StopIteration):
|
||||
next(layer.getFeatures())
|
||||
|
||||
def checkAfter():
|
||||
self.assertEquals(len(layer.pendingFields()), 3)
|
||||
self.assertEqual(len(layer.pendingFields()), 3)
|
||||
# check feature
|
||||
f = next(layer.getFeatures())
|
||||
attrs = f.attributes()
|
||||
self.assertEquals(len(attrs), 3)
|
||||
self.assertEquals(attrs[0], "hello")
|
||||
self.assertEquals(attrs[1], 42)
|
||||
self.assertEqual(len(attrs), 3)
|
||||
self.assertEqual(attrs[0], "hello")
|
||||
self.assertEqual(attrs[1], 42)
|
||||
self.assertTrue(attrs[2] is None)
|
||||
# check feature at id
|
||||
f2 = next(layer.getFeatures(QgsFeatureRequest(f.id())))
|
||||
self.assertEquals(f2[0], "hello")
|
||||
self.assertEquals(f2[1], 42)
|
||||
self.assertEqual(f2[0], "hello")
|
||||
self.assertEqual(f2[1], 42)
|
||||
self.assertTrue(f2[2] is None)
|
||||
|
||||
layer.startEditing()
|
||||
@ -621,17 +621,17 @@ class TestQgsVectorLayer(unittest.TestCase):
|
||||
|
||||
def checkBefore():
|
||||
flds = layer.pendingFields()
|
||||
self.assertEquals(len(flds), 3)
|
||||
self.assertEquals(flds[0].name(), "fldtxt")
|
||||
self.assertEquals(flds[1].name(), "fldint")
|
||||
self.assertEquals(flds[2].name(), "flddouble")
|
||||
self.assertEqual(len(flds), 3)
|
||||
self.assertEqual(flds[0].name(), "fldtxt")
|
||||
self.assertEqual(flds[1].name(), "fldint")
|
||||
self.assertEqual(flds[2].name(), "flddouble")
|
||||
|
||||
f = next(layer.getFeatures())
|
||||
attrs = f.attributes()
|
||||
self.assertEquals(len(attrs), 3)
|
||||
self.assertEquals(attrs[0], "test")
|
||||
self.assertEquals(attrs[1], 123)
|
||||
self.assertEquals(attrs[2], 5.5)
|
||||
self.assertEqual(len(attrs), 3)
|
||||
self.assertEqual(attrs[0], "test")
|
||||
self.assertEqual(attrs[1], 123)
|
||||
self.assertEqual(attrs[2], 5.5)
|
||||
|
||||
layer.startEditing()
|
||||
|
||||
@ -642,16 +642,16 @@ class TestQgsVectorLayer(unittest.TestCase):
|
||||
def checkAfterOneDelete():
|
||||
flds = layer.pendingFields()
|
||||
# for fld in flds: print "FLD", fld.name()
|
||||
self.assertEquals(len(flds), 2)
|
||||
self.assertEquals(flds[0].name(), "fldint")
|
||||
self.assertEquals(flds[1].name(), "flddouble")
|
||||
self.assertEquals(layer.pendingAllAttributesList(), [0, 1])
|
||||
self.assertEqual(len(flds), 2)
|
||||
self.assertEqual(flds[0].name(), "fldint")
|
||||
self.assertEqual(flds[1].name(), "flddouble")
|
||||
self.assertEqual(layer.pendingAllAttributesList(), [0, 1])
|
||||
|
||||
f = next(layer.getFeatures())
|
||||
attrs = f.attributes()
|
||||
self.assertEquals(len(attrs), 2)
|
||||
self.assertEquals(attrs[0], 123)
|
||||
self.assertEquals(attrs[1], 5.5)
|
||||
self.assertEqual(len(attrs), 2)
|
||||
self.assertEqual(attrs[0], 123)
|
||||
self.assertEqual(attrs[1], 5.5)
|
||||
|
||||
checkAfterOneDelete()
|
||||
|
||||
@ -659,20 +659,20 @@ class TestQgsVectorLayer(unittest.TestCase):
|
||||
self.assertTrue(layer.deleteAttribute(0))
|
||||
|
||||
def checkAfterTwoDeletes():
|
||||
self.assertEquals(layer.pendingAllAttributesList(), [0])
|
||||
self.assertEqual(layer.pendingAllAttributesList(), [0])
|
||||
flds = layer.pendingFields()
|
||||
# for fld in flds: print "FLD", fld.name()
|
||||
self.assertEquals(len(flds), 1)
|
||||
self.assertEquals(flds[0].name(), "flddouble")
|
||||
self.assertEqual(len(flds), 1)
|
||||
self.assertEqual(flds[0].name(), "flddouble")
|
||||
|
||||
f = next(layer.getFeatures())
|
||||
attrs = f.attributes()
|
||||
self.assertEquals(len(attrs), 1)
|
||||
self.assertEquals(attrs[0], 5.5)
|
||||
self.assertEqual(len(attrs), 1)
|
||||
self.assertEqual(attrs[0], 5.5)
|
||||
# check feature at id
|
||||
f2 = next(layer.getFeatures(QgsFeatureRequest(f.id())))
|
||||
self.assertEquals(len(f2.attributes()), 1)
|
||||
self.assertEquals(f2[0], 5.5)
|
||||
self.assertEqual(len(f2.attributes()), 1)
|
||||
self.assertEqual(f2[0], 5.5)
|
||||
|
||||
checkAfterTwoDeletes()
|
||||
layer.undoStack().undo()
|
||||
@ -693,21 +693,21 @@ class TestQgsVectorLayer(unittest.TestCase):
|
||||
|
||||
def checkAfter(): # layer should be unchanged
|
||||
flds = layer.pendingFields()
|
||||
self.assertEquals(len(flds), 2)
|
||||
self.assertEquals(flds[0].name(), "fldtxt")
|
||||
self.assertEquals(flds[1].name(), "fldint")
|
||||
self.assertEqual(len(flds), 2)
|
||||
self.assertEqual(flds[0].name(), "fldtxt")
|
||||
self.assertEqual(flds[1].name(), "fldint")
|
||||
|
||||
# check feature
|
||||
f = next(layer.getFeatures())
|
||||
attrs = f.attributes()
|
||||
self.assertEquals(len(attrs), 2)
|
||||
self.assertEquals(attrs[0], "test")
|
||||
self.assertEquals(attrs[1], 123)
|
||||
self.assertEqual(len(attrs), 2)
|
||||
self.assertEqual(attrs[0], "test")
|
||||
self.assertEqual(attrs[1], 123)
|
||||
# check feature at id
|
||||
f2 = next(layer.getFeatures(QgsFeatureRequest(f.id())))
|
||||
self.assertEquals(len(f2.attributes()), 2)
|
||||
self.assertEquals(f2[0], "test")
|
||||
self.assertEquals(f2[1], 123)
|
||||
self.assertEqual(len(f2.attributes()), 2)
|
||||
self.assertEqual(f2[0], "test")
|
||||
self.assertEqual(f2[1], 123)
|
||||
|
||||
checkAfter()
|
||||
|
||||
@ -738,27 +738,27 @@ class TestQgsVectorLayer(unittest.TestCase):
|
||||
newF.setAttributes(["hello", 42])
|
||||
|
||||
def checkBefore():
|
||||
self.assertEquals(len(layer.pendingFields()), 2)
|
||||
self.assertEqual(len(layer.pendingFields()), 2)
|
||||
# check feature
|
||||
with self.assertRaises(StopIteration):
|
||||
next(layer.getFeatures())
|
||||
|
||||
def checkAfter1():
|
||||
self.assertEquals(len(layer.pendingFields()), 2)
|
||||
self.assertEqual(len(layer.pendingFields()), 2)
|
||||
# check feature
|
||||
f = next(layer.getFeatures())
|
||||
attrs = f.attributes()
|
||||
self.assertEquals(len(attrs), 2)
|
||||
self.assertEquals(attrs[0], "hello")
|
||||
self.assertEquals(attrs[1], 42)
|
||||
self.assertEqual(len(attrs), 2)
|
||||
self.assertEqual(attrs[0], "hello")
|
||||
self.assertEqual(attrs[1], 42)
|
||||
|
||||
def checkAfter2():
|
||||
self.assertEquals(len(layer.pendingFields()), 1)
|
||||
self.assertEqual(len(layer.pendingFields()), 1)
|
||||
# check feature
|
||||
f = next(layer.getFeatures())
|
||||
attrs = f.attributes()
|
||||
self.assertEquals(len(attrs), 1)
|
||||
self.assertEquals(attrs[0], 42)
|
||||
self.assertEqual(len(attrs), 1)
|
||||
self.assertEqual(attrs[0], 42)
|
||||
|
||||
layer.startEditing()
|
||||
|
||||
@ -789,24 +789,24 @@ class TestQgsVectorLayer(unittest.TestCase):
|
||||
# check feature
|
||||
f = next(layer.getFeatures())
|
||||
attrs = f.attributes()
|
||||
self.assertEquals(len(attrs), 2)
|
||||
self.assertEquals(attrs[0], "test")
|
||||
self.assertEquals(attrs[1], 123)
|
||||
self.assertEqual(len(attrs), 2)
|
||||
self.assertEqual(attrs[0], "test")
|
||||
self.assertEqual(attrs[1], 123)
|
||||
|
||||
def checkAfter1():
|
||||
# check feature
|
||||
f = next(layer.getFeatures())
|
||||
attrs = f.attributes()
|
||||
self.assertEquals(len(attrs), 2)
|
||||
self.assertEquals(attrs[0], "changed")
|
||||
self.assertEquals(attrs[1], 123)
|
||||
self.assertEqual(len(attrs), 2)
|
||||
self.assertEqual(attrs[0], "changed")
|
||||
self.assertEqual(attrs[1], 123)
|
||||
|
||||
def checkAfter2():
|
||||
# check feature
|
||||
f = next(layer.getFeatures())
|
||||
attrs = f.attributes()
|
||||
self.assertEquals(len(attrs), 1)
|
||||
self.assertEquals(attrs[0], 123)
|
||||
self.assertEqual(len(attrs), 1)
|
||||
self.assertEqual(attrs[0], 123)
|
||||
|
||||
layer.startEditing()
|
||||
|
||||
@ -834,8 +834,8 @@ class TestQgsVectorLayer(unittest.TestCase):
|
||||
layer = createLayerWithOnePoint()
|
||||
|
||||
flds = layer.pendingFields()
|
||||
self.assertEquals(flds.indexFromName("fldint"), 1)
|
||||
self.assertEquals(flds.indexFromName("fldXXX"), -1)
|
||||
self.assertEqual(flds.indexFromName("fldint"), 1)
|
||||
self.assertEqual(flds.indexFromName("fldXXX"), -1)
|
||||
|
||||
def test_getFeatures(self):
|
||||
|
||||
@ -845,10 +845,10 @@ class TestQgsVectorLayer(unittest.TestCase):
|
||||
fi = layer.getFeatures()
|
||||
self.assertTrue(fi.nextFeature(f))
|
||||
self.assertTrue(f.isValid())
|
||||
self.assertEquals(f.id(), 1)
|
||||
self.assertEquals(f.geometry().asPoint(), QgsPoint(100, 200))
|
||||
self.assertEquals(f["fldtxt"], "test")
|
||||
self.assertEquals(f["fldint"], 123)
|
||||
self.assertEqual(f.id(), 1)
|
||||
self.assertEqual(f.geometry().asPoint(), QgsPoint(100, 200))
|
||||
self.assertEqual(f["fldtxt"], "test")
|
||||
self.assertEqual(f["fldint"], 123)
|
||||
|
||||
self.assertFalse(fi.nextFeature(f))
|
||||
|
||||
@ -878,33 +878,33 @@ class TestQgsVectorLayer(unittest.TestCase):
|
||||
layer.addJoin(join2)
|
||||
|
||||
flds = layer.pendingFields()
|
||||
self.assertEquals(len(flds), 6)
|
||||
self.assertEquals(flds[2].name(), "joinlayer_x")
|
||||
self.assertEquals(flds[3].name(), "joinlayer_z")
|
||||
self.assertEquals(flds[4].name(), "custom-prefix_x")
|
||||
self.assertEquals(flds[5].name(), "custom-prefix_z")
|
||||
self.assertEquals(flds.fieldOrigin(0), QgsFields.OriginProvider)
|
||||
self.assertEquals(flds.fieldOrigin(2), QgsFields.OriginJoin)
|
||||
self.assertEquals(flds.fieldOrigin(3), QgsFields.OriginJoin)
|
||||
self.assertEquals(flds.fieldOriginIndex(0), 0)
|
||||
self.assertEquals(flds.fieldOriginIndex(2), 0)
|
||||
self.assertEquals(flds.fieldOriginIndex(3), 2)
|
||||
self.assertEqual(len(flds), 6)
|
||||
self.assertEqual(flds[2].name(), "joinlayer_x")
|
||||
self.assertEqual(flds[3].name(), "joinlayer_z")
|
||||
self.assertEqual(flds[4].name(), "custom-prefix_x")
|
||||
self.assertEqual(flds[5].name(), "custom-prefix_z")
|
||||
self.assertEqual(flds.fieldOrigin(0), QgsFields.OriginProvider)
|
||||
self.assertEqual(flds.fieldOrigin(2), QgsFields.OriginJoin)
|
||||
self.assertEqual(flds.fieldOrigin(3), QgsFields.OriginJoin)
|
||||
self.assertEqual(flds.fieldOriginIndex(0), 0)
|
||||
self.assertEqual(flds.fieldOriginIndex(2), 0)
|
||||
self.assertEqual(flds.fieldOriginIndex(3), 2)
|
||||
|
||||
f = QgsFeature()
|
||||
fi = layer.getFeatures()
|
||||
self.assertTrue(fi.nextFeature(f))
|
||||
attrs = f.attributes()
|
||||
self.assertEquals(len(attrs), 6)
|
||||
self.assertEquals(attrs[0], "test")
|
||||
self.assertEquals(attrs[1], 123)
|
||||
self.assertEquals(attrs[2], "foo")
|
||||
self.assertEquals(attrs[3], 321)
|
||||
self.assertEqual(len(attrs), 6)
|
||||
self.assertEqual(attrs[0], "test")
|
||||
self.assertEqual(attrs[1], 123)
|
||||
self.assertEqual(attrs[2], "foo")
|
||||
self.assertEqual(attrs[3], 321)
|
||||
self.assertFalse(fi.nextFeature(f))
|
||||
|
||||
f2 = next(layer.getFeatures(QgsFeatureRequest(f.id())))
|
||||
self.assertEquals(len(f2.attributes()), 6)
|
||||
self.assertEquals(f2[2], "foo")
|
||||
self.assertEquals(f2[3], 321)
|
||||
self.assertEqual(len(f2.attributes()), 6)
|
||||
self.assertEqual(f2[2], "foo")
|
||||
self.assertEqual(f2[3], 321)
|
||||
|
||||
def test_InvalidOperations(self):
|
||||
layer = createLayerWithOnePoint()
|
||||
@ -951,8 +951,8 @@ class TestQgsVectorLayer(unittest.TestCase):
|
||||
layer.blendModeChanged.connect(self.onBlendModeChanged)
|
||||
layer.setBlendMode(QPainter.CompositionMode_Screen)
|
||||
|
||||
self.assertEquals(self.blendModeTest, QPainter.CompositionMode_Screen)
|
||||
self.assertEquals(layer.blendMode(), QPainter.CompositionMode_Screen)
|
||||
self.assertEqual(self.blendModeTest, QPainter.CompositionMode_Screen)
|
||||
self.assertEqual(layer.blendMode(), QPainter.CompositionMode_Screen)
|
||||
|
||||
def test_setFeatureBlendMode(self):
|
||||
layer = createLayerWithOnePoint()
|
||||
@ -961,8 +961,8 @@ class TestQgsVectorLayer(unittest.TestCase):
|
||||
layer.featureBlendModeChanged.connect(self.onBlendModeChanged)
|
||||
layer.setFeatureBlendMode(QPainter.CompositionMode_Screen)
|
||||
|
||||
self.assertEquals(self.blendModeTest, QPainter.CompositionMode_Screen)
|
||||
self.assertEquals(layer.featureBlendMode(), QPainter.CompositionMode_Screen)
|
||||
self.assertEqual(self.blendModeTest, QPainter.CompositionMode_Screen)
|
||||
self.assertEqual(layer.featureBlendMode(), QPainter.CompositionMode_Screen)
|
||||
|
||||
def test_ExpressionField(self):
|
||||
layer = createLayerWithOnePoint()
|
||||
@ -971,16 +971,16 @@ class TestQgsVectorLayer(unittest.TestCase):
|
||||
|
||||
idx = layer.addExpressionField('5', QgsField('test', QVariant.LongLong))
|
||||
|
||||
self.assertEquals(next(layer.getFeatures())[idx], 5)
|
||||
self.assertEquals(layer.pendingFields().count(), cnt + 1)
|
||||
self.assertEqual(next(layer.getFeatures())[idx], 5)
|
||||
self.assertEqual(layer.pendingFields().count(), cnt + 1)
|
||||
|
||||
layer.updateExpressionField(idx, '9')
|
||||
|
||||
self.assertEquals(next(layer.getFeatures())[idx], 9)
|
||||
self.assertEqual(next(layer.getFeatures())[idx], 9)
|
||||
|
||||
layer.removeExpressionField(idx)
|
||||
|
||||
self.assertEquals(layer.pendingFields().count(), cnt)
|
||||
self.assertEqual(layer.pendingFields().count(), cnt)
|
||||
|
||||
def test_ExpressionFieldEllipsoidLengthCalculation(self):
|
||||
#create a temporary layer
|
||||
@ -1064,8 +1064,8 @@ class TestQgsVectorLayer(unittest.TestCase):
|
||||
self.transparencyTest = 0
|
||||
layer.layerTransparencyChanged.connect(self.onLayerTransparencyChanged)
|
||||
layer.setLayerTransparency(50)
|
||||
self.assertEquals(self.transparencyTest, 50)
|
||||
self.assertEquals(layer.layerTransparency(), 50)
|
||||
self.assertEqual(self.transparencyTest, 50)
|
||||
self.assertEqual(layer.layerTransparency(), 50)
|
||||
|
||||
def onRendererChanged(self):
|
||||
self.rendererChanged = True
|
||||
@ -1079,7 +1079,7 @@ class TestQgsVectorLayer(unittest.TestCase):
|
||||
r = QgsSingleSymbolRendererV2(QgsSymbolV2.defaultSymbol(QGis.Point))
|
||||
layer.setRendererV2(r)
|
||||
self.assertTrue(self.rendererChanged)
|
||||
self.assertEquals(layer.rendererV2(), r)
|
||||
self.assertEqual(layer.rendererV2(), r)
|
||||
|
||||
# TODO:
|
||||
# - fetch rect: feat with changed geometry: 1. in rect, 2. out of rect
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user