Skip to content

Commit 4df99ba

Browse files
akurtakovakurtakov
committed
Remove dummy assert message in Combo tests
These only look awkward in failures. This is also prep step for whenever suite is to be migrated to JUnit 5.
1 parent e1b6447 commit 4df99ba

File tree

1 file changed

+45
-45
lines changed

1 file changed

+45
-45
lines changed

‎tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Combo.java‎

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public void test_ConstructorLorg_eclipse_swt_widgets_CompositeI() {
6363
int[] cases = {SWT.DROP_DOWN, SWT.SIMPLE};
6464
for (int i = 0; i < cases.length; i++) {
6565
combo = new Combo(shell, cases[i]);
66-
assertEquals(":a:" + String.valueOf(i), cases[i], (combo.getStyle() & cases[i]));
66+
assertEquals(String.valueOf(i), cases[i], (combo.getStyle() & cases[i]));
6767
}
6868
}
6969

@@ -73,11 +73,11 @@ public void test_addLjava_lang_String() {
7373
combo.add(null));
7474

7575
combo.add("");
76-
assertArrayEquals(":a:", new String[]{""}, combo.getItems());
76+
assertArrayEquals(new String[]{""}, combo.getItems());
7777
combo.add("");
78-
assertArrayEquals(":b:", new String[]{"", ""}, combo.getItems());
78+
assertArrayEquals(new String[]{"", ""}, combo.getItems());
7979
combo.add("fred");
80-
assertArrayEquals(":c:", new String[]{"", "", "fred"}, combo.getItems());
80+
assertArrayEquals(new String[]{"", "", "fred"}, combo.getItems());
8181

8282
}
8383

@@ -179,7 +179,7 @@ public void widgetDefaultSelected(SelectionEvent event) {
179179
assertThrows(IllegalArgumentException.class, () -> combo.addSelectionListener(null));
180180
combo.addSelectionListener(listener);
181181
combo.select(0);
182-
assertFalse(":a:", listenerCalled);
182+
assertFalse(listenerCalled);
183183
combo.removeSelectionListener(listener);
184184
assertThrows(IllegalArgumentException.class, () -> combo.removeSelectionListener(null));
185185
}
@@ -191,7 +191,7 @@ public void test_addSelectionListenerWidgetSelectedAdapterLorg_eclipse_swt_event
191191

192192
combo.addSelectionListener(listener);
193193
combo.select(0);
194-
assertFalse(":a:", listenerCalled);
194+
assertFalse(listenerCalled);
195195

196196
combo.removeSelectionListener(listener);
197197
listenerCalled = false;
@@ -205,14 +205,14 @@ public void test_clearSelection() {
205205
for (int i = 0; i < number; i++)
206206
combo.add("fred" + i);
207207
combo.clearSelection();
208-
assertEquals(":a:",new Point(0, 0), combo.getSelection());
208+
assertEquals(new Point(0, 0), combo.getSelection());
209209
combo.setSelection(new Point(0, 5));
210-
assertEquals(":b:",new Point(0, 0), combo.getSelection()); //nothing is selected
210+
assertEquals(new Point(0, 0), combo.getSelection()); //nothing is selected
211211
combo.setText("some text");
212212
combo.setSelection(new Point(0, 5));
213-
assertEquals(":c:",new Point(0, 5), combo.getSelection());
213+
assertEquals(new Point(0, 5), combo.getSelection());
214214
combo.clearSelection();
215-
assertEquals(":d:", combo.getSelection().x, combo.getSelection().y);
215+
assertEquals(combo.getSelection().x, combo.getSelection().y);
216216
}
217217

218218
@Override
@@ -236,7 +236,7 @@ public void test_copy() {
236236
combo.copy();
237237
combo.setSelection(new Point(0,0));
238238
combo.paste();
239-
assertEquals(":a:","23123456", combo.getText());
239+
assertEquals("23123456", combo.getText());
240240
}
241241

242242
@Test
@@ -252,7 +252,7 @@ public void test_cut() {
252252
combo.setText("123456");
253253
combo.setSelection(new Point(1,3));
254254
combo.cut();
255-
assertEquals(":a:","1456", combo.getText());
255+
assertEquals("1456", combo.getText());
256256
}
257257

