[5/6] mesos git commit: Improved Stout string tests slightly.

[ne...@apache.org]

Improved Stout string tests slightly.

Review: https://reviews.apache.org/r/57529


Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/51678288
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/51678288
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/51678288

Branch: refs/heads/master
Commit: 51678288d34fb128a47919bb2d83eebe1933a24d
Parents: 6cee2a1
Author: Neil Conway <ne...@gmail.com>
Authored: Fri Mar 10 16:22:33 2017 -0500
Committer: Neil Conway <ne...@gmail.com>
Committed: Tue Apr 11 13:11:30 2017 -0700

----------------------------------------------------------------------
 3rdparty/stout/tests/strings_tests.cpp | 42 +++++++++++++++++------------
 1 file changed, 25 insertions(+), 17 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/51678288/3rdparty/stout/tests/strings_tests.cpp
----------------------------------------------------------------------
diff --git a/3rdparty/stout/tests/strings_tests.cpp b/3rdparty/stout/tests/strings_tests.cpp
index b985a47..a51144d 100644
--- a/3rdparty/stout/tests/strings_tests.cpp
+++ b/3rdparty/stout/tests/strings_tests.cpp
@@ -435,23 +435,27 @@ TEST(StringsTest, SplitNWithMultipleDelims)
 
 TEST(StringsTest, Pairs)
 {
-  map<string, vector<string>> pairs = strings::pairs("one=1,two=2", ",", "=");
-  ASSERT_EQ(2u, pairs.size());
-  ASSERT_EQ(1u, pairs.count("one"));
-  ASSERT_EQ(1u, pairs["one"].size());
-  EXPECT_EQ("1", pairs["one"].front());
-  ASSERT_EQ(1u, pairs.count("two"));
-  ASSERT_EQ(1u, pairs["two"].size());
-  EXPECT_EQ("2", pairs["two"].front());
-
-  pairs = strings::pairs("foo=1;bar=2;baz;foo=3;bam=1=2", ";&", "=");
-  ASSERT_EQ(2u, pairs.size());
-  ASSERT_EQ(1u, pairs.count("foo"));
-  ASSERT_EQ(2u, pairs["foo"].size());
-  ASSERT_EQ("1", pairs["foo"].front());
-  ASSERT_EQ("3", pairs["foo"].back());
-  ASSERT_EQ(1u, pairs.count("bar"));
-  ASSERT_EQ("2", pairs["bar"].front());
+  {
+    map<string, vector<string>> pairs = strings::pairs("one=1,two=2", ",", "=");
+    map<string, vector<string>> expected = {
+      {"one", {"1"}},
+      {"two", {"2"}}
+    };
+
+    EXPECT_EQ(expected, pairs);
+  }
+
+  {
+    map<string, vector<string>> pairs = strings::pairs(
+        "foo=1;bar=2;baz;foo=3;bam=1=2", ";&", "=");
+
+    map<string, vector<string>> expected = {
+      {"foo", {"1", "3"}},
+      {"bar", {"2"}}
+    };
+
+    EXPECT_EQ(expected, pairs);
+  }
 }
 
 
@@ -460,10 +464,14 @@ TEST(StringsTest, Join)
   EXPECT_EQ("a/b", strings::join("/", "a", "b"));
   EXPECT_EQ("a/b/c", strings::join("/", "a", "b", "c"));
   EXPECT_EQ("a\nb\nc\nd", strings::join("\n", "a", "b", "c", "d"));
+  EXPECT_EQ("a//b///d", strings::join("/", "a", "", "b", "", "", "d"));
+
   std::stringstream ss;
   EXPECT_EQ("a, b, c", strings::join(ss, ", ", "a", "b", "c").str());
+
   const string gnarly("gnarly");
   EXPECT_EQ("a/gnarly/c", strings::join("/", "a", gnarly, "c"));
+
   const bool is_true = true;
   const std::set<int32_t> my_set {1, 2, 3};
   EXPECT_EQ(