Merge lp:~amigadave/account-plugins/add-some-tests into lp:account-plugins

[David King]

Add a couple of simple tests

* Add tests for well-formed XML files
* Enable automake silent rules

Add a couple of simple tests

* Add tests for well-formed XML files
* Enable automake silent rules

[David King (amigadave)]

This checks the .provider and .service files with xmllint. It does not check against the DTDs provided by libaccounts-glib, as those will not be available until a future 1.4 release. Some tests for the binary plugins could be provided, but I am not sure how to approach that problem at the moment.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:86
http://s-jenkins:8080/job/account-plugins-ci/10/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/account-plugins-ci/./build=pbuilder,distribution=raring,flavor=amd64/10/console
    FAILURE: http://s-jenkins:8080/job/account-plugins-ci/./build=pbuilder,distribution=raring,flavor=i386/10/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/account-plugins-ci/10//rebuild/?

review: Needs Fixing (continuous-integration)

[lp:~amigadave/account-plugins/add-some-tests]

87. By David King on 2012-12-06

Enable the XML tests only if xmllint is present

88. By David King on 2012-12-06

Force tests to be enabled during distcheck

Add an --enable-tests configure argument, and add it to
DISTCHECK_CONFIGURE_FLAGS.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:88
http://s-jenkins:8080/job/account-plugins-ci/11/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/account-plugins-ci/./build=pbuilder,distribution=raring,flavor=amd64/11/console
    SUCCESS: http://s-jenkins:8080/job/account-plugins-ci/./build=pbuilder,distribution=raring,flavor=i386/11/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/account-plugins-ci/11//rebuild/?

review: Approve (continuous-integration)

[Alberto Mardegan (mardy)]

I don't think there is much sense in making tests for the binary plugins, are they mostly consist of data only -- which BTW will soon be migrated to the provider files, once the new libaccounts-glib is released.

Anyway, this MR makes lots of sense, thanks! :-)

review: Approve

=== modified file '.bzrignore'
--- .bzrignore	2012-11-23 10:02:15 +0000
+++ .bzrignore	2012-12-06 08:13:21 +0000
@@ -57,3 +57,5 @@
 /src/sohu.c
 /src/twitter.c
 /src/windows-live.c
+/test-provider
+/test-service

=== modified file 'Makefile.am'
--- Makefile.am	2012-11-23 10:02:52 +0000
+++ Makefile.am	2012-12-06 08:13:21 +0000
@@ -2,7 +2,8 @@
 	po
 
 DISTCHECK_CONFIGURE_FLAGS = \
-	--enable-libaccount-plugin
+	--enable-libaccount-plugin \
+	--enable-tests
 
 if ENABLE_LIBACCOUNT_PLUGIN
 # Binary account plugins.
@@ -185,9 +186,32 @@
 	$(services_in_files) \
 	src/config.vapi
 
+if HAVE_XMLLINT
+TESTS = \
+	test-provider \
+	test-service
+
+test-provider: Makefile $(providers_DATA)
+	$(AM_V_GEN)echo "#!/bin/sh -e" > $@; \
+		echo "for provider in $(providers_DATA)" >> $@; \
+		echo "do" >> $@; \
+		echo "    $(XMLLINT) --noout $(top_builddir)/\$$provider || exit 1" >> $@; \
+		echo "done" >> $@; \
+		chmod +x $@
+
+test-service: Makefile $(services_DATA)
+	$(AM_V_GEN)echo "#!/bin/sh -e" > $@; \
+		echo "for service in $(services_DATA)" >> $@; \
+		echo "do" >> $@; \
+		echo "    $(XMLLINT) --noout $(top_builddir)/\$$service || exit 1" >> $@; \
+		echo "done" >> $@; \
+		chmod +x $@
+endif # HAVE_XMLLINT
+
 CLEANFILES = \
 	$(services_DATA) \
-	$(providers_DATA)
+	$(providers_DATA) \
+	$(TESTS)
 
 DISTCLEANFILES = \
 	intltool-extract \

=== modified file 'configure.ac'
--- configure.ac	2012-11-13 09:00:39 +0000
+++ configure.ac	2012-12-06 08:13:21 +0000
@@ -6,7 +6,7 @@
         [account-plugins],
         [https://launchpad.net/online-accounts-account-plugins])
 
-AM_INIT_AUTOMAKE([1.10 -Wall -Wno-portability subdir-objects])
+AM_INIT_AUTOMAKE([1.10 -Wall -Wno-portability silent-rules subdir-objects])
 AM_CONFIG_HEADER(config.h)
 
 # Gobject Introspection
@@ -56,6 +56,22 @@
 AC_SUBST([servicesdir],
          [`$PKG_CONFIG --variable servicefilesdir libaccounts-glib`])
 
+AC_ARG_ENABLE([TESTS],
+    [AS_HELP_STRING([--disable-tests], [Disable tests])])
+
+AS_IF([test "x$enable_tests" != "xno"],
+    [AC_PATH_PROG([XMLLINT], [xmllint], [notfound])
+     AS_IF([test "x$XMLLINT" = "xnotfound"],
+         [have_xmllint=no],
+         [have_xmllint=yes])])
+
+AS_IF([test "x$have_xmllint" = "xyes"],
+    [AC_SUBST([XMLLINT])],
+    [AS_IF([test "x$enable_tests" = "xyes"],
+         [AC_MSG_ERROR([testing support enabled but required dependencies were not found])])])
+
+AM_CONDITIONAL([HAVE_XMLLINT], [test "x$have_xmllint" = "xyes"])
+
 # Set Twitter consumer key/secret
 AC_ARG_WITH(twitter-consumer-key,
             [AS_HELP_STRING([--with-twitter-consumer-key],