Test for relationreference field formatter deps

qgis · Dec 13, 2019 · a977343 · a977343
1 parent 4ad62aa
commit a977343
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 8 deletions.
diff --git a/python/core/auto_generated/fieldformatter/qgsrelationreferencefieldformatter.sip.in b/python/core/auto_generated/fieldformatter/qgsrelationreferencefieldformatter.sip.in
@@ -39,7 +39,7 @@ Default constructor of field formatter for a relation reference field.
     virtual QVariant createCache( QgsVectorLayer *layer, int fieldIndex, const QVariantMap &config ) const;
 
 
-    virtual QList<QgsVectorLayerRef> layerDependencies( const QVariantMap &config ) const;
+
 
 };
 

diff --git a/python/core/auto_generated/fieldformatter/qgsvaluerelationfieldformatter.sip.in b/python/core/auto_generated/fieldformatter/qgsvaluerelationfieldformatter.sip.in
@@ -128,8 +128,6 @@ Returns the (possibly NULL) layer from the widget's ``config`` and ``project``
 .. versionadded:: 3.8
 %End
 
-    virtual QList<QgsVectorLayerRef> layerDependencies( const QVariantMap &config ) const;
-
 };
 
 

diff --git a/src/core/fieldformatter/qgsrelationreferencefieldformatter.h b/src/core/fieldformatter/qgsrelationreferencefieldformatter.h
@@ -44,7 +44,10 @@ class CORE_EXPORT QgsRelationReferenceFieldFormatter : public QgsFieldFormatter
 
     QVariant createCache( QgsVectorLayer *layer, int fieldIndex, const QVariantMap &config ) const override;
 
-    QList<QgsVectorLayerRef> layerDependencies( const QVariantMap &config ) const override;
+    QList<QgsVectorLayerRef> layerDependencies( const QVariantMap &config ) const override SIP_SKIP;
+
+    //friend class TestQgsRelationReferenceFieldFormatter;
+
 };
 
 #endif // QGSRELATIONREFERENCEFIELDKIT_H
diff --git a/src/core/fieldformatter/qgsvaluerelationfieldformatter.h b/src/core/fieldformatter/qgsvaluerelationfieldformatter.h
@@ -125,7 +125,7 @@ class CORE_EXPORT QgsValueRelationFieldFormatter : public QgsFieldFormatter
      */
     static QgsVectorLayer *resolveLayer( const QVariantMap &config, const QgsProject *project );
 
-    QList<QgsVectorLayerRef> layerDependencies( const QVariantMap &config ) const override;
+    QList<QgsVectorLayerRef> layerDependencies( const QVariantMap &config ) const override SIP_SKIP;
 };
 
 Q_DECLARE_METATYPE( QgsValueRelationFieldFormatter::ValueRelationCache )

diff --git a/src/gui/editorwidgets/qgsrelationreferencewidgetwrapper.h b/src/gui/editorwidgets/qgsrelationreferencewidgetwrapper.h
@@ -19,7 +19,6 @@
 #include "qgseditorwidgetwrapper.h"
 #include "qgis_sip.h"
 #include "qgis_gui.h"
-#include "qgsvectorlayerref.h"
 
 class QgsRelationReferenceWidget;
 class QgsMapCanvas;
@@ -79,8 +78,6 @@ class GUI_EXPORT QgsRelationReferenceWidgetWrapper : public QgsEditorWidgetWrapp
     QgsMessageBar *mMessageBar = nullptr;
     bool mIndeterminateState;
 
-    friend class TestQgsRelationReferenceWidget;
-
 };
 
 #endif // QGSRELATIONREFERENCEWIDGETWRAPPER_H
diff --git a/tests/src/core/CMakeLists.txt b/tests/src/core/CMakeLists.txt
@@ -201,6 +201,7 @@ SET(TESTS
  testqgsrasterlayer.cpp
  testqgsrastersublayer.cpp
  testqgsrectangle.cpp
+ testqgsrelationreferencefieldformatter.cpp
  testqgsrenderers.cpp
  testqgsrulebasedrenderer.cpp
  testqgssettings.cpp