commit 1523f5c2765ce01ea7e079acf5c605472a378aac
author Ben Clayton <bclayton@google.com> Mon Dec 14 22:30:57 2020 +0000
committer Commit Bot service account <commit-bot@chromium.org> Mon Dec 14 22:30:57 2020 +0000
tree 8a9fecde31abf5c3f2bb78d6a627f597579896a8
parent 5180e16386b1803ba01d9fb85068d53ec368968e

Start cleaning up tests (3/N)

Remove Source{} with ast::Builder::create<>
Use Builder helpers where possible

Change-Id: I7b3188fa8239bf11e88ff6b396a57c23d76a3152
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/35660
Reviewed-by: dan sinclair <dsinclair@chromium.org>
Commit-Queue: Ben Clayton <bclayton@google.com>

src/ast/assignment_statement_test.cc

diff --git a/src/ast/assignment_statement_test.cc b/src/ast/assignment_statement_test.cc
index 951e32c..2d7055d 100644
--- a/src/ast/assignment_statement_test.cc
+++ b/src/ast/assignment_statement_test.cc
@@ -24,91 +24,76 @@
 using AssignmentStatementTest = TestHelper;
 
 TEST_F(AssignmentStatementTest, Creation) {
-  auto* lhs =
-      create<IdentifierExpression>(Source{}, mod.RegisterSymbol("lhs"), "lhs");
-  auto* rhs =
-      create<IdentifierExpression>(Source{}, mod.RegisterSymbol("rhs"), "rhs");
+  auto* lhs = Expr("lhs");
+  auto* rhs = Expr("rhs");
 
-  AssignmentStatement stmt(Source{}, lhs, rhs);
-  EXPECT_EQ(stmt.lhs(), lhs);
-  EXPECT_EQ(stmt.rhs(), rhs);
+  auto* stmt = create<AssignmentStatement>(lhs, rhs);
+  EXPECT_EQ(stmt->lhs(), lhs);
+  EXPECT_EQ(stmt->rhs(), rhs);
 }
 
 TEST_F(AssignmentStatementTest, CreationWithSource) {
-  auto* lhs =
-      create<IdentifierExpression>(Source{}, mod.RegisterSymbol("lhs"), "lhs");
-  auto* rhs =
-      create<IdentifierExpression>(Source{}, mod.RegisterSymbol("rhs"), "rhs");
+  auto* lhs = Expr("lhs");
+  auto* rhs = Expr("rhs");
 
-  AssignmentStatement stmt(Source{Source::Location{20, 2}}, lhs, rhs);
-  auto src = stmt.source();
+  auto* stmt =
+      create<AssignmentStatement>(Source{Source::Location{20, 2}}, lhs, rhs);
+  auto src = stmt->source();
   EXPECT_EQ(src.range.begin.line, 20u);
   EXPECT_EQ(src.range.begin.column, 2u);
 }
 
 TEST_F(AssignmentStatementTest, IsAssign) {
-  auto* lhs =
-      create<IdentifierExpression>(Source{}, mod.RegisterSymbol("lhs"), "lhs");
-  auto* rhs =
-      create<IdentifierExpression>(Source{}, mod.RegisterSymbol("rhs"), "rhs");
+  auto* lhs = Expr("lhs");
+  auto* rhs = Expr("rhs");
 
-  AssignmentStatement stmt(Source{}, lhs, rhs);
-  EXPECT_TRUE(stmt.Is<AssignmentStatement>());
+  auto* stmt = create<AssignmentStatement>(lhs, rhs);
+  EXPECT_TRUE(stmt->Is<AssignmentStatement>());
 }
 
 TEST_F(AssignmentStatementTest, IsValid) {
-  auto* lhs =
-      create<IdentifierExpression>(Source{}, mod.RegisterSymbol("lhs"), "lhs");
-  auto* rhs =
-      create<IdentifierExpression>(Source{}, mod.RegisterSymbol("rhs"), "rhs");
+  auto* lhs = Expr("lhs");
+  auto* rhs = Expr("rhs");
 
-  AssignmentStatement stmt(Source{}, lhs, rhs);
-  EXPECT_TRUE(stmt.IsValid());
+  auto* stmt = create<AssignmentStatement>(lhs, rhs);
+  EXPECT_TRUE(stmt->IsValid());
 }
 
 TEST_F(AssignmentStatementTest, IsValid_MissingLHS) {
-  auto* rhs =
-      create<IdentifierExpression>(Source{}, mod.RegisterSymbol("rhs"), "rhs");
+  auto* rhs = Expr("rhs");
 
-  AssignmentStatement stmt(Source{}, nullptr, rhs);
-  EXPECT_FALSE(stmt.IsValid());
+  auto* stmt = create<AssignmentStatement>(nullptr, rhs);
+  EXPECT_FALSE(stmt->IsValid());
 }
 
 TEST_F(AssignmentStatementTest, IsValid_MissingRHS) {
-  auto* lhs =
-      create<IdentifierExpression>(Source{}, mod.RegisterSymbol("lhs"), "lhs");
+  auto* lhs = Expr("lhs");
 
-  AssignmentStatement stmt(Source{}, lhs, nullptr);
-  EXPECT_FALSE(stmt.IsValid());
+  auto* stmt = create<AssignmentStatement>(lhs, nullptr);
+  EXPECT_FALSE(stmt->IsValid());
 }
 
 TEST_F(AssignmentStatementTest, IsValid_InvalidLHS) {
-  auto* lhs =
-      create<IdentifierExpression>(Source{}, mod.RegisterSymbol(""), "");
-  auto* rhs =
-      create<IdentifierExpression>(Source{}, mod.RegisterSymbol("rhs"), "rhs");
-  AssignmentStatement stmt(Source{}, lhs, rhs);
-  EXPECT_FALSE(stmt.IsValid());
+  auto* lhs = Expr("");
+  auto* rhs = Expr("rhs");
+  auto* stmt = create<AssignmentStatement>(lhs, rhs);
+  EXPECT_FALSE(stmt->IsValid());
 }
 
 TEST_F(AssignmentStatementTest, IsValid_InvalidRHS) {
-  auto* lhs =
-      create<IdentifierExpression>(Source{}, mod.RegisterSymbol("lhs"), "lhs");
-  auto* rhs =
-      create<IdentifierExpression>(Source{}, mod.RegisterSymbol(""), "");
-  AssignmentStatement stmt(Source{}, lhs, rhs);
-  EXPECT_FALSE(stmt.IsValid());
+  auto* lhs = Expr("lhs");
+  auto* rhs = Expr("");
+  auto* stmt = create<AssignmentStatement>(lhs, rhs);
+  EXPECT_FALSE(stmt->IsValid());
 }
 
 TEST_F(AssignmentStatementTest, ToStr) {
-  auto* lhs =
-      create<IdentifierExpression>(Source{}, mod.RegisterSymbol("lhs"), "lhs");
-  auto* rhs =
-      create<IdentifierExpression>(Source{}, mod.RegisterSymbol("rhs"), "rhs");
+  auto* lhs = Expr("lhs");
+  auto* rhs = Expr("rhs");
 
-  AssignmentStatement stmt(Source{}, lhs, rhs);
+  auto* stmt = create<AssignmentStatement>(lhs, rhs);
   std::ostringstream out;
-  stmt.to_str(out, 2);
+  stmt->to_str(out, 2);
 
   EXPECT_EQ(demangle(out.str()), R"(  Assignment{
     Identifier[not set]{lhs}