Merge lp:~ted/ido/gtest into lp:ido/12.10

[Ted Gould]

Adding the gtest framework and a few tests to make sure our menu items can be created and realized.

[Charles Kerr (charlesk)]

ted, looks like this diff is missing the implementation of CHECK_XORG_GTEST.

Did you mean to bzr add another file into m4/ ?

review: Needs Fixing

[Charles Kerr (charlesk)]

d'oh, libxorg-gtest-dev

[jenkins (martin-mrazik+qa)]

PASSED: Continuous integration, rev:119
http://jenkins.qa.ubuntu.com/job/ido-ci/3/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ido-ci/./label=precise/3/console

review: Approve (continuous-integration)

[Charles Kerr (charlesk)]

This was merged awhile back in revno: 109, finally closing out the merge requests and marking this as Merged.

=== modified file '.bzrignore'
--- .bzrignore	2011-09-16 19:34:54 +0000
+++ .bzrignore	2012-04-25 20:33:21 +0000
@@ -28,3 +28,7 @@
 src/libido3-0.1.la
 src/stamp-idotypebuiltins.h
 m4
+m4/gtk-doc.m4
+.deps
+.libs
+gtest-menuitems

=== modified file 'Makefile.am'
--- Makefile.am	2012-03-28 04:50:43 +0000
+++ Makefile.am	2012-04-25 20:33:21 +0000
@@ -10,7 +10,7 @@
 Q         = $(V:1=)
 QUIET_GEN = $(Q:@=@echo '  GEN   '$@;)
 
-SUBDIRS = src example
+SUBDIRS = src example tests
 
 %-0.1.pc: %.pc
 	$(QUIET_GEN) cp -f $< $@

=== modified file 'configure.ac'
--- configure.ac	2012-04-12 15:18:01 +0000
+++ configure.ac	2012-04-25 20:33:21 +0000
@@ -57,6 +57,7 @@
 # Checks for programs
 AC_PROG_CC
 AM_PROG_CC_C_O
+AC_PROG_CXX
 
 # Initialize libtool
 LT_PREREQ([2.2])
@@ -128,6 +129,12 @@
 AC_SUBST(COVERAGE_CXXFLAGS)
 AC_SUBST(COVERAGE_LDFLAGS)
 
+dnl = Google Test Framework ===================================================
+
+m4_include([m4/gtest.m4])
+CHECK_GTEST
+CHECK_XORG_GTEST
+
 dnl = GTK Doc Check ===========================================================
 
 GTK_DOC_CHECK([1.8])
@@ -138,6 +145,7 @@
   Makefile
   src/Makefile
   example/Makefile
+  tests/Makefile
   libido.pc
   libido3.pc
 ])

=== added file 'm4/gtest.m4'
--- m4/gtest.m4	1970-01-01 00:00:00 +0000
+++ m4/gtest.m4	2012-04-25 20:33:21 +0000
@@ -0,0 +1,63 @@
+# Copyright (C) 2012 Canonical, Ltd.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+# Checks whether the gtest source is available on the system. Allows for
+# adjusting the include and source path. Sets have_gtest=yes if the source is
+# present. Sets GTEST_CPPFLAGS and GTEST_SOURCE to the preprocessor flags and
+# source location respectively.
+AC_DEFUN([CHECK_GTEST],
+[
+  AC_ARG_WITH([gtest-include-path],
+              [AS_HELP_STRING([--with-gtest-include-path],
+                              [location of the Google test headers])],
+              [GTEST_CPPFLAGS="-I$withval"])
+
+  AC_ARG_WITH([gtest-source-path],
+              [AS_HELP_STRING([--with-gtest-source-path],
+                              [location of the Google test sources, defaults to /usr/src/gtest])],
+              [GTEST_SOURCE="$withval"],
+              [GTEST_SOURCE="/usr/src/gtest"])
+
+  GTEST_CPPFLAGS="$GTEST_CPPFLAGS -I$GTEST_SOURCE"
+
+  AC_LANG_PUSH([C++])
+
+  tmp_CPPFLAGS="$CPPFLAGS"
+  CPPFLAGS="$CPPFLAGS $GTEST_CPPFLAGS"
+
+  AC_CHECK_HEADER([gtest/gtest.h])
+
+  CPPFLAGS="$tmp_CPPFLAGS"
+
+  AC_LANG_POP
+
+  AC_CHECK_FILES([$GTEST_SOURCE/src/gtest-all.cc]
+                 [$GTEST_SOURCE/src/gtest_main.cc],
+                 [have_gtest_source=yes],
+                 [have_gtest_source=no])
+
+  AS_IF([test "x$ac_cv_header_gtest_gtest_h" = xyes -a \
+              "x$have_gtest_source" = xyes],
+        [have_gtest=yes]
+        [AC_SUBST(GTEST_CPPFLAGS)]
+        [AC_SUBST(GTEST_SOURCE)],
+        [have_gtest=no])
+]) # CHECK_GTEST

