r298966 - Revert "Try to unbreak buildbots after r298913."

[Juergen Ributzka via cfe-commits]

Author: ributzka
Date: Tue Mar 28 19:24:34 2017
New Revision: 298966

URL: http://llvm.org/viewvc/llvm-project?rev=298966&view=rev
Log:
Revert "Try to unbreak buildbots after r298913."

Modified:
    cfe/trunk/unittests/Tooling/RefactoringTest.cpp

Modified: cfe/trunk/unittests/Tooling/RefactoringTest.cpp
URL: 
http://llvm.org/viewvc/llvm-project/cfe/trunk/unittests/Tooling/RefactoringTest.cpp?rev=298966&r1=298965&r2=298966&view=diff
==============================================================================
--- cfe/trunk/unittests/Tooling/RefactoringTest.cpp (original)
+++ cfe/trunk/unittests/Tooling/RefactoringTest.cpp Tue Mar 28 19:24:34 2017
@@ -1513,17 +1513,21 @@ TEST_F(ApplyAtomicChangesTest, InsertsNe
 }
 
 TEST_F(ApplyAtomicChangesTest, RemoveAndSortIncludes) {
-  setInput("#include \"a\"\n"
-           "#include \"b\"\n"
-           "#include \"c\"\n"
-           "\n"
-           "int a;");
+  setInput(R"(
+#include "a"
+#include "b"
+#include "c"
+
+int a;
+      )");
   Changes.emplace_back(FilePath, "key1");
   Changes.back().removeHeader("b");
-  EXPECT_EQ("#include \"a\"\n"
-            "#include \"c\"\n"
-            "\n"
-            "int a;",
+  EXPECT_EQ(R"(
+#include "a"
+#include "c"
+
+int a;
+      )",
             rewrite());
 }
 TEST_F(ApplyAtomicChangesTest, InsertsSystemIncludes) {
@@ -1549,19 +1553,23 @@ TEST_F(ApplyAtomicChangesTest, InsertsSy
 }
 
 TEST_F(ApplyAtomicChangesTest, RemoveSystemIncludes) {
-  setInput("#include <a>\n"
-           "#include <b>\n"
-           "\n"
-           "#include \"c\""
-           "\n"
-           "int a;");
+  setInput(R"(
+#include <a>
+#include <b>
+
+#include "c"
+
+int a;
+      )");
   Changes.emplace_back(FilePath, "key1");
   Changes.back().removeHeader("<a>");
-  EXPECT_EQ("#include <b>\n"
-            "\n"
-            "#include \"c\""
-            "\n"
-            "int a;",
+  EXPECT_EQ(R"(
+#include <b>
+
+#include "c"
+
+int a;
+      )",
             rewrite());
 }
 


_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits