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>

tests/auto/corelib.pro

@@ -11,7 +11,6 @@ SUBDIRS=\
    qcache \
    qchar \
    qcontiguouscache \
-   qcoreapplication \
    qcryptographichash \
    qdate \
    qdatetime \
@@ -24,11 +23,8 @@ SUBDIRS=\
    qline \
    qmap \
    qmargins \
-   qmath \
-   qmetatype \
    qmutex \
    qmutexlocker \
-   qobject \
    qobjectrace \
    qplugin \
    qpluginloader \
@@ -63,14 +59,12 @@ SUBDIRS=\
    qthreadstorage \
    qtime \
    qtimeline \
-   qtimer \
    qtmd5 \
    qtokenautomaton \
    quuid \
    qvarlengtharray \
    qvector \
    qwaitcondition \
-   qwineventnotifier \
    qwritelocker \
    selftests \
    utf8

tests/auto/corelib/corelib.pro

@@ -4,4 +4,5 @@ SUBDIRS=\
    codecs \
    concurrent \
    global \
-   io
+   io \
+   kernel

tests/auto/corelib/io/qfile/largefile/largefile.pro

@@ -6,3 +6,4 @@ SOURCES += tst_largefile.cpp
 wince*: SOURCES += $$QT_SOURCE_TREE/src/corelib/kernel/qfunctions_wince.cpp
 
 CONFIG += parallel_test
+CONFIG += insignificant_test # QTBUG-21175

tests/auto/corelib/kernel/kernel.pro

@@ -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

tests/auto/corelib/kernel/qabstractitemmodel/qabstractitemmodel.pro

@@ -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
+
+
+

tests/auto/corelib/kernel/qeventloop/tst_qeventloop.cpp

@@ -59,7 +59,7 @@
 #include <unistd.h>
 #endif
 
-#include "../../shared/util.h"
+#include "../../../../shared/util.h"
 
 //TESTED_CLASS=
 //TESTED_FILES=

tests/auto/corelib/kernel/qmetaproperty/qmetaproperty.pro

@@ -0,0 +1,4 @@
+load(qttest_p4)
+QT = core gui
+SOURCES  += tst_qmetaproperty.cpp
+

tests/auto/corelib/kernel/qmetaproperty/tst_qmetaproperty.cpp

@@ -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"

tests/auto/corelib/kernel/qsocketnotifier/qsocketnotifier.pro

@@ -8,4 +8,4 @@ include(../platformsocketengine/platformsocketengine.pri)
 
 symbian: TARGET.CAPABILITY = NetworkServices
 
-
+CONFIG += insignificant_test # QTBUG-21204

tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp

@@ -50,7 +50,7 @@
 #include <unistd.h>
 #endif
 
-#include "../../shared/util.h"
+#include "../../../../shared/util.h"
 
 
 //TESTED_CLASS=

tests/auto/corelib/kernel/qtranslator/qtranslator.pro

@@ -9,4 +9,4 @@ wince*|symbian: {
    DEPLOYMENT += addFiles
 }
 
-
+CONFIG += insignificant_test # QTBUG-21125

tests/auto/gui.pro

@@ -10,7 +10,6 @@ SUBDIRS=\
     languagechange \
     modeltest \
     qabstractbutton \
-    qabstractitemmodel \
     qabstractitemview \
     qabstractprintdialog \
     qabstractproxymodel \
@@ -90,12 +89,9 @@ SUBDIRS=\
     qmainwindow \
     qmdisubwindow \
     qmessagebox \
-    qmetaobject \
-    qmimedata \
     qnetworkaccessmanager_and_qprogressdialog \
     qopengl \
     qplaintextedit \
-    qpointer \
     qprogressbar \
     qprogressdialog \
     qpushbutton \
@@ -106,7 +102,6 @@ SUBDIRS=\
     qscroller \
     qsharedpointer_and_qwidget \
     qsidebar \
-    qsignalmapper \
     qsizegrip \
     qslider \
     qsortfilterproxymodel \
@@ -127,12 +122,10 @@ SUBDIRS=\
     qtableview \
     qtablewidget \
     qtcpsocket \
-    qtipc \
     qtoolbar \
     qtoolbox \
     qtooltip \
     qtransformedscreen \
-    qtranslator \
     qtreeview \
     qtreewidget \
     qtreewidgetitemiterator \

tests/auto/network.pro

@@ -8,7 +8,6 @@ SUBDIRS=\
     qabstractnetworkcache \
     qabstractsocket \
     qauthenticator \
-    qeventloop \
     qftp \
     qhostaddress \
     qhostinfo \
@@ -31,7 +30,6 @@ SUBDIRS=\
     qnetworkrequest \
     qnetworksession \
     qobjectperformance \
-    qsocketnotifier \
     qsocks5socketengine \
     qsslcertificate \
     qsslcipher \
@@ -51,6 +49,5 @@ SUBDIRS=\
     qhttpnetworkconnection \
     qhttpnetworkreply \
     qhttpsocketengine \
-    qsocketnotifier \
     qsocks5socketengine \
 

tests/auto/other.pro

@@ -8,7 +8,6 @@ SUBDIRS=\
            qalgorithms \
            qcombobox \
            qfocusevent \
-           qitemmodel \
            qlayout \
            qmdiarea \
            qmenu \
@@ -18,7 +17,6 @@ SUBDIRS=\
            qtextbrowser \
            qtextedit \
            qtoolbutton \
-           qvariant \
            qwidget \
            qworkspace \
            windowsmobile

tests/auto/qabstractitemmodel/qabstractitemmodel.pro

@@ -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
-
-
-