address review

qgis · Jan 28, 2021 · db422ac · db422ac
1 parent 0b19545
commit db422ac
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/src/server/services/wms/qgswmsrenderer.cpp b/src/server/services/wms/qgswmsrenderer.cpp
@@ -869,19 +869,18 @@ namespace QgsWms
     QgsRectangle mapExtent = mWmsParameters.bboxAsRectangle();
 
     QString crs = mWmsParameters.crs();
-    if ( crs.compare( "CRS:84", Qt::CaseInsensitive ) == 0 )
+    if ( crs.compare( QStringLiteral( "CRS:84" ), Qt::CaseInsensitive ) == 0 )
     {
-      crs = QString( "EPSG:4326" );
+      crs = QStringLiteral( "EPSG:4326" );
       mapExtent.invert();
     }
     else if ( crs.isEmpty() )
     {
-      crs = QString( "EPSG:4326" );
+      crs = QStringLiteral( "EPSG:4326" );
     }
 
-    QgsCoordinateReferenceSystem outputCRS;
+    QgsCoordinateReferenceSystem outputCRS = QgsCoordinateReferenceSystem::fromOgcWmsCrs( crs );
 
-    outputCRS = QgsCoordinateReferenceSystem::fromOgcWmsCrs( crs );
     if ( !outputCRS.isValid() )
     {
       QgsServiceException::ExceptionCode code;

diff --git a/tests/src/python/test_qgsserver_wms_dxf.py b/tests/src/python/test_qgsserver_wms_dxf.py
@@ -24,6 +24,8 @@
 
 from qgis.core import (QgsVectorLayer)
 
+from qgis.PyQt import QtCore
+
 # Needed on Qt 5 so that the serialization of XML is consistent among all executions
 os.environ['QT_HASH_SEED'] = '1'
 
@@ -48,16 +50,17 @@ def test_dxf_export_works_with_reverse_axis_epsg(self):
 
         r, h = self._result(self._execute_request(qs))
 
-        dxf = '/tmp/test_dxf_export.dxf'
+        tempDir = QtCore.QTemporaryDir()
+        dxf = os.path.join(tempDir.path(), 'test_dxf_export.dxf')
         f = open(dxf, 'wb')
         f.write(r)
         f.close()
 
         vl = QgsVectorLayer(dxf, "lyr", "ogr")
-        myMessage = ('Expected downloaded: %s dxf contains 1 line\nGot: %s\n' %
+        myMessage = ('Expected downloaded dxf contains: %s line\nGot: %s\n' %
                      (1, vl.featureCount()))
 
-        assert vl.featureCount() == 1, myMessage
+        self.assertEqual(vl.featureCount(), 1, myMessage)
 
         line_from_dxf = next(vl.getFeatures()).geometry().asWkt()
         line = 'LineString (450000 400000, 450100 400000)'