unity-scopes-api

Merge lp:~marcustomlinson/unity-scopes-api/fix-querymetadata-tests into lp:unity-scopes-api/devel

  1. fix-querymetadata-tests
  2. Merge into devel
Proposed by Marcus Tomlinson
Status: Merged
Approved by: Marcus Tomlinson
Approved revision: 637
Merged at revision: 638
Proposed branch: lp:~marcustomlinson/unity-scopes-api/fix-querymetadata-tests
Merge into: lp:unity-scopes-api/devel
Diff against target: 86 lines (+16/-7)
1 file modified
test/gtest/scopes/QueryMetadata/QueryMetadata_test.cpp (+16/-7)
To merge this branch: bzr merge lp:~marcustomlinson/unity-scopes-api/fix-querymetadata-tests
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Marcus Tomlinson (community) Approve
Paweł Stołowski Pending
Review via email: mp+276086@code.launchpad.net

This proposal supersedes a proposal from 2015-10-19.

Commit message

Fixed QueryMetadata tests that were checking the incorrect metadata for copied internet_connectivity statuses

To post a comment you must log in.
Revision history for this message
Paweł Stołowski (stolowski) wrote : Posted in a previous version of this proposal

Yeah, thanks!

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal

PASSED: Continuous integration, rev:356
http://jenkins.qa.ubuntu.com/job/unity-scopes-api-ci/640/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-vivid-amd64-ci/148
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-vivid-armhf-ci/139
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-vivid-armhf-ci/139/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-vivid-i386-ci/140
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-wily-amd64-ci/28
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-wily-armhf-ci/28
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-wily-armhf-ci/28/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-wily-i386-ci/28

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

review: Approve (continuous-integration)
lp:~marcustomlinson/unity-scopes-api/fix-querymetadata-tests updated
637. By Marcus Tomlinson

Fixed QueryMetadata tests that were checking the incorrect metadata for copied internet_connectivity statuses

Revision history for this message
Marcus Tomlinson (marcustomlinson) wrote :

Re-approving this as I was targeting trunk instead of devel before. Diff is exactly the same.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal

PASSED: Continuous integration, rev:356
http://jenkins.qa.ubuntu.com/job/unity-scopes-api-ci/641/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-vivid-amd64-ci/149
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-vivid-armhf-ci/140
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-vivid-armhf-ci/140/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-vivid-i386-ci/141
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-xenial-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-xenial-armhf-ci/1
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-xenial-armhf-ci/1/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-xenial-i386-ci/1

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

review: Approve (continuous-integration)
Revision history for this message
Michi Henning (michihenning) wrote : Posted in a previous version of this proposal

Hmmm... The diff looks very wrong. It includes all the abi-compliance changes. Not sure why this is happening, but it might be good to double-check?

Revision history for this message
Michi Henning (michihenning) wrote : Posted in a previous version of this proposal

