[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: * tp/Makefile.tres, tp/t/30sectioning.t, tp/t/40m
From: |
Patrice Dumas |
Subject: |
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. |
Date: |
Tue, 03 Jan 2023 12:46:43 -0500 |
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 afb69bbd8e * tp/Makefile.tres, tp/t/30sectioning.t,
tp/t/40moresectioning.t: move some tests from tp/t/30sectioning.t to
tp/t/40moresectioning.t.
afb69bbd8e is described below
commit afb69bbd8e9378fefaf5ac2e5a679d04ade6926a
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Tue Jan 3 18:46: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.
---
ChangeLog | 5 +
tp/Makefile.tres | 20 ++--
tp/t/30sectioning.t | 97 +---------------
tp/t/40moresectioning.t | 127 ++++++++++++++++++++-
.../anchor_in_footnote.pl | 0
.../anchor_in_footnote_separate.pl | 0
.../chapter_sections.pl | 0
.../character_and_spaces_in_refs.pl | 0
.../equivalent_nodes_defined_linked.pl | 0
.../only_special_spaces_node.pl | 0
.../section_in_unnumbered_info.pl | 0
.../section_in_unnumbered_plaintext.pl | 0
.../special_spaces_in_nodes.pl | 0
.../top_chapter_sections.pl | 0
14 files changed, 145 insertions(+), 104 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index f1aa1a176e..c47296d4b3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+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.
+
2023-01-03 Patrice Dumas <pertusus@free.fr>
* tp/Makefile.tres, tp/t/30sectioning.t, tp/t/40moresectioning.t:
diff --git a/tp/Makefile.tres b/tp/Makefile.tres
index 175f6df91d..8027f3ee5f 100644
--- a/tp/Makefile.tres
+++ b/tp/Makefile.tres
@@ -1592,14 +1592,24 @@ 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/anchor_in_footnote.pl \
+ t/results/moresectioning/anchor_in_footnote_separate.pl \
+ t/results/moresectioning/chapter_sections.pl \
+ t/results/moresectioning/character_and_spaces_in_refs.pl \
t/results/moresectioning/contents.pl \
t/results/moresectioning/contents_and_shortcontents.pl \
+ t/results/moresectioning/equivalent_nodes_defined_linked.pl \
+ t/results/moresectioning/only_special_spaces_node.pl \
+ t/results/moresectioning/section_in_unnumbered_info.pl \
+ t/results/moresectioning/section_in_unnumbered_plaintext.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/moresectioning/special_spaces_in_nodes.pl \
+ t/results/moresectioning/top_chapter_sections.pl \
t/results/multitable/empty_headitem.pl \
t/results/multitable/empty_item_tab.pl \
t/results/multitable/empty_multitable_with_cells.pl \
@@ -1816,8 +1826,6 @@ test_files_generated_list =
$(test_tap_files_generated_list) \
t/results/regions/ref_in_copying_insert_in_chapter.pl \
t/results/regions/today_in_copying.pl \
t/results/sectioning/a_comma_after_node.pl \
- t/results/sectioning/anchor_in_footnote.pl \
- t/results/sectioning/anchor_in_footnote_separate.pl \
t/results/sectioning/anchor_zero.pl \
t/results/sectioning/at_commands_in_node.pl \
t/results/sectioning/automatic_menu_referencing_node.pl \
@@ -1828,9 +1836,7 @@ test_files_generated_list =
$(test_tap_files_generated_list) \
t/results/sectioning/chapter_between_nodes_with_appendix.pl \
t/results/sectioning/chapter_between_nodes_with_appendix_nomenu.pl \
t/results/sectioning/chapter_node_before_and_after_part.pl \
- t/results/sectioning/chapter_sections.pl \
t/results/sectioning/character_and_spaces_in_node.pl \
- t/results/sectioning/character_and_spaces_in_refs.pl \
t/results/sectioning/character_and_spaces_in_refs_out.pl \
t/results/sectioning/character_and_spaces_in_refs_out/res_html/_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e.html
\
t/results/sectioning/character_and_spaces_in_refs_out/res_html/_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e.html
\
@@ -1863,7 +1869,6 @@ test_files_generated_list =
$(test_tap_files_generated_list) \
t/results/sectioning/empty_top_node_up.pl \
t/results/sectioning/equivalent_labels.pl \
t/results/sectioning/equivalent_nodes.pl \
- t/results/sectioning/equivalent_nodes_defined_linked.pl \
t/results/sectioning/explicit_node_directions.pl \
t/results/sectioning/external_node_in_menu.pl \
t/results/sectioning/hole_in_sectioning.pl \
@@ -1939,7 +1944,6 @@ test_files_generated_list =
$(test_tap_files_generated_list) \
t/results/sectioning/one_node_explicit_directions_anchor.pl \
t/results/sectioning/one_subsection.pl \
t/results/sectioning/one_subsection_and_node.pl \
- t/results/sectioning/only_special_spaces_node.pl \
t/results/sectioning/part_before_chapter.pl \
t/results/sectioning/part_before_section.pl \
t/results/sectioning/part_before_top.pl \
@@ -1975,17 +1979,13 @@ test_files_generated_list =
$(test_tap_files_generated_list) \
t/results/sectioning/section_chapter_before_top.pl \
t/results/sectioning/section_chapter_before_top_nodes.pl \
t/results/sectioning/section_chapter_before_top_nodes/res_latex/section_chapter_before_top_nodes.tex
\
- 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/sections.pl \
t/results/sectioning/semi_auto.pl \
t/results/sectioning/setfilename_on_top_and_after_node.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 \
t/results/sectioning/split_for_format_not_split/res_xml/simplest.xml \
- t/results/sectioning/top_chapter_sections.pl \
t/results/sectioning/top_no_argument_and_content.pl \
t/results/sectioning/top_no_argument_and_node.pl \
t/results/sectioning/top_no_argument_and_top_node.pl \
diff --git a/tp/t/30sectioning.t b/tp/t/30sectioning.t
index cb986e83f6..d8a15bdc5f 100644
--- a/tp/t/30sectioning.t
+++ b/tp/t/30sectioning.t
@@ -5,29 +5,6 @@ use Texinfo::ModulePath (undef, undef, undef, 'updirs' => 2);
require 't/test_utils.pl';
-my $chapter_sections_text =
-'@unnumbered unnumbered
-
-@chapter First chapter
-
-@section second
-
-@chapter Chapter
-
-@section Section of chapter
-
-@subsection subsection 1
-
-@subsection subsection 2
-
-@chapter Chapter 2
-';
-
-my $top_chapter_sections_text =
-'@top top
-
-'.$chapter_sections_text;
-
my $unnumbered_top_without_node_text =
'@node a node,,,(dir)
@unnumbered unnumbered
@@ -53,24 +30,6 @@ Top section
Text of chapter
';
-
-my $anchor_in_footnote_text = '@node Top
-@top Top
-
-In top node@footnote{in footnote
-@anchor{Anchor in footnote}.
-}
-
-@menu
-* chapter::
-@end menu
-
-@node chapter
-@chapter Chap
-
-@ref{Anchor in footnote}.
-';
-
my $nodes_after_top_before_chapter_text =
'@node Top
Top node
@@ -204,9 +163,6 @@ Text part second.
@setfilename a bit too late
'],
-['section_in_unnumbered_plaintext',
-undef, {'test_file' => 'section_in_unnumbered_text.texi'},
-],
['two_unnumbered_no_argument',
'@unnumbered
@unnumbered
@@ -366,8 +322,6 @@ my @tests_info = (
'@node one node
@subsection The subsection
'],
-['character_and_spaces_in_refs',
-undef, {'test_file' => 'character_and_spaces_in_refs_text.texi'}],
['character_and_spaces_in_node',
'
@node Top
@@ -376,12 +330,6 @@ undef, {'test_file' =>
'character_and_spaces_in_refs_text.texi'}],
@node /;<=>?[\\]^_`|~,local node,!_"#$%&\'()*+-., other nodes
@node local node,,/;<=>?[\\]^_`|~,other nodes
'],
-['special_spaces_in_nodes',
-undef, {'test_file' => 'special_spaces_in_nodes.texi',
- 'skip' => ($] < 5.014) ? 'Perl too old: /a regex flag needed' : undef,
}],
-['only_special_spaces_node',
-undef, {'test_file' => 'only_special_spaces_node.texi',
- 'skip' => ($] < 5.018) ? 'Perl too old: LINE TABULATION in /a needed'
: undef, }],
# a subset of the next test, with ascii spaces only
['in_menu_only_special_ascii_spaces_node',
undef, {'test_file' => 'in_menu_only_special_ascii_spaces_node.texi'}],
@@ -459,33 +407,6 @@ In float
@xref{node}.
'],
-['equivalent_nodes_defined_linked',
-'@node Top, @asis{node}
-
-@menu
-* @strong{node}::
-@end menu
-
-@node node
-
-@float Figure, @samp{node}
-A figure
-@end float
-
-@listoffloats Figure
-
-Ref to node @ref{node}.
-
-Ref to @@samp@{node@} @ref{@samp{node}}.
-', {}, {'FORMAT_MENU' => 'menu'}],
-['anchor_in_footnote',
-$anchor_in_footnote_text
-],
-['anchor_in_footnote_separate',
-'@footnotestyle separate
-'.
-$anchor_in_footnote_text
-],
['no_element',
'@settitle no_element test
@documentencoding ISO-8859-1
@@ -963,9 +884,6 @@ Top node
', {'test_formats' => ['plaintext'],
'CHECK_NORMAL_MENU_STRUCTURE' => 1},
{'CONTENTS_OUTPUT_LOCATION' => 'inline'}],
-['section_in_unnumbered_info',
-undef, {'test_file' => 'section_in_unnumbered_text.texi'},
-],
['top_without_node_sections',
$top_without_node_text,
{'test_split' => 'section'}],
@@ -1710,12 +1628,6 @@ in chap
@appendix Appendix
'],
-['chapter_sections',
-$chapter_sections_text,
-{'test_split' => 'section'}],
-['top_chapter_sections',
-$top_chapter_sections_text,
-{'test_split' => 'section'}],
['contents_in_html_text',
'@top top
@@ -1840,7 +1752,7 @@ foreach my $test (@test_out_files) {
}
my @xml_tests_converted_tests = ('section_before_part', 'chapter_before_part',
- 'part_before_top', 'double_part', 'section_in_unnumbered_plaintext',
+ 'part_before_top', 'double_part',
'two_unnumbered_no_argument', 'two_nodes_between_chapters',
'chapter_before_and_after_part', 'node_up_external_node');
@@ -1876,7 +1788,7 @@ my @xml_tests_info_tests = ('part_chapter_after_top',
'node_part_chapter_after_chapter', 'section_before_top',
'section_node_before_part', 'top_node_part_top',
'chapter_node_before_and_after_part',
- 'in_menu_only_special_spaces_node', 'only_special_spaces_node',
+ 'in_menu_only_special_spaces_node',
'more_sections_than_nodes',
'more_nodes_than_sections', 'part_node_chapter_appendix',
'part_node_part_appendix', 'part_node_chapter_node_appendix',
@@ -1884,7 +1796,7 @@ my @xml_tests_info_tests = ('part_chapter_after_top',
'explicit_node_directions', 'nodes_after_top_before_chapter_nodes',
'double_node_anchor_float', 'space_in_node');
-my @docbook_tests_info_tests = ('character_and_spaces_in_refs',
+my @docbook_tests_info_tests = (
'chapter_between_nodes', 'section_before_after_top_node_last_node',
'section_before_after_top_node', 'part_node_before_top part_node_after_top',
'part_chapter_after_top node_part_chapter_after_top',
@@ -1894,7 +1806,7 @@ my @docbook_tests_info_tests =
('character_and_spaces_in_refs',
'section_chapter_before_top_nodes', 'top_node_part_top',
'top_without_node_sections', 'double_node_anchor_float');
-my @latex_tests_info_tests = ('character_and_spaces_in_refs',
+my @latex_tests_info_tests = (
'chapter_between_nodes',
'section_before_after_top_node_last_node',
'section_before_after_top_node',
@@ -1929,7 +1841,6 @@ my @xml_tests_cases_tests = ('part_before_section',
'top_part_chapter', 'section_before_top_no_node',
'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
index 5de17899df..06eeade1c5 100644
--- a/tp/t/40moresectioning.t
+++ b/tp/t/40moresectioning.t
@@ -60,8 +60,94 @@ $test_text
['sections_test_no_use_nodes_use_node_directions',
$test_text
,{},{'USE_NODES' => 0, 'USE_NODE_DIRECTIONS' => 1}],
+['section_in_unnumbered_plaintext',
+undef, {'test_file' => 'section_in_unnumbered_text.texi'},
+],
+);
+
+
+my $anchor_in_footnote_text = '@node Top
+@top Top
+
+In top node@footnote{in footnote
+@anchor{Anchor in footnote}.
+}
+
+@menu
+* chapter::
+@end menu
+
+@node chapter
+@chapter Chap
+
+@ref{Anchor in footnote}.
+';
+
+my @tests_info = (
+['character_and_spaces_in_refs',
+undef, {'test_file' => 'character_and_spaces_in_refs_text.texi'}],
+['special_spaces_in_nodes',
+undef, {'test_file' => 'special_spaces_in_nodes.texi',
+ 'skip' => ($] < 5.014) ? 'Perl too old: /a regex flag needed' : undef,
}],
+['only_special_spaces_node',
+undef, {'test_file' => 'only_special_spaces_node.texi',
+ 'skip' => ($] < 5.018) ? 'Perl too old: LINE TABULATION in /a needed'
: undef, }],
+['equivalent_nodes_defined_linked',
+'@node Top, @asis{node}
+
+@menu
+* @strong{node}::
+@end menu
+
+@node node
+
+@float Figure, @samp{node}
+A figure
+@end float
+
+@listoffloats Figure
+
+Ref to node @ref{node}.
+
+Ref to @@samp@{node@} @ref{@samp{node}}.
+', {}, {'FORMAT_MENU' => 'menu'}],
+['anchor_in_footnote',
+$anchor_in_footnote_text
+],
+['anchor_in_footnote_separate',
+'@footnotestyle separate
+'.
+$anchor_in_footnote_text
+],
+['section_in_unnumbered_info',
+undef, {'test_file' => 'section_in_unnumbered_text.texi'},
+],
);
+
+my $chapter_sections_text =
+'@unnumbered unnumbered
+
+@chapter First chapter
+
+@section second
+
+@chapter Chapter
+
+@section Section of chapter
+
+@subsection subsection 1
+
+@subsection subsection 2
+
+@chapter Chapter 2
+';
+
+my $top_chapter_sections_text =
+'@top top
+
+'.$chapter_sections_text;
+
my @test_cases = (
['sectioning_part_appendix',
$test_text,
@@ -69,11 +155,25 @@ $test_text,
['sectioning_part_appendix_no_top',
$sections_no_top_text,
{'test_split' => 'section'}],
+['chapter_sections',
+$chapter_sections_text,
+{'test_split' => 'section'}],
+['top_chapter_sections',
+$top_chapter_sections_text,
+{'test_split' => 'section'}],
+);
+
+
+my %xml_tests_converted_tests = (
+ 'section_in_unnumbered_plaintext' => 1,
);
foreach my $test (@tests_converted) {
push @{$test->[2]->{'test_formats'}}, 'plaintext';
push @{$test->[2]->{'test_formats'}}, 'html';
+ push @{$test->[2]->{'test_formats'}}, 'xml'
+ if ($xml_tests_converted_tests{$test->[0]});
+
$test->[2]->{'full_document'} = 1 unless
(exists($test->[2]->{'full_document'}));
}
@@ -81,4 +181,29 @@ foreach my $test (@test_cases) {
push @{$test->[2]->{'test_formats'}}, 'xml';
}
-run_all('moresectioning', [@test_cases, @tests_converted]);
+my %xml_tests_info_tests = (
+ 'only_special_spaces_node' => 1,
+);
+
+my %docbook_tests_info_tests = (
+ 'character_and_spaces_in_refs' => 1,
+);
+
+my %latex_tests_info_tests = (
+ 'character_and_spaces_in_refs' => 1,
+);
+
+foreach my $test (@tests_info) {
+ push @{$test->[2]->{'test_formats'}}, 'info';
+ push @{$test->[2]->{'test_formats'}}, 'html';
+ push @{$test->[2]->{'test_formats'}}, 'xml'
+ if ($xml_tests_info_tests{$test->[0]});
+ push @{$test->[2]->{'test_formats'}}, 'docbook'
+ if ($docbook_tests_info_tests{$test->[0]});
+ if ($latex_tests_info_tests{$test->[0]}) {
+ push @{$test->[2]->{'test_formats'}}, 'latex_text';
+ $test->[2]->{'full_document'} = 1 unless
(exists($test->[2]->{'full_document'}));
+ }
+}
+
+run_all('moresectioning', [@test_cases, @tests_converted, @tests_info]);
diff --git a/tp/t/results/sectioning/anchor_in_footnote.pl
b/tp/t/results/moresectioning/anchor_in_footnote.pl
similarity index 100%
rename from tp/t/results/sectioning/anchor_in_footnote.pl
rename to tp/t/results/moresectioning/anchor_in_footnote.pl
diff --git a/tp/t/results/sectioning/anchor_in_footnote_separate.pl
b/tp/t/results/moresectioning/anchor_in_footnote_separate.pl
similarity index 100%
rename from tp/t/results/sectioning/anchor_in_footnote_separate.pl
rename to tp/t/results/moresectioning/anchor_in_footnote_separate.pl
diff --git a/tp/t/results/sectioning/chapter_sections.pl
b/tp/t/results/moresectioning/chapter_sections.pl
similarity index 100%
rename from tp/t/results/sectioning/chapter_sections.pl
rename to tp/t/results/moresectioning/chapter_sections.pl
diff --git a/tp/t/results/sectioning/character_and_spaces_in_refs.pl
b/tp/t/results/moresectioning/character_and_spaces_in_refs.pl
similarity index 100%
rename from tp/t/results/sectioning/character_and_spaces_in_refs.pl
rename to tp/t/results/moresectioning/character_and_spaces_in_refs.pl
diff --git a/tp/t/results/sectioning/equivalent_nodes_defined_linked.pl
b/tp/t/results/moresectioning/equivalent_nodes_defined_linked.pl
similarity index 100%
rename from tp/t/results/sectioning/equivalent_nodes_defined_linked.pl
rename to tp/t/results/moresectioning/equivalent_nodes_defined_linked.pl
diff --git a/tp/t/results/sectioning/only_special_spaces_node.pl
b/tp/t/results/moresectioning/only_special_spaces_node.pl
similarity index 100%
rename from tp/t/results/sectioning/only_special_spaces_node.pl
rename to tp/t/results/moresectioning/only_special_spaces_node.pl
diff --git a/tp/t/results/sectioning/section_in_unnumbered_info.pl
b/tp/t/results/moresectioning/section_in_unnumbered_info.pl
similarity index 100%
rename from tp/t/results/sectioning/section_in_unnumbered_info.pl
rename to tp/t/results/moresectioning/section_in_unnumbered_info.pl
diff --git a/tp/t/results/sectioning/section_in_unnumbered_plaintext.pl
b/tp/t/results/moresectioning/section_in_unnumbered_plaintext.pl
similarity index 100%
rename from tp/t/results/sectioning/section_in_unnumbered_plaintext.pl
rename to tp/t/results/moresectioning/section_in_unnumbered_plaintext.pl
diff --git a/tp/t/results/sectioning/special_spaces_in_nodes.pl
b/tp/t/results/moresectioning/special_spaces_in_nodes.pl
similarity index 100%
rename from tp/t/results/sectioning/special_spaces_in_nodes.pl
rename to tp/t/results/moresectioning/special_spaces_in_nodes.pl
diff --git a/tp/t/results/sectioning/top_chapter_sections.pl
b/tp/t/results/moresectioning/top_chapter_sections.pl
similarity index 100%
rename from tp/t/results/sectioning/top_chapter_sections.pl
rename to tp/t/results/moresectioning/top_chapter_sections.pl
- 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.,
Patrice Dumas <=