Issue 1794 - add handling of std::vector<std::string> by Communication::{Input,Output}Buffer

test/CommunicationTest.cpp

 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
  * Copyright (C) 2006-2014 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 95 matching lines @@
   ASSERT_ANY_THROW(response >> int32Value);
   ASSERT_ANY_THROW(response >> boolValue);
 
   ASSERT_EQ("Foo Received", stringValue);
   ASSERT_EQ(L"Bar \u043f\u0440\u0438\u043d\u044f\u0442\u043e", wstringValue);
   ASSERT_EQ(9876543211L, int64Value);
   ASSERT_EQ(7, int32Value);
   ASSERT_FALSE(boolValue);
 }
 
-TEST(InputOutputBuffersTests, EmptyVector)
+void SendReceiveStrings(const std::vector<std::string>& src)
 {
-  std::vector<std::string> emptySrcVector;
   Communication::OutputBuffer outputBuffer;

[Eric, 2015/01/13 16:20:45]

The core of these tests is the same code. It would be easier to read to use a
common testing function here, in large part to make it clear that these testing
are all doing essentially the same thing, varying only in arguments.

-  outputBuffer << emptySrcVector;
+  outputBuffer << src;
   Communication::InputBuffer inputBuffer(outputBuffer.Get());

[Eric, 2015/02/17 17:18:35]

I don't like the use of Get() here, but I'll save comments for the subsequent
change set.

-  std::vector<std::string> dstVector;
-  inputBuffer >> dstVector;
-  EXPECT_TRUE(dstVector.empty());
+  std::vector<std::string> dst;
+  inputBuffer >> dst;
+  auto dstSize = dst.size();
+  ASSERT_EQ(dstSize, src.size());
+  for (auto i = 0; i < dstSize; ++i)
+  {
+    EXPECT_EQ(dst[i], src[i]);
+  }
 }
 
-TEST(InputOutputBuffersTests, NonemptyVectors)

[Eric, 2015/01/13 16:20:45]

I'd make this two tests.

+TEST(InputOutputBuffersTests, EmptyStrings)
 {
-  {
-    std::vector<std::string> srcVector;
-    srcVector.emplace_back("string1");
-    Communication::OutputBuffer outputBuffer;
-    outputBuffer << srcVector;
-    Communication::InputBuffer inputBuffer(outputBuffer.Get());
-    std::vector<std::string> dstVector;
-    inputBuffer >> dstVector;
-    ASSERT_EQ(1, dstVector.size());
-    EXPECT_EQ("string1", dstVector[0]);
-  }
-  {
-    std::vector<std::string> srcVector;
-    srcVector.emplace_back("string1");
-    srcVector.emplace_back("str2");
-    srcVector.emplace_back("value");
-    Communication::OutputBuffer outputBuffer;
-    outputBuffer << srcVector;
-    Communication::InputBuffer inputBuffer(outputBuffer.Get());
-    std::vector<std::string> dstVector;
-    inputBuffer >> dstVector;
-    ASSERT_EQ(3, dstVector.size());
-    EXPECT_EQ("string1", dstVector[0]);
-    EXPECT_EQ("str2", dstVector[1]);
-    EXPECT_EQ("value", dstVector[2]);
-  }
+  SendReceiveStrings(std::vector<std::string>());
+}
+
+TEST(InputOutputBuffersTests, StringsWithOneValue)
+{
+  std::vector<std::string> src;
+  src.emplace_back("string1");
+  SendReceiveStrings(src);
+}
+
+TEST(InputOutputBuffersTests, MultivalueStrings)
+{
+  std::vector<std::string> src;
+  src.emplace_back("string1");
+  src.emplace_back("str2");
+  src.emplace_back("value");
+  SendReceiveStrings(src);
 }