doc/commands: allow NitUnit entities in model view

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

diff --git a/src/doc/commands/tests/test_commands.nit b/src/doc/commands/tests/test_commands.nit
index d91701b..c5d03a3 100644 (file)
--- a/src/doc/commands/tests/test_commands.nit
+++ b/src/doc/commands/tests/test_commands.nit
@@ -58,7 +58,7 @@ class TestCommands
                var filters = new ModelFilter(
                        private_visibility,
                        accept_fictive = false,
-                       accept_test = false)
+                       accept_test = true)
 
                test_builder = modelbuilder
                test_view = new ModelView(model, mainmodule, filters)

diff --git a/src/doc/commands/tests/test_commands_catalog.nit b/src/doc/commands/tests/test_commands_catalog.nit
index 9d60706..07e82d8 100644 (file)
--- a/src/doc/commands/tests/test_commands_catalog.nit
+++ b/src/doc/commands/tests/test_commands_catalog.nit
@@ -57,7 +57,7 @@ class TestCommandsCatalog
        end
 
        fun test_cmd_catalog_search is test do
-               var cmd = new CmdCatalogSearch(test_view, test_catalog, "test")
+               var cmd = new CmdCatalogSearch(test_view, test_catalog, "testprog")
                var res = cmd.init_command
                assert res isa CmdSuccess
                assert cmd.results.as(not null).first.full_name == "test_prog"

diff --git a/src/doc/commands/tests/test_commands_http.nit b/src/doc/commands/tests/test_commands_http.nit
index c081699..f2d5e18 100644 (file)
--- a/src/doc/commands/tests/test_commands_http.nit
+++ b/src/doc/commands/tests/test_commands_http.nit
@@ -287,7 +287,7 @@ class TestCommandsHttp
        # CmdCatalog
 
        fun test_cmd_http_catalog_search is test do
-               var req = new_request("/?q=test&l=1")
+               var req = new_request("/?q=testprog&l=1")
                var cmd = new CmdCatalogSearch(test_view, test_catalog)
                var res = cmd.http_init(req)
                assert res isa CmdSuccess

diff --git a/src/doc/commands/tests/test_commands_json.sav/test_cmd_mentities.res b/src/doc/commands/tests/test_commands_json.sav/test_cmd_mentities.res
index 07d815d..5d6c8d9 100644 (file)
--- a/src/doc/commands/tests/test_commands_json.sav/test_cmd_mentities.res
+++ b/src/doc/commands/tests/test_commands_json.sav/test_cmd_mentities.res
@@ -128,6 +128,18 @@
                "html_synopsis": "<span class=\"synopsys nitdoc\">A worlg RPG abstraction.</span>",
                "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",
                "synopsis": "A test program with a fake model to check model tools.",
                "namespace": [{

diff --git a/src/doc/commands/tests/test_commands_json.sav/test_cmd_search.res b/src/doc/commands/tests/test_commands_json.sav/test_cmd_search.res
index c392050..d58aef9 100644 (file)
--- a/src/doc/commands/tests/test_commands_json.sav/test_cmd_search.res
+++ b/src/doc/commands/tests/test_commands_json.sav/test_cmd_search.res
@@ -169,7 +169,7 @@
                }
        }],
        "page": 1,
-       "count": 113,
+       "count": 121,
        "limit": 10,
-       "max": 11
+       "max": 12
 }

diff --git a/src/doc/commands/tests/test_commands_model.nit b/src/doc/commands/tests/test_commands_model.nit
index 901dd3e..88d5e5e 100644 (file)
--- a/src/doc/commands/tests/test_commands_model.nit
+++ b/src/doc/commands/tests/test_commands_model.nit
@@ -204,7 +204,7 @@ class TestCommandsModel
                var cmd = new CmdModelEntities(test_view, kind = "modules")
                var res = cmd.init_command
                assert res isa CmdSuccess
-               assert cmd.results.as(not null).length == 10
+               assert cmd.results.as(not null).length == 11
        end
 
        fun test_cmd_results_random is test do

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 fd8b8ba..3f34348 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
- * 10 modules
- * 75 methods
- * 23 classes
- * 471 lines of code
+ * 11 modules
+ * 78 methods
+ * 25 classes
+ * 502 lines of code
  * 6 contributors
  * 1 maintainers
  * 2 tags