Changeset 50117 in vbox for trunk/src/VBox/Frontends/VBoxHeadless/testcase

Timestamp:

Jan 20, 2014 2:05:02 PM (11 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

91661

Message:

Main+Frontends: clear out some cruft code, outdated EventQueue stuff and whitespace cleanup

File:

• trunk/src/VBox/Frontends/VBoxHeadless/testcase/tstHeadless.cpp (modified) (12 diffs)

trunk/src/VBox/Frontends/VBoxHeadless/testcase/tstHeadless.cpp

@@ -6 +6 @@
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2014 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -22 +22 @@
 #include <VBox/com/ErrorInfo.h>
 #include <VBox/com/errorprint.h>
-#include <VBox/com/EventQueue.h>
 
 #include <VBox/com/VirtualBox.h>
@@ -38 +37 @@
  *  Entry point.
  */
-int main (int argc, char **argv)
+int main(int argc, char **argv)
 {
     // initialize VBox Runtime
@@ -56 +55 @@
     if (!name || !operation)
     {
-        RTPrintf ("\nUsage:\n\n"
-                  "%s <machine_name> [on|off|pause|resume]\n\n",
-                  argv [0]);
+        RTPrintf("\nUsage:\n\n"
+                 "%s <machine_name> [on|off|pause|resume]\n\n",
+                 argv [0]);
         return 0;
     }
 
-    RTPrintf ("\n");
-    RTPrintf ("tstHeadless STARTED.\n");
-
-    RTPrintf ("VM name   : {%s}\n"
-              "Operation : %s\n\n",
-              name, operation);
+    RTPrintf("\n");
+    RTPrintf("tstHeadless STARTED.\n");
+
+    RTPrintf("VM name   : {%s}\n"
+             "Operation : %s\n\n",
+             name, operation);
 
     HRESULT rc;
@@ -83 +82 @@
         ComPtr <ISession> session;
 
-        RTPrintf ("Creating VirtualBox object...\n");
-        rc = virtualBox.createLocalObject (CLSID_VirtualBox);
+        RTPrintf("Creating VirtualBox object...\n");
+        rc = virtualBox.createLocalObject(CLSID_VirtualBox);
         if (FAILED(rc))
             RTPrintf("ERROR: failed to create the VirtualBox object!\n");
@@ -94 +93 @@
         }
 
-        if (FAILED (rc))
+        if (FAILED(rc))
         {
             com::ErrorInfo info;
@@ -106 +105 @@
             break;
         }
-
-        // create the event queue
-        // (here it is necessary only to process remaining XPCOM/IPC events
-        // after the session is closed)
-        EventQueue eventQ;
 
         ComPtr <IMachine> m;
@@ -121 +115 @@
         {
             ComPtr <IProgress> progress;
-            RTPrintf ("Opening a new (remote) session...\n");
-            CHECK_ERROR_BREAK (m,
-                               LaunchVMProcess(session, Bstr("vrdp").raw(),
-                                               NULL, progress.asOutParam()));
-
-            RTPrintf ("Waiting for the remote session to open...\n");
-            CHECK_ERROR_BREAK (progress, WaitForCompletion (-1));
+            RTPrintf("Opening a new (remote) session...\n");
+            CHECK_ERROR_BREAK(m,
+                              LaunchVMProcess(session, Bstr("vrdp").raw(),
+                                              NULL, progress.asOutParam()));
+
+            RTPrintf("Waiting for the remote session to open...\n");
+            CHECK_ERROR_BREAK(progress, WaitForCompletion(-1));
 
             BOOL completed;
-            CHECK_ERROR_BREAK (progress, COMGETTER(Completed) (&completed));
-            ASSERT (completed);
+            CHECK_ERROR_BREAK(progress, COMGETTER(Completed)(&completed));
+            ASSERT(completed);
 
             LONG resultCode;
-            CHECK_ERROR_BREAK (progress, COMGETTER(ResultCode) (&resultCode));
-            if (FAILED (resultCode))
+            CHECK_ERROR_BREAK(progress, COMGETTER(ResultCode)(&resultCode));
+            if (FAILED(resultCode))
             {
                 ProgressErrorInfo info(progress);
@@ -142 +136 @@
             else
             {
-                RTPrintf ("Remote session has been successfully opened.\n");
+                RTPrintf("Remote session has been successfully opened.\n");
             }
         }
         else
         {
-            RTPrintf ("Opening an existing session...\n");
+            RTPrintf("Opening an existing session...\n");
             CHECK_ERROR_BREAK(m, LockMachine(session, LockType_Shared));
 
@@ -153 +147 @@
             CHECK_ERROR_BREAK(session, COMGETTER(Console)(console.asOutParam()));
 
-            if (!strcmp (operation, "off"))
+            if (!strcmp(operation, "off"))
             {
                 ComPtr <IProgress> progress;
-                RTPrintf ("Powering the VM off...\n");
-                CHECK_ERROR_BREAK (console, PowerDown(progress.asOutParam()));
-
-                RTPrintf ("Waiting for the VM to power down...\n");
-                CHECK_ERROR_BREAK (progress, WaitForCompletion (-1));
+                RTPrintf("Powering the VM off...\n");
+                CHECK_ERROR_BREAK(console, PowerDown(progress.asOutParam()));
+
+                RTPrintf("Waiting for the VM to power down...\n");
+                CHECK_ERROR_BREAK(progress, WaitForCompletion(-1));
 
                 BOOL completed;
-                CHECK_ERROR_BREAK (progress, COMGETTER(Completed) (&completed));
-                ASSERT (completed);
+                CHECK_ERROR_BREAK(progress, COMGETTER(Completed)(&completed));
+                ASSERT(completed);
 
                 LONG resultCode;
-                CHECK_ERROR_BREAK (progress, COMGETTER(ResultCode) (&resultCode));
-                if (FAILED (resultCode))
+                CHECK_ERROR_BREAK(progress, COMGETTER(ResultCode)(&resultCode));
+                if (FAILED(resultCode))
                 {
                     ProgressErrorInfo info(progress);
@@ -175 +169 @@
                 else
                 {
-                    RTPrintf ("VM is powered down.\n");
+                    RTPrintf("VM is powered down.\n");
                 }
             }
             else
-            if (!strcmp (operation, "pause"))
-            {
-                RTPrintf ("Pausing the VM...\n");
-                CHECK_ERROR_BREAK (console, Pause());
-            }
-            else
-            if (!strcmp (operation, "resume"))
-            {
-                RTPrintf ("Resuming the VM...\n");
-                CHECK_ERROR_BREAK (console, Resume());
-            }
-            else
-            {
-                RTPrintf ("Invalid operation!\n");
+            if (!strcmp(operation, "pause"))
+            {
+                RTPrintf("Pausing the VM...\n");
+                CHECK_ERROR_BREAK(console, Pause());
+            }
+            else
+            if (!strcmp(operation, "resume"))
+            {
+                RTPrintf("Resuming the VM...\n");
+                CHECK_ERROR_BREAK(console, Resume());
+            }
+            else
+            {
+                RTPrintf("Invalid operation!\n");
             }
         }
@@ -200 +194 @@
     }
     while (0);
-    RTPrintf ("\n");
+    RTPrintf("\n");
 
     com::Shutdown();
 
-    RTPrintf ("tstHeadless FINISHED.\n");
+    RTPrintf("tstHeadless FINISHED.\n");
 
     return rc;