vala r2014 - in trunk: . tests tests/basic-types tests/control-flow tests/methods tests/objects

From: juergbi svn gnome org
To: svn-commits-list gnome org
Subject: vala r2014 - in trunk: . tests tests/basic-types tests/control-flow tests/methods tests/objects
Date: Fri, 14 Nov 2008 08:51:25 +0000 (UTC)
Author: juergbi
Date: Fri Nov 14 08:51:25 2008
New Revision: 2014
URL: http://svn.gnome.org/viewvc/vala?rev=2014&view=rev

Log:
2008-11-14  JÃrg Billeter  <j bitron ch>

	* tests/:

	Rearrange test cases


Added:
   trunk/tests/basic-types/
   trunk/tests/basic-types/expressions-assignments.exp   (props changed)
      - copied unchanged from r2013, /trunk/tests/expressions-assignments.exp
   trunk/tests/basic-types/expressions-assignments.vala   (props changed)
      - copied unchanged from r2013, /trunk/tests/expressions-assignments.vala
   trunk/tests/basic-types/expressions-relational.exp   (props changed)
      - copied unchanged from r2013, /trunk/tests/expressions-relational.exp
   trunk/tests/basic-types/expressions-relational.vala   (props changed)
      - copied unchanged from r2013, /trunk/tests/expressions-relational.vala
   trunk/tests/basic-types/strings.exp   (props changed)
      - copied unchanged from r2013, /trunk/tests/strings.exp
   trunk/tests/basic-types/strings.vala   (props changed)
      - copied unchanged from r2013, /trunk/tests/strings.vala
   trunk/tests/basic-types/test-027.exp   (props changed)
      - copied unchanged from r2013, /trunk/tests/test-027.exp
   trunk/tests/basic-types/test-027.vala   (props changed)
      - copied unchanged from r2013, /trunk/tests/test-027.vala
   trunk/tests/basic-types/test-030.exp   (props changed)
      - copied unchanged from r2013, /trunk/tests/test-030.exp
   trunk/tests/basic-types/test-030.vala   (props changed)
      - copied unchanged from r2013, /trunk/tests/test-030.vala
   trunk/tests/basic-types/test-031.exp   (props changed)
      - copied unchanged from r2013, /trunk/tests/test-031.exp
   trunk/tests/basic-types/test-031.vala   (props changed)
      - copied unchanged from r2013, /trunk/tests/test-031.vala
   trunk/tests/control-flow/   (props changed)
   trunk/tests/control-flow/break.exp   (props changed)
      - copied unchanged from r2013, /trunk/tests/statements-jump.exp
   trunk/tests/control-flow/break.vala   (props changed)
      - copied unchanged from r2013, /trunk/tests/statements-jump.vala
   trunk/tests/control-flow/expressions-conditional.exp   (props changed)
      - copied unchanged from r2013, /trunk/tests/expressions-conditional.exp
   trunk/tests/control-flow/expressions-conditional.vala   (props changed)
      - copied unchanged from r2013, /trunk/tests/expressions-conditional.vala
   trunk/tests/control-flow/for.exp   (props changed)
      - copied unchanged from r2013, /trunk/tests/statements-iteration.exp
   trunk/tests/control-flow/for.vala   (props changed)
      - copied unchanged from r2013, /trunk/tests/statements-iteration.vala
   trunk/tests/control-flow/switch.exp   (props changed)
      - copied unchanged from r2013, /trunk/tests/statements-selection.exp
   trunk/tests/control-flow/switch.vala   (props changed)
      - copied unchanged from r2013, /trunk/tests/statements-selection.vala
   trunk/tests/methods/
   trunk/tests/methods/lambda.exp   (props changed)
      - copied unchanged from r2013, /trunk/tests/expressions-lambda.exp
   trunk/tests/methods/lambda.vala   (props changed)
      - copied unchanged from r2013, /trunk/tests/expressions-lambda.vala
   trunk/tests/objects/
   trunk/tests/objects/classes.exp   (props changed)
      - copied unchanged from r2013, /trunk/tests/classes.exp
   trunk/tests/objects/classes.vala   (props changed)
      - copied unchanged from r2013, /trunk/tests/classes.vala
   trunk/tests/objects/fields.exp   (props changed)
      - copied unchanged from r2013, /trunk/tests/classes-fields.exp
   trunk/tests/objects/fields.vala   (props changed)
      - copied unchanged from r2013, /trunk/tests/classes-fields.vala
   trunk/tests/objects/interfaces.exp   (props changed)
      - copied unchanged from r2013, /trunk/tests/interfaces.exp
   trunk/tests/objects/interfaces.vala   (props changed)
      - copied unchanged from r2013, /trunk/tests/interfaces.vala
   trunk/tests/objects/methods.exp   (props changed)
      - copied unchanged from r2013, /trunk/tests/classes-methods.exp
   trunk/tests/objects/methods.vala   (props changed)
      - copied unchanged from r2013, /trunk/tests/classes-methods.vala
   trunk/tests/objects/properties.exp   (contents, props changed)
      - copied, changed from r2013, /trunk/tests/classes-properties.exp
   trunk/tests/objects/properties.vala   (contents, props changed)
      - copied, changed from r2013, /trunk/tests/classes-properties.vala
   trunk/tests/objects/signals.exp   (props changed)
      - copied unchanged from r2013, /trunk/tests/classes-signals.exp
   trunk/tests/objects/signals.vala   (props changed)
      - copied unchanged from r2013, /trunk/tests/classes-signals.vala
   trunk/tests/objects/test-025.exp   (props changed)
      - copied unchanged from r2013, /trunk/tests/test-025.exp
   trunk/tests/objects/test-025.vala   (props changed)
      - copied unchanged from r2013, /trunk/tests/test-025.vala
   trunk/tests/objects/test-026.exp   (props changed)
      - copied unchanged from r2013, /trunk/tests/test-026.exp
   trunk/tests/objects/test-026.vala   (props changed)
      - copied unchanged from r2013, /trunk/tests/test-026.vala
   trunk/tests/objects/test-029.exp   (props changed)
      - copied unchanged from r2013, /trunk/tests/test-029.exp
   trunk/tests/objects/test-029.vala   (props changed)
      - copied unchanged from r2013, /trunk/tests/test-029.vala
   trunk/tests/objects/test-034.exp   (props changed)
      - copied unchanged from r2013, /trunk/tests/test-034.exp
   trunk/tests/objects/test-034.vala   (props changed)
      - copied unchanged from r2013, /trunk/tests/test-034.vala
