From dcb816d791c26291b3ff9e84e16abf29ffaab8bf Mon Sep 17 00:00:00 2001 From: Juerg Billeter Date: Thu, 28 Feb 2008 21:32:18 +0000 Subject: [PATCH] combine and rename some tests 2008-02-28 Juerg Billeter * tests/Makefile.am, tests/delegates.exp, tests/delegates.vala, tests/expressions-lambda.exp, tests/expressions-lambda.vala: combine and rename some tests svn path=/trunk/; revision=1061 --- ChangeLog | 6 ++++++ tests/Makefile.am | 8 ++------ tests/delegates.exp | 1 + tests/delegates.vala | 14 ++++++++++++++ tests/{test-015.exp => expressions-lambda.exp} | 0 tests/{test-015.vala => expressions-lambda.vala} | 0 tests/test-035.exp | 3 --- tests/test-035.vala | 18 ------------------ tests/test-036.exp | 1 - tests/test-036.vala | 15 --------------- 10 files changed, 23 insertions(+), 43 deletions(-) rename tests/{test-015.exp => expressions-lambda.exp} (100%) rename tests/{test-015.vala => expressions-lambda.vala} (100%) delete mode 100644 tests/test-035.exp delete mode 100644 tests/test-035.vala delete mode 100644 tests/test-036.exp delete mode 100644 tests/test-036.vala diff --git a/ChangeLog b/ChangeLog index d69c439..7512fa3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-02-28 Jürg Billeter + + * tests/Makefile.am, tests/delegates.exp, tests/delegates.vala, + tests/expressions-lambda.exp, tests/expressions-lambda.vala: + combine and rename some tests + 2008-02-28 Raffaele Sandrini * gobject/valaccodegeneratormethod.vala: fix instance delegate handling diff --git a/tests/Makefile.am b/tests/Makefile.am index d76a51f..63eda78 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -20,6 +20,7 @@ TESTS = \ expressions-relational.vala \ expressions-conditional.vala \ expressions-assignments.vala \ + expressions-lambda.vala \ statements-selection.vala \ statements-jump.vala \ namespaces.vala \ @@ -37,7 +38,6 @@ TESTS = \ delegates.vala \ exceptions.vala \ \ - test-015.vala \ test-023.vala \ test-025.vala \ test-026.vala \ @@ -46,8 +46,6 @@ TESTS = \ test-030.vala \ test-031.vala \ test-034.vala \ - test-035.vala \ - test-036.vala \ $(NULL) EXTRA_DIST = \ @@ -59,6 +57,7 @@ EXTRA_DIST = \ expressions-relational.exp \ expressions-conditional.exp \ expressions-assignments.exp \ + expressions-lambda.exp \ statements-selection.exp \ statements-jump.exp \ namespaces.exp \ @@ -76,7 +75,6 @@ EXTRA_DIST = \ delegates.exp \ exceptions.exp \ \ - test-015.exp \ test-023.exp \ test-025.exp \ test-026.exp \ @@ -85,7 +83,5 @@ EXTRA_DIST = \ test-030.exp \ test-031.exp \ test-034.exp \ - test-035.exp \ - test-036.exp \ $(NULL) diff --git a/tests/delegates.exp b/tests/delegates.exp index 8cf4ba3..4d6380e 100644 --- a/tests/delegates.exp +++ b/tests/delegates.exp @@ -1 +1,2 @@ Delegate Test: 1 2 3 4 5 6 7 +testing function pointers: 1 2 3 diff --git a/tests/delegates.vala b/tests/delegates.vala index 208b762..41f7752 100644 --- a/tests/delegates.vala +++ b/tests/delegates.vala @@ -28,6 +28,18 @@ class Maman.Bar : Object { instance_cb (42); } + static void test_function_pointers () { + stdout.printf ("testing function pointers:"); + var table = new HashTable.full (str_hash, str_equal, g_free, Object.unref); + stdout.printf (" 1"); + + table.insert ("foo", new Bar ()); + stdout.printf (" 2"); + + var bar = table.lookup ("foo"); + stdout.printf (" 3\n"); + } + static int main (string[] args) { stdout.printf ("Delegate Test: 1"); @@ -50,6 +62,8 @@ class Maman.Bar : Object { stdout.printf (" 7\n"); + test_function_pointers (); + return 0; } } diff --git a/tests/test-015.exp b/tests/expressions-lambda.exp similarity index 100% rename from tests/test-015.exp rename to tests/expressions-lambda.exp diff --git a/tests/test-015.vala b/tests/expressions-lambda.vala similarity index 100% rename from tests/test-015.vala rename to tests/expressions-lambda.vala diff --git a/tests/test-035.exp b/tests/test-035.exp deleted file mode 100644 index a2633c9..0000000 --- a/tests/test-035.exp +++ /dev/null @@ -1,3 +0,0 @@ -before switch: Hello World -within switch: Hello World -behind switch: Hello World diff --git a/tests/test-035.vala b/tests/test-035.vala deleted file mode 100644 index f5230fa..0000000 --- a/tests/test-035.vala +++ /dev/null @@ -1,18 +0,0 @@ -using GLib; - -class SwitchTest : Object { - static void main () { - var foo = "Hello World"; - var bar = 0; - - stdout.printf ("before switch: %s\n", foo); - - switch (bar) { - case 0: - stdout.printf ("within switch: %s\n", foo); - break; - } - - stdout.printf ("behind switch: %s\n", foo); - } -} diff --git a/tests/test-036.exp b/tests/test-036.exp deleted file mode 100644 index d8bb432..0000000 --- a/tests/test-036.exp +++ /dev/null @@ -1 +0,0 @@ -testing function pointers: 1 2 3 diff --git a/tests/test-036.vala b/tests/test-036.vala deleted file mode 100644 index 471e9cc..0000000 --- a/tests/test-036.vala +++ /dev/null @@ -1,15 +0,0 @@ -using GLib; - -class Maman.Bar : GLib.Object { - static void main () { - stdout.printf ("testing function pointers:"); - var table = new HashTable.full (str_hash, str_equal, g_free, Object.unref); - stdout.printf (" 1"); - - table.insert ("foo", new Bar ()); - stdout.printf (" 2"); - - var bar = table.lookup ("foo"); - stdout.printf (" 3\n"); - } -} -- 2.7.4