Changeset 36802 in vbox for trunk/src/VBox/Additions/x11/VBoxClient/testcase

Timestamp:

Apr 21, 2011 8:26:25 PM (14 years ago)

Author:

vboxsync

Message:

Additions/x11/seamless: extended unit test slightly

File:

• trunk/src/VBox/Additions/x11/VBoxClient/testcase/tstSeamlessX11-auto.cpp (modified) (5 diffs)

trunk/src/VBox/Additions/x11/VBoxClient/testcase/tstSeamlessX11-auto.cpp

@@ -247 +247 @@
 }
 
+static int g_SmlsEventType = 0;
+static Window g_SmlsEventWindow = 0;
+
 /* This should not be needed in the bits of the code we test. */
 extern "C" int XNextEvent(Display *display, XEvent *event_return);
 int XNextEvent(Display *display, XEvent *event_return)
 {
-    AssertFailedReturn(0);
+    event_return->xany.type = g_SmlsEventType;
+    event_return->xany.window = g_SmlsEventWindow;
+    event_return->xmap.window = g_SmlsEventWindow;
+    return True;
+}
+
+static void smlsSetNextEvent(int type, Window window)
+{
+    g_SmlsEventType = type;
+    g_SmlsEventWindow = window;
 }
 
@@ -269 +281 @@
     AssertFailedReturn(0);
 }
+
+/** Dummy observer class */
+class testObserver: public VBoxGuestSeamlessObserver
+{
+    bool mfNotified;
+public:
+    testObserver() : mfNotified(false) {}
+    virtual void notify(void)
+    {
+        mfNotified = true;
+    }
+    virtual ~testObserver() {}
+    bool isNotified(void) { return mfNotified; }
+};
 
 /*****************************
@@ -287 +313 @@
  * windows will be the same whether we start the code before the event and
  * handle it or start the code after the event.
- *
- * If it is ever needed I could write a small tool to record a fixture on
- * a live guest, but I will put that off as long as I can.
  */
 struct SMLSFIXTURE
@@ -530 +553 @@
 {
     VBoxGuestSeamlessX11 subject;
+    testObserver observer;
     unsigned cErrs = 0;
 
-    subject.init(NULL);
+    subject.init(&observer);
     smlsSetWindowAttributes(pFixture->paAttribsBefore,
                             pFixture->pahWindowsBefore,
@@ -548 +572 @@
                            pFixture->cShapeRectsAfter,
                            pFixture->paShapeRectsAfter);
-    switch(pFixture->x11EventType)
+    smlsSetNextEvent(pFixture->x11EventType, pFixture->hEventWindow);
+    if (observer.isNotified())  /* Initial window tree rebuild */
     {
-        case ConfigureNotify:
-            subject.doConfigureEvent(pFixture->hEventWindow);
-            break;
-        case MapNotify:
-            subject.doMapEvent(pFixture->hEventWindow);
-            break;
-        case UnmapNotify:
-            subject.doUnmapEvent(pFixture->hEventWindow);
-            break;
-        case VBoxShapeNotify:
-            subject.doShapeEvent(pFixture->hEventWindow);
-            break;
-        default:
-            break;
+        RTPrintf("%s: fixture: %s.  Notification was set before the first event!!!\n",
+                 g_pszTestName, pszDesc);
+        ++cErrs;
+    }
+    subject.nextEvent();
+    if (!observer.isNotified())
+    {
+        RTPrintf("%s: fixture: %s.  No notification was sent for the initial window tree rebuild.\n",
+                 g_pszTestName, pszDesc);
+        ++cErrs;
+    }
+    smlsSetNextEvent(0, 0);
+    subject.nextEvent();
+    if (!observer.isNotified())
+    {
+        RTPrintf("%s: fixture: %s.  No notification was sent after the event.\n",
+                 g_pszTestName, pszDesc);
+        ++cErrs;
     }
     std::auto_ptr<std::vector<RTRECT> > rects = subject.getRects();