1
=== modified file 'scope/apps/action.cpp'
2
--- scope/apps/action.cpp	2016-07-28 15:46:36 +0000
3
+++ scope/apps/action.cpp	2016-07-29 13:21:50 +0000
4
@@ -29,14 +29,30 @@
5
29
namespace usc = unity::scopes;
29
namespace usc = unity::scopes;
6
30
30
7
31
31
8
32
namespace
9
33
{
10
34
static usc::ActivationResponse
11
35
sendToResults(usc::FilterState const& filter_state)
12
36
{
13
37
  usc::CannedQuery query(FULLY_QUALIFIED_APPS_SCOPE);
14
38
  query.set_filter_state(filter_state);
15
39
  return usc::ActivationResponse(query);
16
40
}
17
41
}
18
42
19
43
20
32
Action::
44
Action::
28
33
Action(usc::Result const& result,
45
Action(unity::scopes::Result const&         result,
29
34
       usc::ActionMetadata const& metadata,
46
       unity::scopes::ActionMetadata const& metadata,
30
35
       std::string const& action_id, 
47
       std::string const&                   action_id,
31
36
       std::shared_ptr<HiddenApps> hidden)
48
       Action::OpenUriAction                open_action,
32
37
    : usc::ActivationQueryBase(result, metadata),
49
       std::shared_ptr<HiddenApps>          hidden,
33
38
      action_id_(action_id),
50
       unity::scopes::FilterState const&    filter_state)
34
39
      hidden_(hidden)
51
  : usc::ActivationQueryBase(result, metadata)
35
52
  , action_id_(action_id)
36
53
  , open_action_(open_action)
37
54
  , hidden_(hidden)
38
55
  , filter_state_(filter_state)
39
40
{
56
{
40
41
}
57
}
41
42
58
42
@@ -46,22 +62,17 @@
43
46
{
62
{
44
47
  if (action_id_ == "open")
63
  if (action_id_ == "open")
45
48
  {
64
  {
48
49
    url_dispatch_send(result().uri().c_str() , NULL, NULL);
65
    open_action_(result().uri());
47
50
    return usc::ActivationResponse(usc::ActivationResponse::Status::NotHandled);
49
51
  }
66
  }
50
52
  else if (action_id_ == "hide")
67
  else if (action_id_ == "hide")
51
53
  {
68
  {
52
54
    hidden_->add(QString::fromStdString(result()["app_id"].get_string()));
69
    hidden_->add(QString::fromStdString(result()["app_id"].get_string()));
56
55
70
    return sendToResults(filter_state_);
54
56
    usc::CannedQuery cq(FULLY_QUALIFIED_APPS_SCOPE);
55
57
    return usc::ActivationResponse(cq);
57
58
  }
71
  }
58
59
  else if (action_id_ == "show")
72
  else if (action_id_ == "show")
59
60
  {
73
  {
60
61
    hidden_->remove(QString::fromStdString(result()["app_id"].get_string()));
74
    hidden_->remove(QString::fromStdString(result()["app_id"].get_string()));
64
62
75
    return sendToResults(filter_state_);
62
63
    usc::CannedQuery cq(FULLY_QUALIFIED_APPS_SCOPE);
63
64
    return usc::ActivationResponse(cq);
65
65
  }
76
  }
66
66
  return usc::ActivationResponse(usc::ActivationResponse::Status::NotHandled);
77
  return usc::ActivationResponse(usc::ActivationResponse::Status::NotHandled);
67
67
}
78
}
68
68
79
69
=== modified file 'scope/apps/action.h'
70
--- scope/apps/action.h	2016-07-12 18:26:07 +0000
71
+++ scope/apps/action.h	2016-07-29 13:21:50 +0000
72
@@ -15,31 +15,37 @@
73
15
 * * Authored by:
15
 * * Authored by:
74
16
 *	Kyle Nitzsche <kyle.nitzsche@canonical.com>
16
 *	Kyle Nitzsche <kyle.nitzsche@canonical.com>
75
17
 */
17
 */
