[libgda] Fixes on Unit Test for Vala extensions: * Most tests pass. Remains chopping with fails. * More fixes

[Daniel Espinosa Ortiz <despinosa src gnome org>]

commit a54fbdf67029d1db8ceb9e383186f23abe457c7c
Author: Daniel Espinosa <esodan gmail com>
Date:   Tue Sep 18 02:53:09 2012 -0500

    Fixes on Unit Test for Vala extensions:
    * Most tests pass. Remains chopping with fails.
    * More fixes on unit tests build Makefile.am
    * Fix a dump error due to use an invalid iterator
    * Added GdaData.RecordCollection.chop implementation. Must be defined in Gee.
    * Fix vapigen.m4 warnings, by using AC_REQUIRE instead AC_BEFORE

 libgda/data/GdaData-5.0.gir            |   15 +++++
 libgda/data/RecordCollection.vala      |    5 ++
 m4/vapigen.m4                          |    2 +-
 tests/vala/CheckDataModelIterator.vala |  107 ++++++++++++++++++--------------
 tests/vala/Makefile.am                 |   12 +---
 5 files changed, 82 insertions(+), 59 deletions(-)
---
diff --git a/libgda/data/GdaData-5.0.gir b/libgda/data/GdaData-5.0.gir
index 84f1f4d..25caafe 100644
--- a/libgda/data/GdaData-5.0.gir
+++ b/libgda/data/GdaData-5.0.gir
@@ -212,6 +212,21 @@
 				</parameter>
 			</parameters>
 		</constructor>
+		<method name="chop" c:identifier="gda_data_record_collection_chop">
+			<return-value transfer-ownership="full">
+				<type name="Gee.Iterator" c:type="GeeIterator*">
+					<type name="GdaData.DbRecord" c:type="GdaDataDbRecord*"/>
+				</type>
+			</return-value>
+			<parameters>
+				<parameter name="offset" transfer-ownership="none">
+					<type name="gint" c:type="gint"/>
+				</parameter>
+				<parameter name="length" transfer-ownership="none">
+					<type name="gint" c:type="gint"/>
+				</parameter>
+			</parameters>
+		</method>
 		<method name="to_string" c:identifier="gda_data_record_collection_to_string">
 			<return-value transfer-ownership="full">
 				<type name="utf8" c:type="gchar*"/>
diff --git a/libgda/data/RecordCollection.vala b/libgda/data/RecordCollection.vala
index 3cf8f24..ae9559a 100644
--- a/libgda/data/RecordCollection.vala
+++ b/libgda/data/RecordCollection.vala
@@ -131,6 +131,11 @@ namespace GdaData {
 				return _model.get_n_rows ();
 			} 
 		}