258258
@Test
@@ -263,7 +263,7 @@ public void test_deselectAll() {
263263
combo.select(0);
264264
combo.select(2);
265265
combo.deselectAll();
266-
assertEquals(":a:",-1, combo.getSelectionIndex());
266+
assertEquals(-1, combo.getSelectionIndex());
267267
}
268268
@Test
269269
public void test_deselectI() {
@@ -282,9 +282,9 @@ public void test_deselectI() {
282282
combo.add("fred" + i);
283283
for (int i = 0; i < number; i++) {
284284
combo.select(i);
285-
assertEquals(":a:" + i,i, combo.getSelectionIndex());
285+
assertEquals("index "+i,i, combo.getSelectionIndex());
286286
combo.deselect(i);
287-
assertEquals(":b:" + i,-1, combo.getSelectionIndex());
287+
assertEquals("index "+i,-1, combo.getSelectionIndex());
288288
}
289289
}
290290

@@ -298,17 +298,17 @@ public void test_getChildren() {
298298
public void test_getItemCount() {
299299
int number = 10;
300300
for (int i = 0; i < number; i++) {
301-
assertEquals(":a:" + i,i, combo.getItemCount());
301+
assertEquals("index "+i,i, combo.getItemCount());
302302
combo.add("fred" + i);
303303
}
304-
assertEquals(":aa:", number, combo.getItemCount());
304+
assertEquals(number, combo.getItemCount());
305305

306306
for (int i = 0; i < number; i++) {
307-
assertEquals(":b:" + i, number-i, combo.getItemCount());
307+
assertEquals("index "+i, number-i, combo.getItemCount());
308308
combo.remove(0);
309309
}
310310
combo.removeAll();
311-
assertEquals(":c:", 0, combo.getItemCount());
311+
assertEquals(0, combo.getItemCount());
312312
}
313313

314314
@Test
@@ -335,10 +335,10 @@ public void test_getItems() {
335335
combo.add("2");
336336
combo.add("3");
337337
String[] items = combo.getItems();
338-
assertEquals(":a:", 3, items.length);
339-
assertEquals(":a:", "1", items[0]);
340-
assertEquals(":a:", "2", items[1]);
341-
assertEquals(":a:", "3", items[2]);
338+
assertEquals(3, items.length);
339+
assertEquals("1", items[0]);
340+
assertEquals("2", items[1]);
341+
assertEquals("3", items[2]);
342342
}
343343

344344
@Test
@@ -351,7 +351,7 @@ public void test_getSelection() {
351351
combo.setText("123456");
352352
combo.setSelection(new Point(1,3));
353353
combo.getSelection();
354-
assertEquals(":a:", new Point(1,3), combo.getSelection());
354+
assertEquals(new Point(1,3), combo.getSelection());
355355
}
356356

357357
@Test
@@ -403,7 +403,7 @@ public void test_getText() {
403403
String[] cases = {"", "fred", "fredfred"};
404404
for (int i = 0; i < cases.length; i++) {
405405
combo.setText(cases[i]);
406-
assertEquals(":a:" + String.valueOf(i), cases[i], combo.getText());
406+
assertEquals(String.valueOf(i), cases[i], combo.getText());
407407
}
408408
}
409409

@@ -415,7 +415,7 @@ public void test_getTextHeight() {
415415
@Test
416416
public void test_getTextLimit() {
417417
combo.setTextLimit(3);
418-
assertEquals(":a:", 3, combo.getTextLimit());
418+
assertEquals(3, combo.getTextLimit());
419419
}
420420

421421
@Test
@@ -472,18 +472,18 @@ public void test_indexOfLjava_lang_StringI() {
472472
for (int i = 0; i < number; i++)
473473
combo.add("fred" + i);
474474
for (int i = 0; i < number; i++)
475-
assertEquals(":a:" + i, i, combo.indexOf("fred" + i, 0));
475+
assertEquals("index " + i, i, combo.indexOf("fred" + i, 0));
476476
for (int i = 0; i < number; i++)
477-
assertEquals(":b:" + i, -1, combo.indexOf("fred" + i, i + 1));
477+
assertEquals("index " + i, -1, combo.indexOf("fred" + i, i + 1));
478478

479479
for (int i = 0; i < number; i++)
480480
combo.add("fred" + i);
481481
for (int i = 0; i < 3; i++)
482-
assertEquals(":a:" + i, i, combo.indexOf("fred" + i, 0));
482+
assertEquals("index " + i, i, combo.indexOf("fred" + i, 0));
483483
for (int i = 3; i < number; i++)
484-
assertEquals(":b:" + i, i, combo.indexOf("fred" + i, 3));
484+
assertEquals("index " + i, i, combo.indexOf("fred" + i, 3));
485485
for (int i = 0; i < number; i++)
486-
assertEquals(":b:" + i, i, combo.indexOf("fred" + i, i));
486+
assertEquals("index " + i, i, combo.indexOf("fred" + i, i));
487487
}
488488

489489
@Test
@@ -499,17 +499,17 @@ public void test_paste() {
499499
combo.setText("123456");
500500
combo.setSelection(new Point(1,3));
501501
combo.cut();
502-
assertEquals(":a:", "1456", combo.getText());
502+
assertEquals("1456", combo.getText());
503503
combo.paste();
504-
assertEquals(":a:", "123456", combo.getText());
504+
assertEquals("123456", combo.getText());
505505
}
506506

507507
@Test
508508
public void test_removeAll() {
509509
combo.add("1");
510510
combo.add("2");
511511
combo.removeAll();
512-
assertEquals(":a:", 0, combo.getItems().length);
512+
assertEquals(0, combo.getItems().length);
513513
}
514514

515515
@Test
@@ -671,7 +671,7 @@ public void test_selectI() {
671671
combo.add("456");
672672
combo.add("789");
673673
combo.select(1);
674-
assertEquals(":a:", 1, combo.getSelectionIndex());
674+
assertEquals(1, combo.getSelectionIndex());
675675

676676
// indices out of range are ignored
677677
combo.select(10);
@@ -857,7 +857,7 @@ public void test_setItemILjava_lang_String() {
857857
combo.add("fred");
858858
for (int i = 0; i < number; i++)
859859
combo.setItem(i, "fred" + i);
860-
assertArrayEquals(":a:", new String[]{"fred0", "fred1", "fred2", "fred3", "fred4"}, combo.getItems());
860+
assertArrayEquals(new String[]{"fred0", "fred1", "fred2", "fred3", "fred4"}, combo.getItems());
861861
}
862862

863863
@Test
@@ -869,17 +869,17 @@ public void test_setItemILjava_lang_String() {
869869

870870
for (int i = 0 ; i< items.length; i++){
871871
combo.setItems(items[i]);
872-
assertArrayEquals(":a:" + i, items[i], combo.getItems());}
872+
assertArrayEquals("index" + i, items[i], combo.getItems());}
873873
}
874874

875875
@Test
876876
public void test_setOrientationI() {
877877
combo.setOrientation(SWT.RIGHT_TO_LEFT);
878878
if ((combo.getStyle() & SWT.MIRRORED) != 0) {
879-
assertEquals(":a:", SWT.RIGHT_TO_LEFT, combo.getOrientation());
879+
assertEquals(SWT.RIGHT_TO_LEFT, combo.getOrientation());
880880
}
881881
combo.setOrientation(SWT.LEFT_TO_RIGHT);
882-
assertEquals(":b:", SWT.LEFT_TO_RIGHT, combo.getOrientation());
882+
assertEquals(SWT.LEFT_TO_RIGHT, combo.getOrientation());
883883
}
884884

885885
@Test
@@ -891,10 +891,10 @@ public void test_setSelectionLorg_eclipse_swt_graphics_Point() {
891891
for (int i = 0; i < number; i++)
892892
combo.add("fred" + i);
893893
combo.setSelection(new Point(0, 5));
894-
assertEquals(":a:", new Point(0, 0), combo.getSelection());
894+
assertEquals(new Point(0, 0), combo.getSelection());
895895
combo.setText("some text");
896896
combo.setSelection(new Point(0, 5));
897-
assertEquals(":b:", new Point(0, 5), combo.getSelection());
897+
assertEquals(new Point(0, 5), combo.getSelection());
898898
}
899899

900900
@Test
@@ -903,7 +903,7 @@ public void test_setTextLimitI() {
903903
combo.setTextLimit(0));
904904

905905
combo.setTextLimit(3);
906-
assertEquals(":a:", 3, combo.getTextLimit());
906+
assertEquals(3, combo.getTextLimit());
907907
}
908908

909909
@Test
@@ -914,21 +914,21 @@ public void test_setTextLjava_lang_String() {
914914
String[] cases = {"", "fred", "fred0"};
915915
for (int i = 0; i < cases.length; i++) {
916916
combo.setText(cases[i]);
917-
assertEquals(":a:" + i, cases[i], combo.getText());
917+
assertEquals("index" + i, cases[i], combo.getText());
918918
}
919919
for (int i = 0; i < 5; i++) {
920920
combo.add("fred");
921921
}
922922
for (int i = 0; i < cases.length; i++) {
923923
combo.setText(cases[i]);
924-
assertEquals(":b:" + i,cases[i], combo.getText());
924+
assertEquals("index" + i,cases[i], combo.getText());
925925
}
926926
for (int i = 0; i < 5; i++) {
927927
combo.add("fred" + i);
928928
}
929929
for (int i = 0; i < cases.length; i++) {
930930
combo.setText(cases[i]);
931-
assertEquals(":c:" + i, cases[i], combo.getText());
931+
assertEquals("index" + i, cases[i], combo.getText());
932932
}
933933
}
934934

0 commit comments

Comments
 (0)