Merge lp:~unity-team/unity/enable-vala-tests into lp:unity

[Neil J. Patel]

- Removes all the tests that no longer apply
- Re-enables building of vala tests for libunity
- Adds test-vala to the make check target
- Stubs for test-appinfo-manager.vala and test-io.vala, both of which won't compile on my system so I couldn't add them.
- I left test-pixbuf-cache because I'm still thinking what to do with it

you should be able to `make check` and see all the tests fly by and (hopefully) pass.

N.B. unity.[h|cpp] => unityshell.[h|cpp] because it clashes with the unity.h that libunity produces and, in any case, this now matches the plugin name.

[Gord Allott (gordallott)]

some small comments;
build won't work properly with -j<number>, requires you to make twice, because on the first build unity.vapi isn't built when something needs it (other jobs are still building libunity)
[ 1%] make[2]: *** No rule to make target `libunity/unity.vapi', needed by `tests/vala/test-unit.c'. Stop.

not all tests pass

  /Unit/Place/TwoEntries: **
ERROR:/home/gord/canonical/unity/enable-vala-tests/build/tests/vala/test-place.c:228:unity_tests_unit_place_suite_test_two_entries: assertion failed: (_vala_strcmp0 (entry_paths[0], entry_path1) == 0)
FAIL

[Mikkel Kamstrup Erlandsen (kamstrup)]

I merged this branch into lp:~kamstrup/unity/gio-vapi-break-fixes. So we can close this merge proposal.

Unmerged revisions

=== renamed file 'src/unity.cpp' => 'src/unityshell.cpp'
--- src/unity.cpp	2010-11-26 08:12:02 +0000
+++ src/unityshell.cpp	2010-11-29 11:57:46 +0000
@@ -31,7 +31,7 @@
 #include "LauncherController.h"
 #include "PluginAdapter.h"
 #include "StartupNotifyService.h"
-#include "unity.h"
+#include "unityshell.h"
 
 #include <dbus/dbus.h>
 #include <dbus/dbus-glib.h>

=== renamed file 'src/unity.h' => 'src/unityshell.h'
=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2010-11-25 16:23:26 +0000
+++ tests/CMakeLists.txt	2010-11-29 11:57:46 +0000
@@ -8,7 +8,7 @@
 # Unit tests
 #
 find_package (PkgConfig)
-set (TEST_DEPS "${UNITY_PLUGIN_DEPS};indicator")
+set (TEST_DEPS "${UNITY_PLUGIN_DEPS};indicator;gee-1.0")
 pkg_check_modules (TEST_UNIT_DEPS REQUIRED ${TEST_DEPS} indicator)
 
 set (CFLAGS
@@ -17,16 +17,17 @@
      "-DGETTEXT_PACKAGE=\"unity\""
      "-DINDICATORDIR=\"${CMAKE_BINARY_DIR}/tests\""
      "-DINDICATORICONDIR=\"${CMAKE_BINARY_DIR}/tests\""
+     "-I${CMAKE_BINARY_DIR}/libuntiy"
      )
 add_definitions (${CFLAGS})
 
-set (LIBS ${TEST_UNIT_DEPS_LIBRARIES})
+set (LIBS ${TEST_UNIT_DEPS_LIBRARIES} -lunity)
 link_libraries (${LIBS})
 
-set (LIB_PATHS ${TEST_UNIT_DEPS_LIBRARY_DIRS})
+set (LIB_PATHS ${TEST_UNIT_DEPS_LIBRARY_DIRS} ${CMAKE_BINARY_DIR}/libunity)
 link_directories (${LIB_PATHS})
 
-include_directories (. .. ../services ../src ${CMAKE_BINARY_DIR})
+include_directories (. .. ${CMAKE_BINARY_DIR}/libunity ../services ${CMAKE_BINARY_DIR})
 
 # We can't have convenience libs so we need to rebuild with what we need
 # Please keep actual test files alphabetically at top and then files
@@ -81,11 +82,39 @@
                 )
 
 #
+# Vala tests
+#
+list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/vala)
+include(ValaPrecompile)
+include(ValaVersion)
+
+find_package (Vala)
+
+vala_precompile (VALA_C vala/test-unit.vala
+                        vala/test-place-browser.vala
+                        vala/test-place.vala
+                        vala/test-utils.vala
+                 PACKAGES gtk+-2.0
+                          gio-2.0
+                          glib-2.0
+                          gobject-2.0
+                          gee-1.0
+                          dbus-glib-1
+                          gee-1.0
+                 OPTIONS --thread
+                 CUSTOM_VAPIS ${CMAKE_SOURCE_DIR}/vapi/dee-1.0.vapi
+                              vala/test-const.vapi
+                              ${CMAKE_BINARY_DIR}/libunity/unity.vapi
+)
+
+add_executable(test-vala ${VALA_C} vala/numpty.cpp)
+
+#
 # check target
 #
 set (TEST_RESULT_DIR ${CMAKE_BINARY_DIR}/tests)
-set (TEST_RESULT_XML ${TEST_RESULT_DIR}/test-unit-results.xml)
-set (TEST_RESULT_HTML ${TEST_RESULT_DIR}/test-unit-results.html)
-set (TEST_UNIT_COMMAND gtester --verbose -k --g-fatal-warnings -o=${TEST_RESULT_XML} ./test-unit)
-add_custom_target (check COMMAND  ${TEST_UNIT_COMMAND} DEPENDS test-unit)
+set (TEST_RESULT_XML ${TEST_RESULT_DIR}/test-results.xml)
+set (TEST_RESULT_HTML ${TEST_RESULT_DIR}/test-results.html)
+set (TEST_COMMAND gtester --verbose -k --g-fatal-warnings -o=${TEST_RESULT_XML} ./test-unit ./test-vala)
+add_custom_target (check COMMAND  ${TEST_COMMAND} DEPENDS test-unit test-vala)
 add_custom_target (check-report COMMAND ${TEST_UNIT_COMMAND} && gtester-report ${TEST_RESULT_XML} > ${TEST_RESULT_HTML})

=== renamed directory 'vala_tests' => 'tests/vala'
=== renamed directory 'vala_tests/unit/data' => 'tests/vala/data'
=== added file 'tests/vala/numpty.cpp'
--- tests/vala/numpty.cpp	1970-01-01 00:00:00 +0000
+++ tests/vala/numpty.cpp	2010-11-29 11:57:46 +0000
@@ -0,0 +1,1 @@
+

=== added file 'tests/vala/test-appinfo-manager.vala'
--- tests/vala/test-appinfo-manager.vala	1970-01-01 00:00:00 +0000
+++ tests/vala/test-appinfo-manager.vala	2010-11-29 11:57:46 +0000
@@ -0,0 +1,146 @@
+/* -*- Mode: vala; indent-tabs-mode: nil; c-basic-offset: 2; tab-width: 2 -*- */
+/*
+ * Copyright (C) 2010 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by Mikkel Kamstrup Erlandsen <[e-mail]>
+ *
+ */
+using Unity;
+using Unity.Testing;
+
+namespace Unity.Tests.Unit
+{
+  public class AppInfoManagerSuite
+  {
+    
+    public AppInfoManagerSuite ()
+    {
+      Test.add_data_func ("/Unit/AppInfoManager/Allocation",
+                          AppInfoManagerSuite.test_allocation);
+      Test.add_data_func ("/Unit/AppInfoManager/ClearEmpty",
+                          AppInfoManagerSuite.test_clear_empty);
+      Test.add_data_func ("/Unit/AppInfoManager/SyncLookupMissing",
+                          AppInfoManagerSuite.test_sync_lookup_missing);
+      Test.add_data_func ("/Unit/AppInfoManager/AsyncLookupMissing",
+                          AppInfoManagerSuite.test_async_lookup_missing);
+      Test.add_data_func ("/Unit/AppInfoManager/SyncLookupOk",
+                          AppInfoManagerSuite.test_sync_lookup_ok);
+      Test.add_data_func ("/Unit/AppInfoManager/AsyncLookupOk",
+                          AppInfoManagerSuite.test_async_lookup_ok);
+    }
+
+    /* Test that we can even get a valid ref to the manager */
+    internal static void test_allocation()
+    {
+      var manager = AppInfoManager.get_instance();
+      assert (manager is AppInfoManager);
+    }
+
+    /* Test that we can clear an empty manager */
+    internal static void test_clear_empty()
+    {
+      var manager = AppInfoManager.get_instance();
+      manager.clear ();
+      manager.clear ();
+    }
+
+    /* Test that we can clear an empty manager */
+    internal static void test_sync_lookup_missing()
+    {
+      var manager = AppInfoManager.get_instance();
+      assert (manager.lookup ("_foobar.desktop") == null);
+    }
+
+    internal static void test_async_lookup_missing()
+    {
+      MainLoop mainloop = new MainLoop();
+      do_test_async_lookup_missing.begin(mainloop);
+      mainloop.run ();
+    }
+    
+    internal static async void do_test_async_lookup_missing (MainLoop mainloop)
+    {
+      var manager = AppInfoManager.get_instance();
+      
+      try {
+        AppInfo? appinfo = yield manager.lookup_async ("_foobar.desktop");
+        assert (appinfo == null);
+      } catch (Error e) {
+        error ("Error reading desktop file: %s", e.message);
+      }
+      
+      mainloop.quit ();
+    }
+    
+    /* Test that we can lookup something which is indeed there */
+    internal static void test_sync_lookup_ok()
+    {
+      string old_datadir = Environment.get_user_data_dir ();
+      var manager = AppInfoManager.get_instance();
+      
+      Environment.set_variable ("XDG_DATA_HOME", Config.TESTUNITDIR+"/data", true);
+      debug ("XDG %s", Config.TESTUNITDIR+"/data");
+      
+      var info = manager.lookup ("ubuntu-about.desktop");
+      assert (info != null);
+      assert (info is AppInfo);
+      assert ("About Ubuntu" == info.get_name ());
+      
+      Gee.List<string> categories = manager.get_categories ("ubuntu-about.desktop");
+      assert (categories != null);
+      assert (categories[0] == "GNOME");
+      assert (categories[1] == "Application");
+      assert (categories[2] == "Core");
+      
+      /* Reset the environment like a good citizen */
+      Environment.set_variable ("XDG_DATA_HOME", old_datadir, true);
+    }
+
+    internal static void test_async_lookup_ok()
+    {
+      MainLoop mainloop = new MainLoop();
+      do_test_async_lookup_ok.begin(mainloop);
+      mainloop.run ();
+    }
+    
+    internal static async void do_test_async_lookup_ok (MainLoop mainloop)
+    {
+      string old_datadir = Environment.get_user_data_dir ();
+      var manager = AppInfoManager.get_instance();
+      
+      Environment.set_variable ("XDG_DATA_HOME", Config.TESTUNITDIR+"/data", true);      
+      
+      try{
+        var info = yield manager.lookup_async ("ubuntu-about.desktop");
+        assert (info is AppInfo);
+        assert ("About Ubuntu" == info.get_name ());
+      } catch (Error e) {
+        error ("Error reading desktop file: %s", e.message);
+      }
+      
+      Gee.List<string> categories = manager.get_categories ("ubuntu-about.desktop");
+      assert (categories != null);
+      assert (categories[0] == "GNOME");
+      assert (categories[1] == "Application");
+      assert (categories[2] == "Core");
+      
+      /* Reset the environment like a good citizen */
+      Environment.set_variable ("XDG_DATA_HOME", old_datadir, true);
+      
+      mainloop.quit ();
+    }
+        
+  }
+}

