diff --git a/tests/src/dns.cpp b/tests/src/dns.cpp index 14c3533..63a0946 100644 --- a/tests/src/dns.cpp +++ b/tests/src/dns.cpp @@ -318,7 +318,7 @@ TEST_F(DNSTest, Authority) { ASSERT_EQ(dns.authority_count(), 2); DNS::resources_type resources = dns.authority(); - EXPECT_EQ(2, resources.size()); + EXPECT_EQ(2ULL, resources.size()); for(DNS::resources_type::const_iterator it = resources.begin(); it != resources.end(); ++it) { EXPECT_EQ("www.example.com", it->dname()); EXPECT_EQ(it->type(), DNS::CNAME); @@ -429,7 +429,7 @@ TEST_F(DNSTest, ItAintGonnaCorrupt) { // Check authority records resources = dns.authority(); - EXPECT_EQ(1, resources.size()); + EXPECT_EQ(1ULL, resources.size()); for(DNS::resources_type::const_iterator it = resources.begin(); it != resources.end(); ++it) { EXPECT_EQ("www.example.com", it->dname()); EXPECT_EQ(it->type(), DNS::CNAME); @@ -441,7 +441,7 @@ TEST_F(DNSTest, ItAintGonnaCorrupt) { // Check additional records resources = dns.additional(); - EXPECT_EQ(1, resources.size()); + EXPECT_EQ(1ULL, resources.size()); for(DNS::resources_type::const_iterator it = resources.begin(); it != resources.end(); ++it) { EXPECT_EQ("www.example.com", it->dname()); EXPECT_EQ(it->type(), DNS::CNAME); diff --git a/tests/src/icmp.cpp b/tests/src/icmp.cpp index 1cdacd4..9613532 100644 --- a/tests/src/icmp.cpp +++ b/tests/src/icmp.cpp @@ -140,19 +140,19 @@ TEST_F(ICMPTest, Pointer) { TEST_F(ICMPTest, OriginalTimestamp) { ICMP icmp; icmp.original_timestamp(0x1f8172da); - EXPECT_EQ(0x1f8172da, icmp.original_timestamp()); + EXPECT_EQ(0x1f8172daU, icmp.original_timestamp()); } TEST_F(ICMPTest, ReceiveTimestamp) { ICMP icmp; icmp.receive_timestamp(0x1f8172da); - EXPECT_EQ(0x1f8172da, icmp.receive_timestamp()); + EXPECT_EQ(0x1f8172daU, icmp.receive_timestamp()); } TEST_F(ICMPTest, TransmitTimestamp) { ICMP icmp; icmp.transmit_timestamp(0x1f8172da); - EXPECT_EQ(0x1f8172da, icmp.transmit_timestamp()); + EXPECT_EQ(0x1f8172daU, icmp.transmit_timestamp()); } TEST_F(ICMPTest, AddressMask) { diff --git a/tests/src/icmpv6.cpp b/tests/src/icmpv6.cpp index 0f0a1b3..bbf3c18 100644 --- a/tests/src/icmpv6.cpp +++ b/tests/src/icmpv6.cpp @@ -240,7 +240,7 @@ TEST_F(ICMPv6Test, ShortcutLimit) { ICMPv6::shortcut_limit_type sl = icmp.shortcut_limit(); EXPECT_EQ(123, sl.limit); EXPECT_EQ(0x7f, sl.reserved1); - EXPECT_EQ(0x12345678, sl.reserved2); + EXPECT_EQ(0x12345678U, sl.reserved2); } TEST_F(ICMPv6Test, NewAdvertisementInterval) { diff --git a/tests/src/ip.cpp b/tests/src/ip.cpp index a608895..4f95cc7 100644 --- a/tests/src/ip.cpp +++ b/tests/src/ip.cpp @@ -504,7 +504,7 @@ TEST_F(IPTest, TotalLengthZeroPacket) { EthernetII pkt(tot_len_zero_packet, sizeof(tot_len_zero_packet)); ASSERT_TRUE(pkt.find_pdu() != NULL); ASSERT_TRUE(pkt.find_pdu() != NULL); - EXPECT_EQ(8192, pkt.rfind_pdu().payload_size()); + EXPECT_EQ(8192U, pkt.rfind_pdu().payload_size()); } TEST_F(IPTest, TOS) { diff --git a/tests/src/ip_reassembler.cpp b/tests/src/ip_reassembler.cpp index 9b41e00..c661427 100644 --- a/tests/src/ip_reassembler.cpp +++ b/tests/src/ip_reassembler.cpp @@ -53,7 +53,7 @@ void IPv4ReassemblerTest::test_packets(const std::vector() != NULL); RawPDU *raw = eth.find_pdu(); ASSERT_TRUE(raw != NULL); - ASSERT_EQ(15000, raw->payload().size()); + ASSERT_EQ(15000ULL, raw->payload().size()); } else if(status == IPv4Reassembler::FRAGMENTED) EXPECT_NE(vt.size() - 1, i); diff --git a/tests/src/ipsec.cpp b/tests/src/ipsec.cpp index 85b2fd0..f148b94 100644 --- a/tests/src/ipsec.cpp +++ b/tests/src/ipsec.cpp @@ -65,9 +65,9 @@ TEST_F(IPSecAHTest, DefaultConstructor) { IPSecAH ipsec; EXPECT_EQ(0, ipsec.next_header()); EXPECT_EQ(2, ipsec.length()); - EXPECT_EQ(0, ipsec.spi()); - EXPECT_EQ(0, ipsec.seq_number()); - EXPECT_EQ(4, ipsec.icv().size()); + EXPECT_EQ(0U, ipsec.spi()); + EXPECT_EQ(0U, ipsec.seq_number()); + EXPECT_EQ(4U, ipsec.icv().size()); } TEST_F(IPSecAHTest, EthPacket) { @@ -82,9 +82,9 @@ TEST_F(IPSecAHTest, ConstructorFromBuffer) { const char *icv_ptr = "\x27\xcf\xc0\xa5\xe4\x3d\x69\xb3\x72\x8e\xc5\xb0"; EXPECT_EQ(0x32, ipsec.next_header()); EXPECT_EQ(4, ipsec.length()); - EXPECT_EQ(0x8179b705, ipsec.spi()); - EXPECT_EQ(1, ipsec.seq_number()); - ASSERT_EQ(12, ipsec.icv().size()); + EXPECT_EQ(0x8179b705U, ipsec.spi()); + EXPECT_EQ(1U, ipsec.seq_number()); + ASSERT_EQ(12ULL, ipsec.icv().size()); EXPECT_EQ(ipsec.icv(), byte_array(icv_ptr, icv_ptr + 12)); EXPECT_TRUE(ipsec.find_pdu() != NULL); EXPECT_TRUE(ipsec.find_pdu() != NULL); @@ -113,13 +113,13 @@ TEST_F(IPSecAHTest, Length) { TEST_F(IPSecAHTest, SPI) { IPSecAH ipsec; ipsec.spi(0x73a625fa); - EXPECT_EQ(0x73a625fa, ipsec.spi()); + EXPECT_EQ(0x73a625faU, ipsec.spi()); } TEST_F(IPSecAHTest, SeqNumber) { IPSecAH ipsec; ipsec.seq_number(0x73a625fa); - EXPECT_EQ(0x73a625fa, ipsec.seq_number()); + EXPECT_EQ(0x73a625faU, ipsec.seq_number()); } TEST_F(IPSecAHTest, ICV) { @@ -139,27 +139,27 @@ TEST_F(IPSecAHTest, ICV) { TEST_F(IPSecESPTest, DefaultConstructor) { IPSecESP ipsec; - EXPECT_EQ(0, ipsec.spi()); - EXPECT_EQ(0, ipsec.seq_number()); + EXPECT_EQ(0U, ipsec.spi()); + EXPECT_EQ(0U, ipsec.seq_number()); } TEST_F(IPSecESPTest, ConstructorFromBuffer) { IPSecESP ipsec(expected_packet, sizeof(expected_packet)); - EXPECT_EQ(0x48dac2e4, ipsec.spi()); - EXPECT_EQ(1, ipsec.seq_number()); + EXPECT_EQ(0x48dac2e4U, ipsec.spi()); + EXPECT_EQ(1U, ipsec.seq_number()); EXPECT_TRUE(ipsec.find_pdu() != NULL); } TEST_F(IPSecESPTest, SPI) { IPSecESP ipsec; ipsec.spi(0x73a625fa); - EXPECT_EQ(0x73a625fa, ipsec.spi()); + EXPECT_EQ(0x73a625faU, ipsec.spi()); } TEST_F(IPSecESPTest, SeqNumber) { IPSecESP ipsec; ipsec.seq_number(0x73a625fa); - EXPECT_EQ(0x73a625fa, ipsec.seq_number()); + EXPECT_EQ(0x73a625faU, ipsec.seq_number()); } TEST_F(IPSecESPTest, Serialize) { diff --git a/tests/src/pppoe.cpp b/tests/src/pppoe.cpp index a2679cb..44efb65 100644 --- a/tests/src/pppoe.cpp +++ b/tests/src/pppoe.cpp @@ -53,7 +53,7 @@ TEST_F(PPPoETest, ConstructorFromSessionBuffer) { const RawPDU* raw = pdu.find_pdu(); ASSERT_TRUE(raw != NULL); - EXPECT_EQ(21, raw->payload_size()); + EXPECT_EQ(21U, raw->payload_size()); } TEST_F(PPPoETest, ConstructorFromFullSessionBuffer) { @@ -68,7 +68,7 @@ TEST_F(PPPoETest, ConstructorFromFullSessionBuffer) { const RawPDU* raw = pdu.find_pdu(); ASSERT_TRUE(raw != NULL); - EXPECT_EQ(21, raw->payload_size()); + EXPECT_EQ(21U, raw->payload_size()); } TEST_F(PPPoETest, ConstructorFromBuffer) { diff --git a/tests/src/radiotap.cpp b/tests/src/radiotap.cpp index 7e82bc4..ec2453c 100644 --- a/tests/src/radiotap.cpp +++ b/tests/src/radiotap.cpp @@ -283,7 +283,7 @@ TEST_F(RadioTapTest, ConstructorFromBuffer4) { EXPECT_TRUE((radio.present() & RadioTap::RX_FLAGS) != 0); EXPECT_TRUE((radio.present() & RadioTap::MCS) != 0); - EXPECT_EQ(2076020709598, radio.tsft()); + EXPECT_EQ(2076020709598ULL, radio.tsft()); EXPECT_EQ(0, radio.rx_flags()); EXPECT_EQ(0, radio.antenna()); EXPECT_EQ(-70, radio.dbm_signal()); diff --git a/tests/src/wpa2_decrypt.cpp b/tests/src/wpa2_decrypt.cpp index ef80e1e..f11d872 100644 --- a/tests/src/wpa2_decrypt.cpp +++ b/tests/src/wpa2_decrypt.cpp @@ -139,7 +139,7 @@ TEST_F(WPA2DecryptTest, DecryptCCMPUsingKey) { ASSERT_FALSE(decrypter.decrypt(radio)); } const Crypto::WPA2Decrypter::keys_map& keys = decrypter.get_keys(); - ASSERT_EQ(1, keys.size()); + ASSERT_EQ(1ULL, keys.size()); addresses = keys.begin()->first; session_keys = keys.begin()->second; } @@ -204,7 +204,7 @@ TEST_F(WPA2DecryptTest, DecryptTKIPUsingKey) { ASSERT_FALSE(decrypter.decrypt(radio)); } const Crypto::WPA2Decrypter::keys_map& keys = decrypter.get_keys(); - ASSERT_EQ(1, keys.size()); + ASSERT_EQ(1ULL, keys.size()); addresses = keys.begin()->first; session_keys = keys.begin()->second; }