Skip to content

Commit 180f122

Browse files
vogellaakurtakov
vogella
authored and
akurtakov
committed
Migrate assertions in JFace viewer tests to JUnit 5
1 parent 6fabf86 commit 180f122

31 files changed

Lines changed: 417 additions & 453 deletions

‎tests/org.eclipse.jface.tests/META-INF/MANIFEST.MF‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ Import-Package: org.junit.jupiter.api;version="[5.14.0,6.0.0)",
1616
org.junit.jupiter.api.function;version="[5.14.0,6.0.0)",
1717
org.junit.platform.commons.function;version="[1.14.0,2.0.0)",
1818
org.junit.platform.suite.api;version="[1.14.0,2.0.0)",
19+
org.opentest4j;version="1.3.0",
1920
org.osgi.framework
2021
Export-Package: org.eclipse.jface.tests.fieldassist;x-internal:=true,
2122
org.eclipse.jface.tests.preferences;x-internal:=true,

‎tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/AbstractTreeViewerTest.java‎

Lines changed: 61 additions & 77 deletions
Large diffs are not rendered by default.

‎tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/Bug138608Test.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
package org.eclipse.jface.tests.viewers;
1717

18-
import static org.junit.Assert.assertEquals;
18+
import static org.junit.jupiter.api.Assertions.assertEquals;
1919

2020
import org.eclipse.jface.viewers.ITreeContentProvider;
2121
import org.eclipse.jface.viewers.LabelProvider;
@@ -89,12 +89,12 @@ public void testBug138608() {
8989
getTreeViewer().add(contentProvider.root.getChildren()[1],
9090
contentProvider.root.getChildren()[1].getChildren()[1]);
9191

92-
assertEquals("expected two children of node b", 2, getTreeViewer().getTree().getItem(1).getItemCount());
92+
assertEquals(2, getTreeViewer().getTree().getItem(1).getItemCount(), "expected two children of node b");
9393

9494
getTreeViewer().add(contentProvider.root.getChildren()[1],
9595
contentProvider.root.getChildren()[1].getChildren()[1]);
9696

97-
assertEquals("expected two children of node b", 2, getTreeViewer().getTree().getItem(1).getItemCount());
97+
assertEquals(2, getTreeViewer().getTree().getItem(1).getItemCount(), "expected two children of node b");
9898

9999
}
100100

‎tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/Bug200558Test.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
package org.eclipse.jface.tests.viewers;
1616

17-
import static org.junit.Assert.assertEquals;
17+
import static org.junit.jupiter.api.Assertions.assertEquals;
1818

1919
import org.eclipse.jface.viewers.CellEditor;
2020
import org.eclipse.jface.viewers.ICellModifier;

‎tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/Bug201002TableViewerTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
package org.eclipse.jface.tests.viewers;
1717

18-
import static org.junit.Assert.assertNotEquals;
18+
import static org.junit.jupiter.api.Assertions.assertNotEquals;
1919

2020
import org.eclipse.jface.viewers.ArrayContentProvider;
2121
import org.eclipse.jface.viewers.CellEditor;
@@ -89,7 +89,7 @@ public void testBug201002() {
8989
getTableViewer().editElement(getTableViewer().getElementAt(90), 0);
9090
waitForTopIndexUpdate(false);
9191
int topIndex = getTableViewer().getTable().getTopIndex();
92-
assertNotEquals("TableViewer top index shouldn't be 0", 0, topIndex);
92+
assertNotEquals(0, topIndex, "TableViewer top index shouldn't be 0");
9393
}
9494

