Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use ASSERT_TRUE when checking nullness in GTests #482

Merged
merged 1 commit into from
Apr 14, 2017
Merged

Use ASSERT_TRUE when checking nullness in GTests #482

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions test/gtest/arch_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ TEST(arch, packet_out) {
});

pgm = pgm->apply(passes);
ASSERT_NE(nullptr, pgm);
ASSERT_TRUE(pgm != nullptr);
}

// Potential bug
Expand Down Expand Up @@ -91,7 +91,7 @@ TEST(arch, duplicatedDeclarationBug) {
});

pgm = pgm->apply(passes);
ASSERT_EQ(nullptr, pgm);
ASSERT_TRUE(pgm == nullptr);
}

TEST(arch, instantiation) {
Expand Down Expand Up @@ -141,7 +141,7 @@ TEST(arch, instantiation) {
});

pgm = pgm->apply(passes);
ASSERT_NE(nullptr, pgm);
ASSERT_TRUE(pgm != nullptr);
}

TEST(arch, psa_package_with_body) {
Expand Down Expand Up @@ -172,7 +172,7 @@ TEST(arch, psa_package_with_body) {
new TypeChecking(&refMap, &typeMap)
});
pgm = pgm->apply(passes);
ASSERT_EQ(nullptr, pgm);
ASSERT_TRUE(pgm == nullptr);
}

TEST(arch, psa_control_in_control) {
Expand Down Expand Up @@ -208,7 +208,7 @@ TEST(arch, psa_control_in_control) {
new TypeChecking(&refMap, &typeMap)
});
pgm = pgm->apply(passes);
ASSERT_NE(nullptr, pgm);
ASSERT_TRUE(pgm != nullptr);
}

TEST(arch, psa_clone_as_param_to_package) {
Expand All @@ -233,7 +233,7 @@ TEST(arch, psa_clone_as_param_to_package) {
new TypeChecking(&refMap, &typeMap)
});
pgm = pgm->apply(passes);
ASSERT_NE(nullptr, pgm);
ASSERT_TRUE(pgm != nullptr);
}

TEST(arch, psa_clone_as_param_to_control) {
Expand Down Expand Up @@ -268,7 +268,7 @@ TEST(arch, psa_clone_as_param_to_control) {
new TypeChecking(&refMap, &typeMap)
});
pgm = pgm->apply(passes);
ASSERT_NE(nullptr, pgm);
ASSERT_TRUE(pgm != nullptr);
}

TEST(arch, psa_clone_as_param_to_extern) {
Expand Down Expand Up @@ -311,7 +311,7 @@ TEST(arch, psa_clone_as_param_to_extern) {
new TypeChecking(&refMap, &typeMap)
});
pgm = pgm->apply(passes);
ASSERT_NE(nullptr, pgm);
ASSERT_TRUE(pgm != nullptr);
}

TEST(arch, clone_as_extern_method) {
Expand Down Expand Up @@ -343,6 +343,6 @@ TEST(arch, clone_as_extern_method) {
new TypeChecking(&refMap, &typeMap)
});
pgm = pgm->apply(passes);
ASSERT_NE(nullptr, pgm);
ASSERT_TRUE(pgm != nullptr);
}

12 changes: 6 additions & 6 deletions test/gtest/midend_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ TEST(midend, convertEnums_pass) {
control m() { C(E.A) ctr; apply{} }
)");
const IR::P4Program* pgm = parse_string(program);
ASSERT_NE(nullptr, pgm);
ASSERT_TRUE(pgm != nullptr);

// Example to enable logging in source
// Log::addDebugSpec("convertEnums:0");
Expand All @@ -56,7 +56,7 @@ TEST(midend, convertEnums_pass) {
convertEnums
};
pgm = pgm->apply(passes);
ASSERT_NE(nullptr, pgm);
ASSERT_TRUE(pgm != nullptr);
}

TEST(midend, convertEnums_used_before_declare) {
Expand All @@ -65,7 +65,7 @@ TEST(midend, convertEnums_used_before_declare) {
enum E { A, B, C, D };
)");
const IR::P4Program* pgm = parse_string(program);
ASSERT_NE(nullptr, pgm);
ASSERT_TRUE(pgm != nullptr);

ReferenceMap refMap;
TypeMap typeMap;
Expand All @@ -75,7 +75,7 @@ TEST(midend, convertEnums_used_before_declare) {
};
auto result = pgm->apply(passes);
// use enum before declaration should fail
ASSERT_EQ(nullptr, result);
ASSERT_TRUE(result == nullptr);
}

// use enumMap in convertEnums directly
Expand All @@ -85,7 +85,7 @@ TEST(midend, getEnumMapping) {
const bool a = E.A == E.B;
)");
const IR::P4Program* pgm = parse_string(program);
ASSERT_NE(nullptr, pgm);
ASSERT_TRUE(pgm != nullptr);

ReferenceMap refMap;
TypeMap typeMap;
Expand All @@ -95,7 +95,7 @@ TEST(midend, getEnumMapping) {
convertEnums
};
auto result = pgm->apply(passes_);
ASSERT_NE(nullptr, result);
ASSERT_TRUE(result != nullptr);

enumMap = convertEnums->getEnumMapping();
ASSERT_EQ(enumMap.size(), (unsigned long)1);
Expand Down