unity-scopes-api

Merge lp:~marcustomlinson/unity-scopes-api/fix_expect_eq into lp:unity-scopes-api/devel

  1. fix_expect_eq
  2. Merge into devel
Proposed by Marcus Tomlinson
Status: Merged
Approved by: Michi Henning
Approved revision: 416
Merged at revision: 416
Proposed branch: lp:~marcustomlinson/unity-scopes-api/fix_expect_eq
Merge into: lp:unity-scopes-api/devel
Diff against target: 81 lines (+7/-7)
5 files modified
test/gtest/scopes/OptionSelectorFilter/OptionSelectorFilter_test.cpp (+1/-1)
test/gtest/scopes/Variant/Variant_test.cpp (+1/-1)
test/gtest/scopes/internal/JsonNode/JsonNode_test.cpp (+2/-2)
test/gtest/scopes/internal/zmq_middleware/VariantConverter/VariantConverter_test.cpp (+2/-2)
test/gtest/scopes/testing/IsolatedScope/IsolatedScope_test.cpp (+1/-1)
To merge this branch: bzr merge lp:~marcustomlinson/unity-scopes-api/fix_expect_eq
Reviewer Review Type Date Requested Status
Michi Henning (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+227496@code.launchpad.net

Commit message

Replaced EXPECT_EQ(true with EXPECT_TRUE

Description of the change

Replaced EXPECT_EQ(true with EXPECT_TRUE

(Interestingly enough, there were no instances of "EXPECT_EQ(false")

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

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

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

review: Approve (continuous-integration)
Revision history for this message
Michi Henning (michihenning) wrote :

Cool, thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'test/gtest/scopes/OptionSelectorFilter/OptionSelectorFilter_test.cpp'
2--- test/gtest/scopes/OptionSelectorFilter/OptionSelectorFilter_test.cpp 2014-05-19 09:54:37 +0000
3+++ test/gtest/scopes/OptionSelectorFilter/OptionSelectorFilter_test.cpp 2014-07-21 06:07:31 +0000
4@@ -173,7 +173,7 @@
5
6 EXPECT_EQ("f1", filter.id());
7 EXPECT_EQ("Filter 1", filter.label());
8- EXPECT_EQ(true, filter.multi_select());
9+ EXPECT_TRUE(filter.multi_select());
10 EXPECT_EQ(1u, filter.options().size());
11 EXPECT_EQ("1", filter.options().front()->id());
12 }
13
14=== modified file 'test/gtest/scopes/Variant/Variant_test.cpp'
15--- test/gtest/scopes/Variant/Variant_test.cpp 2014-04-02 10:02:48 +0000
16+++ test/gtest/scopes/Variant/Variant_test.cpp 2014-07-21 06:07:31 +0000
17@@ -49,7 +49,7 @@
18 {
19 Variant v(true);
20 EXPECT_EQ(Variant::Type::Bool, v.which());
21- EXPECT_EQ(true, v.get_bool());
22+ EXPECT_TRUE(v.get_bool());
23 }
24
25 {
26
27=== modified file 'test/gtest/scopes/internal/JsonNode/JsonNode_test.cpp'
28--- test/gtest/scopes/internal/JsonNode/JsonNode_test.cpp 2014-02-25 12:08:41 +0000
29+++ test/gtest/scopes/internal/JsonNode/JsonNode_test.cpp 2014-07-21 06:07:31 +0000
30@@ -75,7 +75,7 @@
31 EXPECT_EQ(25, value_int);
32
33 EXPECT_NO_THROW(value_bool = root_node_->get_node("human")->as_bool());
34- EXPECT_EQ(true, value_bool);
35+ EXPECT_TRUE(value_bool);
36
37 // try get invalid value
38
39@@ -182,7 +182,7 @@
40 EXPECT_TRUE(node.get_node("zee")->as_bool());
41 EXPECT_EQ(1, node.get_node("wee")->get_node(0)->as_int());
42 EXPECT_EQ(2, node.get_node("wee")->get_node(1)->as_int());
43- EXPECT_EQ(true, node.get_node("wee")->get_node(2)->as_bool());
44+ EXPECT_TRUE(node.get_node("wee")->get_node(2)->as_bool());
45 }
46
47 TEST_F(JsonNodeTest, to_variant)
48
49=== modified file 'test/gtest/scopes/internal/zmq_middleware/VariantConverter/VariantConverter_test.cpp'
50--- test/gtest/scopes/internal/zmq_middleware/VariantConverter/VariantConverter_test.cpp 2014-02-25 12:08:41 +0000
51+++ test/gtest/scopes/internal/zmq_middleware/VariantConverter/VariantConverter_test.cpp 2014-07-21 06:07:31 +0000
52@@ -59,14 +59,14 @@
53 EXPECT_EQ(Variant::Dict, resultVar.which());
54 auto outerDict = resultVar.get_dict();
55 EXPECT_EQ(1, outerDict["foo"].get_int());
56- EXPECT_EQ(true, outerDict["bar"].get_bool());
57+ EXPECT_TRUE(outerDict["bar"].get_bool());
58 EXPECT_TRUE(outerDict["nil"].is_null());
59
60 EXPECT_EQ(Variant::Array, outerDict["baz"].which());
61 auto varArray = outerDict["baz"].get_array();
62 EXPECT_EQ(2u, varArray.size());
63 EXPECT_EQ(1, varArray[0].get_int());
64- EXPECT_EQ(true, varArray[1].get_bool());
65+ EXPECT_TRUE(varArray[1].get_bool());
66
67 auto innerDict = outerDict["hints"].get_dict();
68 EXPECT_EQ("maiden", innerDict["iron"].get_string());
69
70=== modified file 'test/gtest/scopes/testing/IsolatedScope/IsolatedScope_test.cpp'
71--- test/gtest/scopes/testing/IsolatedScope/IsolatedScope_test.cpp 2014-06-18 09:50:21 +0000
72+++ test/gtest/scopes/testing/IsolatedScope/IsolatedScope_test.cpp 2014-07-21 06:07:31 +0000
73@@ -111,7 +111,7 @@
74 EXPECT_EQ("icon", metadata.icon());
75 EXPECT_EQ("search_hint", metadata.search_hint());
76 EXPECT_EQ("hot_key", metadata.hot_key());
77- EXPECT_EQ(true, metadata.invisible());
78+ EXPECT_TRUE(metadata.invisible());
79 EXPECT_EQ(appearance_attrs, metadata.appearance_attributes());
80 EXPECT_EQ("scope_dir", metadata.scope_directory());
81 EXPECT_EQ(unity::scopes::ScopeMetadata::ResultsTtlType::Large, metadata.results_ttl_type());

Subscribers

People subscribed via source and target branches

to all changes: