From dc68480f72cb7321be3e228877ceb70ed7678f92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Mon, 21 Aug 2023 11:28:03 +0200
Subject: [PATCH] Move Natspec syntax tests to natspecJSON

---
 scripts/error_codes.py                                           | 1 +
 .../natspec => natspecJSON}/docstring_double_empty.sol           | 0
 .../{syntaxTests/natspec => natspecJSON}/docstring_enum.sol      | 0
 .../natspec => natspecJSON}/docstring_named_return_parameter.sol | 0
 .../{syntaxTests/natspec => natspecJSON}/docstring_parameter.sol | 0
 .../natspec => natspecJSON}/docstring_private_state_variable.sol | 0
 .../natspec => natspecJSON}/docstring_state_variable.sol         | 0
 .../{syntaxTests/natspec => natspecJSON}/docstring_struct.sol    | 0
 .../{syntaxTests/natspec => natspecJSON}/docstring_variable.sol  | 0
 .../invalid/docstring_author_function.sol                        | 0
 .../invalid/docstring_author_title_state_variable.sol            | 0
 .../invalid/docstring_empty_description.sol                      | 0
 .../natspec => natspecJSON}/invalid/docstring_empty_tag.sol      | 0
 .../invalid/docstring_inherit_modifier_no_return.sol             | 0
 .../invalid/docstring_inherit_modifier_no_return2.sol            | 0
 .../natspec => natspecJSON}/invalid/docstring_inheritdoc.sol     | 0
 .../natspec => natspecJSON}/invalid/docstring_inheritdoc2.sol    | 0
 .../natspec => natspecJSON}/invalid/docstring_inheritdoc3.sol    | 0
 .../invalid/docstring_inheritdoc_emptys.sol                      | 0
 .../invalid/docstring_inheritdoc_twice.sol                       | 0
 .../invalid/docstring_inheritdoc_wrong_type.sol                  | 0
 .../invalid/docstring_named_return_param_mismatch.sol            | 0
 .../invalid/docstring_non_public_state_variable_with_return.sol  | 0
 .../natspec => natspecJSON}/invalid/docstring_parameter.sol      | 0
 .../invalid/docstring_return_size_mismatch.sol                   | 0
 .../invalid/docstring_state_variable_too_many_return_tags.sol    | 0
 .../invalid/docstring_too_many_return_tags.sol                   | 0
 .../natspec => natspecJSON}/invalid/inherit_doc_events.sol       | 0
 .../{syntaxTests/natspec => natspecJSON}/invalid/invalid_tag.sol | 0
 .../invalid => natspecJSON}/return_param_amount_differs.sol      | 0
 .../invalid => natspecJSON}/return_param_amount_differs2.sol     | 0
 31 files changed, 1 insertion(+)
 rename test/libsolidity/{syntaxTests/natspec => natspecJSON}/docstring_double_empty.sol (100%)
 rename test/libsolidity/{syntaxTests/natspec => natspecJSON}/docstring_enum.sol (100%)
 rename test/libsolidity/{syntaxTests/natspec => natspecJSON}/docstring_named_return_parameter.sol (100%)
 rename test/libsolidity/{syntaxTests/natspec => natspecJSON}/docstring_parameter.sol (100%)
 rename test/libsolidity/{syntaxTests/natspec => natspecJSON}/docstring_private_state_variable.sol (100%)
 rename test/libsolidity/{syntaxTests/natspec => natspecJSON}/docstring_state_variable.sol (100%)
 rename test/libsolidity/{syntaxTests/natspec => natspecJSON}/docstring_struct.sol (100%)
 rename test/libsolidity/{syntaxTests/natspec => natspecJSON}/docstring_variable.sol (100%)
 rename test/libsolidity/{syntaxTests/natspec => natspecJSON}/invalid/docstring_author_function.sol (100%)
 rename test/libsolidity/{syntaxTests/natspec => natspecJSON}/invalid/docstring_author_title_state_variable.sol (100%)
 rename test/libsolidity/{syntaxTests/natspec => natspecJSON}/invalid/docstring_empty_description.sol (100%)
 rename test/libsolidity/{syntaxTests/natspec => natspecJSON}/invalid/docstring_empty_tag.sol (100%)
 rename test/libsolidity/{syntaxTests/natspec => natspecJSON}/invalid/docstring_inherit_modifier_no_return.sol (100%)
 rename test/libsolidity/{syntaxTests/natspec => natspecJSON}/invalid/docstring_inherit_modifier_no_return2.sol (100%)
 rename test/libsolidity/{syntaxTests/natspec => natspecJSON}/invalid/docstring_inheritdoc.sol (100%)
 rename test/libsolidity/{syntaxTests/natspec => natspecJSON}/invalid/docstring_inheritdoc2.sol (100%)
 rename test/libsolidity/{syntaxTests/natspec => natspecJSON}/invalid/docstring_inheritdoc3.sol (100%)
 rename test/libsolidity/{syntaxTests/natspec => natspecJSON}/invalid/docstring_inheritdoc_emptys.sol (100%)
 rename test/libsolidity/{syntaxTests/natspec => natspecJSON}/invalid/docstring_inheritdoc_twice.sol (100%)
 rename test/libsolidity/{syntaxTests/natspec => natspecJSON}/invalid/docstring_inheritdoc_wrong_type.sol (100%)
 rename test/libsolidity/{syntaxTests/natspec => natspecJSON}/invalid/docstring_named_return_param_mismatch.sol (100%)
 rename test/libsolidity/{syntaxTests/natspec => natspecJSON}/invalid/docstring_non_public_state_variable_with_return.sol (100%)
 rename test/libsolidity/{syntaxTests/natspec => natspecJSON}/invalid/docstring_parameter.sol (100%)
 rename test/libsolidity/{syntaxTests/natspec => natspecJSON}/invalid/docstring_return_size_mismatch.sol (100%)
 rename test/libsolidity/{syntaxTests/natspec => natspecJSON}/invalid/docstring_state_variable_too_many_return_tags.sol (100%)
 rename test/libsolidity/{syntaxTests/natspec => natspecJSON}/invalid/docstring_too_many_return_tags.sol (100%)
 rename test/libsolidity/{syntaxTests/natspec => natspecJSON}/invalid/inherit_doc_events.sol (100%)
 rename test/libsolidity/{syntaxTests/natspec => natspecJSON}/invalid/invalid_tag.sol (100%)
 rename test/libsolidity/{syntaxTests/natspec/invalid => natspecJSON}/return_param_amount_differs.sol (100%)
 rename test/libsolidity/{syntaxTests/natspec/invalid => natspecJSON}/return_param_amount_differs2.sol (100%)