Removed:
   trunk/tests/classes-fields.exp
   trunk/tests/classes-fields.vala
   trunk/tests/classes-methods.exp
   trunk/tests/classes-methods.vala
   trunk/tests/classes-properties.exp
   trunk/tests/classes-properties.vala
   trunk/tests/classes-signals.exp
   trunk/tests/classes-signals.vala
   trunk/tests/classes.exp
   trunk/tests/classes.vala
   trunk/tests/expressions-assignments.exp
   trunk/tests/expressions-assignments.vala
   trunk/tests/expressions-conditional.exp
   trunk/tests/expressions-conditional.vala
   trunk/tests/expressions-lambda.exp
   trunk/tests/expressions-lambda.vala
   trunk/tests/expressions-relational.exp
   trunk/tests/expressions-relational.vala
   trunk/tests/interfaces-properties.exp
   trunk/tests/interfaces-properties.vala
   trunk/tests/interfaces.exp
   trunk/tests/interfaces.vala
   trunk/tests/statements-iteration.exp
   trunk/tests/statements-iteration.vala
   trunk/tests/statements-jump.exp
   trunk/tests/statements-jump.vala
   trunk/tests/statements-selection.exp
   trunk/tests/statements-selection.vala
   trunk/tests/strings.exp
   trunk/tests/strings.vala
   trunk/tests/test-025.exp
   trunk/tests/test-025.vala
   trunk/tests/test-026.exp
   trunk/tests/test-026.vala
   trunk/tests/test-027.exp
   trunk/tests/test-027.vala
   trunk/tests/test-029.exp
   trunk/tests/test-029.vala
   trunk/tests/test-030.exp
   trunk/tests/test-030.vala
   trunk/tests/test-031.exp
   trunk/tests/test-031.vala
   trunk/tests/test-034.exp
   trunk/tests/test-034.vala
