unity-scopes-api

Merge lp:~mhr3/unity-scopes-api/merge-trunk into lp:unity-scopes-api/devel

  1. merge-trunk
  2. Merge into devel
Proposed by Michal Hruby
Status: Merged
Approved by: Michal Hruby
Approved revision: no longer in the source branch.
Merged at revision: 314
Proposed branch: lp:~mhr3/unity-scopes-api/merge-trunk
Merge into: lp:unity-scopes-api/devel
Diff against target: 284 lines (+78/-25)
7 files modified
CMakeLists.txt (+1/-1)
debian/changelog (+13/-2)
debian/control (+1/-1)
debian/libunity-scopes1.symbols (+15/-15)
src/scopes/internal/ScopeConfig.cpp (+4/-4)
test/gtest/scopes/internal/ScopeConfig/ScopeConfig_test.cpp (+40/-1)
test/gtest/scopes/internal/ScopeConfig/configtest1.ini.in (+4/-1)
To merge this branch: bzr merge lp:~mhr3/unity-scopes-api/merge-trunk
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Unity Team Pending
Review via email: mp+217573@code.launchpad.net

Commit message

Merge trunk.

Description of the change

Merge trunk.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-autolanding/174/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-trusty-amd64-autolanding/174/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-trusty-armhf-autolanding/174/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-trusty-i386-autolanding/174/console

review: Needs Fixing (continuous-integration)
Revision history for this message
Michal Hruby (mhr3) wrote :

The CI/automerging bot needs to be transitioned to utopic.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:312
http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-ci/446/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-trusty-amd64-ci/447/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-trusty-armhf-ci/446/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-trusty-i386-ci/446/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-api-devel-ci/446/rebuild

review: Needs Fixing (continuous-integration)
lp:~mhr3/unity-scopes-api/merge-trunk updated
312. By Pete Woods

Fix raciness in RegistryObject test.

Approved by PS Jenkins bot, Michal Hruby.

313. By Pete Woods

Remove dead ini file option from example click scope.

Approved by Michal Hruby, PS Jenkins bot.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:312
http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-ci/449/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-utopic-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-utopic-armhf-ci/1
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-utopic-armhf-ci/1/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-utopic-i386-ci/1

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-api-devel-ci/449/rebuild

review: Approve (continuous-integration)
lp:~mhr3/unity-scopes-api/merge-trunk updated
314. By Michal Hruby

Merge trunk.

