Add some tests

pblottiere · pblottiere · commit 35459c490072 · 2017-11-20T10:50:45.000+01:00
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -1190,6 +1190,8 @@ QgisApp::QgisApp()
   mLayerTreeView = new QgsLayerTreeView( this );
   mUndoWidget = new QgsUndoWidget( nullptr, mMapCanvas );
   mInfoBar = new QgsMessageBar( centralWidget() );
+  mPanelMenu = new QMenu( this );
+  mProgressBar = new QProgressBar( this );
   // More tests may need more members to be initialized
 }
 
diff --git a/src/app/qgsmaptoolidentifyaction.h b/src/app/qgsmaptoolidentifyaction.h
@@ -83,6 +83,8 @@ class APP_EXPORT QgsMapToolIdentifyAction : public QgsMapToolIdentify
     virtual QGis::UnitType displayDistanceUnits() const override;
     virtual QgsUnitTypes::AreaUnit displayAreaUnits() const override;
     void setClickContextScope( const QgsPoint &point );
+
+    friend class TestQgsMapToolIdentifyAction;
 };
 
 #endif
diff --git a/tests/src/app/CMakeLists.txt b/tests/src/app/CMakeLists.txt
@@ -23,6 +23,7 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}
 )
 INCLUDE_DIRECTORIES(SYSTEM
   ${QT_INCLUDE_DIR}
+  ${QWT_INCLUDE_DIR}
   ${GDAL_INCLUDE_DIR}
   ${PROJ_INCLUDE_DIR}
   ${GEOS_INCLUDE_DIR}
diff --git a/tests/src/app/testqgsmaptoolidentifyaction.cpp b/tests/src/app/testqgsmaptoolidentifyaction.cpp
@@ -24,6 +24,9 @@
 #include "qgsmapcanvas.h"
 #include "qgsunittypes.h"
 #include "qgsmaptoolidentifyaction.h"
+#include "qgisapp.h"
+#include "qgsidentifymenu.h"
+#include "qgsidentifyresultsdialog.h"
 
 #include "cpl_conv.h"
 
@@ -46,9 +49,11 @@ class TestQgsMapToolIdentifyAction : public QObject
     void identifyRasterFloat32(); // test pixel identification and decimal precision
     void identifyRasterFloat64(); // test pixel identification and decimal precision
     void identifyInvalidPolygons(); // test selecting invalid polygons
+    void clickxy(); // test if click_x and click_y variables are propagated
 
   private:
     QgsMapCanvas* canvas;
+    QgisApp *mQgisApp;
 
     QString testIdentifyRaster( QgsRasterLayer* layer, double xGeoref, double yGeoref );
     QList<QgsMapToolIdentify::IdentifyResult> testIdentifyVector( QgsVectorLayer* layer, double xGeoref, double yGeoref );
@@ -91,6 +96,8 @@ void TestQgsMapToolIdentifyAction::initTestCase()
   // enforce C locale because the tests expect it
   // (decimal separators / thousand separators)
   QLocale::setDefault( QLocale::c() );
+
+  mQgisApp = new QgisApp();
 }
 
 void TestQgsMapToolIdentifyAction::cleanupTestCase()
@@ -108,6 +115,57 @@ void TestQgsMapToolIdentifyAction::cleanup()
   delete canvas;
 }
 
+void TestQgsMapToolIdentifyAction::clickxy()
+{
+  int clickxOk = 2484588;
+  int clickyOk = 2425722;
+
+  // create temp layer
+  QScopedPointer<QgsVectorLayer> tempLayer( new QgsVectorLayer( QString( "Point?crs=epsg:3111" ), QString( "vl" ), QString( "memory" ) ) );
+  QVERIFY( tempLayer->isValid() );
+
+  // add feature
+  QgsFeature f1( tempLayer->dataProvider()->fields(), 1 );
+  QgsPoint wordPoint( clickxOk, clickyOk );
+  QgsGeometry *geom = QgsGeometry::fromPoint( wordPoint ) ;
+  f1.setGeometry( geom );
+  tempLayer->dataProvider()->addFeatures( QgsFeatureList() << f1 );
+
+  // prepare canvas
+  QgsCoordinateReferenceSystem srs( 3111, QgsCoordinateReferenceSystem::EpsgCrsId );
+  canvas->setDestinationCrs( srs );
+  canvas->setCurrentLayer( tempLayer.data() );
+
+  // init map tool identify action
+  QScopedPointer<QgsMapToolIdentifyAction> identifyAction( new QgsMapToolIdentifyAction( canvas ) );
+
+  // simulate a click on the canvas
+  QgsPoint mapPoint = canvas->getCoordinateTransform()->transform( 2484588, 2425722 );
+  QPoint point = QPoint( mapPoint.x(), mapPoint.y() );
+  QMouseEvent releases( QEvent::MouseButtonRelease, point,
+                        Qt::RightButton, Qt::LeftButton, Qt::NoModifier );
+  QgsMapMouseEvent mapReleases( 0, &releases );
+
+  identifyAction->canvasReleaseEvent( &mapReleases );
+
+  // test QgsIdentifyMenu expression context scope
+  bool ok;
+  QgsIdentifyMenu *menu = identifyAction->identifyMenu();
+  int clickx = menu->expressionContextScope().variable( "click_x" ).toString().toInt( &ok, 10 );
+  QCOMPARE( clickx, clickxOk );
+
+  int clicky = menu->expressionContextScope().variable( "click_y" ).toString().toInt( &ok, 10 );
+  QCOMPARE( clicky, clickyOk );
+
+  // test QgsIdentifyResultsDialog expression context scope
+  QgsIdentifyResultsDialog *dlg = identifyAction->resultsDialog();
+  clickx = dlg->expressionContextScope().variable( "click_x" ).toString().toInt( &ok, 10 );
+  QCOMPARE( clickx, clickxOk );
+
+  clicky = dlg->expressionContextScope().variable( "click_y" ).toString().toInt( &ok, 10 );
+  QCOMPARE( clicky, clickyOk );
+}
+
 void TestQgsMapToolIdentifyAction::lengthCalculation()
 {
   QSettings s;

Original file line number	Diff line number	Diff line change
`@@ -1190,6 +1190,8 @@ QgisApp::QgisApp()`
`1190`	`1190`	`mLayerTreeView = new QgsLayerTreeView( this );`
`1191`	`1191`	`mUndoWidget = new QgsUndoWidget( nullptr, mMapCanvas );`
`1192`	`1192`	`mInfoBar = new QgsMessageBar( centralWidget() );`
	`1193`	`+ mPanelMenu = new QMenu( this );`
	`1194`	`+ mProgressBar = new QProgressBar( this );`
`1193`	`1195`	`// More tests may need more members to be initialized`
`1194`	`1196`	`}`
`1195`	`1197`
Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}`
`23`	`23`	`)`
`24`	`24`	`INCLUDE_DIRECTORIES(SYSTEM`
`25`	`25`	`${QT_INCLUDE_DIR}`
	`26`	`+ ${QWT_INCLUDE_DIR}`
`26`	`27`	`${GDAL_INCLUDE_DIR}`
`27`	`28`	`${PROJ_INCLUDE_DIR}`
`28`	`29`	`${GEOS_INCLUDE_DIR}`