mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-09-24 21:40:12 +01:00
Right now I think everyone has the habit of doing an autoupdate then
using source control for a diff. This is offering an option of better
diff output from the test.
For example:
```
TEST: toolchain/driver/testdata/fail_flush_errors.carbon !
Ran 1 tests in 81 ms wall time, 8 ms across threads
testing/file_test/file_test_base.cpp:264: Failure
Value of: SplitOutput(test_file.actual_stderr)
Expected: matches elements with union diff
Actual: { "fail_flush_errors.carbon:22:3: error: name `undeclared1` not found [NameNotFound]", " undeclared1;", " ^~~~~~~~~~~", "", "fail_flush_errors.carbon:31:3: error: `Core.String` implicitly referenced here, but package `Core` not found [CoreNotFound]", " \"undec\\x6Cared2\";", " ^~~~~~~~~~~~~~~~", "", "fail_flush_errors.carbon:35:3: error: name `undeclared2` not found [NameNotFound]", " undeclared2;", " ^~~~~~~~~~~", "", "fail_flush_errors.carbon:43:3: error: name `undeclared3` not found [NameNotFound]", " undeclared3;", " ^~~~~~~~~~~", "", "" }, union diff (- expected, + actual):
=== diff in expected elements 0 to 2:
+ fail_flush_errors.carbon:22:3: error: name `undeclared1` not found [NameNotFound]
undeclared1;
^~~~~~~~~~~
=== diff in expected elements 4 to 9:
"undec\x6Cared2";
^~~~~~~~~~~~~~~~
+ fail_flush_errors.carbon:35:3: error: name `undeclared2` not found [NameNotFound]
undeclared2;
^~~~~~~~~~~
=== diff end
Stack trace:
0x55e476d29efd: Carbon::Testing::FileTestCase::TestBody()
0x55e476dbd1f2: testing::internal::HandleExceptionsInMethodIfSupported<>()
0x55e476dbcf57: testing::Test::Run()
0x55e476dbf0bf: testing::TestInfo::Run()
... Google Test internal frames ...
To test this file alone, run:
bazel test //toolchain/testing:file_test --test_arg=--file_tests=toolchain/driver/testdata/fail_flush_errors.carbon
testing/file_test/file_test_base.cpp:277: Failure
Failed
Autoupdate would make changes to the file content. Run:
bazel run //toolchain/testing:file_test -- --autoupdate --file_tests=toolchain/driver/testdata/fail_flush_errors.carbon
Stack trace:
0x55e476d2a5f0: Carbon::Testing::FileTestCase::TestBody()
0x55e476dbd1f2: testing::internal::HandleExceptionsInMethodIfSupported<>()
0x55e476dbcf57: testing::Test::Run()
0x55e476dbf0bf: testing::TestInfo::Run()
... Google Test internal frames ...
[ FAILED ] ToolchainFileTest.toolchain/driver/testdata/fail_flush_errors.carbon, where GetParam() = toolchain/driver/testdata/fail_flush_errors.carbon (93 ms)
```
Assisted-by: Google Antigravity with Gemini
248 lines
6.5 KiB
C++
248 lines
6.5 KiB
C++
// Part of the Carbon Language project, under the Apache License v2.0 with LLVM
|
|
// Exceptions. See /LICENSE for license information.
|
|
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
|
|
|
|
#include "testing/base/unified_diff_matcher.h"
|
|
|
|
#include <gmock/gmock.h>
|
|
#include <gtest/gtest.h>
|
|
|
|
#include <string>
|
|
|
|
#include "llvm/ADT/SmallVector.h"
|
|
|
|
namespace Carbon::Testing {
|
|
namespace {
|
|
|
|
using ::testing::Matcher;
|
|
using ::testing::StrEq;
|
|
|
|
// Asserts that when expected does not match actual, the string
|
|
// representation of the produced diff equals expected_diff.
|
|
auto ExpectUnifiedDiff(const llvm::SmallVector<std::string>& actual,
|
|
const llvm::SmallVector<Matcher<std::string>>& expected,
|
|
const std::string& expected_diff) -> void {
|
|
testing::StringMatchResultListener listener;
|
|
EXPECT_FALSE(testing::ExplainMatchResult(
|
|
ElementsAreArrayWithUnifiedDiff(expected), actual, &listener));
|
|
EXPECT_THAT(listener.str(), testing::Eq(expected_diff));
|
|
}
|
|
|
|
TEST(UnifiedDiffMatcherTest, Matches) {
|
|
llvm::SmallVector<std::string> actual = {"A", "B", "C"};
|
|
llvm::SmallVector<Matcher<std::string>> expected = {StrEq("A"), StrEq("B"),
|
|
StrEq("C")};
|
|
EXPECT_THAT(actual, ElementsAreArrayWithUnifiedDiff(expected));
|
|
}
|
|
|
|
TEST(UnifiedDiffMatcherTest, MismatchMissing) {
|
|
constexpr char ExpectedDiff[] = R"(unified diff (- expected, + actual):
|
|
=== diff in expected elements 1 to 3 (1-based index):
|
|
A
|
|
- is equal to "B"
|
|
C
|
|
=== diff end
|
|
)";
|
|
ExpectUnifiedDiff({"A", "C"}, {StrEq("A"), StrEq("B"), StrEq("C")},
|
|
ExpectedDiff);
|
|
}
|
|
|
|
TEST(UnifiedDiffMatcherTest, MismatchExtra) {
|
|
constexpr char ExpectedDiff[] = R"(unified diff (- expected, + actual):
|
|
=== diff in expected elements 1 to 2 (1-based index):
|
|
A
|
|
+ B
|
|
C
|
|
=== diff end
|
|
)";
|
|
ExpectUnifiedDiff({"A", "B", "C"}, {StrEq("A"), StrEq("C")}, ExpectedDiff);
|
|
}
|
|
|
|
TEST(UnifiedDiffMatcherTest, MismatchBoth) {
|
|
constexpr char ExpectedDiff[] = R"(unified diff (- expected, + actual):
|
|
=== diff in expected elements 1 to 2 (1-based index):
|
|
A
|
|
- is equal to "C"
|
|
+ B
|
|
=== diff end
|
|
)";
|
|
ExpectUnifiedDiff({"A", "B"}, {StrEq("A"), StrEq("C")}, ExpectedDiff);
|
|
}
|
|
|
|
TEST(UnifiedDiffMatcherTest, MismatchMultiple) {
|
|
constexpr char ExpectedDiff[] = R"(unified diff (- expected, + actual):
|
|
=== diff in expected elements 1 to 5 (1-based index):
|
|
A
|
|
- is equal to "B"
|
|
+ X
|
|
C
|
|
- is equal to "D"
|
|
+ Y
|
|
E
|
|
=== diff end
|
|
)";
|
|
ExpectUnifiedDiff(
|
|
{"A", "X", "C", "Y", "E"},
|
|
{StrEq("A"), StrEq("B"), StrEq("C"), StrEq("D"), StrEq("E")},
|
|
ExpectedDiff);
|
|
}
|
|
|
|
TEST(UnifiedDiffMatcherTest, MismatchLongContext) {
|
|
constexpr char ExpectedDiff[] = R"(unified diff (- expected, + actual):
|
|
=== diff in expected elements 2 to 8 (1-based index):
|
|
1
|
|
2
|
|
3
|
|
- is equal to "X"
|
|
+ 4
|
|
5
|
|
6
|
|
7
|
|
=== diff end
|
|
)";
|
|
ExpectUnifiedDiff({"0", "1", "2", "3", "4", "5", "6", "7", "8"},
|
|
{StrEq("0"), StrEq("1"), StrEq("2"), StrEq("3"), StrEq("X"),
|
|
StrEq("5"), StrEq("6"), StrEq("7"), StrEq("8")},
|
|
ExpectedDiff);
|
|
}
|
|
|
|
TEST(UnifiedDiffMatcherTest, Mismatch5LineContext) {
|
|
constexpr char ExpectedDiff[] = R"(unified diff (- expected, + actual):
|
|
=== diff in expected elements 1 to 7 (1-based index):
|
|
- is equal to "X"
|
|
+ 0
|
|
1
|
|
2
|
|
3
|
|
4
|
|
5
|
|
- is equal to "Y"
|
|
+ 6
|
|
=== diff end
|
|
)";
|
|
ExpectUnifiedDiff({"0", "1", "2", "3", "4", "5", "6"},
|
|
{StrEq("X"), StrEq("1"), StrEq("2"), StrEq("3"), StrEq("4"),
|
|
StrEq("5"), StrEq("Y")},
|
|
ExpectedDiff);
|
|
}
|
|
|
|
TEST(UnifiedDiffMatcherTest, Mismatch6LineContext) {
|
|
constexpr char ExpectedDiff[] = R"(unified diff (- expected, + actual):
|
|
=== diff in expected elements 1 to 8 (1-based index):
|
|
- is equal to "X"
|
|
+ 0
|
|
1
|
|
2
|
|
3
|
|
4
|
|
5
|
|
6
|
|
- is equal to "Y"
|
|
+ 7
|
|
=== diff end
|
|
)";
|
|
ExpectUnifiedDiff({"0", "1", "2", "3", "4", "5", "6", "7"},
|
|
{StrEq("X"), StrEq("1"), StrEq("2"), StrEq("3"), StrEq("4"),
|
|
StrEq("5"), StrEq("6"), StrEq("Y")},
|
|
ExpectedDiff);
|
|
}
|
|
|
|
TEST(UnifiedDiffMatcherTest, Mismatch7LineContext) {
|
|
constexpr char ExpectedDiff[] = R"(unified diff (- expected, + actual):
|
|
=== diff in expected elements 1 to 4 (1-based index):
|
|
- is equal to "X"
|
|
+ 0
|
|
1
|
|
2
|
|
3
|
|
=== diff in expected elements 6 to 9 (1-based index):
|
|
5
|
|
6
|
|
7
|
|
- is equal to "Y"
|
|
+ 8
|
|
=== diff end
|
|
)";
|
|
ExpectUnifiedDiff({"0", "1", "2", "3", "4", "5", "6", "7", "8"},
|
|
{StrEq("X"), StrEq("1"), StrEq("2"), StrEq("3"), StrEq("4"),
|
|
StrEq("5"), StrEq("6"), StrEq("7"), StrEq("Y")},
|
|
ExpectedDiff);
|
|
}
|
|
|
|
TEST(UnifiedDiffMatcherTest, MismatchEmptyExpected) {
|
|
constexpr char ExpectedDiff[] = R"(unified diff (- expected, + actual):
|
|
=== diff in expected elements 1 to 1 (1-based index):
|
|
+ A
|
|
=== diff end
|
|
)";
|
|
ExpectUnifiedDiff({"A"}, {}, ExpectedDiff);
|
|
}
|
|
|
|
TEST(UnifiedDiffMatcherTest, MismatchEmptyActual) {
|
|
constexpr char ExpectedDiff[] = R"(unified diff (- expected, + actual):
|
|
=== diff in expected elements 1 to 1 (1-based index):
|
|
- is equal to "A"
|
|
=== diff end
|
|
)";
|
|
ExpectUnifiedDiff({}, {StrEq("A")}, ExpectedDiff);
|
|
}
|
|
|
|
TEST(UnifiedDiffMatcherTest, MismatchLongDifference) {
|
|
constexpr char ExpectedDiff[] = R"(unified diff (- expected, + actual):
|
|
=== diff in expected elements 1 to 4 (1-based index):
|
|
1
|
|
- is equal to "2"
|
|
- is equal to "3"
|
|
+ X
|
|
+ Y
|
|
+ Z
|
|
4
|
|
=== diff end
|
|
)";
|
|
ExpectUnifiedDiff({"1", "X", "Y", "Z", "4"},
|
|
{StrEq("1"), StrEq("2"), StrEq("3"), StrEq("4")},
|
|
ExpectedDiff);
|
|
}
|
|
|
|
TEST(UnifiedDiffMatcherTest, MismatchGreedyResyncActualMissing) {
|
|
constexpr char ExpectedDiff[] = R"(unified diff (- expected, + actual):
|
|
=== diff in expected elements 1 to 6 (1-based index):
|
|
1
|
|
2
|
|
- is equal to "3"
|
|
+ X
|
|
+ 7
|
|
4
|
|
5
|
|
6
|
|
=== diff end
|
|
)";
|
|
ExpectUnifiedDiff({"1", "2", "X", "7", "4", "5", "6", "7", "8", "9"},
|
|
{StrEq("1"), StrEq("2"), StrEq("3"), StrEq("4"), StrEq("5"),
|
|
StrEq("6"), StrEq("7"), StrEq("8"), StrEq("9")},
|
|
ExpectedDiff);
|
|
}
|
|
|
|
TEST(UnifiedDiffMatcherTest, MismatchGreedyResyncExpectedMissing) {
|
|
constexpr char ExpectedDiff[] = R"(unified diff (- expected, + actual):
|
|
=== diff in expected elements 1 to 7 (1-based index):
|
|
1
|
|
2
|
|
- is equal to "X"
|
|
- is equal to "7"
|
|
+ 3
|
|
4
|
|
5
|
|
6
|
|
=== diff end
|
|
)";
|
|
ExpectUnifiedDiff(
|
|
{"1", "2", "3", "4", "5", "6", "7", "8", "9"},
|
|
{StrEq("1"), StrEq("2"), StrEq("X"), StrEq("7"), StrEq("4"), StrEq("5"),
|
|
StrEq("6"), StrEq("7"), StrEq("8"), StrEq("9")},
|
|
ExpectedDiff);
|
|
}
|
|
|
|
} // namespace
|
|
} // namespace Carbon::Testing
|