1
0
mirror of https://github.com/mfontanini/libtins synced 2026-01-28 04:34:27 +01:00

Add missing operators to address classes (#275)

* * add or-operator and a simlple unit test for hw_address, ip_address, ipv6_address
* add not-operator and a simlple unit test for hw_address, ip_address, ipv6_address
* add greater-then-operator and a simlple unit test for ipv6_address
* add new constructor and a simlple unit test for network_interface, which use a ipv6_address to find the nic
* add override the function gateway_from_ip for ipv6_address parameter (untested)

* change the ipv6_address in NotMaskAdress_Test, so that the expceted addresses are valid for the winsock api

* Delete CMakeLists.txt.user

* * add  <=, >, >= operator for HWAddress with tests

* add  <=, >, >= operator for IPv4Address with tests
* add  <=,>= operator for IPv6Address with tests

* refactoring the  & , |, ~ operator of ipv6_address to "regular" operator
This commit is contained in:
stubbfel
2018-03-29 05:44:28 +02:00
committed by Matias Fontanini
parent 7848e28b62
commit 342e2c77a7
14 changed files with 371 additions and 7 deletions

View File

@@ -47,8 +47,19 @@ TEST(IPAddressTest, LessThanOperator) {
EXPECT_LT(addr1, "192.168.1.2");
EXPECT_LT(addr1, "192.168.0.226");
EXPECT_LT(addr1, "193.0.0.0");
EXPECT_LE(addr1, addr2);
}
TEST(IPAddressTest, GreaterThanOperator) {
IPv4Address addr1(ip_string), addr2(ip_string);
EXPECT_FALSE(addr1 < addr2);
EXPECT_GT(addr1, "192.167.1.2");
EXPECT_GT(addr1, "192.167.0.226");
EXPECT_GT(addr1, "191.0.0.0");
EXPECT_GE(addr1, addr2);
}
TEST(IPAddressTest, IsPrivate) {
EXPECT_TRUE(IPv4Address("192.168.0.1").is_private());
EXPECT_TRUE(IPv4Address("192.168.133.7").is_private());
@@ -112,6 +123,26 @@ TEST(IPAddressTest, Mask) {
);
}
TEST(IPAddressTest, OrMask) {
EXPECT_EQ(
IPv4Address("255.255.255.1"),
IPv4Address("192.168.100.1") | IPv4Address("255.255.255.0")
);
EXPECT_EQ(
IPv4Address("255.255.1.2"),
IPv4Address("192.255.1.2") | IPv4Address("255.128.0.0")
);
}
TEST(IPAddressTest, NotMask) {
EXPECT_EQ(
IPv4Address("0.0.0.255"), ~IPv4Address("255.255.255.0")
);
EXPECT_EQ(
IPv4Address("0.127.255.255"),~IPv4Address("255.128.0.0")
);
}
TEST(IPv4AddressTest, Size) {
EXPECT_EQ(4UL, IPv4Address("127.0.0.1").size());
EXPECT_EQ(4UL, IPv4Address().size());