fix test by using non deprecated enum

3nids · 3nids · commit 084a2b8659b8 · 2021-06-01T08:22:24.000+02:00
diff --git a/tests/src/core/testqgis.cpp b/tests/src/core/testqgis.cpp
@@ -24,7 +24,7 @@
 #include "qgis.h"
 #include "qgsmaplayermodel.h"
 #include "qgsattributeeditorelement.h"
-#include "qgsattributeeditorrelation.h"
+#include "qgsfieldproxymodel.h"
 
 /**
  * \ingroup UnitTests
@@ -451,13 +451,13 @@ void TestQgis::testQgsEnumKeyToValue()
 
 void TestQgis::testQgsFlagValueToKeys()
 {
-  QgsAttributeEditorRelation::Buttons buttons = QgsAttributeEditorRelation::Button::Link | QgsAttributeEditorRelation::Button::AddChildFeature;
-  QCOMPARE( qgsFlagValueToKeys( buttons ), QStringLiteral( "Link|AddChildFeature" ) );
+  QgsFieldProxyModel::Filters filters = QgsFieldProxyModel::Filter::String | QgsFieldProxyModel::Filter::Double;
+  QCOMPARE( qgsFlagValueToKeys( filters ), QStringLiteral( "String|Double" ) );
 }
 void TestQgis::testQgsFlagKeysToValue()
 {
-  QCOMPARE( qgsFlagKeysToValue( QStringLiteral( "Link|AddChildFeature" ), QgsAttributeEditorRelation::Buttons( QgsAttributeEditorRelation::Button::AllButtons ) ), QgsAttributeEditorRelation::Button::Link | QgsAttributeEditorRelation::Button::AddChildFeature );
-  QCOMPARE( qgsFlagKeysToValue( QStringLiteral( "UnknownKey" ), QgsAttributeEditorRelation::Buttons( QgsAttributeEditorRelation::Button::AllButtons ) ), QgsAttributeEditorRelation::Buttons( QgsAttributeEditorRelation::Button::AllButtons ) );
+  QCOMPARE( qgsFlagKeysToValue( QStringLiteral( "String|Double" ), QgsFieldProxyModel::Filters( QgsFieldProxyModel::Filter::AllTypes ) ), QgsFieldProxyModel::Filter::String | QgsFieldProxyModel::Filter::Double );
+  QCOMPARE( qgsFlagKeysToValue( QStringLiteral( "UnknownKey" ), QgsFieldProxyModel::Filters( QgsFieldProxyModel::Filter::AllTypes ) ), QgsFieldProxyModel::Filters( QgsFieldProxyModel::Filter::AllTypes ) );
 }
 
 void TestQgis::testQMapQVariantList()

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@`
`24`	`24`	`#include "qgis.h"`
`25`	`25`	`#include "qgsmaplayermodel.h"`
`26`	`26`	`#include "qgsattributeeditorelement.h"`
`27`		`-#include "qgsattributeeditorrelation.h"`
	`27`	`+#include "qgsfieldproxymodel.h"`
`28`	`28`
`29`	`29`	`/**`
`30`	`30`	`* \ingroup UnitTests`
`@@ -451,13 +451,13 @@ void TestQgis::testQgsEnumKeyToValue()`
`451`	`451`
`452`	`452`	`void TestQgis::testQgsFlagValueToKeys()`
`453`	`453`	`{`
`454`		`- QgsAttributeEditorRelation::Buttons buttons = QgsAttributeEditorRelation::Button::Link \| QgsAttributeEditorRelation::Button::AddChildFeature;`
`455`		`- QCOMPARE( qgsFlagValueToKeys( buttons ), QStringLiteral( "Link\|AddChildFeature" ) );`
	`454`	`+ QgsFieldProxyModel::Filters filters = QgsFieldProxyModel::Filter::String \| QgsFieldProxyModel::Filter::Double;`
	`455`	`+ QCOMPARE( qgsFlagValueToKeys( filters ), QStringLiteral( "String\|Double" ) );`
`456`	`456`	`}`
`457`	`457`	`void TestQgis::testQgsFlagKeysToValue()`
`458`	`458`	`{`
`459`		`- QCOMPARE( qgsFlagKeysToValue( QStringLiteral( "Link\|AddChildFeature" ), QgsAttributeEditorRelation::Buttons( QgsAttributeEditorRelation::Button::AllButtons ) ), QgsAttributeEditorRelation::Button::Link \| QgsAttributeEditorRelation::Button::AddChildFeature );`
`460`		`- QCOMPARE( qgsFlagKeysToValue( QStringLiteral( "UnknownKey" ), QgsAttributeEditorRelation::Buttons( QgsAttributeEditorRelation::Button::AllButtons ) ), QgsAttributeEditorRelation::Buttons( QgsAttributeEditorRelation::Button::AllButtons ) );`
	`459`	`+ QCOMPARE( qgsFlagKeysToValue( QStringLiteral( "String\|Double" ), QgsFieldProxyModel::Filters( QgsFieldProxyModel::Filter::AllTypes ) ), QgsFieldProxyModel::Filter::String \| QgsFieldProxyModel::Filter::Double );`
	`460`	`+ QCOMPARE( qgsFlagKeysToValue( QStringLiteral( "UnknownKey" ), QgsFieldProxyModel::Filters( QgsFieldProxyModel::Filter::AllTypes ) ), QgsFieldProxyModel::Filters( QgsFieldProxyModel::Filter::AllTypes ) );`
`461`	`461`	`}`
`462`	`462`
`463`	`463`	`void TestQgis::testQMapQVariantList()`