Skip to content

Commit 56166fb

Browse files
committed
C, test namespace revamp
1 parent 9c1e2ce commit 56166fb

File tree

8 files changed

+19
-13
lines changed

8 files changed

+19
-13
lines changed

tests/roots/test-domain-c/anon-dup-decl.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
.. c:namespace:: anon_dup_decl_ns
2+
13
.. c:struct:: anon_dup_decl
24
35
.. c:struct:: @a.A

tests/roots/test-domain-c/function_param_target.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
.. c:namespace:: function_param_target
2+
13
.. c:function:: void f(int i)
24
35
- :c:var:`i`

tests/roots/test-domain-c/ids-vs-tags.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.. c:namespace:: @ids_vs_tags
1+
.. c:namespace:: ids_vs_tags
22
33
.. c:struct:: f_struct
44
.. c:type:: struct f_struct f_struct

tests/roots/test-domain-c/ids-vs-tags2.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.. c:namespace:: @ids_vs_tags2
1+
.. c:namespace:: ids_vs_tags2
22
33
.. c:struct:: A
44

tests/roots/test-domain-c/ids-vs-tags3.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.. c:namespace:: @ids_vs_tags3
1+
.. c:namespace:: ids_vs_tags3
22
33
.. c:function:: void f1(int i)
44

tests/roots/test-domain-c/index.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
.. c:namespace:: index
2+
13
test-domain-c
24
=============
35

tests/roots/test-domain-c/wrong-tags.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.. c:namespace:: @wrong_tag
1+
.. c:namespace:: wrong_tag
22
33
.. c:struct:: A
44

tests/test_domain_c.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -647,7 +647,7 @@ def test_ids_vs_tags(app, warning):
647647
text = ''.join(code.itertext())
648648
entries.append((target, title, text))
649649
expected = []
650-
idPrefix = 'C2-@ids_vs_tags.'
650+
idPrefix = 'C2-ids_vs_tags.'
651651
for tag in ['struct', 'union', 'enum']:
652652
name = 'f_' + tag
653653
tagTitle = tag + ' ' + name
@@ -697,7 +697,7 @@ def test_ids_vs_tags3(app, warning):
697697
assert code.tag == 'code'
698698
text = ''.join(code.itertext())
699699
entries.append((target, title, text))
700-
idPrefix = 'C2-@ids_vs_tags3.'
700+
idPrefix = 'C2-ids_vs_tags3.'
701701
expected = [
702702
(idPrefix + 'f1', 'f1.i', 'f1.i'),
703703
(idPrefix + '-f1.i', 'struct f1.i', 'struct f1.i'),
@@ -731,11 +731,11 @@ def test_build_domain_c_wrong_tags(app, warning):
731731
" Full reference name is '%s'."\
732732
" Full found name is '%s'."
733733
expected = [
734-
template % (8, 'var', 'union A', 'struct A', 'union A.i', '@wrong_tag.struct A.i'),
735-
template % (9, 'var', 'enum A', 'struct A', 'enum A.i', '@wrong_tag.struct A.i'),
736-
template % (11, 'identifier', 'union A', 'struct A', 'union A', '@wrong_tag.struct A'),
737-
template % (13, 'identifier', 'enum A', 'struct A', 'enum A', '@wrong_tag.struct A'),
738-
template % (14, 'identifier', 'union A', 'struct A', 'union A', '@wrong_tag.struct A'),
734+
template % (8, 'var', 'union A', 'struct A', 'union A.i', 'wrong_tag.struct A.i'),
735+
template % (9, 'var', 'enum A', 'struct A', 'enum A.i', 'wrong_tag.struct A.i'),
736+
template % (11, 'identifier', 'union A', 'struct A', 'union A', 'wrong_tag.struct A'),
737+
template % (13, 'identifier', 'enum A', 'struct A', 'enum A', 'wrong_tag.struct A'),
738+
template % (14, 'identifier', 'union A', 'struct A', 'union A', 'wrong_tag.struct A'),
739739
]
740740
for i in range(len(expected)):
741741
assert expected[i] in ws[i]
@@ -768,8 +768,8 @@ def test_build_function_param_target(app, warning):
768768
assert len(ws) == 0
769769
entries = extract_role_links(app, "function_param_target.html")
770770
assert entries == [
771-
('C2-f', 'i', 'i'),
772-
('C2-f', 'f.i', 'f.i'),
771+
('C2-function_param_target.f', 'i', 'i'),
772+
('C2-function_param_target.f', 'f.i', 'f.i'),
773773
]
774774

775775

0 commit comments

Comments
 (0)