You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by nn...@apache.org on 2014/11/20 22:32:46 UTC
[2/2] mesos git commit: Changed slave label test to strictly enforce
format.
Changed slave label test to strictly enforce format.
Review: https://reviews.apache.org/r/28294
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/67ade096
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/67ade096
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/67ade096
Branch: refs/heads/master
Commit: 67ade096ae58118b353f747c33915a166f608cf9
Parents: 6c39925
Author: Niklas Nielsen <ni...@qni.dk>
Authored: Thu Nov 20 13:17:46 2014 -0800
Committer: Niklas Q. Nielsen <ni...@mesosphere.io>
Committed: Thu Nov 20 13:17:46 2014 -0800
----------------------------------------------------------------------
src/tests/slave_tests.cpp | 41 ++++++++++++++++++++++-------------------
1 file changed, 22 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/67ade096/src/tests/slave_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/slave_tests.cpp b/src/tests/slave_tests.cpp
index 4675dac..e048294 100644
--- a/src/tests/slave_tests.cpp
+++ b/src/tests/slave_tests.cpp
@@ -1487,33 +1487,36 @@ TEST_F(SlaveTest, TaskLabels)
JSON::Array labelsObject_ = labelsObject.get();
// Verify the content of 'foo:bar' pair.
- JSON::Object labelObject1 = labelsObject_.values[0].as<JSON::Object>();
+ Try<JSON::Value> expected = JSON::parse(
+ "{"
+ " \"key\":\"foo\","
+ " \"value\":\"bar\""
+ "}");
- const JSON::String key1 = labelObject1.values["key"].as<JSON::String>();
- const JSON::String value1 = labelObject1.values["value"].as<JSON::String>();
-
- EXPECT_EQ(key1.value, "foo");
- EXPECT_EQ(value1.value, "bar");
+ ASSERT_SOME(expected);
+ EXPECT_EQ(labelsObject_.values[0], expected.get());
// Verify the content of 'bar:baz' pair.
- JSON::Object labelObject2 = labelsObject_.values[1].as<JSON::Object>();
-
- const JSON::String key2 = labelObject2.values["key"].as<JSON::String>();
- const JSON::String value2 = labelObject2.values["value"].as<JSON::String>();
+ expected = JSON::parse(
+ "{"
+ " \"key\":\"bar\","
+ " \"value\":\"baz\""
+ "}");
- EXPECT_EQ(key2.value, "bar");
- EXPECT_EQ(value2.value, "baz");
+ ASSERT_SOME(expected);
+ EXPECT_EQ(labelsObject_.values[1], expected.get());
// Verify the content of 'bar:qux' pair.
- JSON::Object labelObject3 = labelsObject_.values[2].as<JSON::Object>();
-
- const JSON::String key3 = labelObject3.values["key"].as<JSON::String>();
- const JSON::String value3 = labelObject3.values["value"].as<JSON::String>();
-
- EXPECT_EQ(key3.value, "bar");
- EXPECT_EQ(value3.value, "qux");
+ expected = JSON::parse(
+ "{"
+ " \"key\":\"bar\","
+ " \"value\":\"qux\""
+ "}");
+
+ ASSERT_SOME(expected);
+ EXPECT_EQ(labelsObject_.values[2], expected.get());
EXPECT_CALL(exec, shutdown(_))
.Times(AtMost(1));