From aa79a840170b4cb62283036e35750c3662160794 Mon Sep 17 00:00:00 2001 From: Alessandro Pasotti Date: Tue, 15 Sep 2020 11:44:07 +0200 Subject: [PATCH] Fix server WFS-T 1.1.0 wrong case in transaction response Fixes #38558 --- src/server/services/wfs/qgswfstransaction.cpp | 6 +++--- tests/src/python/test_qgsserver_wfs.py | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/server/services/wfs/qgswfstransaction.cpp b/src/server/services/wfs/qgswfstransaction.cpp index 735a0d45a715..5f6871934f61 100644 --- a/src/server/services/wfs/qgswfstransaction.cpp +++ b/src/server/services/wfs/qgswfstransaction.cpp @@ -184,19 +184,19 @@ namespace QgsWfs QDomElement summaryElem = doc.createElement( QStringLiteral( "TransactionSummary" ) ); if ( aRequest.inserts.size() > 0 ) { - QDomElement totalInsertedElem = doc.createElement( QStringLiteral( "TotalInserted" ) ); + QDomElement totalInsertedElem = doc.createElement( QStringLiteral( "totalInserted" ) ); totalInsertedElem.appendChild( doc.createTextNode( QString::number( totalInserted ) ) ); summaryElem.appendChild( totalInsertedElem ); } if ( aRequest.updates.size() > 0 ) { - QDomElement totalUpdatedElem = doc.createElement( QStringLiteral( "TotalUpdated" ) ); + QDomElement totalUpdatedElem = doc.createElement( QStringLiteral( "totalUpdated" ) ); totalUpdatedElem.appendChild( doc.createTextNode( QString::number( totalUpdated ) ) ); summaryElem.appendChild( totalUpdatedElem ); } if ( aRequest.deletes.size() > 0 ) { - QDomElement totalDeletedElem = doc.createElement( QStringLiteral( "TotalDeleted" ) ); + QDomElement totalDeletedElem = doc.createElement( QStringLiteral( "totalDeleted" ) ); totalDeletedElem.appendChild( doc.createTextNode( QString::number( totalDeleted ) ) ); summaryElem.appendChild( totalDeletedElem ); } diff --git a/tests/src/python/test_qgsserver_wfs.py b/tests/src/python/test_qgsserver_wfs.py index 210f1b8c29c2..2b49202a4061 100644 --- a/tests/src/python/test_qgsserver_wfs.py +++ b/tests/src/python/test_qgsserver_wfs.py @@ -572,7 +572,7 @@ def _round_trip(value, field, version='1.1.0'): if version == '1.0.0': self.assertTrue(b'' in body, body) else: - self.assertTrue(b'1' in body, body) + self.assertTrue(b'1' in body, body) header, body = self._execute_request("?MAP=%s&SERVICE=WFS&REQUEST=GetFeature&TYPENAME=cdb_lines&FEATUREID=cdb_lines.22" % ( self.testdata_path + 'test_project_wms_grouped_layers.qgs')) if value is not None: @@ -606,7 +606,7 @@ def _round_trip(value, field, version='1.1.0'): if version == '1.0.0': self.assertTrue(b'' in body, body) else: - self.assertTrue(b'0' in body) + self.assertTrue(b'0' in body) self.assertTrue(b'NOT NULL constraint error on layer \'cdb_lines\', field \'name\'' in body, body) def test_describeFeatureTypeGeometryless(self):