[Lldb-commits] [lldb] r363404 - EditlineTest: Improve error message

[Pavel Labath via lldb-commits]

Author: labath
Date: Fri Jun 14 07:33:04 2019
New Revision: 363404

URL: http://llvm.org/viewvc/llvm-project?rev=363404&view=rev
Log:
EditlineTest: Improve error message

This test seems to occasionally fail because editline returns a
different number of lines. Rewrite the message in such a way that we
also see the actual lines when that happens (and not just their count).

Also, clean up the dependencies of the test while I'm in there.

Modified:
    lldb/trunk/unittests/Editline/CMakeLists.txt
    lldb/trunk/unittests/Editline/EditlineTest.cpp

Modified: lldb/trunk/unittests/Editline/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/unittests/Editline/CMakeLists.txt?rev=363404&r1=363403&r2=363404&view=diff
==============================================================================
--- lldb/trunk/unittests/Editline/CMakeLists.txt (original)
+++ lldb/trunk/unittests/Editline/CMakeLists.txt Fri Jun 14 07:33:04 2019
@@ -2,7 +2,6 @@ add_lldb_unittest(EditlineTests
   EditlineTest.cpp
 
   LINK_LIBS
-    lldbCore
     lldbHost
     lldbUtility
   )

Modified: lldb/trunk/unittests/Editline/EditlineTest.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/unittests/Editline/EditlineTest.cpp?rev=363404&r1=363403&r2=363404&view=diff
==============================================================================
--- lldb/trunk/unittests/Editline/EditlineTest.cpp (original)
+++ lldb/trunk/unittests/Editline/EditlineTest.cpp Fri Jun 14 07:33:04 2019
@@ -13,11 +13,11 @@
 #include <stdio.h>
 #include <unistd.h>
 
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
 #include <memory>
 #include <thread>
 
-#include "gtest/gtest.h"
-
 #include "lldb/Host/Editline.h"
 #include "lldb/Host/FileSystem.h"
 #include "lldb/Host/Pipe.h"
@@ -311,11 +311,11 @@ TEST_F(EditlineTestFixture, EditlineRece
 
   // Without any auto indentation support, our output should directly match our
   // input.
-  EXPECT_EQ(input_lines.size(), el_reported_lines.GetSize());
-  if (input_lines.size() == el_reported_lines.GetSize()) {
-    for (size_t i = 0; i < input_lines.size(); ++i)
-      EXPECT_EQ(input_lines[i], el_reported_lines[i]);
-  }
+  std::vector<std::string> reported_lines;
+  for (size_t i = 0; i < el_reported_lines.GetSize(); ++i)
+    reported_lines.push_back(el_reported_lines[i]);
+
+  EXPECT_THAT(reported_lines, testing::ContainerEq(input_lines));
 }
 
 #endif