=== modified file 'src/idorange.h'
--- src/idorange.h	2011-10-05 17:41:37 +0000
+++ src/idorange.h	2012-04-25 20:33:21 +0000
@@ -28,6 +28,8 @@
 
 #include <gtk/gtk.h>
 
+G_BEGIN_DECLS
+
 #define IDO_TYPE_RANGE         (ido_range_get_type ())
 #define IDO_RANGE(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), IDO_TYPE_RANGE, IdoRange))
 #define IDO_RANGE_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST ((k), IDO_TYPE_RANGE, IdoRangeClass))

=== added directory 'tests'
=== added file 'tests/Makefile.am'
--- tests/Makefile.am	1970-01-01 00:00:00 +0000
+++ tests/Makefile.am	2012-04-25 20:33:21 +0000
@@ -0,0 +1,52 @@
+if USE_GTK3
+VER=3
+IDOLIB = $(top_builddir)/src/libido3-0.1.la
+else
+VER=
+IDOLIB = $(top_builddir)/src/libido-0.1.la
+endif
+
+check_LIBRARIES = libgtest.a
+check_PROGRAMS = 
+TESTS =
+
+AM_CPPFLAGS = \
+	$(GTEST_CPPFLAGS) \
+	-I${top_srcdir}/src
+
+#############################
+# Google Test base library
+#############################
+
+nodist_libgtest_a_SOURCES = \
+	$(XORG_GTEST_SOURCE)/src/xorg-gtest-all.cpp \
+	$(GTEST_SOURCE)/src/gtest-all.cc \
+	$(XORG_GTEST_SOURCE)/src/xorg-gtest_main.cpp
+libgtest_a_CPPFLAGS = \
+	$(XORG_GTEST_CPPFLAGS) \
+	$(AM_CPPFLAGS) \
+	$(GTEST_CPPFLAGS) -w
+libgtest_a_CXXFLAGS = \
+	$(AM_CXXFLAGS)
+
+#############################
+# Menuitem tests
+#############################
+
+TESTS += gtest-menuitems
+check_PROGRAMS += gtest-menuitems
+
+gtest_menuitems_SOURCES = \
+	gtest-menuitems.cpp
+gtest_menuitems_CPPFLAGS = \
+	$(GCC_CFLAGS) \
+	$(GTK_CFLAGS) \
+	$(MAINTAINER_CFLAGS) \
+	$(AM_CPPFLAGS)
+gtest_menuitems_LDFLAGS = \
+	-pthread
+gtest_menuitems_LDADD = \
+	$(GTK_LIBS) \
+	$(IDOLIB) \
+	libgtest.a
+

