diff options
author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2016-02-16 22:57:25 +0200 |
---|---|---|
committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2016-02-16 23:30:26 +0200 |
commit | 44ec2ad0ee644322d433d16875301a1398fb4253 (patch) | |
tree | 5af12243e456fa2fc8996ef2cde2c997577380fa /test | |
parent | 1efc299e6692e2ba2bf913bd52de4fec38705c55 (diff) | |
download | qtlocation-mapboxgl-44ec2ad0ee644322d433d16875301a1398fb4253.tar.gz |
[tests] Fix compilation error in test/storage/headers.cpp
error: converting ‘false’ to pointer type for argument 1 of ‘char
testing::internal::IsNullLiteralHelper(testing::internal::Secret*)’
[-Werror=conversion-null]
Diffstat (limited to 'test')
-rw-r--r-- | test/storage/headers.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/test/storage/headers.cpp b/test/storage/headers.cpp index a0b6ecd546..2ec409e8e0 100644 --- a/test/storage/headers.cpp +++ b/test/storage/headers.cpp @@ -10,62 +10,62 @@ TEST_F(Storage, HTTPHeaderParsing) { cc = http::CacheControl::parse(R"#()#"); ASSERT_FALSE(bool(cc.maxAge)); - EXPECT_EQ(false, cc.mustRevalidate); + EXPECT_FALSE(cc.mustRevalidate); cc = http::CacheControl::parse(R"#(max-age =34)#"); ASSERT_TRUE(bool(cc.maxAge)); EXPECT_EQ(34, *cc.maxAge); - EXPECT_EQ(false, cc.mustRevalidate); + EXPECT_FALSE(cc.mustRevalidate); cc = http::CacheControl::parse(R"#(,max-age=1)#"); ASSERT_TRUE(bool(cc.maxAge)); EXPECT_EQ(1, *cc.maxAge); - EXPECT_EQ(false, cc.mustRevalidate); + EXPECT_FALSE(cc.mustRevalidate); cc = http::CacheControl::parse(R"#(max-age=-1)#"); ASSERT_FALSE(bool(cc.maxAge)); - EXPECT_EQ(false, cc.mustRevalidate); + EXPECT_FALSE(cc.mustRevalidate); cc = http::CacheControl::parse(R"#(max-age=foo)#"); ASSERT_FALSE(bool(cc.maxAge)); - EXPECT_EQ(false, cc.mustRevalidate); + EXPECT_FALSE(cc.mustRevalidate); cc = http::CacheControl::parse(R"#(max-age="34,max-age="22,max-age=28)#"); ASSERT_TRUE(bool(cc.maxAge)); EXPECT_EQ(28, *cc.maxAge); - EXPECT_EQ(false, cc.mustRevalidate); + EXPECT_FALSE(cc.mustRevalidate); cc = http::CacheControl::parse(R"#(max-age=3,max-age="34)#"); ASSERT_TRUE(bool(cc.maxAge)); EXPECT_EQ(3, *cc.maxAge); - EXPECT_EQ(false, cc.mustRevalidate); + EXPECT_FALSE(cc.mustRevalidate); cc = http::CacheControl::parse(R"#(max-age="\",max-age=4,")#"); ASSERT_FALSE(bool(cc.maxAge)); - EXPECT_EQ(false, cc.mustRevalidate); + EXPECT_FALSE(cc.mustRevalidate); cc = http::CacheControl::parse(R"#(private, max-age=0, no-cache)#"); ASSERT_TRUE(bool(cc.maxAge)); EXPECT_EQ(0, *cc.maxAge); - EXPECT_EQ(false, cc.mustRevalidate); + EXPECT_FALSE(cc.mustRevalidate); cc = http::CacheControl::parse(R"#(max-age=0, no-cache, no-store)#"); ASSERT_TRUE(bool(cc.maxAge)); EXPECT_EQ(0, *cc.maxAge); - EXPECT_EQ(false, cc.mustRevalidate); + EXPECT_FALSE(cc.mustRevalidate); cc = http::CacheControl::parse(R"#(, private , max-bar=3 , no-cache, "\,",,foo=",",,max-age=32)#"); ASSERT_TRUE(bool(cc.maxAge)); EXPECT_EQ(32, *cc.maxAge); - EXPECT_EQ(false, cc.mustRevalidate); + EXPECT_FALSE(cc.mustRevalidate); cc = http::CacheControl::parse(R"#(max-age=3600, must-revalidate)#"); ASSERT_TRUE(bool(cc.maxAge)); EXPECT_EQ(3600, *cc.maxAge); - EXPECT_EQ(true, cc.mustRevalidate); + EXPECT_TRUE(cc.mustRevalidate); cc = http::CacheControl::parse(R"#(no-cache="Expires,Via",max-age=3600, must-revalidate)#"); ASSERT_TRUE(bool(cc.maxAge)); EXPECT_EQ(3600, *cc.maxAge); - EXPECT_EQ(true, cc.mustRevalidate); + EXPECT_TRUE(cc.mustRevalidate); } |