Skip to content

Commit 36aadc4

Browse files
seanbuddseanbudd
authored
Merge e773ce5 into 82a5a07 
2 parents 82a5a07 + e773ce5 commit 36aadc4

2 files changed

Lines changed: 25 additions & 29 deletions

File tree

‎tests/system/robot/chromeTests.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ def _doTestAriaDetails_NoVBufNoTextInterface(nvdaConfValues: "NVDASpyLib.NVDACon
103103
actualSpeech, actualBraille = _NvdaLib.getSpeechAndBrailleAfterKey(READ_DETAILS_GESTURE)
104104
_asserts.speech_matches(
105105
actualSpeech,
106-
"Press to self destruct",
106+
"Press to self-destruct",
107107
message="Report details"
108108
)
109109
_asserts.braille_matches(
@@ -204,10 +204,10 @@ def test_mark_aria_details_role():
204204
# the role doc-endnote is unsupported as an IA2 role
205205
# The role "ROLE_LIST_ITEM" is used instead
206206
"has details",
207-
"doc endnote,",
207+
"doc-endnote,",
208208
"", # space between spans
209209
"has foot note",
210-
"doc footnote,",
210+
"doc-footnote,",
211211
"", # space between spans
212212
"has comment",
213213
"comment,",
@@ -409,7 +409,7 @@ def exercise_mark_aria_details(nvdaConfValues: "NVDASpyLib.NVDAConfMods"):
409409
actualSpeech, actualBraille = _NvdaLib.getSpeechAndBrailleAfterKey(READ_DETAILS_GESTURE)
410410
_asserts.speech_matches(
411411
actualSpeech,
412-
"Cats go woof BTW Jonathon Commentor No they don't Zara",
412+
"Cats go woof BTW —Jonathon Commentor No they don't —Zara",
413413
message="Browse mode: Report details on word with details"
414414
)
415415
_asserts.braille_matches(
@@ -564,7 +564,7 @@ def exercise_mark_aria_details(nvdaConfValues: "NVDASpyLib.NVDAConfMods"):
564564
actualSpeech, actualBraille = _NvdaLib.getSpeechAndBrailleAfterKey(READ_DETAILS_GESTURE)
565565
_asserts.speech_matches(
566566
actualSpeech,
567-
"Cats go woof BTW Jonathon Commentor No they don't Zara",
567+
"Cats go woof BTW —Jonathon Commentor No they don't —Zara",
568568
message="Focus mode: Report details on word with details.",
569569
)
570570
_asserts.braille_matches(

‎tests/system/robot/symbolPronunciationTests.py‎

Lines changed: 20 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -145,16 +145,16 @@ def test_moveByWord():
145145
'Say',
146146
'(quietly)', 'Hello,', 'Jim', '.', # Expected: no symbols named
147147
"don't", # Expected: mid-word symbol
148-
'right pointing arrow', 't shirt', # todo: Expect dash
148+
'right-pointing arrow', 't-shirt',
149149
# todo: There should not be any "empty" words. Expect 'bar bar', and 'at caret star line'
150150
'1', 'bar', '2', '', '3', '', '4',
151151
# end of first line
152152
'blank', # single space and newline
153153
'', # tab and newline todo: There should not be any "empty" words.
154154
'blank', # 4 spaces and newline
155-
'right pointing arrow',
156-
't shirt', # todo: Expect dash
157-
't shirt', # todo: Expect dash
155+
'right-pointing arrow',
156+
't-shirt',
157+
't-shirt',
158158
'blank', # end of doc
159159
],
160160
)
@@ -170,16 +170,16 @@ def test_moveByWord():
170170
'left paren(quietly right paren)', # Expect: parenthesis are named
171171
'quote Hello comma,', 'Jim', 'quote dot.', # Expect: quote, comma and dot are named
172172
'don tick t', # Expect: mid-word symbol substituted
173-
'right dash pointing arrow', 't dash shirt', # todo: Expect dash symbol not to be replaced with word.
173+
'right dash-pointing arrow', 't dash-shirt',
174174
# Expect no empty words:
175175
'1', 'bar', '2', 'bar bar', '3', 'at caret star line', '4',
176176
# end of first line
177177
'blank', # single space and newline
178178
'tab', # tab and newline
179179
'blank', # 4 spaces and newline
180-
'right dash pointing arrow', # todo: Expect dash symbol not to be replaced with word.
181-
't dash shirt', # todo: Expect dash symbol not to be replaced with word.
182-
't dash shirt', # todo: Expect dash symbol not to be replaced with word.
180+
'right dash-pointing arrow',
181+
't dash-shirt',
182+
't dash-shirt',
183183
'blank' # end of doc
184184
]
185185
)
@@ -247,7 +247,7 @@ def test_moveByChar():
247247
'left paren', 'right paren', # Expect parens named
248248
'quote', 'tick', # Expect quote and apostrophe named
249249
'e', 'comma', # Expect comma named
250-
'right pointing arrow', 't shirt', # todo: Expect dash i.e. 'right-pointing arrow', 't-shirt'
250+
'right-pointing arrow', 't-shirt',
251251
'tab', # Expect tab named
252252
'carriage return', # Expect Windows/notepad newline is \r\n
253253
'line feed', # on Windows/notepad newline is \r\n
@@ -256,8 +256,6 @@ def test_moveByChar():
256256

