Prevent GTest from flooding us with compiler warnings

GTest has a bunch of undefined macros which causes the compiler to spit
out warnings for each one on each test file. There isn't much we can do,
so we just disable the warning for the testcases. Other warnings like
sign-promo and sign-compare we can avoid by being more explicit about
our expected integer constants being unsigned.

As we are just changing testcases, there is no user visible change which
would deserve to be noted in the changelog.

Gbp-Dch: Ignore
Reported-By: gcc-8

1 files changed, 13 insertions, 13 deletions

diff --git a/test/libapt/uri_test.cc b/test/libapt/uri_test.cc
index 54f4f84f8..519de49ba 100644
--- a/test/libapt/uri_test.cc
+++ b/test/libapt/uri_test.cc
@@ -11,7 +11,7 @@ TEST(URITest, BasicHTTP)
    EXPECT_EQ("http", U.Access);
    EXPECT_EQ("", U.User);
    EXPECT_EQ("", U.Password);
-   EXPECT_EQ(90, U.Port);
+   EXPECT_EQ(90u, U.Port);
    EXPECT_EQ("www.debian.org", U.Host);
    EXPECT_EQ("/temp/test", U.Path);
    EXPECT_EQ("http://www.debian.org:90/temp/test", (std::string)U);
@@ -23,7 +23,7 @@ TEST(URITest, BasicHTTP)
    EXPECT_EQ("http", U.Access);
    EXPECT_EQ("jgg", U.User);
    EXPECT_EQ("foo", U.Password);
-   EXPECT_EQ(0, U.Port);
+   EXPECT_EQ(0u, U.Port);
    EXPECT_EQ("ualberta.ca", U.Host);
    EXPECT_EQ("/blah", U.Path);
    EXPECT_EQ("http://jgg:foo@ualberta.ca/blah", (std::string)U);
@@ -35,7 +35,7 @@ TEST(URITest, BasicHTTP)
    EXPECT_EQ("https", U.Access);
    EXPECT_EQ("apt", U.User);
    EXPECT_EQ("", U.Password);
-   EXPECT_EQ(0, U.Port);
+   EXPECT_EQ(0u, U.Port);
    EXPECT_EQ("example.org", U.Host);
    EXPECT_EQ("/blah", U.Path);
    EXPECT_EQ("https://apt@example.org/blah", (std::string)U);
@@ -49,7 +49,7 @@ TEST(URITest, SingeSlashFile)
    EXPECT_EQ("file", U.Access);
    EXPECT_EQ("", U.User);
    EXPECT_EQ("", U.Password);
-   EXPECT_EQ(0, U.Port);
+   EXPECT_EQ(0u, U.Port);
    EXPECT_EQ("", U.Host);
    EXPECT_EQ("/usr/bin/foo", U.Path);
    EXPECT_EQ("file:/usr/bin/foo", (std::string)U);
@@ -63,7 +63,7 @@ TEST(URITest, BasicCDROM)
    EXPECT_EQ("cdrom", U.Access);
    EXPECT_EQ("", U.User);
    EXPECT_EQ("", U.Password);
-   EXPECT_EQ(0, U.Port);
+   EXPECT_EQ(0u, U.Port);
    EXPECT_EQ("Moo Cow Rom", U.Host);
    EXPECT_EQ("/debian", U.Path);
    EXPECT_EQ("cdrom://Moo Cow Rom/debian", (std::string)U);
@@ -77,7 +77,7 @@ TEST(URITest, RelativeGzip)
    EXPECT_EQ("gzip", U.Access);
    EXPECT_EQ("", U.User);
    EXPECT_EQ("", U.Password);
-   EXPECT_EQ(0, U.Port);
+   EXPECT_EQ(0u, U.Port);
    EXPECT_EQ(".", U.Host);
    EXPECT_EQ("/bar/cow", U.Path);
    EXPECT_EQ("gzip://./bar/cow", (std::string)U);