Modified:
   trunk/ChangeLog
   trunk/tests/Makefile.am
   trunk/tests/testrunner.sh

Modified: trunk/tests/Makefile.am
==============================================================================
--- trunk/tests/Makefile.am	(original)
+++ trunk/tests/Makefile.am	Fri Nov 14 08:51:25 2008
@@ -16,37 +16,35 @@
 
 TESTS = \
 	hello.vala \
-	strings.vala \
-	expressions-relational.vala \
-	expressions-conditional.vala \
-	expressions-assignments.vala \
-	expressions-lambda.vala \
-	statements-selection.vala \
-	statements-iteration.vala \
-	statements-jump.vala \
+	basic-types/expressions-assignments.vala \
+	basic-types/expressions-relational.vala \
+	basic-types/strings.vala \
+	basic-types/test-027.vala \
+	basic-types/test-030.vala \
+	basic-types/test-031.vala \
 	namespaces.vala \
-	classes.vala \
-	classes-fields.vala \
-	classes-methods.vala \
-	classes-properties.vala \
-	classes-signals.vala \
-	structs.vala \
-	interfaces.vala \
-	interfaces-properties.vala \
-	enums.vala \
+	methods/lambda.vala \
+	control-flow/break.vala \
+	control-flow/expressions-conditional.vala \
+	control-flow/for.vala \
+	control-flow/switch.vala \
 	arrays.vala \
-	pointers.vala \
+	enums.vala \
+	structs.vala \
 	delegates.vala \
+	objects/classes.vala \
+	objects/fields.vala \
+	objects/interfaces.vala \
+	objects/methods.vala \
+	objects/properties.vala \
+	objects/signals.vala \
+	objects/test-025.vala \
+	objects/test-026.vala \
+	objects/test-029.vala \
+	objects/test-034.vala \
 	exceptions.vala \
-	\
+	pointers.vala \
 	test-023.vala \
-	test-025.vala \
-	test-026.vala \
-	test-027.vala \
-	test-029.vala \
-	test-030.vala \
-	test-031.vala \
-	test-034.vala \
 	$(NULL)
 
 EXTRA_DIST = \
@@ -54,36 +52,34 @@
 	$(TESTS) \
 	\
 	hello.exp \
-	strings.exp \
-	expressions-relational.exp \
-	expressions-conditional.exp \
-	expressions-assignments.exp \
-	expressions-lambda.exp \
-	statements-selection.exp \
-	statements-iteration.exp \
-	statements-jump.exp \
+	basic-types/expressions-assignments.exp \
+	basic-types/expressions-relational.exp \
+	basic-types/strings.exp \
+	basic-types/test-027.exp \
+	basic-types/test-030.exp \
+	basic-types/test-031.exp \
 	namespaces.exp \
-	classes.exp \
-	classes-fields.exp \
-	classes-methods.exp \
-	classes-properties.exp \
-	classes-signals.exp \
-	structs.exp \
-	interfaces.exp \
-	interfaces-properties.exp \
-	enums.exp \
+	methods/lambda.exp \
+	control-flow/break.exp \
+	control-flow/expressions-conditional.exp \
+	control-flow/for.exp \
+	control-flow/switch.exp \
 	arrays.exp \
-	pointers.exp \
+	enums.exp \
+	structs.exp \
 	delegates.exp \
+	objects/classes.exp \
+	objects/fields.exp \
+	objects/interfaces.exp \
+	objects/methods.exp \
+	objects/properties.exp \
+	objects/signals.exp \
+	objects/test-025.exp \
+	objects/test-026.exp \
+	objects/test-029.exp \
+	objects/test-034.exp \
 	exceptions.exp \