257257
_NvdaLib.getSpeechAfterKey(Move.REVIEW_HOME.value) # reset to start position.
258258

259-
# todo: Bug, with symbol level ALL text due to a symbol substitution has further substitutions applied:
260-
# IE: "t-shirt" either becomes "t shirt" or "t dash shirt" dependent on symbol level.
261259
_doTest(
262260
navKey=Move.REVIEW_CHAR,
263261
reportedAfterLast=EndSpeech.RIGHT,
@@ -268,7 +266,7 @@ def test_moveByChar():
268266
'quote', 'tick', # Expect quote and apostrophe named
269267
'e', 'comma', # Expect comma named
270268
# todo: Expect no replacement with word 'dash' i.e. expect 'right-pointing arrow', 't-shirt'
271-
'right dash pointing arrow', 't dash shirt',
269+
'right dash-pointing arrow', 't dash-shirt',
272270
'tab', # Expect whitespace named.
273271
'carriage return', # on Windows/notepad newline is \r\n
274272
'line feed', # on Windows/notepad newline is \r\n
@@ -351,11 +349,11 @@ def test_selByWord():
351349
'', # newline and tab todo: There should not be any "empty" words.
352350
'', # newline and 4 spaces todo: There should not be any "empty" words.
353351
'', # newline todo: There should not be any "empty" words.
354-
'right pointing arrow', # todo: Expect dash
352+
'right-pointing arrow',
355353
'', # newline todo: There should not be any "empty" words.
356-
't shirt', # todo: Expect dash
354+
't-shirt',
357355
'', # newline todo: There should not be any "empty" words.
358-
't shirt', # todo: Expect dash
356+
't-shirt',
359357
# end of doc
360358
]
361359
)),
@@ -384,11 +382,11 @@ def test_selByWord():
384382
'tab ', # newline and tab
385383
'', # newline and 4 spaces
386384
'', # newline
387-
'right dash pointing arrow', # todo: Expect dash symbol not to be replaced with word.
385+
'right dash-pointing arrow',
388386
'', # newline todo: There should not be any "empty" words.
389-
't dash shirt', # todo: Expect dash symbol not to be replaced with word.
387+
't dash-shirt',
390388
'', # newline todo: There should not be any "empty" words.
391-
't dash shirt', # todo: Expect dash symbol not to be replaced with word.
389+
't dash-shirt',
392390
# end of doc
393391
]
394392
))
@@ -467,7 +465,7 @@ def test_selByChar():
467465
'left paren', 'right paren', # Expect parens named
468466
'quote', 'tick', # Expect quote and apostrophe named
469467
'e', 'comma', # Expect comma named
470-
'right pointing arrow', 't shirt', # todo: Expect dash i.e. 'right-pointing arrow', 't-shirt'
468+
'right-pointing arrow', 't-shirt',
471469
'tab', # Expect tab named
472470
'', # Expect Windows/notepad newline is \r\n
473471
]
@@ -476,8 +474,6 @@ def test_selByChar():
476474

477475
_NvdaLib.getSpeechAfterKey(Move.CARET_HOME.value) # reset to start position.
478476

479-
# todo: Bug, with symbol level ALL text due to a symbol substitution has further substitutions applied:
480-
# IE: "t-shirt" either becomes "t shirt" or "t dash shirt" dependent on symbol level.
481477
_doTest(
482478
navKey=Move.SEL_CARET_CHAR,
483479
reportedAfterLast=EndSpeech.NONE,
@@ -489,7 +485,7 @@ def test_selByChar():
489485
'quote', 'tick', # Expect quote and apostrophe named
490486
'e', 'comma', # Expect comma named
491487
# todo: Expect no replacement with word 'dash' i.e. expect 'right-pointing arrow', 't-shirt'
492-
'right dash pointing arrow', 't dash shirt',
488+
'right dash-pointing arrow', 't dash-shirt',
493489
'tab', # Expect whitespace named.
494490
'', # on Windows/notepad newline is \r\n
495491
]
@@ -615,7 +611,7 @@ def test_tableHeaders():
615611
"with 2 rows and 3 columns", # details of the table context
616612
"row 1", # enter row 1 context
617613
"column 1", # enter column 1 context
618-
"First dash name", # the contents of the cell
614+
"First dash-name", # the contents of the cell
619615
])
620616
)
621617
actualSpeech = _chrome.getSpeechAfterKey("downArrow")
@@ -643,7 +639,7 @@ def test_tableHeaders():
643639
# describe third column header
644640
' '.join([
645641
"row 2", # enter row 2 context, still in table
646-
"First dash name", # reminder of the column name
642+
"First dash-name", # reminder of the column name
647643
"column 1", # explicit column 2 context,
648644
"a", # the contents of the cell
649645
])

0 commit comments

Comments
 (0)