76
18
77
19
#ifndef SCOPE_ACTION_H_
18
#ifndef SCOPE_ACTION_H_
78
20
#define SCOPE_ACTION_H_
19
#define SCOPE_ACTION_H_
79
21
20
81
22
#include "scope/apps/scope.h"
21
82
23
#include <unity/scopes/ActionMetadata.h>
22
#include <unity/scopes/ActionMetadata.h>
83
24
#include <unity/scopes/ActivationQueryBase.h>
23
#include <unity/scopes/ActivationQueryBase.h>
84
25
#include <unity/scopes/ActivationResponse.h>
24
#include <unity/scopes/ActivationResponse.h>
85
26
#include <unity/scopes/Result.h>
25
#include <unity/scopes/Result.h>
86
27
26
87
27
88
28
class HiddenApps;
28
class HiddenApps;
89
29
29
90
30
class Action : public unity::scopes::ActivationQueryBase {
30
class Action : public unity::scopes::ActivationQueryBase {
104
31
  public:
31
public:
105
32
    Action(unity::scopes::Result const&         result,
32
  typedef std::function<void(std::string const&)> OpenUriAction;
106
33
           unity::scopes::ActionMetadata const& metadata,
33
107
34
           std::string const&                   action_id, 
34
  explicit Action(unity::scopes::Result const&         result,
108
35
           std::shared_ptr<HiddenApps>          hidden);
35
                  unity::scopes::ActionMetadata const& metadata,
109
36
36
                  std::string const&                   action_id,
110
37
    virtual ~Action() = default;
37
                  OpenUriAction                        open_action,
111
38
    virtual unity::scopes::ActivationResponse activate() override;
38
                  std::shared_ptr<HiddenApps>          hidden,
112
39
39
                  unity::scopes::FilterState const&    filterState);
113
40
  private:
40
114
41
    std::string action_id_;
41
  virtual ~Action() = default;
115
42
    std::string cache_dir_;
42
  virtual unity::scopes::ActivationResponse activate() override;
116
43
    std::shared_ptr<HiddenApps> hidden_;
43
117
44
private:
118
45
  std::string action_id_;
119
46
  std::string cache_dir_;
120
47
  OpenUriAction open_action_;
121
48
  std::shared_ptr<HiddenApps> hidden_;
122
49
  unity::scopes::FilterState filter_state_;
123
44
};
50
};
124
45
#endif
51
#endif
125
46
52
126
=== modified file 'scope/apps/scope.cpp'
127
--- scope/apps/scope.cpp	2016-07-28 15:47:35 +0000
128
+++ scope/apps/scope.cpp	2016-07-29 13:21:50 +0000
129
@@ -29,6 +29,16 @@
130
29
namespace usc = unity::scopes;
29
namespace usc = unity::scopes;
131
30
30
132
31
31
133
32
namespace
134
33
{
135
34
static void
136
35
open_application(std::string const& app_uri)
137
36
{
138
37
  url_dispatch_send(app_uri.c_str(), NULL, NULL);
139
38
}
140
39
}
141
40
142
41
143
32
Scope::
42
Scope::
144
33
Scope(Libertine::Factory const& libertine_factory)
43
Scope(Libertine::Factory const& libertine_factory)
145
34
: libertine_factory_(libertine_factory)
44
: libertine_factory_(libertine_factory)
146
@@ -56,6 +66,7 @@
147
56
search(usc::CannedQuery const&    query,
66
search(usc::CannedQuery const&    query,
148
57
       usc::SearchMetadata const& metadata)
67
       usc::SearchMetadata const& metadata)
