[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[no subject]
|
From: |
Patrice Dumas |
|
Date: |
Sun, 8 Sep 2024 09:40:24 -0400 (EDT) |
branch: master
commit d4a965ce32cde57f75d13a6d60615cc720d38636
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sun Sep 8 15:33:18 2024 +0200
* tp/t/epub_tests.t, tp/Makefile.tres, tp/t/html_tests.t: new
t/epub_tests.t file for epub related tests. Move epub related tests
from html_tests.t to epub_tests.t.
---
ChangeLog | 6 +++
tp/Makefile.tres | 13 +++---
tp/t/epub_tests.t | 49 ++++++++++++++++++++++
tp/t/html_tests.t | 32 ++------------
.../chapter_before_top_epub.pl | 0
.../EPUB/chapter_before_top_epub.opf | 0
.../EPUB/xhtml/chapter_before_top_epub.xhtml | 0
.../EPUB/xhtml/nav_toc.xhtml | 0
.../EPUB/xhtml/top.xhtml | 0
.../META-INF/container.xml | 0
.../chapter_before_top_epub_epub_package/mimetype | 0
.../section_part_epub.pl | 0
.../EPUB/section_part_epub.opf | 0
.../EPUB/xhtml/nav_toc.xhtml | 0
.../EPUB/xhtml/part.xhtml | 0
.../EPUB/xhtml/section_part_epub.xhtml | 0
.../META-INF/container.xml | 0
.../section_part_epub_epub_package/mimetype | 0
.../setfilename_on_top_and_after_node_epub.pl | 0
.../EPUB/very-badly-placed-setfilename.opf | 0
.../EPUB/xhtml/nav_toc.xhtml | 0
.../EPUB/xhtml/very badly placed setfilename.xhtml | 0
.../META-INF/container.xml | 0
.../mimetype | 0
24 files changed, 65 insertions(+), 35 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 2d96da39c8..39dc2c6e26 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2024-09-08 Patrice Dumas <pertusus@free.fr>
+
+ * tp/t/epub_tests.t, tp/Makefile.tres, tp/t/html_tests.t: new
+ t/epub_tests.t file for epub related tests. Move epub related tests
+ from html_tests.t to epub_tests.t.
+
2024-09-08 Patrice Dumas <pertusus@free.fr>
* tp/t/test_utils.pl (test): if epub3.pm is loaded, compare
diff --git a/tp/Makefile.tres b/tp/Makefile.tres
index a37aa52f69..08f797ea90 100644
--- a/tp/Makefile.tres
+++ b/tp/Makefile.tres
@@ -37,6 +37,7 @@ test_tap_files_generated_list = \
t/converters_tests.t \
t/do_master_menu.t \
t/docbook_tests.t \
+ t/epub_tests.t \
t/formats_encodings.t \
t/html_tests.t \
t/htmlxref.t \
@@ -488,6 +489,12 @@ test_files_generated_list =
$(test_tap_files_generated_list) \
t/results/docbook_tests/empty_quotation_with_arg_followed_by_quotation.pl \
t/results/docbook_tests/multiple_documentlanguage.pl \
t/results/docbook_tests/special_docbook_unnumbered.pl \
+ t/results/epub_tests/chapter_before_top_epub.pl \
+ t/results/epub_tests/chapter_before_top_epub/res_html \
+ t/results/epub_tests/section_part_epub.pl \
+ t/results/epub_tests/section_part_epub/res_html \
+ t/results/epub_tests/setfilename_on_top_and_after_node_epub.pl \
+ t/results/epub_tests/setfilename_on_top_and_after_node_epub/res_html \
t/results/float/anchor_in_caption.pl \
t/results/float/cindex_in_caption.pl \
t/results/float/comment_space_comand_in_float.pl \
@@ -571,8 +578,6 @@ test_files_generated_list =
$(test_tap_files_generated_list) \
t/results/html_tests/automatic_menus.pl \
t/results/html_tests/base_for_css_info_in_init_test.pl \
t/results/html_tests/base_for_css_info_in_init_test/res_html \
- t/results/html_tests/chapter_before_top_epub.pl \
- t/results/html_tests/chapter_before_top_epub/res_html \
t/results/html_tests/character_number_leading_toc_stoc.pl \
t/results/html_tests/check_htmlxref.pl \
t/results/html_tests/check_htmlxref_ignore_ref_top_up.pl \
@@ -737,14 +742,10 @@ test_files_generated_list =
$(test_tap_files_generated_list) \
t/results/html_tests/redirection_same_labels.pl \
t/results/html_tests/redirection_same_labels/res_html \
t/results/html_tests/ref_in_preformatted.pl \
- t/results/html_tests/section_part_epub.pl \
- t/results/html_tests/section_part_epub/res_html \
t/results/html_tests/sectioning_check_menu_structure.pl \
t/results/html_tests/sectioning_check_menu_structure/res_html \
t/results/html_tests/set_unit_file_name_filepath.pl \
t/results/html_tests/set_unit_file_name_filepath/res_html \
- t/results/html_tests/setfilename_on_top_and_after_node_epub.pl \
- t/results/html_tests/setfilename_on_top_and_after_node_epub/res_html \
t/results/html_tests/shortcontents_no_top.pl \
t/results/html_tests/shorttitlepage.pl \
t/results/html_tests/simple_only_special_spaces_node.pl \
diff --git a/tp/t/epub_tests.t b/tp/t/epub_tests.t
new file mode 100644
index 0000000000..32ec4915af
--- /dev/null
+++ b/tp/t/epub_tests.t
@@ -0,0 +1,49 @@
+use strict;
+
+use lib '.';
+use Texinfo::ModulePath (undef, undef, undef, 'updirs' => 2);
+
+require 't/test_utils.pl';
+
+my $XS_convert = Texinfo::XSLoader::XS_convert_enabled();
+
+my @file_tests = (
+# also in *sectioning.t. Here we are interested by testing spaces
+# in filenames.
+['setfilename_on_top_and_after_node_epub',
+'@node Top
+@top In top @setfilename very badly placed setfilename
+
+@setfilename a bit too late
+', {'init_files' => ['epub3.pm'],
+ 'test_input_file_name' => 'very badly placed setfilename.texi'},
+ {'EPUB_CREATE_CONTAINER_FILE' => 0}],
+# test for the nav file
+['chapter_before_top_epub',
+'@node Top
+
+@node chapter
+@chapter chapter
+
+@part part
+
+@top top
+', {'init_files' => ['epub3.pm']},
+ {'EPUB_CREATE_CONTAINER_FILE' => 0}],
+['section_part_epub',
+'@node Top
+@section section
+
+@part part
+', {'init_files' => ['epub3.pm']},
+ {'EPUB_CREATE_CONTAINER_FILE' => 0}],
+);
+
+foreach my $test (@file_tests) {
+ push @{$test->[2]->{'test_formats'}}, 'file_html';
+ $test->[2]->{'test_input_file_name'} = $test->[0] . '.texi'
+ unless (exists($test->[2]->{'test_input_file_name'}));
+ $test->[2]->{'full_document'} = 1 unless
(exists($test->[2]->{'full_document'}));
+}
+
+run_all('epub_tests', [@file_tests]);
diff --git a/tp/t/html_tests.t b/tp/t/html_tests.t
index bb68503ecc..cdeac4076f 100644
--- a/tp/t/html_tests.t
+++ b/tp/t/html_tests.t
@@ -1532,50 +1532,24 @@ undef, {'test_file' =>
'simple_only_special_spaces_node.texi',
', {}, {'USE_NODES' => 0,
# needed for the test
'SPLIT' => 'node'}],
-# also in *sectioning.t. Here we are interested by testing spaces
-# in filenames.
-['setfilename_on_top_and_after_node_epub',
-'@node Top
-@top In top @setfilename very badly placed setfilename
-
-@setfilename a bit too late
-', {'init_files' => ['epub3.pm'],
- 'test_input_file_name' => 'very badly placed setfilename.texi'},
- {'EPUB_CREATE_CONTAINER_FILE' => 0}],
-# test for the nav file
-['chapter_before_top_epub',
-'@node Top
-
-@node chapter
-@chapter chapter
-
-@part part
-
-@top top
-', {'init_files' => ['epub3.pm']},
- {'EPUB_CREATE_CONTAINER_FILE' => 0}],
-['section_part_epub',
-'@node Top
-@section section
-
-@part part
-', {'init_files' => ['epub3.pm']},
- {'EPUB_CREATE_CONTAINER_FILE' => 0}],
);
foreach my $test (@test_cases) {
push @{$test->[2]->{'test_formats'}}, 'html';
}
+
foreach my $test (@test_cases_text) {
push @{$test->[2]->{'test_formats'}}, 'html_text';
}
+
foreach my $test (@file_tests) {
push @{$test->[2]->{'test_formats'}}, 'file_html';
$test->[2]->{'test_input_file_name'} = $test->[0] . '.texi'
unless (exists($test->[2]->{'test_input_file_name'}));
$test->[2]->{'full_document'} = 1 unless
(exists($test->[2]->{'full_document'}));
}
+
foreach my $test (@test_cases_file_text) {
if (defined($test->[1])) {
$test->[2]->{'test_input_file_name'} = $test->[0] . '.texi';
diff --git a/tp/t/results/html_tests/chapter_before_top_epub.pl
b/tp/t/results/epub_tests/chapter_before_top_epub.pl
similarity index 100%
rename from tp/t/results/html_tests/chapter_before_top_epub.pl
rename to tp/t/results/epub_tests/chapter_before_top_epub.pl
diff --git
a/tp/t/results/html_tests/chapter_before_top_epub/res_html/chapter_before_top_epub_epub_package/EPUB/chapter_before_top_epub.opf
b/tp/t/results/epub_tests/chapter_before_top_epub/res_html/chapter_before_top_epub_epub_package/EPUB/chapter_before_top_epub.opf
similarity index 100%
rename from
tp/t/results/html_tests/chapter_before_top_epub/res_html/chapter_before_top_epub_epub_package/EPUB/chapter_before_top_epub.opf
rename to
tp/t/results/epub_tests/chapter_before_top_epub/res_html/chapter_before_top_epub_epub_package/EPUB/chapter_before_top_epub.opf
diff --git
a/tp/t/results/html_tests/chapter_before_top_epub/res_html/chapter_before_top_epub_epub_package/EPUB/xhtml/chapter_before_top_epub.xhtml
b/tp/t/results/epub_tests/chapter_before_top_epub/res_html/chapter_before_top_epub_epub_package/EPUB/xhtml/chapter_before_top_epub.xhtml
similarity index 100%
rename from
tp/t/results/html_tests/chapter_before_top_epub/res_html/chapter_before_top_epub_epub_package/EPUB/xhtml/chapter_before_top_epub.xhtml
rename to
tp/t/results/epub_tests/chapter_before_top_epub/res_html/chapter_before_top_epub_epub_package/EPUB/xhtml/chapter_before_top_epub.xhtml
diff --git
a/tp/t/results/html_tests/chapter_before_top_epub/res_html/chapter_before_top_epub_epub_package/EPUB/xhtml/nav_toc.xhtml
b/tp/t/results/epub_tests/chapter_before_top_epub/res_html/chapter_before_top_epub_epub_package/EPUB/xhtml/nav_toc.xhtml
similarity index 100%
rename from
tp/t/results/html_tests/chapter_before_top_epub/res_html/chapter_before_top_epub_epub_package/EPUB/xhtml/nav_toc.xhtml
rename to
tp/t/results/epub_tests/chapter_before_top_epub/res_html/chapter_before_top_epub_epub_package/EPUB/xhtml/nav_toc.xhtml
diff --git
a/tp/t/results/html_tests/chapter_before_top_epub/res_html/chapter_before_top_epub_epub_package/EPUB/xhtml/top.xhtml
b/tp/t/results/epub_tests/chapter_before_top_epub/res_html/chapter_before_top_epub_epub_package/EPUB/xhtml/top.xhtml
similarity index 100%
rename from
tp/t/results/html_tests/chapter_before_top_epub/res_html/chapter_before_top_epub_epub_package/EPUB/xhtml/top.xhtml
rename to
tp/t/results/epub_tests/chapter_before_top_epub/res_html/chapter_before_top_epub_epub_package/EPUB/xhtml/top.xhtml
diff --git
a/tp/t/results/html_tests/chapter_before_top_epub/res_html/chapter_before_top_epub_epub_package/META-INF/container.xml
b/tp/t/results/epub_tests/chapter_before_top_epub/res_html/chapter_before_top_epub_epub_package/META-INF/container.xml
similarity index 100%
rename from
tp/t/results/html_tests/chapter_before_top_epub/res_html/chapter_before_top_epub_epub_package/META-INF/container.xml
rename to
tp/t/results/epub_tests/chapter_before_top_epub/res_html/chapter_before_top_epub_epub_package/META-INF/container.xml
diff --git
a/tp/t/results/html_tests/chapter_before_top_epub/res_html/chapter_before_top_epub_epub_package/mimetype
b/tp/t/results/epub_tests/chapter_before_top_epub/res_html/chapter_before_top_epub_epub_package/mimetype
similarity index 100%
rename from
tp/t/results/html_tests/chapter_before_top_epub/res_html/chapter_before_top_epub_epub_package/mimetype
rename to
tp/t/results/epub_tests/chapter_before_top_epub/res_html/chapter_before_top_epub_epub_package/mimetype
diff --git a/tp/t/results/html_tests/section_part_epub.pl
b/tp/t/results/epub_tests/section_part_epub.pl
similarity index 100%
rename from tp/t/results/html_tests/section_part_epub.pl
rename to tp/t/results/epub_tests/section_part_epub.pl
diff --git
a/tp/t/results/html_tests/section_part_epub/res_html/section_part_epub_epub_package/EPUB/section_part_epub.opf
b/tp/t/results/epub_tests/section_part_epub/res_html/section_part_epub_epub_package/EPUB/section_part_epub.opf
similarity index 100%
rename from
tp/t/results/html_tests/section_part_epub/res_html/section_part_epub_epub_package/EPUB/section_part_epub.opf
rename to
tp/t/results/epub_tests/section_part_epub/res_html/section_part_epub_epub_package/EPUB/section_part_epub.opf
diff --git
a/tp/t/results/html_tests/section_part_epub/res_html/section_part_epub_epub_package/EPUB/xhtml/nav_toc.xhtml
b/tp/t/results/epub_tests/section_part_epub/res_html/section_part_epub_epub_package/EPUB/xhtml/nav_toc.xhtml
similarity index 100%
rename from
tp/t/results/html_tests/section_part_epub/res_html/section_part_epub_epub_package/EPUB/xhtml/nav_toc.xhtml
rename to
tp/t/results/epub_tests/section_part_epub/res_html/section_part_epub_epub_package/EPUB/xhtml/nav_toc.xhtml
diff --git
a/tp/t/results/html_tests/section_part_epub/res_html/section_part_epub_epub_package/EPUB/xhtml/part.xhtml
b/tp/t/results/epub_tests/section_part_epub/res_html/section_part_epub_epub_package/EPUB/xhtml/part.xhtml
similarity index 100%
rename from
tp/t/results/html_tests/section_part_epub/res_html/section_part_epub_epub_package/EPUB/xhtml/part.xhtml
rename to
tp/t/results/epub_tests/section_part_epub/res_html/section_part_epub_epub_package/EPUB/xhtml/part.xhtml
diff --git
a/tp/t/results/html_tests/section_part_epub/res_html/section_part_epub_epub_package/EPUB/xhtml/section_part_epub.xhtml
b/tp/t/results/epub_tests/section_part_epub/res_html/section_part_epub_epub_package/EPUB/xhtml/section_part_epub.xhtml
similarity index 100%
rename from
tp/t/results/html_tests/section_part_epub/res_html/section_part_epub_epub_package/EPUB/xhtml/section_part_epub.xhtml
rename to
tp/t/results/epub_tests/section_part_epub/res_html/section_part_epub_epub_package/EPUB/xhtml/section_part_epub.xhtml
diff --git
a/tp/t/results/html_tests/section_part_epub/res_html/section_part_epub_epub_package/META-INF/container.xml
b/tp/t/results/epub_tests/section_part_epub/res_html/section_part_epub_epub_package/META-INF/container.xml
similarity index 100%
rename from
tp/t/results/html_tests/section_part_epub/res_html/section_part_epub_epub_package/META-INF/container.xml
rename to
tp/t/results/epub_tests/section_part_epub/res_html/section_part_epub_epub_package/META-INF/container.xml
diff --git
a/tp/t/results/html_tests/section_part_epub/res_html/section_part_epub_epub_package/mimetype
b/tp/t/results/epub_tests/section_part_epub/res_html/section_part_epub_epub_package/mimetype
similarity index 100%
rename from
tp/t/results/html_tests/section_part_epub/res_html/section_part_epub_epub_package/mimetype
rename to
tp/t/results/epub_tests/section_part_epub/res_html/section_part_epub_epub_package/mimetype
diff --git a/tp/t/results/html_tests/setfilename_on_top_and_after_node_epub.pl
b/tp/t/results/epub_tests/setfilename_on_top_and_after_node_epub.pl
similarity index 100%
rename from tp/t/results/html_tests/setfilename_on_top_and_after_node_epub.pl
rename to tp/t/results/epub_tests/setfilename_on_top_and_after_node_epub.pl
diff --git
a/tp/t/results/html_tests/setfilename_on_top_and_after_node_epub/res_html/very
badly placed setfilename_epub_package/EPUB/very-badly-placed-setfilename.opf
b/tp/t/results/epub_tests/setfilename_on_top_and_after_node_epub/res_html/very
badly placed setfilename_epub_package/EPUB/very-badly-placed-setfilename.opf
similarity index 100%
rename from
tp/t/results/html_tests/setfilename_on_top_and_after_node_epub/res_html/very
badly placed setfilename_epub_package/EPUB/very-badly-placed-setfilename.opf
rename to
tp/t/results/epub_tests/setfilename_on_top_and_after_node_epub/res_html/very
badly placed setfilename_epub_package/EPUB/very-badly-placed-setfilename.opf
diff --git
a/tp/t/results/html_tests/setfilename_on_top_and_after_node_epub/res_html/very
badly placed setfilename_epub_package/EPUB/xhtml/nav_toc.xhtml
b/tp/t/results/epub_tests/setfilename_on_top_and_after_node_epub/res_html/very
badly placed setfilename_epub_package/EPUB/xhtml/nav_toc.xhtml
similarity index 100%
rename from
tp/t/results/html_tests/setfilename_on_top_and_after_node_epub/res_html/very
badly placed setfilename_epub_package/EPUB/xhtml/nav_toc.xhtml
rename to
tp/t/results/epub_tests/setfilename_on_top_and_after_node_epub/res_html/very
badly placed setfilename_epub_package/EPUB/xhtml/nav_toc.xhtml
diff --git
a/tp/t/results/html_tests/setfilename_on_top_and_after_node_epub/res_html/very
badly placed setfilename_epub_package/EPUB/xhtml/very badly placed
setfilename.xhtml
b/tp/t/results/epub_tests/setfilename_on_top_and_after_node_epub/res_html/very
badly placed setfilename_epub_package/EPUB/xhtml/very badly placed
setfilename.xhtml
similarity index 100%
rename from
tp/t/results/html_tests/setfilename_on_top_and_after_node_epub/res_html/very
badly placed setfilename_epub_package/EPUB/xhtml/very badly placed
setfilename.xhtml
rename to
tp/t/results/epub_tests/setfilename_on_top_and_after_node_epub/res_html/very
badly placed setfilename_epub_package/EPUB/xhtml/very badly placed
setfilename.xhtml
diff --git
a/tp/t/results/html_tests/setfilename_on_top_and_after_node_epub/res_html/very
badly placed setfilename_epub_package/META-INF/container.xml
b/tp/t/results/epub_tests/setfilename_on_top_and_after_node_epub/res_html/very
badly placed setfilename_epub_package/META-INF/container.xml
similarity index 100%
rename from
tp/t/results/html_tests/setfilename_on_top_and_after_node_epub/res_html/very
badly placed setfilename_epub_package/META-INF/container.xml
rename to
tp/t/results/epub_tests/setfilename_on_top_and_after_node_epub/res_html/very
badly placed setfilename_epub_package/META-INF/container.xml
diff --git
a/tp/t/results/html_tests/setfilename_on_top_and_after_node_epub/res_html/very
badly placed setfilename_epub_package/mimetype
b/tp/t/results/epub_tests/setfilename_on_top_and_after_node_epub/res_html/very
badly placed setfilename_epub_package/mimetype
similarity index 100%
rename from
tp/t/results/html_tests/setfilename_on_top_and_after_node_epub/res_html/very
badly placed setfilename_epub_package/mimetype
rename to
tp/t/results/epub_tests/setfilename_on_top_and_after_node_epub/res_html/very
badly placed setfilename_epub_package/mimetype