Skip to content

Commit b304dac

Browse files
hypesthypest
committed
Update tests to expect strong when editing
1 parent 30322dd commit b304dac

File tree

6 files changed

+73
-43
lines changed

6 files changed

+73
-43
lines changed

‎app/src/androidTest/kotlin/org/wordpress/aztec/demo/tests/FormattingHistoryTests.kt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class FormattingHistoryTests : BaseHistoryTest() {
1818
@Test
1919
fun testAddBoldUndoRedo() {
2020
val word = "Testing"
21-
val html = "<b>$word</b>"
21+
val html = "<strong>$word</strong>"
2222
val editorPage = EditorPage()
2323

2424
// Add bold text, verify
@@ -56,8 +56,8 @@ class FormattingHistoryTests : BaseHistoryTest() {
5656
val word1 = "Testing"
5757
val word2 = " Bolder"
5858
val word3 = " History"
59-
val htmlSecond = "$word1<b>$word2</b>"
60-
val htmlFinal = "$word1<b>$word2</b>$word3"
59+
val htmlSecond = "$word1<strong>$word2</strong>"
60+
val htmlFinal = "$word1<strong>$word2</strong>$word3"
6161
val editorPage = EditorPage()
6262

6363
// Add first word - regular
@@ -109,7 +109,7 @@ class FormattingHistoryTests : BaseHistoryTest() {
109109
@Test
110110
fun testSelectToMakeBoldUndoRedo() {
111111
val text = "There's no crying in baseball!"
112-
val html = "<b>$text</b>"
112+
val html = "<strong>$text</strong>"
113113
val editorPage = EditorPage()
114114

115115
// Insert text snippet
@@ -307,4 +307,4 @@ class FormattingHistoryTests : BaseHistoryTest() {
307307
.toggleHtml()
308308
.verifyHTML(html)
309309
}
310-
}
310+
}

‎app/src/androidTest/kotlin/org/wordpress/aztec/demo/tests/MixedTextFormattingTests.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class MixedTextFormattingTests : BaseTest() {
2222
val text1 = "so"
2323
val text2 = "me "
2424
val text3 = "text "
25-
val regex = Regex("<b>$text1</b><i>$text2</i><[bi]><[bi]>$text3</[bi]></[bi]>")
25+
val regex = Regex("<strong>$text1</strong><i>$text2</i><(strong|i)><(strong|i)>$text3</(strong|i)></(strong|i)>")
2626

2727
EditorPage()
2828
.toggleBold()
@@ -43,7 +43,7 @@ class MixedTextFormattingTests : BaseTest() {
4343
val text1 = "a"
4444
val text2 = "b"
4545
val text3 = " "
46-
val html = "a <b>b</b>"
46+
val html = "a <strong>b</strong>"
4747

4848
EditorPage()
4949
.insertText(text1)
@@ -60,7 +60,7 @@ class MixedTextFormattingTests : BaseTest() {
6060
val text1 = "some"
6161
val text2 = "more"
6262
val text3 = "text"
63-
val html = "$text1<b>$text2</b>$text3"
63+
val html = "$text1<strong>$text2</strong>$text3"
6464

6565
EditorPage()
6666
.insertText(text1)

‎app/src/androidTest/kotlin/org/wordpress/aztec/demo/tests/SimpleTextFormattingTests.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class SimpleTextFormattingTests : BaseTest() {
1818
fun testSimpleBoldFormatting() {
1919
val text1 = "some"
2020
val text2 = "text"
21-
val html = "$text1<b>$text2</b>"
21+
val html = "$text1<strong>$text2</strong>"
2222

2323
EditorPage()
2424
.insertText(text1)

‎app/src/androidTest/kotlin/org/wordpress/aztec/demo/tests/ToolbarHighlightingTests.kt‎

Lines changed: 32 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ class ToolbarHighlightingTests : BaseTest() {
7070
.insertText(text2)
7171
.checkBold(isNotChecked())
7272
.toggleHtml()
73-
.verifyHTML("<b>$text1</b>$text2")
73+
.verifyHTML("<strong>$text1</strong>$text2")
7474
}
7575

7676
// make sure that selected toolbar style in empty editor remains when soft keyboard is displayed
@@ -87,6 +87,36 @@ class ToolbarHighlightingTests : BaseTest() {
8787
.checkBold(isChecked())
8888
.insertText(text)
8989
.toggleHtml()
90-
.verifyHTML("<b>$text</b>")
90+
.verifyHTML("<strong>$text</strong>")
91+
}
92+
93+
@Test
94+
fun testHasBoldAndStrongFormatting() {
95+
val input = "<b>bold</b> normal strong"
96+
val html = "<b>bold</b> normal <strong>strong</strong>"
97+
98+
EditorPage()
99+
.toggleHtml()
100+
.insertHTML(input)
101+
.toggleHtml()
102+
.selectText(12, 18)
103+
.toggleBold()
104+
.toggleHtml()
105+
.verifyHTML(html)
106+
}
107+
108+
@Test
109+
fun testExpandBoldAndSetToStrongFormatting() {
110+
val input = "<b>bold</b> normal strong"
111+
val html = "<strong>bold normal strong</strong>"
112+
113+
EditorPage()
114+
.toggleHtml()
115+
.insertHTML(input)
116+
.toggleHtml()
117+
.selectAllText()
118+
.toggleBold()
119+
.toggleHtml()
120+
.verifyHTML(html)
91121
}
92122
}

‎aztec/src/test/kotlin/org/wordpress/aztec/AztecToolbarTest.kt‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ class AztecToolbarTest {
9595
Assert.assertTrue(boldButton.isChecked)
9696

9797
editText.append("bold")
98-
Assert.assertEquals("<b>bold</b>", editText.toHtml())
98+
Assert.assertEquals("<strong>bold</strong>", editText.toHtml())
9999

100100
boldButton.performClick()
101101
Assert.assertFalse(boldButton.isChecked)
@@ -115,7 +115,7 @@ class AztecToolbarTest {
115115
editText.setSelection(0, editText.length())
116116
boldButton.performClick()
117117
Assert.assertTrue(boldButton.isChecked)
118-
Assert.assertEquals("<b>bold</b>", editText.toHtml())
118+
Assert.assertEquals("<strong>bold</strong>", editText.toHtml())
119119

120120
boldButton.performClick()
121121
Assert.assertFalse(boldButton.isChecked)
@@ -261,28 +261,28 @@ class AztecToolbarTest {
261261
editText.append("Bo")
262262
boldButton.performClick()
263263
editText.append("ld")
264-
Assert.assertEquals("<b>Bo</b>ld", editText.toHtml())
264+
Assert.assertEquals("<strong>Bo</strong>ld", editText.toHtml())
265265

266266
// Italic
267267
italicButton.performClick()
268268
editText.append("Ita")
269269
italicButton.performClick()
270270
editText.append("lic")
271-
Assert.assertEquals("<b>Bo</b>ld<i>Ita</i>lic", editText.toHtml())
271+
Assert.assertEquals("<strong>Bo</strong>ld<i>Ita</i>lic", editText.toHtml())
272272

273273
// Strike
274274
strikeThroughButton.performClick()
275275
editText.append("Str")
276276
strikeThroughButton.performClick()
277277
editText.append("ike")
278-
Assert.assertEquals("<b>Bo</b>ld<i>Ita</i>lic<del>Str</del>ike", editText.toHtml())
278+
Assert.assertEquals("<strong>Bo</strong>ld<i>Ita</i>lic<del>Str</del>ike", editText.toHtml())
279279

280280
// Underline
281281
underlineButton.performClick()
282282
editText.append("Under")
283283
underlineButton.performClick()
284284
editText.append("line")
285-
Assert.assertEquals("<b>Bo</b>ld<i>Ita</i>lic<del>Str</del>ike<u>Under</u>line", editText.toHtml())
285+
Assert.assertEquals("<strong>Bo</strong>ld<i>Ita</i>lic<del>Str</del>ike<u>Under</u>line", editText.toHtml())
286286

287287
// Clear text
288288
editText.setText("")
@@ -292,28 +292,28 @@ class AztecToolbarTest {
292292
boldButton.performClick()
293293
editText.append("ld")
294294
boldButton.performClick()
295-
Assert.assertEquals("Bo<b>ld</b>", editText.toHtml())
295+
Assert.assertEquals("Bo<strong>ld</strong>", editText.toHtml())
296296

297297
// Italic
298298
editText.append("Ita")
299299
italicButton.performClick()
300300
editText.append("lic")
301301
italicButton.performClick()
302-
Assert.assertEquals("Bo<b>ld</b>Ita<i>lic</i>", editText.toHtml())
302+
Assert.assertEquals("Bo<strong>ld</strong>Ita<i>lic</i>", editText.toHtml())
303303

304304
// Strike
305305
editText.append("Str")
306306
strikeThroughButton.performClick()
307307
editText.append("ike")
308308
strikeThroughButton.performClick()
309-
Assert.assertEquals("Bo<b>ld</b>Ita<i>lic</i>Str<del>ike</del>", editText.toHtml())
309+
Assert.assertEquals("Bo<strong>ld</strong>Ita<i>lic</i>Str<del>ike</del>", editText.toHtml())
310310

311311
// Underline
312312
editText.append("Under")
313313
underlineButton.performClick()
314314
editText.append("line")
315315
underlineButton.performClick()
316-
Assert.assertEquals("Bo<b>ld</b>Ita<i>lic</i>Str<del>ike</del>Under<u>line</u>", editText.toHtml())
316+
Assert.assertEquals("Bo<strong>ld</strong>Ita<i>lic</i>Str<del>ike</del>Under<u>line</u>", editText.toHtml())
317317
}
318318

319319
/**
@@ -332,7 +332,7 @@ class AztecToolbarTest {
332332
editText.append("Bo")
333333
boldButton.performClick()
334334
editText.append("ld")
335-
Assert.assertEquals(" <b>Bo</b>ld", editText.toHtml())
335+
Assert.assertEquals(" <strong>Bo</strong>ld", editText.toHtml())
336336

337337
// Space
338338
editText.append(" ")
@@ -342,7 +342,7 @@ class AztecToolbarTest {
342342
editText.append("Ita")
343343
italicButton.performClick()
344344
editText.append("lic")
345-
Assert.assertEquals(" <b>Bo</b>ld <i>Ita</i>lic", editText.toHtml())
345+
Assert.assertEquals(" <strong>Bo</strong>ld <i>Ita</i>lic", editText.toHtml())
346346

347347
// Space
348348
editText.append(" ")
@@ -352,7 +352,7 @@ class AztecToolbarTest {
352352
editText.append("Str")
353353
strikeThroughButton.performClick()
354354
editText.append("ike")
355-
Assert.assertEquals(" <b>Bo</b>ld <i>Ita</i>lic <del>Str</del>ike", editText.toHtml())
355+
Assert.assertEquals(" <strong>Bo</strong>ld <i>Ita</i>lic <del>Str</del>ike", editText.toHtml())
356356

357357
// Space
358358
editText.append(" ")
@@ -362,7 +362,7 @@ class AztecToolbarTest {
362362
editText.append("Under")
363363
underlineButton.performClick()
364364
editText.append("line")
365-
Assert.assertEquals(" <b>Bo</b>ld <i>Ita</i>lic <del>Str</del>ike <u>Under</u>line", editText.toHtml())
365+
Assert.assertEquals(" <strong>Bo</strong>ld <i>Ita</i>lic <del>Str</del>ike <u>Under</u>line", editText.toHtml())
366366
}
367367

368368
/**
@@ -380,7 +380,7 @@ class AztecToolbarTest {
380380
boldButton.performClick()
381381
Assert.assertTrue(boldButton.isChecked)
382382

383-
Assert.assertEquals("<b>bold</b> bolditalic italic strike underline normal", editText.toHtml())
383+
Assert.assertEquals("<strong>bold</strong> bolditalic italic strike underline normal", editText.toHtml())
384384

385385
editText.setSelection(5, 15)
386386

@@ -392,7 +392,7 @@ class AztecToolbarTest {
392392
italicButton.performClick()
393393
Assert.assertTrue(italicButton.isChecked)
394394

395-
Assert.assertEquals("<b>bold</b> <b><i>bolditalic</i></b> italic strike underline normal", editText.toHtml())
395+
Assert.assertEquals("<strong>bold</strong> <strong><i>bolditalic</i></strong> italic strike underline normal", editText.toHtml())
396396

397397
editText.setSelection(16, 22)
398398

@@ -407,14 +407,14 @@ class AztecToolbarTest {
407407
strikeThroughButton.performClick()
408408
Assert.assertTrue(strikeThroughButton.isChecked)
409409

410-
Assert.assertEquals("<b>bold</b> <b><i>bolditalic</i></b> <i>italic</i> <del>strike</del> underline normal", editText.toHtml())
410+
Assert.assertEquals("<strong>bold</strong> <strong><i>bolditalic</i></strong> <i>italic</i> <del>strike</del> underline normal", editText.toHtml())
411411

412412
editText.setSelection(30, 39)
413413

414414
underlineButton.performClick()
415415
Assert.assertTrue(underlineButton.isChecked)
416416

417-
Assert.assertEquals("<b>bold</b> <b><i>bolditalic</i></b> <i>italic</i> <del>strike</del> <u>underline</u> normal", editText.toHtml())
417+
Assert.assertEquals("<strong>bold</strong> <strong><i>bolditalic</i></strong> <i>italic</i> <del>strike</del> <u>underline</u> normal", editText.toHtml())
418418
}
419419

420420
/**
@@ -430,36 +430,36 @@ class AztecToolbarTest {
430430
boldButton.performClick()
431431
Assert.assertTrue(boldButton.isChecked)
432432
editText.append("bold")
433-
Assert.assertEquals("<b>bold</b>", editText.toHtml())
433+
Assert.assertEquals("<strong>bold</strong>", editText.toHtml())
434434

435435
italicButton.performClick()
436436
Assert.assertTrue(boldButton.isChecked)
437437
editText.append("bolditalic")
438-
Assert.assertEquals("<b>bold</b><b><i>bolditalic</i></b>", editText.toHtml())
438+
Assert.assertEquals("<strong>bold</strong><strong><i>bolditalic</i></strong>", editText.toHtml())
439439
boldButton.performClick()
440440
Assert.assertFalse(boldButton.isChecked)
441441

442442
editText.append("italic")
443-
Assert.assertEquals("<b>bold</b><b><i>bolditalic</i></b><i>italic</i>", editText.toHtml())
443+
Assert.assertEquals("<strong>bold</strong><strong><i>bolditalic</i></strong><i>italic</i>", editText.toHtml())
444444
italicButton.performClick()
445445
Assert.assertFalse(italicButton.isChecked)
446446

447447
strikeThroughButton.performClick()
448448
Assert.assertTrue(strikeThroughButton.isChecked)
449449
editText.append("strike")
450-
Assert.assertEquals("<b>bold</b><b><i>bolditalic</i></b><i>italic</i><del>strike</del>", editText.toHtml())
450+
Assert.assertEquals("<strong>bold</strong><strong><i>bolditalic</i></strong><i>italic</i><del>strike</del>", editText.toHtml())
451451
strikeThroughButton.performClick()
452452
Assert.assertFalse(strikeThroughButton.isChecked)
453453

454454
underlineButton.performClick()
455455
Assert.assertTrue(underlineButton.isChecked)
456456
editText.append("underline")
457-
Assert.assertEquals("<b>bold</b><b><i>bolditalic</i></b><i>italic</i><del>strike</del><u>underline</u>", editText.toHtml())
457+
Assert.assertEquals("<strong>bold</strong><strong><i>bolditalic</i></strong><i>italic</i><del>strike</del><u>underline</u>", editText.toHtml())
458458
underlineButton.performClick()
459459
Assert.assertFalse(underlineButton.isChecked)
460460

461461
editText.append("normal")
462-
Assert.assertEquals("<b>bold</b><b><i>bolditalic</i></b><i>italic</i><del>strike</del><u>underline</u>normal", editText.toHtml())
462+
Assert.assertEquals("<strong>bold</strong><strong><i>bolditalic</i></strong><i>italic</i><del>strike</del><u>underline</u>normal", editText.toHtml())
463463
}
464464

465465
/**
@@ -636,7 +636,7 @@ class AztecToolbarTest {
636636
Assert.assertEquals("bolditalic", editText.toHtml())
637637

638638
boldButton.performClick()
639-
Assert.assertEquals("<b>bolditalic</b>", editText.toHtml())
639+
Assert.assertEquals("<strong>bolditalic</strong>", editText.toHtml())
640640
}
641641

642642
/**
@@ -674,18 +674,18 @@ class AztecToolbarTest {
674674

675675
editText.setSelection(0, 3)
676676
boldButton.performClick()
677-
Assert.assertEquals("<div class=\"third\"><b>Div</b><br><span>Span</span><br>Hidden</div>",
677+
Assert.assertEquals("<div class=\"third\"><strong>Div</strong><br><span>Span</span><br>Hidden</div>",
678678
editText.toHtml())
679679

680680
editText.setSelection(4, 8)
681681
italicButton.performClick()
682-
Assert.assertEquals("<div class=\"third\"><b>Div</b><br><span><i>Span</i></span><br>Hidden</div>",
682+
Assert.assertEquals("<div class=\"third\"><strong>Div</strong><br><span><i>Span</i></span><br>Hidden</div>",
683683
editText.toHtml())
684684

685685
editText.setSelection(9, 15)
686686
strikeThroughButton.performClick()
687687

688-
Assert.assertEquals("<div class=\"third\"><b>Div</b><br><span><i>Span</i></span><br><del>Hidden</del></div>",
688+
Assert.assertEquals("<div class=\"third\"><strong>Div</strong><br><span><i>Span</i></span><br><del>Hidden</del></div>",
689689
editText.toHtml())
690690
}
691691

‎aztec/src/test/kotlin/org/wordpress/aztec/HeadingTest.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,7 @@ class HeadingTest {
402402
editText.fromHtml("<h5>Heading 5</h5><h1 foo=\"bar\">Heading 1</h1><h5>Heading 5</h5>")
403403
editText.setSelection(editText.text.indexOf("Heading 1"), editText.text.indexOf("Heading 1") + "Heading 1".length)
404404
editText.toggleFormatting(AztecTextFormat.FORMAT_BOLD)
405-
Assert.assertEquals("<h5>Heading 5</h5><h1 foo=\"bar\"><b>Heading 1</b></h1><h5>Heading 5</h5>", editText.toHtml())
405+
Assert.assertEquals("<h5>Heading 5</h5><h1 foo=\"bar\"><strong>Heading 1</strong></h1><h5>Heading 5</h5>", editText.toHtml())
406406
}
407407

408408
@Test
@@ -411,7 +411,7 @@ class HeadingTest {
411411
editText.fromHtml("<h5>Heading 5</h5><pre foo=\"bar\">Preformat</pre><h5>Heading 5</h5>")
412412
editText.setSelection(editText.text.indexOf("Preformat"), editText.text.indexOf("Preformat") + "Preformat".length)
413413
editText.toggleFormatting(AztecTextFormat.FORMAT_BOLD)
414-
Assert.assertEquals("<h5>Heading 5</h5><pre foo=\"bar\"><b>Preformat</b></pre><h5>Heading 5</h5>", editText.toHtml())
414+
Assert.assertEquals("<h5>Heading 5</h5><pre foo=\"bar\"><strong>Preformat</strong></pre><h5>Heading 5</h5>", editText.toHtml())
415415
}
416416

417417
@Test
@@ -420,7 +420,7 @@ class HeadingTest {
420420
editText.fromHtml("<h1 foo=\"bar\">Heading 1</h1>")
421421
editText.setSelection(0, 3)
422422
editText.toggleFormatting(AztecTextFormat.FORMAT_BOLD)
423-
Assert.assertEquals("<h1 foo=\"bar\"><b>Hea</b>ding 1</h1>", editText.toHtml())
423+
Assert.assertEquals("<h1 foo=\"bar\"><strong>Hea</strong>ding 1</h1>", editText.toHtml())
424424
}
425425

426426
@Test
@@ -429,7 +429,7 @@ class HeadingTest {
429429
editText.fromHtml("<pre foo=\"bar\">Preformat</pre>")
430430
editText.setSelection(0, 3)
431431
editText.toggleFormatting(AztecTextFormat.FORMAT_BOLD)
432-
Assert.assertEquals("<pre foo=\"bar\"><b>Pre</b>format</pre>", editText.toHtml())
432+
Assert.assertEquals("<pre foo=\"bar\"><strong>Pre</strong>format</pre>", editText.toHtml())
433433
}
434434

435435
@Test

0 commit comments

Comments
 (0)