From: Frank Reininghaus <frank78ac@googlemail.com>
Date: Sat, 20 Nov 2010 19:13:57 +0000 (+0000)
Subject: Backup and restore the zoom level in
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/730ac2c5975964eb190c681f475af6a92036ad94?ds=inline

Backup and restore the zoom level in
bug234600_overlappingIconsWhenZooming() such that it's the standard
value again in the following test. Also verify that the zoom level is
as expected after each call to DolphinView::setZoomLevel(int).

svn path=/trunk/KDE/kdebase/apps/; revision=1199137
---

diff --git a/src/tests/dolphindetailsviewtest.cpp b/src/tests/dolphindetailsviewtest.cpp
index 6f10c0f55..03d3ade1d 100644
--- a/src/tests/dolphindetailsviewtest.cpp
+++ b/src/tests/dolphindetailsviewtest.cpp
@@ -237,6 +237,7 @@ void DolphinDetailsViewTest::bug234600_overlappingIconsWhenZooming()
 
     // Setting the zoom level to the minimum value and triggering DolphinDetailsView::currentChanged(...)
     // should make sure that the bug is triggered.
+    int zoomLevelBackup = m_view->zoomLevel();
     int zoomLevel = ZoomLevelInfo::minimumLevel();
     m_view->setZoomLevel(zoomLevel);
 
@@ -248,11 +249,13 @@ void DolphinDetailsViewTest::bug234600_overlappingIconsWhenZooming()
     while(zoomLevel < ZoomLevelInfo::maximumLevel()) {
         zoomLevel++;
         m_view->setZoomLevel(zoomLevel);
+        QCOMPARE(m_view->zoomLevel(), zoomLevel);
 
         //Check for each zoom level that the height of each item is at least the icon size.
         QVERIFY(detailsView->visualRect(index1).height() >= ZoomLevelInfo::iconSizeForZoomLevel(zoomLevel));
     }
 
+    m_view->setZoomLevel(zoomLevelBackup);
     m_view->hide();
     cleanupTestDir();
 }