diff --git a/scripts/error_codes.py b/scripts/error_codes.py
index 33a475214..8fe2c4c1b 100755
--- a/scripts/error_codes.py
+++ b/scripts/error_codes.py
@@ -171,6 +171,7 @@ def print_ids_per_file(ids, id_to_file_names, top_dir):
 
 def examine_id_coverage(top_dir, source_id_to_file_names, new_ids_only=False):
     test_sub_dirs = [
+        path.join("test", "libsolidity", "natspecJSON"),
         path.join("test", "libsolidity", "smtCheckerTests"),
         path.join("test", "libsolidity", "syntaxTests"),
         path.join("test", "libyul", "yulSyntaxTests")
diff --git a/test/libsolidity/syntaxTests/natspec/docstring_double_empty.sol b/test/libsolidity/natspecJSON/docstring_double_empty.sol
similarity index 100%
rename from test/libsolidity/syntaxTests/natspec/docstring_double_empty.sol
rename to test/libsolidity/natspecJSON/docstring_double_empty.sol
diff --git a/test/libsolidity/syntaxTests/natspec/docstring_enum.sol b/test/libsolidity/natspecJSON/docstring_enum.sol
similarity index 100%
rename from test/libsolidity/syntaxTests/natspec/docstring_enum.sol
rename to test/libsolidity/natspecJSON/docstring_enum.sol
diff --git a/test/libsolidity/syntaxTests/natspec/docstring_named_return_parameter.sol b/test/libsolidity/natspecJSON/docstring_named_return_parameter.sol
similarity index 100%
rename from test/libsolidity/syntaxTests/natspec/docstring_named_return_parameter.sol
rename to test/libsolidity/natspecJSON/docstring_named_return_parameter.sol
diff --git a/test/libsolidity/syntaxTests/natspec/docstring_parameter.sol b/test/libsolidity/natspecJSON/docstring_parameter.sol
similarity index 100%
rename from test/libsolidity/syntaxTests/natspec/docstring_parameter.sol
rename to test/libsolidity/natspecJSON/docstring_parameter.sol
diff --git a/test/libsolidity/syntaxTests/natspec/docstring_private_state_variable.sol b/test/libsolidity/natspecJSON/docstring_private_state_variable.sol
similarity index 100%
rename from test/libsolidity/syntaxTests/natspec/docstring_private_state_variable.sol
rename to test/libsolidity/natspecJSON/docstring_private_state_variable.sol
diff --git a/test/libsolidity/syntaxTests/natspec/docstring_state_variable.sol b/test/libsolidity/natspecJSON/docstring_state_variable.sol
similarity index 100%
rename from test/libsolidity/syntaxTests/natspec/docstring_state_variable.sol
rename to test/libsolidity/natspecJSON/docstring_state_variable.sol
diff --git a/test/libsolidity/syntaxTests/natspec/docstring_struct.sol b/test/libsolidity/natspecJSON/docstring_struct.sol
similarity index 100%
rename from test/libsolidity/syntaxTests/natspec/docstring_struct.sol
rename to test/libsolidity/natspecJSON/docstring_struct.sol
diff --git a/test/libsolidity/syntaxTests/natspec/docstring_variable.sol b/test/libsolidity/natspecJSON/docstring_variable.sol
similarity index 100%
rename from test/libsolidity/syntaxTests/natspec/docstring_variable.sol
rename to test/libsolidity/natspecJSON/docstring_variable.sol
diff --git a/test/libsolidity/syntaxTests/natspec/invalid/docstring_author_function.sol b/test/libsolidity/natspecJSON/invalid/docstring_author_function.sol
similarity index 100%
rename from test/libsolidity/syntaxTests/natspec/invalid/docstring_author_function.sol
rename to test/libsolidity/natspecJSON/invalid/docstring_author_function.sol
diff --git a/test/libsolidity/syntaxTests/natspec/invalid/docstring_author_title_state_variable.sol b/test/libsolidity/natspecJSON/invalid/docstring_author_title_state_variable.sol
similarity index 100%
rename from test/libsolidity/syntaxTests/natspec/invalid/docstring_author_title_state_variable.sol
rename to test/libsolidity/natspecJSON/invalid/docstring_author_title_state_variable.sol
diff --git a/test/libsolidity/syntaxTests/natspec/invalid/docstring_empty_description.sol b/test/libsolidity/natspecJSON/invalid/docstring_empty_description.sol
similarity index 100%
rename from test/libsolidity/syntaxTests/natspec/invalid/docstring_empty_description.sol
rename to test/libsolidity/natspecJSON/invalid/docstring_empty_description.sol
diff --git a/test/libsolidity/syntaxTests/natspec/invalid/docstring_empty_tag.sol b/test/libsolidity/natspecJSON/invalid/docstring_empty_tag.sol
similarity index 100%
rename from test/libsolidity/syntaxTests/natspec/invalid/docstring_empty_tag.sol
rename to test/libsolidity/natspecJSON/invalid/docstring_empty_tag.sol
diff --git a/test/libsolidity/syntaxTests/natspec/invalid/docstring_inherit_modifier_no_return.sol b/test/libsolidity/natspecJSON/invalid/docstring_inherit_modifier_no_return.sol
similarity index 100%
rename from test/libsolidity/syntaxTests/natspec/invalid/docstring_inherit_modifier_no_return.sol
rename to test/libsolidity/natspecJSON/invalid/docstring_inherit_modifier_no_return.sol
diff --git a/test/libsolidity/syntaxTests/natspec/invalid/docstring_inherit_modifier_no_return2.sol b/test/libsolidity/natspecJSON/invalid/docstring_inherit_modifier_no_return2.sol
similarity index 100%
rename from test/libsolidity/syntaxTests/natspec/invalid/docstring_inherit_modifier_no_return2.sol
rename to test/libsolidity/natspecJSON/invalid/docstring_inherit_modifier_no_return2.sol
diff --git a/test/libsolidity/syntaxTests/natspec/invalid/docstring_inheritdoc.sol b/test/libsolidity/natspecJSON/invalid/docstring_inheritdoc.sol
similarity index 100%
rename from test/libsolidity/syntaxTests/natspec/invalid/docstring_inheritdoc.sol
rename to test/libsolidity/natspecJSON/invalid/docstring_inheritdoc.sol
diff --git a/test/libsolidity/syntaxTests/natspec/invalid/docstring_inheritdoc2.sol b/test/libsolidity/natspecJSON/invalid/docstring_inheritdoc2.sol
similarity index 100%
rename from test/libsolidity/syntaxTests/natspec/invalid/docstring_inheritdoc2.sol
rename to test/libsolidity/natspecJSON/invalid/docstring_inheritdoc2.sol
diff --git a/test/libsolidity/syntaxTests/natspec/invalid/docstring_inheritdoc3.sol b/test/libsolidity/natspecJSON/invalid/docstring_inheritdoc3.sol
similarity index 100%
rename from test/libsolidity/syntaxTests/natspec/invalid/docstring_inheritdoc3.sol
rename to test/libsolidity/natspecJSON/invalid/docstring_inheritdoc3.sol
diff --git a/test/libsolidity/syntaxTests/natspec/invalid/docstring_inheritdoc_emptys.sol b/test/libsolidity/natspecJSON/invalid/docstring_inheritdoc_emptys.sol
similarity index 100%
rename from test/libsolidity/syntaxTests/natspec/invalid/docstring_inheritdoc_emptys.sol
rename to test/libsolidity/natspecJSON/invalid/docstring_inheritdoc_emptys.sol
diff --git a/test/libsolidity/syntaxTests/natspec/invalid/docstring_inheritdoc_twice.sol b/test/libsolidity/natspecJSON/invalid/docstring_inheritdoc_twice.sol
similarity index 100%
rename from test/libsolidity/syntaxTests/natspec/invalid/docstring_inheritdoc_twice.sol
rename to test/libsolidity/natspecJSON/invalid/docstring_inheritdoc_twice.sol
diff --git a/test/libsolidity/syntaxTests/natspec/invalid/docstring_inheritdoc_wrong_type.sol b/test/libsolidity/natspecJSON/invalid/docstring_inheritdoc_wrong_type.sol
similarity index 100%
rename from test/libsolidity/syntaxTests/natspec/invalid/docstring_inheritdoc_wrong_type.sol
rename to test/libsolidity/natspecJSON/invalid/docstring_inheritdoc_wrong_type.sol
diff --git a/test/libsolidity/syntaxTests/natspec/invalid/docstring_named_return_param_mismatch.sol b/test/libsolidity/natspecJSON/invalid/docstring_named_return_param_mismatch.sol
similarity index 100%
rename from test/libsolidity/syntaxTests/natspec/invalid/docstring_named_return_param_mismatch.sol
rename to test/libsolidity/natspecJSON/invalid/docstring_named_return_param_mismatch.sol
diff --git a/test/libsolidity/syntaxTests/natspec/invalid/docstring_non_public_state_variable_with_return.sol b/test/libsolidity/natspecJSON/invalid/docstring_non_public_state_variable_with_return.sol
similarity index 100%
rename from test/libsolidity/syntaxTests/natspec/invalid/docstring_non_public_state_variable_with_return.sol
rename to test/libsolidity/natspecJSON/invalid/docstring_non_public_state_variable_with_return.sol
diff --git a/test/libsolidity/syntaxTests/natspec/invalid/docstring_parameter.sol b/test/libsolidity/natspecJSON/invalid/docstring_parameter.sol
similarity index 100%
rename from test/libsolidity/syntaxTests/natspec/invalid/docstring_parameter.sol
rename to test/libsolidity/natspecJSON/invalid/docstring_parameter.sol
diff --git a/test/libsolidity/syntaxTests/natspec/invalid/docstring_return_size_mismatch.sol b/test/libsolidity/natspecJSON/invalid/docstring_return_size_mismatch.sol
similarity index 100%
rename from test/libsolidity/syntaxTests/natspec/invalid/docstring_return_size_mismatch.sol
rename to test/libsolidity/natspecJSON/invalid/docstring_return_size_mismatch.sol
diff --git a/test/libsolidity/syntaxTests/natspec/invalid/docstring_state_variable_too_many_return_tags.sol b/test/libsolidity/natspecJSON/invalid/docstring_state_variable_too_many_return_tags.sol
similarity index 100%
rename from test/libsolidity/syntaxTests/natspec/invalid/docstring_state_variable_too_many_return_tags.sol
rename to test/libsolidity/natspecJSON/invalid/docstring_state_variable_too_many_return_tags.sol
diff --git a/test/libsolidity/syntaxTests/natspec/invalid/docstring_too_many_return_tags.sol b/test/libsolidity/natspecJSON/invalid/docstring_too_many_return_tags.sol
similarity index 100%
rename from test/libsolidity/syntaxTests/natspec/invalid/docstring_too_many_return_tags.sol
rename to test/libsolidity/natspecJSON/invalid/docstring_too_many_return_tags.sol
diff --git a/test/libsolidity/syntaxTests/natspec/invalid/inherit_doc_events.sol b/test/libsolidity/natspecJSON/invalid/inherit_doc_events.sol
similarity index 100%
rename from test/libsolidity/syntaxTests/natspec/invalid/inherit_doc_events.sol
rename to test/libsolidity/natspecJSON/invalid/inherit_doc_events.sol
diff --git a/test/libsolidity/syntaxTests/natspec/invalid/invalid_tag.sol b/test/libsolidity/natspecJSON/invalid/invalid_tag.sol
similarity index 100%
rename from test/libsolidity/syntaxTests/natspec/invalid/invalid_tag.sol
rename to test/libsolidity/natspecJSON/invalid/invalid_tag.sol
diff --git a/test/libsolidity/syntaxTests/natspec/invalid/return_param_amount_differs.sol b/test/libsolidity/natspecJSON/return_param_amount_differs.sol
similarity index 100%
rename from test/libsolidity/syntaxTests/natspec/invalid/return_param_amount_differs.sol
rename to test/libsolidity/natspecJSON/return_param_amount_differs.sol
diff --git a/test/libsolidity/syntaxTests/natspec/invalid/return_param_amount_differs2.sol b/test/libsolidity/natspecJSON/return_param_amount_differs2.sol
similarity index 100%
rename from test/libsolidity/syntaxTests/natspec/invalid/return_param_amount_differs2.sol
rename to test/libsolidity/natspecJSON/return_param_amount_differs2.sol