add a 'hello world' test for instantiating IndicatorPower

3 files changed, 94 insertions, 52 deletions

diff --git a/src/indicator-power.c b/src/indicator-power.c
index 7cdaeb2..ea1caa5 100644
--- a/src/indicator-power.c
+++ b/src/indicator-power.c
@@ -31,9 +31,7 @@ with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* upower */
 #include <libupower-glib/upower.h>
 
-/* Indicator Stuff */
-#include <libindicator/indicator.h>
-#include <libindicator/indicator-object.h>
+#include "indicator-power.h"
 
 #define ICON_POLICY_KEY "icon-policy"
 
@@ -50,43 +48,6 @@ enum {
   POWER_INDICATOR_ICON_POLICY_NEVER
 };
 
-#define INDICATOR_POWER_TYPE            (indicator_power_get_type ())
-#define INDICATOR_POWER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), INDICATOR_POWER_TYPE, IndicatorPower))
-#define INDICATOR_POWER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), INDICATOR_POWER_TYPE, IndicatorPowerClass))
-#define IS_INDICATOR_POWER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), INDICATOR_POWER_TYPE))
-#define IS_INDICATOR_POWER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), INDICATOR_POWER_TYPE))
-#define INDICATOR_POWER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), INDICATOR_POWER_TYPE, IndicatorPowerClass))
-
-typedef struct _IndicatorPowerClass    IndicatorPowerClass;
-typedef struct _IndicatorPower         IndicatorPower;
-
-struct _IndicatorPowerClass
-{
-  IndicatorObjectClass parent_class;
-};
-
-struct _IndicatorPower
-{
-  IndicatorObject parent_instance;
-
-  GtkMenu   *menu;
-
-  GtkLabel *label;
-  GtkImage *status_image;
-  gchar    *accessible_desc;
-
-  GCancellable *proxy_cancel;
-  GDBusProxy   *proxy;
-  guint         watcher_id;
-
-  GVariant *devices;
-  GVariant *device;
-
-  GSettings *settings;
-};
-
-GType indicator_power_get_type (void) G_GNUC_CONST;
-
 INDICATOR_SET_VERSION
 INDICATOR_SET_TYPE (INDICATOR_POWER_TYPE)
 
diff --git a/src/indicator-power.h b/src/indicator-power.h
new file mode 100644
index 0000000..6fadae3
--- /dev/null
+++ b/src/indicator-power.h
@@ -0,0 +1,68 @@
+/*
+An indicator to power related information in the menubar.
+
+Copyright 2011 Canonical Ltd.
+
+Authors:
+    Javier Jardon <javier.jardon@codethink.co.uk>
+
+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 warranties of
+MERCHANTABILITY, SATISFACTORY QUALITY, 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/>.
+*/
+
+/* Gtk required */
+#include <gtk/gtk.h>
+
+/* parent class */
+#include <libindicator/indicator.h>
+#include <libindicator/indicator-object.h>
+
+G_BEGIN_DECLS
+
+#define INDICATOR_POWER_TYPE            (indicator_power_get_type ())
+#define INDICATOR_POWER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), INDICATOR_POWER_TYPE, IndicatorPower))
+#define INDICATOR_POWER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), INDICATOR_POWER_TYPE, IndicatorPowerClass))
+#define IS_INDICATOR_POWER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), INDICATOR_POWER_TYPE))
+#define IS_INDICATOR_POWER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), INDICATOR_POWER_TYPE))
+#define INDICATOR_POWER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), INDICATOR_POWER_TYPE, IndicatorPowerClass))
+
+typedef struct _IndicatorPowerClass    IndicatorPowerClass;
+typedef struct _IndicatorPower         IndicatorPower;
+
+struct _IndicatorPowerClass
+{
+  IndicatorObjectClass parent_class;
+};
+
+struct _IndicatorPower
+{
+  IndicatorObject parent_instance;
+
+  GtkMenu   *menu;
+
+  GtkLabel *label;
+  GtkImage *status_image;
+  gchar    *accessible_desc;
+
+  GCancellable *proxy_cancel;
+  GDBusProxy   *proxy;
+  guint         watcher_id;
+
+  GVariant *devices;
+  GVariant *device;
+
+  GSettings *settings;
+};
+
+GType indicator_power_get_type (void) G_GNUC_CONST;
+
+G_END_DECLS
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 87dd606..341abdd 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -2,9 +2,6 @@ TESTS =
 CLEANFILES =
 check_PROGRAMS =
 
-AM_CPPFLAGS = $(GTEST_CPPFLAGS) -I${top_srcdir}/src -Wall -Werror
-AM_CXXFLAGS = $(GTEST_CXXFLAGS)
-
 ###
 ###
 ###
@@ -12,27 +9,43 @@ AM_CXXFLAGS = $(GTEST_CXXFLAGS)
 # stock UMB tests on user-visible strings
 include $(srcdir)/Makefile.am.strings
 
+check_LIBRARIES = libgtest.a
+nodist_libgtest_a_SOURCES = \
+  $(GTEST_SOURCE)/src/gtest-all.cc \
+  $(GTEST_SOURCE)/src/gtest_main.cc
+
+AM_CPPFLAGS = $(GTEST_CPPFLAGS) -I${top_srcdir}/src -Wall -Werror
+AM_CXXFLAGS = $(GTEST_CXXFLAGS)
+
 ###
 ###
 ###
 
-TESTS += test-device
-check_PROGRAMS += test-device
-test_device_SOURCES = test-device.cc
-test_device_LDADD = \
+TEST_LIBS = \
 	$(top_builddir)/src/libpower.la \
 	$(INDICATOR_LIBS) \
 	$(UPOWER_LIBS) \
         $(COVERAGE_LDFLAGS) \
 	libgtest.a
 
-test_device_CPPFLAGS = \
+TEST_CPPFLAGS = \
 	$(AM_CPPFLAGS) \
 	$(UPOWER_CFLAGS) \
         $(INDICATOR_CFLAGS) \
         $(COVERAGE_CFLAGS)
 
-check_LIBRARIES = libgtest.a
-nodist_libgtest_a_SOURCES = \
-  $(GTEST_SOURCE)/src/gtest-all.cc \
-  $(GTEST_SOURCE)/src/gtest_main.cc
+TESTS += test-device
+check_PROGRAMS += test-device
+test_device_SOURCES = test-device.cc
+test_device_LDADD = $(TEST_LIBS)
+test_device_CPPFLAGS = $(TEST_CPPFLAGS)
+
+TESTS += test-indicator
+check_PROGRAMS += test-indicator
+test_indicator_SOURCES = test-indicator.cc
+test_indicator_LDADD = $(TEST_LIBS)
+test_indicator_CPPFLAGS = $(TEST_CPPFLAGS)
+
+###
+###
+###