encounter/dawn-cmake
1
0
Fork 0
mirror of https://github.com/encounter/dawn-cmake.git synced 2025-06-16 19:43:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add Struct IsValid tests.

Browse Source 
This Cl adds tests for the Struct::IsValid to make sure struct members
are also valid.

Bug: tint:11
Change-Id: I49d9f1dd6a6d2da8c49a273466316a849e1d28cd
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/16670
Reviewed-by: Sarah Mashayekhi <sarahmashay@google.com>
This commit is contained in:
Dan Sinclair 2020-03-17 03:52:21 +00:00 committed by Sarah Mashayekhi
parent 0cef04193d
commit 7c44407cd3
4 changed files with 34 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/ast/struct.cc
View File

@ -17,6 +17,8 @@
namespace tint { namespace tint {
namespace ast { namespace ast {
Struct::Struct() : Node() {}
Struct::Struct(StructDecoration decoration, Struct::Struct(StructDecoration decoration,
std::vector<std::unique_ptr<StructMember>> members) std::vector<std::unique_ptr<StructMember>> members)
: Node(), decoration_(decoration), members_(std::move(members)) {} : Node(), decoration_(decoration), members_(std::move(members)) {}
@ -29,6 +31,11 @@ Struct::Struct(const Source& source,
Struct::~Struct() = default; Struct::~Struct() = default;
bool Struct::IsValid() const { bool Struct::IsValid() const {
for (const auto& mem : members_) {
if (mem == nullptr || !mem->IsValid()) {
return false;
}
}
return true; return true;
} }

2
src/ast/struct.h
View File

@ -32,7 +32,7 @@ namespace ast {
class Struct : public Node { class Struct : public Node {
public: public:
/// Create a new empty struct statement /// Create a new empty struct statement
Struct() = default; Struct();
/// Create a new struct statement /// Create a new struct statement
/// @param decoration The struct decorations /// @param decoration The struct decorations
/// @param members The struct members /// @param members The struct members

2
src/ast/struct_member.cc
View File

@ -36,7 +36,7 @@ StructMember::StructMember(
StructMember::~StructMember() = default; StructMember::~StructMember() = default;
bool StructMember::IsValid() const { bool StructMember::IsValid() const {
if (name_.length() == 0) { if (name_.empty()) {
return false; return false;
} }
if (type_ == nullptr) { if (type_ == nullptr) {

29
src/ast/struct_test.cc
View File

@ -59,6 +59,27 @@ TEST_F(StructTest, IsValid) {
EXPECT_TRUE(s.IsValid()); EXPECT_TRUE(s.IsValid());
} }
TEST_F(StructTest, IsValid_Null_StructMember) {
type::I32Type i32;
std::vector<std::unique_ptr<StructMember>> members;
members.push_back(std::make_unique<StructMember>(
"a", &i32, std::vector<std::unique_ptr<StructMemberDecoration>>()));
members.push_back(nullptr);
Struct s{StructDecoration::kNone, std::move(members)};
EXPECT_FALSE(s.IsValid());
}
TEST_F(StructTest, IsValid_Invalid_StructMember) {
type::I32Type i32;
std::vector<std::unique_ptr<StructMember>> members;
members.push_back(std::make_unique<StructMember>(
"", &i32, std::vector<std::unique_ptr<StructMemberDecoration>>()));
Struct s{StructDecoration::kNone, std::move(members)};
EXPECT_FALSE(s.IsValid());
}
TEST_F(StructTest, ToStr) { TEST_F(StructTest, ToStr) {
type::I32Type i32; type::I32Type i32;
Source source{27, 4}; Source source{27, 4};
@ -69,10 +90,10 @@ TEST_F(StructTest, ToStr) {
Struct s{source, StructDecoration::kNone, std::move(members)}; Struct s{source, StructDecoration::kNone, std::move(members)};
std::ostringstream out; std::ostringstream out;
s.to_str(out, 0); s.to_str(out, 2);
EXPECT_EQ(out.str(), R"(Struct{ EXPECT_EQ(out.str(), R"( Struct{
StructMember{a: __i32} StructMember{a: __i32}
} }
)"); )");
} }