Ah, OK, sorry for the noise. I just saw the replacement version of this :-)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'test/gtest/scopes/QueryMetadata/QueryMetadata_test.cpp'
--- test/gtest/scopes/QueryMetadata/QueryMetadata_test.cpp 2014-09-03 13:00:31 +0000
+++ test/gtest/scopes/QueryMetadata/QueryMetadata_test.cpp 2015-10-29 06:24:31 +0000
@@ -132,9 +132,11 @@
132 auto meta2 = meta;132 auto meta2 = meta;
133133
134 meta.set_cardinality(0);134 meta.set_cardinality(0);
135 meta.set_internet_connectivity(QueryMetadata::Connected);
135 EXPECT_EQ(0, meta.cardinality());136 EXPECT_EQ(0, meta.cardinality());
136 EXPECT_EQ(100, meta2.cardinality());137 EXPECT_EQ(100, meta2.cardinality());
137 EXPECT_EQ(QueryMetadata::Unknown, meta.internet_connectivity());138 EXPECT_EQ(QueryMetadata::Connected, meta.internet_connectivity());
139 EXPECT_EQ(QueryMetadata::Unknown, meta2.internet_connectivity());
138 EXPECT_DOUBLE_EQ(1.0, meta.location().latitude());140 EXPECT_DOUBLE_EQ(1.0, meta.location().latitude());
139 EXPECT_DOUBLE_EQ(2.0, meta.location().longitude());141 EXPECT_DOUBLE_EQ(2.0, meta.location().longitude());
140 EXPECT_DOUBLE_EQ(1.0, meta2.location().latitude());142 EXPECT_DOUBLE_EQ(1.0, meta2.location().latitude());
@@ -143,13 +145,15 @@
143 {145 {
144 SearchMetadata meta(100, "pl", "phone");146 SearchMetadata meta(100, "pl", "phone");
145 meta.set_location(Location(1.0, 2.0));147 meta.set_location(Location(1.0, 2.0));
148 meta.set_internet_connectivity(QueryMetadata::Disconnected);
146 SearchMetadata meta2(meta);149 SearchMetadata meta2(meta);
147150
148 meta.set_cardinality(0);151 meta.set_cardinality(0);
149 meta.set_location(Location(3.0, 4.0));152 meta.set_location(Location(3.0, 4.0));
150 EXPECT_EQ(0, meta.cardinality());153 EXPECT_EQ(0, meta.cardinality());
151 EXPECT_EQ(100, meta2.cardinality());154 EXPECT_EQ(100, meta2.cardinality());
152 EXPECT_EQ(QueryMetadata::Unknown, meta.internet_connectivity());155 EXPECT_EQ(QueryMetadata::Disconnected, meta.internet_connectivity());
156 EXPECT_EQ(QueryMetadata::Disconnected, meta2.internet_connectivity());
153 EXPECT_DOUBLE_EQ(1.0, meta2.location().latitude());157 EXPECT_DOUBLE_EQ(1.0, meta2.location().latitude());
154 EXPECT_DOUBLE_EQ(2.0, meta2.location().longitude());158 EXPECT_DOUBLE_EQ(2.0, meta2.location().longitude());
155 EXPECT_DOUBLE_EQ(3.0, meta.location().latitude());159 EXPECT_DOUBLE_EQ(3.0, meta.location().latitude());
@@ -157,23 +161,26 @@
157 }161 }
158 {162 {
159 SearchMetadata meta(100, "pl", "phone");163 SearchMetadata meta(100, "pl", "phone");
164 meta.set_internet_connectivity(QueryMetadata::Connected);
160 auto meta2 = meta;165 auto meta2 = meta;
161166
162 meta.set_cardinality(0);167 meta.set_cardinality(0);
163 meta.set_internet_connectivity(QueryMetadata::Connected);
164 EXPECT_EQ(0, meta.cardinality());168 EXPECT_EQ(0, meta.cardinality());
165 EXPECT_EQ(100, meta2.cardinality());169 EXPECT_EQ(100, meta2.cardinality());
166 EXPECT_EQ(QueryMetadata::Connected, meta.internet_connectivity());170 EXPECT_EQ(QueryMetadata::Connected, meta.internet_connectivity());
171 EXPECT_EQ(QueryMetadata::Connected, meta2.internet_connectivity());
167 }172 }
168 {173 {
169 SearchMetadata meta(100, "pl", "phone");174 SearchMetadata meta(100, "pl", "phone");
175 meta.set_internet_connectivity(QueryMetadata::Disconnected);
170 SearchMetadata meta2(meta);176 SearchMetadata meta2(meta);
171177
172 meta.set_cardinality(0);178 meta.set_cardinality(0);
173 meta.set_internet_connectivity(QueryMetadata::Disconnected);179 meta.set_internet_connectivity(QueryMetadata::Connected);
174 EXPECT_EQ(0, meta.cardinality());180 EXPECT_EQ(0, meta.cardinality());
175 EXPECT_EQ(100, meta2.cardinality());181 EXPECT_EQ(100, meta2.cardinality());
176 EXPECT_EQ(QueryMetadata::Disconnected, meta.internet_connectivity());182 EXPECT_EQ(QueryMetadata::Connected, meta.internet_connectivity());
183 EXPECT_EQ(QueryMetadata::Disconnected, meta2.internet_connectivity());
177 }184 }
178}185}
179186
@@ -263,18 +270,20 @@
263270
264 EXPECT_TRUE(meta2.scope_data().is_null());271 EXPECT_TRUE(meta2.scope_data().is_null());
265 EXPECT_EQ("foo", meta.scope_data().get_string());272 EXPECT_EQ("foo", meta.scope_data().get_string());
273 EXPECT_EQ(QueryMetadata::Unknown, meta2.internet_connectivity());
266 EXPECT_EQ(QueryMetadata::Unknown, meta.internet_connectivity());274 EXPECT_EQ(QueryMetadata::Unknown, meta.internet_connectivity());
267 }275 }
268 {276 {
269 ActionMetadata meta("pl", "phone");277 ActionMetadata meta("pl", "phone");
278 meta.set_internet_connectivity(QueryMetadata::Connected);
270 ActionMetadata meta2(meta);279 ActionMetadata meta2(meta);
271280
272 Variant var(10);281 Variant var(10);
273 meta.set_scope_data(var);282 meta.set_scope_data(var);
274 meta.set_internet_connectivity(QueryMetadata::Disconnected);
275283
276 EXPECT_TRUE(meta2.scope_data().is_null());284 EXPECT_TRUE(meta2.scope_data().is_null());
277 EXPECT_EQ(10, meta.scope_data().get_int());285 EXPECT_EQ(10, meta.scope_data().get_int());
278 EXPECT_EQ(QueryMetadata::Disconnected, meta.internet_connectivity());286 EXPECT_EQ(QueryMetadata::Connected, meta2.internet_connectivity());
287 EXPECT_EQ(QueryMetadata::Connected, meta.internet_connectivity());
279 }288 }
280}289}

Subscribers

People subscribed via source and target branches

to all changes: