branch master updated: * tp/Makefile.tres, tp/t/02coverage.t, tp/t/92formatting.t: move one_line_no_content and one_line tests from 92formatting.t to 02coverage.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 ed060bbaaa * tp/Makefile.tres, tp/t/02coverage.t, tp/t/92formatting.t: 
move one_line_no_content and one_line tests from 92formatting.t to 02coverage.t.
ed060bbaaa is described below

commit ed060bbaaa4babcdc23de9c9f8623eaf29ea050a
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Tue Jan 3 00:10:56 2023 +0100

    * tp/Makefile.tres, tp/t/02coverage.t, tp/t/92formatting.t: move
    one_line_no_content and one_line tests from 92formatting.t to
    02coverage.t.
---
 ChangeLog                                      |  6 ++
 tp/Makefile.tres                               |  4 +-
 tp/t/02coverage.t                              | 10 ++-
 tp/t/92formatting.t                            |  8 ---
 tp/t/results/coverage/one_line.pl              | 66 ++++++++++++++++++
 tp/t/results/coverage/one_line_no_content.pl   | 62 +++++++++++++++++
 tp/t/results/formatting/one_line.pl            | 92 --------------------------
 tp/t/results/formatting/one_line_no_content.pl | 91 -------------------------
 8 files changed, 144 insertions(+), 195 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b11e1f6c84..1e33f0a49b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2023-01-02  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Makefile.tres, tp/t/02coverage.t, tp/t/92formatting.t: move
+       one_line_no_content and one_line tests from 92formatting.t to
+       02coverage.t.
+
 2023-01-02  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Makefile.am (test_files), tp/Makefile.tres, tp/t/80include.t:
diff --git a/tp/Makefile.tres b/tp/Makefile.tres
index 12dc1b7f63..3624c5a3ce 100644
--- a/tp/Makefile.tres
+++ b/tp/Makefile.tres
@@ -299,6 +299,8 @@ test_files_generated_list = 
$(test_tap_files_generated_list) \
   t/results/coverage/multitable.pl \
   t/results/coverage/nested_block_commands.pl \
   t/results/coverage/not_i_j_in_dotless.pl \
+  t/results/coverage/one_line.pl \
+  t/results/coverage/one_line_no_content.pl \
   t/results/coverage/preformatted.pl \
   t/results/coverage/punctuation_in_line_commands.pl \
   t/results/coverage/quotation_author.pl \
@@ -568,8 +570,6 @@ test_files_generated_list = 
$(test_tap_files_generated_list) \
   t/results/formatting/float_copying/res_html/index.html \
   t/results/formatting/float_copying/res_html/public-domain-anchor.html \
   t/results/formatting/float_copying/res_html/public-domain.html \
-  t/results/formatting/one_line.pl \
-  t/results/formatting/one_line_no_content.pl \
   t/results/formatting/simplest_test_date_in_header.pl \
   t/results/formatting/simplest_test_date_in_header/res_html/simplest.html \
   t/results/formatting/simplest_test_prefix.pl \
diff --git a/tp/t/02coverage.t b/tp/t/02coverage.t
index 0e9e2901ff..a787d6b80b 100644
--- a/tp/t/02coverage.t
+++ b/tp/t/02coverage.t
@@ -684,6 +684,12 @@ In float with caption.
 in cartouche.
 @end cartouche@bye
 '],
+['one_line_no_content',
+  undef, {'test_file' => 'one_line_no_content.texi',},
+],
+['one_line',
+  undef, {'test_file' => 'one_line.texi',},
+],
 );
 
 my @test_tree = (
@@ -994,11 +1000,11 @@ before first vtable
 before first multitable
 @end multitable
 '],
-['delcomment', undef, {'test_file' => 'delcomment.texi'}
-],
 ['group_beginning_and_end_on_line',
 '@group within @end group
 '],
+['delcomment', undef, {'test_file' => 'delcomment.texi'}
+],
 );
 
 my %docbooc_doc_tests = (
diff --git a/tp/t/92formatting.t b/tp/t/92formatting.t
index 834390ca60..fa687c09b1 100644
--- a/tp/t/92formatting.t
+++ b/tp/t/92formatting.t
@@ -55,14 +55,6 @@ my @test_cases = (
   },
   {'EXPANDED_FORMATS' => ['info', 'html', 'tex'],}
 ],
-['one_line_no_content',
-  undef, {'test_file' => 'one_line_no_content.texi',
-  },
-],
-['one_line',
-  undef, {'test_file' => 'one_line.texi',
-  },
-],
 ['direntry_dircategory',
   undef,
   {'test_file' => 'direntry_dircategory.texi',
diff --git a/tp/t/results/coverage/one_line.pl 
b/tp/t/results/coverage/one_line.pl
new file mode 100644
index 0000000000..9304ea4e6e
--- /dev/null
+++ b/tp/t/results/coverage/one_line.pl
@@ -0,0 +1,66 @@
+use vars qw(%result_texis %result_texts %result_trees %result_errors 
+   %result_indices %result_sectioning %result_nodes %result_menus
+   %result_floats %result_converted %result_converted_errors 
+   %result_elements %result_directions_text %result_indices_sort_strings);
+
+use utf8;
+
+$result_trees{'one_line'} = {
+  'contents' => [
+    {
+      'contents' => [
+        {
+          'contents' => [],
+          'type' => 'preamble_before_content'
+        },
+        {
+          'contents' => [
+            {
+              'text' => 'AB
+'
+            }
+          ],
+          'type' => 'paragraph'
+        }
+      ],
+      'type' => 'before_node_section'
+    }
+  ],
+  'type' => 'document_root'
+};
+
+$result_texis{'one_line'} = 'AB
+';
+
+
+$result_texts{'one_line'} = 'AB
+';
+
+$result_errors{'one_line'} = [];
+
+
+$result_floats{'one_line'} = {};
+
+
+
+$result_converted{'plaintext'}->{'one_line'} = 'AB
+';
+
+
+$result_converted{'html_text'}->{'one_line'} = '<p>AB
+</p>';
+
+
+$result_converted{'xml'}->{'one_line'} = '<para>AB
+</para>';
+
+
+$result_converted{'latex_text'}->{'one_line'} = '\\begin{document}
+AB
+';
+
+
+$result_converted{'docbook'}->{'one_line'} = '<para>AB
+</para>';
+
+1;
diff --git a/tp/t/results/coverage/one_line_no_content.pl 
b/tp/t/results/coverage/one_line_no_content.pl
new file mode 100644
index 0000000000..7d53c0192e
--- /dev/null
+++ b/tp/t/results/coverage/one_line_no_content.pl
@@ -0,0 +1,62 @@
+use vars qw(%result_texis %result_texts %result_trees %result_errors 
+   %result_indices %result_sectioning %result_nodes %result_menus
+   %result_floats %result_converted %result_converted_errors 
+   %result_elements %result_directions_text %result_indices_sort_strings);
+
+use utf8;
+
+$result_trees{'one_line_no_content'} = {
+  'contents' => [
+    {
+      'contents' => [
+        {
+          'contents' => [
+            {
+              'text' => '\\input texinfo.tex
+',
+              'type' => 'text_before_beginning'
+            }
+          ],
+          'type' => 'preamble_before_beginning'
+        },
+        {
+          'contents' => [],
+          'type' => 'preamble_before_content'
+        }
+      ],
+      'type' => 'before_node_section'
+    }
+  ],
+  'type' => 'document_root'
+};
+
+$result_texis{'one_line_no_content'} = '\\input texinfo.tex
+';
+
+
+$result_texts{'one_line_no_content'} = '';
+
+$result_errors{'one_line_no_content'} = [];
+
+
+$result_floats{'one_line_no_content'} = {};
+
+
+
+$result_converted{'plaintext'}->{'one_line_no_content'} = '';
+
+
+$result_converted{'html_text'}->{'one_line_no_content'} = '';
+
+
+$result_converted{'xml'}->{'one_line_no_content'} = 
'<preamblebeforebeginning>\\input texinfo.tex
+</preamblebeforebeginning>';
+
+
+$result_converted{'latex_text'}->{'one_line_no_content'} = '\\begin{document}
+';
+
+
+$result_converted{'docbook'}->{'one_line_no_content'} = '';
+
+1;
diff --git a/tp/t/results/formatting/one_line.pl 
b/tp/t/results/formatting/one_line.pl
deleted file mode 100644
index 6b68fa4422..0000000000
--- a/tp/t/results/formatting/one_line.pl
+++ /dev/null
@@ -1,92 +0,0 @@
-use vars qw(%result_texis %result_texts %result_trees %result_errors 
-   %result_indices %result_sectioning %result_nodes %result_menus
-   %result_floats %result_converted %result_converted_errors 
-   %result_elements %result_directions_text %result_indices_sort_strings);
-
-use utf8;
-
-$result_trees{'one_line'} = {
-  'contents' => [
-    {
-      'contents' => [
-        {
-          'contents' => [],
-          'type' => 'preamble_before_content'
-        },
-        {
-          'contents' => [
-            {
-              'text' => 'AB
-'
-            }
-          ],
-          'type' => 'paragraph'
-        }
-      ],
-      'type' => 'before_node_section'
-    }
-  ],
-  'type' => 'document_root'
-};
-
-$result_texis{'one_line'} = 'AB
-';
-
-
-$result_texts{'one_line'} = 'AB
-';
-
-$result_errors{'one_line'} = [];
-
-
-$result_floats{'one_line'} = {};
-
-
-
-$result_converted{'html'}->{'one_line'} = '<!DOCTYPE html>
-<html>
-<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Untitled Document</title>
-
-<meta name="description" content="Untitled Document">
-<meta name="keywords" content="Untitled Document">
-<meta name="resource-type" content="document">
-<meta name="distribution" content="global">
-<meta name="Generator" content="texi2any">
-<meta name="viewport" content="width=device-width,initial-scale=1">
-
-<style type="text/css">
-<!--
-span.program-in-footer {font-size: smaller}
--->
-</style>
-
-
-</head>
-
-<body lang="en">
-<p>AB
-</p><hr>
-<p>
-  <span class="program-in-footer">This document was generated on <em 
class="emph">a sunny day</em> using <a class="uref" 
href="http://www.gnu.org/software/texinfo/";><em 
class="emph">texi2any</em></a>.</span>
-</p>
-
-
-</body>
-</html>
-';
-
-$result_converted_errors{'html'}->{'one_line'} = [
-  {
-    'error_line' => 'warning: must specify a title with a title command or @top
-',
-    'file_name' => 'one_line.texi',
-    'text' => 'must specify a title with a title command or @top',
-    'type' => 'warning'
-  }
-];
-
-
-1;
diff --git a/tp/t/results/formatting/one_line_no_content.pl 
b/tp/t/results/formatting/one_line_no_content.pl
deleted file mode 100644
index d43d6755cb..0000000000
--- a/tp/t/results/formatting/one_line_no_content.pl
+++ /dev/null
@@ -1,91 +0,0 @@
-use vars qw(%result_texis %result_texts %result_trees %result_errors 
-   %result_indices %result_sectioning %result_nodes %result_menus
-   %result_floats %result_converted %result_converted_errors 
-   %result_elements %result_directions_text %result_indices_sort_strings);
-
-use utf8;
-
-$result_trees{'one_line_no_content'} = {
-  'contents' => [
-    {
-      'contents' => [
-        {
-          'contents' => [
-            {
-              'text' => '\\input texinfo.tex
-',
-              'type' => 'text_before_beginning'
-            }
-          ],
-          'type' => 'preamble_before_beginning'
-        },
-        {
-          'contents' => [],
-          'type' => 'preamble_before_content'
-        }
-      ],
-      'type' => 'before_node_section'
-    }
-  ],
-  'type' => 'document_root'
-};
-
-$result_texis{'one_line_no_content'} = '\\input texinfo.tex
-';
-
-
-$result_texts{'one_line_no_content'} = '';
-
-$result_errors{'one_line_no_content'} = [];
-
-
-$result_floats{'one_line_no_content'} = {};
-
-
-
-$result_converted{'html'}->{'one_line_no_content'} = '<!DOCTYPE html>
-<html>
-<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Untitled Document</title>
-
-<meta name="description" content="Untitled Document">
-<meta name="keywords" content="Untitled Document">
-<meta name="resource-type" content="document">
-<meta name="distribution" content="global">
-<meta name="Generator" content="texi2any">
-<meta name="viewport" content="width=device-width,initial-scale=1">
-
-<style type="text/css">
-<!--
-span.program-in-footer {font-size: smaller}
--->
-</style>
-
-
-</head>
-
-<body lang="en">
-<hr>
-<p>
-  <span class="program-in-footer">This document was generated on <em 
class="emph">a sunny day</em> using <a class="uref" 
href="http://www.gnu.org/software/texinfo/";><em 
class="emph">texi2any</em></a>.</span>
-</p>
-
-
-</body>
-</html>
-';
-
-$result_converted_errors{'html'}->{'one_line_no_content'} = [
-  {
-    'error_line' => 'warning: must specify a title with a title command or @top
-',
-    'file_name' => 'one_line_no_content.texi',
-    'text' => 'must specify a title with a title command or @top',
-    'type' => 'warning'
-  }
-];
-
-
-1;