diff options
Diffstat (limited to 'clang-tools-extra/unittests/cpp11-migrate')
6 files changed, 15 insertions, 117 deletions
diff --git a/clang-tools-extra/unittests/cpp11-migrate/CMakeLists.txt b/clang-tools-extra/unittests/cpp11-migrate/CMakeLists.txt index 8da010f0dbd..1f647d5dc19 100644 --- a/clang-tools-extra/unittests/cpp11-migrate/CMakeLists.txt +++ b/clang-tools-extra/unittests/cpp11-migrate/CMakeLists.txt @@ -11,7 +11,6 @@ add_extra_unittest(Cpp11MigrateTests ReformattingTest.cpp
IncludeExcludeTest.cpp
PerfSupportTest.cpp
- ReplacementsYamlTest.cpp
TransformTest.cpp
UniqueHeaderNameTest.cpp
)
diff --git a/clang-tools-extra/unittests/cpp11-migrate/FileOverridesTest.cpp b/clang-tools-extra/unittests/cpp11-migrate/FileOverridesTest.cpp index 382c5a8c737..39ed662cbec 100644 --- a/clang-tools-extra/unittests/cpp11-migrate/FileOverridesTest.cpp +++ b/clang-tools-extra/unittests/cpp11-migrate/FileOverridesTest.cpp @@ -30,10 +30,8 @@ TEST(SourceOverridesTest, Interface) { Replacements Replaces; unsigned ReplacementLength = strlen("std::vector<such_a_long_name_for_a_type>::const_iterator"); - Replaces.insert( - Replacement(FileName, 0, ReplacementLength, "auto")); - Overrides.applyReplacements(Replaces, VFHelper.getNewSourceManager(), - "use-auto"); + Replaces.insert(Replacement(FileName, 0, ReplacementLength, "auto")); + Overrides.applyReplacements(Replaces, VFHelper.getNewSourceManager()); EXPECT_TRUE(Overrides.isSourceOverriden()); std::string ExpectedContent = "auto long_type =\n" diff --git a/clang-tools-extra/unittests/cpp11-migrate/IncludeExcludeTest.cpp b/clang-tools-extra/unittests/cpp11-migrate/IncludeExcludeTest.cpp index 6a206df60aa..7aea471c21a 100644 --- a/clang-tools-extra/unittests/cpp11-migrate/IncludeExcludeTest.cpp +++ b/clang-tools-extra/unittests/cpp11-migrate/IncludeExcludeTest.cpp @@ -7,13 +7,24 @@ // //===----------------------------------------------------------------------===// -#include "Utility.h" #include "Core/IncludeExcludeInfo.h" #include "gtest/gtest.h" #include "llvm/Support/FileSystem.h" #include "llvm/Support/Path.h" #include <fstream> +// FIXME: copied from unittests/Support/Path.cpp +#define ASSERT_NO_ERROR(x) \ + if (llvm::error_code ASSERT_NO_ERROR_ec = x) { \ + llvm::SmallString<128> MessageStorage; \ + llvm::raw_svector_ostream Message(MessageStorage); \ + Message << #x ": did not return errc::success.\n" \ + << "error number: " << ASSERT_NO_ERROR_ec.value() << "\n" \ + << "error message: " << ASSERT_NO_ERROR_ec.message() << "\n"; \ + GTEST_FATAL_FAILURE_(MessageStorage.c_str()); \ + } else { \ + } + TEST(IncludeExcludeTest, ParseString) { IncludeExcludeInfo IEManager; llvm::error_code Err = IEManager.readListFromString( diff --git a/clang-tools-extra/unittests/cpp11-migrate/ReformattingTest.cpp b/clang-tools-extra/unittests/cpp11-migrate/ReformattingTest.cpp index a5caa0a3d77..fcde6b81db4 100644 --- a/clang-tools-extra/unittests/cpp11-migrate/ReformattingTest.cpp +++ b/clang-tools-extra/unittests/cpp11-migrate/ReformattingTest.cpp @@ -39,8 +39,7 @@ TEST(Reformatter, SingleReformat) { FileName, Changes, VFHelper.getNewSourceManager()); SourceOverrides Overrides(FileName, /*TrackChanges=*/false); - Overrides.applyReplacements(Replaces, VFHelper.getNewSourceManager(), - "reformatter"); + Overrides.applyReplacements(Replaces, VFHelper.getNewSourceManager()); std::string Expected, Result; diff --git a/clang-tools-extra/unittests/cpp11-migrate/ReplacementsYamlTest.cpp b/clang-tools-extra/unittests/cpp11-migrate/ReplacementsYamlTest.cpp deleted file mode 100644 index 5d009f8812e..00000000000 --- a/clang-tools-extra/unittests/cpp11-migrate/ReplacementsYamlTest.cpp +++ /dev/null @@ -1,84 +0,0 @@ -//===- unittests/cpp11-migrate/ReplacementsYamlTest.cpp -------------------===// -// -// The LLVM Compiler Infrastructure -// -// This file is distributed under the University of Illinois Open Source -// License. See LICENSE.TXT for details. -// -//===----------------------------------------------------------------------===// -// -// Test for the Yaml files generated by transforms on header files. -// -//===----------------------------------------------------------------------===// - -#include "Utility.h" -#include "Core/FileOverrides.h" -#include "gtest/gtest.h" - -using namespace llvm; - -TEST(ReplacementsYamlTest, writeReadTest) { - using clang::tooling::Replacement; - - const std::string HeaderFileName = "/path/to/common.h"; - const std::string TransformID = "loop-convert"; - const unsigned int ReplacementOffset1 = 232; - const unsigned int ReplacementLength1 = 56; - const std::string ReplacementText1 = "(auto & elem : V)"; - const unsigned int ReplacementOffset2 = 301; - const unsigned int ReplacementLength2 = 2; - const std::string ReplacementText2 = "elem"; - - TransformReplacements TR; - TR.TransformID = TransformID; - TR.GeneratedReplacements - .push_back(Replacement(HeaderFileName, ReplacementOffset1, - ReplacementLength1, ReplacementText1)); - TR.GeneratedReplacements - .push_back(Replacement(HeaderFileName, ReplacementOffset2, - ReplacementLength2, ReplacementText2)); - - TransformDocument TD; - TD.FileName = HeaderFileName.c_str(); - TD.Replacements.push_back(TR); - - std::string YamlContent; - llvm::raw_string_ostream YamlContentStream(YamlContent); - - // Write to the YAML file. - { - yaml::Output YAML(YamlContentStream); - YAML << TD; - YamlContentStream.str(); - ASSERT_NE(YamlContent.length(), 0u); - } - - // Read from the YAML file and verify that what was written is exactly what - // we read back. - { - TransformDocument TDActual; - yaml::Input YAML(YamlContent); - YAML >> TDActual; - ASSERT_NO_ERROR(YAML.error()); - EXPECT_EQ(HeaderFileName, TDActual.FileName); - ASSERT_EQ(1u, TDActual.Replacements.size()); - - TransformReplacements TRActual = TDActual.Replacements[0]; - EXPECT_EQ(TransformID, TRActual.TransformID); - ASSERT_EQ(2u, TRActual.GeneratedReplacements.size()); - - EXPECT_EQ(ReplacementOffset1, - TRActual.GeneratedReplacements[0].getOffset()); - EXPECT_EQ(ReplacementLength1, - TRActual.GeneratedReplacements[0].getLength()); - EXPECT_EQ(ReplacementText1, - TRActual.GeneratedReplacements[0].getReplacementText().str()); - - EXPECT_EQ(ReplacementOffset2, - TRActual.GeneratedReplacements[1].getOffset()); - EXPECT_EQ(ReplacementLength2, - TRActual.GeneratedReplacements[1].getLength()); - EXPECT_EQ(ReplacementText2, - TRActual.GeneratedReplacements[1].getReplacementText().str()); - } -} diff --git a/clang-tools-extra/unittests/cpp11-migrate/Utility.h b/clang-tools-extra/unittests/cpp11-migrate/Utility.h deleted file mode 100644 index 54291d941a3..00000000000 --- a/clang-tools-extra/unittests/cpp11-migrate/Utility.h +++ /dev/null @@ -1,25 +0,0 @@ -//=-- cpp11-migrate/Utility.h - Utility functions and macros-----*- C++ -*-===// -// -// The LLVM Compiler Infrastructure -// -// This file is distributed under the University of Illinois Open Source -// License. See LICENSE.TXT for details. -// -//===----------------------------------------------------------------------===// - -#ifndef CPP11_MIGRATE_UNITTESTS_UTILITY_H -#define CPP11_MIGRATE_UNITTESTS_UTILITY_H - -// FIXME: copied from unittests/Support/Path.cpp -#define ASSERT_NO_ERROR(x) \ - if (llvm::error_code ASSERT_NO_ERROR_ec = x) { \ - llvm::SmallString<128> MessageStorage; \ - llvm::raw_svector_ostream Message(MessageStorage); \ - Message << #x ": did not return errc::success.\n" \ - << "error number: " << ASSERT_NO_ERROR_ec.value() << "\n" \ - << "error message: " << ASSERT_NO_ERROR_ec.message() << "\n"; \ - GTEST_FATAL_FAILURE_(MessageStorage.c_str()); \ - } else { \ - } - -#endif // CPP11_MIGRATE_UNITTESTS_UTILITY_H |