@@ -91,7 +91,7 @@ TEST(URITest, NoSlashFTP)
    EXPECT_EQ("ftp", U.Access);
    EXPECT_EQ("", U.User);
    EXPECT_EQ("", U.Password);
-   EXPECT_EQ(0, U.Port);
+   EXPECT_EQ(0u, U.Port);
    EXPECT_EQ("ftp.fr.debian.org", U.Host);
    EXPECT_EQ("/debian/pool/main/x/xtel/xtel_3.2.1-15_i386.deb", U.Path);
    EXPECT_EQ("ftp://ftp.fr.debian.org/debian/pool/main/x/xtel/xtel_3.2.1-15_i386.deb", (std::string)U);
@@ -105,7 +105,7 @@ TEST(URITest, RFC2732)
    EXPECT_EQ("http", U.Access);
    EXPECT_EQ("", U.User);
    EXPECT_EQ("", U.Password);
-   EXPECT_EQ(0, U.Port);
+   EXPECT_EQ(0u, U.Port);
    EXPECT_EQ("1080::8:800:200C:417A", U.Host);
    EXPECT_EQ("/foo", U.Path);
    EXPECT_EQ("http://[1080::8:800:200C:417A]/foo", (std::string)U);
@@ -117,7 +117,7 @@ TEST(URITest, RFC2732)
    EXPECT_EQ("http", U.Access);
    EXPECT_EQ("", U.User);
    EXPECT_EQ("", U.Password);
-   EXPECT_EQ(80, U.Port);
+   EXPECT_EQ(80u, U.Port);
    EXPECT_EQ("::FFFF:129.144.52.38", U.Host);
    EXPECT_EQ("/index.html", U.Path);
    EXPECT_EQ("http://[::FFFF:129.144.52.38]:80/index.html", (std::string)U);
@@ -129,7 +129,7 @@ TEST(URITest, RFC2732)
    EXPECT_EQ("http", U.Access);
    EXPECT_EQ("", U.User);
    EXPECT_EQ("", U.Password);
-   EXPECT_EQ(80, U.Port);
+   EXPECT_EQ(80u, U.Port);
    EXPECT_EQ("::FFFF:129.144.52.38:", U.Host);
    EXPECT_EQ("/index.html", U.Path);
    EXPECT_EQ("http://[::FFFF:129.144.52.38:]:80/index.html", (std::string)U);
@@ -141,7 +141,7 @@ TEST(URITest, RFC2732)
    EXPECT_EQ("http", U.Access);
    EXPECT_EQ("", U.User);
    EXPECT_EQ("", U.Password);
-   EXPECT_EQ(0, U.Port);
+   EXPECT_EQ(0u, U.Port);
    EXPECT_EQ("::FFFF:129.144.52.38:", U.Host);
    EXPECT_EQ("/index.html", U.Path);
    EXPECT_EQ("http://[::FFFF:129.144.52.38:]/index.html", (std::string)U);
@@ -154,7 +154,7 @@ TEST(URITest, RFC2732)
    EXPECT_EQ("cdrom", U.Access);
    EXPECT_EQ("", U.User);
    EXPECT_EQ("", U.Password);
-   EXPECT_EQ(0, U.Port);
+   EXPECT_EQ(0u, U.Port);
    EXPECT_EQ("The Debian 1.2 disk, 1/2 R1:6", U.Host);
    EXPECT_EQ("/debian/", U.Path);
    EXPECT_EQ("cdrom://[The Debian 1.2 disk, 1/2 R1:6]/debian/", (std::string)U);
@@ -166,7 +166,7 @@ TEST(URITest, RFC2732)
    EXPECT_EQ("cdrom", U.Access);
    EXPECT_EQ("", U.User);
    EXPECT_EQ("", U.Password);
-   EXPECT_EQ(0, U.Port);
+   EXPECT_EQ(0u, U.Port);
    EXPECT_EQ("Foo Bar Cow", U.Host);
    EXPECT_EQ("/debian/", U.Path);
    EXPECT_EQ("cdrom://Foo Bar Cow/debian/", (std::string)U);