Changeset 1329:361ff71dbc44

Timestamp:

09/03/09 06:07:48 (2 years ago)

Author:

niam

Branch:

default

Children:

1330:112784adfac8, 1345:b24305dd9edb

Message:

adjusted io::network::client test

Location:

trunk/tests

Files:

• ionetworkclient_test/test.cc (modified) (1 diff)
• ionetworksslclient_test/test.cc (modified) (1 diff)

trunk/tests/ionetworkclient_test/test.cc

@@ -18 +18 @@
         try
         {
-                try
-                {
-                        client c(connection::PROTOCOL_FAMILY_IPV4, connection::TRANSFER_STREAM);
-                        exchange ex;
-                        dodoString str;
+                dodoString host = "kernel.org";
 
-                        try
-                        {
-                                c.connectFrom("127.0.0.1", "127.0.0.1", 21, ex);
+                cout << host << ":" << tools::network::hostPrimaryIp(host) << endl;
 
-                                str = ex.readString();
-                                cout << "\n" << str << "\n";
-                        }
-                        catch (dodo::exception::basic ex)
-                        {
-                                cout << (dodoString)ex << "\t" << ex.line << endl;
-                        }
-                }
-                catch (dodo::exception::basic ex)
-                {
-                        cout << (dodoString)ex << "\t" << ex.line << endl;
-                }
+                client st(io::network::connection::PROTOCOL_FAMILY_IPV4, io::network::connection::TRANSFER_STREAM);
+
+                exchange ex;
+                dodoString str;
+
+                st.connect(tools::network::hostPrimaryIp(host), 80, ex);
+
+                str = "GET / HTTP/1.1\r\n";
+                ex.blockSize = str.size();
+                ex.write(str);
+
+                str = "Host: " + host + "\r\n";
+                ex.blockSize = str.size();
+                ex.write(str);
+
+                str = "Connection: Close\r\n";
+                ex.blockSize = str.size();
+                ex.write(str);
+
+                str = "User-Agent: " PACKAGE_NAME "/" PACKAGE_VERSION "\r\n\r\n";
+                ex.blockSize = str.size();
+                ex.write(str);
+
+                ex.blockSize = 512;
+                str = ex.readString();
+
+                cout << tools::misc::split(str, "\r\n\r\n")[0] << endl;
         }
         catch (dodo::exception::basic ex)

trunk/tests/ionetworksslclient_test/test.cc

@@ -60 +60 @@
                 ex.write(str);
 
+                ex.blockSize = 4096;
                 str = ex.readString();
 
-                cout << str << endl;
+                cout << tools::misc::split(str, "\r\n\r\n")[0] << endl;
 #endif
         }