1
=== modified file 'src/Unity/CMakeLists.txt'
2
--- src/Unity/CMakeLists.txt	2013-11-25 18:41:16 +0000
3
+++ src/Unity/CMakeLists.txt	2013-12-12 12:53:45 +0000
4
@@ -5,7 +5,7 @@
5
5
include(FindPkgConfig)
5
include(FindPkgConfig)
6
6
pkg_check_modules(QTDEE REQUIRED libdee-qt5>=3.2)
6
pkg_check_modules(QTDEE REQUIRED libdee-qt5>=3.2)
7
7
pkg_check_modules(UNITYCORE REQUIRED unity-core-6.0>=7.1.1)
7
pkg_check_modules(UNITYCORE REQUIRED unity-core-6.0>=7.1.1)
9
8
pkg_check_modules(SCOPESLIB REQUIRED libunity-scopes>=0.1)
8
pkg_check_modules(SCOPESLIB REQUIRED libunity-scopes>=0.1.3)
10
9
9
11
10
include_directories(
10
include_directories(
12
11
    ${CMAKE_CURRENT_SOURCE_DIR}
11
    ${CMAKE_CURRENT_SOURCE_DIR}
13
12
12
14
=== modified file 'src/Unity/scopes-ng/CMakeLists.txt'
15
--- src/Unity/scopes-ng/CMakeLists.txt	2013-12-05 12:21:23 +0000
16
+++ src/Unity/scopes-ng/CMakeLists.txt	2013-12-12 12:53:45 +0000
17
@@ -1,6 +1,6 @@
18
1
# Dependencies
1
# Dependencies
19
2
include(FindPkgConfig)
2
include(FindPkgConfig)
21
3
pkg_check_modules(SCOPESLIB REQUIRED libunity-scopes>=0.1.2)
3
pkg_check_modules(SCOPESLIB REQUIRED libunity-scopes>=0.1.3)
22
4
4
23
5
include_directories(
5
include_directories(
24
6
    ${CMAKE_CURRENT_SOURCE_DIR}
6
    ${CMAKE_CURRENT_SOURCE_DIR}
25
7
7
26
=== modified file 'src/Unity/scopes-ng/categories.cpp'
27
--- src/Unity/scopes-ng/categories.cpp	2013-12-06 10:47:26 +0000
28
+++ src/Unity/scopes-ng/categories.cpp	2013-12-12 12:53:45 +0000
29
@@ -181,17 +181,17 @@
30
181
181
31
182
    switch (role) {
182
    switch (role) {
32
183
        case RoleCategoryId:
183
        case RoleCategoryId:
34
184
            return QVariant(QString::fromStdString(cat->id()));
184
            return QString::fromStdString(cat->id());
35
185
        case RoleName:
185
        case RoleName:
37
186
            return QVariant(QString::fromStdString(cat->title()));
186
            return QString::fromStdString(cat->title());
38
187
        case RoleIcon:
187
        case RoleIcon:
40
188
            return QVariant(QString::fromStdString(cat->icon()));
188
            return QString::fromStdString(cat->icon());
41
189
        case RoleRenderer:
189
        case RoleRenderer:
42
190
            return catData->renderer_template.toVariant();
190
            return catData->renderer_template.toVariant();
43
191
        case RoleComponents:
191
        case RoleComponents:
44
192
             return catData->components.toVariant();
192
             return catData->components.toVariant();
45
193
        case RoleContentType:
193
        case RoleContentType:
47
194
            return QVariant(QString("default"));
194
            return QString("default");
48
195
        case RoleRendererHint:
195
        case RoleRendererHint:
49
196
            return QVariant();
196
            return QVariant();
50
197
        case RoleProgressSource:
197
        case RoleProgressSource:
51
198
198
52
=== modified file 'src/Unity/scopes-ng/categories.h'
53
--- src/Unity/scopes-ng/categories.h	2013-12-04 17:23:15 +0000
54
+++ src/Unity/scopes-ng/categories.h	2013-12-12 12:53:45 +0000
55
@@ -36,7 +36,7 @@
56
36
36
57
37
struct CategoryData;
37
struct CategoryData;
58
38
38
60
39
class Categories : public QAbstractListModel
39
class Q_DECL_EXPORT Categories : public QAbstractListModel
61
40
{
40
{
62
41
    Q_OBJECT
41
    Q_OBJECT
63
42
42
64
@@ -60,7 +60,7 @@
65
60
60
66
61
    QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
61
    QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
67
62
    QHash<int, QByteArray> roleNames() const override;
62
    QHash<int, QByteArray> roleNames() const override;
69
63
    int rowCount(const QModelIndex& parent) const override;
63
    int rowCount(const QModelIndex& parent = QModelIndex()) const override;
70
64
64
71
65
    ResultsModel* lookupCategory(std::string const& category_id);
65
    ResultsModel* lookupCategory(std::string const& category_id);
72
66
    void registerCategory(unity::api::scopes::Category::SCPtr category, ResultsModel* model);
66
    void registerCategory(unity::api::scopes::Category::SCPtr category, ResultsModel* model);
73
67
67
74
=== modified file 'src/Unity/scopes-ng/resultsmodel.cpp'
75
--- src/Unity/scopes-ng/resultsmodel.cpp	2013-12-06 10:47:26 +0000
76
+++ src/Unity/scopes-ng/resultsmodel.cpp	2013-12-12 12:53:45 +0000
77
@@ -30,13 +30,20 @@
78
30
    : QAbstractListModel(parent)
30
    : QAbstractListModel(parent)
79
31
{
31
{
80
32
    m_roles[ResultsModel::RoleUri] = "uri";
32
    m_roles[ResultsModel::RoleUri] = "uri";
85
33
    m_roles[ResultsModel::RoleIconHint] = "icon";
33
    m_roles[ResultsModel::RoleCategoryId] = "categoryId";
82
34
    m_roles[ResultsModel::RoleCategory] = "category";
83
35
    m_roles[ResultsModel::RoleTitle] = "title";
84
36
    m_roles[ResultsModel::RoleComment] = "comment";
86
37
    m_roles[ResultsModel::RoleDndUri] = "dndUri";
34
    m_roles[ResultsModel::RoleDndUri] = "dndUri";
87
38
    m_roles[ResultsModel::RoleMetadata] = "metadata";
35
    m_roles[ResultsModel::RoleMetadata] = "metadata";
89
39
    m_roles[ResultsModel::RoleRendererHints] = "rendererHints";
36
    m_roles[ResultsModel::RoleTitle] = "title";
90
37
    m_roles[ResultsModel::RoleArt] = "art";
91
38
    m_roles[ResultsModel::RoleSubtitle] = "subtitle";
92
39
    m_roles[ResultsModel::RoleMascot] = "mascot";
93
40
    m_roles[ResultsModel::RoleEmblem] = "emblem";
94
41
    m_roles[ResultsModel::RoleOldPrice] = "oldPrice";
95
42
    m_roles[ResultsModel::RolePrice] = "price";
96
43
    m_roles[ResultsModel::RoleAltPrice] = "altPrice";
97
44
    m_roles[ResultsModel::RoleRating] = "rating";
98
45
    m_roles[ResultsModel::RoleAltRating] = "altRating";
99
46
    m_roles[ResultsModel::RoleSummary] = "summary";
100
40
}
47
}
101
41
48
102
42
QString ResultsModel::categoryId() const
49
QString ResultsModel::categoryId() const
103
@@ -95,36 +102,66 @@
104
95
}
102
}
105
96
103
106
97
QVariant
104
QVariant
107
105
ResultsModel::componentValue(scopes::CategorisedResult* result, std::string const& fieldName) const
108
106
{
109
107
    // FIXME: component field mapping
110
108
    if (!result->has_metadata(fieldName)) {
111
109
        return QVariant();
112
110
    }
113
111
    scopes::Variant const& v = result->metadata(fieldName);
114
112
    if (v.which() != scopes::Variant::Type::String) {
115
113
        return QVariant();
116
114
    }
117
115
118
116
    return QString::fromStdString(v.get_string());
119
117
}
120
118
121
119
QVariant
122
98
ResultsModel::data(const QModelIndex& index, int role) const
120
ResultsModel::data(const QModelIndex& index, int role) const
123
99
{
121
{
124
100
    scopes::CategorisedResult* result = m_results.at(index.row()).get();
122
    scopes::CategorisedResult* result = m_results.at(index.row()).get();
125
101
123
126
102
    switch (role) {
124
    switch (role) {
127
103
        case RoleUri:
125
        case RoleUri:
132
104
            return QVariant(QString::fromStdString(result->uri()));
126
            return QString::fromStdString(result->uri());
133
105
        case RoleIconHint: {
127
        case RoleCategoryId:
134
106
            QString iconHint(QString::fromStdString(result->art()));
128
            return QString::fromStdString(result->category()->id());
135
107
            if (iconHint.isEmpty()) {
129
        case RoleDndUri:
136
130
            return QString::fromStdString(result->dnd_uri());
137
131
        case RoleMetadata:
138
132
            return QVariantMap(); // FIXME! would be great to keep it opaque, so it isn't misused
139
133
        case RoleTitle:
140
134
            return QString::fromStdString(result->title());
141
135
        case RoleArt: {
142
136
            QString image(QString::fromStdString(result->art()));
143
137
            if (image.isEmpty()) {
144
108
                QString uri(QString::fromStdString(result->uri()));
138
                QString uri(QString::fromStdString(result->uri()));
145
139
                // FIXME: what to do about mimetype?
146
109
                QString thumbnailerUri(uriToThumbnailerProviderString(uri, QString(), QVariantHash()));
140
                QString thumbnailerUri(uriToThumbnailerProviderString(uri, QString(), QVariantHash()));
147
110
                if (!thumbnailerUri.isNull()) {
141
                if (!thumbnailerUri.isNull()) {
149
111
                    return QVariant::fromValue(thumbnailerUri);
142
                    return thumbnailerUri;
150
112
                }
143
                }
151
113
            }
144
            }
153
114
            return QVariant(iconHint);
145
            return image;
154
115
        }
146
        }
167
116
        case RoleCategory:
147
        case RoleSubtitle:
168
117
            return QVariant(QString::fromStdString(result->category()->id()));
148
            return componentValue(result, "subtitle");
169
118
        case RoleTitle:
149
        case RoleMascot:
170
119
            return QVariant(QString::fromStdString(result->title()));
150
            return componentValue(result, "mascot");
171
120
        case RoleComment:
151
        case RoleEmblem:
172
121
            return QVariant();
152
            return componentValue(result, "emblem");
173
122
        case RoleDndUri:
153
        case RoleOldPrice:
174
123
            return QVariant(QString::fromStdString(result->dnd_uri()));
154
            return componentValue(result, "old-price");
175
124
        case RoleMetadata:
155
        case RolePrice:
176
125
            return QVariant(QVariantMap());
156
            return componentValue(result, "price");
177
126
        case RoleRendererHints:
157
        case RoleAltPrice:
178
127
            return QVariant();
158
            return componentValue(result, "alt-price");
179
159
        case RoleRating:
180
160
            return componentValue(result, "rating");
181
161
        case RoleAltRating:
182
162
            return componentValue(result, "alt-rating");
183
163
        case RoleSummary:
184
164
            return componentValue(result, "summary");
185
128
        default:
165
        default:
186
129
            return QVariant();
166
            return QVariant();
187
130
    }
167
    }
188
131
168
189
=== modified file 'src/Unity/scopes-ng/resultsmodel.h'
190
--- src/Unity/scopes-ng/resultsmodel.h	2013-12-05 10:40:44 +0000
191
+++ src/Unity/scopes-ng/resultsmodel.h	2013-12-12 12:53:45 +0000
192
@@ -24,6 +24,7 @@
193
24
#include <QAbstractListModel>
24
#include <QAbstractListModel>
194
25
25
195
26
#include <scopes/CategorisedResult.h>
26
#include <scopes/CategorisedResult.h>
196
27
#include <unordered_map>
197
27
28
198
28
namespace scopes_ng {
29
namespace scopes_ng {
199
29
30
200
@@ -41,16 +42,24 @@
201
41
42
202
42
    enum Roles {
43
    enum Roles {
203
43
        RoleUri,
44
        RoleUri,
208
44
        RoleIconHint,
45
        RoleCategoryId,
205
45
        RoleCategory,
206
46
        RoleTitle,
207
47
        RoleComment,
209
48
        RoleDndUri,
46
        RoleDndUri,
210
49
        RoleMetadata,
47
        RoleMetadata,
212
50
        RoleRendererHints
48
        // card components
213
49
        RoleTitle,
214
50
        RoleArt,
215
51
        RoleSubtitle,
216
52
        RoleMascot,
217
53
        RoleEmblem,
218
54
        RoleOldPrice,
219
55
        RolePrice,
220
56
        RoleAltPrice,
221
57
        RoleRating,
222
58
        RoleAltRating,
223
59
        RoleSummary
224
51
    };
60
    };
225
52
61
227
53
    int rowCount(const QModelIndex& parent) const override;
62
    int rowCount(const QModelIndex& parent = QModelIndex()) const override;
228
54
    QHash<int, QByteArray> roleNames() const override;
63
    QHash<int, QByteArray> roleNames() const override;
229
55
    QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
64
    QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
230
56
65
231
@@ -69,7 +78,10 @@
232
69
    void countChanged();
78
    void countChanged();
233
70
79
234
71
private:
80
private:
235
81
    QVariant componentValue(unity::api::scopes::CategorisedResult* result, std::string const& fieldName) const;
236
82
237
72
    QHash<int, QByteArray> m_roles;
83
    QHash<int, QByteArray> m_roles;
238
84
    std::unordered_map<std::string, std::string> m_componentMapping;
239
73
    QList<std::shared_ptr<unity::api::scopes::CategorisedResult>> m_results;
85
    QList<std::shared_ptr<unity::api::scopes::CategorisedResult>> m_results;
240
74
    QString m_categoryId;
86
    QString m_categoryId;
241
75
};
87
};
242
76
88
243
=== modified file 'src/Unity/scopes-ng/scope.h'
244
--- src/Unity/scopes-ng/scope.h	2013-12-05 18:05:13 +0000
245
+++ src/Unity/scopes-ng/scope.h	2013-12-12 12:53:45 +0000
246
@@ -35,7 +35,7 @@
247
35
35
248
36
class Categories;
36
class Categories;
249
37
37
251
38
class Scope : public QObject
38
class Q_DECL_EXPORT Scope : public QObject
252
39
{
39
{
253
40
    Q_OBJECT
40
    Q_OBJECT
254
41
41
255
42
42
256
=== modified file 'src/Unity/scopes-ng/scopes.cpp'
257
--- src/Unity/scopes-ng/scopes.cpp	2013-12-06 10:47:26 +0000
258
+++ src/Unity/scopes-ng/scopes.cpp	2013-12-12 12:53:45 +0000
259
@@ -41,9 +41,8 @@
260
41
{
41
{
261
42
    try
42
    try
262
43
    {
43
    {
266
44
        // FIXME: use proper path for the runtime config
44
        // m_runtimeConfig should be null in most cases, and empty string is for system-wide fallback
267
45
        //   but have libunity-scopes export it first?!
45
        m_scopesRuntime = scopes::Runtime::create(m_runtimeConfig.toStdString());
265
46
        m_scopesRuntime = scopes::Runtime::create();
268
47
        auto registry = m_scopesRuntime->registry();
46
        auto registry = m_scopesRuntime->registry();
269
48
        m_metadataMap = registry->list();
47
        m_metadataMap = registry->list();
270
49
    }
48
    }
271
@@ -54,6 +53,11 @@
272
54
    Q_EMIT discoveryFinished();
53
    Q_EMIT discoveryFinished();
273
55
}
54
}
274
56
55
275
56
void ScopeListWorker::setRuntimeConfig(QString const& config)
276
57
{
277
58
    m_runtimeConfig = config;
278
59
}
279
60
280
57
scopes::Runtime::UPtr ScopeListWorker::takeRuntime()
61
scopes::Runtime::UPtr ScopeListWorker::takeRuntime()
281
58
{
62
{
282
59
    return std::move(m_scopesRuntime);
63
    return std::move(m_scopesRuntime);
283
@@ -63,7 +67,7 @@
284
63
{
67
{
285
64
    return m_metadataMap;
68
    return m_metadataMap;
286
65
}
69
}
288
66
        
70
289
67
Scopes::Scopes(QObject *parent)
71
Scopes::Scopes(QObject *parent)
290
68
    : QAbstractListModel(parent)
72
    : QAbstractListModel(parent)
291
69
    , m_listThread(nullptr)
73
    , m_listThread(nullptr)
292
@@ -102,6 +106,8 @@
293
102
void Scopes::populateScopes()
106
void Scopes::populateScopes()
294
103
{
107
{
295
104
    auto thread = new ScopeListWorker;
108
    auto thread = new ScopeListWorker;
296
109
    QByteArray runtimeConfig = qgetenv("UNITY_SCOPES_RUNTIME_PATH");
297
110
    thread->setRuntimeConfig(QString::fromLocal8Bit(runtimeConfig));
298
105
    QObject::connect(thread, &ScopeListWorker::discoveryFinished, this, &Scopes::discoveryFinished);
111
    QObject::connect(thread, &ScopeListWorker::discoveryFinished, this, &Scopes::discoveryFinished);
299
106
    QObject::connect(thread, &ScopeListWorker::finished, thread, &QObject::deleteLater);
112
    QObject::connect(thread, &ScopeListWorker::finished, thread, &QObject::deleteLater);
300
107
113
301
@@ -138,11 +144,11 @@
302
138
        case Scopes::RoleScope:
144
        case Scopes::RoleScope:
303
139
            return QVariant::fromValue(scope);
145
            return QVariant::fromValue(scope);
304
140
        case Scopes::RoleId:
146
        case Scopes::RoleId:
306
141
            return QVariant::fromValue(scope->id());
147
            return QString(scope->id());
307
142
        case Scopes::RoleVisible:
148
        case Scopes::RoleVisible:
308
143
            return QVariant::fromValue(scope->visible());
149
            return QVariant::fromValue(scope->visible());
309
144
        case Scopes::RoleTitle:
150
        case Scopes::RoleTitle:
311
145
            return QVariant::fromValue(scope->name());
151
            return QString(scope->name());
312
146
        default:
152
        default:
313
147
            return QVariant();
153
            return QVariant();
314
148
    }
154
    }
315
@@ -150,7 +156,10 @@
316
150
156
317
151
QVariant Scopes::get(int row) const
157
QVariant Scopes::get(int row) const
318
152
{
158
{
320
153
    return data(QAbstractListModel::index(row), 0);
159
    if (row >= m_scopes.size() || row < 0) {
321
160
        return QVariant();
322
161
    }
323
162
    return data(QAbstractListModel::index(row), RoleScope);
324
154
}
163
}
325
155
164
326
156
QVariant Scopes::get(const QString& scope_id) const
165
QVariant Scopes::get(const QString& scope_id) const
327
157
166
328
=== modified file 'src/Unity/scopes-ng/scopes.h'
329
--- src/Unity/scopes-ng/scopes.h	2013-12-04 14:13:45 +0000
330
+++ src/Unity/scopes-ng/scopes.h	2013-12-12 12:53:45 +0000
331
@@ -35,7 +35,7 @@
332
35
35
333
36
class Scope;
36
class Scope;
334
37
37
336
38
class Scopes : public QAbstractListModel
38
class Q_DECL_EXPORT Scopes : public QAbstractListModel
337
39
{
39
{
338
40
    Q_OBJECT
40
    Q_OBJECT
339
41
41
340
@@ -85,6 +85,7 @@
341
85
    Q_OBJECT
85
    Q_OBJECT
342
86
86
343
87
public:
87
public:
344
88
    void setRuntimeConfig(QString const& config);
345
88
    void run() override;
89
    void run() override;
346
89
    unity::api::scopes::Runtime::UPtr takeRuntime();
90
    unity::api::scopes::Runtime::UPtr takeRuntime();
347
90
    unity::api::scopes::MetadataMap metadataMap() const;
91
    unity::api::scopes::MetadataMap metadataMap() const;
348
@@ -93,6 +94,7 @@
349
93
    void discoveryFinished();
94
    void discoveryFinished();
350
94
95
351
95
private:
96
private:
352
97
    QString m_runtimeConfig;
353
96
    unity::api::scopes::Runtime::UPtr m_scopesRuntime;
98
    unity::api::scopes::Runtime::UPtr m_scopesRuntime;
354
97
    unity::api::scopes::MetadataMap m_metadataMap;
99
    unity::api::scopes::MetadataMap m_metadataMap;
355
98
};
100
};
356
99
101
357
=== modified file 'tests/CMakeLists.txt'
358
--- tests/CMakeLists.txt	2013-11-25 15:07:51 +0000
359
+++ tests/CMakeLists.txt	2013-12-12 12:53:45 +0000
360
@@ -1,8 +1,15 @@
361
1
include(FindPkgConfig)
362
1
pkg_check_modules(UNITYCORE REQUIRED unity-core-6.0>=7.1.1)
2
pkg_check_modules(UNITYCORE REQUIRED unity-core-6.0>=7.1.1)
363
2
pkg_check_modules(LIBUNITYPROTO REQUIRED unity-protocol-private)
3
pkg_check_modules(LIBUNITYPROTO REQUIRED unity-protocol-private)
364
3
pkg_check_modules(LIBUNITY REQUIRED unity)
4
pkg_check_modules(LIBUNITY REQUIRED unity)
365
4
pkg_check_modules(LIBSIGCPP REQUIRED sigc++-2.0)
5
pkg_check_modules(LIBSIGCPP REQUIRED sigc++-2.0)
366
5
pkg_check_modules(QTDEE REQUIRED libdee-qt5>=3.2)
6
pkg_check_modules(QTDEE REQUIRED libdee-qt5>=3.2)
367
7
pkg_check_modules(SCOPESLIB REQUIRED libunity-scopes>=0.1.3)
368
8
369
9
set(SCOPES_BIN_DIR ${SCOPESLIB_LIBDIR})
370
10
set(SCOPES_TEST_RUNTIME ${CMAKE_CURRENT_BINARY_DIR}/data/Runtime.ini)
371
11
372
12
add_subdirectory(data)
373
6
13
374
7
include_directories(
14
include_directories(
375
8
    ${Unity-qml_SOURCE_DIR}
15
    ${Unity-qml_SOURCE_DIR}
376
@@ -13,6 +20,7 @@
377
13
    ${LIBSIGCPP_INCLUDE_DIRS}
20
    ${LIBSIGCPP_INCLUDE_DIRS}
378
14
    ${UNITYCORE_INCLUDE_DIRS}
21
    ${UNITYCORE_INCLUDE_DIRS}
379
15
    ${QTDEE_INCLUDE_DIRS}
22
    ${QTDEE_INCLUDE_DIRS}
380
23
    ${SCOPESLIB_INCLUDE_DIRS}
381
16
    )
24
    )
382
17
25
383
18
macro(run_tests)
26
macro(run_tests)
384
@@ -27,7 +35,9 @@
385
27
        add_executable(${_test}Exec ${_test}.cpp)
35
        add_executable(${_test}Exec ${_test}.cpp)
386
28
        qt5_use_modules(${_test}Exec Test Core Qml)
36
        qt5_use_modules(${_test}Exec Test Core Qml)
387
29
        set_tests_properties(test${CLASSNAME}${_test}
37
        set_tests_properties(test${CLASSNAME}${_test}
389
30
                PROPERTIES ENVIRONMENT "QT_QPA_PLATFORM=minimal;LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/plugins/Unity:${LIBUNITYPROTO_LIBRARY_DIRS}")
38
                PROPERTIES ENVIRONMENT "QT_QPA_PLATFORM=minimal;LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/plugins/Unity:${LIBUNITYPROTO_LIBRARY_DIRS};UNITY_SCOPES_RUNTIME_PATH=${SCOPES_TEST_RUNTIME}")
390
39
        set_target_properties(${_test}Exec
391
40
                PROPERTIES COMPILE_FLAGS "-DTEST_SCOPEREGISTRY_BIN='\"${SCOPES_BIN_DIR}/scoperegistry/scoperegistry\"' -DTEST_RUNTIME_CONFIG='\"${SCOPES_TEST_RUNTIME}\"'")
392
31
41
393
32
        target_link_libraries(${_test}Exec
42
        target_link_libraries(${_test}Exec
394
33
            Unity-qml
43
            Unity-qml
395
@@ -36,6 +46,7 @@
396
36
            ${LIBUNITYPROTO_LDFLAGS}
46
            ${LIBUNITYPROTO_LDFLAGS}
397
37
            ${LIBSIGCPP_LDFLAGS}
47
            ${LIBSIGCPP_LDFLAGS}
398
38
            ${QTDEE_LDFLAGS}
48
            ${QTDEE_LDFLAGS}
399
49
            ${SCOPESLIB_LDFLAGS}
400
39
            )
50
            )
401
40
51
402
41
        set(_test_list "${_test_list};${_test}")
52
        set(_test_list "${_test_list};${_test}")
403
@@ -47,4 +58,5 @@
404
47
    previewbindingstest
58
    previewbindingstest
405
48
    filtersbindingstest
59
    filtersbindingstest
406
49
    resultstest
60
    resultstest
407
61
    resultstest-ng
408
50
    )
62
    )
409
51
63
410
=== added directory 'tests/data'
411
=== added file 'tests/data/CMakeLists.txt'
412
--- tests/data/CMakeLists.txt	1970-01-01 00:00:00 +0000
413
+++ tests/data/CMakeLists.txt	2013-12-12 12:53:45 +0000
414
@@ -0,0 +1,7 @@
415
1
add_subdirectory(mock-scope)
416
2
417
3
configure_file(Runtime.ini.in Runtime.ini @ONLY)
418
4
configure_file(Registry.ini.in Registry.ini @ONLY)
419
5
configure_file(Zmq.ini.in Zmq.ini @ONLY)
420
6
421
7
execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/endpoints)
422
0
8
423
=== added file 'tests/data/Registry.ini.in'
424
--- tests/data/Registry.ini.in	1970-01-01 00:00:00 +0000
425
+++ tests/data/Registry.ini.in	2013-12-12 12:53:45 +0000
426
@@ -0,0 +1,7 @@
427
1
[Registry]
428
2
Middleware = Zmq
429
3
Zmq.Endpoint = ipc:///tmp/scopes-test-endpoints/Registry
430
4
Zmq.EndpointDir = /tmp/scopes-test-endpoints
431
5
Zmq.ConfigFile = @CMAKE_CURRENT_BINARY_DIR@/Zmq.ini
432
6
Scope.InstallDir = @CMAKE_CURRENT_BINARY_DIR@
433
7
Scoperunner.Path = @SCOPES_BIN_DIR@/scoperunner/scoperunner
434
0
8
435
=== added file 'tests/data/Runtime.ini.in'
436
--- tests/data/Runtime.ini.in	1970-01-01 00:00:00 +0000
437
+++ tests/data/Runtime.ini.in	2013-12-12 12:53:45 +0000
438
@@ -0,0 +1,6 @@
439
1
[Runtime]
440
2
Registry.Identity = Registry
441
3
Registry.ConfigFile = @CMAKE_CURRENT_BINARY_DIR@/Registry.ini
442
4
Default.Middleware = Zmq
443
5
Zmq.ConfigFile = @CMAKE_CURRENT_BINARY_DIR@/Zmq.ini
444
6
Factory.ConfigFile = Factory.ini
445
0
7
446
=== added file 'tests/data/Zmq.ini.in'
447
--- tests/data/Zmq.ini.in	1970-01-01 00:00:00 +0000
448
+++ tests/data/Zmq.ini.in	2013-12-12 12:53:45 +0000
449
@@ -0,0 +1,3 @@
450
1
[Zmq]
451
2
EndpointDir.Public = /tmp/scopes-test-endpoints
452
3
EndpointDir.Private = /tmp/scopes-test-endpoints
453
0
4
454
=== added directory 'tests/data/mock-scope'
455
=== added file 'tests/data/mock-scope/CMakeLists.txt'
456
--- tests/data/mock-scope/CMakeLists.txt	1970-01-01 00:00:00 +0000
457
+++ tests/data/mock-scope/CMakeLists.txt	2013-12-12 12:53:45 +0000
458
@@ -0,0 +1,11 @@
459
1
include(FindPkgConfig)
460
2
pkg_check_modules(SCOPESLIB REQUIRED libunity-scopes>=0.1.2)
461
3
462
4
set(SCOPES_BIN_DIR ${SCOPESLIB_LIBDIR})
463
5
464
6
include_directories(${SCOPESLIB_INCLUDE_DIRS})
465
7
466
8
add_library(mock-scope MODULE mock-scope.cpp)
467
9
target_link_libraries(mock-scope ${SCOPESLIB_LDFLAGS})
468
10
469
11
configure_file(mock-scope.ini.in mock-scope.ini)
470
0
12
471
=== added file 'tests/data/mock-scope/mock-scope.cpp'
472
--- tests/data/mock-scope/mock-scope.cpp	1970-01-01 00:00:00 +0000
473
+++ tests/data/mock-scope/mock-scope.cpp	2013-12-12 12:53:45 +0000
474
@@ -0,0 +1,119 @@
475
1
/*
476
2
 * Copyright (C) 2013 Canonical, Ltd.
477
3
 *
478
4
 * This program is free software; you can redistribute it and/or modify
479
5
 * it under the terms of the GNU General Public License as published by
480
6
 * the Free Software Foundation; version 3.
481
7
 *
482
8
 * This program is distributed in the hope that it will be useful,
483
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
484
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
485
11
 * GNU General Public License for more details.
486
12
 *
487
13
 * You should have received a copy of the GNU General Public License
488
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
489
15
 *
490
16
 * Authors:
491
17
 *  Michal Hruby <michal.hruby@canonical.com>
492
18
 */
493
19
494
20
#include <scopes/ScopeBase.h>
495
21
#include <scopes/Reply.h>
496
22
#include <scopes/Category.h>
497
23
#include <scopes/CategorisedResult.h>
498
24
#include <scopes/CategoryRenderer.h>
499
25
500
26
#include <iostream>
501
27
502
28
#define EXPORT __attribute__ ((visibility ("default")))
503
29
504
30
using namespace std;
505
31
using namespace unity::api::scopes;
506
32
507
33
// Example scope A: replies synchronously to a query. (Replies are returned before returning from the run() method.)
508
34
509
35
class MyQuery : public QueryBase
510
36
{
511
37
public:
512
38
    MyQuery(string const& query) :
513
39
        query_(query)
514
40
    {
515
41
    }
516
42
517
43
    ~MyQuery() noexcept
518
44
    {
519
45
    }
520
46
521
47
    virtual void cancelled() override
522
48
    {
523
49
    }
524
50
525
51
    virtual void run(ReplyProxy const& reply) override
526
52
    {
527
53
        CategoryRenderer rdr;
528
54
        if (query_ == "metadata")
529
55
        {
530
56
            auto cat = reply->register_category("cat1", "Category 1", "", rdr);
531
57
            CategorisedResult res(cat);
532
58
            res.set_uri("test:uri");
533
59
            res.set_title("result for: \"" + query_ + "\"");
534
60
            res.set_art("art");
535
61
            res.set_dnd_uri("test:dnd_uri");
536
62
            res.add_metadata("subtitle", Variant("subtitle"));
537
63
            res.add_metadata("emblem", Variant("emblem"));
538
64
            reply->push(res);
539
65
        }
540
66
        else
541
67
        {
542
68
            auto cat = reply->register_category("cat1", "Category 1", "", rdr);
543
69
            CategorisedResult res(cat);
544
70
            res.set_uri("test:uri");
545
71
            res.set_title("result for: \"" + query_ + "\"");
546
72
            res.set_art("art");
547
73
            res.set_dnd_uri("test:dnd_uri");
548
74
            reply->push(res);
549
75
        }
550
76
    }
551
77
552
78
private:
553
79
    string query_;
554
80
};
555
81
556
82
class MyScope : public ScopeBase
557
83
{
558
84
public:
559
85
    virtual int start(string const&, RegistryProxy const&) override
560
86
    {
561
87
        return VERSION;
562
88
    }
563
89
564
90
    virtual void stop() override {}
565
91
566
92
    virtual QueryBase::UPtr create_query(string const& q, VariantMap const&) override
567
93
    {
568
94
        QueryBase::UPtr query(new MyQuery(q));
569
95
        cout << "scope-A: created query: \"" << q << "\"" << endl;
570
96
        return query;
571
97
    }
572
98
};
573
99
574
100
extern "C"
575
101
{
576
102
577
103
    EXPORT
578
104
    unity::api::scopes::ScopeBase*
579
105
    // cppcheck-suppress unusedFunction
580
106
    UNITY_API_SCOPE_CREATE_FUNCTION()
581
107
    {
582
108
        return new MyScope;
583
109
    }
584
110
585
111
    EXPORT
586
112
    void
587
113
    // cppcheck-suppress unusedFunction
588
114
    UNITY_API_SCOPE_DESTROY_FUNCTION(unity::api::scopes::ScopeBase* scope_base)
589
115
    {
590
116
        delete scope_base;
591
117
    }
592
118
593
119
}
594
0
120
595
=== added file 'tests/data/mock-scope/mock-scope.ini.in'
596
--- tests/data/mock-scope/mock-scope.ini.in	1970-01-01 00:00:00 +0000
597
+++ tests/data/mock-scope/mock-scope.ini.in	2013-12-12 12:53:45 +0000
598
@@ -0,0 +1,7 @@
599
1
[ScopeConfig]
600
2
DisplayName = mock.DisplayName
601
3
Description = mock.Description
602
4
Art = mock.Art
603
5
Icon = mock.Icon
604
6
SearchHint = mock.SearchHint
605
7
HotKey = mock.HotKey
606
0
8
607
=== added file 'tests/resultstest-ng.cpp'
608
--- tests/resultstest-ng.cpp	1970-01-01 00:00:00 +0000
609
+++ tests/resultstest-ng.cpp	2013-12-12 12:53:45 +0000
610
@@ -0,0 +1,200 @@
611
1
/*
612
2
 * Copyright (C) 2013 Canonical, Ltd.
613
3
 *
614
4
 * This program is free software; you can redistribute it and/or modify
615
5
 * it under the terms of the GNU General Public License as published by
616
6
 * the Free Software Foundation; version 3.
617
7
 *
618
8
 * This program is distributed in the hope that it will be useful,
619
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
620
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
621
11
 * GNU General Public License for more details.
622
12
 *
623
13
 * You should have received a copy of the GNU General Public License
624
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
625
15
 *
626
16
 * Authors:
627
17
 *  Michal Hruby <michal.hruby@canonical.com>
628
18
 */
629
19
630
20
#include <QObject>
631
21
#include <QTest>
632
22
#include <QFile>
633
23
#include <QFileInfo>
634
24
#include <QDir>
635
25
#include <QProcess>
636
26
#include <QThread>
637
27
#include <QScopedPointer>
638
28
639
29
#include <scopes-ng/scopes.h>
640
30
#include <scopes-ng/scope.h>
641
31
#include <scopes-ng/categories.h>
642
32
#include <scopes-ng/resultsmodel.h>
643
33
644
34
#define SCOPES_TMP_ENDPOINT_DIR "/tmp/scopes-test-endpoints"
645
35
646
36
using namespace scopes_ng;
647
37
648
38
class ResultsTestNg : public QObject
649
39
{
650
40
    Q_OBJECT
651
41
private:
652
42
    QScopedPointer<Scopes> m_scopes;
653
43
    Scope* m_scope;
654
44
    QScopedPointer<QProcess> m_registry;
655
45
656
46
private Q_SLOTS:
657
47
    void initTestCase()
658
48
    {
659
49
        QDir endpointdir(QFileInfo(TEST_RUNTIME_CONFIG).dir());
660
50
        endpointdir.cd(QString("endpoints"));
661
51
        QFile::remove(SCOPES_TMP_ENDPOINT_DIR);
662
52
        // symlinking to workaround "File name too long" issue
663
53
        QVERIFY2(QFile::link(endpointdir.absolutePath(), SCOPES_TMP_ENDPOINT_DIR),
664
54
            "Unable to create symlink " SCOPES_TMP_ENDPOINT_DIR);
665
55
        // startup our private scope registry
666
56
        QString registryBin(TEST_SCOPEREGISTRY_BIN);
667
57
        QStringList arguments;
668
58
        arguments << TEST_RUNTIME_CONFIG;
669
59
670
60
        m_registry.reset(new QProcess(nullptr));
671
61
        m_registry->start(registryBin, arguments);
672
62
    }
673
63
674
64
    void cleanupTestCase()
675
65
    {
676
66
        if (m_registry) {
677
67
            m_registry->terminate();
678
68
            if (!m_registry->waitForFinished()) {
679
69
                m_registry->kill();
680
70
            }
681
71
        }
682
72
        QFile::remove(SCOPES_TMP_ENDPOINT_DIR);
683
73
    }
684
74
685
75
    void init()
686
76
    {
687
77
        m_scopes.reset(new Scopes(nullptr));
688
78
        // no scopes on startup
689
79
        QCOMPARE(m_scopes->rowCount(), 0);
690
80
        // wait till the registry spawns
691
81
        QTRY_COMPARE(m_scopes->loaded(), true);
692
82
        // should have one scope now
693
83
        QCOMPARE(m_scopes->rowCount(), 1);
694
84
695
85
        QVariant scope_var = m_scopes->data(m_scopes->index(0), Scopes::Roles::RoleScope);
696
86
        QVERIFY(scope_var.canConvert<Scope*>());
697
87
698
88
        // get scope proxy
699
89
        m_scope = scope_var.value<Scope*>();
700
90
    }
701
91
702
92
    void cleanup()
703
93
    {
704
94
        m_scopes.reset();
705
95
        m_scope = nullptr;
706
96
    }
707
97
708
98
    void testScopeCommunication()
709
99
    {
710
100
        QCOMPARE(m_scope->searchInProgress(), false);
711
101
        // perform a search
712
102
        m_scope->setSearchQuery(QString(""));
713
103
        QCOMPARE(m_scope->searchInProgress(), true);
714
104
        QTRY_COMPARE(m_scope->searchInProgress(), false);
715
105
716
106
        // ensure categories have > 0 rows
717
107
        auto categories = m_scope->categories();
718
108
        QVERIFY(categories->rowCount() > 0);
719
109
        QVariant results_var = categories->data(categories->index(0), Categories::Roles::RoleResults);
720
110
        QVERIFY(results_var.canConvert<ResultsModel*>());
721
111
722
112
        // ensure results have some data
723
113
        auto results = results_var.value<ResultsModel*>();
724
114
        QVERIFY(results->rowCount() > 0);
725
115
    }
726
116
727
117
    void testScopesGet()
728
118
    {
729
119
        QVariant scope_var = m_scopes->get(0);
730
120
        QVERIFY(scope_var.canConvert<scopes_ng::Scope*>());
731
121
732
122
        // try incorrect index as well
733
123
        scope_var = m_scopes->get(65536);
734
124
        QVERIFY(scope_var.isNull());
735
125
        scope_var = m_scopes->get(-1);
736
126
        QVERIFY(scope_var.isNull());
737
127
    }
738
128
739
129
    void testTwoSearches()
740
130
    {
741
131
        QCOMPARE(m_scope->searchInProgress(), false);
742
132
        // perform a search
743
133
        m_scope->setSearchQuery(QString(""));
744
134
        QCOMPARE(m_scope->searchInProgress(), true);
745
135
        QTRY_COMPARE(m_scope->searchInProgress(), false);
746
136
747
137
        // ensure categories have > 0 rows
748
138
        auto categories = m_scope->categories();
749
139
        auto categories_count = categories->rowCount();
750
140
        QVERIFY(categories_count > 0);
751
141
752
142
        m_scope->setSearchQuery(QString("foo"));
753
143
        QCOMPARE(m_scope->searchInProgress(), true);
754
144
        // wait for the search to finish
755
145
        QTRY_COMPARE(m_scope->searchInProgress(), false);
756
146
757
147
        // shouldn't create more nor fewer categories
758
148
        QVERIFY(categories->rowCount() == categories_count);
759
149
    }
760
150
761
151
    void testBasicResultData()
762
152
    {
763
153
        QCOMPARE(m_scope->searchInProgress(), false);
764
154
        // perform a search
765
155
        m_scope->setSearchQuery(QString(""));
766
156
        QCOMPARE(m_scope->searchInProgress(), true);
767
157
        QTRY_COMPARE(m_scope->searchInProgress(), false);
768
158
769
159
        // get ResultsModel instance
770
160
        auto categories = m_scope->categories();
771
161
        QVERIFY(categories->rowCount() > 0);
772
162
        QVariant results_var = categories->data(categories->index(0), Categories::Roles::RoleResults);
773
163
        QVERIFY(results_var.canConvert<ResultsModel*>());
774
164
        auto results = results_var.value<ResultsModel*>();
775
165
        QVERIFY(results->rowCount() > 0);
776
166
777
167
        auto idx = results->index(0);
778
168
        QCOMPARE(results->data(idx, ResultsModel::Roles::RoleUri).toString(), QString("test:uri"));
779
169
        QCOMPARE(results->data(idx, ResultsModel::Roles::RoleDndUri).toString(), QString("test:dnd_uri"));
780
170
        QCOMPARE(results->data(idx, ResultsModel::Roles::RoleTitle).toString(), QString("result for: \"\""));
781
171
        QCOMPARE(results->data(idx, ResultsModel::Roles::RoleArt).toString(), QString("art"));
782
172
        QCOMPARE(results->data(idx, ResultsModel::Roles::RoleCategoryId), categories->data(categories->index(0), Categories::Roles::RoleCategoryId));
783
173
    }
784
174
785
175
    void testMetadataData()
786
176
    {
787
177
        QCOMPARE(m_scope->searchInProgress(), false);
788
178
        // perform a search
789
179
        m_scope->setSearchQuery(QString("metadata"));
790
180
        QCOMPARE(m_scope->searchInProgress(), true);
791
181
        QTRY_COMPARE(m_scope->searchInProgress(), false);
792
182
793
183
        // get ResultsModel instance
794
184
        auto categories = m_scope->categories();
795
185
        QVERIFY(categories->rowCount() > 0);
796
186
        QVariant results_var = categories->data(categories->index(0), Categories::Roles::RoleResults);
797
187
        QVERIFY(results_var.canConvert<ResultsModel*>());
798
188
        auto results = results_var.value<ResultsModel*>();
799
189
        QVERIFY(results->rowCount() > 0);
800
190
801
191
        auto idx = results->index(0);
802
192
        QCOMPARE(results->data(idx, ResultsModel::Roles::RoleTitle).toString(), QString("result for: \"metadata\""));
803
193
        QCOMPARE(results->data(idx, ResultsModel::Roles::RoleSubtitle).toString(), QString("subtitle"));
804
194
        QCOMPARE(results->data(idx, ResultsModel::Roles::RoleEmblem).toString(), QString("emblem"));
805
195
        QCOMPARE(results->data(idx, ResultsModel::Roles::RoleAltRating).toString(), QString());
806
196
    }
807
197
};
808
198
809
199
QTEST_MAIN(ResultsTestNg)
810
200
#include <resultstest-ng.moc>
Status:	Merged
Approved by:	Michal Hruby on 2013-12-12
Approved revision:	37
Merged at revision:	31
Proposed branch:	lp:~mhr3/unity-scopes-shell/scopes-ng-tests
Merge into:	lp:unity-scopes-shell
Diff against target:	810 lines (+479/-47) 18 files modified src/Unity/CMakeLists.txt (+1/-1) src/Unity/scopes-ng/CMakeLists.txt (+1/-1) src/Unity/scopes-ng/categories.cpp (+4/-4) src/Unity/scopes-ng/categories.h (+2/-2) src/Unity/scopes-ng/resultsmodel.cpp (+60/-23) src/Unity/scopes-ng/resultsmodel.h (+18/-6) src/Unity/scopes-ng/scope.h (+1/-1) src/Unity/scopes-ng/scopes.cpp (+16/-7) src/Unity/scopes-ng/scopes.h (+3/-1) tests/CMakeLists.txt (+13/-1) tests/data/CMakeLists.txt (+7/-0) tests/data/Registry.ini.in (+7/-0) tests/data/Runtime.ini.in (+6/-0) tests/data/Zmq.ini.in (+3/-0) tests/data/mock-scope/CMakeLists.txt (+11/-0) tests/data/mock-scope/mock-scope.cpp (+119/-0) tests/data/mock-scope/mock-scope.ini.in (+7/-0) tests/resultstest-ng.cpp (+200/-0)
To merge this branch:	bzr merge lp:~mhr3/unity-scopes-shell/scopes-ng-tests
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Approve on 2013-12-12
Michael Zanetti (community)		2013-12-10	Approve on 2013-12-12
Review via email: mp+198437@code.launchpad.net