Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit34be5a2

Browse files
committed
test_bibparse includes parsed strings with leading space, no longer included in output
1 parent989c506 commit34be5a2

File tree

1 file changed

+29
-28
lines changed

1 file changed

+29
-28
lines changed

‎examples/test_bibparse.py‎

Lines changed: 29 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -18,30 +18,30 @@ def test_names(self):
1818
(bp.cite_key,True),
1919
):
2020
ifdig1f:# can start with digit
21-
self.assertEqual(name_type.parseString("2t")[0],"2t")
21+
self.assertEqual("2t",name_type.parseString("2t")[0])
2222
else:
2323
self.assertRaises(ParseException,name_type.parseString,"2t")
2424
# All of the names cannot contain some characters
2525
forcharinbad_chars:
2626
self.assertRaises(ParseException,name_type.parseString,char)
2727
# standard strings all OK
28-
self.assertEqual(name_type.parseString("simple_test")[0],"simple_test")
28+
self.assertEqual("simple_test",name_type.parseString("simple_test")[0])
2929
# Test macro ref
3030
mr=bp.macro_ref
3131
# can't start with digit
3232
self.assertRaises(ParseException,mr.parseString,"2t")
3333
forcharinbad_chars:
3434
self.assertRaises(ParseException,mr.parseString,char)
35-
self.assertEqual(mr.parseString("simple_test")[0].name,"simple_test")
35+
self.assertEqual("simple_test",mr.parseString("simple_test")[0].name)
3636

3737
deftest_numbers(self):
38-
self.assertEqual(bp.number.parseString("1066")[0],"1066")
39-
self.assertEqual(bp.number.parseString("0")[0],"0")
38+
self.assertEqual("1066",bp.number.parseString("1066")[0])
39+
self.assertEqual("0",bp.number.parseString("0")[0])
4040
self.assertRaises(ParseException,bp.number.parseString,"-4")
4141
self.assertRaises(ParseException,bp.number.parseString,"+4")
4242
self.assertRaises(ParseException,bp.number.parseString,".4")
4343
# something point something leaves a trailing .4 unmatched
44-
self.assertEqual(bp.number.parseString("0.4")[0],"0")
44+
self.assertEqual("0",bp.number.parseString("0.4")[0])
4545

4646
deftest_parse_string(self):
4747
# test string building blocks
@@ -57,26 +57,27 @@ def test_parse_string(self):
5757
self.assertEqual(obj.parseString("{}").asList(), [])
5858
self.assertEqual(obj.parseString('{a "string}')[0],'a "string')
5959
self.assertEqual(
60+
["a ", ["nested"],"string"],
6061
obj.parseString("{a {nested} string}").asList(),
61-
["a ", ["nested"]," string"],
6262
)
6363
self.assertEqual(
64+
["a ", ["double ", ["nested"]],"string"],
6465
obj.parseString("{a {double {nested}} string}").asList(),
65-
["a ", ["double ", ["nested"]]," string"],
6666
)
6767
forobjin (bp.quoted_string,bp.string,bp.field_value):
68-
self.assertEqual(obj.parseString('""').asList(), [])
69-
self.assertEqual(obj.parseString('"a string"')[0],"a string")
68+
self.assertEqual([],obj.parseString('""').asList())
69+
self.assertEqual("a string",obj.parseString('"a string"')[0])
7070
self.assertEqual(
71+
["a ", ["nested"],"string"],
7172
obj.parseString('"a {nested} string"').asList(),
72-
["a ", ["nested"]," string"],
7373
)
7474
self.assertEqual(
75+
["a ", ["double ", ["nested"]],"string"],
7576
obj.parseString('"a {double {nested}} string"').asList(),
76-
["a ", ["double ", ["nested"]]," string"],
7777
)
78+
7879
# check macro def in string
79-
self.assertEqual(bp.string.parseString("someascii")[0],Macro("someascii"))
80+
self.assertEqual(Macro("someascii"),bp.string.parseString("someascii")[0])
8081
self.assertRaises(ParseException,bp.string.parseString,"%#= validstring")
8182
# check number in string
8283
self.assertEqual(bp.string.parseString("1994")[0],"1994")
@@ -85,42 +86,42 @@ def test_parse_field(self):
8586
# test field value - hashes included
8687
fv=bp.field_value
8788
# Macro
88-
self.assertEqual(fv.parseString("aname")[0],Macro("aname"))
89-
self.assertEqual(fv.parseString("ANAME")[0],Macro("aname"))
89+
self.assertEqual(Macro("aname"),fv.parseString("aname")[0])
90+
self.assertEqual(Macro("aname"),fv.parseString("ANAME")[0])
9091
# String and macro
9192
self.assertEqual(
92-
fv.parseString('aname # "some string"').asList(),
9393
[Macro("aname"),"some string"],
94+
fv.parseString('aname # "some string"').asList(),
9495
)
9596
# Nested string
9697
self.assertEqual(
97-
fv.parseString("aname # {some {string}}").asList(),
9898
[Macro("aname"),"some ", ["string"]],
99+
fv.parseString("aname # {some {string}}").asList(),
99100
)
100101
# String and number
101102
self.assertEqual(
102-
fv.parseString('"a string" # 1994').asList(), ["a string","1994"]
103+
["a string","1994"],fv.parseString('"a string" # 1994').asList()
103104
)
104105
# String and number and macro
105106
self.assertEqual(
106-
fv.parseString('"a string" # 1994 # a_macro').asList(),
107107
["a string","1994",Macro("a_macro")],
108+
fv.parseString('"a string" # 1994 # a_macro').asList(),
108109
)
109110