-	\
+	pointers.exp \
 	test-023.exp \
-	test-025.exp \
-	test-026.exp \
-	test-027.exp \
-	test-029.exp \
-	test-030.exp \
-	test-031.exp \
-	test-034.exp \
 	$(NULL)
 

Copied: trunk/tests/objects/properties.exp (from r2013, /trunk/tests/classes-properties.exp)
==============================================================================
--- /trunk/tests/classes-properties.exp	(original)
+++ trunk/tests/objects/properties.exp	Fri Nov 14 08:51:25 2008
@@ -4,3 +4,4 @@
 read_only: InitialReadOnly
 automatic: TheNewAutomatic
 Property Test: 1 2 3 4 5 6 7
+Interface Properties Test: 1 2 3

Copied: trunk/tests/objects/properties.vala (from r2013, /trunk/tests/classes-properties.vala)
==============================================================================
--- /trunk/tests/classes-properties.vala	(original)
+++ trunk/tests/objects/properties.vala	Fri Nov 14 08:51:25 2008
@@ -49,6 +49,13 @@
 
 		Maman.Bar.run ();
 
+		stdout.printf ("Interface Properties Test: 1");
+
+		Maman.Ibaz ibaz = new Maman.Baz ();
+		ibaz.simple_method ();
+	
+		stdout.printf (" 3\n");
+
 		return 0;
 	}
 }
@@ -91,3 +98,17 @@
 	}
 }
 
+interface Maman.Ibaz : Object {
+	public abstract int number { get; }
+
+	public void simple_method () {
+		int n = number;
+		stdout.printf (" %d", n);
+	}
+}
+
+class Maman.Baz : Object, Ibaz {
+	public int number {
+		get { return 2; }
+	}
+}

Modified: trunk/tests/testrunner.sh
==============================================================================
--- trunk/tests/testrunner.sh	(original)
+++ trunk/tests/testrunner.sh	Fri Nov 14 08:51:25 2008
@@ -42,27 +42,26 @@
 for testcasesource in "$@"
 do
 	testsrc=${testcasesource/.vala/}
-	testbuild=`basename "$testsrc"`
-	if ! $VALAC -C --vapidir "$vapidir" --basedir $topsrcdir -d $topbuilddir $testsrc.vala > $testbuild.err 2>&1
+	if ! $VALAC -C --vapidir "$vapidir" --basedir $topsrcdir -d $topbuilddir $testsrc.vala > $testsrc.err 2>&1
 	then
 		echo "ERROR: Compiling" $testcasesource 
-		cat $testbuild.err
+		cat $testsrc.err
 		CODE=1
 		continue
 	fi
-	if ! $CC $CFLAGS $testbuild.c $(pkg-config --cflags --libs gobject-2.0) -o $testbuild $LDLIBS > $testbuild.err 2>&1
+	if ! $CC $CFLAGS $testsrc.c $(pkg-config --cflags --libs gobject-2.0) -o $testsrc $LDLIBS > $testsrc.err 2>&1
 	then
-		echo "ERROR: Compiling" $testbuild.c
-		cat $testbuild.err
+		echo "ERROR: Compiling" $testsrc.c
+		cat $testsrc.err
 		CODE=1
 		continue
 	fi
-	if ./$testbuild 2>&1 | tee $testbuild.err | cmp -s $testsrc.exp
+	if ./$testsrc 2>&1 | tee $testsrc.err | cmp -s $testsrc.exp
 	then
-		rm $testbuild.c $testbuild.h $testbuild$exe $testbuild.err
+		rm $testsrc.c $testsrc.h $testsrc$exe $testsrc.err
 	else
-		echo "ERROR: test failed. This is the difference between" $testbuild.exp "and" $testbuild.err
-		diff -u $testbuild.exp $testbuild.err
+		echo "ERROR: test failed. This is the difference between" $testsrc.exp "and" $testsrc.err
+		diff -u $testsrc.exp $testsrc.err
 		CODE=1
 	fi
 done
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]