From 254d7aee5337b7bc2b402e2294e9e474014c4c4f Mon Sep 17 00:00:00 2001
From: Juergen Ributzka <juergen@ributzka.de>
Date: Wed, 29 Mar 2017 00:24:34 +0000
Subject: [PATCH] Revert "Try to unbreak buildbots after r298913."

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@298966 91177308-0d34-0410-b5e6-96231b3b80d8
---
 unittests/Tooling/RefactoringTest.cpp | 48 ++++++++++++++++-----------
 1 file changed, 28 insertions(+), 20 deletions(-)

diff --git a/unittests/Tooling/RefactoringTest.cpp b/unittests/Tooling/RefactoringTest.cpp
index 080a00330b..7ac5a1d0d4 100644
--- a/unittests/Tooling/RefactoringTest.cpp
+++ b/unittests/Tooling/RefactoringTest.cpp
@@ -1513,17 +1513,21 @@ TEST_F(ApplyAtomicChangesTest, InsertsNewIncludesInRightOrder) {
 }
 
 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, InsertsSystemIncludes) {
 }
 
 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());
 }
 
-- 
2.40.0