← Back to branch summary

~ubuntu-sdk-team/ubuntu-ui-toolkit/armedFlakes

« back to all changes in this revision

Viewing changes to tests/unit/tst_mainview/tst_mainview.cpp

  • Committer: Tarmac
  • Author(s): Zsombor Egri, Christian Dywan
  • Date: 2016-02-02 18:54:21 UTC
  • mfrom: (1826.1.8 staging)
  • Revision ID: tarmac-20160202185421-jcaz8nu6w9wcpot1
Link singletons used as context properties in root context of the QML Engine to the engine instance. Fixes: https://bugs.launchpad.net/bugs/1539558.

Approved by ubuntu-sdk-build-bot, Zoltan Balogh.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/unit/tst_mainview/tst_mainview.cpp
36
36
#include "ucapplication.h"
37
37
#include "ucunits.h"
38
38
#include "uctestcase.h"
 
39
#include "plugin.h"
39
40
 
40
41
class tst_MainView : public QObject
41
42
{
77
78
 
78
79
        view = new QQuickView;
79
80
        QQmlEngine *quickEngine = view->engine();
 
81
        UbuntuComponentsPlugin::initializeContextProperties(quickEngine);
80
82
 
81
 
        view->setGeometry(0,0, UCUnits::instance().gu(40), UCUnits::instance().gu(30));
 
83
        view->setGeometry(0,0, UCUnits::instance()->gu(40), UCUnits::instance()->gu(30));
82
84
        //add modules folder so we have access to the plugin from QML
83
85
        QStringList imports = quickEngine->importPathList();
84
86
        imports.prepend(QDir(modules).absolutePath());
103
105
 
104
106
    void testSetApplicationName() {
105
107
        QString appName("com.ubuntu.foo");
106
 
        UCApplication::instance().setApplicationName(appName);
107
 
        QCOMPARE(UCApplication::instance().applicationName(), appName);
 
108
        UCApplication::instance()->setApplicationName(appName);
 
109
        QCOMPARE(UCApplication::instance()->applicationName(), appName);
108
110
        QCOMPARE(QCoreApplication::applicationName(), appName);
109
111
        QCOMPARE(QString(""), QCoreApplication::organizationName());
110
112
    }
111
113
 
112
114
    void testExpectedDataFolder() {
113
115
        QString appName("net.weight.gain");
114
 
        UCApplication::instance().setApplicationName(appName);
 
116
        UCApplication::instance()->setApplicationName(appName);
115
117
        QString dataFolder(QStandardPaths::writableLocation(QStandardPaths::DataLocation));
116
118
        QString xdgDataHome(QProcessEnvironment::systemEnvironment().value("XDG_DATA_HOME",
117
119
            QProcessEnvironment::systemEnvironment().value("HOME") + "/.local/share"));
121
123
 
122
124
    void testExpectedCacheFolder() {
123
125
        QString appName("cat.long.very");
124
 
        UCApplication::instance().setApplicationName(appName);
 
126
        UCApplication::instance()->setApplicationName(appName);
125
127
        QString cacheFolder(QStandardPaths::writableLocation(QStandardPaths::CacheLocation));
126
128
        QString xdgCacheHome(QProcessEnvironment::systemEnvironment().value("XDG_CACHE_HOME",
127
129
            QProcessEnvironment::systemEnvironment().value("HOME") + "/.cache"));
175
177
        QString filename(getConfFile(applicationName));
176
178
        QFile::remove(filename);
177
179
 
178
 
        UCApplication::instance().setApplicationName(applicationName);
 
180
        UCApplication::instance()->setApplicationName(applicationName);
179
181
        // QSettings with defaults
180
182
        QSettings mySettings;
181
183
        mySettings.setValue("spam", "eggs");