+		// Traversable interface
+		public Gee.Iterator<DbRecord> chop (int offset, int length = -1) 
+		{
+			return this.iterator ().chop (offset, length);
+		}
 		// 
 		public string to_string ()
 		{
diff --git a/m4/vapigen.m4 b/m4/vapigen.m4
index d51bab3..0f7183e 100644
--- a/m4/vapigen.m4
+++ b/m4/vapigen.m4
@@ -23,7 +23,7 @@ dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  US
 # See http://live.gnome.org/Vala/UpstreamGuide for detailed documentation
 AC_DEFUN([VAPIGEN_CHECK],
 [
-  AC_BEFORE([GOBJECT_INTROSPECTION_CHECK],[$0])
+  AC_REQUIRE([GOBJECT_INTROSPECTION_CHECK])
   AC_REQUIRE([PKG_PROG_PKG_CONFIG])
   AC_REQUIRE([AM_PROG_VALAC])
   
diff --git a/tests/vala/CheckDataModelIterator.vala b/tests/vala/CheckDataModelIterator.vala
index 73245d4..460827d 100644
--- a/tests/vala/CheckDataModelIterator.vala
+++ b/tests/vala/CheckDataModelIterator.vala
@@ -100,81 +100,94 @@ namespace Check {
 			var iter = itermodel.chop (1);
 			if (!iter.valid)
 				stdout.printf ("----- FAIL: " + (++fails).to_string () + "\n");
-			stdout.printf (iter.get ().to_string () + "\n");
-			var name = (string) iter.get().get_value ("name");
-			if (name == "Jhon")
-				stdout.printf ("+++++ PASS\n");
 			else {
-				fails++;
-				stdout.printf ("----- FAIL: " + (++fails).to_string () + "\n");
+				stdout.printf (iter.get ().to_string () + "\n");
+				var name = (string) iter.get().get_value ("name");
+				if (name == "Jhon")
+					stdout.printf ("+++++ PASS\n");
+				else {
+					fails++;
+					stdout.printf ("----- FAIL: " + (++fails).to_string () + "\n");
+				}
 			}
 			
 			stdout.printf ("Choping to get the 4th to 5th DbRecords...\n");
 			var iter2 = itermodel.chop (3,2);
 			if (!iter2.valid)
-				stdout.printf ("----- FAIL: " + (fails++).to_string () + "\n");
-			
-			stdout.printf ("Iterating over chopped records...\n");
-			int i = 0;
-			while (iter2.valid) {
-				i++;
-				stdout.printf (iter2.get ().to_string () + "\n");
-				var name2 = (string) iter2.get().get_value ("name");
-				if (i==1) {
-					if (name2 != "Jack") {
-						fails++;
-						stdout.printf ("----- FAIL: " + (++fails).to_string () + "\n");
-						break;
+				stdout.printf ("----- FAIL: " + (++fails).to_string () + "\n");
+			else {
+				stdout.printf ("Iterating over chopped records...\n");
+				int i = 0;
+				while (iter2.valid) {
+					i++;
+					stdout.printf (iter2.get ().to_string () + "\n");
+					var name2 = (string) iter2.get().get_value ("name");
+					if (i==1) {
+						if (name2 != "Jack") {
+							fails++;
+							stdout.printf ("----- FAIL: " + (++fails).to_string () + "\n");
+							break;
+						}
 					}
-				}
-				if (i==2) {
-					if (name2 != "Elsy") {
-						fails++;
-						stdout.printf ("----- FAIL: " + (++fails).to_string () + "\n");
-						break;
+					if (i==2) {
+						if (name2 != "Elsy") {
+							fails++;
+							stdout.printf ("----- FAIL: " + (++fails).to_string () + "\n");
+							break;
+						}
 					}
+					iter2.next ();
 				}
-				iter2.next ();
-			}
-			if (i!=2) {
-				fails++;
-				stdout.printf ("----- FAIL: " + (++fails).to_string () + "\n");
+				if (i!=2) {
+					fails++;
+					stdout.printf ("----- FAIL: " + (++fails).to_string () + "\n");
+				}
+				stdout.printf ("+++++ PASS\n");
 			}
-			stdout.printf ("+++++ PASS\n");
 			
 			stdout.printf ("Choping offset = 7 must fail...\n");
 			var iter3 = itermodel.chop (7);
 			if (iter3.valid)
 				stdout.printf ("----- FAIL: " + (++fails).to_string () + "\n");
-			if (!iter3.next ())
-				stdout.printf ("----- FAIL: " + (++fails).to_string () + "\n");
-			if (fails == 0)
-				stdout.printf ("+++++ PASS\n");
+			else {
+				if (!iter3.next ())
+					stdout.printf ("----- FAIL: " + (++fails).to_string () + "\n");
+				if (fails == 0)
+					stdout.printf ("+++++ PASS\n");
+			}
+			
 			stdout.printf ("Choping offset = 6 length = 0 must fail...\n");
 			var iter4 = itermodel.chop (6,0);
 			if (iter4.valid)
 				stdout.printf ("----- FAIL: " + (++fails).to_string () + "\n");
-			if (!iter4.next ())
-				stdout.printf ("----- FAIL: " + (++fails).to_string () + "\n");
-			if (fails == 0)
-				stdout.printf ("+++++ PASS\n");
+			else {
+				if (!iter4.next ())
+					stdout.printf ("----- FAIL: " + (++fails).to_string () + "\n");
+				if (fails == 0)
+					stdout.printf ("+++++ PASS\n");
+			}
 			
 			stdout.printf ("Choping offset = 5 length = 1...\n");
 			var iter5 = itermodel.chop (5,1);
 			if (!iter5.valid)
 				stdout.printf ("----- FAIL: " + (++fails).to_string () + "\n");
-			if (iter5.next ())
-				stdout.printf ("----- FAIL: " + (++fails).to_string () + "\n");
-			if (fails == 0)
-				stdout.printf ("+++++ PASS\n");
+			else {
+				if (iter5.next ())
+					stdout.printf ("----- FAIL: " + (++fails).to_string () + "\n");
+				if (fails == 0)
+					stdout.printf ("+++++ PASS\n");
+			}
+			
 			stdout.printf ("Choping offset = 3 length = 1...\n");
 			var iter6 = itermodel.chop (3,2);
 			if (!iter6.valid)
 				stdout.printf ("----- FAIL: " + (++fails).to_string () + "\n");
-			var tr = iter6.get().get_value ("name");
-			if (tr==null)
-				stdout.printf ("----- FAIL: " + (++fails).to_string () + "\n");
-
+			else {
+				var tr = iter6.get().get_value ("name");
+				if (tr==null)
+					stdout.printf ("----- FAIL: " + (++fails).to_string () + "\n");
+			}
+			
 			if (fails == 0)
 				stdout.printf ("+++++ PASS: " + "\n");
 			return fails;
diff --git a/tests/vala/Makefile.am b/tests/vala/Makefile.am
index 6744b08..b4fdc25 100644
--- a/tests/vala/Makefile.am
+++ b/tests/vala/Makefile.am
@@ -15,17 +15,7 @@ TESTS_ENVIRONMENT =
 TESTS = check_dataobject check_datamodeliterator check_table
 check_PROGRAMS = check_dataobject check_datamodeliterator check_table
 
-BUILT_SOURCES = \
-    check_dataobject.vala.stamp \
-    check_datamodeliterator.vala.stamp \
-    check_table.vala.stamp \
-    $(NULL)
-
-CLEANFILES = \
-    check_dataobject.vala.stamp \
-    check_datamodeliterator.vala.stamp \
-    check_table.vala.stamp \
-    $(NULL)
+CLEANFILES =
 
 VALAFLAGS = \
     --pkg gee-0.8 \