=== added file 'tests/gtest-menuitems.cpp'
--- tests/gtest-menuitems.cpp	1970-01-01 00:00:00 +0000
+++ tests/gtest-menuitems.cpp	2012-04-25 20:33:21 +0000
@@ -0,0 +1,102 @@
+
+#include <gtk/gtk.h>
+#include <gtest/gtest.h>
+#include "idocalendarmenuitem.h"
+#include "idoentrymenuitem.h"
+#include "idoscalemenuitem.h"
+
+class TestMenuitems : public ::testing::Test
+{
+public:
+	TestMenuitems()
+	{
+		gint argc = 0;
+		gchar * argv[] = {NULL};
+		gtk_init(&argc, (gchar ***)&argv);
+		return;
+	}
+};
+
+TEST_F(TestMenuitems, BuildCalendar) {
+	GtkWidget * cal = ido_calendar_menu_item_new();
+
+	EXPECT_TRUE(cal != NULL);
+	EXPECT_TRUE(IDO_IS_CALENDAR_MENU_ITEM(cal));
+	EXPECT_TRUE(GTK_IS_MENU_ITEM(cal));
+
+	GtkWidget * menu = gtk_menu_new();
+	gtk_widget_show(menu);
+	gtk_menu_shell_append(GTK_MENU_SHELL(menu), cal);
+
+	gtk_widget_show(cal);
+	gtk_widget_realize(cal);
+
+	EXPECT_TRUE(gtk_widget_get_realized(cal));
+
+	g_object_ref_sink(menu);
+	g_object_unref(menu);
+	return;
+}
+
+TEST_F(TestMenuitems, BuildEntry) {
+	GtkWidget * entry = ido_entry_menu_item_new();
+
+	EXPECT_TRUE(entry != NULL);
+	EXPECT_TRUE(IDO_IS_ENTRY_MENU_ITEM(entry));
+	EXPECT_TRUE(GTK_IS_MENU_ITEM(entry));
+
+	GtkWidget * menu = gtk_menu_new();
+	gtk_widget_show(menu);
+	gtk_menu_shell_append(GTK_MENU_SHELL(menu), entry);
+
+	gtk_widget_show(entry);
+	gtk_widget_realize(entry);
+
+	EXPECT_TRUE(gtk_widget_get_realized(entry));
+
+	g_object_ref_sink(menu);
+	g_object_unref(menu);
+	return;
+}
+
+TEST_F(TestMenuitems, BuildScaleDefault) {
+	GtkWidget * scale = ido_scale_menu_item_new("Label", IDO_RANGE_STYLE_DEFAULT, gtk_adjustment_new(0.5, 0.0, 1.0, 0.01, 0.1, 0.1));
+
+	EXPECT_TRUE(scale != NULL);
+	EXPECT_TRUE(IDO_IS_SCALE_MENU_ITEM(scale));
+	EXPECT_TRUE(GTK_IS_MENU_ITEM(scale));
+
+	GtkWidget * menu = gtk_menu_new();
+	gtk_widget_show(menu);
+	gtk_menu_shell_append(GTK_MENU_SHELL(menu), scale);
+
+	gtk_widget_show(scale);
+	gtk_widget_realize(scale);
+
+	EXPECT_TRUE(gtk_widget_get_realized(scale));
+
+	g_object_ref_sink(menu);
+	g_object_unref(menu);
+	return;
+}
+
+TEST_F(TestMenuitems, BuildScaleSmall) {
+	GtkWidget * scale = ido_scale_menu_item_new("Label", IDO_RANGE_STYLE_SMALL, gtk_adjustment_new(0.5, 0.0, 1.0, 0.01, 0.1, 0.1));
+
+	EXPECT_TRUE(scale != NULL);
+	EXPECT_TRUE(IDO_IS_SCALE_MENU_ITEM(scale));
+	EXPECT_TRUE(GTK_IS_MENU_ITEM(scale));
+
+	GtkWidget * menu = gtk_menu_new();
+	gtk_widget_show(menu);
+	gtk_menu_shell_append(GTK_MENU_SHELL(menu), scale);
+
+	gtk_widget_show(scale);
+	gtk_widget_realize(scale);
+
+	EXPECT_TRUE(gtk_widget_get_realized(scale));
+
+	g_object_ref_sink(menu);
+	g_object_unref(menu);
+	return;
+}