[vala: 3/4] tests: Merge two main methods
- From: Rico Tzschichholz <ricotz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [vala: 3/4] tests: Merge two main methods
- Date: Tue, 14 Mar 2017 11:16:44 +0000 (UTC)
commit 95b8e0763f8ab8903f1c124873136ac14d1940cf
Author: Rico Tzschichholz <ricotz ubuntu com>
Date: Tue Mar 14 11:49:13 2017 +0100
tests: Merge two main methods
tests/objects/signals.vala | 46 +++++++++++++++++++------------------------
1 files changed, 20 insertions(+), 26 deletions(-)
---
diff --git a/tests/objects/signals.vala b/tests/objects/signals.vala
index 3a07d99..195f563 100644
--- a/tests/objects/signals.vala
+++ b/tests/objects/signals.vala
@@ -46,31 +46,6 @@ class Maman.Bar : Object {
stdout.printf (" 9");
}
-
- public static int main () {
- stdout.printf ("Signal Test: 1");
-
- var bar = new Bar ();
- bar.run ();
-
- stdout.printf (" 10\n");
-
- stdout.printf ("User Signal Test: 1");
-
- var user_bar = new UserBar ();
- user_bar.run ();
-
- stdout.printf (" 6\n");
-
- stdout.printf ("Signal Return Test: 1");
-
- var return_bar = new ReturnBar ();
- return_bar.run ();
-
- stdout.printf (" 8\n");
-
- return 0;
- }
}
class Maman.UserFoo : Object {
@@ -129,6 +104,25 @@ class Maman.ReturnBar : Object {
}
void main () {
- Maman.Bar.main ();
+ stdout.printf ("Signal Test: 1");
+
+ var bar = new Maman.Bar ();
+ bar.run ();
+
+ stdout.printf (" 10\n");
+
+ stdout.printf ("User Signal Test: 1");
+
+ var user_bar = new Maman.UserBar ();
+ user_bar.run ();
+
+ stdout.printf (" 6\n");
+
+ stdout.printf ("Signal Return Test: 1");
+
+ var return_bar = new Maman.ReturnBar ();
+ return_bar.run ();
+
+ stdout.printf (" 8\n");
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]