tests: Move namespaces.vala into parser and merge its main methods

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 063c7e8fd5e90a4be375f9a01023d74aba8ee8b6..c8f8416574a0936f1c3731a70679302061a35da4 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -65,7 +65,6 @@ TESTS = \
        chainup/struct-this-foo.vala \
        chainup/bug791785.vala \
        pointers/bug590641.vala \
-       namespaces.vala \
        methods/lambda.vala \
        methods/closures.vala \
        methods/contains.vala \
@@ -409,6 +408,7 @@ TESTS = \
        parser/method-no-static-override.test \
        parser/method-no-static-virtual.test \
        parser/method-no-virtual-override.test \
+       parser/namespaces.vala \
        parser/namespace-missing-bracket.test \
        parser/preprocessor.vala \
        parser/property-default-redefined.test \

diff --git a/tests/namespaces.vala b/tests/parser/namespaces.vala
similarity index 88%
rename from tests/namespaces.vala
rename to tests/parser/namespaces.vala
index b35db592744eccc1ddae442a23e0a74ae548ab54..aae68838ff582fd1959981d2922c34a26ff82d74 100644 (file)
--- a/tests/namespaces.vala
+++ b/tests/parser/namespaces.vala
@@ -6,7 +6,7 @@ public class GlobalTestClass {
 }
 
 namespace Maman {
-       static int main () {
+       static void run () {
                stdout.printf ("Namespace Test\n");
 
                Bar.run ();
@@ -14,8 +14,6 @@ namespace Maman {
                new GlobalTestClass();
 
                var obj = new ClassInNestedNamespace ();
-
-               return 0;
        }
 
        class Bar : Object {
@@ -28,8 +26,7 @@ namespace Maman {
 public class Foo.Sub.ClassInNestedNamespace {
 }
 
-
 void main () {
-       Maman.main ();
+       Maman.run ();
 }