[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[no subject]
|
From: |
Patrice Dumas |
|
Date: |
Sun, 13 Mar 2022 08:05:51 -0400 (EDT) |
branch: master
commit 17aaca53b66ff514ca4a7295925323ba352b5a65
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sun Mar 13 12:29:51 2022 +0100
Always remove empty empty 'structure' hashes in tp/t/test_utils.pl
---
tp/t/results/include/cpp_line_latin1.pl | 9 +++------
tp/t/results/include/cpp_lines.pl | 6 ++----
tp/t/results/include/macro_and_commands_in_early_commands.pl | 9 +++------
tp/t/results/include/macro_in_early_commands.pl | 9 +++------
tp/t/results/include/value_expansion_in_include.pl | 6 ++----
tp/t/results/indices/complex_recursive_synindex.pl | 6 ++----
tp/t/results/indices/print_merged_index.pl | 6 ++----
tp/t/results/invalid_nestings/footnote_in_ref.pl | 6 ++----
tp/t/results/invalid_nestings/ignore_in_xref.pl | 6 ++----
tp/t/results/invalid_nestings/in_table.pl | 6 ++----
tp/t/results/invalid_nestings/node_in_copying.pl | 6 ++----
tp/t/results/invalid_nestings/node_in_copying_not_closed.pl | 9 +++------
tp/t/results/invalid_nestings/quotation_in_ref.pl | 6 ++----
tp/t/results/invalid_nestings/ref_in_anchor.pl | 6 ++----
tp/t/results/invalid_nestings/ref_in_ref.pl | 6 ++----
.../invalid_nestings/style_not_closed_before_first_node.pl | 6 ++----
tp/t/results/invalid_nestings/verbatim_in_ref.pl | 6 ++----
tp/t/results/macro/backslash_in_arg.pl | 6 ++----
tp/t/results/macro/macro_in_index_commands.pl | 6 ++----
tp/t/results/menu/direntry_dircategory_after_first_node.pl | 9 +++------
tp/t/results/menu/menu_in_deffn.pl | 6 ++----
tp/t/results/menu/menu_node_unterminated.pl | 6 ++----
tp/t/results/misc_commands/text_before_line_command.pl | 9 +++------
tp/t/results/sectioning/a_comma_after_node.pl | 6 ++----
tp/t/results/sectioning/at_commands_in_node.pl | 6 ++----
tp/t/results/sectioning/contents_at_document_begin.pl | 9 +++------
tp/t/results/sectioning/contents_at_end_document.pl | 9 +++------
tp/t/results/sectioning/contents_in_document.pl | 9 +++------
tp/t/results/sectioning/contents_no_section.pl | 6 ++----
tp/t/results/sectioning/email_in_node.pl | 6 ++----
tp/t/results/sectioning/empty_ref_arg.pl | 6 ++----
tp/t/results/sectioning/node_empty_direction.pl | 6 ++----
tp/t/results/sectioning/node_line_arguments.pl | 6 ++----
tp/t/results/sectioning/unknown_node_in_menu.pl | 6 ++----
tp/t/results/value/value_in_index_commands.pl | 6 ++----
tp/t/results/value/value_in_misc_commands.pl | 9 +++------
tp/t/test_utils.pl | 10 +++++-----
37 files changed, 87 insertions(+), 169 deletions(-)
diff --git a/tp/t/results/include/cpp_line_latin1.pl
b/tp/t/results/include/cpp_line_latin1.pl
index 30402eaa88..4319fe6290 100644
--- a/tp/t/results/include/cpp_line_latin1.pl
+++ b/tp/t/results/include/cpp_line_latin1.pl
@@ -261,8 +261,7 @@ $result_sectioning{'cpp_line_latin1'} = {
'cmdname' => 'node',
'extra' => {
'normalized' => 'Top'
- },
- 'structure' => {}
+ }
}
},
'structure' => {
@@ -285,16 +284,14 @@ $result_nodes{'cpp_line_latin1'} = {
'structure' => {}
},
'normalized' => 'Top'
- },
- 'structure' => {}
+ }
};
$result_menus{'cpp_line_latin1'} = {
'cmdname' => 'node',
'extra' => {
'normalized' => 'Top'
- },
- 'structure' => {}
+ }
};
$result_errors{'cpp_line_latin1'} = [
diff --git a/tp/t/results/include/cpp_lines.pl
b/tp/t/results/include/cpp_lines.pl
index aebc699440..50fe5ffdd7 100644
--- a/tp/t/results/include/cpp_lines.pl
+++ b/tp/t/results/include/cpp_lines.pl
@@ -972,16 +972,14 @@ $result_nodes{'cpp_lines'} = {
'cmdname' => 'node',
'extra' => {
'normalized' => 'Top'
- },
- 'structure' => {}
+ }
};
$result_menus{'cpp_lines'} = {
'cmdname' => 'node',
'extra' => {
'normalized' => 'Top'
- },
- 'structure' => {}
+ }
};
$result_errors{'cpp_lines'} = [
diff --git a/tp/t/results/include/macro_and_commands_in_early_commands.pl
b/tp/t/results/include/macro_and_commands_in_early_commands.pl
index cfe7650a0e..0c320fa757 100644
--- a/tp/t/results/include/macro_and_commands_in_early_commands.pl
+++ b/tp/t/results/include/macro_and_commands_in_early_commands.pl
@@ -539,8 +539,7 @@ $result_sectioning{'macro_and_commands_in_early_commands'}
= {
'cmdname' => 'node',
'extra' => {
'normalized' => 'Top'
- },
- 'structure' => {}
+ }
}
},
'structure' => {
@@ -563,16 +562,14 @@ $result_nodes{'macro_and_commands_in_early_commands'} = {
'structure' => {}
},
'normalized' => 'Top'
- },
- 'structure' => {}
+ }
};
$result_menus{'macro_and_commands_in_early_commands'} = {
'cmdname' => 'node',
'extra' => {
'normalized' => 'Top'
- },
- 'structure' => {}
+ }
};
$result_errors{'macro_and_commands_in_early_commands'} = [
diff --git a/tp/t/results/include/macro_in_early_commands.pl
b/tp/t/results/include/macro_in_early_commands.pl
index b2a2212b99..c7eff56e8b 100644
--- a/tp/t/results/include/macro_in_early_commands.pl
+++ b/tp/t/results/include/macro_in_early_commands.pl
@@ -634,8 +634,7 @@ $result_sectioning{'macro_in_early_commands'} = {
'cmdname' => 'node',
'extra' => {
'normalized' => 'Top'
- },
- 'structure' => {}
+ }
}
},
'structure' => {
@@ -658,16 +657,14 @@ $result_nodes{'macro_in_early_commands'} = {
'structure' => {}
},
'normalized' => 'Top'
- },
- 'structure' => {}
+ }
};
$result_menus{'macro_in_early_commands'} = {
'cmdname' => 'node',
'extra' => {
'normalized' => 'Top'
- },
- 'structure' => {}
+ }
};
$result_errors{'macro_in_early_commands'} = [];
diff --git a/tp/t/results/include/value_expansion_in_include.pl
b/tp/t/results/include/value_expansion_in_include.pl
index f34377973b..0b89b74445 100644
--- a/tp/t/results/include/value_expansion_in_include.pl
+++ b/tp/t/results/include/value_expansion_in_include.pl
@@ -582,16 +582,14 @@ $result_nodes{'value_expansion_in_include'} = {
'cmdname' => 'node',
'extra' => {
'normalized' => 'Top'
- },
- 'structure' => {}
+ }
};
$result_menus{'value_expansion_in_include'} = {
'cmdname' => 'node',
'extra' => {
'normalized' => 'Top'
- },
- 'structure' => {}
+ }
};
$result_errors{'value_expansion_in_include'} = [
diff --git a/tp/t/results/indices/complex_recursive_synindex.pl
b/tp/t/results/indices/complex_recursive_synindex.pl
index 660a214826..280155b47b 100644
--- a/tp/t/results/indices/complex_recursive_synindex.pl
+++ b/tp/t/results/indices/complex_recursive_synindex.pl
@@ -1093,8 +1093,7 @@ $result_nodes{'complex_recursive_synindex'} = {
'extra' => {
'isindex' => 1,
'normalized' => 'Top'
- },
- 'structure' => {}
+ }
};
$result_menus{'complex_recursive_synindex'} = {
@@ -1102,8 +1101,7 @@ $result_menus{'complex_recursive_synindex'} = {
'extra' => {
'isindex' => 1,
'normalized' => 'Top'
- },
- 'structure' => {}
+ }
};
$result_errors{'complex_recursive_synindex'} = [
diff --git a/tp/t/results/indices/print_merged_index.pl
b/tp/t/results/indices/print_merged_index.pl
index 0ad34ca20d..c4d2c2460d 100644
--- a/tp/t/results/indices/print_merged_index.pl
+++ b/tp/t/results/indices/print_merged_index.pl
@@ -143,8 +143,7 @@ $result_nodes{'print_merged_index'} = {
'extra' => {
'isindex' => 1,
'normalized' => 'Top'
- },
- 'structure' => {}
+ }
};
$result_menus{'print_merged_index'} = {
@@ -152,8 +151,7 @@ $result_menus{'print_merged_index'} = {
'extra' => {
'isindex' => 1,
'normalized' => 'Top'
- },
- 'structure' => {}
+ }
};
$result_errors{'print_merged_index'} = [
diff --git a/tp/t/results/invalid_nestings/footnote_in_ref.pl
b/tp/t/results/invalid_nestings/footnote_in_ref.pl
index cb633d17a5..0fd914a792 100644
--- a/tp/t/results/invalid_nestings/footnote_in_ref.pl
+++ b/tp/t/results/invalid_nestings/footnote_in_ref.pl
@@ -189,16 +189,14 @@ $result_nodes{'footnote_in_ref'} = {
'cmdname' => 'node',
'extra' => {
'normalized' => 'Top'
- },
- 'structure' => {}
+ }
};
$result_menus{'footnote_in_ref'} = {
'cmdname' => 'node',
'extra' => {
'normalized' => 'Top'
- },
- 'structure' => {}
+ }
};
$result_errors{'footnote_in_ref'} = [
diff --git a/tp/t/results/invalid_nestings/ignore_in_xref.pl
b/tp/t/results/invalid_nestings/ignore_in_xref.pl
index 07c172bf48..4f0908b9ce 100644
--- a/tp/t/results/invalid_nestings/ignore_in_xref.pl
+++ b/tp/t/results/invalid_nestings/ignore_in_xref.pl
@@ -192,16 +192,14 @@ $result_nodes{'ignore_in_xref'} = {
'cmdname' => 'node',
'extra' => {
'normalized' => 'Top'
- },
- 'structure' => {}
+ }
};
$result_menus{'ignore_in_xref'} = {
'cmdname' => 'node',
'extra' => {
'normalized' => 'Top'
- },
- 'structure' => {}
+ }
};
$result_errors{'ignore_in_xref'} = [
diff --git a/tp/t/results/invalid_nestings/in_table.pl
b/tp/t/results/invalid_nestings/in_table.pl
index 6608061629..e16efdd1c0 100644
--- a/tp/t/results/invalid_nestings/in_table.pl
+++ b/tp/t/results/invalid_nestings/in_table.pl
@@ -1261,8 +1261,7 @@ $result_nodes{'in_table'} = {
'extra' => {
'isindex' => 1,
'normalized' => 'Top'
- },
- 'structure' => {}
+ }
};
$result_menus{'in_table'} = {
@@ -1270,8 +1269,7 @@ $result_menus{'in_table'} = {
'extra' => {
'isindex' => 1,
'normalized' => 'Top'
- },
- 'structure' => {}
+ }
};
$result_errors{'in_table'} = [
diff --git a/tp/t/results/invalid_nestings/node_in_copying.pl
b/tp/t/results/invalid_nestings/node_in_copying.pl
index a4938f42ff..2f2c2d440a 100644
--- a/tp/t/results/invalid_nestings/node_in_copying.pl
+++ b/tp/t/results/invalid_nestings/node_in_copying.pl
@@ -108,16 +108,14 @@ $result_nodes{'node_in_copying'} = {
'cmdname' => 'node',
'extra' => {
'normalized' => 'node'
- },
- 'structure' => {}
+ }
};
$result_menus{'node_in_copying'} = {
'cmdname' => 'node',
'extra' => {
'normalized' => 'node'
- },
- 'structure' => {}
+ }
};
$result_errors{'node_in_copying'} = [
diff --git a/tp/t/results/invalid_nestings/node_in_copying_not_closed.pl
b/tp/t/results/invalid_nestings/node_in_copying_not_closed.pl
index c63b621dec..9ff41aac22 100644
--- a/tp/t/results/invalid_nestings/node_in_copying_not_closed.pl
+++ b/tp/t/results/invalid_nestings/node_in_copying_not_closed.pl
@@ -207,8 +207,7 @@ $result_sectioning{'node_in_copying_not_closed'} = {
'cmdname' => 'node',
'extra' => {
'normalized' => 'Top'
- },
- 'structure' => {}
+ }
}
},
'structure' => {
@@ -231,16 +230,14 @@ $result_nodes{'node_in_copying_not_closed'} = {
'structure' => {}
},
'normalized' => 'Top'
- },
- 'structure' => {}
+ }
};
$result_menus{'node_in_copying_not_closed'} = {
'cmdname' => 'node',
'extra' => {
'normalized' => 'Top'
- },
- 'structure' => {}
+ }
};
$result_errors{'node_in_copying_not_closed'} = [
diff --git a/tp/t/results/invalid_nestings/quotation_in_ref.pl
b/tp/t/results/invalid_nestings/quotation_in_ref.pl
index 73ddf7d038..c8c5ac37e6 100644
--- a/tp/t/results/invalid_nestings/quotation_in_ref.pl
+++ b/tp/t/results/invalid_nestings/quotation_in_ref.pl
@@ -218,16 +218,14 @@ $result_nodes{'quotation_in_ref'} = {
'cmdname' => 'node',
'extra' => {
'normalized' => 'Top'
- },
- 'structure' => {}
+ }
};
$result_menus{'quotation_in_ref'} = {
'cmdname' => 'node',
'extra' => {
'normalized' => 'Top'
- },
- 'structure' => {}
+ }
};
$result_errors{'quotation_in_ref'} = [
diff --git a/tp/t/results/invalid_nestings/ref_in_anchor.pl
b/tp/t/results/invalid_nestings/ref_in_anchor.pl
index 101682e8d2..30b1d38c3d 100644
--- a/tp/t/results/invalid_nestings/ref_in_anchor.pl
+++ b/tp/t/results/invalid_nestings/ref_in_anchor.pl
@@ -150,16 +150,14 @@ $result_nodes{'ref_in_anchor'} = {
'cmdname' => 'node',
'extra' => {
'normalized' => 'Top'
- },
- 'structure' => {}
+ }
};
$result_menus{'ref_in_anchor'} = {
'cmdname' => 'node',
'extra' => {
'normalized' => 'Top'
- },
- 'structure' => {}
+ }
};
$result_errors{'ref_in_anchor'} = [
diff --git a/tp/t/results/invalid_nestings/ref_in_ref.pl
b/tp/t/results/invalid_nestings/ref_in_ref.pl
index b26b6d7b9d..68e0c13a72 100644
--- a/tp/t/results/invalid_nestings/ref_in_ref.pl
+++ b/tp/t/results/invalid_nestings/ref_in_ref.pl
@@ -148,16 +148,14 @@ $result_nodes{'ref_in_ref'} = {
'cmdname' => 'node',
'extra' => {
'normalized' => 'Top'
- },
- 'structure' => {}
+ }
};
$result_menus{'ref_in_ref'} = {
'cmdname' => 'node',
'extra' => {
'normalized' => 'Top'
- },
- 'structure' => {}
+ }
};
$result_errors{'ref_in_ref'} = [
diff --git
a/tp/t/results/invalid_nestings/style_not_closed_before_first_node.pl
b/tp/t/results/invalid_nestings/style_not_closed_before_first_node.pl
index a46412a173..16bc570839 100644
--- a/tp/t/results/invalid_nestings/style_not_closed_before_first_node.pl
+++ b/tp/t/results/invalid_nestings/style_not_closed_before_first_node.pl
@@ -134,16 +134,14 @@ $result_nodes{'style_not_closed_before_first_node'} = {
'cmdname' => 'node',
'extra' => {
'normalized' => 'Top'
- },
- 'structure' => {}
+ }
};
$result_menus{'style_not_closed_before_first_node'} = {
'cmdname' => 'node',
'extra' => {
'normalized' => 'Top'
- },
- 'structure' => {}
+ }
};
$result_errors{'style_not_closed_before_first_node'} = [
diff --git a/tp/t/results/invalid_nestings/verbatim_in_ref.pl
b/tp/t/results/invalid_nestings/verbatim_in_ref.pl
index 09d57ee88d..00e0604d7f 100644
--- a/tp/t/results/invalid_nestings/verbatim_in_ref.pl
+++ b/tp/t/results/invalid_nestings/verbatim_in_ref.pl
@@ -187,16 +187,14 @@ $result_nodes{'verbatim_in_ref'} = {
'cmdname' => 'node',
'extra' => {
'normalized' => 'Top'
- },
- 'structure' => {}
+ }
};
$result_menus{'verbatim_in_ref'} = {
'cmdname' => 'node',
'extra' => {
'normalized' => 'Top'
- },
- 'structure' => {}
+ }
};
$result_errors{'verbatim_in_ref'} = [
diff --git a/tp/t/results/macro/backslash_in_arg.pl
b/tp/t/results/macro/backslash_in_arg.pl
index 33fa4b6d97..dddfc55c3d 100644
--- a/tp/t/results/macro/backslash_in_arg.pl
+++ b/tp/t/results/macro/backslash_in_arg.pl
@@ -378,8 +378,7 @@ $result_nodes{'backslash_in_arg'} = {
'extra' => {
'isindex' => 1,
'normalized' => 'Top'
- },
- 'structure' => {}
+ }
};
$result_menus{'backslash_in_arg'} = {
@@ -387,8 +386,7 @@ $result_menus{'backslash_in_arg'} = {
'extra' => {
'isindex' => 1,
'normalized' => 'Top'
- },
- 'structure' => {}
+ }
};
$result_errors{'backslash_in_arg'} = [];
diff --git a/tp/t/results/macro/macro_in_index_commands.pl
b/tp/t/results/macro/macro_in_index_commands.pl
index e7844e05c8..1755cfafa9 100644
--- a/tp/t/results/macro/macro_in_index_commands.pl
+++ b/tp/t/results/macro/macro_in_index_commands.pl
@@ -1098,8 +1098,7 @@ $result_nodes{'macro_in_index_commands'} = {
'extra' => {
'isindex' => 1,
'normalized' => 'Top'
- },
- 'structure' => {}
+ }
};
$result_menus{'macro_in_index_commands'} = {
@@ -1107,8 +1106,7 @@ $result_menus{'macro_in_index_commands'} = {
'extra' => {
'isindex' => 1,
'normalized' => 'Top'
- },
- 'structure' => {}
+ }
};
$result_errors{'macro_in_index_commands'} = [
diff --git a/tp/t/results/menu/direntry_dircategory_after_first_node.pl
b/tp/t/results/menu/direntry_dircategory_after_first_node.pl
index 3d76d5a3d2..96b0b3395d 100644
--- a/tp/t/results/menu/direntry_dircategory_after_first_node.pl
+++ b/tp/t/results/menu/direntry_dircategory_after_first_node.pl
@@ -316,8 +316,7 @@ $result_sectioning{'direntry_dircategory_after_first_node'}
= {
'cmdname' => 'node',
'extra' => {
'normalized' => 'Top'
- },
- 'structure' => {}
+ }
}
},
'structure' => {
@@ -340,16 +339,14 @@ $result_nodes{'direntry_dircategory_after_first_node'} = {
'structure' => {}
},
'normalized' => 'Top'
- },
- 'structure' => {}
+ }
};
$result_menus{'direntry_dircategory_after_first_node'} = {
'cmdname' => 'node',
'extra' => {
'normalized' => 'Top'
- },
- 'structure' => {}
+ }
};
$result_errors{'direntry_dircategory_after_first_node'} = [
diff --git a/tp/t/results/menu/menu_in_deffn.pl
b/tp/t/results/menu/menu_in_deffn.pl
index 3631dff051..02b179d5d6 100644
--- a/tp/t/results/menu/menu_in_deffn.pl
+++ b/tp/t/results/menu/menu_in_deffn.pl
@@ -384,16 +384,14 @@ $result_nodes{'menu_in_deffn'} = {
'cmdname' => 'node',
'extra' => {
'normalized' => 'Top'
- },
- 'structure' => {}
+ }
};
$result_menus{'menu_in_deffn'} = {
'cmdname' => 'node',
'extra' => {
'normalized' => 'Top'
- },
- 'structure' => {}
+ }
};
$result_errors{'menu_in_deffn'} = [
diff --git a/tp/t/results/menu/menu_node_unterminated.pl
b/tp/t/results/menu/menu_node_unterminated.pl
index 50eb267b6d..c831ea5283 100644
--- a/tp/t/results/menu/menu_node_unterminated.pl
+++ b/tp/t/results/menu/menu_node_unterminated.pl
@@ -229,16 +229,14 @@ $result_nodes{'menu_node_unterminated'} = {
}
],
'normalized' => 'Top'
- },
- 'structure' => {}
+ }
};
$result_menus{'menu_node_unterminated'} = {
'cmdname' => 'node',
'extra' => {
'normalized' => 'Top'
- },
- 'structure' => {}
+ }
};
$result_errors{'menu_node_unterminated'} = [
diff --git a/tp/t/results/misc_commands/text_before_line_command.pl
b/tp/t/results/misc_commands/text_before_line_command.pl
index 8987cba606..2302d42274 100644
--- a/tp/t/results/misc_commands/text_before_line_command.pl
+++ b/tp/t/results/misc_commands/text_before_line_command.pl
@@ -366,8 +366,7 @@ $result_sectioning{'text_before_line_command'} = {
'cmdname' => 'node',
'extra' => {
'normalized' => 'LD-Version-Scripts'
- },
- 'structure' => {}
+ }
}
},
'structure' => {
@@ -393,16 +392,14 @@ $result_nodes{'text_before_line_command'} = {
}
},
'normalized' => 'LD-Version-Scripts'
- },
- 'structure' => {}
+ }
};
$result_menus{'text_before_line_command'} = {
'cmdname' => 'node',
'extra' => {
'normalized' => 'LD-Version-Scripts'
- },
- 'structure' => {}
+ }
};
$result_errors{'text_before_line_command'} = [
diff --git a/tp/t/results/sectioning/a_comma_after_node.pl
b/tp/t/results/sectioning/a_comma_after_node.pl
index 5b10116c10..9ac43e7f03 100644
--- a/tp/t/results/sectioning/a_comma_after_node.pl
+++ b/tp/t/results/sectioning/a_comma_after_node.pl
@@ -140,16 +140,14 @@ $result_nodes{'a_comma_after_node'} = {
'cmdname' => 'node',
'extra' => {
'normalized' => 'Commands'
- },
- 'structure' => {}
+ }
};
$result_menus{'a_comma_after_node'} = {
'cmdname' => 'node',
'extra' => {
'normalized' => 'Commands'
- },
- 'structure' => {}
+ }
};
$result_errors{'a_comma_after_node'} = [
diff --git a/tp/t/results/sectioning/at_commands_in_node.pl
b/tp/t/results/sectioning/at_commands_in_node.pl
index dfcb656fc4..f866743b1c 100644
--- a/tp/t/results/sectioning/at_commands_in_node.pl
+++ b/tp/t/results/sectioning/at_commands_in_node.pl
@@ -373,16 +373,14 @@ $result_nodes{'at_commands_in_node'} = {
'cmdname' => 'node',
'extra' => {
'normalized' => 'A-SC-node-_00ef-_00ef-_1e14-_0142-_1e08-_00a1'
- },
- 'structure' => {}
+ }
};
$result_menus{'at_commands_in_node'} = {
'cmdname' => 'node',
'extra' => {
'normalized' => 'A-SC-node-_00ef-_00ef-_1e14-_0142-_1e08-_00a1'
- },
- 'structure' => {}
+ }
};
$result_errors{'at_commands_in_node'} = [];
diff --git a/tp/t/results/sectioning/contents_at_document_begin.pl
b/tp/t/results/sectioning/contents_at_document_begin.pl
index b3fc9784df..3c8d61956c 100644
--- a/tp/t/results/sectioning/contents_at_document_begin.pl
+++ b/tp/t/results/sectioning/contents_at_document_begin.pl
@@ -293,8 +293,7 @@ $result_sectioning{'contents_at_document_begin'} = {
'cmdname' => 'node',
'extra' => {
'normalized' => 'Top'
- },
- 'structure' => {}
+ }
}
},
'structure' => {
@@ -333,16 +332,14 @@ $result_nodes{'contents_at_document_begin'} = {
'structure' => {}
},
'normalized' => 'Top'
- },
- 'structure' => {}
+ }
};
$result_menus{'contents_at_document_begin'} = {
'cmdname' => 'node',
'extra' => {
'normalized' => 'Top'
- },
- 'structure' => {}
+ }
};
$result_errors{'contents_at_document_begin'} = [];
diff --git a/tp/t/results/sectioning/contents_at_end_document.pl
b/tp/t/results/sectioning/contents_at_end_document.pl
index 4bc51cdc1c..ef3fb0174c 100644
--- a/tp/t/results/sectioning/contents_at_end_document.pl
+++ b/tp/t/results/sectioning/contents_at_end_document.pl
@@ -293,8 +293,7 @@ $result_sectioning{'contents_at_end_document'} = {
'cmdname' => 'node',
'extra' => {
'normalized' => 'Top'
- },
- 'structure' => {}
+ }
}
},
'structure' => {
@@ -333,16 +332,14 @@ $result_nodes{'contents_at_end_document'} = {
'structure' => {}
},
'normalized' => 'Top'
- },
- 'structure' => {}
+ }
};
$result_menus{'contents_at_end_document'} = {
'cmdname' => 'node',
'extra' => {
'normalized' => 'Top'
- },
- 'structure' => {}
+ }
};
$result_errors{'contents_at_end_document'} = [];
diff --git a/tp/t/results/sectioning/contents_in_document.pl
b/tp/t/results/sectioning/contents_in_document.pl
index 414ead52cf..d4e30bcb4f 100644
--- a/tp/t/results/sectioning/contents_in_document.pl
+++ b/tp/t/results/sectioning/contents_in_document.pl
@@ -293,8 +293,7 @@ $result_sectioning{'contents_in_document'} = {
'cmdname' => 'node',
'extra' => {
'normalized' => 'Top'
- },
- 'structure' => {}
+ }
}
},
'structure' => {
@@ -333,16 +332,14 @@ $result_nodes{'contents_in_document'} = {
'structure' => {}
},
'normalized' => 'Top'
- },
- 'structure' => {}
+ }
};
$result_menus{'contents_in_document'} = {
'cmdname' => 'node',
'extra' => {
'normalized' => 'Top'
- },
- 'structure' => {}
+ }
};
$result_errors{'contents_in_document'} = [];
diff --git a/tp/t/results/sectioning/contents_no_section.pl
b/tp/t/results/sectioning/contents_no_section.pl
index 569209ae82..74d2f3752c 100644
--- a/tp/t/results/sectioning/contents_no_section.pl
+++ b/tp/t/results/sectioning/contents_no_section.pl
@@ -207,16 +207,14 @@ $result_nodes{'contents_no_section'} = {
'cmdname' => 'node',
'extra' => {
'normalized' => 'Top'
- },
- 'structure' => {}
+ }
};
$result_menus{'contents_no_section'} = {
'cmdname' => 'node',
'extra' => {
'normalized' => 'Top'
- },
- 'structure' => {}
+ }
};
$result_errors{'contents_no_section'} = [];
diff --git a/tp/t/results/sectioning/email_in_node.pl
b/tp/t/results/sectioning/email_in_node.pl
index 033e9abc4d..9ac2dcf64d 100644
--- a/tp/t/results/sectioning/email_in_node.pl
+++ b/tp/t/results/sectioning/email_in_node.pl
@@ -203,16 +203,14 @@ $result_nodes{'email_in_node'} = {
'cmdname' => 'node',
'extra' => {
'normalized' => 'a-c-'
- },
- 'structure' => {}
+ }
};
$result_menus{'email_in_node'} = {
'cmdname' => 'node',
'extra' => {
'normalized' => 'a-c-'
- },
- 'structure' => {}
+ }
};
$result_errors{'email_in_node'} = [];
diff --git a/tp/t/results/sectioning/empty_ref_arg.pl
b/tp/t/results/sectioning/empty_ref_arg.pl
index 570fcefbde..9f867a91c9 100644
--- a/tp/t/results/sectioning/empty_ref_arg.pl
+++ b/tp/t/results/sectioning/empty_ref_arg.pl
@@ -452,16 +452,14 @@ $result_nodes{'empty_ref_arg'} = {
'cmdname' => 'node',
'extra' => {
'normalized' => 'Top'
- },
- 'structure' => {}
+ }
};
$result_menus{'empty_ref_arg'} = {
'cmdname' => 'node',
'extra' => {
'normalized' => 'Top'
- },
- 'structure' => {}
+ }
};
$result_errors{'empty_ref_arg'} = [
diff --git a/tp/t/results/sectioning/node_empty_direction.pl
b/tp/t/results/sectioning/node_empty_direction.pl
index 98996a407c..c4ca17555b 100644
--- a/tp/t/results/sectioning/node_empty_direction.pl
+++ b/tp/t/results/sectioning/node_empty_direction.pl
@@ -78,16 +78,14 @@ $result_nodes{'node_empty_direction'} = {
'cmdname' => 'node',
'extra' => {
'normalized' => 'name'
- },
- 'structure' => {}
+ }
};
$result_menus{'node_empty_direction'} = {
'cmdname' => 'node',
'extra' => {
'normalized' => 'name'
- },
- 'structure' => {}
+ }
};
$result_errors{'node_empty_direction'} = [];
diff --git a/tp/t/results/sectioning/node_line_arguments.pl
b/tp/t/results/sectioning/node_line_arguments.pl
index 645c81f168..a71c743b0f 100644
--- a/tp/t/results/sectioning/node_line_arguments.pl
+++ b/tp/t/results/sectioning/node_line_arguments.pl
@@ -734,16 +734,14 @@ $result_nodes{'node_line_arguments'} = {
'cmdname' => 'node',
'extra' => {
'normalized' => 'one-arg1'
- },
- 'structure' => {}
+ }
};
$result_menus{'node_line_arguments'} = {
'cmdname' => 'node',
'extra' => {
'normalized' => 'one-arg1'
- },
- 'structure' => {}
+ }
};
$result_errors{'node_line_arguments'} = [
diff --git a/tp/t/results/sectioning/unknown_node_in_menu.pl
b/tp/t/results/sectioning/unknown_node_in_menu.pl
index 63fba09cc3..bf661810ba 100644
--- a/tp/t/results/sectioning/unknown_node_in_menu.pl
+++ b/tp/t/results/sectioning/unknown_node_in_menu.pl
@@ -220,16 +220,14 @@ $result_nodes{'unknown_node_in_menu'} = {
}
],
'normalized' => 'Top'
- },
- 'structure' => {}
+ }
};
$result_menus{'unknown_node_in_menu'} = {
'cmdname' => 'node',
'extra' => {
'normalized' => 'Top'
- },
- 'structure' => {}
+ }
};
$result_errors{'unknown_node_in_menu'} = [
diff --git a/tp/t/results/value/value_in_index_commands.pl
b/tp/t/results/value/value_in_index_commands.pl
index b2a2256604..1b8d5d2a24 100644
--- a/tp/t/results/value/value_in_index_commands.pl
+++ b/tp/t/results/value/value_in_index_commands.pl
@@ -956,8 +956,7 @@ $result_nodes{'value_in_index_commands'} = {
'extra' => {
'isindex' => 1,
'normalized' => 'Top'
- },
- 'structure' => {}
+ }
};
$result_menus{'value_in_index_commands'} = {
@@ -965,8 +964,7 @@ $result_menus{'value_in_index_commands'} = {
'extra' => {
'isindex' => 1,
'normalized' => 'Top'
- },
- 'structure' => {}
+ }
};
$result_errors{'value_in_index_commands'} = [
diff --git a/tp/t/results/value/value_in_misc_commands.pl
b/tp/t/results/value/value_in_misc_commands.pl
index d87bcd5612..546f429e03 100644
--- a/tp/t/results/value/value_in_misc_commands.pl
+++ b/tp/t/results/value/value_in_misc_commands.pl
@@ -3355,8 +3355,7 @@ $result_sectioning{'value_in_misc_commands'} = {
'cmdname' => 'node',
'extra' => {
'normalized' => 'Top'
- },
- 'structure' => {}
+ }
}
},
'structure' => {
@@ -3379,16 +3378,14 @@ $result_nodes{'value_in_misc_commands'} = {
'structure' => {}
},
'normalized' => 'Top'
- },
- 'structure' => {}
+ }
};
$result_menus{'value_in_misc_commands'} = {
'cmdname' => 'node',
'extra' => {
'normalized' => 'Top'
- },
- 'structure' => {}
+ }
};
$result_errors{'value_in_misc_commands'} = [
diff --git a/tp/t/test_utils.pl b/tp/t/test_utils.pl
index f3b218dd9f..5531709037 100644
--- a/tp/t/test_utils.pl
+++ b/tp/t/test_utils.pl
@@ -237,8 +237,7 @@ sub protect_perl_string($)
return $string;
}
-# re-associate top level command with the document_root in case a converter
-# split the document, by resetting their 'parent' key.
+# remove the association with document units
sub unsplit($)
{
my $root = shift;
@@ -247,9 +246,10 @@ sub unsplit($)
return;
}
foreach my $content (@{$root->{'contents'}}) {
- if ($content->{'structure'}
- and $content->{'structure'}->{'associated_unit'}) {
- delete $content->{'structure'}->{'associated_unit'};
+ if ($content->{'structure'}) {
+ if ($content->{'structure'}->{'associated_unit'}) {
+ delete $content->{'structure'}->{'associated_unit'};
+ }
if (scalar(keys(%{$content->{'structure'}})) == 0) {
delete $content->{'structure'};
}