| |
@@ -18,6 +18,9 @@ |
| 18 |
18 |
|
private TS m3rd = new TS( "3rd" ); |
| 19 |
19 |
|
private TS m4th = new TS( "4th" ); |
| 20 |
20 |
|
private TS m5th = new TS( "5th" ); |
| |
21 |
+ |
private TS m6th = new TS( "6th" ); |
| |
22 |
+ |
private TS m7th = new TS( "7th" ); |
| |
23 |
+ |
private TS m8th = new TS( "8th" ); |
| 21 |
24 |
|
|
| 22 |
25 |
|
private Top<TS> mTop1st = Top.create( m1st ); |
| 23 |
26 |
|
|
| |
@@ -26,11 +29,17 @@ |
| 26 |
29 |
|
private Reference<TS> m3rdReference = Reference.create( 2, m3rd ); |
| 27 |
30 |
|
private Reference<TS> m4thReference = Reference.create( 2, m4th ); |
| 28 |
31 |
|
private Reference<TS> m5thReference = Reference.create( 2, m5th ); |
| |
32 |
+ |
private Reference<TS> m6thReference = Reference.create( 2, m6th ); |
| |
33 |
+ |
private Reference<TS> m7thReference = Reference.create( 2, m7th ); |
| |
34 |
+ |
private Reference<TS> m8thReference = Reference.create( 2, m8th ); |
| 29 |
35 |
|
|
| 30 |
36 |
|
private There<TS> m1stThere2nd = There.create( m1st, m2nd ); |
| 31 |
37 |
|
private There<TS> m2ndThere3rd = There.create( m2nd, m3rd ); |
| 32 |
38 |
|
private There<TS> m3rdThere4th = There.create( m3rd, m4th ); |
| 33 |
39 |
|
private There<TS> m4thThere5th = There.create( m4th, m5th ); |
| |
40 |
+ |
private There<TS> m5thThere6th = There.create( m5th, m6th ); |
| |
41 |
+ |
private There<TS> m6thThere7th = There.create( m6th, m7th ); |
| |
42 |
+ |
private There<TS> m7thThere8th = There.create( m7th, m8th ); |
| 34 |
43 |
|
|
| 35 |
44 |
|
public static TestSuite suite() |
| 36 |
45 |
|
{ |
| |
@@ -264,28 +273,66 @@ |
| 264 |
273 |
|
); |
| 265 |
274 |
|
assertSelectedBetweens( zSelectedBetweens, zBetweenSelected1st3rd ); |
| 266 |
275 |
|
|
| 267 |
|
- |
// zController = new InjectionPointSelectorController<TS>( 2, null, m1st, m2nd, m3rd, m4th ); |
| 268 |
|
- |
// |
| 269 |
|
- |
// assertEquals( zController.updateDrillDownSetWhenSelectedBetweensChange( 5, zSelectedBetweens ), // |
| 270 |
|
- |
// new ViewSet( mTop1st, // |
| 271 |
|
- |
// m1stReference, // |
| 272 |
|
- |
// Between.create( false, m1st, m4th ), // |
| 273 |
|
- |
// m4thReference, // |
| 274 |
|
- |
// Bottom.create( m4th ) ) // |
| 275 |
|
- |
// ); |
| 276 |
|
- |
// assertSelectedBetweens( zSelectedBetweens ); |
| 277 |
|
- |
// |
| 278 |
|
- |
// assertEquals( zController.updateDrillDownSetWhenSelectedBetweensChange( 7, zSelectedBetweens ), // |
| 279 |
|
- |
// new ViewSet( mTop1st, // |
| 280 |
|
- |
// m1stReference, // |
| 281 |
|
- |
// m1stThere2nd, // |
| 282 |
|
- |
// m2ndReference, // |
| 283 |
|
- |
// Between.create( false, m2nd, m4th ), // |
| 284 |
|
- |
// m4thReference, // |
| 285 |
|
- |
// Bottom.create( m4th ) ) // |
| 286 |
|
- |
// ); |
| 287 |
|
- |
// assertSelectedBetweens( zSelectedBetweens ); |
| 288 |
|
- |
// |
| |
276 |
+ |
zController = new InjectionPointSelectorController<TS>( 2, null, m1st, m2nd, m3rd, m4th, m5th, m6th, m7th, m8th ); |
| |
277 |
+ |
|
| |
278 |
+ |
zSelectedBetweens.clear(); |
| |
279 |
+ |
|
| |
280 |
+ |
assertEquals( zController.updateDrillDownSetWhenSelectedBetweensChange( 7, zSelectedBetweens ), // |
| |
281 |
+ |
new ViewSet( mTop1st, // |
| |
282 |
+ |
m1stReference, // |
| |
283 |
+ |
Between.create( false, m1st, m4th ), // |
| |
284 |
+ |
m4thReference, // |
| |
285 |
+ |
Between.create( false, m4th, m8th ), // |
| |
286 |
+ |
m8thReference, // |
| |
287 |
+ |
Bottom.create( m8th ) ) // |
| |
288 |
+ |
); |
| |
289 |
+ |
assertSelectedBetweens( zSelectedBetweens ); |
| |
290 |
+ |
|
| |
291 |
+ |
Between<TS> zBetweenSelected4th8th = Between.create( true, m4th, m8th ); |
| |
292 |
+ |
zSelectedBetweens.add( zBetweenSelected4th8th ); |
| |
293 |
+ |
assertEquals( zController.updateDrillDownSetWhenSelectedBetweensChange( 7, zSelectedBetweens ), // |
| |
294 |
+ |
new ViewSet( mTop1st, // Home Set |
| |
295 |
+ |
m1stReference, // |
| |
296 |
+ |
Between.create( false, m1st, m4th ), // |
| |
297 |
+ |
m4thReference, // |
| |
298 |
+ |
zBetweenSelected4th8th, // |
| |
299 |
+ |
m8thReference, // |
| |
300 |
+ |
Bottom.create( m8th ) ), // |
| |
301 |
+ |
new ViewSet( m4thReference, // Current Set |
| |
302 |
+ |
m4thThere5th, // |
| |
303 |
+ |
m5thReference, // |
| |
304 |
+ |
m5thThere6th, // |
| |
305 |
+ |
m6thReference, // |
| |
306 |
+ |
Between.create( false, m6th, m8th ), // |
| |
307 |
+ |
m8thReference ) // |
| |
308 |
+ |
); |
| |
309 |
+ |
assertSelectedBetweens( zSelectedBetweens, zBetweenSelected4th8th ); |
| |
310 |
+ |
|
| |
311 |
+ |
Between<TS> zBetweenSelected6th8th = Between.create( true, m6th, m8th ); |
| |
312 |
+ |
zSelectedBetweens.add( zBetweenSelected6th8th ); |
| |
313 |
+ |
assertEquals( zController.updateDrillDownSetWhenSelectedBetweensChange( 7, zSelectedBetweens ), // |
| |
314 |
+ |
new ViewSet( mTop1st, // Home Set |
| |
315 |
+ |
m1stReference, // |
| |
316 |
+ |
Between.create( false, m1st, m4th ), // |
| |
317 |
+ |
m4thReference, // |
| |
318 |
+ |
zBetweenSelected4th8th, // |
| |
319 |
+ |
m8thReference, // |
| |
320 |
+ |
Bottom.create( m8th ) ), // |
| |
321 |
+ |
new ViewSet( m4thReference, // Previous Set |
| |
322 |
+ |
m4thThere5th, // |
| |
323 |
+ |
m5thReference, // |
| |
324 |
+ |
m5thThere6th, // |
| |
325 |
+ |
m6thReference, // |
| |
326 |
+ |
zBetweenSelected6th8th, // |
| |
327 |
+ |
m8thReference ), // |
| |
328 |
+ |
new ViewSet( m6thReference, // Current Set |
| |
329 |
+ |
m6thThere7th, // |
| |
330 |
+ |
m7thReference, // |
| |
331 |
+ |
m7thThere8th, // |
| |
332 |
+ |
m8thReference ) // |
| |
333 |
+ |
); |
| |
334 |
+ |
assertSelectedBetweens( zSelectedBetweens, zBetweenSelected4th8th, zBetweenSelected6th8th ); |
| |
335 |
+ |
|
| 289 |
336 |
|
// zController = new InjectionPointSelectorController<TS>( 2, null, m1st, m2nd, m3rd, m4th, m5th ); |
| 290 |
337 |
|
// assertEquals( zController.updateDrillDownSetWhenSelectedBetweensChange( 5, zSelectedBetweens ), // |
| 291 |
338 |
|
// new ViewSet( mTop1st, // |
View this file contents
View the full history
Commits for