From bc235d96505305036d5dc63d445740d32569f88d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Thu, 10 Feb 2011 18:45:15 +0000 Subject: [PATCH] * The test should now actually work, however, it welcomes KDL for now. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@40424 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../net/libnetapi/NetworkInterfaceTest.cpp | 89 ++++++++++--------- .../kits/net/libnetapi/NetworkInterfaceTest.h | 8 ++ 2 files changed, 54 insertions(+), 43 deletions(-) diff --git a/src/tests/kits/net/libnetapi/NetworkInterfaceTest.cpp b/src/tests/kits/net/libnetapi/NetworkInterfaceTest.cpp index 0b9f63671b..96727e2b33 100644 --- a/src/tests/kits/net/libnetapi/NetworkInterfaceTest.cpp +++ b/src/tests/kits/net/libnetapi/NetworkInterfaceTest.cpp @@ -23,6 +23,24 @@ NetworkInterfaceTest::~NetworkInterfaceTest() } +void +NetworkInterfaceTest::setUp() +{ + fInterface.SetTo("loopTest"); + CPPUNIT_ASSERT(BNetworkRoster::Default().AddInterface(fInterface) == B_OK); + CPPUNIT_ASSERT(fInterface.CountAddresses() == 0); + // every interface has one unspec address +} + + +void +NetworkInterfaceTest::tearDown() +{ + CPPUNIT_ASSERT(BNetworkRoster::Default().RemoveInterface(fInterface) + == B_OK); +} + + void NetworkInterfaceTest::TestUnset() { @@ -35,84 +53,69 @@ NetworkInterfaceTest::TestUnset() void NetworkInterfaceTest::TestFindAddress() { - BNetworkInterface interface("testInterface"); - CPPUNIT_ASSERT(BNetworkRoster::Default().AddInterface(interface) == B_OK); - CPPUNIT_ASSERT(interface.CountAddresses() == 0); - // Add first BNetworkInterfaceAddress first; first.SetAddress(BNetworkAddress(AF_INET, "8.8.8.8")); - CPPUNIT_ASSERT(interface.FindAddress(first.Address()) < 0); - CPPUNIT_ASSERT(interface.AddAddress(first) == B_OK); - CPPUNIT_ASSERT(interface.FindAddress(first.Address()) == 0); + CPPUNIT_ASSERT(fInterface.FindAddress(first.Address()) < 0); + CPPUNIT_ASSERT(fInterface.AddAddress(first) == B_OK); + CPPUNIT_ASSERT(fInterface.FindAddress(first.Address()) == 0); // Add second BNetworkInterfaceAddress second; second.SetAddress(BNetworkAddress(AF_INET6, "::1")); - - CPPUNIT_ASSERT(interface.FindAddress(second.Address()) < 0); - CPPUNIT_ASSERT(interface.AddAddress(second) == B_OK); - CPPUNIT_ASSERT(interface.FindAddress(second.Address()) >= 0); + CPPUNIT_ASSERT(fInterface.FindAddress(second.Address()) < 0); + CPPUNIT_ASSERT(fInterface.AddAddress(second) == B_OK); + CPPUNIT_ASSERT(fInterface.FindAddress(second.Address()) >= 0); // Remove them again - CPPUNIT_ASSERT(interface.RemoveAddress(first) == B_OK); - CPPUNIT_ASSERT(interface.FindAddress(first.Address()) < 0); - CPPUNIT_ASSERT(interface.FindAddress(second.Address()) >= 0); + CPPUNIT_ASSERT(fInterface.RemoveAddress(first) == B_OK); + CPPUNIT_ASSERT(fInterface.FindAddress(first.Address()) < 0); + CPPUNIT_ASSERT(fInterface.FindAddress(second.Address()) >= 0); - CPPUNIT_ASSERT(interface.RemoveAddress(second.Address()) == B_OK); - CPPUNIT_ASSERT(interface.FindAddress(first.Address()) < 0); - CPPUNIT_ASSERT(interface.FindAddress(second.Address()) < 0); - - CPPUNIT_ASSERT(BNetworkRoster::Default().RemoveInterface(interface) - == B_OK); + CPPUNIT_ASSERT(fInterface.RemoveAddress(second.Address()) == B_OK); + CPPUNIT_ASSERT(fInterface.FindAddress(first.Address()) < 0); + CPPUNIT_ASSERT(fInterface.FindAddress(second.Address()) < 0); } void NetworkInterfaceTest::TestFindFirstAddress() { - BNetworkInterface interface("testInterface"); - CPPUNIT_ASSERT(BNetworkRoster::Default().AddInterface(interface) == B_OK); - CPPUNIT_ASSERT(interface.CountAddresses() == 0); - // Add first BNetworkInterfaceAddress first; first.SetAddress(BNetworkAddress(AF_INET, "8.8.8.8")); - CPPUNIT_ASSERT(interface.FindFirstAddress(AF_INET) < 0); - CPPUNIT_ASSERT(interface.FindFirstAddress(AF_INET6) < 0); - CPPUNIT_ASSERT(interface.AddAddress(first) == B_OK); - CPPUNIT_ASSERT(interface.FindFirstAddress(AF_INET) == 0); - CPPUNIT_ASSERT(interface.FindFirstAddress(AF_INET6) < 0); + CPPUNIT_ASSERT(fInterface.FindFirstAddress(AF_INET) < 0); + CPPUNIT_ASSERT(fInterface.FindFirstAddress(AF_INET6) < 0); + CPPUNIT_ASSERT(fInterface.AddAddress(first) == B_OK); + CPPUNIT_ASSERT(fInterface.FindFirstAddress(AF_INET) == 0); + CPPUNIT_ASSERT(fInterface.FindFirstAddress(AF_INET6) < 0); // Add second BNetworkInterfaceAddress second; second.SetAddress(BNetworkAddress(AF_INET6, "::1")); - CPPUNIT_ASSERT(interface.AddAddress(second) == B_OK); - CPPUNIT_ASSERT(interface.FindFirstAddress(AF_INET) >= 0); - CPPUNIT_ASSERT(interface.FindFirstAddress(AF_INET6) >= 0); - CPPUNIT_ASSERT(interface.FindFirstAddress(AF_INET) - != interface.FindFirstAddress(AF_INET6)); + CPPUNIT_ASSERT(fInterface.AddAddress(second) == B_OK); + CPPUNIT_ASSERT(fInterface.FindFirstAddress(AF_INET) >= 0); + CPPUNIT_ASSERT(fInterface.FindFirstAddress(AF_INET6) >= 0); + CPPUNIT_ASSERT(fInterface.FindFirstAddress(AF_INET) + != fInterface.FindFirstAddress(AF_INET6)); // Remove them again - CPPUNIT_ASSERT(interface.RemoveAddress(first) == B_OK); - CPPUNIT_ASSERT(interface.FindFirstAddress(AF_INET) < 0); - CPPUNIT_ASSERT(interface.FindFirstAddress(AF_INET6) >= 0); + CPPUNIT_ASSERT(fInterface.RemoveAddress(first) == B_OK); + CPPUNIT_ASSERT(fInterface.FindFirstAddress(AF_INET) < 0); + CPPUNIT_ASSERT(fInterface.FindFirstAddress(AF_INET6) >= 0); - CPPUNIT_ASSERT(interface.RemoveAddress(second.Address()) == B_OK); - CPPUNIT_ASSERT(interface.FindFirstAddress(AF_INET) < 0); - CPPUNIT_ASSERT(interface.FindFirstAddress(AF_INET6) < 0); - - CPPUNIT_ASSERT(BNetworkRoster::Default().RemoveInterface(interface) - == B_OK); + CPPUNIT_ASSERT(fInterface.RemoveAddress(second.Address()) == B_OK); + CPPUNIT_ASSERT(fInterface.FindFirstAddress(AF_INET) < 0); + CPPUNIT_ASSERT(fInterface.FindFirstAddress(AF_INET6) < 0); } diff --git a/src/tests/kits/net/libnetapi/NetworkInterfaceTest.h b/src/tests/kits/net/libnetapi/NetworkInterfaceTest.h index 1326c53f16..156a549d3d 100644 --- a/src/tests/kits/net/libnetapi/NetworkInterfaceTest.h +++ b/src/tests/kits/net/libnetapi/NetworkInterfaceTest.h @@ -6,6 +6,8 @@ #define NETWORK_INTERFACE_TEST_H +#include + #include #include @@ -15,11 +17,17 @@ public: NetworkInterfaceTest(); virtual ~NetworkInterfaceTest(); + virtual void setUp(); + virtual void tearDown(); + void TestUnset(); void TestFindAddress(); void TestFindFirstAddress(); static void AddTests(BTestSuite& suite); + +private: + BNetworkInterface fInterface; };