mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-10-03 21:35:51 +01:00
Chandler Carruth
5f67029479
This moves over to the vanilla upstream GoogleTest pulled in the more expected manner with Bazel. It also adds Abseil and Google Benchmark libraries in the same fashion (there are cross dependencies here). As part of this, also introduce a dependency check test that can enforce basic layering of dependencies. For example, this lets us ensure that non-test Carbon code only depends on LLVM and Clang despite having other libraries available. There remains some cleanup to improve the way these dependency tests work, but this at least ensures we don't regress. I've also provided workarounds to allow both Carbon code and LLVM code to freely be used with GoogleTest (and other `std::ostream` based output code). This is done by extending the code in `//common/ostream.h`. One downside is that it requires opening the `llvm` namespace and adding an ADL_found overload there. I think on balance this is still a win and doesn't make me too nervous. The new version of GoogleTest requires printing more often from matchers and so I've also added several printing routines to types that previously didn't require them. Otherwise, most of the updates are just using the more conventional upstream style of including the headers and adding `ostream.h` where it is needed. I did consider moving code over to use `std::ostream` instead of LLVM's `raw_ostream`, but the advantages of not doing virtual dispatch still seem significant, and it also seems good to retain access to LLVM's formatting utilities built around `raw_ostream` given that we can't pull arbitrary dependencies into Carbon code outside of test code. All of this was slightly motivated by requests for newer features in GoogleTest, but much more-so by my desire to have access to Google Benchmark and Abseil when writing benchmarks. For example, using Abseil's random number generator seems extremely helpful when generating inputs for benchmarks. The growing dependencies between these packages further motivated me to just pull them all in and ensure they worked well.
97 lines
3.3 KiB
C++
97 lines
3.3 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 "toolchain/diagnostics/diagnostic_emitter.h"
|
|
|
|
#include <gmock/gmock.h>
|
|
#include <gtest/gtest.h>
|
|
|
|
#include "llvm/ADT/StringRef.h"
|
|
#include "llvm/Support/FormatVariadic.h"
|
|
#include "toolchain/diagnostics/mocks.h"
|
|
|
|
namespace Carbon {
|
|
namespace {
|
|
|
|
using Testing::DiagnosticAt;
|
|
using Testing::DiagnosticLevel;
|
|
using Testing::DiagnosticMessage;
|
|
using Testing::DiagnosticShortName;
|
|
using ::testing::ElementsAre;
|
|
using ::testing::Eq;
|
|
|
|
struct FakeDiagnostic {
|
|
static constexpr llvm::StringLiteral ShortName = "fake-diagnostic";
|
|
// TODO: consider ways to put the Message into `format` to allow dynamic
|
|
// selection of the message.
|
|
static constexpr llvm::StringLiteral Message = "{0}";
|
|
|
|
std::string message;
|
|
|
|
auto Format() -> std::string {
|
|
// Work around a bug in Clang's unused const variable warning by marking it
|
|
// used here with a no-op.
|
|
static_cast<void>(ShortName);
|
|
|
|
return llvm::formatv(Message.data(), message).str();
|
|
}
|
|
};
|
|
|
|
struct FakeDiagnosticLocationTranslator : DiagnosticLocationTranslator<int> {
|
|
auto GetLocation(int n) -> Diagnostic::Location override {
|
|
return {.file_name = "test", .line_number = 1, .column_number = n};
|
|
}
|
|
};
|
|
|
|
TEST(DiagTest, EmitErrors) {
|
|
FakeDiagnosticLocationTranslator translator;
|
|
Testing::MockDiagnosticConsumer consumer;
|
|
DiagnosticEmitter<int> emitter(translator, consumer);
|
|
|
|
EXPECT_CALL(consumer, HandleDiagnostic(
|
|
AllOf(DiagnosticLevel(Diagnostic::Error),
|
|
DiagnosticAt(1, 1), DiagnosticMessage("M1"),
|
|
DiagnosticShortName("fake-diagnostic"))));
|
|
EXPECT_CALL(consumer, HandleDiagnostic(
|
|
AllOf(DiagnosticLevel(Diagnostic::Error),
|
|
DiagnosticAt(1, 2), DiagnosticMessage("M2"),
|
|
DiagnosticShortName("fake-diagnostic"))));
|
|
|
|
emitter.EmitError<FakeDiagnostic>(1, {.message = "M1"});
|
|
emitter.EmitError<FakeDiagnostic>(2, {.message = "M2"});
|
|
}
|
|
|
|
TEST(DiagTest, EmitWarnings) {
|
|
std::vector<std::string> reported;
|
|
|
|
FakeDiagnosticLocationTranslator translator;
|
|
Testing::MockDiagnosticConsumer consumer;
|
|
DiagnosticEmitter<int> emitter(translator, consumer);
|
|
|
|
EXPECT_CALL(consumer, HandleDiagnostic(
|
|
AllOf(DiagnosticLevel(Diagnostic::Warning),
|
|
DiagnosticAt(1, 3), DiagnosticMessage("M1"),
|
|
DiagnosticShortName("fake-diagnostic"))));
|
|
EXPECT_CALL(consumer, HandleDiagnostic(
|
|
AllOf(DiagnosticLevel(Diagnostic::Warning),
|
|
DiagnosticAt(1, 5), DiagnosticMessage("M3"),
|
|
DiagnosticShortName("fake-diagnostic"))));
|
|
|
|
emitter.EmitWarningIf<FakeDiagnostic>(3, [](FakeDiagnostic& diagnostic) {
|
|
diagnostic.message = "M1";
|
|
return true;
|
|
});
|
|
emitter.EmitWarningIf<FakeDiagnostic>(4, [](FakeDiagnostic& diagnostic) {
|
|
diagnostic.message = "M2";
|
|
return false;
|
|
});
|
|
emitter.EmitWarningIf<FakeDiagnostic>(5, [](FakeDiagnostic& diagnostic) {
|
|
diagnostic.message = "M3";
|
|
return true;
|
|
});
|
|
}
|
|
|
|
} // namespace
|
|
} // namespace Carbon
|