=== renamed file 'vala_tests/unit/test-const.vapi' => 'tests/vala/test-const.vapi'
=== added file 'tests/vala/test-io.vala'
--- tests/vala/test-io.vala	1970-01-01 00:00:00 +0000
+++ tests/vala/test-io.vala	2010-11-29 11:57:46 +0000
@@ -0,0 +1,86 @@
+/* -*- Mode: vala; indent-tabs-mode: nil; c-basic-offset: 2; tab-width: 2 -*- */
+/*
+ * Copyright (C) 2010 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by Mikkel Kamstrup Erlandsen <[e-mail]>
+ *
+ */
+using Unity;
+using Unity.Place;
+using Unity.Testing;
+
+namespace Unity.Tests.Unit
+{
+  public class IOSuite
+  {
+    /* Copy of the data found in data/test_desktop_file.deskop */
+    static string TEST_DATA = """[Desktop Entry]
+Name=Test Application
+Comment=This is a test application desktop file
+Exec=xclock
+Terminal=false
+Type=Application
+StartupNotify=false
+Icon=test_desktop_icon.png
+""";
+  
+    public IOSuite ()
+    {
+      Test.add_data_func ("/Unit/IO/AsyncDektopFile",
+                          IOSuite.test_async_find_and_load);
+    }
+
+    internal static void test_async_find_and_load()
+    {
+      MainLoop mainloop = new MainLoop();
+      do_test_async_find_and_load.begin(mainloop);
+      mainloop.run ();
+    }
+    
+    internal static async void do_test_async_find_and_load (MainLoop mainloop)
+    {
+      string[] dirs = new string[1];
+      dirs[0] = Path.build_filename (Config.TESTUNITDIR, "data", null
+      );
+      try
+        {
+          var input = yield IO.open_from_dirs ("test_desktop_file.desktop",
+                                               dirs);
+          assert (input is FileInputStream);
+          
+          /* Read in small chunks to test reading across buffer pages */
+          uchar[] buf = new uchar[16];
+          void* data;
+          size_t data_size;
+          yield IO.read_stream_async (input, buf, 16, Priority.DEFAULT,  null,
+                                      out data, out data_size);
+          
+          /* The test file is 177 bytes long */
+          assert (data_size == 177);
+          
+          /* null terminate the data so we can use it string comparison */
+          string sdata = ((string)data).ndup(data_size);
+          assert (sdata == TEST_DATA);
+        }
+      catch (Error e)
+        {
+          error ("Failed read test file: %s", e.message);
+        }
+      
+      mainloop.quit ();
+    }
+        
+  }
+}

=== added file 'tests/vala/test-place-browser.vala'
--- tests/vala/test-place-browser.vala	1970-01-01 00:00:00 +0000
+++ tests/vala/test-place-browser.vala	2010-11-29 11:57:46 +0000
@@ -0,0 +1,129 @@
+/* -*- Mode: vala; indent-tabs-mode: nil; c-basic-offset: 2; tab-width: 2 -*- */
+/*
+ * Copyright (C) 2010 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by Mikkel Kamstrup Erlandsen <[e-mail]>
+ *
+ */
+using Unity;
+using Unity.Place;
+using Unity.Testing;
+using Gee;
+
+namespace Unity.Tests.Unit
+{
+  public class PlaceBrowserSuite
+  {
+    public PlaceBrowserSuite ()
+    {
+      Test.add_data_func ("/Unit/Place/Stack",
+                          PlaceBrowserSuite.test_stack);
+      Test.add_data_func ("/Unit/Place/Browser",
+                          PlaceBrowserSuite.test_browser);
+    }
+
+    internal static void test_stack()
+    {
+      /* Test the empty stack */
+      var stack = new Stack<string> ();
+      assert (stack.is_empty ());
+      assert (stack.size () == 0);
+      assert (stack.pop () == null);
+      
+      /* Test with one element */
+      stack.push ("foo");
+      assert (!stack.is_empty ());
+      assert (stack.size () == 1);
+      assert ("foo" == stack.pop ());
+      assert (stack.is_empty ());
+      assert (stack.size () == 0);
+      assert (stack.pop () == null);
+      
+      /* Test with two elements */
+      stack.push ("bar");
+      assert (!stack.is_empty ());
+      assert (stack.size () == 1);
+      stack.push ("baz");
+      assert (!stack.is_empty ());
+      assert (stack.size () == 2);
+      assert ("baz" == stack.pop ());
+      assert (!stack.is_empty ());
+      assert (stack.size () == 1);
+      assert ("bar" == stack.pop ());
+      assert (stack.is_empty ());
+      assert (stack.size () == 0);
+      assert (stack.pop () == null);
+    }
+    
+    internal static void test_browser ()
+    {
+      Gee.List<string> playback = new ArrayList<string> ();
+      Browser<string> browser = new Browser<string> ("/org/example/browser/1");
+      
+      assert (browser.dbus_path == "/org/example/browser/1");
+      
+      browser.back.connect ( (b, state, comment) => {
+        playback.add ((string)state);
+      });
+      
+      browser.forward.connect ( (b, state, comment) => {
+        playback.add ((string)state);
+      });
+      
+      browser.record_state ("First", "Comment1");
+      browser.record_state ("Second", "Comment2");
+      browser.record_state ("Third", "Comment3");
+      browser.record_state ("Fourth", "Comment4");
+      
+      browser.go_back ();
+      assert (playback[playback.size - 1] == "Third");
+      
+      browser.go_back ();
+      assert (playback[playback.size - 1] == "Second");
+      
+      browser.record_state ("Fifth", "Comment5");
+      browser.record_state ("Sixth", "Comment6");
+      browser.record_state ("Seven", "Comment7");
+      
+      browser.go_back ();
+      assert (playback[playback.size - 1] == "Sixth");
+      
+      browser.go_back ();
+      assert (playback[playback.size - 1] == "Fifth");
+      
+      browser.go_back ();      
+      assert (playback[playback.size - 1] == "Second");
+      
+      browser.go_back ();
+      var last_size = playback.size;
+      assert (playback[playback.size - 1] == "First");
+      assert (playback.size == last_size);
+      
+      browser.go_back (); // no-op      
+      assert (playback[playback.size - 1] == "First");
+      assert (playback.size == last_size);
+      
+      browser.go_forward ();
+      assert (playback[playback.size - 1] == "Second");
+      
+      browser.go_forward ();
+      assert (playback[playback.size - 1] == "Fifth");
+      
+      browser.go_forward ();
+      assert (playback[playback.size - 1] == "Sixth");
+    }
+
+  }
+}

