Skip to content

Increase consistency w.r.t. tests checking for nullptr. #621

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

Merged
mattklein123 merged 1 commit into from
Mar 24, 2017
Merged

Increase consistency w.r.t. tests checking for nullptr. #621

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
4 changes: 2 additions & 2 deletions test/common/network/cidr_range_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,14 +61,14 @@ TEST(TruncateIpAddressAndLength, Various) {
test_cases.size();
for (const auto& kv : test_cases) {
InstanceConstSharedPtr inPtr = parseInternetAddress(kv.first.first);
EXPECT_TRUE(inPtr != nullptr) << kv.first.first;
EXPECT_NE(inPtr, nullptr) << kv.first.first;
int length_io = kv.first.second;
InstanceConstSharedPtr outPtr = CidrRange::truncateIpAddressAndLength(inPtr, &length_io);
if (kv.second.second == -1) {
EXPECT_EQ(outPtr, nullptr) << outPtr->asString() << "\n" << kv;
EXPECT_EQ(length_io, -1) << kv;
} else {
ASSERT_TRUE(outPtr != nullptr) << kv;
ASSERT_NE(outPtr, nullptr) << kv;
EXPECT_EQ(outPtr->ip()->addressAsString(), kv.second.first) << kv;
EXPECT_EQ(length_io, kv.second.second) << kv;
}
Expand Down
4 changes: 2 additions & 2 deletions test/common/network/utility_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,15 +143,15 @@ TEST(NetworkUtility, loopbackAddress) {
TEST(NetworkUtility, AnyAddress) {
{
Address::InstanceConstSharedPtr any = Utility::getIpv4AnyAddress();
ASSERT_TRUE(any != nullptr);
ASSERT_NE(any, nullptr);
EXPECT_EQ(any->type(), Address::Type::Ip);
EXPECT_EQ(any->ip()->version(), Address::IpVersion::v4);
EXPECT_EQ(any->asString(), "0.0.0.0:0");
EXPECT_EQ(any, Utility::getIpv4AnyAddress());
}
{
Address::InstanceConstSharedPtr any = Utility::getIpv6AnyAddress();
ASSERT_TRUE(any != nullptr);
ASSERT_NE(any, nullptr);
EXPECT_EQ(any->type(), Address::Type::Ip);
EXPECT_EQ(any->ip()->version(), Address::IpVersion::v6);
EXPECT_EQ(any->asString(), "[::]:0");
Expand Down
12 changes: 6 additions & 6 deletions test/common/ssl/context_impl_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ TEST(SslContextImplTest, TestdNSNameMatching) {

TEST(SslContextImplTest, TestVerifySubjectAltNameDNSMatched) {
FILE* fp = fopen("test/common/ssl/test_data/san_dns.crt", "r");
EXPECT_TRUE(fp != nullptr);
EXPECT_NE(fp, nullptr);
X509* cert = PEM_read_X509(fp, nullptr, nullptr, nullptr);
EXPECT_TRUE(cert != nullptr);
EXPECT_NE(cert, nullptr);
std::vector<std::string> verify_subject_alt_name_list = {"foo.com", "test.com"};
EXPECT_TRUE(ContextImpl::verifySubjectAltName(cert, verify_subject_alt_name_list));
X509_free(cert);
Expand All @@ -33,9 +33,9 @@ TEST(SslContextImplTest, TestVerifySubjectAltNameDNSMatched) {

TEST(SslContextImplTest, TestVerifySubjectAltNameURIMatched) {
FILE* fp = fopen("test/common/ssl/test_data/san_uri.crt", "r");
EXPECT_TRUE(fp != nullptr);
EXPECT_NE(fp, nullptr);
X509* cert = PEM_read_X509(fp, nullptr, nullptr, nullptr);
EXPECT_TRUE(cert != nullptr);
EXPECT_NE(cert, nullptr);
std::vector<std::string> verify_subject_alt_name_list = {"istio:account.test.com",
"istio:account2.test.com"};
EXPECT_TRUE(ContextImpl::verifySubjectAltName(cert, verify_subject_alt_name_list));
Expand All @@ -45,9 +45,9 @@ TEST(SslContextImplTest, TestVerifySubjectAltNameURIMatched) {

TEST(SslContextImplTest, TestVerifySubjectAltNameNotMatched) {
FILE* fp = fopen("test/common/ssl/test_data/san_dns.crt", "r");
EXPECT_TRUE(fp != nullptr);
EXPECT_NE(fp, nullptr);
X509* cert = PEM_read_X509(fp, nullptr, nullptr, nullptr);
EXPECT_TRUE(cert != nullptr);
EXPECT_NE(cert, nullptr);
std::vector<std::string> verify_subject_alt_name_list = {"foo", "bar"};
EXPECT_FALSE(ContextImpl::verifySubjectAltName(cert, verify_subject_alt_name_list));
X509_free(cert);
Expand Down