carbon-language/carbon-lang
1
0
Fork 0
mirror of https://github.com/carbon-language/carbon-lang.git synced 2026-10-06 09:34:42 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

Migrate some lexer tests to file tests. (#2892)

Browse Source 
These tests are doing string comparisons on output that don't seem to be meaningfully different from a file_test.

I'm tempted to migrate lexer tests in general, but I'm not doing that here since others may find more value in the current approach.
This commit is contained in:
Jon Ross-Perkins
2023-06-14 09:50:48 -07:00
committed by GitHub
parent d18c1347d7
commit 8b1e820848
7 changed files with 69 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/driver/driver_test.cpp
+10 -10
View File
@@ -21,15 +21,15 @@ using ::testing::ElementsAre;
using ::testing::HasSubstr;
using ::testing::StrEq;
static constexpr llvm::StringLiteral TestFileName = "test_file.carbon";
class DriverTest : public testing::Test {
protected:
DriverTest() : driver_(fs_, test_output_stream_, test_error_stream_) {}
auto CreateTestFile(llvm::StringRef text) -> void {
auto CreateTestFile(llvm::StringRef text) -> llvm::StringRef {
static constexpr llvm::StringLiteral TestFileName = "test_file.carbon";
fs_.addFile(TestFileName, /*ModificationTime=*/0,
llvm::MemoryBuffer::getMemBuffer(text));
return TestFileName;
}
llvm::vfs::InMemoryFileSystem fs_;
@@ -82,9 +82,9 @@ TEST_F(DriverTest, HelpErrors) {
}
TEST_F(DriverTest, DumpTokens) {
CreateTestFile("Hello World");
EXPECT_TRUE(driver_.RunDumpSubcommand(ConsoleDiagnosticConsumer(),
{"tokens", TestFileName}));
auto file = CreateTestFile("Hello World");
EXPECT_TRUE(
driver_.RunDumpSubcommand(ConsoleDiagnosticConsumer(), {"tokens", file}));
EXPECT_THAT(test_error_stream_.TakeStr(), StrEq(""));
auto tokenized_text = test_output_stream_.TakeStr();
@@ -114,7 +114,7 @@ TEST_F(DriverTest, DumpTokens) {
{"spelling", ""}}}));
// Check that the subcommand dispatch works.
EXPECT_TRUE(driver_.RunFullCommand({"dump", "tokens", TestFileName}));
EXPECT_TRUE(driver_.RunFullCommand({"dump", "tokens", file}));
EXPECT_THAT(test_error_stream_.TakeStr(), StrEq(""));
EXPECT_THAT(test_output_stream_.TakeStr(), StrEq(tokenized_text));
}
@@ -141,15 +141,15 @@ TEST_F(DriverTest, DumpErrors) {
}
TEST_F(DriverTest, DumpParseTree) {
CreateTestFile("var v: Int = 42;");
auto file = CreateTestFile("var v: Int = 42;");
EXPECT_TRUE(driver_.RunDumpSubcommand(ConsoleDiagnosticConsumer(),
{"parse-tree", TestFileName}));
{"parse-tree", file}));
EXPECT_THAT(test_error_stream_.TakeStr(), StrEq(""));
// Verify there is output without examining it.
EXPECT_FALSE(test_output_stream_.TakeStr().empty());
// Check that the subcommand dispatch works.
EXPECT_TRUE(driver_.RunFullCommand({"dump", "parse-tree", TestFileName}));
EXPECT_TRUE(driver_.RunFullCommand({"dump", "parse-tree", file}));
EXPECT_THAT(test_error_stream_.TakeStr(), StrEq(""));
// Verify there is output without examining it.
EXPECT_FALSE(test_output_stream_.TakeStr().empty());