Merge into trunk : ubuntuTestCaseCxx : Code : Ubuntu UI Toolkit

Status:

Merged

Merged at revision:

981

Proposed branch:

lp:~kalikiana/ubuntu-ui-toolkit/ubuntuTestCaseCxx

Merge into:

lp:ubuntu-ui-toolkit

Diff against target:

220 lines (+131/-22)

6 files modified

modules/Ubuntu/Test/Test.pro (+1/-0)
modules/Ubuntu/Test/plugin/plugin.pro (+25/-0)
modules/Ubuntu/Test/plugin/uctestcase.cpp (+50/-0)
modules/Ubuntu/Test/plugin/uctestcase.h (+47/-0)
tests/unit/plugin_dependency.pri (+3/-0)
tests/unit_x11/tst_layouts/tst_layouts.cpp (+5/-22)

To merge this branch:

bzr merge lp:~kalikiana/ubuntu-ui-toolkit/ubuntuTestCaseCxx

High

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Needs Fixing on 2014-03-19
Zsombor Egri		2013-12-16	Approve on 2014-03-19
Review via email: mp+199162@code.launchpad.net

Commit message

Introduce UbuntuTestCase API for C++

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-12-23:

#

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/1503/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-01-10:

#

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/1565/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-01-13:

#

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/1580/rebuild

review: Approve (continuous-integration)

Revision history for this message

Zsombor Egri (zsombi) wrote on 2014-01-17:

#

94 +void UbuntuTestCase::setFile(const QString& file) {
95 + Q_ASSERT(!file.isEmpty());
96 + if (rootObject())
97 + delete rootObject();
98 + setSource(QUrl::fromLocalFile(file));
99 + Q_ASSERT(status() == QQuickView::Ready);
100 + Q_ASSERT(rootObject());
101 + show();
102 + QTest::qWaitForWindowExposed(this);
103 +}

I see the approach you had taken is the way the InverseMouseArea test does. I found out that this approach is not the best one, as the Ubuntu Components plugin is not reloaded when the next test (root object) is set. This may lead in leaving the singletons in the plugin in a state which is not expected when the app starts. And that is not good.

A better approach would be to use the QScopedPointer in each test function. That would make sure we get rid of the test view each time the test fails, and will also destroy the view when the test ends. Just like it is done in tst_layouts.cpp.

review: Needs Fixing

Revision history for this message

Zsombor Egri (zsombi) wrote on 2014-03-19:

#

This is awesome! I like it!!! We must extend this with all kinds of helpers we need for touch, flick, other stuff!!! Thanks!!

review: Approve

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-19:

#

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/1918/rebuild

review: Needs Fixing (continuous-integration)

Ubuntu UI Toolkit

Merge lp:~kalikiana/ubuntu-ui-toolkit/ubuntuTestCaseCxx into lp:ubuntu-ui-toolkit

Commit message

Description of the change

Preview Diff

Subscribers

 === modified file 'modules/Ubuntu/Test/Test.pro'
 --- modules/Ubuntu/Test/Test.pro	2013-07-24 12:34:45 +0000
 +++ modules/Ubuntu/Test/Test.pro	2014-03-19 12:49:53 +0000
@@ -1,4 +1,5 @@
  TEMPLATE = subdirs
++SUBDIRS += plugin
  OTHER_FILES += $$system(ls *.qml)
  include(deployment.pri)
 === added directory 'modules/Ubuntu/Test/plugin'
 === added file 'modules/Ubuntu/Test/plugin/plugin.pro'
 --- modules/Ubuntu/Test/plugin/plugin.pro	1970-01-01 00:00:00 +0000
 +++ modules/Ubuntu/Test/plugin/plugin.pro	2014-03-19 12:49:53 +0000
@@ -0,0 +1,25 @@
++TEMPLATE = lib
++TARGET = ../UbuntuTest
++QT += core-private qml qml-private quick quick-private
++
++equals(QT_MAJOR_VERSION, 5):lessThan(QT_MINOR_VERSION, 2) {
++    QT += v8-private
++}
++
++CONFIG += qt plugin no_keywords
++
++QMAKE_CXXFLAGS += -Werror
++
++TARGET = $$qtLibraryTarget($$TARGET)
++uri = Ubuntu.Test
++
++HEADERS += \
++    uctestcase.h \
++
++SOURCES += \
++    uctestcase.cpp \
++
++# deployment rules for the plugin
++installPath = $$[QT_INSTALL_QML]/$$replace(uri, \\., /)
++target.path = $$installPath
++INSTALLS += target
 === added file 'modules/Ubuntu/Test/plugin/uctestcase.cpp'
 --- modules/Ubuntu/Test/plugin/uctestcase.cpp	1970-01-01 00:00:00 +0000
 +++ modules/Ubuntu/Test/plugin/uctestcase.cpp	2014-03-19 12:49:53 +0000