Approved by PS Jenkins bot.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2014-04-28 05:57:11 +0000
3+++ CMakeLists.txt 2014-04-29 10:31:01 +0000
4@@ -55,7 +55,7 @@
5
6 include(FindPkgConfig)
7 find_package(Boost COMPONENTS system filesystem regex serialization REQUIRED)
8-pkg_check_modules(UNITY_API libunity-api>=0.1.1 REQUIRED)
9+pkg_check_modules(UNITY_API libunity-api>=0.1.3 REQUIRED)
10 pkg_check_modules(PROCESS_CPP process-cpp>=1.0.0 REQUIRED)
11 pkg_check_modules(LTTNG_UST lttng-ust REQUIRED)
12 pkg_check_modules(LIBURCU_BP liburcu-bp REQUIRED)
13
14=== modified file 'debian/changelog'
15--- debian/changelog 2014-04-23 13:11:53 +0000
16+++ debian/changelog 2014-04-29 10:31:01 +0000
17@@ -1,9 +1,20 @@
18-unity-scopes-api (0.4.3-0ubuntu1) UNRELEASED; urgency=low
19+unity-scopes-api (0.4.3+14.10.20140428-0ubuntu1) utopic; urgency=low
20
21+ [ Pawel Stolowski ]
22 * Implemented to_uri() and from_uri() conversions for CannedQuery.
23 * Ship scopes-client in libunity-scopes-cli package.
24
25- -- Pawel Stolowski <pawel.stolowski@ubuntu.com> Wed, 23 Apr 2014 14:32:03 +0200
26+ [ Ubuntu daily release ]
27+ * debian/*symbols: auto-update new symbols to released version
28+
29+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Mon, 28 Apr 2014 17:24:08 +0000
30+
31+unity-scopes-api (0.4.2+14.04.20140408-0ubuntu1) trusty; urgency=low
32+
33+ [ Michal Hruby ]
34+ * Merge r298 from devel branch.
35+
36+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Tue, 08 Apr 2014 13:41:30 +0000
37
38 unity-scopes-api (0.4.2+14.04.20140404.2-0ubuntu1) trusty; urgency=low
39
40
41=== modified file 'debian/control'
42--- debian/control 2014-04-23 15:43:01 +0000
43+++ debian/control 2014-04-29 10:31:01 +0000
44@@ -12,7 +12,7 @@
45 python3,
46 capnproto,
47 libprocess-cpp-dev (>= 1.0.0),
48- libunity-api-dev (>= 7.80.5~),
49+ libunity-api-dev (>= 7.80.7~),
50 libboost-filesystem-dev,
51 libboost-regex-dev,
52 libboost-serialization-dev,
53
54=== modified file 'debian/libunity-scopes1.symbols'
55--- debian/libunity-scopes1.symbols 2014-04-23 21:53:31 +0000
56+++ debian/libunity-scopes1.symbols 2014-04-29 10:31:01 +0000
57@@ -32,7 +32,7 @@
58 (c++)"unity::scopes::CannedQuery::set_filter_state(unity::scopes::FilterState const&)@Base" 0.4.0+14.04.20140312.1
59 (c++)"unity::scopes::CannedQuery::set_query_string(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.4.0+14.04.20140312.1
60 (c++)"unity::scopes::CannedQuery::set_department_id(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.4.0+14.04.20140312.1
61- (c++)"unity::scopes::CannedQuery::from_uri(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0replaceme
62+ (c++)"unity::scopes::CannedQuery::from_uri(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.4.3+14.10.20140428
63 (c++)"unity::scopes::CannedQuery::CannedQuery(unity::scopes::CannedQuery&&)@Base" 0.4.0+14.04.20140312.1
64 (c++)"unity::scopes::CannedQuery::CannedQuery(unity::scopes::internal::CannedQueryImpl*)@Base" 0.4.0+14.04.20140312.1
65 (c++)"unity::scopes::CannedQuery::CannedQuery(unity::scopes::CannedQuery const&)@Base" 0.4.0+14.04.20140312.1
66@@ -285,7 +285,7 @@
67 (c++)"unity::scopes::Runtime::run_scope(unity::scopes::ScopeBase*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.4.2+14.04.20140404.2
68 (c++)"unity::scopes::Runtime::Runtime(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.4.0+14.04.20140312.1
69 (c++)"unity::scopes::Runtime::~Runtime()@Base" 0.4.0+14.04.20140312.1
70- (c++)"unity::scopes::Variant::deserialize_json(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0replaceme
71+ (c++)"unity::scopes::Variant::deserialize_json(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.4.3+14.10.20140428
72 (c++)"unity::scopes::Variant::null()@Base" 0.4.0+14.04.20140312.1
73 (c++)"unity::scopes::Variant::swap(unity::scopes::Variant&)@Base" 0.4.0+14.04.20140312.1
74 (c++)"unity::scopes::Variant::Variant(unity::scopes::Variant&&)@Base" 0.4.0+14.04.20140312.1
75@@ -408,7 +408,7 @@
76 (c++)"unity::scopes::internal::RegistryObject::ScopeProcess::on_process_death(int)@Base" 0.4.2+14.04.20140404.2
77 (c++)"unity::scopes::internal::RegistryObject::ScopeProcess::clear_handle_unlocked()@Base" 0.4.2+14.04.20140404.2
78 (c++)"unity::scopes::internal::RegistryObject::ScopeProcess::update_state_unlocked(unity::scopes::internal::RegistryObject::ScopeProcess::ProcessState)@Base" 0.4.2+14.04.20140404.2
79- (c++)"unity::scopes::internal::RegistryObject::ScopeProcess::exec(core::posix::ChildProcess::DeathObserver&, std::shared_ptr<unity::scopes::internal::Executor>)@Base" 0replaceme
80+ (c++)"unity::scopes::internal::RegistryObject::ScopeProcess::exec(core::posix::ChildProcess::DeathObserver&, std::shared_ptr<unity::scopes::internal::Executor>)@Base" 0.4.3+14.10.20140428
81 (c++)"unity::scopes::internal::RegistryObject::ScopeProcess::kill(std::unique_lock<std::mutex>&)@Base" 0.4.2+14.04.20140404.2
82 (c++)"unity::scopes::internal::RegistryObject::ScopeProcess::kill()@Base" 0.4.2+14.04.20140404.2
83 (c++)"unity::scopes::internal::RegistryObject::ScopeProcess::ScopeProcess(unity::scopes::internal::RegistryObject::ScopeExecData)@Base" 0.4.2+14.04.20140404.2
84@@ -425,7 +425,7 @@
85 (c++)"unity::scopes::internal::RegistryObject::remove_local_scope(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.4.0+14.04.20140312.1
86 (c++)"unity::scopes::internal::RegistryObject::set_remote_registry(std::shared_ptr<unity::scopes::internal::MWRegistry> const&)@Base" 0.4.0+14.04.20140312.1
87 (c++)"unity::scopes::internal::RegistryObject::locate(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.4.0+14.04.20140312.1
88- (c++)"unity::scopes::internal::RegistryObject::RegistryObject(core::posix::ChildProcess::DeathObserver&, std::shared_ptr<unity::scopes::internal::Executor> const&)@Base" 0replaceme
89+ (c++)"unity::scopes::internal::RegistryObject::RegistryObject(core::posix::ChildProcess::DeathObserver&, std::shared_ptr<unity::scopes::internal::Executor> const&)@Base" 0.4.3+14.10.20140428
90 (c++)"unity::scopes::internal::RegistryObject::~RegistryObject()@Base" 0.4.0+14.04.20140312.1
91 (c++)"unity::scopes::internal::MiddlewareFactory::MiddlewareData::~MiddlewareData()@Base" 0.4.0+14.04.20140312.1
92 (c++)"unity::scopes::internal::MiddlewareFactory::to_kind(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.4.0+14.04.20140312.1
93@@ -455,11 +455,11 @@
94 (c++)"unity::scopes::internal::StateReceiverObject::push_state(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, unity::scopes::internal::StateReceiverObject::State const&)@Base" 0.4.2+14.04.20140404.2
95 (c++)"unity::scopes::internal::StateReceiverObject::StateReceiverObject()@Base" 0.4.2+14.04.20140404.2
96 (c++)"unity::scopes::internal::StateReceiverObject::~StateReceiverObject()@Base" 0.4.2+14.04.20140404.2
97- (c++)"unity::scopes::internal::Executor::exec(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > const&, std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> > const, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > > const&, core::posix::StandardStream const&)@Base" 0replaceme
98- (c++)"unity::scopes::internal::Executor::Executor()@Base" 0replaceme
99- (c++)"unity::scopes::internal::Executor::~Executor()@Base" 0replaceme
100+ (c++)"unity::scopes::internal::Executor::exec(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > const&, std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> > const, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > > const&, core::posix::StandardStream const&)@Base" 0.4.3+14.10.20140428
101+ (c++)"unity::scopes::internal::Executor::Executor()@Base" 0.4.3+14.10.20140428
102+ (c++)"unity::scopes::internal::Executor::~Executor()@Base" 0.4.3+14.10.20140428
103 (c++)"unity::scopes::internal::ScopeImpl::perform_action(unity::scopes::Result const&, unity::scopes::ActionMetadata const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::shared_ptr<unity::scopes::ActivationListenerBase> const&)@Base" 0.4.0+14.04.20140312.1
104- (c++)"unity::scopes::internal::ScopeImpl::fwd()@Base" 0replaceme
105+ (c++)"unity::scopes::internal::ScopeImpl::fwd()@Base" 0.4.3+14.10.20140428
106 (c++)"unity::scopes::internal::ScopeImpl::create(std::shared_ptr<unity::scopes::internal::MWScope> const&, unity::scopes::internal::RuntimeImpl*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.4.0+14.04.20140312.1
107 (c++)"unity::scopes::internal::ScopeImpl::search(unity::scopes::CannedQuery const&, unity::scopes::SearchMetadata const&, std::shared_ptr<unity::scopes::SearchListenerBase> const&)@Base" 0.4.0+14.04.20140312.1
108 (c++)"unity::scopes::internal::ScopeImpl::search(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, unity::scopes::FilterState const&, unity::scopes::SearchMetadata const&, std::shared_ptr<unity::scopes::SearchListenerBase> const&)@Base" 0.4.0+14.04.20140312.1
109@@ -499,7 +499,7 @@
110 (c++)"unity::scopes::CannedQuery::filter_state() const@Base" 0.4.0+14.04.20140312.1
111 (c++)"unity::scopes::CannedQuery::query_string() const@Base" 0.4.0+14.04.20140312.1
112 (c++)"unity::scopes::CannedQuery::department_id() const@Base" 0.4.0+14.04.20140312.1
113- (c++)"unity::scopes::CannedQuery::to_uri() const@Base" 0replaceme
114+ (c++)"unity::scopes::CannedQuery::to_uri() const@Base" 0.4.3+14.10.20140428
115 (c++)"unity::scopes::CannedQuery::scope_id() const@Base" 0.4.0+14.04.20140312.1
116 (c++)"unity::scopes::CannedQuery::serialize() const@Base" 0.4.0+14.04.20140312.1
117 (c++)"unity::scopes::FilterState::has_filter(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) const@Base" 0.4.0+14.04.20140312.1
118@@ -580,7 +580,7 @@
119 (c++)"unity::scopes::Runtime::registry() const@Base" 0.4.0+14.04.20140312.1
120 (c++)"unity::scopes::Variant::get_double() const@Base" 0.4.0+14.04.20140312.1
121 (c++)"unity::scopes::Variant::get_string() const@Base" 0.4.0+14.04.20140312.1
122- (c++)"unity::scopes::Variant::serialize_json() const@Base" 0replaceme
123+ (c++)"unity::scopes::Variant::serialize_json() const@Base" 0.4.3+14.10.20140428
124 (c++)"unity::scopes::Variant::which() const@Base" 0.4.0+14.04.20140312.1
125 (c++)"unity::scopes::Variant::get_int() const@Base" 0.4.0+14.04.20140312.1
126 (c++)"unity::scopes::Variant::is_null() const@Base" 0.4.0+14.04.20140312.1
127@@ -603,11 +603,11 @@
128 (c++)"unity::scopes::Category::icon() const@Base" 0.4.0+14.04.20140312.1
129 (c++)"unity::scopes::Category::title() const@Base" 0.4.0+14.04.20140312.1
130 (c++)"unity::scopes::Category::serialize() const@Base" 0.4.0+14.04.20140312.1
131- (c++)"unity::scopes::internal::RuntimeImpl::async_pool() const@Base" 0replaceme
132+ (c++)"unity::scopes::internal::RuntimeImpl::async_pool() const@Base" 0.4.3+14.10.20140428
133 (c++)"unity::scopes::internal::RuntimeImpl::configfile() const@Base" 0.4.2+14.04.20140404.2
134- (c++)"unity::scopes::internal::RuntimeImpl::future_queue() const@Base" 0replaceme
135+ (c++)"unity::scopes::internal::RuntimeImpl::future_queue() const@Base" 0.4.3+14.10.20140428
136 (c++)"unity::scopes::internal::RuntimeImpl::reply_reaper() const@Base" 0.4.0+14.04.20140312.1
137- (c++)"unity::scopes::internal::RuntimeImpl::waiter_thread(std::shared_ptr<unity::scopes::internal::ThreadSafeQueue<std::future<void> > > const&) const@Base" 0replaceme
138+ (c++)"unity::scopes::internal::RuntimeImpl::waiter_thread(std::shared_ptr<unity::scopes::internal::ThreadSafeQueue<std::future<void> > > const&) const@Base" 0.4.3+14.10.20140428
139 (c++)"unity::scopes::internal::RuntimeImpl::proxy_to_string(std::shared_ptr<unity::scopes::Object> const&) const@Base" 0.4.0+14.04.20140312.1
140 (c++)"unity::scopes::internal::RuntimeImpl::string_to_proxy(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) const@Base" 0.4.0+14.04.20140312.1
141 (c++)"unity::scopes::internal::RuntimeImpl::registry_endpoint() const@Base" 0.4.0+14.04.20140312.1
142@@ -644,7 +644,7 @@
143 (c++)"unity::scopes::internal::RegistryConfig::endpointdir() const@Base" 0.4.0+14.04.20140312.1
144 (c++)"unity::scopes::internal::RegistryConfig::mw_configfile() const@Base" 0.4.0+14.04.20140312.1
145 (c++)"unity::scopes::internal::RegistryConfig::oem_installdir() const@Base" 0.4.0+14.04.20140312.1
146- (c++)"unity::scopes::internal::RegistryConfig::click_installdir() const@Base" 0replaceme
147+ (c++)"unity::scopes::internal::RegistryConfig::click_installdir() const@Base" 0.4.3+14.10.20140428
148 (c++)"unity::scopes::internal::RegistryConfig::scope_installdir() const@Base" 0.4.0+14.04.20140312.1
149 (c++)"unity::scopes::internal::RegistryConfig::scoperunner_path() const@Base" 0.4.0+14.04.20140312.1
150 (c++)"unity::scopes::internal::RegistryConfig::ss_registry_endpoint() const@Base" 0.4.0+14.04.20140312.1
151@@ -675,7 +675,7 @@
152 (c++)"unity::scopes::internal::ScopeMetadataImpl::invisible() const@Base" 0.4.0+14.04.20140312.1
153 (c++)"unity::scopes::internal::ScopeMetadataImpl::serialize() const@Base" 0.4.0+14.04.20140312.1
154 (c++)"unity::scopes::internal::StateReceiverObject::state_received() const@Base" 0.4.2+14.04.20140404.2
155- (c++)"unity::scopes::QueryBase::valid() const@Base" 0replaceme
156+ (c++)"unity::scopes::QueryBase::valid() const@Base" 0.4.3+14.10.20140428
157 (c++)"unity::scopes::ScopeBase::scope_directory() const@Base" 0.4.2+14.04.20140404.2
158 (c++)"typeinfo for unity::scopes::Annotation@Base" 0.4.0+14.04.20140312.1
159 (c++)"typeinfo for unity::scopes::FilterBase@Base" 0.4.0+14.04.20140312.1
160
161=== modified file 'src/scopes/internal/ScopeConfig.cpp'
162--- src/scopes/internal/ScopeConfig.cpp 2014-04-08 08:26:44 +0000
163+++ src/scopes/internal/ScopeConfig.cpp 2014-04-29 10:31:01 +0000
164@@ -38,7 +38,7 @@
165 namespace
166 {
167 const string overrideable_str = "Override";
168- const string scope_id_str = "DisplayName";
169+ const string scope_name_str = "DisplayName";
170 const string description_str = "Description";
171 const string author_str = "Author";
172 const string art_str = "Art";
173@@ -61,8 +61,8 @@
174 overrideable_ = false;
175 }
176
177- display_name_ = parser()->get_string(SCOPE_CONFIG_GROUP, scope_id_str);
178- description_ = parser()->get_string(SCOPE_CONFIG_GROUP, description_str);
179+ display_name_ = parser()->get_locale_string(SCOPE_CONFIG_GROUP, scope_name_str);
180+ description_ = parser()->get_locale_string(SCOPE_CONFIG_GROUP, description_str);
181 author_ = parser()->get_string(SCOPE_CONFIG_GROUP, author_str);
182
183 // For optional values, we store them in a unique_ptr so we can distinguish the "not set at all" case
184@@ -86,7 +86,7 @@
185 }
186 try
187 {
188- string hint = parser()->get_string(SCOPE_CONFIG_GROUP, search_hint_str);
189+ string hint = parser()->get_locale_string(SCOPE_CONFIG_GROUP, search_hint_str);
190 search_hint_.reset(new string(hint));
191 }
192 catch (LogicException const&)
193
194=== modified file 'test/gtest/scopes/internal/ScopeConfig/ScopeConfig_test.cpp'
195--- test/gtest/scopes/internal/ScopeConfig/ScopeConfig_test.cpp 2014-03-18 10:25:32 +0000
196+++ test/gtest/scopes/internal/ScopeConfig/ScopeConfig_test.cpp 2014-04-29 10:31:01 +0000
197@@ -30,10 +30,11 @@
198 ScopeConfig cfg("configtest1.ini");
199
200 EXPECT_EQ("Scope name", cfg.display_name());
201+ EXPECT_EQ("Scope description", cfg.description());
202 EXPECT_EQ("scope art", cfg.art());
203 EXPECT_EQ("Canonical", cfg.author());
204 EXPECT_EQ("an icon", cfg.icon());
205- EXPECT_EQ("a search hint string", cfg.search_hint());
206+ EXPECT_EQ("search string", cfg.search_hint());
207 EXPECT_EQ("a key", cfg.hot_key());
208
209 auto attrs = cfg.appearance_attributes();
210@@ -47,6 +48,7 @@
211 ScopeConfig cfg("configtest2.ini");
212
213 EXPECT_EQ("Scope name", cfg.display_name());
214+ EXPECT_EQ("Scope description", cfg.description());
215 EXPECT_EQ("scope art", cfg.art());
216 EXPECT_EQ("Canonical", cfg.author());
217 EXPECT_EQ("an icon", cfg.icon());
218@@ -59,6 +61,7 @@
219 ScopeConfig cfg("configtest3.ini");
220
221 EXPECT_EQ("Scope name", cfg.display_name());
222+ EXPECT_EQ("Scope description", cfg.description());
223 EXPECT_EQ("scope art", cfg.art());
224 EXPECT_EQ("Canonical", cfg.author());
225 EXPECT_EQ("an icon", cfg.icon());
226@@ -69,3 +72,39 @@
227 EXPECT_EQ(0, cfg.appearance_attributes().size());
228 }
229 }
230+
231+class ScopeConfigWithIntl: public ::testing::Test
232+{
233+public:
234+ ScopeConfigWithIntl()
235+ {
236+ setenv("LANGUAGE", "test", 1);
237+ }
238+
239+ ~ScopeConfigWithIntl()
240+ {
241+ unsetenv("LANGUAGE");
242+ }
243+};
244+
245+TEST_F(ScopeConfigWithIntl, localization)
246+{
247+ {
248+ ScopeConfig cfg("configtest1.ini");
249+
250+ EXPECT_EQ("copesay amenay", cfg.display_name());
251+ EXPECT_EQ("copesay criptiondesay", cfg.description());
252+ EXPECT_EQ("scope art", cfg.art());
253+ EXPECT_EQ("Canonical", cfg.author());
254+ EXPECT_EQ("an icon", cfg.icon());
255+ EXPECT_EQ("earchsay ringstay", cfg.search_hint());
256+ EXPECT_EQ("a key", cfg.hot_key());
257+
258+ auto attrs = cfg.appearance_attributes();
259+ EXPECT_EQ(2, attrs.size());
260+ EXPECT_EQ("foo", attrs["arbitrary_key"].get_string());
261+ EXPECT_EQ("bar", attrs["another_one"].get_string());
262+
263+ EXPECT_THROW(cfg.scope_runner(), unity::scopes::NotFoundException);
264+ }
265+}
266
267=== modified file 'test/gtest/scopes/internal/ScopeConfig/configtest1.ini.in'
268--- test/gtest/scopes/internal/ScopeConfig/configtest1.ini.in 2014-03-13 12:33:32 +0000
269+++ test/gtest/scopes/internal/ScopeConfig/configtest1.ini.in 2014-04-29 10:31:01 +0000
270@@ -1,10 +1,13 @@
271 [ScopeConfig]
272 DisplayName = Scope name
273+DisplayName[test] = copesay amenay
274 Description = Scope description
275+Description[test] = copesay criptiondesay
276 Art = scope art
277 Author = Canonical
278 Icon = an icon
279-SearchHint = a search hint string
280+SearchHint = search string
281+SearchHint[test] = earchsay ringstay
282 HotKey = a key
283
284 [Appearance]

Subscribers

People subscribed via source and target branches

to all changes: