branch master updated: * tp/Makefile.tres, tp/t/30sectioning.t, tp/t/40moresectioning.t: move some tests from tp/t/30sectioning.t to tp/t/40moresectioning.t as part of an effort to reduce the size of 30sectioning.t.

[Patrice Dumas]

This is an automated email from the git hooks/post-receive script.

pertusus pushed a commit to branch master
in repository texinfo.

The following commit(s) were added to refs/heads/master by this push:
     new 5c8cd533f8 * tp/Makefile.tres, tp/t/30sectioning.t, 
tp/t/40moresectioning.t: move some tests from tp/t/30sectioning.t to 
tp/t/40moresectioning.t as part of an effort to reduce the size of 
30sectioning.t.
5c8cd533f8 is described below

commit 5c8cd533f8a6cdc9fa02d81a44beda0785a02bbf
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Tue Jan 3 18:01:33 2023 +0100

    * tp/Makefile.tres, tp/t/30sectioning.t, tp/t/40moresectioning.t:
    move some tests from tp/t/30sectioning.t to tp/t/40moresectioning.t
    as part of an effort to reduce the size of 30sectioning.t.
---
 ChangeLog                                          |  6 ++
 tp/Makefile.tres                                   | 17 ++---
 tp/t/30sectioning.t                                | 64 +----------------
 tp/t/40moresectioning.t                            | 84 ++++++++++++++++++++++
 .../{sectioning => moresectioning}/contents.pl     |  0
 .../contents_and_shortcontents.pl                  |  0
 .../sectioning_part_appendix.pl                    |  0
 .../sectioning_part_appendix_no_top.pl             |  0
 .../sections_test.pl                               |  0
 .../sections_test_no_use_nodes.pl                  |  0
 ...ctions_test_no_use_nodes_use_node_directions.pl |  0
 .../shortcontents.pl                               |  0
 12 files changed, 101 insertions(+), 70 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f3865ea796..f1aa1a176e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2023-01-03  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Makefile.tres, tp/t/30sectioning.t, tp/t/40moresectioning.t:
+       move some tests from tp/t/30sectioning.t to tp/t/40moresectioning.t
+       as part of an effort to reduce the size of 30sectioning.t.
+
 2023-01-03  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Makefile.am (test_files), tp/t/30sectioning.t: use files for the
diff --git a/tp/Makefile.tres b/tp/Makefile.tres
index c0ef6a3241..175f6df91d 100644
--- a/tp/Makefile.tres
+++ b/tp/Makefile.tres
@@ -21,6 +21,7 @@ test_tap_files_generated_list = \
   t/27float.t \
   t/28heading.t \
   t/30sectioning.t \
+  t/40moresectioning.t \
   t/50value.t \
   t/55conditionals.t \
   t/57invalid_nestings.t \
@@ -1591,6 +1592,14 @@ test_files_generated_list = 
$(test_tap_files_generated_list) \
   t/results/misc_commands/text_before_and_after_bye.pl \
   t/results/misc_commands/text_before_line_command.pl \
   t/results/misc_commands/vskip.pl \
+  t/results/moresectioning/contents.pl \
+  t/results/moresectioning/contents_and_shortcontents.pl \
+  t/results/moresectioning/sectioning_part_appendix.pl \
+  t/results/moresectioning/sectioning_part_appendix_no_top.pl \
+  t/results/moresectioning/sections_test.pl \
+  t/results/moresectioning/sections_test_no_use_nodes.pl \
+  t/results/moresectioning/sections_test_no_use_nodes_use_node_directions.pl \
+  t/results/moresectioning/shortcontents.pl \
   t/results/multitable/empty_headitem.pl \
   t/results/multitable/empty_item_tab.pl \
   t/results/multitable/empty_multitable_with_cells.pl \
@@ -1831,8 +1840,6 @@ test_files_generated_list = 
$(test_tap_files_generated_list) \
   
t/results/sectioning/character_and_spaces_in_refs_out/res_html/other-nodes.html 
\
   t/results/sectioning/complex.pl \
   t/results/sectioning/complex_split_at_node.pl \
-  t/results/sectioning/contents.pl \
-  t/results/sectioning/contents_and_shortcontents.pl \
   t/results/sectioning/contents_at_document_begin.pl \
   t/results/sectioning/contents_at_end_document.pl \
   t/results/sectioning/contents_at_end_document_after_node.pl \
