From 9dcb677ec48dff55f5e1b18a1ed3be5fdedb450c Mon Sep 17 00:00:00 2001
From: Eric Liu <ioeric@google.com>
Date: Tue, 28 Mar 2017 13:56:19 +0000
Subject: [PATCH] Try to unbreak buildbots after r298913.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@298919 91177308-0d34-0410-b5e6-96231b3b80d8
---
unittests/Tooling/RefactoringTest.cpp | 48 +++++++++++----------------
1 file changed, 20 insertions(+), 28 deletions(-)
diff --git a/unittests/Tooling/RefactoringTest.cpp b/unittests/Tooling/RefactoringTest.cpp
index 7ac5a1d0d45..080a00330be 100644
--- a/unittests/Tooling/RefactoringTest.cpp
+++ b/unittests/Tooling/RefactoringTest.cpp
@@ -1513,21 +1513,17 @@ TEST_F(ApplyAtomicChangesTest, InsertsNewIncludesInRightOrder) {
}
TEST_F(ApplyAtomicChangesTest, RemoveAndSortIncludes) {
- setInput(R"(
-#include "a"
-#include "b"
-#include "c"
-
-int a;
- )");
+ setInput("#include \"a\"\n"
+ "#include \"b\"\n"
+ "#include \"c\"\n"
+ "\n"
+ "int a;");
Changes.emplace_back(FilePath, "key1");
Changes.back().removeHeader("b");
- EXPECT_EQ(R"(
-#include "a"
-#include "c"
-
-int a;
- )",
+ EXPECT_EQ("#include \"a\"\n"
+ "#include \"c\"\n"
+ "\n"
+ "int a;",
rewrite());
}
TEST_F(ApplyAtomicChangesTest, InsertsSystemIncludes) {
@@ -1553,23 +1549,19 @@ TEST_F(ApplyAtomicChangesTest, InsertsSystemIncludes) {
}
TEST_F(ApplyAtomicChangesTest, RemoveSystemIncludes) {
- setInput(R"(
-#include <a>
-#include <b>
-
-#include "c"
-
-int a;
- )");
+ setInput("#include <a>\n"
+ "#include <b>\n"
+ "\n"
+ "#include \"c\""
+ "\n"
+ "int a;");
Changes.emplace_back(FilePath, "key1");
Changes.back().removeHeader("<a>");
- EXPECT_EQ(R"(
-#include <b>
-
-#include "c"
-
-int a;
- )",
+ EXPECT_EQ("#include <b>\n"
+ "\n"
+ "#include \"c\""
+ "\n"
+ "int a;",
rewrite());
}
--
GitLab