diff -r 000000000000 -r 1918ee327afb tests/auto/qerrormessage/tst_qerrormessage.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/auto/qerrormessage/tst_qerrormessage.cpp	Mon Jan 11 14:00:40 2010 +0000
@@ -0,0 +1,158 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <QtTest/QtTest>
+#include <QErrorMessage>
+#include <QDebug>
+#include <QCheckBox>
+
+class tst_QErrorMessage : public QObject
+{
+    Q_OBJECT
+
+private slots:
+    void dontShowAgain();
+    void dontShowCategoryAgain();
+
+};
+
+void tst_QErrorMessage::dontShowAgain()
+{
+    QString plainString = QLatin1String("foo");
+    QString htmlString = QLatin1String("foo<br>bar");
+    QCheckBox *checkBox = 0;
+
+    QErrorMessage errorMessageDialog(0);
+
+    // show an error with plain string 
+    errorMessageDialog.showMessage(plainString);
+    QVERIFY(errorMessageDialog.isVisible());
+    checkBox = qFindChild<QCheckBox*>(&errorMessageDialog);
+    QVERIFY(checkBox);
+    QVERIFY(checkBox->isChecked());
+    errorMessageDialog.close();
+
+    errorMessageDialog.showMessage(plainString);
+    QVERIFY(errorMessageDialog.isVisible());
+    checkBox = qFindChild<QCheckBox*>(&errorMessageDialog);
+    QVERIFY(checkBox);
+    QVERIFY(checkBox->isChecked());
+    checkBox->setChecked(false);
+    errorMessageDialog.close();
+
+    errorMessageDialog.showMessage(plainString);
+    QVERIFY(!errorMessageDialog.isVisible());
+
+    // show an error with an html string
+    errorMessageDialog.showMessage(htmlString);
+    QVERIFY(errorMessageDialog.isVisible());
+    checkBox = qFindChild<QCheckBox*>(&errorMessageDialog);
+    QVERIFY(checkBox);
+    QVERIFY(!checkBox->isChecked());
+    checkBox->setChecked(true);
+    errorMessageDialog.close();
+
+    errorMessageDialog.showMessage(htmlString);
+    QVERIFY(errorMessageDialog.isVisible());
+    checkBox = qFindChild<QCheckBox*>(&errorMessageDialog);
+    QVERIFY(checkBox);
+    QVERIFY(checkBox->isChecked());
+    checkBox->setChecked(false);
+    errorMessageDialog.close();
+
+    errorMessageDialog.showMessage(htmlString);
+    QVERIFY(!errorMessageDialog.isVisible());
+}
+
+void tst_QErrorMessage::dontShowCategoryAgain()
+{
+    QString htmlString = QLatin1String("foo<br>bar");
+    QString htmlString2 = QLatin1String("foo2<br>bar2");
+    QCheckBox *checkBox = 0;
+
+    QErrorMessage errorMessageDialog(0);
+
+    errorMessageDialog.showMessage(htmlString,"Cat 1");
+    QVERIFY(errorMessageDialog.isVisible());
+    checkBox = qFindChild<QCheckBox*>(&errorMessageDialog);
+    QVERIFY(checkBox);
+    QVERIFY(checkBox->isChecked());
+    checkBox->setChecked(true);
+    errorMessageDialog.close();
+
+    errorMessageDialog.showMessage(htmlString,"Cat 1");
+    QVERIFY(errorMessageDialog.isVisible());
+    checkBox = qFindChild<QCheckBox*>(&errorMessageDialog);
+    QVERIFY(checkBox);
+    QVERIFY(checkBox->isChecked());
+    checkBox->setChecked(true);
+    errorMessageDialog.close();
+
+    errorMessageDialog.showMessage(htmlString2,"Cat 1");
+    QVERIFY(errorMessageDialog.isVisible());
+    checkBox = qFindChild<QCheckBox*>(&errorMessageDialog);
+    QVERIFY(checkBox);
+    QVERIFY(checkBox->isChecked());
+    checkBox->setChecked(true);
+    errorMessageDialog.close();
+
+    errorMessageDialog.showMessage(htmlString,"Cat 1");
+    QVERIFY(errorMessageDialog.isVisible());
+    checkBox = qFindChild<QCheckBox*>(&errorMessageDialog);
+    QVERIFY(checkBox);
+    QVERIFY(checkBox->isChecked());
+    checkBox->setChecked(false);
+    errorMessageDialog.close();
+
+    errorMessageDialog.showMessage(htmlString2,"Cat 1");
+    QVERIFY(!errorMessageDialog.isVisible());
+
+    errorMessageDialog.showMessage(htmlString,"Cat 1");
+    QVERIFY(!errorMessageDialog.isVisible());
+
+    errorMessageDialog.showMessage(htmlString);
+    QVERIFY(errorMessageDialog.isVisible());
+
+    errorMessageDialog.showMessage(htmlString,"Cat 2");
+    QVERIFY(errorMessageDialog.isVisible());
+}
+
+QTEST_MAIN(tst_QErrorMessage)
+#include "tst_qerrormessage.moc"