@@ -1971,15 +1978,9 @@ test_files_generated_list = 
$(test_tap_files_generated_list) \
   t/results/sectioning/section_in_unnumbered_info.pl \
   t/results/sectioning/section_in_unnumbered_plaintext.pl \
   t/results/sectioning/section_node_before_part.pl \
-  t/results/sectioning/sectioning_part_appendix.pl \
-  t/results/sectioning/sectioning_part_appendix_no_top.pl \
   t/results/sectioning/sections.pl \
-  t/results/sectioning/sections_test.pl \
-  t/results/sectioning/sections_test_no_use_nodes.pl \
-  t/results/sectioning/sections_test_no_use_nodes_use_node_directions.pl \
   t/results/sectioning/semi_auto.pl \
   t/results/sectioning/setfilename_on_top_and_after_node.pl \
-  t/results/sectioning/shortcontents.pl \
   t/results/sectioning/space_in_node.pl \
   t/results/sectioning/special_spaces_in_nodes.pl \
   t/results/sectioning/split_for_format_not_split.pl \
diff --git a/tp/t/30sectioning.t b/tp/t/30sectioning.t
index cac39bb311..cb986e83f6 100644
--- a/tp/t/30sectioning.t
+++ b/tp/t/30sectioning.t
@@ -5,33 +5,6 @@ use Texinfo::ModulePath (undef, undef, undef, 'updirs' => 2);
 
 require 't/test_utils.pl';
 
-my $sections_no_top_text =
-'@chapter chapter
-
-@section section
-
-@subsection subsection
-
-@subsubsection subsubsection
-
-@part part
-
-@chapter chapter in part
-
-@chapter second chapter in part
-
-@unnumbered unnumbered
-
-@appendix appendix
-
-@appendixsec appendixsec
-';
-
-my $test_text =
-'@top top
-
-'.$sections_no_top_text;
-
 my $chapter_sections_text =
 '@unnumbered unnumbered
 
