Fixed the order of expected value in EXPECT_EQ. The expected value should come first.
Review: https://reviews.apache.org/r/36669 Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/940f5254 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/940f5254 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/940f5254 Branch: refs/heads/master Commit: 940f5254858cb23d694fde315562c23d18dbc703 Parents: 923c156 Author: Kapil Arya <[email protected]> Authored: Tue Jul 21 21:17:39 2015 -0700 Committer: Benjamin Hindman <[email protected]> Committed: Tue Jul 21 21:17:41 2015 -0700 ---------------------------------------------------------------------- src/tests/hook_tests.cpp | 24 ++++++++++++------------ src/tests/master_tests.cpp | 40 ++++++++++++++++++++++++---------------- src/tests/slave_tests.cpp | 30 ++++++++++++++++++------------ 3 files changed, 54 insertions(+), 40 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/940f5254/src/tests/hook_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/hook_tests.cpp b/src/tests/hook_tests.cpp index 6b10db1..86e53d8 100644 --- a/src/tests/hook_tests.cpp +++ b/src/tests/hook_tests.cpp @@ -202,8 +202,8 @@ TEST_F(HookTest, VerifyMasterLaunchTaskHook) const Labels &labels_ = runTaskMessage.get().task().labels(); ASSERT_EQ(1, labels_.labels_size()); - EXPECT_EQ(labels_.labels().Get(0).key(), testLabelKey); - EXPECT_EQ(labels_.labels().Get(0).value(), testLabelValue); + EXPECT_EQ(testLabelKey, labels_.labels().Get(0).key()); + EXPECT_EQ(testLabelValue, labels_.labels().Get(0).value()); driver.stop(); driver.join(); @@ -408,18 +408,18 @@ TEST_F(HookTest, VerifySlaveRunTaskHook) ASSERT_EQ(3, labels_.labels_size()); // The slave run task hook will prepend a new "baz":"qux" label. - EXPECT_EQ(labels_.labels(0).key(), "baz"); - EXPECT_EQ(labels_.labels(0).value(), "qux"); + EXPECT_EQ("baz", labels_.labels(0).key()); + EXPECT_EQ("qux", labels_.labels(0).value()); // Master launch task hook will still hang off test label. - EXPECT_EQ(labels_.labels(1).key(), testLabelKey); - EXPECT_EQ(labels_.labels(1).value(), testLabelValue); + EXPECT_EQ(testLabelKey, labels_.labels(1).key()); + EXPECT_EQ(testLabelValue, labels_.labels(1).value()); // And lastly, we only expect the "foo":"bar" pair to be stripped by // the module. The last pair should be the original "bar":"baz" // pair set by the test. - EXPECT_EQ(labels_.labels(2).key(), "bar"); - EXPECT_EQ(labels_.labels(2).value(), "baz"); + EXPECT_EQ("bar", labels_.labels(2).key()); + EXPECT_EQ("baz", labels_.labels(2).value()); driver.stop(); driver.join(); @@ -510,14 +510,14 @@ TEST_F(HookTest, VerifySlaveTaskStatusLabelDecorator) EXPECT_EQ(2, labels_.labels_size()); // The test hook will prepend a new "baz":"qux" label. - EXPECT_EQ(labels_.labels(0).key(), "bar"); - EXPECT_EQ(labels_.labels(0).value(), "qux"); + EXPECT_EQ("bar", labels_.labels(0).key()); + EXPECT_EQ("qux", labels_.labels(0).value()); // And lastly, we only expect the "foo":"bar" pair to be stripped by // the module. The last pair should be the original "bar":"baz" // pair set by the test. - EXPECT_EQ(labels_.labels(1).key(), "bar"); - EXPECT_EQ(labels_.labels(1).value(), "baz"); + EXPECT_EQ("bar", labels_.labels(1).key()); + EXPECT_EQ("baz", labels_.labels(1).value()); driver.stop(); driver.join(); http://git-wip-us.apache.org/repos/asf/mesos/blob/940f5254/src/tests/master_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/master_tests.cpp b/src/tests/master_tests.cpp index 42dde0f..8b8d386 100644 --- a/src/tests/master_tests.cpp +++ b/src/tests/master_tests.cpp @@ -3112,12 +3112,15 @@ TEST_F(MasterTest, TaskLabels) JSON::Array labelsObject = find.get(); // Verify the contents of 'foo:bar', 'bar:baz', and 'bar:qux' pairs. - EXPECT_EQ(labelsObject.values[0], - JSON::Value(JSON::Protobuf(createLabel("foo", "bar")))); - EXPECT_EQ(labelsObject.values[1], - JSON::Value(JSON::Protobuf(createLabel("bar", "baz")))); - EXPECT_EQ(labelsObject.values[2], - JSON::Value(JSON::Protobuf(createLabel("bar", "qux")))); + EXPECT_EQ( + JSON::Value(JSON::Protobuf(createLabel("foo", "bar"))), + labelsObject.values[0]); + EXPECT_EQ( + JSON::Value(JSON::Protobuf(createLabel("bar", "baz"))), + labelsObject.values[1]); + EXPECT_EQ( + JSON::Value(JSON::Protobuf(createLabel("bar", "qux"))), + labelsObject.values[2]); EXPECT_CALL(exec, shutdown(_)) .Times(AtMost(1)); @@ -3214,12 +3217,15 @@ TEST_F(MasterTest, TaskStatusLabels) JSON::Array labelsObject = find.get(); // Verify the content of 'foo:bar' pair. - EXPECT_EQ(labelsObject.values[0], - JSON::Value(JSON::Protobuf(createLabel("foo", "bar")))); - EXPECT_EQ(labelsObject.values[1], - JSON::Value(JSON::Protobuf(createLabel("bar", "baz")))); - EXPECT_EQ(labelsObject.values[2], - JSON::Value(JSON::Protobuf(createLabel("bar", "qux")))); + EXPECT_EQ( + JSON::Value(JSON::Protobuf(createLabel("foo", "bar"))), + labelsObject.values[0]); + EXPECT_EQ( + JSON::Value(JSON::Protobuf(createLabel("bar", "baz"))), + labelsObject.values[1]); + EXPECT_EQ( + JSON::Value(JSON::Protobuf(createLabel("bar", "qux"))), + labelsObject.values[2]); EXPECT_CALL(exec, shutdown(_)) .Times(AtMost(1)); @@ -3454,12 +3460,14 @@ TEST_F(MasterTest, TaskDiscoveryInfo) EXPECT_EQ(2u, labelsArray.values.size()); // Verify the content of 'clearance:high' pair. - EXPECT_EQ(labelsArray.values[0], - JSON::Value(JSON::Protobuf(createLabel("clearance", "high")))); + EXPECT_EQ( + JSON::Value(JSON::Protobuf(createLabel("clearance", "high"))), + labelsArray.values[0]); // Verify the content of 'RPC:yes' pair. - EXPECT_EQ(labelsArray.values[1], - JSON::Value(JSON::Protobuf(createLabel("RPC", "yes")))); + EXPECT_EQ( + JSON::Value(JSON::Protobuf(createLabel("RPC", "yes"))), + labelsArray.values[1]); EXPECT_CALL(exec, shutdown(_)) .Times(AtMost(1)); http://git-wip-us.apache.org/repos/asf/mesos/blob/940f5254/src/tests/slave_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/slave_tests.cpp b/src/tests/slave_tests.cpp index 73afb6e..e1390ad 100644 --- a/src/tests/slave_tests.cpp +++ b/src/tests/slave_tests.cpp @@ -2128,12 +2128,15 @@ TEST_F(SlaveTest, TaskLabels) JSON::Array labelsObject = find.get(); // Verify the contents of 'foo:bar', 'bar:baz', and 'bar:qux' pairs. - EXPECT_EQ(labelsObject.values[0], - JSON::Value(JSON::Protobuf(createLabel("foo", "bar")))); - EXPECT_EQ(labelsObject.values[1], - JSON::Value(JSON::Protobuf(createLabel("bar", "baz")))); - EXPECT_EQ(labelsObject.values[2], - JSON::Value(JSON::Protobuf(createLabel("bar", "qux")))); + EXPECT_EQ( + JSON::Value(JSON::Protobuf(createLabel("foo", "bar"))), + labelsObject.values[0]); + EXPECT_EQ( + JSON::Value(JSON::Protobuf(createLabel("bar", "baz"))), + labelsObject.values[1]); + EXPECT_EQ( + JSON::Value(JSON::Protobuf(createLabel("bar", "qux"))), + labelsObject.values[2]); EXPECT_CALL(exec, shutdown(_)) .Times(AtMost(1)); @@ -2230,12 +2233,15 @@ TEST_F(SlaveTest, TaskStatusLabels) JSON::Array labelsObject = find.get(); // Verify the contents of 'foo:bar', 'bar:baz', and 'bar:qux' pairs. - EXPECT_EQ(labelsObject.values[0], - JSON::Value(JSON::Protobuf(createLabel("foo", "bar")))); - EXPECT_EQ(labelsObject.values[1], - JSON::Value(JSON::Protobuf(createLabel("bar", "baz")))); - EXPECT_EQ(labelsObject.values[2], - JSON::Value(JSON::Protobuf(createLabel("bar", "qux")))); + EXPECT_EQ( + JSON::Value(JSON::Protobuf(createLabel("foo", "bar"))), + labelsObject.values[0]); + EXPECT_EQ( + JSON::Value(JSON::Protobuf(createLabel("bar", "baz"))), + labelsObject.values[1]); + EXPECT_EQ( + JSON::Value(JSON::Protobuf(createLabel("bar", "qux"))), + labelsObject.values[2]); EXPECT_CALL(exec, shutdown(_)) .Times(AtMost(1));
