Changeset 60063 in vbox for trunk/src/VBox/Main/testcase

Timestamp:

Mar 16, 2016 3:00:06 PM (9 years ago)

Author:

vboxsync

Message:

Frontends etc: convert more code to use VirtualBoxClient instead of direct creation of VirtualBox instances, to improve error handling

Location:

trunk/src/VBox/Main/testcase

Files:

• tstAPI.cpp (modified) (4 diffs)
• tstMediumLock.cpp (modified) (4 diffs)
• tstOVF.cpp (modified) (3 diffs)
• tstVBoxAPI.cpp (modified) (2 diffs)
• tstVBoxAPIPerf.cpp (modified) (2 diffs)
• tstVBoxAPIWin.cpp (modified) (5 diffs)

trunk/src/VBox/Main/testcase/tstAPI.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2016 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -223 +223 @@
     ////////////////////////////////////////////////////////////////////////////
 
+    ComPtr<IVirtualBoxClient> virtualBoxClient;
     ComPtr<IVirtualBox> virtualBox;
     ComPtr<ISession> session;
@@ -242 +243 @@
 
     RTPrintf("Creating VirtualBox object...\n");
-    rc = virtualBox.createLocalObject(CLSID_VirtualBox);
+    rc = virtualBoxClient.createInprocObject(CLSID_VirtualBoxClient);
+    if (SUCCEEDED(rc))
+        rc = virtualBoxClient->COMGETTER(VirtualBox)(virtualBox.asOutParam());
     if (FAILED(rc))
         RTPrintf("ERROR: failed to create the VirtualBox object!\n");
@@ -303 +306 @@
 
             RTPrintf("Creating one more VirtualBox object...\n");
-            CHECK_RC(virtualBox2.createLocalObject(CLSID_VirtualBox));
+            CHECK_RC(virtualBoxClient->COMGETTER(virtualBox2.asOutParam()));
             if (FAILED(rc))
             {

trunk/src/VBox/Main/testcase/tstMediumLock.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2013-2015 Oracle Corporation
+ * Copyright (C) 2013-2016 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -73 +73 @@
 
     bool fComInit = false;
+    ComPtr<IVirtualBoxClient> pVirtualBoxClient;
     ComPtr<IVirtualBox> pVirtualBox;
     char szPathTemp[RTPATH_MAX] = "";
@@ -99 +100 @@
 
         RTTestSub(hTest, "Getting VirtualBox reference");
-        TEST_COM_SUCCESS(hTest, pVirtualBox.createLocalObject(CLSID_VirtualBox), "vbox reference");
+        TEST_COM_SUCCESS(hTest, pVirtualBoxClient.createInprocObject(CLSID_VirtualBoxClient), "vboxclient reference");
+        TEST_COM_SUCCESS(hTest, pVirtualBoxClient->COMGETTER(VirtualBox)(pVirtualBox.asOutParam()), "vbox reference");
     }
 
@@ -279 +281 @@
 
     pVirtualBox.setNull();
+    pVirtualBoxClient.setNull();
 
     /* Make sure that there are no object references alive here, XPCOM does

trunk/src/VBox/Main/testcase/tstOVF.cpp

@@ -6 +6 @@
 
 /*
- * Copyright (C) 2010-2014 Oracle Corporation
+ * Copyright (C) 2010-2016 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -296 +296 @@
     std::list<Guid> llMachinesCreated;
 
+    ComPtr<IVirtualBoxClient> pVirtualBoxClient;
     ComPtr<IVirtualBox> pVirtualBox;
 
@@ -307 +308 @@
 
         RTPrintf("Creating VirtualBox object...\n");
-        rc = pVirtualBox.createLocalObject(CLSID_VirtualBox);
+        rc = pVirtualBoxClient.createInprocObject(CLSID_VirtualBoxClient);
+        if (SUCCEEDED(rc))
+            rc = pVirtualBoxClient->COMGETTER(VirtualBox)(pVirtualBox.asOutParam());
         if (FAILED(rc)) throw MyError(rc, "failed to create the VirtualBox object!\n");
 

trunk/src/VBox/Main/testcase/tstVBoxAPI.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -369 +369 @@
     if (SUCCEEDED(hrc))
     {
+        ComPtr<IVirtualBoxClient> ptrVBoxClient;
         ComPtr<IVirtualBox> ptrVBox;
-        hrc = TST_COM_EXPR(ptrVBox.createLocalObject(CLSID_VirtualBox));
+        hrc = TST_COM_EXPR(ptrVBoxClient.createInprocObject(CLSID_VirtualBoxClient));
+        if (SUCCEEDED(hrc))
+            hrc = TST_COM_EXPR(ptrVBoxClient->COMGETTER(VirtualBox)(ptrVBox.asOutParam()));
         if (SUCCEEDED(hrc))
         {

trunk/src/VBox/Main/testcase/tstVBoxAPIPerf.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2016 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -211 +211 @@
     if (SUCCEEDED(hrc))
     {
+        ComPtr<IVirtualBoxClient> ptrVBoxClient;
         ComPtr<IVirtualBox> ptrVBox;
-        hrc = TST_COM_EXPR(ptrVBox.createLocalObject(CLSID_VirtualBox));
+        hrc = TST_COM_EXPR(ptrVBoxClient.createInprocObject(CLSID_VirtualBoxClient));
+        if (SUCCEEDED(hrc))
+            hrc = TST_COM_EXPR(ptrVBoxClient->COMGETTER(VirtualBox)(ptrVBox.asOutParam()));
         if (SUCCEEDED(hrc))
         {

trunk/src/VBox/Main/testcase/tstVBoxAPIWin.cpp

@@ -13 +13 @@
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2016 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -199 +199 @@
             rc = CoCreateInstance(CLSID_Session,        /* the VirtualBox base object */
                                   NULL,                 /* no aggregation */
-                                  CLSCTX_INPROC_SERVER, /* the object lives in a server process on this machine */
+                                  CLSCTX_INPROC_SERVER, /* the object lives in the current process */
                                   IID_ISession,         /* IID of the interface */
                                   (void**)&session);
@@ -259 +259 @@
 {
     HRESULT rc;
+    IVirtualBoxClient *virtualBoxClient;
     IVirtualBox *virtualBox;
 
@@ -267 +268 @@
 
         /* Instantiate the VirtualBox root object. */
-        rc = CoCreateInstance(CLSID_VirtualBox,       /* the VirtualBox base object */
+        rc = CoCreateInstance(CLSID_VirtualBoxClient, /* the VirtualBoxClient object */
                               NULL,                   /* no aggregation */
-                              CLSCTX_LOCAL_SERVER,    /* the object lives in a server process on this machine */
-                              IID_IVirtualBox,        /* IID of the interface */
-                              (void**)&virtualBox);
+                              CLSCTX_INPROC_SERVER,   /* the object lives in the current process */
+                              IID_IVirtualBoxClient,  /* IID of the interface */
+                              (void**)&virtualBoxClient);
+        if (SUCCEEDED(rc))
+            virtualBoxClient->get_VirtualBox(&virtualBox);
 
         if (!SUCCEEDED(rc))
@@ -288 +291 @@
         /* Release the VirtualBox object. */
         virtualBox->Release();
+        virtualBoxClient->Release();
 
     } while (0);