[svn] commit: r2198 - in /branches/trac221/src/bin/auth/tests: asio_link_unittest.cc auth_srv_unittest.cc

[BIND 10 source code commits]

Author: jinmei
Date: Mon Jun 21 22:58:08 2010
New Revision: 2198

Log:
checkpoint: introduced endpoint wrappers.

Modified:
    branches/trac221/src/bin/auth/tests/asio_link_unittest.cc
    branches/trac221/src/bin/auth/tests/auth_srv_unittest.cc

Modified: branches/trac221/src/bin/auth/tests/asio_link_unittest.cc
==============================================================================
--- branches/trac221/src/bin/auth/tests/asio_link_unittest.cc (original)
+++ branches/trac221/src/bin/auth/tests/asio_link_unittest.cc Mon Jun 21 22:58:08 2010
@@ -59,6 +59,34 @@
     EXPECT_THROW(IOAddress("2001:db8:::1234"), IOError);
 }
 
+TEST(IOEndpointTest, createFromAddress) {
+    const IOEndpoint* ep;
+    ep = IOEndpoint::createFromAddress(IPPROTO_UDP, IOAddress("192.0.2.1"),
+                                       5300);
+    EXPECT_EQ("192.0.2.1", ep->getAddress().toText());
+    delete ep;
+
+    ep = IOEndpoint::createFromAddress(IPPROTO_TCP, IOAddress("192.0.2.1"),
+                                       5300);
+    EXPECT_EQ("192.0.2.1", ep->getAddress().toText());
+    delete ep;
+
+    ep = IOEndpoint::createFromAddress(IPPROTO_UDP,
+                                       IOAddress("2001:db8::1234"), 5300);
+    EXPECT_EQ("2001:db8::1234", ep->getAddress().toText());
+    delete ep;
+
+    ep = IOEndpoint::createFromAddress(IPPROTO_TCP,
+                                       IOAddress("2001:db8::1234"), 5300);
+    EXPECT_EQ("2001:db8::1234", ep->getAddress().toText());
+    delete ep;
+
+    EXPECT_THROW(IOEndpoint::createFromAddress(IPPROTO_IP,
+                                               IOAddress("192.0.2.1"),
+                                               5300)->getAddress().toText(),
+                 IOError);
+}
+
 TEST(IOSocketTest, dummySockets) {
     EXPECT_EQ(IPPROTO_UDP, IOSocket::getDummyUDPSocket().getProtocol());
     EXPECT_EQ(IPPROTO_TCP, IOSocket::getDummyTCPSocket().getProtocol());
@@ -131,7 +159,8 @@
     void callBack(const IOMessage& io_message) {
         callback_protocol_ = io_message.getSocket().getProtocol();
         callback_native_ = io_message.getSocket().getNative();
-        callback_address_ = io_message.getRemoteAddress().toText();
+        callback_address_ =
+            io_message.getRemoteEndpoint().getAddress().toText();
         callback_data_.assign(
             static_cast<const uint8_t*>(io_message.getData()),
             static_cast<const uint8_t*>(io_message.getData()) +

Modified: branches/trac221/src/bin/auth/tests/auth_srv_unittest.cc
==============================================================================
--- branches/trac221/src/bin/auth/tests/auth_srv_unittest.cc (original)
+++ branches/trac221/src/bin/auth/tests/auth_srv_unittest.cc Mon Jun 21 22:58:08 2010
@@ -50,12 +50,13 @@
                     parse_message(Message::PARSE), default_qid(0x1035),
                     opcode(Opcode(Opcode::QUERY())), qname("www.example.com"),
                     qclass(RRClass::IN()), qtype(RRType::A()),
-                    io_message(NULL), request_obuffer(0),
+                    io_message(NULL), endpoint(NULL), request_obuffer(0),
                     request_renderer(request_obuffer),
                     response_obuffer(0), response_renderer(response_obuffer)
     {}
     ~AuthSrvTest() {
         delete io_message;
+        delete endpoint;
     }
     AuthSrv server;
     Message request_message;
@@ -65,7 +66,8 @@
     const Name qname;
     const RRClass qclass;
     const RRType qtype;
-    IOMessage *io_message;
+    IOMessage* io_message;
+    const IOEndpoint* endpoint;
     OutputBuffer request_obuffer;
     MessageRenderer request_renderer;
     OutputBuffer response_obuffer;
@@ -91,9 +93,13 @@
     delete io_message;
     data.clear();
 
+    delete endpoint;
+    endpoint = IOEndpoint::createFromAddress(IPPROTO_UDP,
+                                             IOAddress("192.0.2.1"),
+                                             5300);
     UnitTestUtil::readWireData(datafile, data);
     io_message = new IOMessage(&data[0], data.size(),
-                               IOSocket::getDummyUDPSocket(), "192.0.2.1");
+                               IOSocket::getDummyUDPSocket(), *endpoint);
 }
 
 void