Merge lp:~gue5t/midori/appmenu-visibility-test into lp:midori

[gue5t gue5t]

Add unit test to check appmenu/menubar visibility

Just add a test for the recent bugfixes

[Paweł Forysiuk (tuxator)]

review: Approve

=== modified file 'midori/midori-window.vala'
--- midori/midori-window.vala	2015-08-10 23:55:02 +0000
+++ midori/midori-window.vala	2015-08-16 00:19:06 +0000
@@ -66,7 +66,7 @@
         public Window () {
         }
 
-        Gtk.ToolItem? get_tool_item (string name) {
+        public Gtk.ToolItem? get_tool_item (string name) {
             /* Name is the empty string if actions has ,, or trailing , */
             if (name == "")
                 return null;

=== modified file 'tests/browser.c'
--- tests/browser.c	2014-07-03 08:03:18 +0000
+++ tests/browser.c	2015-08-16 00:19:06 +0000
@@ -159,6 +159,43 @@
     g_object_unref (settings);
 }
 
+static void
+browser_appmenu_visibility (void)
+{
+    MidoriApp* app = midori_app_new (NULL);
+    MidoriBrowser* browser = midori_app_create_browser (app);
+    GtkToolItem* appmenu = midori_window_get_tool_item (MIDORI_WINDOW (browser), "CompactMenu");
+    gboolean menubar_visible;
+    gboolean appmenu_visible;
+
+    midori_test_log_set_fatal_handler_for_icons ();
+
+    g_object_get (appmenu, "visible", &appmenu_visible, NULL);
+    g_object_get (browser, "show-menubar", &menubar_visible, NULL);
+    g_assert (menubar_visible == !appmenu_visible);
+
+    g_object_set (browser, "show-menubar", !menubar_visible, NULL);
+
+    g_object_get (appmenu, "visible", &appmenu_visible, NULL);
+    g_object_get (browser, "show-menubar", &menubar_visible, NULL);
+    g_assert (menubar_visible == !appmenu_visible);
+
+    g_object_set (browser, "show-menubar", TRUE, NULL);
+
+    g_object_get (appmenu, "visible", &appmenu_visible, NULL);
+    g_object_get (browser, "show-menubar", &menubar_visible, NULL);
+    g_assert (menubar_visible && !appmenu_visible);
+
+    g_object_set (browser, "show-menubar", FALSE, NULL);
+
+    g_object_get (appmenu, "visible", &appmenu_visible, NULL);
+    g_object_get (browser, "show-menubar", &menubar_visible, NULL);
+    g_assert (!menubar_visible && appmenu_visible);
+
+    gtk_widget_destroy (GTK_WIDGET (browser));
+    g_object_unref (app);
+}
+
 int
 main (int    argc,
       char** argv)
@@ -176,6 +213,7 @@
     g_test_add_func ("/browser/tooltips", browser_tooltips);
     g_test_add_func ("/browser/site_data", browser_site_data);
     g_test_add_func ("/browser/block_uris", browser_block_uris);
+    g_test_add_func ("/browser/appmenu_visibility", browser_appmenu_visibility);
 
     return g_test_run ();
 }