110111
deftest_comments(self):
111112
res=bp.comment.parseString("@Comment{about something}")
112113
self.assertEqual(res.asList(), ["comment","{about something}"])
113114
self.assertEqual(
114-
bp.comment.parseString("@COMMENT{about something").asList(),
115115
["comment","{about something"],
116+
bp.comment.parseString("@COMMENT{about something").asList(),
116117
)
117118
self.assertEqual(
118-
bp.comment.parseString("@comment(about something").asList(),
119119
["comment","(about something"],
120+
bp.comment.parseString("@comment(about something").asList(),
120121
)
121122
self.assertEqual(
122-
bp.comment.parseString("@COMment about something").asList(),
123123
["comment"," about something"],
124+
bp.comment.parseString("@COMment about something").asList(),
124125
)
125126
self.assertRaises(
126127
ParseException,bp.comment.parseString,"@commentabout something"
@@ -136,59 +137,58 @@ def test_preamble(self):
136137
res=bp.preamble.parseString('@preamble{"about something"}')
137138
self.assertEqual(res.asList(), ["preamble","about something"])
138139
self.assertEqual(
139-
bp.preamble.parseString("@PREamble{{about something}}").asList(),
140140
["preamble","about something"],
141+
bp.preamble.parseString("@PREamble{{about something}}").asList(),
141142
)
142143
self.assertEqual(
144+
["preamble","about something"],
143145
bp.preamble.parseString(
144146
"""@PREamble{
145147
{about something}
146148
}"""
147149
).asList(),
148-
["preamble","about something"],
149150
)
150151

151152
deftest_macro(self):
152153
res=bp.macro.parseString('@string{ANAME = "about something"}')
153154
self.assertEqual(res.asList(), ["string","aname","about something"])
154155
self.assertEqual(
155-
bp.macro.parseString("@string{aname = {about something}}").asList(),
156156
["string","aname","about something"],
157+
bp.macro.parseString("@string{aname = {about something}}").asList(),
157158
)
158159

159160
deftest_entry(self):
160161
txt="""@some_entry{akey, aname = "about something",
161162
another={something else}}"""
162163
res=bp.entry.parseString(txt)
163164
self.assertEqual(
164-
res.asList(),
165165
[
166166
"some_entry",
167167
"akey",
168168
["aname","about something"],
169169
["another","something else"],
170170
],
171+
res.asList(),
171172
)
172173
# Case conversion
173174
txt="""@SOME_ENTRY{akey, ANAME = "about something",
174175
another={something else}}"""
175176
res=bp.entry.parseString(txt)
176177
self.assertEqual(
177-
res.asList(),
178178
[
179179
"some_entry",
180180
"akey",
181181
["aname","about something"],
182182
["another","something else"],
183183
],
184+
res.asList(),
184185
)
185186

186187
deftest_bibfile(self):
187188
txt="""@some_entry{akey, aname = "about something",
188189
another={something else}}"""
189190
res=bp.bibfile.parseString(txt)
190191
self.assertEqual(
191-
res.asList(),
192192
[
193193
[
194194
"some_entry",
@@ -197,6 +197,7 @@ def test_bibfile(self):
197197
["another","something else"],
198198
]
199199
],
200+
res.asList(),
200201
)
201202

202203
deftest_bib1(self):

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp