From f5ef6bc58a3fd01e3d0b5ba97b4587b8c591567d Mon Sep 17 00:00:00 2001
From: Kurt Korbatits <kurt.korbatits@nokia.com>
Date: Mon, 23 Jan 2012 11:44:49 +1000
Subject: [PATCH] Changed qtextdocument, qtextdocumentlayout unittests to
 cleanup tmp files.

- qtextdocument unittest to remove foo.png after test.
- qtextdocumentlayout unittest to remove expected.png and img.png after test.

Change-Id: I42971e9128d399cadc87b9fd345c868065f180a9
Reviewed-by: Kurt Korbatits  <kurt.korbatits@nokia.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
---
 tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp  | 7 ++++++-
 .../text/qtextdocumentlayout/tst_qtextdocumentlayout.cpp | 9 +++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp b/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp
index 1a448f404b..71d74f7b82 100644
--- a/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp
+++ b/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp
@@ -76,6 +76,7 @@ public:
 public slots:
     void init();
     void cleanup();
+    void cleanupTestCase();
 private slots:
     void getSetCheck();
     void isEmpty();
@@ -231,7 +232,6 @@ tst_QTextDocument::tst_QTextDocument()
 
 tst_QTextDocument::~tst_QTextDocument()
 {
-    QFile::remove(QLatin1String("foo.png"));
 }
 
 void tst_QTextDocument::init()
@@ -258,6 +258,11 @@ void tst_QTextDocument::cleanup()
     doc = 0;
 }
 
+void tst_QTextDocument::cleanupTestCase()
+{
+    QFile::remove(QLatin1String("foo.png"));
+}
+
 void tst_QTextDocument::isEmpty()
 {
     QVERIFY(doc->isEmpty());
diff --git a/tests/auto/gui/text/qtextdocumentlayout/tst_qtextdocumentlayout.cpp b/tests/auto/gui/text/qtextdocumentlayout/tst_qtextdocumentlayout.cpp
index c81fba0bf1..12811c2987 100644
--- a/tests/auto/gui/text/qtextdocumentlayout/tst_qtextdocumentlayout.cpp
+++ b/tests/auto/gui/text/qtextdocumentlayout/tst_qtextdocumentlayout.cpp
@@ -60,6 +60,7 @@ public:
 public slots:
     void init();
     void cleanup();
+    void cleanupTestCase();
 
 private slots:
     void defaultPageSizeHandling();
@@ -85,6 +86,14 @@ void tst_QTextDocumentLayout::cleanup()
     doc = 0;
 }
 
+void tst_QTextDocumentLayout::cleanupTestCase()
+{
+    if (qgetenv("QTEST_KEEP_IMAGEDATA").toInt() == 0) {
+        QFile::remove(QLatin1String("expected.png"));
+        QFile::remove(QLatin1String("img.png"));
+    }
+}
+
 void tst_QTextDocumentLayout::defaultPageSizeHandling()
 {
     QAbstractTextDocumentLayout *layout = doc->documentLayout();