Repository: mesos Updated Branches: refs/heads/master f0e242213 -> 67ade096a
Changed master label test to strictly enforce format. Review: https://reviews.apache.org/r/28293 Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/6c399258 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/6c399258 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/6c399258 Branch: refs/heads/master Commit: 6c3992580c92f113ac1ba4ee7d5c6d0758302999 Parents: f0e2422 Author: Niklas Nielsen <[email protected]> Authored: Thu Nov 20 12:44:26 2014 -0800 Committer: Niklas Q. Nielsen <[email protected]> Committed: Thu Nov 20 13:17:15 2014 -0800 ---------------------------------------------------------------------- src/tests/master_tests.cpp | 41 ++++++++++++++++++++++------------------- 1 file changed, 22 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/6c399258/src/tests/master_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/master_tests.cpp b/src/tests/master_tests.cpp index 21a642f..0ed02b3 100644 --- a/src/tests/master_tests.cpp +++ b/src/tests/master_tests.cpp @@ -2637,33 +2637,36 @@ TEST_F(MasterTest, 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(_))
