Update unit tests

pblottiere · Oct 12, 2023 · 37aee39 · 37aee39
1 parent eab7904
commit 37aee39
Show file tree

Hide file tree

Showing 10 changed files with 6 additions and 7 deletions.
diff --git a/tests/src/analysis/testqgsprocessingalgspt1.cpp b/tests/src/analysis/testqgsprocessingalgspt1.cpp
@@ -1351,11 +1351,11 @@ void TestQgsProcessingAlgsPt1::flattenRelations()
   QVERIFY( res.contains( QgsAttributes() << QStringLiteral( "B52" ) << 3 << QStringLiteral( "B52" ) << 0LL << 10.0 << 2 << 1 << 3 << QStringLiteral( "Point (-103 23)" ) ) );
   QVERIFY( res.contains( QgsAttributes() << QStringLiteral( "B52" ) << 3 << QStringLiteral( "B52" ) << 12LL << 10.0 << 1 << 1 << 2 << QStringLiteral( "Point (-103 23)" ) ) );
   QVERIFY( res.contains( QgsAttributes() << QStringLiteral( "B52" ) << 3 << QStringLiteral( "B52" ) << 34LL << 10.0 << 2 << 1 << 3 << QStringLiteral( "Point (-103 23)" ) ) );
-  QVERIFY( res.contains( QgsAttributes() << QStringLiteral( "B52" ) << 3 << QStringLiteral( "B52" ) << 80LL << 10.0 << 2 << 1 << 3 << QStringLiteral( "Point (-103 23)" ) ) );
+  QVERIFY( res.contains( QgsAttributes() << QStringLiteral( "B52" ) << 3 << QStringLiteral( "B52" ) << 89LL << 10.0 << 2 << 1 << 3 << QStringLiteral( "Point (-103 23)" ) ) );
   QVERIFY( res.contains( QgsAttributes() << QStringLiteral( "Jet" ) << 1 << QStringLiteral( "Jet" ) << 90LL << 3.0 << 2 << 0 << 2 << QStringLiteral( "Point (-117 37)" ) ) );
   QVERIFY( res.contains( QgsAttributes() << QStringLiteral( "Jet" ) << 1 << QStringLiteral( "Jet" ) << 85LL << 3.0 << 1 << 1 << 2 << QStringLiteral( "Point (-117 37)" ) ) );
   QVERIFY( res.contains( QgsAttributes() << QStringLiteral( "Jet" ) << 1 << QStringLiteral( "Jet" ) << 95LL << 3.0 << 1 << 1 << 2 << QStringLiteral( "Point (-117 37)" ) ) );
-  QVERIFY( res.contains( QgsAttributes() << QStringLiteral( "Jet" ) << 1 << QStringLiteral( "Jet" ) << 90LL << 3.0 << 1 << 0 << 1 << QStringLiteral( "Point (-117 37)" ) ) );
+  QVERIFY( res.contains( QgsAttributes() << QStringLiteral( "Jet" ) << 1 << QStringLiteral( "Jet" ) << 91LL << 3.0 << 1 << 0 << 1 << QStringLiteral( "Point (-117 37)" ) ) );
   QVERIFY( res.contains( QgsAttributes() << QStringLiteral( "Jet" ) << 1 << QStringLiteral( "Jet" ) << 160LL << 4.0 << 2 << 0 << 2 << QStringLiteral( "Point (-117 37)" ) ) );
   QVERIFY( res.contains( QgsAttributes() << QStringLiteral( "Jet" ) << 1 << QStringLiteral( "Jet" ) << 180LL << 3.0 << 1 << 0 << 1 << QStringLiteral( "Point (-117 37)" ) ) );
   QVERIFY( res.contains( QgsAttributes() << QStringLiteral( "Jet" ) << 1 << QStringLiteral( "Jet" ) << 140LL << 10.0 << 1 << 1 << 2 << QStringLiteral( "Point (-117 37)" ) ) );

diff --git a/tests/src/core/testqgsvectordataprovider.cpp b/tests/src/core/testqgsvectordataprovider.cpp
@@ -100,7 +100,7 @@ static void checkFid4( QgsFeature &f, bool hasGeometry, bool hasAttrs, int onlyO
   if ( hasAttrs )
   {
     QCOMPARE( attrs[0].toString(), ( onlyOneAttribute == -1 || onlyOneAttribute == 0 ) ? QString( "Jet" ) : QString() );
-    QCOMPARE( attrs[1].toInt(), ( onlyOneAttribute == -1 || onlyOneAttribute == 1 ) ? 90 : 0 );
+    QCOMPARE( attrs[1].toInt(), ( onlyOneAttribute == -1 || onlyOneAttribute == 1 ) ? 91 : 0 );
     QCOMPARE( attrs[2].toInt(), ( onlyOneAttribute == -1 || onlyOneAttribute == 2 ) ? 3 : 0 );
   }
   else

diff --git a/tests/src/gui/testqgsdualview.cpp b/tests/src/gui/testqgsdualview.cpp
@@ -227,19 +227,18 @@ void TestQgsDualView::testSort()
            <<  QStringLiteral( "0" )
            <<  QStringLiteral( "12" )
            <<  QStringLiteral( "34" )
-           <<  QStringLiteral( "80" )
            <<  QStringLiteral( "85" )
+           <<  QStringLiteral( "89" )
            <<  QStringLiteral( "90" )
-           <<  QStringLiteral( "90" )
+           <<  QStringLiteral( "91" )
            <<  QStringLiteral( "95" )
            <<  QStringLiteral( "100" )
            <<  QStringLiteral( "140" )
            <<  QStringLiteral( "160" )
            <<  QStringLiteral( "180" )
            <<  QStringLiteral( "240" )
            <<  QStringLiteral( "270" )
-           <<  QStringLiteral( "300" )
-           <<  QStringLiteral( "340" );
+           <<  QStringLiteral( "300" );
 
   mDualView->setSortExpression( QStringLiteral( "Heading" ) );
 

diff --git a/...poserattributetable_columnwidth/expected_composerattributetable_columnwidth.png b/...poserattributetable_columnwidth/expected_composerattributetable_columnwidth.png
diff --git a/...tetable_conditionalstyles/expected_composerattributetable_conditionalstyles.png b/...tetable_conditionalstyles/expected_composerattributetable_conditionalstyles.png
diff --git a/...nditionalstyles_text/expected_composerattributetable_conditionalstyles_text.png b/...nditionalstyles_text/expected_composerattributetable_conditionalstyles_text.png
diff --git a/...pected_composerattributetable_render/expected_composerattributetable_render.png b/...pected_composerattributetable_render/expected_composerattributetable_render.png
diff --git a/...serTemplateAttributeTable_0/expected_importComposerTemplateAttributeTable_0.png b/...serTemplateAttributeTable_0/expected_importComposerTemplateAttributeTable_0.png
diff --git a/tests/testdata/control_images/expected_single/default/expected_single.png b/tests/testdata/control_images/expected_single/default/expected_single.png
diff --git a/...implemarker_boundsrotationoffset/expected_simplemarker_boundsrotationoffset.png b/...implemarker_boundsrotationoffset/expected_simplemarker_boundsrotationoffset.png