@@ -0,0 +1,50 @@
++/*
++ * Copyright 2013-2014 Canonical Ltd.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ *
++ * Author: Christian Dywan <christian.dywan@canonical.com>
++ */
++
++#include "uctestcase.h"
++
++#include <stdlib.h>
++
++#include <QtQml/QQmlEngine>
++#include <QtCore/QDir>
++#include <QtCore/QDebug>
++#include <QtTest/QtTest>
++#include <QtQuick/QQuickItem>
++
++/*!
++ * \ingroup ubuntu
++ * \brief UbuntuTestCase is the C++ pendant to the QML UbuntuTestCase.
++ */
++UbuntuTestCase::UbuntuTestCase(const QString& file, QWindow* parent) : QQuickView(parent)
++{
++    QString modules("../../../modules");
++    Q_ASSERT(QDir(modules).exists());
++    QString modulePath(QDir(modules).absolutePath());
++    engine()->addImportPath(modulePath);
++
++    m_spy = new QSignalSpy(engine(), SIGNAL(warnings(QList<QQmlError>)));
++    m_spy->setParent(this);
++
++    Q_ASSERT(!file.isEmpty());
++    setSource(QUrl::fromLocalFile(file));
++    Q_ASSERT(status() == QQuickView::Ready);
++    Q_ASSERT(rootObject());
++    show();
++    QTest::qWaitForWindowExposed(this);
++}
++
 === added file 'modules/Ubuntu/Test/plugin/uctestcase.h'
 --- modules/Ubuntu/Test/plugin/uctestcase.h	1970-01-01 00:00:00 +0000
 +++ modules/Ubuntu/Test/plugin/uctestcase.h	2014-03-19 12:49:53 +0000
@@ -0,0 +1,47 @@
++/*
++ * Copyright 2013-2014 Canonical Ltd.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ *
++ * Author: Christian Dywan <christian.dywan@canonical.com>
++ */
++
++#ifndef UBUNTU_TEST_UBUNTUTESTCASE_H
++#define UBUNTU_TEST_UBUNTUTESTCASE_H
++
++#include <QtQuick/QQuickItem>
++#include <QtQuick/QQuickView>
++#include <QtTest/QSignalSpy>
++
++class UbuntuTestCase : public QQuickView
++{
++    Q_OBJECT
++
++public:
++    UbuntuTestCase(const QString& file, QWindow* parent = 0);
++    // getter
++    template<class T>
++    inline T findItem(const QString& objectName) const {
++        T item = rootObject()->findChild<T>(objectName);
++        if (item)
++            return item;
++        if (rootObject()->findChild<QObject*>(objectName))
++            qFatal("Item '%s' found with unexpected type", qPrintable(objectName));
++        qFatal("No item '%s' found", qPrintable(objectName));
++    }
++
++private:
++    QSignalSpy* m_spy;
++};
++
++#endif // UBUNTU_TEST_UBUNTUTESTCASE_H
 === modified file 'tests/unit/plugin_dependency.pri'
 --- tests/unit/plugin_dependency.pri	2013-10-30 13:57:33 +0000
 +++ tests/unit/plugin_dependency.pri	2014-03-19 12:49:53 +0000
@@ -1,7 +1,10 @@
  COMPONENTS_PATH = ../../../modules/Ubuntu/Components
  INCLUDEPATH += $$COMPONENTS_PATH/plugin
++INCLUDEPATH += ../../../modules/Ubuntu/Test/plugin
  PRE_TARGETDEPS = $$COMPONENTS_PATH/libUbuntuComponents.so
++PRE_TARGETDEPS += ../../../modules/Ubuntu/Test/libUbuntuTest.so
  LIBS += $$COMPONENTS_PATH/libUbuntuComponents.so
++LIBS += ../../../modules/Ubuntu/Test/libUbuntuTest.so
  DEFINES += QUICK_TEST_SOURCE_DIR=\"\\\"$$_PRO_FILE_PWD_\\\"\"
  QMAKE_CXXFLAGS += -Werror
 === modified file 'tests/unit_x11/tst_layouts/tst_layouts.cpp'
 --- tests/unit_x11/tst_layouts/tst_layouts.cpp	2014-02-18 13:27:23 +0000
 +++ tests/unit_x11/tst_layouts/tst_layouts.cpp	2014-03-19 12:49:53 +0000
@@ -28,6 +28,7 @@
  #include "ullayouts.h"
  #include "ucunits.h"
++#include "uctestcase.h"
  #include <QtQuick/private/qquickanchors_p.h>
  #include <QtQuick/private/qquickanchors_p_p.h>
@@ -58,18 +59,8 @@
      QQuickView * loadTest(const QString &file)
+     {
--        QQuickView *view = new QQuickView;
--        view->engine()->addImportPath(m_modulePath);
--
--        view->setSource(QUrl::fromLocalFile(file));
--        if (!view->rootObject()) {
--            delete view;
--            view = 0;
--        } else {
--            view->show();
--            QTest::qWaitForWindowExposed(view);
--        }
--        return view;
++        UbuntuTestCase* testCase = new UbuntuTestCase(file);
++        return qobject_cast<QQuickView*>(testCase);
+     }
      QQuickItem *testItem(QQuickItem *that, const QString &identifier)
@@ -85,10 +76,6 @@
  private Q_SLOTS:
      void initTestCase()
+     {
--        QString modules("../../../modules");
--        QVERIFY(QDir(modules).exists());
--
--        m_modulePath = QDir(modules).absolutePath();
+     }
      void cleanupTestCase()
@@ -97,12 +84,8 @@
      void testCase_NoLayouts()
+     {
--        QScopedPointer<QQuickView> view(loadTest("NoLayouts.qml"));
--        QVERIFY(view);
--
--        ULLayouts *layouts = qobject_cast<ULLayouts*>(testItem(view->rootObject(), "layouts"));
--        QVERIFY(layouts);
--
++        QScopedPointer<UbuntuTestCase> testCase(new UbuntuTestCase("NoLayouts.qml"));
++        ULLayouts *layouts = testCase->findItem<ULLayouts*>("layouts");
          QVERIFY(layouts->layoutList().isEmpty());
+     }