tests: fix tests related to test_prog

Signed-off-by: Alexandre Terrasa <alexandre@moz-code.org>

diff --git a/src/doc/templates/tests/test_templates_json.sav/test_classdefs_to_full_json.res b/src/doc/templates/tests/test_templates_json.sav/test_classdefs_to_full_json.res
index 241e975..42e562f 100644 (file)
--- a/src/doc/templates/tests/test_templates_json.sav/test_classdefs_to_full_json.res
+++ b/src/doc/templates/tests/test_templates_json.sav/test_classdefs_to_full_json.res
@@ -109,6 +109,42 @@
        }]
 }
 {
+       "name": "Sys",
+       "synopsis": "Sys",
+       "namespace": [{
+               "name": "test_prog",
+               "synopsis": "Test program for model tools."
+       }, "$", {
+               "name": "Sys",
+               "synopsis": "Sys"
+       }],
+       "class_name": "MClassDef",
+       "full_name": "test_prog$Sys",
+       "visibility": "public",
+       "html_synopsis": "<span class=\"synopsys nitdoc\">Sys</span>",
+       "modifiers": ["class"],
+       "is_intro": true
+}
+{
+       "name": "Sys",
+       "synopsis": "Sys",
+       "namespace": [{
+               "name": "test_prog",
+               "synopsis": "Test program for model tools."
+       }, "::", {
+               "name": "test_prog",
+               "synopsis": "A test program with a fake model to check model tools."
+       }, "$", {
+               "name": "Sys",
+               "synopsis": "Sys"
+       }],
+       "class_name": "MClassDef",
+       "full_name": "test_prog::test_prog$Sys",
+       "visibility": "public",
+       "html_synopsis": "<span class=\"synopsys nitdoc\">Sys</span>",
+       "modifiers": ["redef", "class"]
+}
+{
        "name": "Career",
        "synopsis": "A `Career` gives a characteristic bonus or malus to the character.",
        "namespace": [{
@@ -382,15 +418,29 @@
        "is_intro": true
 }
 {
-       "name": "Sys",
+       "name": "TestGame",
        "namespace": [{
                "name": "test_prog",
                "synopsis": "Test program for model tools."
        }, "$", {
-               "name": "Sys"
+               "name": "TestGame"
        }],
        "class_name": "MClassDef",
-       "full_name": "test_prog$Sys",
+       "full_name": "test_prog$TestGame",
+       "visibility": "public",
+       "modifiers": ["class"],
+       "is_intro": true
+}
+{
+       "name": "GameTest",
+       "namespace": [{
+               "name": "test_prog",
+               "synopsis": "Test program for model tools."
+       }, "$", {
+               "name": "GameTest"
+       }],
+       "class_name": "MClassDef",
+       "full_name": "test_prog$GameTest",
        "visibility": "public",
        "modifiers": ["class"],
        "is_intro": true

diff --git a/src/doc/templates/tests/test_templates_json.sav/test_classes_to_full_json.res b/src/doc/templates/tests/test_templates_json.sav/test_classes_to_full_json.res
index 7e7c7ad..18c77c4 100644 (file)
--- a/src/doc/templates/tests/test_templates_json.sav/test_classes_to_full_json.res
+++ b/src/doc/templates/tests/test_templates_json.sav/test_classes_to_full_json.res
@@ -103,6 +103,22 @@
        }]
 }
 {
+       "name": "Sys",
+       "synopsis": "Sys",
+       "namespace": [{
+               "name": "test_prog",
+               "synopsis": "Test program for model tools."
+       }, "::", {
+               "name": "Sys",
+               "synopsis": "Sys"
+       }],
+       "class_name": "MClass",
+       "full_name": "test_prog::Sys",
+       "visibility": "public",
+       "html_synopsis": "<span class=\"synopsys nitdoc\">Sys</span>",
+       "modifiers": ["class"]
+}
+{
        "name": "Career",
        "synopsis": "A `Career` gives a characteristic bonus or malus to the character.",
        "namespace": [{
@@ -324,15 +340,28 @@
        "modifiers": ["class"]
 }
 {
-       "name": "Sys",
+       "name": "TestGame",
        "namespace": [{
                "name": "test_prog",
                "synopsis": "Test program for model tools."
        }, "::", {
-               "name": "Sys"
+               "name": "TestGame"
        }],
        "class_name": "MClass",
-       "full_name": "test_prog::Sys",
+       "full_name": "test_prog::TestGame",
+       "visibility": "public",
+       "modifiers": ["class"]
+}
+{
+       "name": "GameTest",
+       "namespace": [{
+               "name": "test_prog",
+               "synopsis": "Test program for model tools."
+       }, "::", {
+               "name": "GameTest"
+       }],
+       "class_name": "MClass",
+       "full_name": "test_prog::GameTest",
        "visibility": "public",
        "modifiers": ["class"]
 }

diff --git a/src/doc/templates/tests/test_templates_json.sav/test_groups_to_full_json.res b/src/doc/templates/tests/test_templates_json.sav/test_groups_to_full_json.res
index 3fc95f5..885eefe 100644 (file)
--- a/src/doc/templates/tests/test_templates_json.sav/test_groups_to_full_json.res
+++ b/src/doc/templates/tests/test_templates_json.sav/test_groups_to_full_json.res
@@ -41,6 +41,19 @@
        "modifiers": ["group"]
 }
 {
+       "name": "man",
+       "namespace": [{
+               "name": "test_prog",
+               "synopsis": "Test program for model tools."
+       }, ">", {
+               "name": "man"
+       }, ">"],
+       "class_name": "MGroup",
+       "full_name": "test_prog>man>",
+       "visibility": "public",
+       "modifiers": ["group"]
+}
+{
        "name": "platform",
        "synopsis": "Fictive Crappy Platform.",
        "namespace": [{
@@ -73,6 +86,19 @@
        "modifiers": ["group"]
 }
 {
+       "name": "tests",
+       "namespace": [{
+               "name": "test_prog",
+               "synopsis": "Test program for model tools."
+       }, ">", {
+               "name": "tests"
+       }, ">"],
+       "class_name": "MGroup",
+       "full_name": "test_prog>tests>",
+       "visibility": "public",
+       "modifiers": ["group"]
+}
+{
        "name": "excluded",
        "namespace": [{
                "name": "excluded"

diff --git a/src/doc/templates/tests/test_templates_json.sav/test_modules_to_full_json.res b/src/doc/templates/tests/test_templates_json.sav/test_modules_to_full_json.res
index 6b46961..857fcb1 100644 (file)
--- a/src/doc/templates/tests/test_templates_json.sav/test_modules_to_full_json.res
+++ b/src/doc/templates/tests/test_templates_json.sav/test_modules_to_full_json.res
@@ -152,6 +152,19 @@
        "modifiers": ["module"]
 }
 {
+       "name": "test_game",
+       "namespace": [{
+               "name": "test_prog",
+               "synopsis": "Test program for model tools."
+       }, "::", {
+               "name": "test_game"
+       }],
+       "class_name": "MModule",
+       "full_name": "test_prog::test_game",
+       "visibility": "public",
+       "modifiers": ["module"]
+}
+{
        "name": "test_prog-m",
        "namespace": [{
                "name": "test_prog-m"

diff --git a/src/doc/templates/tests/test_templates_json.sav/test_propdefs_to_full_json.res b/src/doc/templates/tests/test_templates_json.sav/test_propdefs_to_full_json.res
index dea3470..ea14337 100644 (file)
--- a/src/doc/templates/tests/test_templates_json.sav/test_propdefs_to_full_json.res
+++ b/src/doc/templates/tests/test_templates_json.sav/test_propdefs_to_full_json.res
@@ -728,6 +728,52 @@
        }
 }
 {
+       "name": "main",
+       "namespace": [{
+               "name": "test_prog",
+               "synopsis": "Test program for model tools."
+       }, "$", {
+               "name": "Sys",
+               "synopsis": "Sys"
+       }, "$", {
+               "name": "main"
+       }],
+       "class_name": "MMethodDef",
+       "full_name": "test_prog$Sys$main",
+       "visibility": "public",
+       "modifiers": ["intern", "fun"],
+       "is_intro": true,
+       "msignature": {
+               "arity": 0,
+               "mparameters": [],
+               "return_mtype": null
+       }
+}
+{
+       "name": "main",
+       "namespace": [{
+               "name": "test_prog",
+               "synopsis": "Test program for model tools."
+       }, "::", {
+               "name": "test_prog",
+               "synopsis": "A test program with a fake model to check model tools."
+       }, "$", {
+               "name": "Sys",
+               "synopsis": "Sys"
+       }, "$", {
+               "name": "main"
+       }],
+       "class_name": "MMethodDef",
+       "full_name": "test_prog::test_prog$Sys$main",
+       "visibility": "public",
+       "modifiers": ["redef", "fun"],
+       "msignature": {
+               "arity": 0,
+               "mparameters": [],
+               "return_mtype": null
+       }
+}
+{
        "name": "_strength_bonus",
        "namespace": [{
                "name": "test_prog",
@@ -2195,6 +2241,36 @@
        }
 }
 {
+       "name": "player_characters",
+       "synopsis": "Characters played by human players.",
+       "namespace": [{
+               "name": "test_prog",
+               "synopsis": "Test program for model tools."
+       }, "$", {
+               "name": "TestGame"
+       }, "$", {
+               "name": "Game",
+               "synopsis": "This is the interface you have to implement to use ure gaming platform."
+       }, "::", {
+               "name": "player_characters",
+               "synopsis": "Characters played by human players."
+       }],
+       "class_name": "MMethodDef",
+       "full_name": "test_prog$TestGame$Game::player_characters",
+       "visibility": "public",
+       "html_synopsis": "<span class=\"synopsys nitdoc\">Characters played by human players.</span>",
+       "modifiers": ["redef", "fun"],
+       "msignature": {
+               "arity": 0,
+               "mparameters": [],
+               "return_mtype": {
+                       "name": "List[Character]",
+                       "synopsis": "List of things.",
+                       "html_synopsis": "<span class=\"synopsys nitdoc\">List of things.</span>"
+               }
+       }
+}
+{
        "name": "computer_characters",
        "synopsis": "Characters players by computer.",
        "namespace": [{
@@ -2536,17 +2612,67 @@
        }
 }
 {
-       "name": "main",
+       "name": "_player_characters",
        "namespace": [{
                "name": "test_prog",
                "synopsis": "Test program for model tools."
        }, "$", {
-               "name": "Sys"
+               "name": "TestGame"
        }, "$", {
-               "name": "main"
+               "name": "_player_characters"
+       }],
+       "class_name": "MAttributeDef",
+       "full_name": "test_prog$TestGame$_player_characters",
+       "visibility": "private",
+       "modifiers": ["private", "var"],
+       "is_intro": true,
+       "static_mtype": {
+               "name": "List[Character]",
+               "synopsis": "List of things.",
+               "html_synopsis": "<span class=\"synopsys nitdoc\">List of things.</span>"
+       }
+}
+{
+       "name": "player_characters=",
+       "namespace": [{
+               "name": "test_prog",
+               "synopsis": "Test program for model tools."
+       }, "$", {
+               "name": "TestGame"
+       }, "$", {
+               "name": "player_characters="
        }],
        "class_name": "MMethodDef",
-       "full_name": "test_prog$Sys$main",
+       "full_name": "test_prog$TestGame$player_characters=",
+       "visibility": "protected",
+       "modifiers": ["protected", "fun"],
+       "is_intro": true,
+       "msignature": {
+               "arity": 1,
+               "mparameters": [{
+                       "is_vararg": false,
+                       "name": "player_characters",
+                       "mtype": {
+                               "name": "List[Character]",
+                               "synopsis": "List of things.",
+                               "html_synopsis": "<span class=\"synopsys nitdoc\">List of things.</span>"
+                       }
+               }],
+               "return_mtype": null
+       }
+}
+{
+       "name": "test_game",
+       "namespace": [{
+               "name": "test_prog",
+               "synopsis": "Test program for model tools."
+       }, "$", {
+               "name": "GameTest"
+       }, "$", {
+               "name": "test_game"
+       }],
+       "class_name": "MMethodDef",
+       "full_name": "test_prog$GameTest$test_game",
        "visibility": "public",
        "modifiers": ["fun"],
        "is_intro": true,

diff --git a/src/doc/templates/tests/test_templates_json.sav/test_props_to_full_json.res b/src/doc/templates/tests/test_templates_json.sav/test_props_to_full_json.res
index bb15a19..961fa79 100644 (file)
--- a/src/doc/templates/tests/test_templates_json.sav/test_props_to_full_json.res
+++ b/src/doc/templates/tests/test_templates_json.sav/test_props_to_full_json.res
@@ -497,6 +497,27 @@
        }
 }
 {
+       "name": "main",
+       "namespace": [{
+               "name": "test_prog",
+               "synopsis": "Test program for model tools."
+       }, "::", {
+               "name": "Sys",
+               "synopsis": "Sys"
+       }, "::", {
+               "name": "main"
+       }],
+       "class_name": "MMethod",
+       "full_name": "test_prog::Sys::main",
+       "visibility": "public",
+       "modifiers": ["intern", "fun"],
+       "msignature": {
+               "arity": 0,
+               "mparameters": [],
+               "return_mtype": null
+       }
+}
+{
        "name": "_strength_bonus",
        "namespace": [{
                "name": "test_prog",
@@ -2077,17 +2098,67 @@
        }
 }
 {
-       "name": "main",
+       "name": "_player_characters",
        "namespace": [{
                "name": "test_prog",
                "synopsis": "Test program for model tools."
        }, "::", {
-               "name": "Sys"
+               "name": "test_game"
        }, "::", {
-               "name": "main"
+               "name": "TestGame"
+       }, "::", {
+               "name": "_player_characters"
+       }],
+       "class_name": "MAttribute",
+       "full_name": "test_prog::test_game::TestGame::_player_characters",
+       "visibility": "private",
+       "modifiers": ["private", "var"],
+       "static_mtype": {
+               "name": "List[Character]",
+               "synopsis": "List of things.",
+               "html_synopsis": "<span class=\"synopsys nitdoc\">List of things.</span>"
+       }
+}
+{
+       "name": "player_characters=",
+       "namespace": [{
+               "name": "test_prog",
+               "synopsis": "Test program for model tools."
+       }, "::", {
+               "name": "TestGame"
+       }, "::", {
+               "name": "player_characters="
        }],
        "class_name": "MMethod",
-       "full_name": "test_prog::Sys::main",
+       "full_name": "test_prog::TestGame::player_characters=",
+       "visibility": "protected",
+       "modifiers": ["protected", "fun"],
+       "msignature": {
+               "arity": 1,
+               "mparameters": [{
+                       "is_vararg": false,
+                       "name": "player_characters",
+                       "mtype": {
+                               "name": "List[Character]",
+                               "synopsis": "List of things.",
+                               "html_synopsis": "<span class=\"synopsys nitdoc\">List of things.</span>"
+                       }
+               }],
+               "return_mtype": null
+       }
+}
+{
+       "name": "test_game",
+       "namespace": [{
+               "name": "test_prog",
+               "synopsis": "Test program for model tools."
+       }, "::", {
+               "name": "GameTest"
+       }, "::", {
+               "name": "test_game"
+       }],
+       "class_name": "MMethod",
+       "full_name": "test_prog::GameTest::test_game",
        "visibility": "public",
        "modifiers": ["fun"],
        "msignature": {

diff --git a/src/doc/term/tests/test_term.sav/test_term_catalog_stats.res b/src/doc/term/tests/test_term.sav/test_term_catalog_stats.res
index 18f7bdc..c8a157d 100644 (file)
--- a/src/doc/term/tests/test_term.sav/test_term_catalog_stats.res
+++ b/src/doc/term/tests/test_term.sav/test_term_catalog_stats.res
@@ -1,9 +1,9 @@
 Catalog statistics:
  * 2 packages
  * 11 modules
- * 78 methods
- * 25 classes
- * 503 lines of code
+ * 79 methods
+ * 26 classes
+ * 509 lines of code
  * 6 contributors
  * 1 maintainers
  * 2 tags

diff --git a/tests/sav/nitcatalog_args1.res b/tests/sav/nitcatalog_args1.res
index 8524fc6..7ab7a71 100644 (file)
--- a/tests/sav/nitcatalog_args1.res
+++ b/tests/sav/nitcatalog_args1.res
@@ -62,6 +62,10 @@
 </ul>
 </li>
 <li><strong>test_prog</strong>: <span class="synopsys nitdoc">A test program with a fake model to check model tools.</span> (test_prog/test_prog.nit)</li>
+<li><strong>tests</strong> (test_prog/tests)<ul>
+<li><strong>test_game</strong> (test_prog/tests/test_game.nit)</li>
+</ul>
+</li>
 </ul>
 </li>
 </ul>
@@ -80,8 +84,8 @@
 </ul>
 <h3>Quality</h3>
 <ul class="box">
-<li>28 warnings (59/kloc)</li>
-<li>82% documented</li>
+<li>28 warnings (55/kloc)</li>
+<li>73% documented</li>
 </ul>
 <h3>Tags</h3>
 <a href="../index.html#tag_test">test</a>, <a href="../index.html#tag_game">game</a><h3>Requirements</h3>
@@ -89,10 +93,10 @@ none<h3>Clients</h3>
 none<h3>Contributors</h3>
 <ul class="box"><li><a href="http:&#47;&#47;www.example.com&#47;~jdoe"><img src="https://secure.gravatar.com/avatar/694ea0904ceaf766c6738166ed89bafb?size=20&amp;default=retro">&nbsp;John Doe</a></li><li><img src="https://secure.gravatar.com/avatar/db3f2909768694ad2bb6409b44627182?size=20&amp;default=retro">&nbsp;Riri</li><li>Fifi (http:&#47;&#47;www.example.com&#47;~fifi)</li><li>Loulou</li></ul><h3>Stats</h3>
 <ul class="box">
-<li>9 modules</li>
-<li>23 classes</li>
-<li>75 methods</li>
-<li>471 lines of code</li>
+<li>10 modules</li>
+<li>26 classes</li>
+<li>79 methods</li>
+<li>509 lines of code</li>
 </ul>
 </div>
 </div> <!-- container-fluid -->

diff --git a/tests/sav/nitdoc_args4.res b/tests/sav/nitdoc_args4.res
index 9fdb265..e764a49 100644 (file)
--- a/tests/sav/nitdoc_args4.res
+++ b/tests/sav/nitdoc_args4.res
@@ -1,6 +1,8 @@
 Empty README for group `examples` (readme-warning)
+Empty README for group `man` (readme-warning)
+Empty README for group `tests` (readme-warning)
 Empty README for group `excluded` (readme-warning)
-Errors: 0. Warnings: 2.
+Errors: 0. Warnings: 4.
 MGroupPage excluded
        # excluded.section
                ## excluded.intro
@@ -39,12 +41,16 @@ ReadmePage examples
 ReadmePage game
        # mdarticle-0
 
+ReadmePage man
+
 ReadmePage platform
        # mdarticle-0
 
 ReadmePage rpg
        # mdarticle-0
 
+ReadmePage tests
+
 SearchPage Index
        # index.article
 
@@ -79,7 +85,10 @@ MModulePage test_prog
                                                ###### list.group
                                                        ####### test_prog-__Starter.intros
                                                        ####### test_prog-__Starter.redefs
-                       ### test_prog-__Sys.definition-list
+               ## test_prog__platform.concern
+               ## test_prog__platform-.concern
+                       ### test_prog__platform-__Sys.definition-list
+                               #### test_prog__platform-__Sys.definition
                                #### test_prog-__Sys.definition
                                        ##### test_prog-__Sys.intros_redefs
                                                ###### list.group
@@ -108,27 +117,6 @@ MPropertyPage start
        # start.section
                ## test_prog-__Starter__start.intro
 
-MClassPage Sys
-       # Sys.section
-               ## test_prog-__Sys.intro
-               ## test_prog-__Sys.inheritance
-                       ### test_prog-__Sys.graph
-                       ### list.group
-                               #### test_prog-__Sys.parents
-                               #### test_prog-__Sys.ancestors
-                               #### test_prog-__Sys.children
-                               #### test_prog-__Sys.descendants
-               ## test_prog-__Sys.constructors
-               ## test_prog-__Sys.concerns
-               ## test_prog.concern
-               ## test_prog.concern
-               ## test_prog-.concern
-                       ### test_prog-__Sys__main.definition
-
-MPropertyPage main
-       # main.section
-               ## test_prog-__Sys__main.intro
-
 MGroupPage examples
        # examples.section
                ## test_prog__examples.intro
@@ -287,6 +275,9 @@ MPropertyPage player_characters
                ## test_prog__examples.concern
                ## test_prog__examples-.concern
                        ### test_prog__examples-__MyGame__player_characters.definition
+               ## test_prog__tests.concern
+               ## test_prog__tests-.concern
+                       ### test_prog__tests-__TestGame__player_characters.definition
 
 MPropertyPage start_game
        # start_game.section
@@ -308,6 +299,10 @@ MPropertyPage stop_game
                ## test_prog__examples-.concern
                        ### test_prog__examples-__MyGame__stop_game.definition
 
+MGroupPage man
+       # man.section
+               ## test_prog__man.intro
+
 MGroupPage platform
        # platform.section
                ## test_prog__platform.intro
@@ -371,6 +366,12 @@ MModulePage platform
                                                ###### list.group
                                                        ####### test_prog__platform-__String.intros
                                                        ####### test_prog__platform-__String.redefs
+                       ### test_prog__platform-__Sys.definition-list
+                               #### test_prog__platform-__Sys.definition
+                                       ##### test_prog__platform-__Sys.intros_redefs
+                                               ###### list.group
+                                                       ####### test_prog__platform-__Sys.intros
+                                                       ####### test_prog__platform-__Sys.redefs
 
 MClassPage Bool
        # Bool.section
@@ -554,6 +555,38 @@ MClassPage String
                                #### test_prog__platform-__String.children
                                #### test_prog__platform-__String.descendants
 
+MClassPage Sys
+       # Sys.section
+               ## test_prog__platform-__Sys.intro
+               ## test_prog__platform-__Sys.inheritance
+                       ### test_prog__platform-__Sys.graph
+                       ### list.group
+                               #### test_prog__platform-__Sys.parents
+                               #### test_prog__platform-__Sys.ancestors
+                               #### test_prog__platform-__Sys.children
+                               #### test_prog__platform-__Sys.descendants
+               ## test_prog__platform-__Sys.constructors
+                       ### test_prog__platform-__Object__init.definition
+               ## test_prog__platform-__Sys.concerns
+               ## test_prog.concern
+               ## test_prog.concern
+               ## test_prog__platform.concern
+               ## test_prog__platform-.concern
+                       ### test_prog__platform-__Sys__main.definition
+                               #### test_prog__platform-__Sys__main.lin
+               ## test_prog-.concern
+                       ### test_prog-__Sys__main.definition
+                               #### test_prog-__Sys__main.lin
+
+MPropertyPage main
+       # main.section
+               ## test_prog__platform-__Sys__main.intro
+               ## test_prog__platform-__Sys__main.concerns
+               ## test_prog.concern
+               ## test_prog.concern
+               ## test_prog-.concern
+                       ### test_prog-__Sys__main.definition
+
 MGroupPage rpg
        # rpg.section
                ## test_prog__rpg.intro
@@ -1139,24 +1172,112 @@ MModulePage rpg
                                #### test_prog__rpg__rpg.imports
                                #### test_prog__rpg__rpg.clients
 
-Generated 105 pages
+MGroupPage tests
+       # tests.section
+               ## test_prog__tests.intro
+               ## test_prog__tests.concerns
+               ## test_prog.concern
+               ## test_prog.concern
+               ## test_prog__tests.concern
+               ## test_prog__tests-.concern
+                       ### test_prog__tests-.definition
+                               #### test_prog__tests-.intros_redefs
+                                       ##### list.group
+                                               ###### test_prog__tests-.intros
+                                               ###### test_prog__tests-.redefs
+
+MModulePage test_game
+       # test_game.section
+               ## test_prog__tests-.intro
+               ## test_prog__tests-.importation
+                       ### test_prog__tests-.graph
+                       ### list.group
+                               #### test_prog__tests-.imports
+                               #### test_prog__tests-.clients
+               ## test_prog__tests-.concerns
+               ## test_prog.concern
+               ## test_prog.concern
+               ## test_prog__tests.concern
+               ## test_prog__tests-.concern
+                       ### test_prog__tests-__GameTest.definition-list
+                               #### test_prog__tests-__GameTest.definition
+                                       ##### test_prog__tests-__GameTest.intros_redefs
+                                               ###### list.group
+                                                       ####### test_prog__tests-__GameTest.intros
+                                                       ####### test_prog__tests-__GameTest.redefs
+                       ### test_prog__tests-__TestGame.definition-list
+                               #### test_prog__tests-__TestGame.definition
+                                       ##### test_prog__tests-__TestGame.intros_redefs
+                                               ###### list.group
+                                                       ####### test_prog__tests-__TestGame.intros
+                                                       ####### test_prog__tests-__TestGame.redefs
+
+MClassPage GameTest
+       # GameTest.section
+               ## test_prog__tests-__GameTest.intro
+               ## test_prog__tests-__GameTest.inheritance
+                       ### test_prog__tests-__GameTest.graph
+                       ### list.group
+                               #### test_prog__tests-__GameTest.parents
+                               #### test_prog__tests-__GameTest.ancestors
+                               #### test_prog__tests-__GameTest.children
+                               #### test_prog__tests-__GameTest.descendants
+               ## test_prog__tests-__GameTest.constructors
+                       ### test_prog__platform-__Object__init.definition
+               ## test_prog__tests-__GameTest.concerns
+               ## test_prog.concern
+               ## test_prog.concern
+               ## test_prog__tests.concern
+               ## test_prog__tests-.concern
+                       ### test_prog__tests-__GameTest__test_game.definition
+
+MPropertyPage test_game
+       # test_game.section
+               ## test_prog__tests-__GameTest__test_game.intro
+
+MClassPage TestGame
+       # TestGame.section
+               ## test_prog__tests-__TestGame.intro
+               ## test_prog__tests-__TestGame.inheritance
+                       ### test_prog__tests-__TestGame.graph
+                       ### list.group
+                               #### test_prog__tests-__TestGame.parents
+                               #### test_prog__tests-__TestGame.ancestors
+                               #### test_prog__tests-__TestGame.children
+                               #### test_prog__tests-__TestGame.descendants
+               ## test_prog__tests-__TestGame.constructors
+                       ### test_prog__platform-__Object__init.definition
+               ## test_prog__tests-__TestGame.concerns
+               ## test_prog.concern
+               ## test_prog.concern
+               ## test_prog__tests.concern
+               ## test_prog__tests-.concern
+                       ### test_prog__tests-__TestGame__player_characters.definition
+                               #### test_prog__tests-__TestGame__player_characters.lin
+                       ### test_prog__tests-__TestGame__player_characters_61d.definition
+
+MPropertyPage player_characters=
+       # player_characters=.section
+               ## test_prog__tests-__TestGame__player_characters_61d.intro
+
+Generated 114 pages
  list:
-  MPropertyPage: 60 (57.14%)
-  MClassPage: 21 (20.00%)
-  MModulePage: 10 (9.52%)
-  ReadmePage: 6 (5.71%)
-  MGroupPage: 6 (5.71%)
-  SearchPage: 1 (0.95%)
-  OverviewPage: 1 (0.95%)
-Found 198 mentities
+  MPropertyPage: 62 (54.38%)
+  MClassPage: 23 (20.17%)
+  MModulePage: 11 (9.64%)
+  ReadmePage: 8 (7.01%)
+  MGroupPage: 8 (7.01%)
+  SearchPage: 1 (0.87%)
+  OverviewPage: 1 (0.87%)
+Found 212 mentities
  list:
-  MMethodDef: 75 (37.87%)
-  MMethod: 59 (29.79%)
-  MClassDef: 23 (11.61%)
-  MClass: 21 (10.60%)
-  MModule: 10 (5.05%)
-  MGroup: 6 (3.03%)
-  MPackage: 2 (1.01%)
-  MVirtualTypeDef: 1 (0.50%)
-  MVirtualTypeProp: 1 (0.50%)
+  MMethodDef: 79 (37.26%)
+  MMethod: 61 (28.77%)
+  MClassDef: 26 (12.26%)
+  MClass: 23 (10.84%)
+  MModule: 11 (5.18%)
+  MGroup: 8 (3.77%)
+  MPackage: 2 (0.94%)
+  MVirtualTypeDef: 1 (0.47%)
+  MVirtualTypeProp: 1 (0.47%)
 quicksearch-list.js

diff --git a/tests/sav/nitls_args7.res b/tests/sav/nitls_args7.res
index 49f93f6..d5326c0 100644 (file)
--- a/tests/sav/nitls_args7.res
+++ b/tests/sav/nitls_args7.res
@@ -11,4 +11,6 @@ test_prog: Test program for model tools. (test_prog)
 |  |--combat: COmbat interactions between characters. (test_prog/rpg/combat.nit)
 |  |--races: Races of the game. (test_prog/rpg/races.nit)
 |  `--rpg: A worlg RPG abstraction. (test_prog/rpg/rpg.nit)
-`--test_prog: A test program with a fake model to check model tools. (test_prog/test_prog.nit)
+|--test_prog: A test program with a fake model to check model tools. (test_prog/test_prog.nit)
+`--tests (test_prog/tests)
+   `--test_game (test_prog/tests/test_game.nit)

diff --git a/tests/sav/nitsmells_args1.res b/tests/sav/nitsmells_args1.res
index 109e74a..6bf7b3d 100644 (file)
--- a/tests/sav/nitsmells_args1.res
+++ b/tests/sav/nitsmells_args1.res
@@ -7,4 +7,12 @@ Long method:  Average 1 lines
                -total_strengh has 2 lines
                -total_endurance has 2 lines
                -total_intelligence has 2 lines
-Large class: 6 attributes and 18 methods (4.581A 7.153M Average)
+Large class: 6 attributes and 18 methods (4.673A 6.923M Average)
+--------------------
+Full name: test_prog$GameTest Location: test_prog/tests/test_game.nit:25,1--33,3
+Feature envy:
+       Affected method(s):
+               -test_game() 0/1 move to TestGame
+Long method:  Average 1 lines
+       Affected method(s):
+               -test_game has 3 lines

diff --git a/tests/sav/test_loader_args1.res b/tests/sav/test_loader_args1.res
index c237e27..830f160 100644 (file)
--- a/tests/sav/test_loader_args1.res
+++ b/tests/sav/test_loader_args1.res
@@ -14,8 +14,8 @@ scan_full found 6 modules
   model: mpackages=1 mmodules=5
   mb: identified modules=5; parsed modules=0
 parse found 2 modules
-  model: mpackages=2 mmodules=10
-  mb: identified modules=10; parsed modules=6
+  model: mpackages=2 mmodules=11
+  mb: identified modules=11; parsed modules=6
 parse_full found 5 modules
-  model: mpackages=2 mmodules=10
-  mb: identified modules=10; parsed modules=6
+  model: mpackages=2 mmodules=11
+  mb: identified modules=11; parsed modules=6

diff --git a/tests/sav/test_loader_args2.res b/tests/sav/test_loader_args2.res
index 4650fe7..1f0568d 100644 (file)
--- a/tests/sav/test_loader_args2.res
+++ b/tests/sav/test_loader_args2.res
@@ -22,20 +22,20 @@ test_prog::test_prog: module?
        module test_prog::test_prog at test_prog/test_prog.nit
 test_prog::test_prog: group?
        nothing
-  model: mpackages=2 mmodules=10
-  mb: identified modules=10; parsed modules=0
+  model: mpackages=2 mmodules=11
+  mb: identified modules=11; parsed modules=0
 test_prog/: module?
        module test_prog::test_prog at test_prog/test_prog.nit
 test_prog/: group?
        group test_prog> at test_prog
-  model: mpackages=2 mmodules=10
-  mb: identified modules=10; parsed modules=0
-scan_full found 20 modules
-  model: mpackages=2 mmodules=10
-  mb: identified modules=10; parsed modules=0
+  model: mpackages=2 mmodules=11
+  mb: identified modules=11; parsed modules=0
+scan_full found 22 modules
+  model: mpackages=2 mmodules=11
+  mb: identified modules=11; parsed modules=0
 parse found 1 modules
-  model: mpackages=2 mmodules=10
-  mb: identified modules=10; parsed modules=8
-parse_full found 9 modules
-  model: mpackages=2 mmodules=10
-  mb: identified modules=10; parsed modules=9
+  model: mpackages=2 mmodules=11
+  mb: identified modules=11; parsed modules=8
+parse_full found 10 modules
+  model: mpackages=2 mmodules=11
+  mb: identified modules=11; parsed modules=10

diff --git a/tests/sav/test_loader_args3.res b/tests/sav/test_loader_args3.res
index fea9069..384c032 100644 (file)
--- a/tests/sav/test_loader_args3.res
+++ b/tests/sav/test_loader_args3.res
@@ -6,26 +6,26 @@ test_prog::races: module?
        module test_prog::races at test_prog/rpg/races.nit
 test_prog::races: group?
        nothing
-  model: mpackages=2 mmodules=10
-  mb: identified modules=10; parsed modules=0
+  model: mpackages=2 mmodules=11
+  mb: identified modules=11; parsed modules=0
 test_prog::races:rpg: module?
        Error: cannot find module `test_prog::races:rpg`. Did you mean test_prog::races?
 test_prog::races:rpg: group?
        nothing
-  model: mpackages=2 mmodules=10
-  mb: identified modules=10; parsed modules=0
+  model: mpackages=2 mmodules=11
+  mb: identified modules=11; parsed modules=0
 test_prog::races::combat: module?
        Error: cannot find module `test_prog::races::combat`. Did you mean test_prog::combat?
 test_prog::races::combat: group?
        nothing
-  model: mpackages=2 mmodules=10
-  mb: identified modules=10; parsed modules=0
+  model: mpackages=2 mmodules=11
+  mb: identified modules=11; parsed modules=0
 scan_full found 1 modules
-  model: mpackages=2 mmodules=10
-  mb: identified modules=10; parsed modules=0
+  model: mpackages=2 mmodules=11
+  mb: identified modules=11; parsed modules=0
 parse found 1 modules
-  model: mpackages=2 mmodules=10
-  mb: identified modules=10; parsed modules=2
+  model: mpackages=2 mmodules=11
+  mb: identified modules=11; parsed modules=2
 parse_full found 1 modules
-  model: mpackages=2 mmodules=10
-  mb: identified modules=10; parsed modules=2
+  model: mpackages=2 mmodules=11
+  mb: identified modules=11; parsed modules=2

diff --git a/tests/sav/test_loader_args4.res b/tests/sav/test_loader_args4.res
index 4c9789a..63492e1 100644 (file)
--- a/tests/sav/test_loader_args4.res
+++ b/tests/sav/test_loader_args4.res
@@ -8,26 +8,26 @@ test_prog::fail::races: module?
        Error: cannot find module `test_prog::fail::races`. Did you mean test_prog::races?
 test_prog::fail::races: group?
        nothing
-  model: mpackages=2 mmodules=10
-  mb: identified modules=10; parsed modules=0
+  model: mpackages=2 mmodules=11
+  mb: identified modules=11; parsed modules=0
 test_prog::fail: module?
        Error: cannot find module `test_prog::fail`. Did you mean test_prog::game?
 test_prog::fail: group?
        nothing
-  model: mpackages=2 mmodules=10
-  mb: identified modules=10; parsed modules=0
+  model: mpackages=2 mmodules=11
+  mb: identified modules=11; parsed modules=0
 fail::fail: module?
        nothing
 fail::fail: group?
        nothing
-  model: mpackages=2 mmodules=10
-  mb: identified modules=10; parsed modules=0
+  model: mpackages=2 mmodules=11
+  mb: identified modules=11; parsed modules=0
 scan_full found 0 modules
-  model: mpackages=2 mmodules=10
-  mb: identified modules=10; parsed modules=0
+  model: mpackages=2 mmodules=11
+  mb: identified modules=11; parsed modules=0
 parse found 0 modules
-  model: mpackages=2 mmodules=10
-  mb: identified modules=10; parsed modules=0
+  model: mpackages=2 mmodules=11
+  mb: identified modules=11; parsed modules=0
 parse_full found 0 modules
-  model: mpackages=2 mmodules=10
-  mb: identified modules=10; parsed modules=0
+  model: mpackages=2 mmodules=11
+  mb: identified modules=11; parsed modules=0

diff --git a/tests/sav/test_model_index_args10.res b/tests/sav/test_model_index_args10.res
index cfee574..d68740c 100644 (file)
--- a/tests/sav/test_model_index_args10.res
+++ b/tests/sav/test_model_index_args10.res
@@ -5,8 +5,8 @@
  * 5: careers (test_prog::careers)
  * 5: examples (test_prog>examples>)
  * 5: excluded (excluded>)
- * 5: excluded (excluded::excluded)
  * 5: excluded (excluded)
- * 5: game (test_prog::game)
+ * 5: excluded (excluded::excluded)
  * 5: game (test_prog>game>)
+ * 5: game (test_prog::game)
  * 4: races (test_prog::races)

diff --git a/tests/sav/test_model_index_args11.res b/tests/sav/test_model_index_args11.res
index f969724..02cba00 100644 (file)
--- a/tests/sav/test_model_index_args11.res
+++ b/tests/sav/test_model_index_args11.res
@@ -1,12 +1,12 @@
 # Dwarves
 
- * 13: Int (test_prog::Int)
  * 12: Sys (test_prog::Sys)
  * 8: excluded (excluded>)
  * 7: excluded (excluded)
  * 13: game (test_prog>game>)
+ * 13: man (test_prog>man>)
  * 13: races (test_prog::races)
  * 13: rpg (test_prog>rpg>)
  * 13: rpg (test_prog::rpg)
- * 9: test_prog (test_prog>)
  * 9: test_prog (test_prog)
+ * 9: test_prog (test_prog>)

diff --git a/tests/sav/test_model_index_args13.res b/tests/sav/test_model_index_args13.res
index 000025b..fe5bfd3 100644 (file)
--- a/tests/sav/test_model_index_args13.res
+++ b/tests/sav/test_model_index_args13.res
@@ -1,12 +1,12 @@
 # Obj
 
  * 3: + (test_prog::Int::+)
- * 3: - (test_prog::Int::-)
  * 3: > (test_prog::Int::>)
  * 3: Elf (test_prog::Elf)
  * 3: Int (test_prog::Int)
  * 1: Object (test_prog::Object)
  * 3: Sys (test_prog::Sys)
  * 3: age (test_prog::Character::age)
+ * 3: man (test_prog>man>)
  * 3: rpg (test_prog::rpg)
  * 3: rpg (test_prog>rpg>)

diff --git a/tests/sav/test_model_index_args16.res b/tests/sav/test_model_index_args16.res
index fc68d39..bd3e0ad 100644 (file)
--- a/tests/sav/test_model_index_args16.res
+++ b/tests/sav/test_model_index_args16.res
@@ -1,11 +1,11 @@
 # Dwa
 
  * 13: Dwarf (test_prog::Dwarf)
- * 14: Game (test_prog::Game)
  * 9: excluded (excluded>)
  * 8: excluded (excluded)
  * 14: game (test_prog>game>)
  * 14: game (test_prog::game)
+ * 13: man (test_prog>man>)
  * 14: rpg (test_prog>rpg>)
  * 14: rpg (test_prog::rpg)
  * 10: test_prog (test_prog>)

diff --git a/tests/sav/test_model_index_args20.res b/tests/sav/test_model_index_args20.res
index dd17043..41184bb 100644 (file)
--- a/tests/sav/test_model_index_args20.res
+++ b/tests/sav/test_model_index_args20.res
@@ -1,12 +1,12 @@
 # Foo
 
- * 3: != (test_prog::Object::!=)
- * 3: == (test_prog::Object::==)
- * 3: > (test_prog::Int::>)
+ * 3: * (test_prog::Int::*)
  * 2: Bool (test_prog::Bool)
  * 3: Elf (test_prog::Elf)
  * 3: Float (test_prog::Float)
  * 3: Int (test_prog::Int)
  * 3: Sys (test_prog::Sys)
- * 3: rpg (test_prog::rpg)
+ * 3: dps (test_prog::Weapon::dps)
+ * 3: man (test_prog>man>)
  * 3: rpg (test_prog>rpg>)
+ * 3: rpg (test_prog::rpg)

diff --git a/tests/sav/test_model_index_args21.res b/tests/sav/test_model_index_args21.res
index c06776c..0c44100 100644 (file)
--- a/tests/sav/test_model_index_args21.res
+++ b/tests/sav/test_model_index_args21.res
@@ -7,6 +7,6 @@
  * 3: Int (test_prog::Int)
  * 3: Sys (test_prog::Sys)
  * 3: rpg (test_prog::rpg)
- * 3: test_prog (test_prog::test_prog)
- * 3: test_prog (test_prog)
  * 3: test_prog (test_prog>)
+ * 3: test_prog (test_prog)
+ * 3: test_prog (test_prog::test_prog)

diff --git a/tests/sav/test_model_index_args8.res b/tests/sav/test_model_index_args8.res
index 191fd72..6381895 100644 (file)
--- a/tests/sav/test_model_index_args8.res
+++ b/tests/sav/test_model_index_args8.res
@@ -6,7 +6,7 @@
  * 1: + (test_prog::Float::+)
  * 1: - (test_prog::Int::-)
  * 1: - (test_prog::Float::-)
- * 1: / (test_prog::Float::/)
  * 1: / (test_prog::Int::/)
- * 1: > (test_prog::Float::>)
+ * 1: / (test_prog::Float::/)
  * 1: > (test_prog::Int::>)
+ * 1: > (test_prog::Float::>)

diff --git a/tests/sav/test_model_index_args9.res b/tests/sav/test_model_index_args9.res
index a4c370f..d8bc532 100644 (file)
--- a/tests/sav/test_model_index_args9.res
+++ b/tests/sav/test_model_index_args9.res
@@ -1,12 +1,12 @@
 # Foo
 
- * 3: + (test_prog::Int::+)
- * 3: + (test_prog::Float::+)
  * 2: Bool (test_prog::Bool)
  * 3: Elf (test_prog::Elf)
  * 3: Float (test_prog::Float)
  * 3: Int (test_prog::Int)
  * 3: Sys (test_prog::Sys)
  * 3: age (test_prog::Character::age)
+ * 3: dps (test_prog::Weapon::dps)
+ * 3: man (test_prog>man>)
  * 3: rpg (test_prog::rpg)
  * 3: rpg (test_prog>rpg>)

diff --git a/tests/sav/test_neo_args1.res b/tests/sav/test_neo_args1.res
index e907ec7..92b6106 100644 (file)
--- a/tests/sav/test_neo_args1.res
+++ b/tests/sav/test_neo_args1.res
@@ -4,9 +4,9 @@ excluded test_prog
 excluded test_prog
 
 # mmodules:
-careers character combat excluded game game_examples platform races rpg test_prog
+careers character combat excluded game game_examples platform races rpg test_game test_prog
 ------------------------------------
-careers character combat excluded game game_examples platform races rpg test_prog
+careers character combat excluded game game_examples platform races rpg test_game test_prog
 
 # mclasses:
 Alcoholic Bool Career Character Combatable Dwarf Elf Float Game Human Int List Magician Object Race Starter String Sys Warrior Weapon

diff --git a/tests/sav/test_sort_perf_args1.res b/tests/sav/test_sort_perf_args1.res
index 38964bb..6a7da0f 100644 (file)
--- a/tests/sav/test_sort_perf_args1.res
+++ b/tests/sav/test_sort_perf_args1.res
@@ -10,6 +10,8 @@ test_prog/
 |  |--test_prog/game/excluded_dir
 |  |  `--test_prog/game/excluded_dir/more.nit
 |  `--test_prog/game/game.nit
+|--test_prog/man
+|  `--test_prog/man/test_prog.man
 |--test_prog/package.ini
 |--test_prog/platform
 |  |--test_prog/platform/README.md
@@ -21,4 +23,6 @@ test_prog/
 |  |--test_prog/rpg/combat.nit
 |  |--test_prog/rpg/races.nit
 |  `--test_prog/rpg/rpg.nit
-`--test_prog/test_prog.nit
+|--test_prog/test_prog.nit
+`--test_prog/tests
+   `--test_prog/tests/test_game.nit

diff --git a/tests/test_prog/platform/platform.nit b/tests/test_prog/platform/platform.nit
index 175e6fc..7bd604f 100644 (file)
--- a/tests/test_prog/platform/platform.nit
+++ b/tests/test_prog/platform/platform.nit
@@ -57,3 +57,8 @@ class String end
 
 # List of things.
 class List[E] end
+
+# Sys
+class Sys
+       fun main is intern
+end

diff --git a/tests/test_prog/tests/test_game.nit b/tests/test_prog/tests/test_game.nit
index 975e909..6d667a0 100644 (file)
--- a/tests/test_prog/tests/test_game.nit
+++ b/tests/test_prog/tests/test_game.nit
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-module test_game_examples is test
+module test_game is test
 
 import game
 
@@ -26,7 +26,8 @@ class GameTest
        test
 
        fun test_game is test do
-               var game = new TestGame
-               assert game.player_characters isa List[Character]
+               var game1 = new TestGame
+               var game2 = new TestGame
+               assert game1 != game2
        end
 end