149
58
{
68
{
150
69
  filter_state_ = query.filter_state();
151
59
  return usc::SearchQueryBase::UPtr(new Query(query,
70
  return usc::SearchQueryBase::UPtr(new Query(query,
152
60
                                              metadata,
71
                                              metadata,
153
61
                                              libertine_factory_,
72
                                              libertine_factory_,
154
@@ -81,7 +92,9 @@
155
81
  return usc::ActivationQueryBase::UPtr(new Action(result,
92
  return usc::ActivationQueryBase::UPtr(new Action(result,
156
82
                                                   metadata,
93
                                                   metadata,
157
83
                                                   action_id,
94
                                                   action_id,
159
84
                                                   std::make_shared<HiddenApps>(cache_directory())));
95
                                                   open_application,
160
96
                                                   std::make_shared<HiddenApps>(cache_directory()),
161
97
                                                   filter_state_));
162
85
}
98
}
163
86
99
164
87
100
165
88
101
166
=== modified file 'scope/apps/scope.h'
167
--- scope/apps/scope.h	2016-07-12 18:26:07 +0000
168
+++ scope/apps/scope.h	2016-07-29 13:21:50 +0000
169
@@ -78,6 +78,7 @@
170
78
78
171
79
private:
79
private:
172
80
  Libertine::Factory libertine_factory_;
80
  Libertine::Factory libertine_factory_;
173
81
  unity::scopes::FilterState filter_state_;
174
81
};
82
};
175
82
83
176
83
#endif // LIBERTINE_SCOPE_SCOPE_H_
84
#endif // LIBERTINE_SCOPE_SCOPE_H_
177
84
85
178
=== modified file 'tests/CMakeLists.txt'
179
--- tests/CMakeLists.txt	2016-07-12 18:26:07 +0000
180
+++ tests/CMakeLists.txt	2016-07-29 13:21:50 +0000
181
@@ -7,6 +7,7 @@
182
7
  add_executable(${test_name}_exe
7
  add_executable(${test_name}_exe
183
8
    fake_container.cpp
8
    fake_container.cpp
184
9
    fake_libertine.cpp
9
    fake_libertine.cpp
185
10
    mock_hidden_apps.h
186
10
    ${test_name}.cpp
11
    ${test_name}.cpp
187
11
  )
12
  )
188
12
13
189
@@ -25,5 +26,6 @@
190
25
create_test(test_query)
26
create_test(test_query)
191
26
create_test(test_hidden_apps)
27
create_test(test_hidden_apps)
192
27
create_test(test_blacklist)
28
create_test(test_blacklist)
193
29
create_test(test_action)
194
28
30
195
29
file(COPY data DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
31
file(COPY data DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
196
30
32
197
=== added file 'tests/mock_hidden_apps.h'
198
--- tests/mock_hidden_apps.h	1970-01-01 00:00:00 +0000
199
+++ tests/mock_hidden_apps.h	2016-07-29 13:21:50 +0000
200
@@ -0,0 +1,32 @@
201
1
/*
202
2
 * Copyright 2016 Canonical Ltd.
203
3
 *
204
4
 * This program is free software: you can redistribute it and/or modify it under
205
5
 * the terms of the GNU General Public License, version 3, as published by the
206
6
 * Free Software Foundation.
207
7
 *
208
8
 * This program is distributed in the hope that it will be useful,
209
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
210
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
211
11
 * GNU General Public License for more details.
212
12
 *
213
13
 * You should have received a copy of the GNU General Public License
214
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
215
15
 */
216
16
#include "scope/apps/hidden_apps.h"
217
17
#include <gmock/gmock.h>
218
18
219
19
220
20
class MockHiddenApps : public HiddenApps
221
21
{
222
22
public:
223
23
  MockHiddenApps()
224
24
    : HiddenApps("")
225
25
  {
226
26
  }
227
27
228
28
  MOCK_CONST_METHOD1(app_is_hidden, bool(QString const&));
229
29
  MOCK_CONST_METHOD0(empty, bool());
230
30
  MOCK_METHOD1(remove, void(QString const&));
231
31
  MOCK_METHOD1(add, void(QString const&));
232
32
};
233
0
33
234
=== added file 'tests/test_action.cpp'
235
--- tests/test_action.cpp	1970-01-01 00:00:00 +0000
236
+++ tests/test_action.cpp	2016-07-29 13:21:50 +0000
237
@@ -0,0 +1,82 @@
238
1
/*
239
2
 * Copyright 2016 Canonical Ltd.
240
3
 *
241
4
 * This program is free software: you can redistribute it and/or modify it under
242
5
 * the terms of the GNU General Public License, version 3, as published by the
243
6
 * Free Software Foundation.
244
7
 *
245
8
 * This program is distributed in the hope that it will be useful,
246
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
247
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
248
11
 * GNU General Public License for more details.
249
12
 *
250
13
 * You should have received a copy of the GNU General Public License
251
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
252
15
 */
253
16
#include "scope/apps/action.h"
254
17
#include "tests/mock_hidden_apps.h"
255
18
256
19
#include <unity/scopes/ActionMetadata.h>
257
20
#include <unity/scopes/testing/Result.h>
258
21
#include <gmock/gmock.h>
259
22
260
23
261
24
namespace
262
25
{
263
26
TEST(ActionTest, OpenSendsDispatchURI)
264
27
{
265
28
  unity::scopes::testing::Result result;
266
29
  result.set_uri("app://this/is/my/app");
267
30
  unity::scopes::ActionMetadata metadata("en_US", "phone");
268
31
  auto hidden = std::make_shared<testing::NiceMock<MockHiddenApps> >();
269
32
  unity::scopes::FilterState filter_state;
270
33
271
34
  std::string uri;
272
35
273
36
  Action action(result, metadata, "open", [&](std::string const& app_uri) {
274
37
    uri = app_uri;
275
38
  }, hidden, filter_state);
276
39
277
40
  auto response = action.activate();
278
41
  EXPECT_EQ(unity::scopes::ActivationResponse::Status::NotHandled, response.status());
279
42
  EXPECT_EQ(result.uri(), uri);
280
43
}
281
44
282
45
283
46
TEST(ActionTest, ShowRemovesAppFromHidden)
284
47
{
285
48
  unity::scopes::testing::Result result;
286
49
  unity::scopes::ActionMetadata metadata("en_US", "phone");
287
50
  unity::scopes::FilterState filter_state;
288
51
  auto hidden = std::make_shared<testing::NiceMock<MockHiddenApps> >();
289
52
290
53
  QString app_id = "something.desktop";
291
54
  result["app_id"] = app_id.toStdString();
292
55
  EXPECT_CALL(*hidden, remove(app_id));
293
56
294
57
  Action action(result, metadata, "show", Action::OpenUriAction{}, hidden, filter_state);
295
58
296
59
  auto response = action.activate();
297
60
  EXPECT_EQ(filter_state.serialize(), response.query().filter_state().serialize());
298
61
  EXPECT_EQ(unity::scopes::ActivationResponse::Status::PerformQuery, response.status());
299
62
}
300
63
301
64
302
65
TEST(ActionTest, HideAddsAppToHidden)
303
66
{
304
67
  unity::scopes::testing::Result result;
305
68
  unity::scopes::ActionMetadata metadata("en_US", "phone");
306
69
  unity::scopes::FilterState filter_state;
307
70
  auto hidden = std::make_shared<testing::NiceMock<MockHiddenApps> >();
308
71
309
72
  QString app_id = "something.desktop";
310
73
  result["app_id"] = app_id.toStdString();
311
74
  EXPECT_CALL(*hidden, add(app_id));
312
75
313
76
  Action action(result, metadata, "hide", Action::OpenUriAction{}, hidden, filter_state);
314
77
315
78
  auto response = action.activate();
316
79
  EXPECT_EQ(filter_state.serialize(), response.query().filter_state().serialize());
317
80
  EXPECT_EQ(unity::scopes::ActivationResponse::Status::PerformQuery, response.status());
318
81
}
319
82
}
320
0
83
321
=== modified file 'tests/test_query.cpp'
322
--- tests/test_query.cpp	2016-07-12 18:26:07 +0000
323
+++ tests/test_query.cpp	2016-07-29 13:21:50 +0000
324
@@ -17,6 +17,7 @@
325
17
#include "scope/apps/query.h"
17
#include "scope/apps/query.h"
326
18
#include "scope/apps/config.h"
18
#include "scope/apps/config.h"
327
19
#include "tests/fake_libertine.h"
19
#include "tests/fake_libertine.h"
328
20
#include "tests/mock_hidden_apps.h"
329
20
#include <unity/scopes/SearchMetadata.h>
21
#include <unity/scopes/SearchMetadata.h>
330
21
#include <unity/scopes/CannedQuery.h>
22
#include <unity/scopes/CannedQuery.h>
331
22
#include <unity/scopes/SearchReplyProxyFwd.h>
23
#include <unity/scopes/SearchReplyProxyFwd.h>
332
@@ -67,18 +68,6 @@
333
67
};
68
};
334
68
69
335
69
70
336
70
class MockHiddenApps : public HiddenApps
337
71
{
338
72
public:
339
73
  MockHiddenApps()
340
74
    : HiddenApps("")
341
75
  {
342
76
  }
343
77
344
78
  MOCK_CONST_METHOD1(app_is_hidden, bool(QString const&));
345
79
  MOCK_CONST_METHOD0(empty, bool());
346
80
};
347
81
348
82
class MockBlacklist : public Blacklist
71
class MockBlacklist : public Blacklist
349
83
{
72
{
350
84
public:
73
public:
Reviewer	Review Type	Date Requested	Status
Christopher Townsend		2016-07-28	Approve on 2016-07-29
Libertine CI Bot	continuous-integration		Approve on 2016-07-29
Review via email: mp+301426@code.launchpad.net