Add rendering test, rename layout map test function

qgis · May 4, 2021 · 9a28e11 · 9a28e11
1 parent 8299547
commit 9a28e11
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 8 deletions.
diff --git a/tests/src/providers/testqgswmsprovider.cpp b/tests/src/providers/testqgswmsprovider.cpp
@@ -158,7 +158,37 @@ class TestQgsWmsProvider: public QObject
       QgsRasterLayer layer( uq.toString(), "isle_of_man", "wms" );
       QVERIFY( layer.isValid() );
 
-      QVERIFY( imageCheck( "mbtiles_1", &layer, layer.extent() ) );
+      QgsMapSettings mapSettings;
+      mapSettings.setLayers( QList<QgsMapLayer *>() << &layer );
+      mapSettings.setExtent( layer.extent() );
+      mapSettings.setOutputSize( QSize( 400, 400 ) );
+      mapSettings.setOutputDpi( 96 );
+      QVERIFY( imageCheck( "mbtiles_1", mapSettings ) );
+    }
+
+    void testDpiDependentData()
+    {
+      QString dataDir( TEST_DATA_DIR );
+      QUrlQuery uq;
+      uq.addQueryItem( "type", "mbtiles" );
+      uq.addQueryItem( "url", QUrl::fromLocalFile( dataDir + "/isle_of_man_xxx_invalid.mbtiles" ).toString() );
+
+      // check first that we do not accept invalid mbtiles paths
+      QgsRasterLayer layerInvalid( uq.toString(), "invalid", "wms" );
+      //QgsWmsProvider providerInvalid( uq.toString(), QgsDataProvider::ProviderOptions() );
+      QVERIFY( !layerInvalid.isValid() );
+
+      uq.addQueryItem( "url", QUrl::fromLocalFile( dataDir + "/isle_of_man.mbtiles" ).toString() );
+      QgsRasterLayer layer( uq.toString(), "isle_of_man", "wms" );
+      QVERIFY( layer.isValid() );
+
+      QgsMapSettings mapSettings;
+      mapSettings.setLayers( QList<QgsMapLayer *>() << &layer );
+      mapSettings.setExtent( layer.extent() );
+      mapSettings.setOutputSize( QSize( 400, 400 ) );
+      mapSettings.setOutputDpi( 96 );
+      mapSettings.setDpiTarget( 48 );
+      QVERIFY( imageCheck( "mbtiles_dpidependentdata", mapSettings ) );
     }
 
     void providerUriUpdates()
@@ -213,15 +243,10 @@ class TestQgsWmsProvider: public QObject
       QVERIFY( provider.layerMetadata().rights().at( 0 ).startsWith( "Base map and data from OpenStreetMap and OpenStreetMap Foundation" ) );
     }
 
-    bool imageCheck( const QString &testType, QgsMapLayer *layer, const QgsRectangle &extent )
+    bool imageCheck( const QString &testType, QgsMapSettings &mapSettings )
     {
       //use the QgsRenderChecker test utility class to
       //ensure the rendered output matches our control image
-      QgsMapSettings mapSettings;
-      mapSettings.setLayers( QList<QgsMapLayer *>() << layer );
-      mapSettings.setExtent( extent );
-      mapSettings.setOutputSize( QSize( 400, 400 ) );
-      mapSettings.setOutputDpi( 96 );
       QgsMultiRenderChecker myChecker;
       myChecker.setControlPathPrefix( QStringLiteral( "wmsprovider" ) );
       myChecker.setControlName( "expected_" + testType );

diff --git a/tests/src/python/test_qgslayoutmap.py b/tests/src/python/test_qgslayoutmap.py
@@ -860,7 +860,7 @@ def testCrsChanged(self):
         map.refresh()
         self.assertEqual(len(spy), 7)
 
-    def testCrsChanged(self):
+    def testMapSettingsDpiTarget(self):
         """
         Test that the CRS changed signal is emitted in the right circumstances
         """