Add some tests for regular polygon map tools

src/app/qgsmaptooladdregularpolygon.h

@@ -19,10 +19,11 @@
 #include "qgsregularpolygon.h"
 #include "qgsmaptoolcapture.h"
 #include "qgsspinbox.h"
+#include "qgis_app.h"
 
 class QSpinBox;
 
-class QgsMapToolAddRegularPolygon: public QgsMapToolCapture
+class APP_EXPORT QgsMapToolAddRegularPolygon: public QgsMapToolCapture
 {
     Q_OBJECT
 

src/app/qgsmaptoolregularpolygon2points.h

@@ -18,8 +18,9 @@
 #define QGSMAPTOOLREGULARPOLYGON2POINTS_H
 
 #include "qgsmaptooladdregularpolygon.h"
+#include "qgis_app.h"
 
-class QgsMapToolRegularPolygon2Points: public QgsMapToolAddRegularPolygon
+class APP_EXPORT QgsMapToolRegularPolygon2Points: public QgsMapToolAddRegularPolygon
 {
     Q_OBJECT
 

src/app/qgsmaptoolregularpolygoncentercorner.h

@@ -18,8 +18,9 @@
 #define QGSMAPTOOLREGULARPOLYGONCENTERCORNER_H
 
 #include "qgsmaptooladdregularpolygon.h"
+#include "qgis_app.h"
 
-class QgsMapToolRegularPolygonCenterCorner: public QgsMapToolAddRegularPolygon
+class APP_EXPORT QgsMapToolRegularPolygonCenterCorner: public QgsMapToolAddRegularPolygon
 {
     Q_OBJECT
 

src/app/qgsmaptoolregularpolygoncenterpoint.h

@@ -18,8 +18,9 @@
 #define QGSMAPTOOLREGULARPOLYGONCENTERPOINT_H
 
 #include "qgsmaptooladdregularpolygon.h"
+#include "qgis_app.h"
 
-class QgsMapToolRegularPolygonCenterPoint: public QgsMapToolAddRegularPolygon
+class APP_EXPORT QgsMapToolRegularPolygonCenterPoint: public QgsMapToolAddRegularPolygon
 {
     Q_OBJECT
 

tests/src/app/CMakeLists.txt

@@ -103,6 +103,7 @@ ADD_QGIS_TEST(maptoolcircularstringtest testqgsmaptoolcircularstring.cpp)
 ADD_QGIS_TEST(maptoolcircletest testqgsmaptoolcircle.cpp)
 ADD_QGIS_TEST(maptoolellipsetest testqgsmaptoolellipse.cpp)
 ADD_QGIS_TEST(maptoolrectangletest testqgsmaptoolrectangle.cpp)
+ADD_QGIS_TEST(maptoolregularpolygontest testqgsmaptoolregularpolygon.cpp)
 ADD_QGIS_TEST(measuretool testqgsmeasuretool.cpp)
 ADD_QGIS_TEST(vertextool testqgsvertextool.cpp)
 ADD_QGIS_TEST(vectorlayersaveasdialogtest testqgsvectorlayersaveasdialog.cpp)

tests/src/app/testqgsmaptoolregularpolygon.cpp

@@ -0,0 +1,158 @@
+/***************************************************************************
+     testqgsmaptoolregularpolygon.cpp
+     ---------------------------
+    Date                 : January 2018
+    Copyright            : (C) 2018 by Paul Blottiere
+    Email                : paul.blottiere@oslandia.com
+ ***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+#include "qgstest.h"
+
+#include "qgisapp.h"
+#include "qgsgeometry.h"
+#include "qgsmapcanvas.h"
+#include "qgssettings.h"
+#include "qgsvectorlayer.h"
+#include "qgsmaptooladdfeature.h"
+#include "qgsgeometryutils.h"
+
+#include "testqgsmaptoolutils.h"
+#include "qgsmaptoolregularpolygon2points.h"
+#include "qgsmaptoolregularpolygoncenterpoint.h"
+#include "qgsmaptoolregularpolygoncentercorner.h"
+
+
+class TestQgsMapToolRegularPolygon : public QObject
+{
+    Q_OBJECT
+
+  public:
+    TestQgsMapToolRegularPolygon();
+
+  private slots:
+    void initTestCase();
+    void cleanupTestCase();
+
+    void testRegularPolygonFrom2Points();
+    void testRegularPolygonFromCenterAndPoint();
+    void testRegularPolygonFromCenterAndCroner();
+
+  private:
+    QgisApp *mQgisApp = nullptr;
+    QgsMapToolCapture *mParentTool = nullptr;
+    QgsMapCanvas *mCanvas = nullptr;
+    QgsVectorLayer *mLayer = nullptr;
+};
+
+TestQgsMapToolRegularPolygon::TestQgsMapToolRegularPolygon() = default;
+
+
+//runs before all tests
+void TestQgsMapToolRegularPolygon::initTestCase()
+{
+  QgsApplication::init();
+  QgsApplication::initQgis();
+
+  mQgisApp = new QgisApp();
+
+  mCanvas = new QgsMapCanvas();
+  mCanvas->setDestinationCrs( QgsCoordinateReferenceSystem( QStringLiteral( "EPSG:27700" ) ) );
+
+  // make testing layers
+  mLayer = new QgsVectorLayer( QStringLiteral( "LineStringZ?crs=EPSG:27700" ), QStringLiteral( "layer line Z" ), QStringLiteral( "memory" ) );
+  QVERIFY( mLayer->isValid() );
+  QgsProject::instance()->addMapLayers( QList<QgsMapLayer *>() << mLayer );
+
+  // set layers in canvas
+  mCanvas->setLayers( QList<QgsMapLayer *>() << mLayer );
+  mCanvas->setCurrentLayer( mLayer );
+
+  mParentTool = new QgsMapToolAddFeature( mCanvas, QgsMapToolCapture::CaptureLine );
+}
+
+void TestQgsMapToolRegularPolygon::cleanupTestCase()
+{
+  QgsApplication::exitQgis();
+}
+
+void TestQgsMapToolRegularPolygon::testRegularPolygonFrom2Points()
+{
+  QgsSettings().setValue( QStringLiteral( "/qgis/digitizing/default_z_value" ), 333 );
+  mLayer->startEditing();
+
+  QgsMapToolRegularPolygon2Points mapTool( mParentTool, mCanvas );
+  mCanvas->setMapTool( &mapTool );
+
+  TestQgsMapToolAdvancedDigitizingUtils utils( &mapTool );
+  utils.mouseClick( 0, 0, Qt::LeftButton );
+  utils.mouseMove( 2, 1 );
+  utils.mouseClick( 2, 1, Qt::RightButton );
+  QgsFeatureId newFid = utils.newFeatureId();
+
+  QCOMPARE( mLayer->featureCount(), ( long )1 );
+  QgsFeature f = mLayer->getFeature( newFid );
+
+  QString wkt = "LineStringZ (0 0 333, 2 1 333, 4 -0 333, 4 -2 333, 2 -3 333, -0 -2 333, 0 0 333)";
+  QCOMPARE( f.geometry().asWkt( 0 ), wkt );
+
+  mLayer->rollBack();
+  QgsSettings().setValue( QStringLiteral( "/qgis/digitizing/default_z_value" ), 0 );
+}
+
+void TestQgsMapToolRegularPolygon::testRegularPolygonFromCenterAndPoint()
+{
+  QgsSettings().setValue( QStringLiteral( "/qgis/digitizing/default_z_value" ), 222 );
+  mLayer->startEditing();
+
+  QgsMapToolRegularPolygonCenterPoint mapTool( mParentTool, mCanvas );
+  mCanvas->setMapTool( &mapTool );
+
+  TestQgsMapToolAdvancedDigitizingUtils utils( &mapTool );
+  utils.mouseClick( 0, 0, Qt::LeftButton );
+  utils.mouseMove( 2, 1 );
+  utils.mouseClick( 2, 1, Qt::RightButton );
+  QgsFeatureId newFid = utils.newFeatureId();
+
+  QCOMPARE( mLayer->featureCount(), ( long )1 );
+  QgsFeature f = mLayer->getFeature( newFid );
+
+  QString wkt = "LineStringZ (1 2 222, 3 -0 222, 1 -2 222, -1 -2 222, -3 0 222, -1 2 222, 1 2 222)";
+  QCOMPARE( f.geometry().asWkt( 0 ), wkt );
+
+  mLayer->rollBack();
+  QgsSettings().setValue( QStringLiteral( "/qgis/digitizing/default_z_value" ), 0 );
+}
+
+void TestQgsMapToolRegularPolygon::testRegularPolygonFromCenterAndCroner()
+{
+  QgsSettings().setValue( QStringLiteral( "/qgis/digitizing/default_z_value" ), 111 );
+  mLayer->startEditing();
+
+  QgsMapToolRegularPolygonCenterCorner mapTool( mParentTool, mCanvas );
+  mCanvas->setMapTool( &mapTool );
+
+  TestQgsMapToolAdvancedDigitizingUtils utils( &mapTool );
+  utils.mouseClick( 0, 0, Qt::LeftButton );
+  utils.mouseMove( 2, 1 );
+  utils.mouseClick( 2, 1, Qt::RightButton );
+  QgsFeatureId newFid = utils.newFeatureId();
+
+  QCOMPARE( mLayer->featureCount(), ( long )1 );
+  QgsFeature f = mLayer->getFeature( newFid );
+
+  QString wkt = "LineStringZ (2 1 111, 2 -1 111, -0 -2 111, -2 -1 111, -2 1 111, 0 2 111, 2 1 111)";
+  QCOMPARE( f.geometry().asWkt( 0 ), wkt );
+
+  mLayer->rollBack();
+  QgsSettings().setValue( QStringLiteral( "/qgis/digitizing/default_z_value" ), 0 );
+}
+
+QGSTEST_MAIN( TestQgsMapToolRegularPolygon )
+#include "testqgsmaptoolregularpolygon.moc"