Moving relevant tests to corelib/kernel
Added Test for qmetaproperty Marked QSocketNotifier Autotest as insignificant. See QTBUG-21204 Marked qtranslator Autotest as insignificant. See QTBUG-21125 Marked corelib/io/qfile/largefile as insignificant. See QTBUG-21175 Task-number: QTBUG-21066 Change-Id: I2a7f6587845c355091bb07c8dd3d1557d16db0be Reviewed-on: http://codereview.qt.nokia.com/3598 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
This commit is contained in:
parent
a90f50942e
commit
3a7e6157d1
@ -11,7 +11,6 @@ SUBDIRS=\
|
|||||||
qcache \
|
qcache \
|
||||||
qchar \
|
qchar \
|
||||||
qcontiguouscache \
|
qcontiguouscache \
|
||||||
qcoreapplication \
|
|
||||||
qcryptographichash \
|
qcryptographichash \
|
||||||
qdate \
|
qdate \
|
||||||
qdatetime \
|
qdatetime \
|
||||||
@ -24,11 +23,8 @@ SUBDIRS=\
|
|||||||
qline \
|
qline \
|
||||||
qmap \
|
qmap \
|
||||||
qmargins \
|
qmargins \
|
||||||
qmath \
|
|
||||||
qmetatype \
|
|
||||||
qmutex \
|
qmutex \
|
||||||
qmutexlocker \
|
qmutexlocker \
|
||||||
qobject \
|
|
||||||
qobjectrace \
|
qobjectrace \
|
||||||
qplugin \
|
qplugin \
|
||||||
qpluginloader \
|
qpluginloader \
|
||||||
@ -63,14 +59,12 @@ SUBDIRS=\
|
|||||||
qthreadstorage \
|
qthreadstorage \
|
||||||
qtime \
|
qtime \
|
||||||
qtimeline \
|
qtimeline \
|
||||||
qtimer \
|
|
||||||
qtmd5 \
|
qtmd5 \
|
||||||
qtokenautomaton \
|
qtokenautomaton \
|
||||||
quuid \
|
quuid \
|
||||||
qvarlengtharray \
|
qvarlengtharray \
|
||||||
qvector \
|
qvector \
|
||||||
qwaitcondition \
|
qwaitcondition \
|
||||||
qwineventnotifier \
|
|
||||||
qwritelocker \
|
qwritelocker \
|
||||||
selftests \
|
selftests \
|
||||||
utf8
|
utf8
|
||||||
|
@ -4,4 +4,5 @@ SUBDIRS=\
|
|||||||
codecs \
|
codecs \
|
||||||
concurrent \
|
concurrent \
|
||||||
global \
|
global \
|
||||||
io
|
io \
|
||||||
|
kernel
|
||||||
|
@ -6,3 +6,4 @@ SOURCES += tst_largefile.cpp
|
|||||||
wince*: SOURCES += $$QT_SOURCE_TREE/src/corelib/kernel/qfunctions_wince.cpp
|
wince*: SOURCES += $$QT_SOURCE_TREE/src/corelib/kernel/qfunctions_wince.cpp
|
||||||
|
|
||||||
CONFIG += parallel_test
|
CONFIG += parallel_test
|
||||||
|
CONFIG += insignificant_test # QTBUG-21175
|
||||||
|
22
tests/auto/corelib/kernel/kernel.pro
Normal file
22
tests/auto/corelib/kernel/kernel.pro
Normal file
@ -0,0 +1,22 @@
|
|||||||
|
TEMPLATE=subdirs
|
||||||
|
SUBDIRS=\
|
||||||
|
qabstractitemmodel \
|
||||||
|
qcoreapplication \
|
||||||
|
qeventloop \
|
||||||
|
qitemmodel \
|
||||||
|
qmath \
|
||||||
|
qmetaobject \
|
||||||
|
qmetatype \
|
||||||
|
qmimedata \
|
||||||
|
qobject \
|
||||||
|
qpointer \
|
||||||
|
qsignalmapper \
|
||||||
|
qsocketnotifier \
|
||||||
|
qtimer \
|
||||||
|
# qtipc \ # needs to be moved to qtscript
|
||||||
|
qtranslator \
|
||||||
|
qvariant \
|
||||||
|
qwineventnotifier
|
||||||
|
|
||||||
|
!contains(QT_CONFIG, private_tests): SUBDIRS -= \
|
||||||
|
qsocketnotifier
|
@ -0,0 +1,9 @@
|
|||||||
|
load(qttest_p4)
|
||||||
|
|
||||||
|
INCLUDEPATH += $$PWD/../../../modeltest
|
||||||
|
QT += widgets
|
||||||
|
SOURCES += tst_qabstractitemmodel.cpp ../../../modeltest/dynamictreemodel.cpp ../../../modeltest/modeltest.cpp
|
||||||
|
HEADERS += ../../../modeltest/dynamictreemodel.h ../../../modeltest/modeltest.h
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -59,7 +59,7 @@
|
|||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "../../shared/util.h"
|
#include "../../../../shared/util.h"
|
||||||
|
|
||||||
//TESTED_CLASS=
|
//TESTED_CLASS=
|
||||||
//TESTED_FILES=
|
//TESTED_FILES=
|
@ -0,0 +1,4 @@
|
|||||||
|
load(qttest_p4)
|
||||||
|
QT = core gui
|
||||||
|
SOURCES += tst_qmetaproperty.cpp
|
||||||
|
|
115
tests/auto/corelib/kernel/qmetaproperty/tst_qmetaproperty.cpp
Normal file
115
tests/auto/corelib/kernel/qmetaproperty/tst_qmetaproperty.cpp
Normal file
@ -0,0 +1,115 @@
|
|||||||
|
/****************************************************************************
|
||||||
|
**
|
||||||
|
** Copyright (C) 2011 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$
|
||||||
|
** GNU Lesser General Public License Usage
|
||||||
|
** 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.
|
||||||
|
**
|
||||||
|
** GNU General Public License Usage
|
||||||
|
** Alternatively, this file may be used under the terms of the GNU General
|
||||||
|
** Public License version 3.0 as published by the Free Software Foundation
|
||||||
|
** and appearing in the file LICENSE.GPL included in the packaging of this
|
||||||
|
** file. Please review the following information to ensure the GNU General
|
||||||
|
** Public License version 3.0 requirements will be met:
|
||||||
|
** http://www.gnu.org/copyleft/gpl.html.
|
||||||
|
**
|
||||||
|
** Other Usage
|
||||||
|
** Alternatively, this file may be used in accordance with the terms and
|
||||||
|
** conditions contained in a signed written agreement between you and Nokia.
|
||||||
|
**
|
||||||
|
**
|
||||||
|
**
|
||||||
|
**
|
||||||
|
**
|
||||||
|
** $QT_END_LICENSE$
|
||||||
|
**
|
||||||
|
****************************************************************************/
|
||||||
|
|
||||||
|
|
||||||
|
#include <QtTest/QtTest>
|
||||||
|
|
||||||
|
#include <qobject.h>
|
||||||
|
#include <qmetaobject.h>
|
||||||
|
|
||||||
|
class tst_QMetaProperty : public QObject
|
||||||
|
{
|
||||||
|
Q_OBJECT
|
||||||
|
Q_PROPERTY(EnumType value WRITE setValue READ getValue)
|
||||||
|
Q_PROPERTY(EnumType value2 WRITE set_value READ get_value)
|
||||||
|
Q_PROPERTY(int value8 READ value8)
|
||||||
|
Q_PROPERTY(int value9 READ value9 CONSTANT)
|
||||||
|
Q_PROPERTY(int value10 READ value10 FINAL)
|
||||||
|
|
||||||
|
private slots:
|
||||||
|
void hasStdCppSet();
|
||||||
|
void isConstant();
|
||||||
|
void isFinal();
|
||||||
|
|
||||||
|
public:
|
||||||
|
enum EnumType { EnumType1 };
|
||||||
|
|
||||||
|
void setValue(EnumType) {}
|
||||||
|
EnumType getValue() const { return EnumType1; }
|
||||||
|
void set_value(EnumType) {}
|
||||||
|
EnumType get_value() const { return EnumType1; }
|
||||||
|
|
||||||
|
int value8() const { return 1; }
|
||||||
|
int value9() const { return 1; }
|
||||||
|
int value10() const { return 1; }
|
||||||
|
};
|
||||||
|
|
||||||
|
void tst_QMetaProperty::hasStdCppSet()
|
||||||
|
{
|
||||||
|
const QMetaObject *mo = metaObject();
|
||||||
|
|
||||||
|
QMetaProperty prop = mo->property(mo->indexOfProperty("value"));
|
||||||
|
QVERIFY(prop.isValid());
|
||||||
|
QVERIFY(prop.hasStdCppSet());
|
||||||
|
|
||||||
|
prop = mo->property(mo->indexOfProperty("value2"));
|
||||||
|
QVERIFY(prop.isValid());
|
||||||
|
QVERIFY(!prop.hasStdCppSet());
|
||||||
|
}
|
||||||
|
|
||||||
|
void tst_QMetaProperty::isConstant()
|
||||||
|
{
|
||||||
|
const QMetaObject *mo = metaObject();
|
||||||
|
|
||||||
|
QMetaProperty prop = mo->property(mo->indexOfProperty("value8"));
|
||||||
|
QVERIFY(prop.isValid());
|
||||||
|
QVERIFY(!prop.isConstant());
|
||||||
|
|
||||||
|
prop = mo->property(mo->indexOfProperty("value9"));
|
||||||
|
QVERIFY(prop.isValid());
|
||||||
|
QVERIFY(prop.isConstant());
|
||||||
|
}
|
||||||
|
|
||||||
|
void tst_QMetaProperty::isFinal()
|
||||||
|
{
|
||||||
|
const QMetaObject *mo = metaObject();
|
||||||
|
|
||||||
|
QMetaProperty prop = mo->property(mo->indexOfProperty("value10"));
|
||||||
|
QVERIFY(prop.isValid());
|
||||||
|
QVERIFY(prop.isFinal());
|
||||||
|
|
||||||
|
prop = mo->property(mo->indexOfProperty("value9"));
|
||||||
|
QVERIFY(prop.isValid());
|
||||||
|
QVERIFY(!prop.isFinal());
|
||||||
|
}
|
||||||
|
|
||||||
|
QTEST_MAIN(tst_QMetaProperty)
|
||||||
|
#include "tst_qmetaproperty.moc"
|
@ -8,4 +8,4 @@ include(../platformsocketengine/platformsocketengine.pri)
|
|||||||
|
|
||||||
symbian: TARGET.CAPABILITY = NetworkServices
|
symbian: TARGET.CAPABILITY = NetworkServices
|
||||||
|
|
||||||
|
CONFIG += insignificant_test # QTBUG-21204
|
@ -50,7 +50,7 @@
|
|||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "../../shared/util.h"
|
#include "../../../../shared/util.h"
|
||||||
|
|
||||||
|
|
||||||
//TESTED_CLASS=
|
//TESTED_CLASS=
|
@ -9,4 +9,4 @@ wince*|symbian: {
|
|||||||
DEPLOYMENT += addFiles
|
DEPLOYMENT += addFiles
|
||||||
}
|
}
|
||||||
|
|
||||||
|
CONFIG += insignificant_test # QTBUG-21125
|
@ -10,7 +10,6 @@ SUBDIRS=\
|
|||||||
languagechange \
|
languagechange \
|
||||||
modeltest \
|
modeltest \
|
||||||
qabstractbutton \
|
qabstractbutton \
|
||||||
qabstractitemmodel \
|
|
||||||
qabstractitemview \
|
qabstractitemview \
|
||||||
qabstractprintdialog \
|
qabstractprintdialog \
|
||||||
qabstractproxymodel \
|
qabstractproxymodel \
|
||||||
@ -90,12 +89,9 @@ SUBDIRS=\
|
|||||||
qmainwindow \
|
qmainwindow \
|
||||||
qmdisubwindow \
|
qmdisubwindow \
|
||||||
qmessagebox \
|
qmessagebox \
|
||||||
qmetaobject \
|
|
||||||
qmimedata \
|
|
||||||
qnetworkaccessmanager_and_qprogressdialog \
|
qnetworkaccessmanager_and_qprogressdialog \
|
||||||
qopengl \
|
qopengl \
|
||||||
qplaintextedit \
|
qplaintextedit \
|
||||||
qpointer \
|
|
||||||
qprogressbar \
|
qprogressbar \
|
||||||
qprogressdialog \
|
qprogressdialog \
|
||||||
qpushbutton \
|
qpushbutton \
|
||||||
@ -106,7 +102,6 @@ SUBDIRS=\
|
|||||||
qscroller \
|
qscroller \
|
||||||
qsharedpointer_and_qwidget \
|
qsharedpointer_and_qwidget \
|
||||||
qsidebar \
|
qsidebar \
|
||||||
qsignalmapper \
|
|
||||||
qsizegrip \
|
qsizegrip \
|
||||||
qslider \
|
qslider \
|
||||||
qsortfilterproxymodel \
|
qsortfilterproxymodel \
|
||||||
@ -127,12 +122,10 @@ SUBDIRS=\
|
|||||||
qtableview \
|
qtableview \
|
||||||
qtablewidget \
|
qtablewidget \
|
||||||
qtcpsocket \
|
qtcpsocket \
|
||||||
qtipc \
|
|
||||||
qtoolbar \
|
qtoolbar \
|
||||||
qtoolbox \
|
qtoolbox \
|
||||||
qtooltip \
|
qtooltip \
|
||||||
qtransformedscreen \
|
qtransformedscreen \
|
||||||
qtranslator \
|
|
||||||
qtreeview \
|
qtreeview \
|
||||||
qtreewidget \
|
qtreewidget \
|
||||||
qtreewidgetitemiterator \
|
qtreewidgetitemiterator \
|
||||||
|
@ -8,7 +8,6 @@ SUBDIRS=\
|
|||||||
qabstractnetworkcache \
|
qabstractnetworkcache \
|
||||||
qabstractsocket \
|
qabstractsocket \
|
||||||
qauthenticator \
|
qauthenticator \
|
||||||
qeventloop \
|
|
||||||
qftp \
|
qftp \
|
||||||
qhostaddress \
|
qhostaddress \
|
||||||
qhostinfo \
|
qhostinfo \
|
||||||
@ -31,7 +30,6 @@ SUBDIRS=\
|
|||||||
qnetworkrequest \
|
qnetworkrequest \
|
||||||
qnetworksession \
|
qnetworksession \
|
||||||
qobjectperformance \
|
qobjectperformance \
|
||||||
qsocketnotifier \
|
|
||||||
qsocks5socketengine \
|
qsocks5socketengine \
|
||||||
qsslcertificate \
|
qsslcertificate \
|
||||||
qsslcipher \
|
qsslcipher \
|
||||||
@ -51,6 +49,5 @@ SUBDIRS=\
|
|||||||
qhttpnetworkconnection \
|
qhttpnetworkconnection \
|
||||||
qhttpnetworkreply \
|
qhttpnetworkreply \
|
||||||
qhttpsocketengine \
|
qhttpsocketengine \
|
||||||
qsocketnotifier \
|
|
||||||
qsocks5socketengine \
|
qsocks5socketengine \
|
||||||
|
|
||||||
|
@ -8,7 +8,6 @@ SUBDIRS=\
|
|||||||
qalgorithms \
|
qalgorithms \
|
||||||
qcombobox \
|
qcombobox \
|
||||||
qfocusevent \
|
qfocusevent \
|
||||||
qitemmodel \
|
|
||||||
qlayout \
|
qlayout \
|
||||||
qmdiarea \
|
qmdiarea \
|
||||||
qmenu \
|
qmenu \
|
||||||
@ -18,7 +17,6 @@ SUBDIRS=\
|
|||||||
qtextbrowser \
|
qtextbrowser \
|
||||||
qtextedit \
|
qtextedit \
|
||||||
qtoolbutton \
|
qtoolbutton \
|
||||||
qvariant \
|
|
||||||
qwidget \
|
qwidget \
|
||||||
qworkspace \
|
qworkspace \
|
||||||
windowsmobile
|
windowsmobile
|
||||||
|
@ -1,9 +0,0 @@
|
|||||||
load(qttest_p4)
|
|
||||||
|
|
||||||
INCLUDEPATH += $$PWD/../modeltest
|
|
||||||
QT += widgets
|
|
||||||
SOURCES += tst_qabstractitemmodel.cpp ../modeltest/dynamictreemodel.cpp ../modeltest/modeltest.cpp
|
|
||||||
HEADERS += ../modeltest/dynamictreemodel.h ../modeltest/modeltest.h
|
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
x
Reference in New Issue
Block a user