[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdelibs/kdeui/tests
From:       David Faure <faure () kde ! org>
Date:       2010-11-17 15:16:12
Message-ID: 20101117151612.9495BAC8A0 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1198144 by dfaure:

add some actions (in order to create some menus) in the testClientDestruction test. No leaks, good.


 M  +23 -3     kxmlgui_unittest.cpp  
 M  +1 -0      testxmlguiwindow.h  


--- trunk/KDE/kdelibs/kdeui/tests/kxmlgui_unittest.cpp #1198143:1198144
@@ -919,22 +919,42 @@
 }
 
 void KXmlGui_UnitTest::testClientDestruction() { // #170806
-    const QByteArray xml =
+    const QByteArray hostXml =
         "<?xml version = '1.0'?>\n"
         "<!DOCTYPE gui SYSTEM \"kpartgui.dtd\">\n"
         "<gui version=\"1\" name=\"foo\" >\n"
         "<MenuBar>\n"
-        " <Menu name=\"filemenu\"><text>File Menu</text></Menu>\n"
+        " <Menu name=\"file\"><text>&amp;File</text>\n"
+        " </Menu>\n"
+        " <Merge/>\n"
         "</MenuBar>\n"
         "</gui>";
+    const QByteArray xml = "<?xml version = '1.0'?>\n"
+        "<!DOCTYPE gui SYSTEM \"kpartgui.dtd\">\n"
+        "<gui version=\"1\" name=\"foo\" >\n"
+        "<MenuBar>\n"
+        " <Menu name=\"file\"><text>&amp;File</text>\n"
+        "  <Action name=\"file_open\"/>\n"
+        "  <Action name=\"file_quit\"/>\n"
+        " </Menu>\n"
+        "</MenuBar>\n"
+        "</gui>";
 
-    TestXmlGuiWindow mainWindow(xml);
+    TestXmlGuiWindow mainWindow(hostXml);
     TestGuiClient* client = new TestGuiClient(xml);
+    client->createActions(QStringList() << "file_open" << "file_quit");
     mainWindow.insertChildClient(client);
     mainWindow.createGUI();
 
+    checkActions(mainWindow.menuBar()->actions(), QStringList()
+                 << "file" << "separator" << "help" );
+
     QVERIFY(mainWindow.factory()->clients().contains(client));
     delete client;
     QVERIFY(!mainWindow.factory()->clients().contains(client));
+
+    // No change, because deletion is fast, it doesn't do manual unplugging.
+    checkActions(mainWindow.menuBar()->actions(), QStringList()
+                 << "file" << "separator" << "help" );
 }
 
--- trunk/KDE/kdelibs/kdeui/tests/testxmlguiwindow.h #1198143:1198144
@@ -43,6 +43,7 @@
         m_userFile.close(); // write to disk
     }
     void createGUI() {
+        // This merges in ui_standards.rc, too.
         KXmlGuiWindow::createGUI(m_fileName);
     }
     void createGUIBad() {
[prev in list] [next in list] [prev in thread] [next in thread]