Skip to content

Commit 74635dd

Browse files
committed
Invert parameters of all call to AssertEquals in Spinner tests
They were being used wrong. Also, add the index of the array in one of the tests for better debugging.
1 parent 18ac3b4 commit 74635dd

File tree

1 file changed

+32
-30
lines changed

1 file changed

+32
-30
lines changed

tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Spinner.java

Lines changed: 32 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -59,55 +59,55 @@ public void test_getIncrement() {
5959
int [] cases = {5,100,1000,1};
6060
for (int value : cases) {
6161
spinner.setIncrement(value);
62-
assertEquals(spinner.getIncrement(), value);
62+
assertEquals(value, spinner.getIncrement());
6363
}
6464
spinner.setIncrement(-1);
65-
assertEquals(spinner.getIncrement(), cases[cases.length-1]);
65+
assertEquals(cases[cases.length-1], spinner.getIncrement());
6666
}
6767

6868
@Test
6969
public void test_getDigits() {
7070
int [] cases = {1,10,0};
7171
for (int digits : cases) {
7272
spinner.setDigits(digits);
73-
assertEquals(spinner.getDigits(), digits);
73+
assertEquals(digits, spinner.getDigits());
7474
}
7575
try{
7676
spinner.setDigits(-1);
7777
fail("setDigits should have failed with illegal Argument");
7878
}
7979
catch(IllegalArgumentException e){
80-
assertEquals(spinner.getDigits(), cases[cases.length-1]);
80+
assertEquals(cases[cases.length-1], spinner.getDigits());
8181
}
8282
}
8383

8484
@Test
8585
public void test_getMaximum() {
8686
spinner.setMaximum(1000);
87-
assertEquals(spinner.getMaximum(), 1000);
87+
assertEquals(1000, spinner.getMaximum());
8888
spinner.setMinimum(100);
8989
spinner.setMaximum(99);
90-
assertEquals(spinner.getMaximum(), 1000);
90+
assertEquals(1000, spinner.getMaximum());
9191
}
9292

9393
@Test
9494
public void test_getMinimum() {
9595
spinner.setMinimum(2);
96-
assertEquals(spinner.getMinimum(), 2);
96+
assertEquals(2, spinner.getMinimum());
9797
spinner.setMaximum(99);
9898
spinner.setMinimum(100);
99-
assertEquals(spinner.getMinimum(), 2);
99+
assertEquals(2, spinner.getMinimum());
100100
}
101101

102102
@Test
103103
public void test_getPageIncrement() {
104104
int [] cases = {5,1000,20,1};
105105
for (int value : cases) {
106106
spinner.setPageIncrement(value);
107-
assertEquals(spinner.getPageIncrement(), value);
107+
assertEquals(value, spinner.getPageIncrement());
108108
}
109109
spinner.setPageIncrement(-1);
110-
assertEquals(spinner.getPageIncrement(), cases[cases.length-1]);
110+
assertEquals(cases[cases.length-1], spinner.getPageIncrement());
111111
}
112112

113113
@Test
@@ -117,20 +117,20 @@ public void test_getSelection() {
117117
if(cases[i]>=spinner.getMaximum())
118118
cases[i] = spinner.getMaximum()-1;
119119
spinner.setSelection(cases[i]);
120-
assertEquals(spinner.getSelection(), cases[i]);
120+
assertEquals(cases[i], spinner.getSelection());
121121
}
122122
spinner.setSelection(spinner.getMaximum()+1);
123-
assertEquals(spinner.getSelection(), spinner.getMaximum());
123+
assertEquals(spinner.getMaximum(), spinner.getSelection());
124124
spinner.setSelection(spinner.getMinimum()-1);
125-
assertEquals(spinner.getSelection(), spinner.getMinimum());
125+
assertEquals(spinner.getMinimum(), spinner.getSelection());
126126
}
127127

128128
@Test
129129
public void test_getTextLimit() {
130130
int [] cases = {5,1000,1};
131131
for (int value : cases) {
132132
spinner.setTextLimit(value);
133-
assertEquals(spinner.getTextLimit(), value);
133+
assertEquals(value, spinner.getTextLimit());
134134
}
135135
try {
136136
spinner.setTextLimit(0);
@@ -150,30 +150,32 @@ public void test_setValues() {
150150
int [] pageIncrement = {50,5,6,100};
151151
for (int i=0;i<cases;i++){
152152
spinner.setValues(selection[i], minimum[i], maximum[i], digits[i], increment[i], pageIncrement[i]);
153-
assertEquals(spinner.getSelection(), selection[i]);
154-
assertEquals(spinner.getMinimum(), minimum[i]);
155-
assertEquals(spinner.getMaximum(), maximum[i]);
156-
assertEquals(spinner.getDigits(), digits[i]);
157-
assertEquals(spinner.getIncrement(), increment[i]);
158-
assertEquals(spinner.getPageIncrement(), pageIncrement[i]);
153+
assertEquals("i=" + i, selection[i], spinner.getSelection());
154+
assertEquals("i=" + i, minimum[i], spinner.getMinimum());
155+
assertEquals("i=" + i, maximum[i], spinner.getMaximum());
156+
assertEquals("i=" + i, digits[i], spinner.getDigits());
157+
assertEquals("i=" + i, increment[i], spinner.getIncrement());
158+
assertEquals("i=" + i, pageIncrement[i], spinner.getPageIncrement());
159159
}
160+
161+
// set invalid values. The last values should be preserved
160162
spinner.setValues(5, 10, 3, -1, 0, -1);
161-
assertEquals(spinner.getSelection(), selection[cases-1]);
162-
assertEquals(spinner.getMinimum(), minimum[cases-1]);
163-
assertEquals(spinner.getMaximum(), maximum[cases-1]);
164-
assertEquals(spinner.getDigits(), digits[cases-1]);
165-
assertEquals(spinner.getIncrement(), increment[cases-1]);
166-
assertEquals(spinner.getPageIncrement(), pageIncrement[cases-1]);
167-
spinner = new Spinner(shell,0);
163+
assertEquals(selection[cases - 1], spinner.getSelection());
164+
assertEquals(minimum[cases - 1], spinner.getMinimum());
165+
assertEquals(maximum[cases - 1], spinner.getMaximum());
166+
assertEquals(digits[cases - 1], spinner.getDigits());
167+
assertEquals(increment[cases - 1], spinner.getIncrement());
168+
assertEquals(pageIncrement[cases - 1], spinner.getPageIncrement());
169+
spinner = new Spinner(shell, 0);
168170
}
169171

170172
@Test
171173
public void test_getText(){
172174
spinner.setSelection(5);
173-
assertEquals(spinner.getText(), "5");
175+
assertEquals("5", spinner.getText());
174176
spinner.setSelection(-5);
175-
assertEquals(spinner.getText(), "0");
177+
assertEquals("0",spinner.getText());
176178
spinner.setSelection(spinner.getMaximum()+1);
177-
assertEquals(spinner.getText(), String.valueOf(spinner.getMaximum()));
179+
assertEquals(String.valueOf(spinner.getMaximum()), spinner.getText());
178180
}
179181
}

0 commit comments

Comments
 (0)