9595
private void waitForTopIndexUpdate(boolean isTopZero) {

‎tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/Bug201002TreeViewerTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
package org.eclipse.jface.tests.viewers;
1616

17-
import static org.junit.Assert.assertTrue;
17+
import static org.junit.jupiter.api.Assertions.assertTrue;
1818

1919
import java.util.ArrayList;
2020

‎tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/Bug242231Test.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
*******************************************************************************/
1414
package org.eclipse.jface.tests.viewers;
1515

16-
import static org.junit.Assert.assertEquals;
16+
import static org.junit.jupiter.api.Assertions.assertEquals;
1717

1818
import org.eclipse.jface.viewers.CellEditor;
1919
import org.eclipse.jface.viewers.ColumnLabelProvider;

‎tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/CheckboxTableViewerTest.java‎

Lines changed: 25 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@
1313
*******************************************************************************/
1414
package org.eclipse.jface.tests.viewers;
1515

16-
import static org.junit.Assert.assertEquals;
17-
import static org.junit.Assert.assertFalse;
18-
import static org.junit.Assert.assertNotNull;
19-
import static org.junit.Assert.assertNull;
20-
import static org.junit.Assert.assertTrue;
16+
import static org.junit.jupiter.api.Assertions.assertEquals;
17+
import static org.junit.jupiter.api.Assertions.assertFalse;
18+
import static org.junit.jupiter.api.Assertions.assertNotNull;
19+
import static org.junit.jupiter.api.Assertions.assertNull;
20+
import static org.junit.jupiter.api.Assertions.assertTrue;
2121

2222
import java.util.ArrayList;
2323
import java.util.List;
@@ -252,13 +252,13 @@ public void testCheckProviderInvoked() {
252252
TestMethodsInvokedCheckStateProvider provider = new TestMethodsInvokedCheckStateProvider();
253253

254254
ctv.setCheckStateProvider(provider);
255-
assertTrue("isChecked should be invoked on a refresh", (!provider.isCheckedInvokedOn.isEmpty()));
256-
assertTrue("isGrayed should be invoked on a refresh", (!provider.isGrayedInvokedOn.isEmpty()));
255+
assertTrue((!provider.isCheckedInvokedOn.isEmpty()), "isChecked should be invoked on a refresh");
256+
assertTrue((!provider.isGrayedInvokedOn.isEmpty()), "isGrayed should be invoked on a refresh");
257257

258258
provider.reset();
259259
ctv.refresh();
260-
assertTrue("isChecked should be invoked on a refresh", (!provider.isCheckedInvokedOn.isEmpty()));
261-
assertTrue("isGrayed should be invoked on a refresh", (!provider.isGrayedInvokedOn.isEmpty()));
260+
assertTrue((!provider.isCheckedInvokedOn.isEmpty()), "isChecked should be invoked on a refresh");
261+
assertTrue((!provider.isGrayedInvokedOn.isEmpty()), "isGrayed should be invoked on a refresh");
262262
}
263263

264264
@Test
@@ -298,8 +298,8 @@ public boolean isGrayed(Object element) {
298298

299299
TableItem item = ctv.getTable().getItem(0);
300300

301-
assertEquals(item.getChecked(), isChecked);
302-
assertEquals(item.getGrayed(), isGrayed);
301+
assertEquals(isChecked, item.getChecked());
302+
assertEquals(isGrayed, item.getGrayed());
303303
}
304304

305305
@Test
@@ -355,13 +355,11 @@ public void testCheckProviderWithFilter() {
355355

356356
// Check that the provider is only invoked on elements which pass the filter
357357
for (TestElement element : checkStateProvider.isCheckedInvokedOn) {
358-
assertTrue("The check provider should not be invoked on elements which did not get through the filter",
359-
filter.select(ctv, null, element));
358+
assertTrue(filter.select(ctv, null, element), "The check provider should not be invoked on elements which did not get through the filter");
360359
}
361360

362361
for (TestElement element : checkStateProvider.isGrayedInvokedOn) {
363-
assertTrue("The check provider should not be invoked on elements which did not get through the filter",
364-
filter.select(ctv, null, element));
362+
assertTrue(filter.select(ctv, null, element), "The check provider should not be invoked on elements which did not get through the filter");
365363
}
366364
}
367365

@@ -403,8 +401,8 @@ private static void checkAllStates(String comment, CheckboxTableViewer ctv, int
403401
* @param shift the shift parameter being used
404402
*/
405403
private static void checkState(String comment, TestElement te, CheckboxTableViewer viewer, int shift) {
406-
assertEquals(comment, CheckStateProviderTestsUtil.shouldBeChecked(te, shift), viewer.getChecked(te));
407-
assertEquals(comment, CheckStateProviderTestsUtil.shouldBeGrayed(te, shift), viewer.getGrayed(te));
404+
assertEquals(CheckStateProviderTestsUtil.shouldBeChecked(te, shift), viewer.getChecked(te), comment);
405+
assertEquals(CheckStateProviderTestsUtil.shouldBeGrayed(te, shift), viewer.getGrayed(te), comment);
408406
}
409407

410408
/**
@@ -415,10 +413,10 @@ private static void checkState(String comment, TestElement te, CheckboxTableView
415413
* @param shift the shift parameter being used
416414
*/
417415
private static void checkState(String comment, TestElement te, TableItem item, int shift) {
418-
assertEquals("Wrong checkstate: " + comment, CheckStateProviderTestsUtil.shouldBeChecked(te, shift),
419-
item.getChecked());
420-
assertEquals("Wrong checkstate: " + comment, CheckStateProviderTestsUtil.shouldBeGrayed(te, shift),
421-
item.getGrayed());
416+
assertEquals(CheckStateProviderTestsUtil.shouldBeChecked(te, shift),
417+
item.getChecked(), "Wrong checkstate: " + comment);
418+
assertEquals(CheckStateProviderTestsUtil.shouldBeGrayed(te, shift),
419+
item.getGrayed(), "Wrong checkstate: " + comment);
422420
}
423421

424422
@Test
@@ -437,10 +435,10 @@ public void testGetCheckedElements() {
437435
Object[] actuallyChecked = ctv.getCheckedElements();
438436

439437
for (Object element : actuallyChecked) {
440-
assertTrue("getCheckedElements should include all checked elements", checked.remove(element));
438+
assertTrue(checked.remove(element), "getCheckedElements should include all checked elements");
441439
}
442440

443-
assertTrue("getCheckedElements should not include any unchecked elements", checked.isEmpty());
441+
assertTrue(checked.isEmpty(), "getCheckedElements should not include any unchecked elements");
444442
}
445443

446444
@Test
@@ -459,11 +457,9 @@ public void testSetCheckedElements() {
459457

460458
for (int i = 0; i < children.length; i++) {
461459
if (i % 2 == 0) {
462-
assertTrue("an element passed through setCheckedElements should be checked",
463-
ctv.getChecked(children[i]));
460+
assertTrue(ctv.getChecked(children[i]), "an element passed through setCheckedElements should be checked");
464461
} else {
465-
assertFalse("an element not passed through setCheckedElements should be unchecked",
466-
ctv.getChecked(children[i]));
462+
assertFalse(ctv.getChecked(children[i]), "an element not passed through setCheckedElements should be unchecked");
467463
}
468464
}
469465
}
@@ -484,10 +480,9 @@ public void testSetGrayedElements() {
484480

485481
for (int i = 0; i < children.length; i++) {
486482
if (i % 2 == 0) {
487-
assertTrue("an element passed through setGrayedElements should be grayed", ctv.getGrayed(children[i]));
483+
assertTrue(ctv.getGrayed(children[i]), "an element passed through setGrayedElements should be grayed");
488484
} else {
489-
assertFalse("an element not passed through setGrayedElements should not be grayed",
490-
ctv.getGrayed(children[i]));
485+
assertFalse(ctv.getGrayed(children[i]), "an element not passed through setGrayedElements should not be grayed");
491486
}
492487
}
493488
}

‎tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/CheckboxTreeViewerTest.java‎

Lines changed: 29 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
*******************************************************************************/
1414
package org.eclipse.jface.tests.viewers;
1515

16-
import static org.junit.Assert.assertEquals;
17-
import static org.junit.Assert.assertFalse;
18-
import static org.junit.Assert.assertTrue;
16+
import static org.junit.jupiter.api.Assertions.assertEquals;
17+
import static org.junit.jupiter.api.Assertions.assertFalse;
18+
import static org.junit.jupiter.api.Assertions.assertTrue;
1919

2020
import java.util.ArrayList;
2121
import java.util.Collection;
@@ -140,13 +140,13 @@ public void testCheckProviderInvoked() {
140140
TestMethodsInvokedCheckStateProvider provider = new TestMethodsInvokedCheckStateProvider();
141141

142142
ctv.setCheckStateProvider(provider);
143-
assertFalse("isChecked should be invoked on a refresh", provider.isCheckedInvokedOn.isEmpty());
144-
assertFalse("isGrayed should be invoked on a refresh", provider.isGrayedInvokedOn.isEmpty());
143+
assertFalse(provider.isCheckedInvokedOn.isEmpty(), "isChecked should be invoked on a refresh");
144+
assertFalse(provider.isGrayedInvokedOn.isEmpty(), "isGrayed should be invoked on a refresh");
145145

146146
provider.reset();
147147
ctv.refresh();
148-
assertFalse("isChecked should be invoked on a refresh", provider.isCheckedInvokedOn.isEmpty());
149-
assertFalse("isGrayed should be invoked on a refresh", provider.isGrayedInvokedOn.isEmpty());
148+
assertFalse(provider.isCheckedInvokedOn.isEmpty(), "isChecked should be invoked on a refresh");
149+
assertFalse(provider.isGrayedInvokedOn.isEmpty(), "isGrayed should be invoked on a refresh");
150150

151151
}
152152

@@ -169,7 +169,7 @@ public void testCheckProviderLazilyInvoked() {
169169
for (int j = 0; j < expected.length && !firstLevelElement; j++) {
170170
firstLevelElement = element.equals(expected[j]);
171171
}
172-
assertTrue("The check provider should only be invoked with visible elements", firstLevelElement);
172+
assertTrue(firstLevelElement, "The check provider should only be invoked with visible elements");
173173
}
174174

175175
for (TestElement testElement : provider.isGrayedInvokedOn) {
@@ -178,7 +178,7 @@ public void testCheckProviderLazilyInvoked() {
178178
for (int j = 0; j < expected.length && !firstLevelElement; j++) {
179179
firstLevelElement = element.equals(expected[j]);
180180
}
181-
assertTrue("The check provider should only be invoked with visible elements", firstLevelElement);
181+
assertTrue(firstLevelElement, "The check provider should only be invoked with visible elements");
182182
}
183183
}
184184

@@ -280,13 +280,11 @@ public void testCheckProviderWithFilter() {
280280

281281
// Check that the provider is only invoked on elements which pass the filter
282282
for (TestElement element : checkStateProvider.isCheckedInvokedOn) {
283-
assertTrue("The check provider should not be invoked on elements which did not get through the filter",
284-
filter.select(ctv, null, element));
283+
assertTrue(filter.select(ctv, null, element), "The check provider should not be invoked on elements which did not get through the filter");
285284
}
286285

287286
for (TestElement element : checkStateProvider.isGrayedInvokedOn) {
288-
assertTrue("The check provider should not be invoked on elements which did not get through the filter",
289-
filter.select(ctv, null, element));
287+
assertTrue(filter.select(ctv, null, element), "The check provider should not be invoked on elements which did not get through the filter");
290288
}
291289
}
292290

@@ -342,8 +340,8 @@ private void checkAllStates(String comment, CheckboxTreeViewer ctv, int shift) {
342340
* @param shift the shift parameter being used
343341
*/
344342
private static void checkState(String comment, TestElement te, CheckboxTreeViewer viewer, int shift) {
345-
assertEquals(comment, CheckStateProviderTestsUtil.shouldBeChecked(te, shift), viewer.getChecked(te));
346-
assertEquals(comment, CheckStateProviderTestsUtil.shouldBeGrayed(te, shift), viewer.getGrayed(te));
343+
assertEquals(CheckStateProviderTestsUtil.shouldBeChecked(te, shift), viewer.getChecked(te), comment);
344+
assertEquals(CheckStateProviderTestsUtil.shouldBeGrayed(te, shift), viewer.getGrayed(te), comment);
347345
}
348346

349347
/**
@@ -354,10 +352,10 @@ private static void checkState(String comment, TestElement te, CheckboxTreeViewe
354352
* @param shift the shift parameter being used
355353
*/
356354
private static void checkState(String comment, TestElement te, TreeItem item, int shift) {
357-
assertEquals("Wrong checkstate: " + comment, CheckStateProviderTestsUtil.shouldBeChecked(te, shift),
358-
item.getChecked());
359-
assertEquals("Wrong checkstate: " + comment, CheckStateProviderTestsUtil.shouldBeGrayed(te, shift),
360-
item.getGrayed());
355+
assertEquals(CheckStateProviderTestsUtil.shouldBeChecked(te, shift),
356+
item.getChecked(), "Wrong checkstate: " + comment);
357+
assertEquals(CheckStateProviderTestsUtil.shouldBeGrayed(te, shift),
358+
item.getGrayed(), "Wrong checkstate: " + comment);
361359
}
362360

363361
@Test
@@ -376,10 +374,10 @@ public void testGetCheckedElements() {
376374
Object[] actuallyChecked = ctv.getCheckedElements();
377375

378376
for (Object element : actuallyChecked) {
379-
assertTrue("getCheckedElements should include all checked elements", checked.remove(element));
377+
assertTrue(checked.remove(element), "getCheckedElements should include all checked elements");
380378
}
381379

382-
assertTrue("getCheckedElements should not include any unchecked elements", checked.isEmpty());
380+
assertTrue(checked.isEmpty(), "getCheckedElements should not include any unchecked elements");
383381
}
384382

385383
@Test
@@ -398,11 +396,9 @@ public void testSetCheckedElements() {
398396

399397
for (int i = 0; i < children.length; i++) {
400398
if (i % 2 == 0) {
401-
assertTrue("an element passed through setCheckedElements should be checked",
402-
ctv.getChecked(children[i]));
399+
assertTrue(ctv.getChecked(children[i]), "an element passed through setCheckedElements should be checked");
403400
} else {
404-
assertFalse("an element not passed through setCheckedElements should be unchecked",
405-
ctv.getChecked(children[i]));
401+
assertFalse(ctv.getChecked(children[i]), "an element not passed through setCheckedElements should be unchecked");
406402
}
407403
}
408404
}
@@ -423,10 +419,9 @@ public void testSetGrayedElements() {
423419

424420
for (int i = 0; i < children.length; i++) {
425421
if (i % 2 == 0) {
426-
assertTrue("an element passed through setGrayedElements should be grayed", ctv.getGrayed(children[i]));
422+
assertTrue(ctv.getGrayed(children[i]), "an element passed through setGrayedElements should be grayed");
427423
} else {
428-
assertFalse("an element not passed through setGrayedElements should not be grayed",
429-
ctv.getGrayed(children[i]));
424+
assertFalse(ctv.getGrayed(children[i]), "an element not passed through setGrayedElements should not be grayed");
430425
}
431426
}
432427
}
@@ -442,13 +437,13 @@ public void testSetAllChecked() {
442437
Object[] expandedElements = ctv.getExpandedElements();
443438

444439
for (Object expandedElement : expandedElements) {
445-
assertTrue("all expanded items should be checked", ctv.getChecked(expandedElement));
440+
assertTrue(ctv.getChecked(expandedElement), "all expanded items should be checked");
446441
}
447442

448443
ctv.setAllChecked(false);
449444

450445
for (Object expandedElement : expandedElements) {
451-
assertFalse("all expanded items should be unchecked", ctv.getChecked(expandedElement));
446+
assertFalse(ctv.getChecked(expandedElement), "all expanded items should be unchecked");
452447
}
453448
}
454449

@@ -461,10 +456,10 @@ public void testSetGrayChecked() {
461456
ctv.setGrayChecked(children[0], true);
462457
ctv.setGrayChecked(children[1], false);
463458

464-
assertTrue("an item invoked with setGrayChecked(true) should be checked", ctv.getChecked(children[0]));
465-
assertTrue("an item invoked with setGrayChecked(true) should be grayed", ctv.getGrayed(children[0]));
459+
assertTrue(ctv.getChecked(children[0]), "an item invoked with setGrayChecked(true) should be checked");
460+
assertTrue(ctv.getGrayed(children[0]), "an item invoked with setGrayChecked(true) should be grayed");
466461

467-
assertFalse("an item invoked with setGrayChecked(false) should be unchecked", ctv.getChecked(children[1]));
468-
assertFalse("an item invoked with setGrayChecked(false) should not be grayed", ctv.getGrayed(children[1]));
462+
assertFalse(ctv.getChecked(children[1]), "an item invoked with setGrayChecked(false) should be unchecked");
463+
assertFalse(ctv.getGrayed(children[1]), "an item invoked with setGrayChecked(false) should not be grayed");
469464
}
470465
}

‎tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/ListViewerComparatorTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
package org.eclipse.jface.tests.viewers;
1616

17-
import static org.junit.Assert.assertEquals;
17+
import static org.junit.jupiter.api.Assertions.assertEquals;
1818

1919
import org.eclipse.jface.viewers.ListViewer;
2020
import org.eclipse.jface.viewers.StructuredViewer;
@@ -68,7 +68,7 @@ private void assertSortedResult(String[] expected) {
6868
String[] items = getListViewer().getList().getItems();
6969
for (int i = 0; i < items.length; i++) {
7070
String item = items[i];
71-
assertEquals("Item not expected. actual=" + item + " expected=", expected[i], item);
71+
assertEquals(expected[i], item, "Item not expected. actual=" + item + " expected=");
7272
}
7373
}
7474

0 commit comments

Comments
 (0)