Changeset 84 for trunk/src/control/test/control_test.cpp

Timestamp:

01/13/06 23:32:35 (3 years ago)

Author:

edmanm

Message:

Use QAbstractSocket's isValid() method to determine if the control socket is
connected;
Check if the socket is ready for reading and writing before sending or
receiving;
Update the control test code for the method names I changed back in revision
75;
The authenticate() method in TorControl? will handle loading controller
authentication tokens itself, once it's implemented. (maybe)

Files:

• trunk/src/control/test/control_test.cpp (modified) (4 diffs)

trunk/src/control/test/control_test.cpp

@@ -38 +38 @@
   
   /* Start Tor */
-  if (!control.startTor(&errmsg)) {
+  if (!control.start(&errmsg)) {
     qDebug() << "Could not start Tor:" << errmsg;
     return -1;
@@ -48 +48 @@
   if (!control.connect(&errmsg)) {
     qDebug() << "Could not connect to Tor:" << errmsg;
-    control.stopTor();
+    control.stop();
     return -1;
   } else {
@@ -55 +55 @@
 
   /* Authenticate */
-  if (control.authenticate(QByteArray(), &errmsg)) {
+  if (control.authenticate(&errmsg)) {
     qDebug() << "Authentication Successful...";
     
@@ -71 +71 @@
   /* Disconnect the control socket and stop Tor */
   control.disconnect();
-  control.stopTor();
+  control.stop();
   
   return 0;