From ff59e8e8dcad6fc1b9d3224a04f08de72dbf8e6a Mon Sep 17 00:00:00 2001
From: Eric Liu <ioeric@google.com>
Date: Fri, 27 May 2016 08:20:02 +0000
Subject: [PATCH] [clang-format] moved unit tests related to replacements
cleaner from FormatTest.cpp to CleanUpTest.cpp.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@270971 91177308-0d34-0410-b5e6-96231b3b80d8
---
unittests/Format/CleanupTest.cpp | 41 ++++++++++++++++++++++++++++++++
unittests/Format/FormatTest.cpp | 29 ----------------------
2 files changed, 41 insertions(+), 29 deletions(-)
diff --git a/unittests/Format/CleanupTest.cpp b/unittests/Format/CleanupTest.cpp
index 01a90a306c9..93cc1e82fe6 100644
--- a/unittests/Format/CleanupTest.cpp
+++ b/unittests/Format/CleanupTest.cpp
@@ -9,6 +9,7 @@
#include "clang/Format/Format.h"
+#include "../Tooling/RewriterTestContext.h"
#include "clang/Tooling/Core/Replacement.h"
#include "gtest/gtest.h"
@@ -240,6 +241,46 @@ TEST_F(CleanupTest, CtorInitializerInNamespace) {
EXPECT_EQ(Expected, Result);
}
+class CleanUpReplacementsTest : public ::testing::Test {
+protected:
+ tooling::Replacement createReplacement(SourceLocation Start, unsigned Length,
+ llvm::StringRef ReplacementText) {
+ return tooling::Replacement(Context.Sources, Start, Length,
+ ReplacementText);
+ }
+
+ RewriterTestContext Context;
+};
+
+TEST_F(CleanUpReplacementsTest, FixOnlyAffectedCodeAfterReplacements) {
+ std::string Code = "namespace A {\n"
+ "namespace B {\n"
+ " int x;\n"
+ "} // namespace B\n"
+ "} // namespace A\n"
+ "\n"
+ "namespace C {\n"
+ "namespace D { int i; }\n"
+ "inline namespace E { namespace { int y; } }\n"
+ "int x= 0;"
+ "}";
+ std::string Expected = "\n\nnamespace C {\n"
+ "namespace D { int i; }\n\n"
+ "int x= 0;"
+ "}";
+ FileID ID = Context.createInMemoryFile("fix.cpp", Code);
+ tooling::Replacements Replaces;
+ Replaces.insert(tooling::Replacement(Context.Sources,
+ Context.getLocation(ID, 3, 3), 6, ""));
+ Replaces.insert(tooling::Replacement(Context.Sources,
+ Context.getLocation(ID, 9, 34), 6, ""));
+
+ format::FormatStyle Style = format::getLLVMStyle();
+ auto FinalReplaces = formatReplacements(
+ Code, cleanupAroundReplacements(Code, Replaces, Style), Style);
+ EXPECT_EQ(Expected, applyAllReplacements(Code, FinalReplaces));
+}
+
} // end namespace
} // end namespace format
} // end namespace clang
diff --git a/unittests/Format/FormatTest.cpp b/unittests/Format/FormatTest.cpp
index 27379b7d6c7..5effc3162f7 100644
--- a/unittests/Format/FormatTest.cpp
+++ b/unittests/Format/FormatTest.cpp
@@ -11537,35 +11537,6 @@ TEST_F(ReplacementTest, FormatCodeAfterReplacements) {
Code, formatReplacements(Code, Replaces, Style)));
}
-TEST_F(ReplacementTest, FixOnlyAffectedCodeAfterReplacements) {
- std::string Code = "namespace A {\n"
- "namespace B {\n"
- " int x;\n"
- "} // namespace B\n"
- "} // namespace A\n"
- "\n"
- "namespace C {\n"
- "namespace D { int i; }\n"
- "inline namespace E { namespace { int y; } }\n"
- "int x= 0;"
- "}";
- std::string Expected = "\n\nnamespace C {\n"
- "namespace D { int i; }\n\n"
- "int x= 0;"
- "}";
- FileID ID = Context.createInMemoryFile("fix.cpp", Code);
- tooling::Replacements Replaces;
- Replaces.insert(tooling::Replacement(
- Context.Sources, Context.getLocation(ID, 3, 3), 6, ""));
- Replaces.insert(tooling::Replacement(
- Context.Sources, Context.getLocation(ID, 9, 34), 6, ""));
-
- format::FormatStyle Style = format::getLLVMStyle();
- auto FinalReplaces = formatReplacements(
- Code, cleanupAroundReplacements(Code, Replaces, Style), Style);
- EXPECT_EQ(Expected, applyAllReplacements(Code, FinalReplaces));
-}
-
TEST_F(ReplacementTest, SortIncludesAfterReplacement) {
std::string Code = "#include \"a.h\"\n"
"#include \"c.h\"\n"
--
GitLab