fix test

qgis · May 23, 2023 · f0ec61b · f0ec61b
1 parent 916cbb8
commit f0ec61b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/app/qgsmergeattributesdialog.cpp b/src/app/qgsmergeattributesdialog.cpp
@@ -234,7 +234,9 @@ void QgsMergeAttributesDialog::createTableWidgetContents()
 
     if ( !mVectorLayer->dataProvider()->defaultValueClause( idx ).isEmpty() )
     {
-      mTableWidget->item( mTableWidget->rowCount() - 1, j )->setData( Qt::DisplayRole, mVectorLayer->dataProvider()->defaultValueClause( idx ) );
+      QVariant v = mVectorLayer->dataProvider()->defaultValueClause( idx );
+      mTableWidget->item( mTableWidget->rowCount() - 1, j )->setData( Qt::DisplayRole, v );
+      mTableWidget->item( mTableWidget->rowCount() - 1, j )->setData( Qt::UserRole, v );
       setToManual = true;
     }
     else
@@ -775,7 +777,6 @@ QgsAttributes QgsMergeAttributesDialog::mergedAttributes() const
     if ( !comboBox )
       continue;
 
-
     QVariant value;
     QWidget *w = mTableWidget->cellWidget( mFeatureList.size() + 1, widgetIndex );
     QgsEditorWidgetWrapper *eww = QgsEditorWidgetWrapper::fromWidget( w );

diff --git a/tests/src/app/testqgsmergeattributesdialog.cpp b/tests/src/app/testqgsmergeattributesdialog.cpp
@@ -86,7 +86,7 @@ class TestQgsMergeattributesDialog : public QObject
 
       // At beginnning the first feature of the list is the target
       QCOMPARE( dialog.targetFeatureId(), FID_NULL );
-      QCOMPARE( dialog.mergedAttributes().first(), "Autogenerate" );
+      QCOMPARE( dialog.mergedAttributes()[0], "Autogenerate" );
 
       // Check after taking feature with largest geometry
       QVERIFY( QMetaObject::invokeMethod( &dialog, "mFromLargestPushButton_clicked" ) );