[haiku-commits] r40424 - haiku/trunk/src/tests/kits/net/libnetapi

• From: axeld@xxxxxxxxxxxxxxxx
• To: haiku-commits@xxxxxxxxxxxxx
• Date: Thu, 10 Feb 2011 19:45:15 +0100 (CET)

Author: axeld
Date: 2011-02-10 19:45:15 +0100 (Thu, 10 Feb 2011)
New Revision: 40424
Changeset: http://dev.haiku-os.org/changeset/40424

Modified:
   haiku/trunk/src/tests/kits/net/libnetapi/NetworkInterfaceTest.cpp
   haiku/trunk/src/tests/kits/net/libnetapi/NetworkInterfaceTest.h
Log:
* The test should now actually work, however, it welcomes KDL for now.


Modified: haiku/trunk/src/tests/kits/net/libnetapi/NetworkInterfaceTest.cpp
===================================================================
--- haiku/trunk/src/tests/kits/net/libnetapi/NetworkInterfaceTest.cpp   
2011-02-10 18:40:27 UTC (rev 40423)
+++ haiku/trunk/src/tests/kits/net/libnetapi/NetworkInterfaceTest.cpp   
2011-02-10 18:45:15 UTC (rev 40424)
@@ -24,6 +24,24 @@
 
 
 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()
 {
        BNetworkInterface unset("test");
@@ -35,84 +53,69 @@
 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(fInterface.FindAddress(second.Address()) < 0);
+       CPPUNIT_ASSERT(fInterface.AddAddress(second) == B_OK);
+       CPPUNIT_ASSERT(fInterface.FindAddress(second.Address()) >= 0);
 
-       CPPUNIT_ASSERT(interface.FindAddress(second.Address()) < 0);
-       CPPUNIT_ASSERT(interface.AddAddress(second) == B_OK);
-       CPPUNIT_ASSERT(interface.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);
 }
 
 

Modified: haiku/trunk/src/tests/kits/net/libnetapi/NetworkInterfaceTest.h
===================================================================
--- haiku/trunk/src/tests/kits/net/libnetapi/NetworkInterfaceTest.h     
2011-02-10 18:40:27 UTC (rev 40423)
+++ haiku/trunk/src/tests/kits/net/libnetapi/NetworkInterfaceTest.h     
2011-02-10 18:45:15 UTC (rev 40424)
@@ -6,6 +6,8 @@
 #define NETWORK_INTERFACE_TEST_H
 
 
+#include <NetworkInterface.h>
+
 #include <TestCase.h>
 #include <TestSuite.h>
 
@@ -15,11 +17,17 @@
                                                                
NetworkInterfaceTest();
        virtual                                         ~NetworkInterfaceTest();
 
+       virtual void                            setUp();
+       virtual void                            tearDown();
+
                        void                            TestUnset();
                        void                            TestFindAddress();
                        void                            TestFindFirstAddress();
 
        static  void                            AddTests(BTestSuite& suite);
+
+private:
+                       BNetworkInterface       fInterface;
 };
 
 

Other related posts:

• » [haiku-commits] r40424 - haiku/trunk/src/tests/kits/net/libnetapi - axeld

1. Home
2. haiku-commits
3. Archive
4. 02-2011

---

• » Previous by Date
• » Next by Date
• » Related Posts
• » View list details
• » Manage your subscription

---