|
Lines 21-33
Link Here
|
| 21 |
import junit.framework.Test; |
21 |
import junit.framework.Test; |
| 22 |
|
22 |
|
| 23 |
import org.eclipse.core.databinding.observable.list.IObservableList; |
23 |
import org.eclipse.core.databinding.observable.list.IObservableList; |
| 24 |
import org.eclipse.core.databinding.observable.list.ListDiffEntry; |
24 |
import org.eclipse.core.databinding.observable.list.ListDiff; |
| 25 |
import org.eclipse.jface.databinding.conformance.delegate.IObservableCollectionContractDelegate; |
25 |
import org.eclipse.jface.databinding.conformance.delegate.IObservableCollectionContractDelegate; |
| 26 |
import org.eclipse.jface.databinding.conformance.util.ChangeEventTracker; |
26 |
import org.eclipse.jface.databinding.conformance.util.ChangeEventTracker; |
| 27 |
import org.eclipse.jface.databinding.conformance.util.ListChangeEventTracker; |
27 |
import org.eclipse.jface.databinding.conformance.util.ListChangeEventTracker; |
| 28 |
import org.eclipse.jface.databinding.conformance.util.SuiteBuilder; |
28 |
import org.eclipse.jface.databinding.conformance.util.SuiteBuilder; |
| 29 |
|
29 |
|
| 30 |
|
|
|
| 31 |
/** |
30 |
/** |
| 32 |
* Mutability tests for IObservableList. |
31 |
* Mutability tests for IObservableList. |
| 33 |
* |
32 |
* |
|
Lines 68-89
Link Here
|
| 68 |
} |
67 |
} |
| 69 |
|
68 |
|
| 70 |
public void testAdd_ListChangeEvent() throws Exception { |
69 |
public void testAdd_ListChangeEvent() throws Exception { |
|
|
70 |
final Object element = delegate.createElement(list); |
| 71 |
assertListChangeEventFired(new Runnable() { |
71 |
assertListChangeEventFired(new Runnable() { |
| 72 |
public void run() { |
72 |
public void run() { |
| 73 |
list.add(delegate.createElement(list)); |
73 |
list.add(element); |
| 74 |
} |
74 |
} |
| 75 |
}, "List.add(Object)", list); |
75 |
}, "List.add(Object)", list, Collections.singletonList(element)); |
| 76 |
} |
76 |
} |
| 77 |
|
77 |
|
| 78 |
public void testAdd_ListDiffEntry() throws Exception { |
78 |
public void testAdd_ListDiffEntry() throws Exception { |
| 79 |
list.add(delegate.createElement(list)); |
79 |
Object element0 = delegate.createElement(list); |
| 80 |
final Object element = delegate.createElement(list); |
80 |
list.add(element0); |
|
|
81 |
final Object element1 = delegate.createElement(list); |
| 81 |
|
82 |
|
| 82 |
assertAddDiffEntry(new Runnable() { |
83 |
assertListChangeEventFired(new Runnable() { |
| 83 |
public void run() { |
84 |
public void run() { |
| 84 |
list.add(element); |
85 |
list.add(element1); |
| 85 |
} |
86 |
} |
| 86 |
}, "List.add(Object)", list, element, 1); |
87 |
}, "List.add(Object)", list, Arrays.asList(new Object[] { element0, |
|
|
88 |
element1 })); |
| 87 |
} |
89 |
} |
| 88 |
|
90 |
|
| 89 |
public void testAddAtIndex_ChangeEvent() throws Exception { |
91 |
public void testAddAtIndex_ChangeEvent() throws Exception { |
|
Lines 95-105
Link Here
|
| 95 |
} |
97 |
} |
| 96 |
|
98 |
|
| 97 |
public void testAddAtIndex_ListChangeEvent() throws Exception { |
99 |
public void testAddAtIndex_ListChangeEvent() throws Exception { |
|
|
100 |
final Object element = delegate.createElement(list); |
| 98 |
assertListChangeEventFired(new Runnable() { |
101 |
assertListChangeEventFired(new Runnable() { |
| 99 |
public void run() { |
102 |
public void run() { |
| 100 |
list.add(0, delegate.createElement(list)); |
103 |
list.add(0, element); |
| 101 |
} |
104 |
} |
| 102 |
}, "List.add(int, Object)", list); |
105 |
}, "List.add(int, Object)", list, Collections.singletonList(element)); |
| 103 |
} |
106 |
} |
| 104 |
|
107 |
|
| 105 |
public void testAddAtIndex_ChangeEventFiredAfterElementIsAdded() |
108 |
public void testAddAtIndex_ChangeEventFiredAfterElementIsAdded() |
|
Lines 114-157
Link Here
|
| 114 |
} |
117 |
} |
| 115 |
|
118 |
|
| 116 |
public void testAddAtIndex_ListDiffEntry() throws Exception { |
119 |
public void testAddAtIndex_ListDiffEntry() throws Exception { |
| 117 |
list.add(delegate.createElement(list)); |
120 |
Object element0 = delegate.createElement(list); |
| 118 |
final Object element = delegate.createElement(list); |
121 |
list.add(element0); |
|
|
122 |
final Object element1 = delegate.createElement(list); |
| 119 |
|
123 |
|
| 120 |
assertAddDiffEntry(new Runnable() { |
124 |
assertListChangeEventFired(new Runnable() { |
| 121 |
public void run() { |
125 |
public void run() { |
| 122 |
list.add(1, element); |
126 |
list.add(1, element1); |
| 123 |
} |
127 |
} |
| 124 |
}, "List.add(int, Object)", list, element, 1); |
128 |
}, "List.add(int, Object)", list, Arrays.asList(new Object[] { |
|
|
129 |
element0, element1 })); |
| 125 |
} |
130 |
} |
| 126 |
|
131 |
|
| 127 |
public void testAddAll_ListChangeEvent() throws Exception { |
132 |
public void testAddAll_ListChangeEvent() throws Exception { |
|
|
133 |
final Object element = delegate.createElement(list); |
| 128 |
assertListChangeEventFired(new Runnable() { |
134 |
assertListChangeEventFired(new Runnable() { |
| 129 |
public void run() { |
135 |
public void run() { |
| 130 |
list.addAll(Arrays.asList(new Object[] { delegate |
136 |
list.addAll(Collections.singletonList(element)); |
| 131 |
.createElement(list) })); |
|
|
| 132 |
} |
137 |
} |
| 133 |
}, "List.addAll(Collection", list); |
138 |
}, "List.addAll(Collection", list, Collections.singletonList(element)); |
| 134 |
} |
139 |
} |
| 135 |
|
140 |
|
| 136 |
public void testAddAll_ListDiffEntry() throws Exception { |
141 |
public void testAddAll_ListDiffEntry() throws Exception { |
| 137 |
final Object element = delegate.createElement(list); |
142 |
final Object element = delegate.createElement(list); |
| 138 |
|
143 |
|
| 139 |
assertAddDiffEntry(new Runnable() { |
144 |
assertListChangeEventFired(new Runnable() { |
| 140 |
public void run() { |
145 |
public void run() { |
| 141 |
list.addAll(Arrays.asList(new Object[] { element })); |
146 |
list.addAll(Collections.singletonList(element)); |
| 142 |
} |
147 |
} |
| 143 |
}, "List.addAll(Collection)", list, element, 0); |
148 |
}, "List.addAll(Collection)", list, Collections.singletonList(element)); |
| 144 |
} |
149 |
} |
| 145 |
|
150 |
|
| 146 |
public void testAddAll_ListDiffEntry2() throws Exception { |
151 |
public void testAddAll_ListDiffEntry2() throws Exception { |
| 147 |
list.add(delegate.createElement(list)); |
152 |
final Object element0 = delegate.createElement(list); |
| 148 |
final Object element = delegate.createElement(list); |
153 |
list.add(element0); |
|
|
154 |
final Object element1 = delegate.createElement(list); |
| 149 |
|
155 |
|
| 150 |
assertAddDiffEntry(new Runnable() { |
156 |
assertListChangeEventFired(new Runnable() { |
| 151 |
public void run() { |
157 |
public void run() { |
| 152 |
list.addAll(Collections.singletonList(element)); |
158 |
list.addAll(Collections.singletonList(element1)); |
| 153 |
} |
159 |
} |
| 154 |
}, "List.addAll(Collection)", list, element, 1); |
160 |
}, "List.addAll(Collection)", list, Arrays.asList(new Object[] { |
|
|
161 |
element0, element1 })); |
| 155 |
} |
162 |
} |
| 156 |
|
163 |
|
| 157 |
public void testAddAllAtIndex_ChangeEvent() throws Exception { |
164 |
public void testAddAllAtIndex_ChangeEvent() throws Exception { |
|
Lines 164-175
Link Here
|
| 164 |
} |
171 |
} |
| 165 |
|
172 |
|
| 166 |
public void testAddAllAtIndex_ListChangeEvent() throws Exception { |
173 |
public void testAddAllAtIndex_ListChangeEvent() throws Exception { |
|
|
174 |
final Object element = delegate.createElement(list); |
| 167 |
assertListChangeEventFired(new Runnable() { |
175 |
assertListChangeEventFired(new Runnable() { |
| 168 |
public void run() { |
176 |
public void run() { |
| 169 |
list.addAll(0, Arrays.asList(new Object[] { delegate |
177 |
list.addAll(0, Collections.singletonList(element)); |
| 170 |
.createElement(list) })); |
|
|
| 171 |
} |
178 |
} |
| 172 |
}, "List.addAll(int, Collection)", list); |
179 |
}, "List.addAll(int, Collection)", list, Collections |
|
|
180 |
.singletonList(element)); |
| 173 |
} |
181 |
} |
| 174 |
|
182 |
|
| 175 |
public void testAddAllAtIndex_ChangeEventFiredAfterElementIsAdded() |
183 |
public void testAddAllAtIndex_ChangeEventFiredAfterElementIsAdded() |
|
Lines 184-197
Link Here
|
| 184 |
} |
192 |
} |
| 185 |
|
193 |
|
| 186 |
public void testAddAllAtIndex_ListDiffEntry() throws Exception { |
194 |
public void testAddAllAtIndex_ListDiffEntry() throws Exception { |
| 187 |
list.add(delegate.createElement(list)); |
195 |
Object element0 = delegate.createElement(list); |
| 188 |
final Object element = delegate.createElement(list); |
196 |
list.add(element0); |
|
|
197 |
final Object element1 = delegate.createElement(list); |
| 189 |
|
198 |
|
| 190 |
assertAddDiffEntry(new Runnable() { |
199 |
assertListChangeEventFired(new Runnable() { |
| 191 |
public void run() { |
200 |
public void run() { |
| 192 |
list.addAll(1, Arrays.asList(new Object[] { element })); |
201 |
list.addAll(1, Collections.singletonList(element1)); |
| 193 |
} |
202 |
} |
| 194 |
}, "List.addAll(int, Collection)", list, element, 1); |
203 |
}, "List.addAll(int, Collection)", list, Arrays.asList(new Object[] { |
|
|
204 |
element0, element1 })); |
| 195 |
} |
205 |
} |
| 196 |
|
206 |
|
| 197 |
public void testSet_ChangeEvent() throws Exception { |
207 |
public void testSet_ChangeEvent() throws Exception { |
|
Lines 205-263
Link Here
|
| 205 |
} |
215 |
} |
| 206 |
|
216 |
|
| 207 |
public void testSet_ListChangeEvent() throws Exception { |
217 |
public void testSet_ListChangeEvent() throws Exception { |
| 208 |
list.add(delegate.createElement(list)); |
218 |
final Object element0 = delegate.createElement(list); |
|
|
219 |
list.add(element0); |
| 220 |
final Object element1 = delegate.createElement(list); |
| 209 |
|
221 |
|
| 210 |
assertListChangeEventFired(new Runnable() { |
222 |
assertListChangeEventFired(new Runnable() { |
| 211 |
public void run() { |
223 |
public void run() { |
| 212 |
list.set(0, delegate.createElement(list)); |
224 |
assertSame(element0, list.set(0, element1)); |
| 213 |
} |
225 |
} |
| 214 |
}, "List.set(int, Object)", list); |
226 |
}, "List.set(int, Object)", list, Arrays |
|
|
227 |
.asList(new Object[] { element1 })); |
| 215 |
} |
228 |
} |
| 216 |
|
229 |
|
| 217 |
public void testSet_ChangeEventFiredAfterElementIsSet() throws Exception { |
230 |
public void testSet_ChangeEventFiredAfterElementIsSet() throws Exception { |
| 218 |
Object element1 = delegate.createElement(list); |
231 |
final Object element1 = delegate.createElement(list); |
| 219 |
list.add(element1); |
232 |
list.add(element1); |
| 220 |
final Object element2 = delegate.createElement(list); |
233 |
final Object element2 = delegate.createElement(list); |
| 221 |
|
234 |
|
| 222 |
assertContainsDuringChangeEvent(new Runnable() { |
235 |
assertContainsDuringChangeEvent(new Runnable() { |
| 223 |
public void run() { |
236 |
public void run() { |
| 224 |
list.set(0, element2); |
237 |
assertSame(element1, list.set(0, element2)); |
| 225 |
} |
238 |
} |
| 226 |
}, "List.set(int, Object)", list, element2); |
239 |
}, "List.set(int, Object)", list, element2); |
| 227 |
} |
240 |
} |
| 228 |
|
241 |
|
| 229 |
public void testSet_ListDiffEntry() throws Exception { |
242 |
public void testSet_ListChangeEvent2() throws Exception { |
| 230 |
list.add(delegate.createElement(list)); |
243 |
Object element0 = delegate.createElement(list); |
| 231 |
Object oldElement = delegate.createElement(list); |
244 |
list.add(element0); |
| 232 |
list.add(oldElement); |
245 |
Object oldElement1 = delegate.createElement(list); |
| 233 |
|
246 |
list.add(oldElement1); |
| 234 |
ListChangeEventTracker listener = ListChangeEventTracker.observe(list); |
247 |
final Object newElement1 = delegate.createElement(list); |
| 235 |
|
|
|
| 236 |
Object newElement = delegate.createElement(list); |
| 237 |
list.set(1, newElement); |
| 238 |
|
| 239 |
ListDiffEntry[] entries = listener.event.diff.getDifferences(); |
| 240 |
assertEquals( |
| 241 |
"List.set(int, Object) should result in 2 list diff entries.", |
| 242 |
2, entries.length); |
| 243 |
|
| 244 |
ListDiffEntry remove = entries[0]; |
| 245 |
assertFalse(remove.isAddition()); |
| 246 |
assertEquals( |
| 247 |
"List.set(int, Object) removed element should be the old element.", |
| 248 |
oldElement, remove.getElement()); |
| 249 |
assertEquals( |
| 250 |
"List.set(int, Object) removed index should be the index the new element was set at.", |
| 251 |
1, remove.getPosition()); |
| 252 |
|
248 |
|
| 253 |
ListDiffEntry add = entries[1]; |
249 |
assertListChangeEventFired(new Runnable() { |
| 254 |
assertTrue(add.isAddition()); |
250 |
public void run() { |
| 255 |
assertEquals( |
251 |
list.set(1, newElement1); |
| 256 |
"List.set(int, Object) added element should be the set element.", |
252 |
} |
| 257 |
newElement, add.getElement()); |
253 |
}, "List.set(int, Object)", list, Arrays.asList(new Object[] { |
| 258 |
assertEquals( |
254 |
element0, newElement1 })); |
| 259 |
"List.set(int, Object) add index should be the index the new element was set at.", |
|
|
| 260 |
1, add.getPosition()); |
| 261 |
} |
255 |
} |
| 262 |
|
256 |
|
| 263 |
public void testMove_ChangeEvent() throws Exception { |
257 |
public void testMove_ChangeEvent() throws Exception { |
|
Lines 289-304
Link Here
|
| 289 |
} |
283 |
} |
| 290 |
|
284 |
|
| 291 |
public void testMove_ListChangeEvent() throws Exception { |
285 |
public void testMove_ListChangeEvent() throws Exception { |
| 292 |
final Object element = delegate.createElement(list); |
286 |
final Object element0 = delegate.createElement(list); |
| 293 |
list.add(element); |
287 |
list.add(element0); |
| 294 |
list.add(delegate.createElement(list)); |
288 |
final Object element1 = delegate.createElement(list); |
|
|
289 |
list.add(element1); |
| 295 |
|
290 |
|
| 296 |
assertListChangeEventFired(new Runnable() { |
291 |
assertListChangeEventFired(new Runnable() { |
| 297 |
public void run() { |
292 |
public void run() { |
| 298 |
Object movedElement = list.move(0, 1); |
293 |
assertSame(element0, list.move(0, 1)); |
| 299 |
assertEquals(element, movedElement); |
|
|
| 300 |
} |
294 |
} |
| 301 |
}, "IObservableList.move(int, int)", list); |
295 |
}, "IObservableList.move(int, int)", list, Arrays.asList(new Object[] { |
|
|
296 |
element1, element0 })); |
| 302 |
} |
297 |
} |
| 303 |
|
298 |
|
| 304 |
public void testMove_ChangeEventFiredAfterElementIsMoved() throws Exception { |
299 |
public void testMove_ChangeEventFiredAfterElementIsMoved() throws Exception { |
|
Lines 316-357
Link Here
|
| 316 |
assertSame(element0, list.get(1)); |
311 |
assertSame(element0, list.get(1)); |
| 317 |
} |
312 |
} |
| 318 |
|
313 |
|
| 319 |
public void testMove_ListDiffEntry() { |
314 |
public void testMove_ListChangeEvent2() { |
| 320 |
Object element = delegate.createElement(list); |
315 |
Object element0 = delegate.createElement(list); |
| 321 |
list.add(element); |
316 |
list.add(element0); |
| 322 |
list.add(delegate.createElement(list)); |
317 |
Object element1 = delegate.createElement(list); |
| 323 |
|
318 |
list.add(element1); |
| 324 |
ListChangeEventTracker listener = ListChangeEventTracker.observe(list); |
|
|
| 325 |
|
| 326 |
list.move(0, 1); |
| 327 |
|
| 328 |
ListDiffEntry[] entries = listener.event.diff.getDifferences(); |
| 329 |
assertEquals( |
| 330 |
"List.set(int, Object) should result in 2 list diff entries.", |
| 331 |
2, entries.length); |
| 332 |
|
| 333 |
ListDiffEntry remove = entries[0]; |
| 334 |
ListDiffEntry add = entries[1]; |
| 335 |
assertFalse( |
| 336 |
"IObservableList.move(int, int) removed element should be first in list diff", |
| 337 |
remove.isAddition()); |
| 338 |
assertTrue( |
| 339 |
"IObservableList.move(int, int) added element should be second in list diff", |
| 340 |
add.isAddition()); |
| 341 |
|
| 342 |
assertEquals( |
| 343 |
"IObservableList.move(int, int) remove entry contains incorrect element", |
| 344 |
element, remove.getElement()); |
| 345 |
assertEquals( |
| 346 |
"IObservableList.move(int, int) add entry contains incorrect element", |
| 347 |
element, add.getElement()); |
| 348 |
|
319 |
|
| 349 |
assertEquals( |
320 |
assertListChangeEventFired(new Runnable() { |
| 350 |
"IObservableList.move(int, int) remove entry should be the old element index", |
321 |
public void run() { |
| 351 |
0, remove.getPosition()); |
322 |
list.move(0, 1); |
| 352 |
assertEquals( |
323 |
} |
| 353 |
"IObservableList.move(int, int) add entry should be the new element index", |
324 |
}, "IObservableList.move(int, int)", list, Arrays.asList(new Object[] { |
| 354 |
1, add.getPosition()); |
325 |
element1, element0 })); |
| 355 |
} |
326 |
} |
| 356 |
|
327 |
|
| 357 |
public void testRemove_ListChangeEvent() throws Exception { |
328 |
public void testRemove_ListChangeEvent() throws Exception { |
|
Lines 362-380
Link Here
|
| 362 |
public void run() { |
333 |
public void run() { |
| 363 |
list.remove(element); |
334 |
list.remove(element); |
| 364 |
} |
335 |
} |
| 365 |
}, "List.remove(Object)", list); |
336 |
}, "List.remove(Object)", list, Collections.EMPTY_LIST); |
| 366 |
} |
337 |
} |
| 367 |
|
338 |
|
| 368 |
public void testRemove_ListDiffEntry() throws Exception { |
339 |
public void testRemove_ListDiffEntry() throws Exception { |
| 369 |
list.add(delegate.createElement(list)); |
340 |
final Object element0 = delegate.createElement(list); |
| 370 |
final Object element = delegate.createElement(list); |
341 |
list.add(element0); |
| 371 |
list.add(element); |
342 |
final Object element1 = delegate.createElement(list); |
|
|
343 |
list.add(element1); |
| 372 |
|
344 |
|
| 373 |
assertRemoveDiffEntry(new Runnable() { |
345 |
assertListChangeEventFired(new Runnable() { |
| 374 |
public void run() { |
346 |
public void run() { |
| 375 |
list.remove(element); |
347 |
list.remove(element1); |
| 376 |
} |
348 |
} |
| 377 |
}, "List.remove(Object)", list, element, 1); |
349 |
}, "List.remove(Object)", list, Collections.singletonList(element0)); |
| 378 |
} |
350 |
} |
| 379 |
|
351 |
|
| 380 |
public void testRemoveAtIndex_ChangeEvent() throws Exception { |
352 |
public void testRemoveAtIndex_ChangeEvent() throws Exception { |
|
Lines 394-400
Link Here
|
| 394 |
public void run() { |
366 |
public void run() { |
| 395 |
list.remove(0); |
367 |
list.remove(0); |
| 396 |
} |
368 |
} |
| 397 |
}, "List.remove(int)", list); |
369 |
}, "List.remove(int)", list, Collections.EMPTY_LIST); |
| 398 |
} |
370 |
} |
| 399 |
|
371 |
|
| 400 |
public void testRemoveAtIndex_ChangeEventFiredAfterElementIsRemoved() |
372 |
public void testRemoveAtIndex_ChangeEventFiredAfterElementIsRemoved() |
|
Lines 410-424
Link Here
|
| 410 |
} |
382 |
} |
| 411 |
|
383 |
|
| 412 |
public void testRemoveAtIndex_ListDiffEntry() throws Exception { |
384 |
public void testRemoveAtIndex_ListDiffEntry() throws Exception { |
| 413 |
list.add(delegate.createElement(list)); |
385 |
Object element0 = delegate.createElement(list); |
| 414 |
Object element = delegate.createElement(list); |
386 |
list.add(element0); |
| 415 |
list.add(element); |
387 |
Object element1 = delegate.createElement(list); |
|
|
388 |
list.add(element1); |
| 416 |
|
389 |
|
| 417 |
assertRemoveDiffEntry(new Runnable() { |
390 |
assertListChangeEventFired(new Runnable() { |
| 418 |
public void run() { |
391 |
public void run() { |
| 419 |
list.remove(1); |
392 |
list.remove(1); |
| 420 |
} |
393 |
} |
| 421 |
}, "List.remove(int)", list, element, 1); |
394 |
}, "List.remove(int)", list, Collections.singletonList(element0)); |
| 422 |
} |
395 |
} |
| 423 |
|
396 |
|
| 424 |
public void testRemoveAll_ListChangeEvent() throws Exception { |
397 |
public void testRemoveAll_ListChangeEvent() throws Exception { |
|
Lines 427-483
Link Here
|
| 427 |
|
400 |
|
| 428 |
assertListChangeEventFired(new Runnable() { |
401 |
assertListChangeEventFired(new Runnable() { |
| 429 |
public void run() { |
402 |
public void run() { |
| 430 |
list.removeAll(Arrays.asList(new Object[] { element })); |
403 |
list.removeAll(Collections.singletonList(element)); |
| 431 |
} |
404 |
} |
| 432 |
}, "List.removeAll(Collection)", list); |
405 |
}, "List.removeAll(Collection)", list, Collections.EMPTY_LIST); |
| 433 |
} |
406 |
} |
| 434 |
|
407 |
|
| 435 |
public void testRemoveAll_ListDiffEntry() throws Exception { |
408 |
public void testRemoveAll_ListDiffEntry() throws Exception { |
| 436 |
final Object element = delegate.createElement(list); |
409 |
final Object element = delegate.createElement(list); |
| 437 |
list.add(element); |
410 |
list.add(element); |
| 438 |
|
411 |
|
| 439 |
assertRemoveDiffEntry(new Runnable() { |
412 |
assertListChangeEventFired(new Runnable() { |
| 440 |
public void run() { |
413 |
public void run() { |
| 441 |
list.removeAll(Arrays.asList(new Object[] { element })); |
414 |
list.removeAll(Collections.singletonList(element)); |
| 442 |
} |
415 |
} |
| 443 |
}, "List.removeAll(Collection)", list, element, 0); |
416 |
}, "List.removeAll(Collection)", list, Collections.EMPTY_LIST); |
| 444 |
} |
417 |
} |
| 445 |
|
418 |
|
| 446 |
public void testRemoveAll_ListDiffEntry2() throws Exception { |
419 |
public void testRemoveAll_ListDiffEntry2() throws Exception { |
| 447 |
list.add(delegate.createElement(list)); |
420 |
Object element0 = delegate.createElement(list); |
| 448 |
final Object element = delegate.createElement(list); |
421 |
list.add(element0); |
| 449 |
list.add(element); |
422 |
final Object element1 = delegate.createElement(list); |
|
|
423 |
list.add(element1); |
| 450 |
|
424 |
|
| 451 |
assertRemoveDiffEntry(new Runnable() { |
425 |
assertListChangeEventFired(new Runnable() { |
| 452 |
public void run() { |
426 |
public void run() { |
| 453 |
list.removeAll(Arrays.asList(new Object[] { element })); |
427 |
list.removeAll(Arrays.asList(new Object[] { element1 })); |
| 454 |
} |
428 |
} |
| 455 |
}, "List.removeAll(Collection)", list, element, 1); |
429 |
}, "List.removeAll(Collection)", list, Collections |
|
|
430 |
.singletonList(element0)); |
| 456 |
} |
431 |
} |
| 457 |
|
432 |
|
| 458 |
public void testRetainAll_ListChangeEvent() throws Exception { |
433 |
public void testRetainAll_ListChangeEvent() throws Exception { |
| 459 |
final Object element1 = delegate.createElement(list); |
434 |
final Object element0 = delegate.createElement(list); |
| 460 |
list.add(element1); |
435 |
list.add(element0); |
| 461 |
list.add(delegate.createElement(list)); |
436 |
list.add(delegate.createElement(list)); |
| 462 |
|
437 |
|
| 463 |
assertListChangeEventFired(new Runnable() { |
438 |
assertListChangeEventFired(new Runnable() { |
| 464 |
public void run() { |
439 |
public void run() { |
| 465 |
list.retainAll(Arrays.asList(new Object[] { element1 })); |
440 |
list.retainAll(Arrays.asList(new Object[] { element0 })); |
| 466 |
} |
441 |
} |
| 467 |
}, "List.retainAll(Collection", list); |
442 |
}, "List.retainAll(Collection", list, Collections |
|
|
443 |
.singletonList(element0)); |
| 468 |
} |
444 |
} |
| 469 |
|
445 |
|
| 470 |
public void testRetainAll_ListDiffEntry() throws Exception { |
446 |
public void testRetainAll_ListDiffEntry() throws Exception { |
| 471 |
final Object element1 = delegate.createElement(list); |
447 |
final Object element = delegate.createElement(list); |
| 472 |
list.add(element1); |
448 |
list.add(element); |
| 473 |
Object element2 = delegate.createElement(list); |
449 |
list.add(delegate.createElement(list)); |
| 474 |
list.add(element2); |
|
|
| 475 |
|
450 |
|
| 476 |
assertRemoveDiffEntry(new Runnable() { |
451 |
assertListChangeEventFired(new Runnable() { |
| 477 |
public void run() { |
452 |
public void run() { |
| 478 |
list.retainAll(Arrays.asList(new Object[] { element1 })); |
453 |
list.retainAll(Arrays.asList(new Object[] { element })); |
| 479 |
} |
454 |
} |
| 480 |
}, "List.retainAll(Collection)", list, element2, 1); |
455 |
}, "List.retainAll(Collection)", list, Collections |
|
|
456 |
.singletonList(element)); |
| 481 |
} |
457 |
} |
| 482 |
|
458 |
|
| 483 |
public void testClear_ListChangeEvent() throws Exception { |
459 |
public void testClear_ListChangeEvent() throws Exception { |
|
Lines 487-504
Link Here
|
| 487 |
public void run() { |
463 |
public void run() { |
| 488 |
list.clear(); |
464 |
list.clear(); |
| 489 |
} |
465 |
} |
| 490 |
}, "List.clear()", list); |
466 |
}, "List.clear()", list, Collections.EMPTY_LIST); |
| 491 |
} |
467 |
} |
| 492 |
|
468 |
|
| 493 |
public void testClear_ListDiffEntry() throws Exception { |
469 |
public void testClear_ListDiffEntry() throws Exception { |
| 494 |
Object element = delegate.createElement(list); |
470 |
list.add(delegate.createElement(list)); |
| 495 |
list.add(element); |
|
|
| 496 |
|
471 |
|
| 497 |
assertRemoveDiffEntry(new Runnable() { |
472 |
assertListChangeEventFired(new Runnable() { |
| 498 |
public void run() { |
473 |
public void run() { |
| 499 |
list.clear(); |
474 |
list.clear(); |
| 500 |
} |
475 |
} |
| 501 |
}, "List.clear()", list, element, 0); |
476 |
}, "List.clear()", list, Collections.EMPTY_LIST); |
| 502 |
} |
477 |
} |
| 503 |
|
478 |
|
| 504 |
public void testClear_ClearsList() { |
479 |
public void testClear_ClearsList() { |
|
Lines 509-528
Link Here
|
| 509 |
Assert.assertEquals(Collections.EMPTY_LIST, list); |
484 |
Assert.assertEquals(Collections.EMPTY_LIST, list); |
| 510 |
} |
485 |
} |
| 511 |
|
486 |
|
| 512 |
/** |
|
|
| 513 |
* Asserts standard behaviors of firing list change events. |
| 514 |
* <ul> |
| 515 |
* <li>Event fires once.</li> |
| 516 |
* <li>Source of the event is the provided <code>list</code>. |
| 517 |
* <li>The list change event is fired after the change event.</li> |
| 518 |
* </ul> |
| 519 |
* |
| 520 |
* @param runnable |
| 521 |
* @param methodName |
| 522 |
* @param list |
| 523 |
*/ |
| 524 |
private void assertListChangeEventFired(Runnable runnable, |
487 |
private void assertListChangeEventFired(Runnable runnable, |
| 525 |
String methodName, IObservableList list) { |
488 |
String methodName, IObservableList list, List newList) { |
|
|
489 |
List oldList = new ArrayList(list); |
| 490 |
|
| 526 |
List queue = new ArrayList(); |
491 |
List queue = new ArrayList(); |
| 527 |
ListChangeEventTracker listListener = new ListChangeEventTracker(queue); |
492 |
ListChangeEventTracker listListener = new ListChangeEventTracker(queue); |
| 528 |
ChangeEventTracker changeListener = new ChangeEventTracker(queue); |
493 |
ChangeEventTracker changeListener = new ChangeEventTracker(queue); |
|
Lines 546-617
Link Here
|
| 546 |
assertEquals("ListChangeEvent of " + methodName |
511 |
assertEquals("ListChangeEvent of " + methodName |
| 547 |
+ " should have fired after the ChangeEvent.", listListener, |
512 |
+ " should have fired after the ChangeEvent.", listListener, |
| 548 |
queue.get(1)); |
513 |
queue.get(1)); |
| 549 |
} |
|
|
| 550 |
|
| 551 |
/** |
| 552 |
* Asserts the list diff entry for a remove operation. |
| 553 |
* |
| 554 |
* @param runnable |
| 555 |
* @param methodName |
| 556 |
* @param list |
| 557 |
* @param element |
| 558 |
* @param index |
| 559 |
*/ |
| 560 |
private void assertRemoveDiffEntry(Runnable runnable, String methodName, |
| 561 |
IObservableList list, Object element, int index) { |
| 562 |
ListChangeEventTracker listener = new ListChangeEventTracker(); |
| 563 |
list.addListChangeListener(listener); |
| 564 |
|
514 |
|
| 565 |
runnable.run(); |
515 |
assertEquals(formatFail(methodName |
|
|
516 |
+ " did not leave observable list with the expected contents"), |
| 517 |
newList, list); |
| 566 |
|
518 |
|
| 567 |
ListDiffEntry[] entries = listener.event.diff.getDifferences(); |
519 |
ListDiff diff = listListener.event.diff; |
| 568 |
assertEquals(methodName + " should result in one diff entry.", 1, |
520 |
diff.applyTo(oldList); |
| 569 |
entries.length); |
|
|
| 570 |
|
| 571 |
ListDiffEntry entry = entries[0]; |
| 572 |
assertFalse(methodName |
| 573 |
+ " should result in a diff entry that is an removal.", entry |
| 574 |
.isAddition()); |
| 575 |
assertEquals(methodName |
| 576 |
+ " remove diff entry should have removed the element.", |
| 577 |
element, entry.getElement()); |
| 578 |
assertEquals( |
521 |
assertEquals( |
| 579 |
methodName |
522 |
formatFail(methodName |
| 580 |
+ " remove diff entry should have removed the element from the provided index.", |
523 |
+ " fired a diff which does not represent the expected list change"), |
| 581 |
index, entry.getPosition()); |
524 |
newList, oldList); |
| 582 |
} |
|
|
| 583 |
|
525 |
|
| 584 |
/** |
|
|
| 585 |
* Asserts the list diff entry for an add operation. |
| 586 |
* |
| 587 |
* @param runnable |
| 588 |
* @param methodName |
| 589 |
* @param list |
| 590 |
* @param element |
| 591 |
* @param index |
| 592 |
*/ |
| 593 |
private void assertAddDiffEntry(Runnable runnable, String methodName, |
| 594 |
IObservableList list, Object element, int index) { |
| 595 |
ListChangeEventTracker listener = new ListChangeEventTracker(); |
| 596 |
list.addListChangeListener(listener); |
| 597 |
|
| 598 |
runnable.run(); |
| 599 |
|
| 600 |
ListDiffEntry[] entries = listener.event.diff.getDifferences(); |
| 601 |
assertEquals(methodName + " should result in one diff entry.", 1, |
| 602 |
entries.length); |
| 603 |
|
| 604 |
ListDiffEntry entry = entries[0]; |
| 605 |
assertTrue(methodName |
| 606 |
+ " should result in a diff entry that is an addition.", entry |
| 607 |
.isAddition()); |
| 608 |
assertEquals(methodName |
| 609 |
+ " add diff entry should have added the element.", element, |
| 610 |
entry.getElement()); |
| 611 |
assertEquals( |
| 612 |
methodName |
| 613 |
+ "add diff entry should have added the element at the provided index.", |
| 614 |
index, entry.getPosition()); |
| 615 |
} |
526 |
} |
| 616 |
|
527 |
|
| 617 |
public static Test suite(IObservableCollectionContractDelegate delegate) { |
528 |
public static Test suite(IObservableCollectionContractDelegate delegate) { |