@@ -144,33 +117,6 @@ Top node
 ';
 
 my @tests_converted = (
-['contents',
-$test_text.
-'
-@contents
-'],
-['shortcontents',
-$test_text.
-'
-@shortcontents
-'],
-['contents_and_shortcontents',
-$test_text.
-'
-@shortcontents
-
-@contents
-'],
-# used as a possible comparison with the next two
-['sections_test',
-$test_text
-],
-['sections_test_no_use_nodes',
-$test_text
-,{},{'USE_NODES' => 0}],
-['sections_test_no_use_nodes_use_node_directions',
-$test_text
-,{},{'USE_NODES' => 0, 'USE_NODE_DIRECTIONS' => 1}],
 ['one_subsection',
 '@subsection The subsection
 '],
@@ -1764,12 +1710,6 @@ in chap
 
 @appendix Appendix
 '],
-['sectioning_part_appendix',
-$test_text,
-{'test_split' => 'section'}],
-['sectioning_part_appendix_no_top',
-$sections_no_top_text,
-{'test_split' => 'section'}],
 ['chapter_sections',
 $chapter_sections_text,
 {'test_split' => 'section'}],
@@ -1987,8 +1927,8 @@ foreach my $test (@tests_info) {
 my @xml_tests_cases_tests = ('part_before_section',
 'section_before_chapter',
 'top_part_chapter', 'section_before_top_no_node',
-'section_chapter_before_top', 'sectioning_part_appendix',
-'part_chapter_appendix', 'sectioning_part_appendix_no_top',
+'section_chapter_before_top',
+'part_chapter_appendix',
 'top_chapter_sections', 'chapter_sections',
 'next_no_prev_to_node',
 'empty_ref_arg');
diff --git a/tp/t/40moresectioning.t b/tp/t/40moresectioning.t
new file mode 100644
index 0000000000..5de17899df
--- /dev/null
+++ b/tp/t/40moresectioning.t
@@ -0,0 +1,84 @@
+use strict;
+
+use lib '.';
+use Texinfo::ModulePath (undef, undef, undef, 'updirs' => 2);
+
+require 't/test_utils.pl';
+
+my $sections_no_top_text =
+'@chapter chapter
+
+@section section
+
+@subsection subsection
+
+@subsubsection subsubsection
+
+@part part
+
+@chapter chapter in part
+
+@chapter second chapter in part
+
+@unnumbered unnumbered
+
+@appendix appendix
+
+@appendixsec appendixsec
+';
+
+my $test_text =
+'@top top
+
+'.$sections_no_top_text;
+
+my @tests_converted = (
+['contents',
+$test_text.
+'
+@contents
+'],
+['shortcontents',
+$test_text.
+'
+@shortcontents
+'],
+['contents_and_shortcontents',
+$test_text.
+'
+@shortcontents
+
+@contents
+'],
+# used as a possible comparison with the next two
+['sections_test',
+$test_text
+],
+['sections_test_no_use_nodes',
+$test_text
+,{},{'USE_NODES' => 0}],
+['sections_test_no_use_nodes_use_node_directions',
+$test_text
+,{},{'USE_NODES' => 0, 'USE_NODE_DIRECTIONS' => 1}],
+);
+
+my @test_cases = (
+['sectioning_part_appendix',
+$test_text,
+{'test_split' => 'section'}],
+['sectioning_part_appendix_no_top',
+$sections_no_top_text,
+{'test_split' => 'section'}],
+);
+
+foreach my $test (@tests_converted) {
+  push @{$test->[2]->{'test_formats'}}, 'plaintext';
+  push @{$test->[2]->{'test_formats'}}, 'html';
+  $test->[2]->{'full_document'} = 1 unless 
(exists($test->[2]->{'full_document'}));
+}
+
+foreach my $test (@test_cases) {
+  push @{$test->[2]->{'test_formats'}}, 'xml';
+}
+
+run_all('moresectioning', [@test_cases, @tests_converted]);
diff --git a/tp/t/results/sectioning/contents.pl 
b/tp/t/results/moresectioning/contents.pl
similarity index 100%
rename from tp/t/results/sectioning/contents.pl
rename to tp/t/results/moresectioning/contents.pl
diff --git a/tp/t/results/sectioning/contents_and_shortcontents.pl 
b/tp/t/results/moresectioning/contents_and_shortcontents.pl
similarity index 100%
rename from tp/t/results/sectioning/contents_and_shortcontents.pl
rename to tp/t/results/moresectioning/contents_and_shortcontents.pl
diff --git a/tp/t/results/sectioning/sectioning_part_appendix.pl 
b/tp/t/results/moresectioning/sectioning_part_appendix.pl
similarity index 100%
rename from tp/t/results/sectioning/sectioning_part_appendix.pl
rename to tp/t/results/moresectioning/sectioning_part_appendix.pl
diff --git a/tp/t/results/sectioning/sectioning_part_appendix_no_top.pl 
b/tp/t/results/moresectioning/sectioning_part_appendix_no_top.pl
similarity index 100%
rename from tp/t/results/sectioning/sectioning_part_appendix_no_top.pl
rename to tp/t/results/moresectioning/sectioning_part_appendix_no_top.pl
diff --git a/tp/t/results/sectioning/sections_test.pl 
b/tp/t/results/moresectioning/sections_test.pl
similarity index 100%
rename from tp/t/results/sectioning/sections_test.pl
rename to tp/t/results/moresectioning/sections_test.pl
diff --git a/tp/t/results/sectioning/sections_test_no_use_nodes.pl 
b/tp/t/results/moresectioning/sections_test_no_use_nodes.pl
similarity index 100%
rename from tp/t/results/sectioning/sections_test_no_use_nodes.pl
rename to tp/t/results/moresectioning/sections_test_no_use_nodes.pl
diff --git 
a/tp/t/results/sectioning/sections_test_no_use_nodes_use_node_directions.pl 
b/tp/t/results/moresectioning/sections_test_no_use_nodes_use_node_directions.pl
similarity index 100%
rename from 
tp/t/results/sectioning/sections_test_no_use_nodes_use_node_directions.pl
rename to 
tp/t/results/moresectioning/sections_test_no_use_nodes_use_node_directions.pl
diff --git a/tp/t/results/sectioning/shortcontents.pl 
b/tp/t/results/moresectioning/shortcontents.pl
similarity index 100%
rename from tp/t/results/sectioning/shortcontents.pl
rename to tp/t/results/moresectioning/shortcontents.pl