diff -r 000000000000 -r 1918ee327afb tests/auto/q3header/tst_q3header.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/auto/q3header/tst_q3header.cpp	Mon Jan 11 14:00:40 2010 +0000
@@ -0,0 +1,126 @@
+/****************************************************************************
+**
+** 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 "q3header.h"
+
+//TESTED_CLASS=
+//TESTED_FILES=
+
+class tst_Q3Header : public QObject
+{
+    Q_OBJECT
+public:
+    tst_Q3Header();
+
+
+public slots:
+    void initTestCase();
+    void cleanupTestCase();
+private slots:
+    void bug_setOffset();
+    void nullStringLabel();
+
+private:
+    Q3Header *testW;
+};
+
+tst_Q3Header::tst_Q3Header()
+
+{
+}
+
+void tst_Q3Header::initTestCase()
+{
+    // Create the test class
+    testW = new Q3Header( 0, "testObject" );
+}
+
+void tst_Q3Header::cleanupTestCase()
+{
+    delete testW;
+}
+
+/*!  info/arc-15/30171 described a bug in setOffset(). Supposedly
+  fixed in change 59949. Up to Qt 3.0.2 the horizontal size was used
+  to determine whether scrolling was possible at all.  Could be merged
+  into a general setOffset() test that goes through several variations
+  of sizes and orientation.
+*/
+void tst_Q3Header::bug_setOffset()
+{
+    // create a vertical header which is wider than high.
+    testW->setOrientation( Qt::Vertical );
+    testW->addLabel( "111111111111111111111111111111111111" );
+    testW->addLabel( "222222222222222222222222222222222222" );
+    testW->addLabel( "333333333333333333333333333333333333" );
+    testW->addLabel( "444444444444444444444444444444444444" );
+    testW->setFixedSize( testW->headerWidth() * 2, testW->headerWidth() / 2 );
+
+    // we'll try to scroll down a little bit
+    int offs = testW->sectionSize( 0 ) / 2;
+    testW->setOffset( offs );
+
+    // and check whether we succeeded. In case the method used width()
+    // for the visible header length offset() would be 0.
+    QCOMPARE( testW->offset(), offs );
+}
+
+// Task 95640
+void tst_Q3Header::nullStringLabel()
+{
+    QString oldLabel = testW->label(0);
+    testW->setLabel(0, QString());
+    QCOMPARE(testW->label(0), QString());
+    testW->setLabel(0, oldLabel);
+    QCOMPARE(testW->label(0), oldLabel);
+    QCOMPARE(testW->label(testW->addLabel(QString())), QString());
+    QCOMPARE(testW->label(testW->addLabel(QString("Foo"))), QString("Foo"));
+    testW->removeLabel(testW->count()-1);
+    QCOMPARE(testW->label(testW->addLabel(QString())), QString());
+    QCOMPARE(testW->label(testW->addLabel(QString(""))), QString(""));
+}
+
+QTEST_MAIN(tst_Q3Header)
+#include "tst_q3header.moc"
+