Update dxf unit tests

qgis · Mar 27, 2019 · b702c30 · b702c30
1 parent 66d4de6
commit b702c30
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/tests/src/server/wms/CMakeLists.txt b/tests/src/server/wms/CMakeLists.txt
@@ -34,6 +34,7 @@ SET(MODULE_WMS_SRCS
   ${CMAKE_SOURCE_DIR}/src/server/services/wms/qgslayerrestorer.cpp
   ${CMAKE_SOURCE_DIR}/src/server/services/wms/qgsmaprendererjobproxy.cpp
   ${CMAKE_SOURCE_DIR}/src/server/services/wms/qgswmsparameters.cpp
+  ${CMAKE_SOURCE_DIR}/src/server/services/wms/qgswmsrendercontext.cpp
 )
 
 MACRO (ADD_QGIS_TEST TESTSRC)

diff --git a/tests/src/server/wms/test_qgsserver_wms_dxf.cpp b/tests/src/server/wms/test_qgsserver_wms_dxf.cpp
@@ -19,6 +19,7 @@
 #include "qgsserverinterfaceimpl.h"
 #include "qgswmsparameters.h"
 #include "qgswmsrenderer.h"
+#include "qgswmsrendercontext.h"
 
 /**
  * \ingroup UnitTests
@@ -76,9 +77,17 @@ void TestQgsServerWmsDxf::use_title_as_layername_true()
   QgsServiceRegistry registry;
   QgsServerSettings settings;
   QgsServerInterfaceImpl interface( &cache, &registry, &settings );
-  QgsWms::QgsRenderer renderer( &interface, &project, parameters );
 
+  QgsWms::QgsWmsRenderContext context( &project, &interface );
+  context.setFlag( QgsWms::QgsWmsRenderContext::UseWfsLayersOnly );
+  context.setFlag( QgsWms::QgsWmsRenderContext::UseOpacity );
+  context.setFlag( QgsWms::QgsWmsRenderContext::UseFilter );
+  context.setFlag( QgsWms::QgsWmsRenderContext::SetAccessControl );
+  context.setParameters( parameters );
+
+  QgsWms::QgsRenderer renderer( context );
   QgsDxfExport exporter = renderer.getDxf();
+
   const QString name = exporter.layerName( vl );
   QCOMPARE( exporter.layerName( vl ), QString( "testlayer \u00E8\u00E9" ) );
 
@@ -117,9 +126,17 @@ void TestQgsServerWmsDxf::use_title_as_layername_false()
   QgsServiceRegistry registry;
   QgsServerSettings settings;
   QgsServerInterfaceImpl interface( &cache, &registry, &settings );
-  QgsWms::QgsRenderer renderer( &interface, &project, parameters );
 
+  QgsWms::QgsWmsRenderContext context( &project, &interface );
+  context.setFlag( QgsWms::QgsWmsRenderContext::UseWfsLayersOnly );
+  context.setFlag( QgsWms::QgsWmsRenderContext::UseOpacity );
+  context.setFlag( QgsWms::QgsWmsRenderContext::UseFilter );
+  context.setFlag( QgsWms::QgsWmsRenderContext::SetAccessControl );
+  context.setParameters( parameters );
+
+  QgsWms::QgsRenderer renderer( context );
   QgsDxfExport exporter = renderer.getDxf();
+
   const QString name = exporter.layerName( vl );
   QCOMPARE( exporter.layerName( vl ), QString( "A test vector layer" ) );