=== renamed file 'vala_tests/unit/test-place.vala' => 'tests/vala/test-place.vala'
=== renamed file 'vala_tests/unit/test-unit.vala' => 'tests/vala/test-unit.vala'
--- vala_tests/unit/test-unit.vala	2010-08-02 07:33:41 +0000
+++ tests/vala/test-unit.vala	2010-11-29 11:57:46 +0000
@@ -24,47 +24,23 @@
 {
   public static int main (string[] args)
   {
-    UnityPixbufCacheSuite unity_pixbuf_cache;
-
-    LauncherSuite launcher;
-    QuicklistSuite quicklists;
-
-    PanelIndicatorObjectEntryViewSuite panel_object_entry_view_suite;
-    PanelIndicatorObjectViewSuite panel_object_view_suite;
-
-    PlacesPlaceFileModelSuite place_file_model;
-    PlacesPlaceSuite places_place;
-    PlacesSuite places;
     PlaceSuite place;
     PlaceBrowserSuite place_browser;
-    IOSuite io;
-    AppInfoManagerSuite appinfo_manager;
+    //IOSuite io;
+    //AppInfoManagerSuite appinfo_manager;
 
     Gtk.init (ref args);
-    Ctk.init (ref args);
     Test.init (ref args);
 
-    /* Libunity tests */
-    unity_pixbuf_cache = new UnityPixbufCacheSuite ();
-
-    /* Launcher tests */
-    launcher = new LauncherSuite ();
-    quicklists = new QuicklistSuite ();
-
-    /* Panel tests */
-    panel_object_entry_view_suite = new PanelIndicatorObjectEntryViewSuite ();
-    panel_object_view_suite = new PanelIndicatorObjectViewSuite ();
-    place_file_model = new PlacesPlaceFileModelSuite ();
-    places_place = new PlacesPlaceSuite ();
-
     /* Places tests */
-    places = new PlacesSuite ();
     place = new PlaceSuite ();
     place_browser = new PlaceBrowserSuite ();
 
-    /* IO utility tests */
-    io = new IOSuite ();
-    appinfo_manager = new AppInfoManagerSuite ();
+    /* FIXME:  IO utility tests */
+    //io = new IOSuite ();
+
+    /* FIXME: This needs to be re-enabled in mikkels branch 
+    appinfo_manager = new AppInfoManagerSuite ();*/
 
     Test.run ();
 

=== renamed file 'vala_tests/unit/test-unity-pixbuf-cache.vala' => 'tests/vala/test-unity-pixbuf-cache.vala'
=== added file 'tests/vala/test-utils.vala'
--- tests/vala/test-utils.vala	1970-01-01 00:00:00 +0000
+++ tests/vala/test-utils.vala	2010-11-29 11:57:46 +0000
@@ -0,0 +1,126 @@
+/*
+ * Copyright (C) 2010 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by Neil Jagdish Patel <[e-mail]>
+ *
+ */
+
+namespace G
+{
+  namespace Test
+  {
+    public class Log
+    {
+      public delegate bool LogFatalFunc (string?       log_domain,
+                                         LogLevelFlags flags,
+                                         string?       message);
+
+      public extern static void set_fatal_handler (LogFatalFunc func);
+    }
+  }
+}
+
+namespace Unity.Testing
+{
+  public class Logging
+  {
+    public Logging ()
+    {
+      Log.set_default_handler (log_handler);
+    }
+
+    public static bool fatal_handler (string?       log_domain,
+                                      LogLevelFlags flags,
+                                      string?       message)
+    {
+      if (log_domain == null)
+        return true;
+
+      if ("liblauncher" in log_domain)
+        return false;
+
+      if ("bamfdaemon" in log_domain)
+        return false;
+
+      if ("Gtk" in log_domain)
+        return false;
+
+      if ("ndicator" in log_domain)
+        return false;
+
+      if (message == null)
+        return true;
+
+      if ("widget class `GtkImage' has no property named `x-ayatana-indicator-dynamic'" in message)
+        return false;
+
+      if ("is currently inside an allocation cycle" in message)
+        return false;
+
+      if ("Bamf r" in message)
+        return false;
+
+      return true;
+    }
+
+    /**
+     * init_fatal_handler:
+     * Makes sure that known warnings don't make our testing fail
+     **/
+    public static void init_fatal_handler ()
+    {
+      G.Test.Log.set_fatal_handler (fatal_handler);
+    }
+
+    private void log_handler (string? log_domain,
+                              LogLevelFlags flags,
+                              string        message)
+    {
+      string level;
+
+      if (log_domain == "Clutter" && (flags & LogLevelFlags.LEVEL_WARNING)!=0)
+        {
+          if ("is currently inside an allocation cycle" in message)
+            return;
+        }
+
+      if (log_domain == "Gtk" && (flags & LogLevelFlags.LEVEL_WARNING) != 0)
+        {
+          if ("has no property named `x-ayatana-indicator-dynamic'" in message)
+            return;
+        }
+
+      if ((flags & LogLevelFlags.LEVEL_ERROR) != 0)
+        level = "FATAL";
+      else if ((flags & LogLevelFlags.LEVEL_CRITICAL) != 0)
+        level = "CRITICAL";
+      else if ((flags & LogLevelFlags.LEVEL_WARNING) != 0)
+        level = "WARNING";
+      else if ((flags & LogLevelFlags.LEVEL_MESSAGE) != 0)
+        level = "MESSAGE";
+      else if ((flags & LogLevelFlags.LEVEL_INFO) != 0)
+        level = "INFO";
+      else if ((flags & LogLevelFlags.LEVEL_DEBUG) != 0)
+        level = "DEBUG";
+      else
+        level = @"$flags";
+
+      print ("%s-%s: %s\n\n",
+             log_domain == null ? "Unity" : log_domain,
+             level,
+             message);
+    }
+  }
+}

=== removed directory 'vala_tests/ui'
=== removed file 'vala_tests/ui/Makefile.am'
--- vala_tests/ui/Makefile.am	2010-07-12 08:50:07 +0000
+++ vala_tests/ui/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,73 +0,0 @@
-SUBDIRS = data
-
-noinst_PROGRAMS = test-ui
-
-TESTDIR = $(top_srcdir)/tests/ui
-
-test_ui_CPPFLAGS = \
-  -I$(top_srcdir) \
-  -I$(top_srcdir)/unity \
-  -I$(top_srcdir)/unity-private \
-  -I$(top_srcdir)/src \
-  -DTESTDIR=\"$(TESTDIR)\" \
-  $(BASE_CFLAGS)
-
-test_ui_LDADD = \
-  $(top_builddir)/unity/libunity.la \
-  $(top_builddir)/unity-private/libunity-private.la \
-  $(BASE_LIBS) \
-  $(MAINTAINER_LIBS)
-
-test_ui_VALAFLAGS = \
-  --vapidir=$(top_srcdir)/unity \
-  --vapidir=$(top_srcdir)/unity-private \
-  --vapidir=$(top_srcdir)/src \
-  --vapidir=$(top_srcdir)/vapi/ \
-  --vapidir=$(top_srcdir)/tests/ui \
-  --pkg Bamf-0.2 \
-  --pkg clutter-1.0 \
-  --pkg clutter-gtk-0.10 \
-  --pkg dbus-glib-1 \
-  --pkg Dbusmenu-Glib-0.2 \
-  --pkg dee-1.0 \
-  --pkg gtk+-2.0 \
-  --pkg gdk-2.0 \
-  --pkg gee-1.0 \
-  --pkg x11 \
-  --pkg gtk+-2.0 \
-  --pkg gee-1.0 \
-  --pkg indicator \
-  --pkg clutk-0.3 \
-  --pkg launcher-0.3 \
-  --pkg test-const \
-  --pkg unique-1.0 \
-  --pkg unity \
-  --pkg unity-const \
-  --pkg unity-private \
-  $(MAINTAINER_VALAFLAGS)
-
-test_ui_SOURCES = \
-  test-automate.vala \
-  test-home-button.vala \
-  test-indicators.vala \
-  test-quicklist.vala \
-  test-ui.vala
-
-# GTester stuff
-XML_REPORT = test-ui-results.xml
-HTML_REPORT = test-ui-results.html
-
-unit-tester: test-ui
-	@gtester -o=$(XML_REPORT) ./test-ui
-
-check-report:
-	@gtester -o=$(XML_REPORT) -k ./test-ui \
-	&& (gtester-report $(XML_REPORT) \
-			| sed 's/GTester UI Test Report</>GTester UI Test Report (normal)</' \
-			> $(HTML_REPORT)) \
-	&& xdg-open $(HTML_REPORT)
-
-check-local: unit-tester
-
-EXTRA_DIST = test-const.vapi
-CLEANFILES = *.stamp $(XML_REPORT) $(HTML_REPORT) *.c

=== removed directory 'vala_tests/ui/data'
=== removed file 'vala_tests/ui/data/Makefile.am'
--- vala_tests/ui/data/Makefile.am	2010-04-14 14:00:26 +0000
+++ vala_tests/ui/data/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-EXTRA_DIST = *.png

=== removed file 'vala_tests/ui/data/quicklist_controller_show_label.png'
Binary files vala_tests/ui/data/quicklist_controller_show_label.png	2010-06-03 13:14:06 +0000 and vala_tests/ui/data/quicklist_controller_show_label.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'vala_tests/ui/data/quicklist_shown_on_hover.png'
Binary files vala_tests/ui/data/quicklist_shown_on_hover.png	2010-04-14 14:00:56 +0000 and vala_tests/ui/data/quicklist_shown_on_hover.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'vala_tests/ui/test-automate.vala'
--- vala_tests/ui/test-automate.vala	2010-07-08 12:08:51 +0000
+++ vala_tests/ui/test-automate.vala	1970-01-01 00:00:00 +0000
@@ -1,131 +0,0 @@
-/*
- * Copyright (C) 2010 Canonical Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by Neil Jagdish Patel <[e-mail]>
- *
- */
-
-using Unity;
-using Unity.Testing;
-using Unity.Launcher;
-
-GLib.Timer gTimer;
-static void
-on_animation_started (Clutter.Animation? anim)
-{
-    //stdout.printf("Animation Started\n");
-    gTimer.start ();
-}
-
-static void
-on_animation_completed (Clutter.Animation? anim)
-{
-    //stdout.printf("Animation Completed\n");
-    gTimer.stop ();
-}
-
-namespace Unity.Tests.UI
-{
-  public class AutomationBasicTestSuite : Object
-  {
-    private const string DOMAIN = "/UI/Quicklist";
-
-    Unity.Testing.Window? window;
-    Clutter.Stage?        stage;
-
-    public AutomationBasicTestSuite ()
-    {
-      Logging.init_fatal_handler ();
-
-      /* Testup the test window */
-      window = new Unity.Testing.Window (true, 1024, 600);
-      window.init_test_mode ();
-      stage = window.stage;
-      window.title = "Automation Tests";
-      window.show_all ();
-
-      Test.add_data_func (DOMAIN + "/Automation",
-                          test_automation);
-
-
-      /* Keep this one last, it's a dummy to clean up the state as Vala cant
-       * deal with the standard TestSuite stuff properly
-       */
-      Test.add_data_func (DOMAIN +"/Teardown", test_teardown);
-    }
-
-    private void test_teardown ()
-    {
-      //window.destroy ();
-      stage = null;
-    }
-
-    private void test_automation ()
-    {
-/*
-      ObjectRegistry registry = ObjectRegistry.get_default ();
-
-      Logging.init_fatal_handler ();
-
-      QuicklistController qlcontroller = QuicklistController.get_default ();
-      ScrollerModel scroller = registry.lookup ("UnityScrollerModel").get(0) as ScrollerModel;
-
-      gTimer = new GLib.Timer();
-      int DT = 2500;
-      stdout.printf("\n");
-
-      foreach (ScrollerChild launcher in scroller)
-        {
-          //launcher = scroller[i] as ScrollerChild;
-          var dir = new Director (launcher.get_stage() as Clutter.Stage);
-
-          qlcontroller.show_label ("Ubuntu Software Centre", launcher);
-
-          Clutter.Animation? anim;
-          launcher.opacity = 255;
-
-
-          gTimer.start ();
-          anim = launcher.animate (Clutter.AnimationMode.EASE_IN_SINE, 2500, "opacity", 0);
-          //anim.started.connect (on_animation_started);
-          anim.completed.connect (on_animation_completed);
-          dir.do_wait_for_animation (launcher);
-
-          float dt = (float)gTimer.elapsed ();
-          float dt0 =  (float)DT/1000.0f;
-          stdout.printf("Expected Duration: %2.3f, Observed Duration: %2.3f, Error: %2.3f%%\n", dt0, dt,
-                        (dt - dt0)*100.0f/dt0);
-
-          gTimer.start ();
-          anim = launcher.animate (Clutter.AnimationMode.EASE_IN_SINE, 2500, "opacity", 255);
-          //anim.started.connect (on_animation_started);
-          anim.completed.connect (on_animation_completed);
-          dir.do_wait_for_animation (launcher);
-
-          dt = (float)gTimer.elapsed ();
-          dt0 =  (float)DT/1000.0f;
-          stdout.printf("Expected Duration: %2.3f, Observed Duration: %2.3f, Error: %2.3f%%\n", dt0, dt,
-                        (dt - dt0)*100.0f/dt0);
-
-
-          //dir.do_wait_for_timeout (5000);
-        }
-
-      //debug ("After Animation");
-      qlcontroller.close_menu ();
-*/
-    }
-  }
-}

=== removed file 'vala_tests/ui/test-const.vapi'
--- vala_tests/ui/test-const.vapi	2010-04-07 16:16:07 +0000
+++ vala_tests/ui/test-const.vapi	1970-01-01 00:00:00 +0000
@@ -1,25 +0,0 @@
-/* -*- Mode: vala; indent-tabs-mode: nil; c-basic-offset: 2; tab-width: 2 -*- */
-/*
- * Copyright (C) 2009 Canonical Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * idst under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by Gordon Allott <[e-mail]>
- *
- */
-
-namespace Unity.Tests {
-  [CCode (cname = "TESTDIR")]
-  public static const string TESTDIR;
-
-}

=== removed file 'vala_tests/ui/test-home-button.vala'
--- vala_tests/ui/test-home-button.vala	2010-08-26 13:00:32 +0000
+++ vala_tests/ui/test-home-button.vala	1970-01-01 00:00:00 +0000
@@ -1,188 +0,0 @@
-/* -*- Mode: vala; indent-tabs-mode: nil; c-basic-offset: 2; tab-width: 2 -*- */
-/*
- * Copyright (C) 2010 Canonical Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by Mirco Müller <[e-mail]>
- *
- */
-
-using Unity;
-using Unity.Testing;
-using Unity.Panel;
-
-bool g_flag = false;
-
-namespace Unity.Tests.UI
-{
-  public class HomeButtonSuite : Object, Shell
-  {
-    private const string DOMAIN = "/UI/HomeButton";
-
-    Unity.Testing.Window?  window;
-    Clutter.Stage?         stage;
-    Unity.Testing.Director director;
-    Unity.Panel.HomeButton home_button;
-    public bool          super_key_active {get; set;}
-    public bool is_starting {get; set;}
-
-    public HomeButtonSuite ()
-    {
-      Logging.init_fatal_handler ();
-
-      /* Testup the test window */
-      window = new Unity.Testing.Window (true, 1024, 600);
-      window.init_test_mode ();
-      stage = window.stage;
-      window.title = "HomeButton Test";
-      window.show_all ();
-
-      home_button = new Unity.Panel.HomeButton (this);
-      director = new Unity.Testing.Director (stage);
-
-      Test.add_data_func (DOMAIN + "/HomeButton", test_click_home_button);
-    }
-
-
-    private void test_click_home_button ()
-    {
-      director.button_press (home_button, 1, true, 1.0f, 1.0f, false);
-
-      Logging.init_fatal_handler ();
-
-      assert (g_flag == true);
-    }
-
-    //
-    // mostly a dummy shell-implementation to satisfy the interface
-    //
-    public bool menus_swallow_events { get { return true; } }
-
-    public void get_window_details (uint32 xid, out bool a, out bool b)
-    {
-
-    }
-
-    public void do_window_action (uint32 xid, WindowAction action)
-    {
-
-    }
-
-    public ShellMode
-    get_mode ()
-    {
-      return ShellMode.MINIMIZED;
-    }
-
-    public Clutter.Stage
-    get_stage ()
-    {
-      return this.stage;
-    }
-
-    public void
-    show_unity ()
-    {
-      g_flag = true;
-    }
-
-    public void
-    hide_unity ()
-    {
-
-    }
-
-    public int
-    get_indicators_width ()
-    {
-      // stub
-      return 0;
-    }
-
-    public int
-    get_launcher_width_foobar ()
-    {
-      // stub
-      return 0;
-    }
-
-    public int
-    get_panel_height_foobar ()
-    {
-      // stub
-      return 0;
-    }
-
-    public void
-    ensure_input_region ()
-    {
-      // stub
-    }
-
-    public void
-    add_fullscreen_request (Object o)
-    {
-      // stub
-    }
-
-    public bool
-    remove_fullscreen_request (Object o)
-    {
-      // stub
-      return false;
-    }
-
-    public void
-    grab_keyboard (bool grab, uint32 timestamp)
-    {
-      // stub
-    }
-
-    public void
-    about_to_show_places ()
-    {
-      // stub
-    }
-
-    public void
-    close_xids (Array<uint32> xids)
-    {
-      // stub
-    }
-
-    public void
-    show_window (uint32 xid)
-    {
-      // stub
-    }
-
-		public void
-		expose_xids (Array<uint32> xids)
-		{
-      // stub
-		}
-
-		public void
-		stop_expose ()
-		{
-      // stub
-		}
-
-    public uint32 get_current_time ()
-    {
-      return Clutter.get_current_event_time ();
-    }
-  }
-}
-

=== removed file 'vala_tests/ui/test-indicators.vala'
--- vala_tests/ui/test-indicators.vala	2010-06-09 02:46:10 +0000
+++ vala_tests/ui/test-indicators.vala	1970-01-01 00:00:00 +0000
@@ -1,321 +0,0 @@
-/* -*- Mode: vala; indent-tabs-mode: nil; c-basic-offset: 2; tab-width: 2 -*- */
-/*
- * Copyright (C) 2010 Canonical Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by Jay Taoko <[e-mail]>
- *
- */
-
-using Unity;
-using Unity.Testing;
-using Unity.Panel;
-using Unity.Panel.Indicators;
-
-namespace Unity.Tests.UI
-{
-  public class FakeIndicatorObject: Indicator.Object
-  {
-    public Gee.ArrayList<Indicator.ObjectEntry> indicator_entry_array;
-    //GLib.List<Indicator.ObjectEntry> list;
-    
-    public Gtk.Label _label = null;
-    public Gtk.Image _image = null;
-    public Gtk.Menu _menu = null;
-    public int index {get; set construct;}
-    
-    public FakeIndicatorObject (int i)
-    {
-      Object(index:i);
-    }
-    
-    construct
-    {
-      START_FUNCTION ();
-      string index_string = "%d".printf(index);
-      indicator_entry_array = new Gee.ArrayList< unowned Indicator.ObjectEntry> ();
-      
-      _label = new Gtk.Label ("Indicator" + index_string);
-      _image = new Gtk.Image.from_icon_name ("gtk-apply", Gtk.IconSize.MENU);
-      _menu = new Gtk.Menu ();
-
-      END_FUNCTION ();
-    }
-    
-    public void add_entry(Indicator.ObjectEntry entry)
-    {
-      int pos = indicator_entry_array.index_of (entry);
-      if (pos != -1)
-        return;
-      
-      indicator_entry_array.add (entry);
-      entry_added (entry);
-    }
-
-    public void remove_entry(Indicator.ObjectEntry entry)
-    {
-      int pos = indicator_entry_array.index_of (entry);
-      if (pos != -1)
-        {
-          indicator_entry_array.remove_at (pos);
-          entry_removed (entry);
-        }
-    }
-    
-    public override unowned Gtk.Label get_label ()
-    {
-      return this._label;
-    }
-    
-    public override unowned Gtk.Image get_image ()
-    {
-      return this._image;
-    }
-    
-    public override unowned Gtk.Menu get_menu ()
-    {
-      return this._menu;
-    }
-    
-//     public override unowned GLib.List<Indicator.ObjectEntry> get_entries ()
-//     {
-//       list = new GLib.List<Indicator.ObjectEntry> ();
-//       foreach(Indicator.ObjectEntry element in indicator_entry_array)
-//       {
-//         list.append (element);
-//       }
-//       return list;
-//     }    
-  }
-  
-  public class FakeIndicatorsModel : IndicatorsModel
-  {
-    public Gee.HashMap<Indicator.Object, string> indicator_map;
-    public Gee.ArrayList<Indicator.Object> indicator_list;
-    
-    
-    public FakeIndicatorObject indicator_object_0;
-    public FakeIndicatorObject indicator_object_1;
-    
-    public FakeIndicatorsModel ()
-    {
-      START_FUNCTION ();
-
-      indicator_map = new Gee.HashMap<Indicator.Object, string> ();
-      indicator_list = new Gee.ArrayList<Indicator.Object> ();
-
-      load_fake_indicators ();
-      
-      END_FUNCTION ();
-    }
-
-    private void load_fake_indicators ()
-    {
-      indicator_object_0 = new FakeIndicatorObject (0);
-      indicator_object_1 = new FakeIndicatorObject (1);
-
-      this.indicator_map[indicator_object_0] = "fakeindicator0";
-      indicator_list.add (indicator_object_0);
-      this.indicator_map[indicator_object_1] = "fakeindicator1";
-      indicator_list.add (indicator_object_1);
-          
-    }
-
-    public override Gee.ArrayList<Indicator.Object> get_indicators ()
-    {
-      return indicator_list;
-    }
-
-    public override string get_indicator_name (Indicator.Object o)
-    {
-      return indicator_map[o];
-    }
-  }
-  
-  
-  public class IndicatorTestSuite : Object
-  {
-    private const string DOMAIN = "/UI/Indicators";
-
-    Unity.Testing.Window?  window;
-    Clutter.Stage?         stage;
-    Unity.Testing.Director director;
-
-    public Indicator.ObjectEntry entry0;
-    public Indicator.ObjectEntry entry1;
-
-    private Gtk.Menu  menu0;
-    private Gtk.Label label0;
-    private Gtk.Image image0;
-    
-    private Gtk.Menu  menu1;
-    private Gtk.Label label1;
-    private Gtk.Image image1;
-    
-    private Gtk.MenuItem item;
-    
-    public IndicatorTestSuite ()
-    {
-      Logging.init_fatal_handler ();
-
-      FakeIndicatorsModel fake_indicator_model = new FakeIndicatorsModel ();
-      IndicatorsModel.set_default (fake_indicator_model);
-      
-     
-      /* Testup the test window */
-      window = new Unity.Testing.Window (true, 1024, 600);
-      window.init_test_mode ();
-      stage = window.stage;
-      window.title = "Indicators testing";
-      window.show_all ();
-
-      
-      director = new Unity.Testing.Director (stage);
-    
-      FakeIndicatorsModel indicator_model = IndicatorsModel.get_default () as FakeIndicatorsModel;
-      
-      menu0 = new Gtk.Menu ();
-      label0 = new Gtk.Label ("Entry0");
-      image0 = new Gtk.Image.from_icon_name ("gtk-apply", Gtk.IconSize.MENU);
-      item = new Gtk.MenuItem.with_label ("MenuItem0");
-      item.show();
-      menu0.append (item);
-      item = new Gtk.MenuItem.with_label ("MenuItem1");
-      item.show();
-      menu0.append (item);
-      item = new Gtk.MenuItem.with_label ("MenuItem2");
-      item.show();
-      menu0.append (item);
-      item = new Gtk.MenuItem.with_label ("MenuItem3");
-      item.show();
-      menu0.append (item);
-      
-      entry0 = new Indicator.ObjectEntry ();
-      entry0.menu = menu0;
-      entry0.label = label0;
-      entry0.image = image0;
-      indicator_model.indicator_object_0.add_entry (entry0);
-
-      menu1 = new Gtk.Menu ();
-      label1 = new Gtk.Label ("Entry1");
-      image1 = new Gtk.Image.from_icon_name ("gtk-apply", Gtk.IconSize.MENU);
-      item = new Gtk.MenuItem.with_label ("MenuItem0");
-      item.show();
-      menu1.append (item);
-      item = new Gtk.MenuItem.with_label ("MenuItem1");
-      item.show();
-      menu1.append (item);
-      item = new Gtk.MenuItem.with_label ("MenuItem2");
-      item.show();
-      menu1.append (item);
-      item = new Gtk.MenuItem.with_label ("MenuItem3");
-      item.show();
-      menu1.append (item);
-      
-      entry1 =  new Indicator.ObjectEntry ();
-      entry1.menu = menu1;
-      entry1.label = label1;
-      entry1.image = image1;
-      indicator_model.indicator_object_1.add_entry (entry1);
-      
-      Test.add_data_func (DOMAIN + "/IndicatorMouseEvent", test_indicators_mouse_event);
-      Test.add_data_func (DOMAIN + "/IndicatorKeyboardEvent", test_indicators_keyboard_event);
-    }
-
-
-    private void test_indicators_mouse_event ()
-    {
-      ObjectRegistry registry = ObjectRegistry.get_default ();
-      Logging.init_fatal_handler ();
-      
-      FakeIndicatorsModel indicator_model = IndicatorsModel.get_default () as FakeIndicatorsModel;
-      
-      IndicatorBar indicator_bar = registry.lookup ("IndicatorBar").get (0) as IndicatorBar;
-      assert (indicator_bar != null);
-
-      IndicatorObjectView indicator_object_view0 = indicator_bar.get_indicator_view_matching (indicator_model.indicator_object_0);
-      assert (indicator_object_view0 != null);
-      IndicatorObjectView indicator_object_view1 = indicator_bar.get_indicator_view_matching (indicator_model.indicator_object_1);
-      assert (indicator_object_view1 != null);
-
-      /* Hack to remove the default entries: because get_entries has not been overriden in FakeIndicatorObject */
-      indicator_object_view0.remove_first_entry ();
-      indicator_object_view1.remove_first_entry ();
-      
-      indicator_bar.do_queue_redraw ();
-
-      IndicatorObjectEntryView object_entry0 = indicator_object_view0.get_entry_view (entry0);
-      assert (object_entry0 != null);
-      IndicatorObjectEntryView object_entry1 = indicator_object_view1.get_entry_view (entry1);
-      assert (object_entry1 != null);
-      
-      // Test button press on first indicator
-      director.button_press (object_entry0, 1, true, 1.0f, 1.0f, false);
-      assert (object_entry0.is_open () == true);
-      assert (object_entry1.is_open () == false);
-      director.do_wait_for_timeout (1000);
-
-      // Test button press on second indicator      
-      director.button_press (object_entry1, 1, true, 1.0f, 1.0f, false);
-      assert (object_entry0.is_open () == false);
-      assert (object_entry1.is_open () == true);
-      director.do_wait_for_timeout (1000);
-      
-      // Press to close
-      director.button_press (object_entry1, 1, true, 1.0f, 1.0f, false);
-      assert (object_entry0.is_open () == false);
-      assert (object_entry1.is_open () == false);
-      
-    }
-
-    private void test_indicators_keyboard_event ()
-    {
-      ObjectRegistry registry = ObjectRegistry.get_default ();
-      Logging.init_fatal_handler ();
-      
-      FakeIndicatorsModel indicator_model = IndicatorsModel.get_default () as FakeIndicatorsModel;
-      
-      IndicatorBar indicator_bar = registry.lookup ("IndicatorBar").get (0) as IndicatorBar;
-      assert (indicator_bar != null);
-
-      IndicatorObjectView indicator_object_view0 = indicator_bar.get_indicator_view_matching (indicator_model.indicator_object_0);
-      assert (indicator_object_view0 != null);
-      IndicatorObjectView indicator_object_view1 = indicator_bar.get_indicator_view_matching (indicator_model.indicator_object_1);
-      assert (indicator_object_view1 != null);
-      
-      IndicatorObjectEntryView object_entry0 = indicator_object_view0.get_entry_view (entry0);
-      assert (object_entry0 != null);
-      IndicatorObjectEntryView object_entry1 = indicator_object_view1.get_entry_view (entry1);
-      assert (object_entry1 != null);      
-      
-      //Simulate key navigation
-      director.do_wait_for_timeout (1000);
-      director.button_press (object_entry0, 1, true, 1.0f, 1.0f, false);
-      assert (object_entry0.is_open () == true);
-      assert (object_entry1.is_open () == false);
-      director.do_wait_for_timeout (1000);
-      
-      object_entry0.entry.menu.move_current (Gtk.MenuDirectionType.CHILD);
-      assert (object_entry0.is_open () == false);
-      assert (object_entry1.is_open () == true);
-      director.do_wait_for_timeout (1000);
-      object_entry1.entry.menu.move_current (Gtk.MenuDirectionType.PARENT);
-      assert (object_entry0.is_open () == true);
-      assert (object_entry1.is_open () == false);
-      director.do_wait_for_timeout (1000);
-      
-    }
-  }
-}
-

=== removed file 'vala_tests/ui/test-quicklist.vala'
--- vala_tests/ui/test-quicklist.vala	2010-07-08 12:08:51 +0000
+++ vala_tests/ui/test-quicklist.vala	1970-01-01 00:00:00 +0000
@@ -1,85 +0,0 @@
-/*
- * Copyright (C) 2010 Canonical Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by Neil Jagdish Patel <[e-mail]>
- *
- */
-
-using Unity;
-using Unity.Testing;
-using Unity.Launcher;
-
-namespace Unity.Tests.UI
-{
-  public class QuicklistSuite : Object
-  {
-    private const string DOMAIN = "/UI/Quicklist";
-
-    Unity.Testing.Window? window;
-    Clutter.Stage?        stage;
-
-    public QuicklistSuite ()
-    {
-      Logging.init_fatal_handler ();
-
-      /* Testup the test window */
-      Unity.favorites_singleton = new TestFavorites ();
-      window = new Unity.Testing.Window (true, 1024, 600);
-      window.init_test_mode ();
-      stage = window.stage;
-      window.title = "Quicklist Tests";
-      window.show_all ();
-
-      Test.add_data_func (DOMAIN + "/ControllerShowLabel",
-                          test_controller_show_label);
-
-
-      /* Keep this one last, it's a dummy to clean up the state as Vala cant
-       * deal with the standard TestSuite stuff properly
-       */
-      Test.add_data_func (DOMAIN +"/Teardown", test_teardown);
-    }
-
-    private void test_teardown ()
-    {
-      //window.destroy ();
-      stage = null;
-    }
-
-    private void test_controller_show_label ()
-    {
-/*
-      string img = TESTDIR + "/data/quicklist_controller_show_label.png";
-      ObjectRegistry registry = ObjectRegistry.get_default ();
-
-      Logging.init_fatal_handler ();
-
-      ScrollerModel scroller = (registry.lookup ("UnityScrollerModel")[0]) as ScrollerModel;
-      ScrollerChild first = scroller[0] as ScrollerChild;
-
-      QuicklistController qlcontroller = QuicklistController.get_default ();
-      qlcontroller.show_label ("Ubuntu Software Centre", first);
-
-      while (Gtk.events_pending ())
-        Gtk.main_iteration ();
-
-      assert (Utils.compare_snapshot (stage, img, 54, 30, 200, 50));
-
-      qlcontroller.close_menu ();
-    */
-    }
-
-  }
-}

=== removed file 'vala_tests/ui/test-ui.vala'
--- vala_tests/ui/test-ui.vala	2010-07-01 11:23:01 +0000
+++ vala_tests/ui/test-ui.vala	1970-01-01 00:00:00 +0000
@@ -1,129 +0,0 @@
-/*
- * Copyright (C) 2010 Canonical Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by Neil Jagdish Patel <[e-mail]>
- *
- */
-using Gee;
-using Unity;
-using Unity.Testing;
-using Unity.Tests.UI;
-
-namespace Unity.Tests.UI
-{
-public class TestFavorites : Unity.Favorites
-  {
-    public override ArrayList<string> get_favorites ()
-    {
-      var retlist = new ArrayList<string> ();
-      retlist.add ("app-firefox");
-      return retlist;
-    }
-
-    public override string find_uid_for_desktop_file (string desktop_file)
-    {
-      return "app-firefox";
-    }
-
-    public override void add_favorite (string uid)
-    {
-    }
-    public override void remove_favorite (string uid)
-    {
-    }
-    public override bool is_favorite (string uid)
-    {
-      return true;
-    }
-
-    public override string? get_string (string uid, string name)
-    {
-      if (name == "type")
-        return "application";
-
-      return "/usr/share/applications/firefox.desktop";
-    }
-
-    public override void set_string (string uid, string name, string value)
-    {
-    }
-
-    public override int? get_int (string uid, string name)
-    {
-      return null;
-    }
-    public override void set_int (string uid, string name, int value)
-    {
-    }
-
-
-    public override float? get_float (string uid, string name)
-    {
-      return null;
-    }
-    public override void set_float (string uid, string name, float value)
-    {
-    }
-
-    public override bool? get_bool (string uid, string name)
-    {
-      return null;
-    }
-
-    public override void set_bool (string uid, string name, bool value)
-    {
-    }
-  }
-}
-
-public class Main
-{
-  public static int main (string[] args)
-  {
-    Logging         logger;
-    QuicklistSuite  quicklist_suite;
-    HomeButtonSuite home_button_suite;
-    AutomationBasicTestSuite basic_test_suite;
-    IndicatorTestSuite indicator_test_suite;
-
-
-    Environment.set_variable ("UNITY_DISABLE_TRAY", "1", true);
-    Environment.set_variable ("UNITY_DISABLE_IDLES", "1", true);
-    Environment.set_variable ("UNITY_PANEL_INDICATORS_SKIP", "all", true);
-
-    Gtk.init (ref args);
-    Gtk.Settings.get_default ().gtk_xft_dpi = 96 * 1024;
-
-    Ctk.init (ref args);
-    Test.init (ref args);
-
-    logger = new Logging ();
-
-    basic_test_suite = new AutomationBasicTestSuite ();
-    quicklist_suite = new QuicklistSuite ();
-    home_button_suite = new HomeButtonSuite ();
-    indicator_test_suite = new IndicatorTestSuite ();
-
-    Timeout.add_seconds (3, ()=> {
-      Test.run ();
-      Gtk.main_quit ();
-      return false;
-    });
-
-    Gtk.main ();
-
-    return 0;
-  }
-}

=== removed file 'vala_tests/unit/Makefile.am'
--- vala_tests/unit/Makefile.am	2010-08-02 07:33:41 +0000
+++ vala_tests/unit/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,85 +0,0 @@
-SUBDIRS = data
-
-noinst_PROGRAMS = test-unit
-
-TESTDIR = $(top_srcdir)/tests/unit
-
-test_unit_CPPFLAGS = \
-  -I$(top_srcdir) \
-  -I$(top_srcdir)/unity \
-  -I$(top_srcdir)/unity-private \
-  -I$(top_srcdir)/src \
-  -DTESTDIR=\"$(TESTDIR)\" \
-  $(BASE_CFLAGS)
-
-test_unit_LDADD = \
-  $(top_builddir)/unity/libunity.la \
-  $(top_builddir)/unity-private/libunity-private.la \
-  $(BASE_LIBS) \
-  $(MAINTAINER_LIBS)
-
-test_unit_VALAFLAGS = \
-  --vapidir=$(top_srcdir)/unity \
-  --vapidir=$(top_srcdir)/unity-private \
-  --vapidir=$(top_srcdir)/src \
-  --vapidir=$(top_srcdir)/vapi/ \
-  --vapidir=$(top_srcdir)/tests \
-  --vapidir=$(top_srcdir)/tests/unit \
-  --pkg gio-2.0 \
-  --pkg Bamf-0.2 \
-  --pkg clutter-1.0 \
-  --pkg clutter-gtk-0.10 \
-  --pkg config \
-  --pkg dbus-glib-1 \
-  --pkg Dbusmenu-Glib-0.2 \
-  --pkg dee-1.0 \
-  --pkg gtk+-2.0 \
-  --pkg gdk-2.0 \
-  --pkg gee-1.0 \
-  --pkg x11 \
-  --pkg gtk+-2.0 \
-  --pkg gee-1.0 \
-  --pkg indicator \
-  --pkg clutk-0.3 \
-  --pkg launcher-0.3 \
-  --pkg posix \
-  --pkg test-const \
-  --pkg unique-1.0 \
-  --pkg unity \
-  --pkg unity-const \
-  --pkg unity-private \
-  $(MAINTAINER_VALAFLAGS)
-
-test_unit_SOURCES = \
-  test-dbusmenu-quicklists.vala \
-  test-launcher.vala \
-  test-panel-indicator-object-entry-view.vala \
-  test-panel-indicator-object-view.vala \
-  test-places-place-file-model.vala \
-  test-places-place.vala \
-  test-places.vala \
-  test-place.vala \
-  test-place-browser.vala \
-  test-io.vala \
-  test-appinfo-manager.vala \
-  test-unity-pixbuf-cache.vala \
-  test-unit.vala
-
-# GTester stuff
-XML_REPORT = test-unit-results.xml
-HTML_REPORT = test-unit-results.html
-
-unit-tester: test-unit
-	@gtester -o=$(XML_REPORT) ./test-unit
-
-check-report:
-	@gtester -o=$(XML_REPORT) -k ./test-unit \
-	&& (gtester-report $(XML_REPORT) \
-			| sed 's/GTester Unit Test Report</>GTester Unit Test Report (normal)</' \
-			> $(HTML_REPORT)) \
-	&& xdg-open $(HTML_REPORT)
-
-check-local: unit-tester
-
-EXTRA_DIST = test-const.vapi
-CLEANFILES = *.stamp $(XML_REPORT) $(HTML_REPORT) *.c

=== removed file 'vala_tests/unit/test-dbusmenu-quicklists.vala'
--- vala_tests/unit/test-dbusmenu-quicklists.vala	2010-08-01 19:50:39 +0000
+++ vala_tests/unit/test-dbusmenu-quicklists.vala	1970-01-01 00:00:00 +0000
@@ -1,188 +0,0 @@
-/*
- *      test-launcher.vala
- *      Copyright (C) 2010 Canonical Ltd
- *
- *      This program is free software; you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation; either version 3 of the License, or
- *      (at your option) any later version.
- *
- *      This program is distributed in the hope that it will be useful,
- *      but WITHOUT ANY WARRANTY; without even the implied warranty of
- *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *      GNU General Public License for more details.
- *
- *      You should have received a copy of the GNU General Public License
- *      along with this program; if not, write to the Free Software
- *      Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- *      MA 02110-1301, USA.
- *
- *
- *      Authored by Gordon Allott <[e-mail]>
- */
-using Unity;
-using Unity.Launcher;
-using Unity.Testing;
-
-/* TODO - add more tests once we have bamf and can test the controllers */
-namespace Unity.Tests.Unit
-{
-  public class TestScrollerChildController : ScrollerChildController
-  {
-    public TestScrollerChildController (ScrollerChild child_)
-    {
-      Object (child: child_);
-    }
-
-    construct
-    {
-      name = "Testing";
-    }
-
-    public override void get_menu_actions (ScrollerChildController.menu_cb callback)
-    {
-      // our actions menu goes as follows
-      // + Root
-      //  - Checked Menu Item, unchecked, "Unchecked"
-      //  - Checked Menu Item, checked, "Checked"
-      //  - Separator
-      //  - Label "A Label"
-      //  - Radio Menu Item, checked, "Radio Active"
-      //  - Radio Menu Item, unchecked, "Radio Unactive"
-      Dbusmenu.Menuitem root = new Dbusmenu.Menuitem ();
-      root.set_root (true);
-
-      Dbusmenu.Menuitem menuitem = new Dbusmenu.Menuitem ();
-      menuitem.property_set (Dbusmenu.MENUITEM_PROP_LABEL, "Unchecked");
-      menuitem.property_set (Dbusmenu.MENUITEM_PROP_TOGGLE_TYPE, Dbusmenu.MENUITEM_TOGGLE_CHECK);
-      menuitem.property_set_bool (Dbusmenu.MENUITEM_PROP_ENABLED, true);
-      menuitem.property_set_bool (Dbusmenu.MENUITEM_PROP_VISIBLE, true);
-      menuitem.property_set_int (Dbusmenu.MENUITEM_PROP_TOGGLE_STATE, Dbusmenu.MENUITEM_TOGGLE_STATE_UNCHECKED);
-      root.child_append (menuitem);
-
-      menuitem = new Dbusmenu.Menuitem ();
-      menuitem.property_set (Dbusmenu.MENUITEM_PROP_LABEL, "Checked");
-      menuitem.property_set (Dbusmenu.MENUITEM_PROP_TOGGLE_TYPE, Dbusmenu.MENUITEM_TOGGLE_CHECK);
-      menuitem.property_set_bool (Dbusmenu.MENUITEM_PROP_ENABLED, true);
-      menuitem.property_set_bool (Dbusmenu.MENUITEM_PROP_VISIBLE, true);
-      menuitem.property_set_int (Dbusmenu.MENUITEM_PROP_TOGGLE_STATE, Dbusmenu.MENUITEM_TOGGLE_STATE_CHECKED);
-      root.child_append (menuitem);
-
-      menuitem = new Dbusmenu.Menuitem ();
-      menuitem.property_set ("type", Dbusmenu.CLIENT_TYPES_SEPARATOR);
-      menuitem.property_set_bool (Dbusmenu.MENUITEM_PROP_ENABLED, true);
-      menuitem.property_set_bool (Dbusmenu.MENUITEM_PROP_VISIBLE, true);
-      root.child_append (menuitem);
-
-      menuitem = new Dbusmenu.Menuitem ();
-      menuitem.property_set (Dbusmenu.MENUITEM_PROP_LABEL, "A Label");
-      menuitem.property_set_bool (Dbusmenu.MENUITEM_PROP_ENABLED, true);
-      menuitem.property_set_bool (Dbusmenu.MENUITEM_PROP_VISIBLE, true);
-      root.child_append (menuitem);
-
-      menuitem = new Dbusmenu.Menuitem ();
-      menuitem.property_set (Dbusmenu.MENUITEM_PROP_LABEL, "Radio Active");
-      menuitem.property_set (Dbusmenu.MENUITEM_PROP_TOGGLE_TYPE, Dbusmenu.MENUITEM_TOGGLE_RADIO);
-      menuitem.property_set_bool (Dbusmenu.MENUITEM_PROP_ENABLED, true);
-      menuitem.property_set_bool (Dbusmenu.MENUITEM_PROP_VISIBLE, true);
-      menuitem.property_set_int (Dbusmenu.MENUITEM_PROP_TOGGLE_STATE, Dbusmenu.MENUITEM_TOGGLE_STATE_CHECKED);
-      root.child_append (menuitem);
-
-      menuitem = new Dbusmenu.Menuitem ();
-      menuitem.property_set (Dbusmenu.MENUITEM_PROP_LABEL, "Radio Unactive");
-      menuitem.property_set (Dbusmenu.MENUITEM_PROP_TOGGLE_TYPE, Dbusmenu.MENUITEM_TOGGLE_RADIO);
-      menuitem.property_set_bool (Dbusmenu.MENUITEM_PROP_ENABLED, true);
-      menuitem.property_set_bool (Dbusmenu.MENUITEM_PROP_VISIBLE, true);
-      menuitem.property_set_int (Dbusmenu.MENUITEM_PROP_TOGGLE_STATE, Dbusmenu.MENUITEM_TOGGLE_STATE_UNCHECKED);
-      root.child_append (menuitem);
-
-      callback (root);
-    }
-
-    public override void get_menu_navigation (ScrollerChildController.menu_cb callback)
-    {
-      // just tests that the order is correct
-      Dbusmenu.Menuitem root = new Dbusmenu.Menuitem ();
-      root.set_root (true);
-
-      Dbusmenu.Menuitem menuitem = new Dbusmenu.Menuitem ();
-      menuitem.property_set (Dbusmenu.MENUITEM_PROP_LABEL, "1");
-      menuitem.property_set_bool (Dbusmenu.MENUITEM_PROP_ENABLED, true);
-      menuitem.property_set_bool (Dbusmenu.MENUITEM_PROP_VISIBLE, true);
-      root.child_append (menuitem);
-
-      menuitem = new Dbusmenu.Menuitem ();
-      menuitem.property_set (Dbusmenu.MENUITEM_PROP_LABEL, "2");
-      menuitem.property_set_bool (Dbusmenu.MENUITEM_PROP_ENABLED, true);
-      menuitem.property_set_bool (Dbusmenu.MENUITEM_PROP_VISIBLE, true);
-      root.child_append (menuitem);
-
-      menuitem = new Dbusmenu.Menuitem ();
-      menuitem.property_set (Dbusmenu.MENUITEM_PROP_LABEL, "3");
-      menuitem.property_set_bool (Dbusmenu.MENUITEM_PROP_ENABLED, true);
-      menuitem.property_set_bool (Dbusmenu.MENUITEM_PROP_VISIBLE, true);
-      root.child_append (menuitem);
-
-      callback (root);
-    }
-
-    public override void activate ()
-    {
-    }
-
-    public override QuicklistController? get_menu_controller ()
-    {
-      QuicklistController new_menu = new ApplicationQuicklistController (this);
-      return new_menu;
-    }
-  }
-
-  public class QuicklistSuite
-  {
-    public QuicklistSuite ()
-    {
-      Test.add_data_func ("/Unity/Launcher/TestDbusMenu", test_dbus_menu);
-    }
-
-    private void test_dbus_menu()
-    {
-      ScrollerChild child = new TestScrollerChild ();
-      TestScrollerChildController controller = new TestScrollerChildController(child);
-      ApplicationQuicklistController menu = controller.get_menu_controller () as ApplicationQuicklistController;
-      menu.state = QuicklistControllerState.LABEL;
-
-      unowned GLib.List<Ctk.MenuItem> menuitems = null;
-      assert (menuitems.length () == 0);
-
-      menu.state = QuicklistControllerState.MENU;
-
-      // this assert here will only work for our local dbusmenu's because they return
-      // immediately. remote dbusmenu's need to be slightly more clever
-      menuitems = menu.get_view ().get_items ();
-      assert (menuitems.length () >= 10);
-
-      assert (menuitems.data is Ctk.CheckMenuItem);
-      assert ((menuitems.data as Ctk.CheckMenuItem).active == false);
-      menuitems = menuitems.next;
-
-      assert (menuitems.data is Ctk.CheckMenuItem);
-      assert ((menuitems.data as Ctk.CheckMenuItem).active == true);
-      menuitems = menuitems.next;
-
-      assert (menuitems.data is Ctk.MenuSeperator);
-      menuitems = menuitems.next;
-
-      assert (menuitems.data is Ctk.MenuItem);
-      assert ((menuitems.data as Ctk.MenuItem).label == "A Label");
-      menuitems = menuitems.next;
-
-      assert (menuitems.data is Ctk.RadioMenuItem);
-      assert ((menuitems.data as Ctk.RadioMenuItem).active == true);
-      menuitems = menuitems.next;
-
-      assert (menuitems.data is Ctk.RadioMenuItem);
-      assert ((menuitems.data as Ctk.RadioMenuItem).active == true);
-      menuitems = menuitems.next;
-    }
-  }
-}

=== removed file 'vala_tests/unit/test-launcher.vala'
--- vala_tests/unit/test-launcher.vala	2010-07-29 11:48:06 +0000
+++ vala_tests/unit/test-launcher.vala	1970-01-01 00:00:00 +0000
@@ -1,223 +0,0 @@
-/*
- *      test-launcher.vala
- *      Copyright (C) 2010 Canonical Ltd
- *
- *      This program is free software; you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation; either version 3 of the License, or
- *      (at your option) any later version.
- *
- *      This program is distributed in the hope that it will be useful,
- *      but WITHOUT ANY WARRANTY; without even the implied warranty of
- *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *      GNU General Public License for more details.
- *
- *      You should have received a copy of the GNU General Public License
- *      along with this program; if not, write to the Free Software
- *      Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- *      MA 02110-1301, USA.
- *
- *
- *      Authored by Gordon Allott <[e-mail]>
- */
-using Unity;
-using Unity.Launcher;
-using Unity.Testing;
-
-namespace Unity.Tests.Unit
-{
-  // can't use this code yet because bamf hates testing :'(
-/*
-  public class TestBamfIndicator : Bamf.Indicator
-  {
-    public TestBamfIndicator ()
-    {
-    }
-
-    construct
-    {
-    }
-
-		public new string get_dbus_menu_path ()
-    {
-      return "";
-    }
-		public new string get_remote_address ()
-    {
-      return "";
-    }
-		public new string get_remote_path ()
-    {
-      return "";
-    }
-	}
-*/
-
-	public class TestBamfApplication : Bamf.Application
-	{
-		public bool test_is_active = true;
-		public bool test_is_urgent = false;
-		public bool test_user_visible = true;
-		public bool test_is_running = true;
-
-		public string desktop_file = "firefox.desktop";
-		public string name = "firefox";
-		public string icon = "firefox";
-    private GLib.List<Bamf.View> children;
-
-		public TestBamfApplication ()
-		{
-			Object (path: "/null");
-		}
-
-		construct
-		{
-      children = new GLib.List<Bamf.View> ();
-		}
-
-		public new unowned string get_desktop_file ()
-		{
-			return desktop_file;
-		}
-
-		GLib.List<Object> temp_list;
-		public new unowned GLib.List get_windows ()
-		{
-			temp_list = new GLib.List<Object> ();
-			return temp_list;
-		}
-
-    public override GLib.List get_children ()
-    {
-      GLib.List<Bamf.View> tmplist = new GLib.List<Bamf.View> ();
-      foreach (Bamf.View child in children)
-        {
-          tmplist.append (child);
-        }
-      return tmplist;
-    }
-
-		public new GLib.Array get_xids ()
-		{
-			Array<uint32> retarray = new Array<uint32> (true, false, (uint)sizeof (uint32));
-			return retarray;
-		}
-
-		public override string get_icon ()
-		{
-			return icon;
-		}
-
-		public override string get_name ()
-		{
-			return name;
-		}
-
-		public override bool is_active ()
-		{
-			return test_is_active;
-		}
-
-		public override bool is_running ()
-		{
-			return test_is_running;
-		}
-
-		public override bool is_urgent ()
-		{
-			return test_is_urgent;
-		}
-
-		public new bool user_visible ()
-		{
-			return test_user_visible;
-		}
-
-		public override unowned string view_type ()
-		{
-			return "test";
-		}
-	}
-
-  public class TestScrollerChild : ScrollerChild
-    {
-    }
-
-  public class LauncherSuite
-  {
-    public LauncherSuite ()
-    {
-      Test.add_data_func ("/Unity/Launcher/TestScrollerModel", test_scroller_model);
-			Test.add_data_func ("/Unity/Launcher/TestScrollerChildController", test_scroller_child_controller);
-    }
-
-
-    // very basic tests for scroller model, makes sure its list interface works
-    // as expected
-    private void test_scroller_model ()
-    {
-      ScrollerModel model = new ScrollerModel ();
-      ScrollerChild child_a = new TestScrollerChild ();
-      ScrollerChild child_b = new TestScrollerChild ();
-      ScrollerChild child_c = new TestScrollerChild ();
-
-      model.add (child_a);
-      model.add (child_c);
-      model.insert (child_b, 1);
-
-			// make sure each model is in the correct position
-      assert (model[1] == child_b);
-      assert (model[2] == child_c);
-
-			// make sure non of the children got lost somehow
-      foreach (ScrollerChild child in model)
-      {
-        assert (child is ScrollerChild);
-      }
-
-      assert (child_a in model);
-
-			// make sure that after removing a child, everything is still in the correct order
-      model.remove (child_b);
-      assert (model[1] == child_c);
-    }
-
-		private void test_scroller_child_controller ()
-		{
-			TestBamfApplication test_app = new TestBamfApplication ();
-			ScrollerChild child = new TestScrollerChild ();
-			ApplicationController controller = new ApplicationController (Config.TESTUNITDIR + "/data/test_desktop_file.desktop", child);
-
-			test_app.name = "Test Application-New";
-			test_app.desktop_file = Config.TESTUNITDIR + "/data/test_desktop_file.desktop";
-			test_app.icon = Config.TESTUNITDIR + "/data/test_desktop_icon.png";
-			test_app.test_is_active = true;
-			test_app.test_is_urgent = false;
-			test_app.test_user_visible = true;
-			test_app.test_is_running = true;
-
-			//assert that the controller set the model into the correct state
-			assert (child.running == false);
-			assert (child.active == false);
-			assert (child.needs_attention == false);
-			assert (controller.name == "Test Application");
-
-    // unfortunately we need to disable the bamf tests for now, bamf is not letting us subclass for fake objects
-/*
-			controller.attach_application (test_app);
-			assert (child.running == true);
-			assert (child.active == true);
-			assert (controller.name == "Test Application-New");
-
-			test_app.test_is_active = false;
-			test_app.active_changed (test_app.test_is_active);
-			assert (child.active == false);
-
-			test_app.test_is_running = false;
-			test_app.running_changed (test_app.test_is_running);
-			assert (child.running == false);
-			assert (controller.debug_is_application_attached () == false);
-*/
-		}
-  }
-}

=== removed file 'vala_tests/unit/test-panel-indicator-object-entry-view.vala'
--- vala_tests/unit/test-panel-indicator-object-entry-view.vala	2010-06-03 17:13:55 +0000
+++ vala_tests/unit/test-panel-indicator-object-entry-view.vala	1970-01-01 00:00:00 +0000
@@ -1,97 +0,0 @@
-/*
- * Copyright (C) 2009 Canonical Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by Neil Jagdish Patel <[e-mail]>
- *
- */
-using Unity;
-using Unity.Testing;
-using Unity.Panel.Indicators;
-
-namespace Unity.Tests.Unit
-{
-  public class PanelIndicatorObjectEntryViewSuite : Object
-  {
-    public const string DOMAIN = "/Unit/Panel/Indicator/ObjectEntry";
-
-    private Indicator.ObjectEntry entry;
-    private Gtk.Menu  menu;
-    private Gtk.Label label;
-    private Gtk.Image image;
-
-    public PanelIndicatorObjectEntryViewSuite ()
-    {
-      Logging.init_fatal_handler ();
-
-      entry = new Indicator.ObjectEntry ();
-
-      menu = new Gtk.Menu ();
-      entry.menu = menu;
-
-      label = new Gtk.Label ("Test Label");
-      entry.label = label;
-
-      image = new Gtk.Image.from_icon_name ("gtk-apply", Gtk.IconSize.MENU);
-      entry.image = image;
-
-      Test.add_data_func (DOMAIN + "/Allocation", test_allocation);
-      Test.add_data_func (DOMAIN + "/LabelSync", test_label_sync);
-      Test.add_data_func (DOMAIN + "/ImageSync", test_image_sync);
-    }
-
-    private void test_allocation ()
-    {
-      var e = new IndicatorObjectEntryView (entry);
-
-      assert (e is IndicatorObjectEntryView);
-    }
-
-    private void test_label_sync ()
-    {
-      var e = new IndicatorObjectEntryView (entry);
-
-      assert (e is IndicatorObjectEntryView);
-
-      /* Make sure text is in sync */
-      assert (e.text.text == label.label);
-
-      /* Update the label and check again */
-      label.label = "Test Label 2";
-      assert (e.text.text == label.label);
-
-      label.label = "Test Label";
-    }
-
-    private void test_image_sync ()
-    {
-      var e = new IndicatorObjectEntryView (entry);
-      assert (e is IndicatorObjectEntryView);
-
-      /* Test that the icon name has synced */
-      assert (e.image.stock_id == image.icon_name);
-
-      /* Test that if it changes entry keeps it in sync */
-      image.icon_name = "gtk-close";
-      assert (e.image.stock_id == image.icon_name);
-
-      /* Test pixbuf */
-      var p = new Gdk.Pixbuf (Gdk.Colorspace.RGB, true, 8, 100, 100);
-      image.pixbuf = p;
-      assert (e.image.pixbuf == image.pixbuf);
-
-      image.icon_name = "gtk-apply";
-    }
-  }
-}

=== removed file 'vala_tests/unit/test-panel-indicator-object-view.vala'
--- vala_tests/unit/test-panel-indicator-object-view.vala	2010-06-08 04:30:19 +0000
+++ vala_tests/unit/test-panel-indicator-object-view.vala	1970-01-01 00:00:00 +0000
@@ -1,154 +0,0 @@
-/*
- * Copyright (C) 2009 Canonical Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by Neil Jay Taoko <[e-mail]>
- *
- */
-using Unity;
-using Unity.Testing;
-using Unity.Panel.Indicators;
-
-namespace Unity.Tests.Unit
-{
-  public class FakeIndicatorObject: Indicator.Object
-  {
-    public Gee.ArrayList<Indicator.ObjectEntry> indicator_entry_array;
-    public Gtk.Label _label;
-    public Gtk.Image _image;
-    public Gtk.Menu _menu;
-
-    public FakeIndicatorObject ()
-    {
-      Object();
-    }
-
-    construct
-    {
-      START_FUNCTION ();
-      indicator_entry_array = new Gee.ArrayList< unowned Indicator.ObjectEntry> ();
-      
-      _label = new Gtk.Label ("Test Label");
-      _image = new Gtk.Image.from_icon_name ("gtk-apply", Gtk.IconSize.MENU);
-      _menu = new Gtk.Menu ();
-      END_FUNCTION ();
-    }
-
-    public void add_entry(Indicator.ObjectEntry entry)
-    {
-      int pos = indicator_entry_array.index_of (entry);
-      if (pos != -1)
-        return;
-      
-      indicator_entry_array.add (entry);
-      entry_added (entry);
-    }
-
-    public void remove_entry(Indicator.ObjectEntry entry)
-    {
-      int pos = indicator_entry_array.index_of (entry);
-      if (pos != -1)
-        {
-          indicator_entry_array.remove_at (pos);
-          entry_removed (entry);
-        }
-    }
-
-    public override unowned Gtk.Label get_label ()
-    {
-      return this._label;
-    }
-
-    public override unowned Gtk.Image get_image ()
-    {
-      return this._image;
-    }
-
-    public override unowned Gtk.Menu get_menu ()
-    {
-      return this._menu;
-    }
-
-//     public override GLib.List<unowned Indicator.ObjectEntry> get_entries ()
-//     {
-//       GLib.List<unowned Indicator.ObjectEntry> list = new GLib.List<unowned Indicator.ObjectEntry> ();
-//       foreach(unowned Indicator.ObjectEntry element in indicator_entry_array)
-//       {
-//         list.append (element);
-//       }
-//       return list;
-//     }
-  }
-
-  public class PanelIndicatorObjectViewSuite : Object
-  {
-    public const string DOMAIN = "/Unit/Panel/Indicator/ObjectView";
-
-    private Indicator.ObjectEntry entry;
-    private Gtk.Menu  menu;
-    private Gtk.Label label;
-    private Gtk.Image image;
-    
-    public PanelIndicatorObjectViewSuite ()
-    {
-      Logging.init_fatal_handler ();
-
-      entry = new Indicator.ObjectEntry ();
-
-      menu = new Gtk.Menu ();
-      entry.menu = menu;
-
-      label = new Gtk.Label ("Test Label");
-      entry.label = label;
-
-      image = new Gtk.Image.from_icon_name ("gtk-apply", Gtk.IconSize.MENU);
-      entry.image = image;
-
-      Test.add_data_func (DOMAIN + "/FakeIndicator", test_fake_indicator_object);
-      Test.add_data_func (DOMAIN + "/FakeIndicatorAddEntry", test_indicator_add_entry);
-      Test.add_data_func (DOMAIN + "/TestEntryView", test_indicator_enty_view);
-    }
-
-    private void test_fake_indicator_object ()
-    {
-      var fakeobject = new FakeIndicatorObject ();
-      
-      assert (fakeobject is FakeIndicatorObject);
-    }
-
-    private void test_indicator_add_entry ()
-    {
-      var fakeobject = new FakeIndicatorObject ();
-      var e = new IndicatorObjectView (fakeobject);
-
-      fakeobject.add_entry (entry);
-     
-      assert (e.find_entry (entry));
-    }
-
-    private void test_indicator_enty_view ()
-    {
-      var fakeobject = new FakeIndicatorObject ();
-      var e = new IndicatorObjectView (fakeobject);
-
-      fakeobject.add_entry (entry);
-      IndicatorObjectEntryView? entry_view = e.get_entry_view (entry);
-      
-      assert (entry_view.entry == entry);
-      assert (entry_view.entry.label == entry.label);
-      assert (entry_view.entry.image == entry.image);
-      assert (entry_view.entry.menu == entry.menu);
-    }
-  }
-}

=== removed file 'vala_tests/unit/test-places-place-file-model.vala'
--- vala_tests/unit/test-places-place-file-model.vala	2010-07-29 11:48:06 +0000
+++ vala_tests/unit/test-places-place-file-model.vala	1970-01-01 00:00:00 +0000
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2010 Canonical Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by Neil Jagdish Patel <[e-mail]>
- *
- */
-using Unity;
-using Unity.Testing;
-using Unity.Places;
-
-namespace Unity.Tests.Unit
-{
-  public class PlacesPlaceFileModelSuite : Object
-  {
-    public const string DOMAIN = "/Unit/Places/PlaceFileModel";
-
-    public PlacesPlaceFileModelSuite ()
-    {
-      Logging.init_fatal_handler ();
-
-      Test.add_data_func (DOMAIN + "/Allocation", test_allocation);
-    }
-
-    private void test_allocation ()
-    {
-      var model = new PlaceFileModel.with_directory (Config.TESTUNITDIR+"/data");
-      assert (model is PlaceFileModel);
-      assert (model.size == 2);
-    }
-  }
-}

=== removed file 'vala_tests/unit/test-places-place.vala'
--- vala_tests/unit/test-places-place.vala	2010-07-29 11:48:06 +0000
+++ vala_tests/unit/test-places-place.vala	1970-01-01 00:00:00 +0000
@@ -1,161 +0,0 @@
-/*
- * Copyright (C) 2010 Canonical Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by Neil Jagdish Patel <[e-mail]>
- *
- */
-using Unity;
-using Unity.Testing;
-using Unity.Places;
-using GLib.Test;
-
-namespace Unity.Tests.Unit
-{
-  public class PlacesPlaceSuite : Object
-  {
-    public const string DOMAIN = "/Unit/Places/Place";
-
-    public PlacesPlaceSuite ()
-    {
-      Logging.init_fatal_handler ();
-
-      Test.add_data_func (DOMAIN + "/Allocation", test_allocation);
-      Test.add_data_func (DOMAIN + "/SimplePlaceFile", test_simple_placefile);
-      Test.add_data_func (DOMAIN + "/AdvancedPlaceFile", test_advanced_place_file);
-      Test.add_data_func (DOMAIN + "/BadSimplePlaceFile", test_bad_simple_place_file);
-      Test.add_data_func (DOMAIN + "/BadAdvancedPlaceFile", test_bad_advanced_place_file);
-    }
-
-    private void test_allocation ()
-    {
-      var place = new Places.Place ("__name__", "__path__");
-      assert (place is Places.Place);
-      assert (place.dbus_name == "__name__");
-      assert (place.dbus_path == "__path__");
-    }
-
-    private void test_simple_placefile ()
-    {
-      var file = new KeyFile ();
-      try {
-        file.load_from_file (Config.TESTUNITDIR + "/data/place0.place",
-                             KeyFileFlags.NONE);
-      } catch (Error e) {
-          error ("Unable to load test place: %s", e.message);
-      }
-
-      var place = Places.Place.new_from_keyfile (file);
-      assert (place is Places.Place);
-
-      /* Test Place group was loaded properly */
-      assert (place.dbus_name == "org.ayatana.Unity.Place0");
-      assert (place.dbus_path == "/org/ayatana/Unity/Place0");
-
-      /* Test entries were loaded properly */
-      assert (place.n_entries == 0);
-    }
-
-    private void test_advanced_place_file ()
-    {
-      var file = new KeyFile ();
-      try {
-        file.load_from_file (Config.TESTUNITDIR + "/data/place1.place",
-                             KeyFileFlags.NONE);
-      } catch (Error error) {
-          warning ("Unable to load test place: %s", error.message);
-      }
-
-      var place = Places.Place.new_from_keyfile (file);
-      assert (place is Places.Place);
-
-      /* Test Place group was loaded properly */
-      assert (place.dbus_name == "org.ayatana.Unity.Place1");
-      assert (place.dbus_path == "/org/ayatana/Unity/Place1");
-
-      /* Test entries were loaded properly */
-      assert (place.n_entries == 3);
-
-      /* Test individual entry's properties were loaded correctly */
-      PlaceEntryDbus? e;
-
-      e = place.get_nth_entry (0) as PlaceEntryDbus;;
-      assert (e is PlaceEntry);
-      assert (e.dbus_path == "/org/ayatana/Unity/Place1/Entry1");
-      assert (e.name == "One");
-      assert (e.icon == "gtk-apply");
-      assert (e.description == "One Description");
-      assert (e.show_global == true);
-      assert (e.show_entry == false);
-
-      e = place.get_nth_entry (1) as PlaceEntryDbus;
-      assert (e is PlaceEntry);
-      assert (e.dbus_path == "/org/ayatana/Unity/Place1/Entry2");
-      assert (e.name == "Two");
-      assert (e.icon == "gtk-close");
-      assert (e.description == "Two Description");
-      assert (e.show_global == false);
-      assert (e.show_entry == true);
-
-      e = place.get_nth_entry (2) as PlaceEntryDbus;
-      assert (e is PlaceEntry);
-      assert (e.dbus_path == "/org/ayatana/Unity/Place1/Entry3");
-      assert (e.name == "Three");
-      assert (e.icon == "gtk-cancel");
-      assert (e.description == "Three Description");
-      assert (e.show_global == false);
-      assert (e.show_entry == false);
-    }
-
-    private void test_bad_simple_place_file ()
-    {
-      var file = new KeyFile ();
-      try {
-        file.load_from_file (Config.TESTUNITDIR + "/data/place0.badplace",
-                             KeyFileFlags.NONE);
-      } catch (Error error) {
-          warning ("Unable to load test place: %s", error.message);
-      }
-
-      if (trap_fork (0, TestTrapFlags.SILENCE_STDOUT | TestTrapFlags.SILENCE_STDERR))
-        {
-          var place = Places.Place.new_from_keyfile (file);
-          assert (place is Places.Place);
-          Posix.exit (0);
-        }
-        trap_has_passed ();
-        trap_assert_stderr ("*Does not contain 'Place' grou*");
-    }
-
-    private void test_bad_advanced_place_file ()
-    {
-      var file = new KeyFile ();
-      try {
-        file.load_from_file (Config.TESTUNITDIR + "/data/place1.badplace",
-                             KeyFileFlags.NONE);
-      } catch (Error error) {
-          warning ("Unable to load test place: %s", error.message);
-      }
-
-      if (trap_fork (0, TestTrapFlags.SILENCE_STDOUT | TestTrapFlags.SILENCE_STDERR))
-        {
-          var place = Places.Place.new_from_keyfile (file);
-          assert (place is Places.Place);
-          Posix.exit (0);
-        }
-        trap_has_passed ();
-        trap_assert_stderr ("*Does not contain valid DBusObjectPat*");
-    }
-  }
-}

=== removed file 'vala_tests/unit/test-places.vala'
--- vala_tests/unit/test-places.vala	2010-06-02 12:05:59 +0000
+++ vala_tests/unit/test-places.vala	1970-01-01 00:00:00 +0000
@@ -1,68 +0,0 @@
-/* -*- Mode: vala; indent-tabs-mode: nil; c-basic-offset: 2; tab-width: 2 -*- */
-/*
- * Copyright (C) 2009 Canonical Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by Neil Jagdish Patel <[e-mail]>
- *
- */
-using Unity;
-using Unity.Testing;
-
-namespace Unity.Tests.Unit
-{
-  public class PlacesSuite
-  {
-    public PlacesSuite ()
-    {
-      /*Test.add_func ("/Unit/Places/TestPlace", () => {
-
-        Logging.init_fatal_handler ();
-
-        var place = new TestPlace ();
-
-        assert (place is TestPlace);
-
-        var loop = new MainLoop (null, false);
-
-        try
-          {
-            DBus.Connection conn = DBus.Bus.get (DBus.BusType.SESSION);
-
-            Utils.register_object_on_dbus (conn,
-                                    "/com/canonical/Unity/Place",
-                                    place);
-            loop.get_context ().iteration (true);
-          }
-        catch (Error e)
-          {
-            warning ("TestPlace error: %s", e.message);
-          }
-      });*/
-    }
-
-    /*public class TestPlace : Unity.Place
-    {
-      public TestPlace ()
-      {
-        Object (name:"neil", icon_name:"gtk-apply", tooltip:"hello");
-      }
-
-      construct
-      {
-        this.is_active.connect ((a) => {print (@"$a\n");});
-      }
-    }*/
-  }
-}