mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-10-05 19:31:08 +01:00
Move tests into Carbon::Testing, set small size (#992)
The small size is for the 1m vs 5m time limit -- all these tests _should_ be fast so a lower limit seems consistent, and the 5m timeout was getting in my way when trying to debug *actual* timeouts. The Carbon::Testing bit is for convenience -- test libraries are generally using it, it seems like the tests should too. Note this reduces the need for `using`. This does push NodeMatchers into Carbon::Testing -- I don't think this was benefiting from having its own namespace; `using namespace` is discouraged [under style](https://google.github.io/styleguide/cppguide.html#Namespaces), we wouldn't support an equivalent in Carbon, and it feels like it's not helping to avoid name collisions. (also tidy was bugging about it, and while I could NOLINT that, this felt like the better approach)
This commit is contained in:
@@ -19,18 +19,13 @@
|
||||
#include "toolchain/parser/parse_node_kind.h"
|
||||
#include "toolchain/parser/parse_test_helpers.h"
|
||||
|
||||
namespace Carbon {
|
||||
namespace Carbon::Testing {
|
||||
namespace {
|
||||
|
||||
using Carbon::Testing::DiagnosticMessage;
|
||||
using Carbon::Testing::ExpectedNode;
|
||||
using Carbon::Testing::MatchParseTreeNodes;
|
||||
using namespace Carbon::Testing::NodeMatchers;
|
||||
using ::testing::ElementsAre;
|
||||
using ::testing::Eq;
|
||||
using ::testing::Ne;
|
||||
using ::testing::StrEq;
|
||||
namespace Yaml = Carbon::Testing::Yaml;
|
||||
|
||||
class ParseTreeTest : public ::testing::Test {
|
||||
protected:
|
||||
@@ -1176,4 +1171,4 @@ TEST_F(ParseTreeTest, ParenMatchRegression) {
|
||||
}
|
||||
|
||||
} // namespace
|
||||
} // namespace Carbon
|
||||
} // namespace Carbon::Testing
|
||||
|
||||
Reference in New Issue
Block a user