Merged in unity-ql-uc1

(bzr r3)

2 files changed, 27 insertions, 2 deletions

diff --git a/tests/Makefile.am b/tests/Makefile.am
index ccb2acd6a..ae3a8f84d 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -2,17 +2,20 @@ bin_PROGRAMS = test-unity
 
 test_unity_CPPFLAGS = \
 -I$(top_builddir)/src \
+ -I$(top_builddir)/src/quicklauncher \
 $(BASE_CFLAGS) \
 $(MAINTAINER_CFLAGS)
 
 test_unity_LDADD = \
 $(top_builddir)/src/libunity-static.la \
+ $(top_builddir)/src/quicklauncher/libunity-quicklauncher.la \
 $(BASE_LIBS) \
 $(MAINTAINER_LIBS)
 
 test_unity_VALAFLAGS = \
 --vapidir=$(top_builddir)/src \
- --vapidir=../vapi/ \
+ --vapidir=$(top_builddir)/src/quicklauncher \
+ --vapidir=$(top_builddir)/vapi/ \
 --vapidir=./ \
 --pkg clutter-1.0 \
 --pkg clutter-gtk-0.10 \
@@ -22,7 +25,10 @@ test_unity_VALAFLAGS = \
 --pkg x11 \
 --pkg gtk+-2.0 \
 --pkg gee-1.0 \
+ --pkg clutk-0.3 \
+ --pkg launcher-0.3 \
 --pkg unity-static \
+ --pkg unity-quicklauncher \
 $(MAINTAINER_VALAFLAGS)
 
 test_unity_SOURCES = \
diff --git a/tests/test-unity.vala b/tests/test-unity.vala
index dcbb8ddea..0b726b5a7 100644
--- a/tests/test-unity.vala
+++ b/tests/test-unity.vala
@@ -1,3 +1,4 @@
+/* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 2; tab-width: 2 -*- */
 /*
 * Copyright (C) 2009 Canonical Ltd
 *
@@ -16,13 +17,14 @@
 * Authored by Neil Jagdish Patel <neil.patel@canonical.com>
 *
 */
+using Unity;
 
 public class Main
 {
 public static int main (string[] args)
 {
 Gtk.init (ref args);
-	GtkClutter.init (ref args);
+ GtkClutter.init (ref args);
 Test.init (ref args);
 
 add_launcher_tests ();
@@ -48,5 +50,22 @@ public class Main
 assert (window.visible);
 } 
 );
+
+	Test.add_func ("/Unity/Quicklauncher/ApplicationView", () => {
+	var app = new Launcher.Application.from_desktop_file (
+	"/usr/share/applications/firefox.desktop");
+
+	var appview = new Quicklauncher.ApplicationView (app);
+	assert (appview is Quicklauncher.ApplicationView);
+	assert (appview.app is Launcher.Application);
+	}
+	);
+
+ Test.add_func ("/Unity/Quicklauncher/ApplicationStore", () => {
+ var appstore = new Quicklauncher.ApplicationStore ();
+ assert (appstore is Quicklauncher.ApplicationStore);
+ }
+ );
+
 }
 }