Changeset 1846 for trunk/autoquest-core-tasktrees-test/src/test/java/de/ugoe/cs/autoquest/tasktrees/temporalrelation/TaskSymbolBucketedMapTest.java
- Timestamp:
- 12/23/14 10:55:46 (10 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/autoquest-core-tasktrees-test/src/test/java/de/ugoe/cs/autoquest/tasktrees/temporalrelation/TaskSymbolBucketedMapTest.java
r1294 r1846 34 34 import de.ugoe.cs.autoquest.tasktrees.treeifc.ITask; 35 35 import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskFactory; 36 import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskInstance;37 36 import de.ugoe.cs.autoquest.tasktrees.treeimpl.TaskFactory; 38 37 import de.ugoe.cs.autoquest.test.DummyGUIElement; … … 63 62 @Test 64 63 public void testSymbolMap_1() { 65 SymbolMap<ITask Instance, String> symbolMap = new TaskSymbolBucketedMap<String>66 (new Task InstanceComparator(TaskEquality.SEMANTICALLY_EQUAL));64 SymbolMap<ITask, String> symbolMap = new TaskSymbolBucketedMap<String> 65 (new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 67 66 68 67 assertNotNull(symbolMap); … … 73 72 public void testSymbolMap_2() { 74 73 TaskSymbolBucketedMap<String> symbolMap1 = new TaskSymbolBucketedMap<String> 75 (new Task InstanceComparator(TaskEquality.SEMANTICALLY_EQUAL));76 77 ITask Instance taskInstance = createTaskInstance("symbol");78 symbolMap1.addSymbol(task Instance, "value");79 80 SymbolMap<ITask Instance, String> symbolMap2 = new TaskSymbolBucketedMap<String>(symbolMap1);74 (new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 75 76 ITask task = createTask("symbol"); 77 symbolMap1.addSymbol(task, "value"); 78 79 SymbolMap<ITask, String> symbolMap2 = new TaskSymbolBucketedMap<String>(symbolMap1); 81 80 82 81 assertNotNull(symbolMap2); 83 assertSymbolMapEntries(symbolMap2, new ITask Instance[] { taskInstance},82 assertSymbolMapEntries(symbolMap2, new ITask[] { task }, 84 83 new String[] { "value" }); 85 84 } … … 92 91 @Test 93 92 public void testAddSymbol_1() { 94 SymbolMap<ITask Instance, String> symbolMap = new TaskSymbolBucketedMap<String>95 (new Task InstanceComparator(TaskEquality.SEMANTICALLY_EQUAL));96 97 ITask Instance taskInstance = createTaskInstance("symbol");98 symbolMap.addSymbol(task Instance, "value1");93 SymbolMap<ITask, String> symbolMap = new TaskSymbolBucketedMap<String> 94 (new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 95 96 ITask task = createTask("symbol"); 97 symbolMap.addSymbol(task, "value1"); 99 98 100 99 assertNotNull(symbolMap); 101 assertSymbolMapEntries(symbolMap, new ITask Instance[] { taskInstance},100 assertSymbolMapEntries(symbolMap, new ITask[] { task }, 102 101 new String[] { "value1" }); 103 102 } … … 105 104 @Test 106 105 public void testAddSymbol_2() { 107 SymbolMap<ITask Instance, String> symbolMap = new TaskSymbolBucketedMap<String>108 (new Task InstanceComparator(TaskEquality.SEMANTICALLY_EQUAL));109 110 int entryCount = 2000; 111 112 ITask Instance[] symbols = new ITaskInstance[entryCount];106 SymbolMap<ITask, String> symbolMap = new TaskSymbolBucketedMap<String> 107 (new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 108 109 int entryCount = 2000; 110 111 ITask[] symbols = new ITask[entryCount]; 113 112 String[] values = new String[entryCount]; 114 113 115 114 for (int i = 0; i < entryCount; i++) { 116 symbols[i] = createTask Instance("symbol" + i);115 symbols[i] = createTask("symbol" + i); 117 116 symbolMap.addSymbol(symbols[i], "value" + i); 118 117 values[i] = "value" + i; … … 125 124 @Test 126 125 public void testAddSymbol_3() { 127 SymbolMap<ITask Instance, String> symbolMap = new TaskSymbolBucketedMap<String>128 (new Task InstanceComparator(TaskEquality.SEMANTICALLY_EQUAL));129 130 int entryCount = 2000; 131 132 ITask Instance[] symbols = new ITaskInstance[entryCount];126 SymbolMap<ITask, String> symbolMap = new TaskSymbolBucketedMap<String> 127 (new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 128 129 int entryCount = 2000; 130 131 ITask[] symbols = new ITask[entryCount]; 133 132 String[] values = new String[entryCount]; 134 133 135 134 for (int i = 0; i < entryCount; i++) { 136 symbols[i] = createTask Instance("symbol" + i);135 symbols[i] = createTask("symbol" + i); 137 136 if (i % 7 == 0) { 138 137 values[i] = "value" + i; … … 151 150 @Test(expected = java.lang.IllegalArgumentException.class) 152 151 public void testAddSymbol_4() { 153 SymbolMap<ITask Instance, String> symbolMap = new TaskSymbolBucketedMap<String>154 (new Task InstanceComparator(TaskEquality.SEMANTICALLY_EQUAL));152 SymbolMap<ITask, String> symbolMap = new TaskSymbolBucketedMap<String> 153 (new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 155 154 156 155 symbolMap.addSymbol(null, null); … … 159 158 @Test 160 159 public void testSize_1() { 161 SymbolMap<ITask Instance, String> symbolMap = new TaskSymbolBucketedMap<String>162 (new Task InstanceComparator(TaskEquality.SEMANTICALLY_EQUAL));160 SymbolMap<ITask, String> symbolMap = new TaskSymbolBucketedMap<String> 161 (new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 163 162 164 163 assertEquals(0, symbolMap.size()); … … 167 166 @Test 168 167 public void testSize_2() { 169 SymbolMap<ITask Instance, String> symbolMap = new TaskSymbolBucketedMap<String>170 (new Task InstanceComparator(TaskEquality.SEMANTICALLY_EQUAL));171 172 symbolMap.addSymbol(createTask Instance("symbol1"), "value1");168 SymbolMap<ITask, String> symbolMap = new TaskSymbolBucketedMap<String> 169 (new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 170 171 symbolMap.addSymbol(createTask("symbol1"), "value1"); 173 172 174 173 assertEquals(1, symbolMap.size()); … … 177 176 @Test 178 177 public void testSize_3() { 179 SymbolMap<ITask Instance, String> symbolMap = new TaskSymbolBucketedMap<String>180 (new Task InstanceComparator(TaskEquality.SEMANTICALLY_EQUAL));181 182 int entryCount = 2000; 183 184 for (int i = 0; i < entryCount; i++) { 185 symbolMap.addSymbol(createTask Instance("symbol" + i), "value" + i);178 SymbolMap<ITask, String> symbolMap = new TaskSymbolBucketedMap<String> 179 (new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 180 181 int entryCount = 2000; 182 183 for (int i = 0; i < entryCount; i++) { 184 symbolMap.addSymbol(createTask("symbol" + i), "value" + i); 186 185 } 187 186 … … 191 190 @Test 192 191 public void testSize_4() { 193 SymbolMap<ITask Instance, String> symbolMap = new TaskSymbolBucketedMap<String>194 (new Task InstanceComparator(TaskEquality.SEMANTICALLY_EQUAL));195 196 int entryCount = 2000; 197 198 for (int i = 0; i < entryCount; i++) { 199 if (i % 7 == 0) { 200 symbolMap.addSymbol(createTask Instance("symbol" + i), "value" + i);201 } 202 else { 203 symbolMap.addSymbol(createTask Instance("symbol" + i), null);192 SymbolMap<ITask, String> symbolMap = new TaskSymbolBucketedMap<String> 193 (new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 194 195 int entryCount = 2000; 196 197 for (int i = 0; i < entryCount; i++) { 198 if (i % 7 == 0) { 199 symbolMap.addSymbol(createTask("symbol" + i), "value" + i); 200 } 201 else { 202 symbolMap.addSymbol(createTask("symbol" + i), null); 204 203 } 205 204 } … … 210 209 @Test 211 210 public void testSize_5() { 212 SymbolMap<ITask Instance, String> symbolMap = new TaskSymbolBucketedMap<String>213 (new Task InstanceComparator(TaskEquality.SEMANTICALLY_EQUAL));214 215 int entryCount = 2000; 216 217 for (int i = 0; i < entryCount; i++) { 218 symbolMap.addSymbol(createTask Instance("symbol" + i), "value" + i);219 } 220 221 for (int i = 150; i < (entryCount - 150); i++) { 222 symbolMap.removeSymbol(createTask Instance("symbol" + i));211 SymbolMap<ITask, String> symbolMap = new TaskSymbolBucketedMap<String> 212 (new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 213 214 int entryCount = 2000; 215 216 for (int i = 0; i < entryCount; i++) { 217 symbolMap.addSymbol(createTask("symbol" + i), "value" + i); 218 } 219 220 for (int i = 150; i < (entryCount - 150); i++) { 221 symbolMap.removeSymbol(createTask("symbol" + i)); 223 222 } 224 223 … … 228 227 @Test 229 228 public void testIsEmpty_1() { 230 SymbolMap<ITask Instance, String> symbolMap = new TaskSymbolBucketedMap<String>231 (new Task InstanceComparator(TaskEquality.SEMANTICALLY_EQUAL));229 SymbolMap<ITask, String> symbolMap = new TaskSymbolBucketedMap<String> 230 (new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 232 231 233 232 assertTrue(symbolMap.isEmpty()); … … 236 235 @Test 237 236 public void testIsEmpty_2() { 238 SymbolMap<ITask Instance, String> symbolMap = new TaskSymbolBucketedMap<String>239 (new Task InstanceComparator(TaskEquality.SEMANTICALLY_EQUAL));240 241 symbolMap.addSymbol(createTask Instance("symbol1"), "value1");237 SymbolMap<ITask, String> symbolMap = new TaskSymbolBucketedMap<String> 238 (new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 239 240 symbolMap.addSymbol(createTask("symbol1"), "value1"); 242 241 243 242 assertFalse(symbolMap.isEmpty()); … … 246 245 @Test 247 246 public void testIsEmpty_3() { 248 SymbolMap<ITask Instance, String> symbolMap = new TaskSymbolBucketedMap<String>249 (new Task InstanceComparator(TaskEquality.SEMANTICALLY_EQUAL));250 251 int entryCount = 2000; 252 253 for (int i = 0; i < entryCount; i++) { 254 symbolMap.addSymbol(createTask Instance("symbol" + i), "value" + i);247 SymbolMap<ITask, String> symbolMap = new TaskSymbolBucketedMap<String> 248 (new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 249 250 int entryCount = 2000; 251 252 for (int i = 0; i < entryCount; i++) { 253 symbolMap.addSymbol(createTask("symbol" + i), "value" + i); 255 254 } 256 255 … … 260 259 @Test 261 260 public void testIsEmpty_4() { 262 SymbolMap<ITask Instance, String> symbolMap = new TaskSymbolBucketedMap<String>263 (new Task InstanceComparator(TaskEquality.SEMANTICALLY_EQUAL));264 265 int entryCount = 2000; 266 267 for (int i = 0; i < entryCount; i++) { 268 if (i % 7 == 0) { 269 symbolMap.addSymbol(createTask Instance("symbol" + i), "value" + i);270 } 271 else { 272 symbolMap.addSymbol(createTask Instance("symbol" + i), null);261 SymbolMap<ITask, String> symbolMap = new TaskSymbolBucketedMap<String> 262 (new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 263 264 int entryCount = 2000; 265 266 for (int i = 0; i < entryCount; i++) { 267 if (i % 7 == 0) { 268 symbolMap.addSymbol(createTask("symbol" + i), "value" + i); 269 } 270 else { 271 symbolMap.addSymbol(createTask("symbol" + i), null); 273 272 } 274 273 } … … 279 278 @Test 280 279 public void testIsEmpty_5() { 281 SymbolMap<ITask Instance, String> symbolMap = new TaskSymbolBucketedMap<String>282 (new Task InstanceComparator(TaskEquality.SEMANTICALLY_EQUAL));283 284 int entryCount = 2000; 285 286 for (int i = 0; i < entryCount; i++) { 287 symbolMap.addSymbol(createTask Instance("symbol" + i), "value" + i);288 } 289 290 for (int i = 150; i < (entryCount - 150); i++) { 291 symbolMap.removeSymbol(createTask Instance("symbol" + i));280 SymbolMap<ITask, String> symbolMap = new TaskSymbolBucketedMap<String> 281 (new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 282 283 int entryCount = 2000; 284 285 for (int i = 0; i < entryCount; i++) { 286 symbolMap.addSymbol(createTask("symbol" + i), "value" + i); 287 } 288 289 for (int i = 150; i < (entryCount - 150); i++) { 290 symbolMap.removeSymbol(createTask("symbol" + i)); 292 291 } 293 292 … … 297 296 @Test 298 297 public void testContainsSymbol_1() { 299 SymbolMap<ITask Instance, String> symbolMap = new TaskSymbolBucketedMap<String>300 (new Task InstanceComparator(TaskEquality.SEMANTICALLY_EQUAL));301 302 assertFalse(symbolMap.containsSymbol(createTask Instance("symbol")));298 SymbolMap<ITask, String> symbolMap = new TaskSymbolBucketedMap<String> 299 (new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 300 301 assertFalse(symbolMap.containsSymbol(createTask("symbol"))); 303 302 } 304 303 305 304 @Test 306 305 public void testContainsSymbol_2() { 307 SymbolMap<ITask Instance, String> symbolMap = new TaskSymbolBucketedMap<String>308 (new Task InstanceComparator(TaskEquality.SEMANTICALLY_EQUAL));309 310 symbolMap.addSymbol(createTask Instance("symbol1"), "value1");311 312 assertTrue(symbolMap.containsSymbol(createTask Instance("symbol1")));306 SymbolMap<ITask, String> symbolMap = new TaskSymbolBucketedMap<String> 307 (new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 308 309 symbolMap.addSymbol(createTask("symbol1"), "value1"); 310 311 assertTrue(symbolMap.containsSymbol(createTask("symbol1"))); 313 312 } 314 313 315 314 @Test 316 315 public void testContainsSymbol_3() { 317 SymbolMap<ITask Instance, String> symbolMap = new TaskSymbolBucketedMap<String>318 (new Task InstanceComparator(TaskEquality.SEMANTICALLY_EQUAL));319 320 int entryCount = 2000; 321 322 for (int i = 0; i < entryCount; i++) { 323 symbolMap.addSymbol(createTask Instance("symbol" + i), "value" + i);324 } 325 326 for (int i = 0; i < entryCount; i++) { 327 assertTrue(symbolMap.containsSymbol(createTask Instance("symbol" + i)));316 SymbolMap<ITask, String> symbolMap = new TaskSymbolBucketedMap<String> 317 (new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 318 319 int entryCount = 2000; 320 321 for (int i = 0; i < entryCount; i++) { 322 symbolMap.addSymbol(createTask("symbol" + i), "value" + i); 323 } 324 325 for (int i = 0; i < entryCount; i++) { 326 assertTrue(symbolMap.containsSymbol(createTask("symbol" + i))); 328 327 } 329 328 } … … 331 330 @Test 332 331 public void testContainsSymbol_4() { 333 SymbolMap<ITask Instance, String> symbolMap = new TaskSymbolBucketedMap<String>334 (new Task InstanceComparator(TaskEquality.SEMANTICALLY_EQUAL));335 336 int entryCount = 2000; 337 338 for (int i = 0; i < entryCount; i++) { 339 if (i % 7 == 0) { 340 symbolMap.addSymbol(createTask Instance("symbol" + i), "value" + i);341 } 342 else { 343 symbolMap.addSymbol(createTask Instance("symbol" + i), null);344 } 345 } 346 347 for (int i = 0; i < entryCount; i++) { 348 assertTrue(symbolMap.containsSymbol(createTask Instance("symbol" + i)));332 SymbolMap<ITask, String> symbolMap = new TaskSymbolBucketedMap<String> 333 (new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 334 335 int entryCount = 2000; 336 337 for (int i = 0; i < entryCount; i++) { 338 if (i % 7 == 0) { 339 symbolMap.addSymbol(createTask("symbol" + i), "value" + i); 340 } 341 else { 342 symbolMap.addSymbol(createTask("symbol" + i), null); 343 } 344 } 345 346 for (int i = 0; i < entryCount; i++) { 347 assertTrue(symbolMap.containsSymbol(createTask("symbol" + i))); 349 348 } 350 349 } … … 352 351 @Test 353 352 public void testContainsSymbol_5() { 354 SymbolMap<ITask Instance, String> symbolMap = new TaskSymbolBucketedMap<String>355 (new Task InstanceComparator(TaskEquality.SEMANTICALLY_EQUAL));356 357 int entryCount = 2000; 358 359 for (int i = 0; i < entryCount; i++) { 360 symbolMap.addSymbol(createTask Instance("symbol" + i), "value" + i);361 } 362 363 for (int i = 150; i < (entryCount - 150); i++) { 364 symbolMap.removeSymbol(createTask Instance("symbol" + i));353 SymbolMap<ITask, String> symbolMap = new TaskSymbolBucketedMap<String> 354 (new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 355 356 int entryCount = 2000; 357 358 for (int i = 0; i < entryCount; i++) { 359 symbolMap.addSymbol(createTask("symbol" + i), "value" + i); 360 } 361 362 for (int i = 150; i < (entryCount - 150); i++) { 363 symbolMap.removeSymbol(createTask("symbol" + i)); 365 364 } 366 365 367 366 for (int i = 0; i < 150; i++) { 368 assertTrue(symbolMap.containsSymbol(createTask Instance("symbol" + i)));369 } 370 371 for (int i = 150; i < (entryCount - 150); i++) { 372 assertFalse(symbolMap.containsSymbol(createTask Instance("symbol" + i)));367 assertTrue(symbolMap.containsSymbol(createTask("symbol" + i))); 368 } 369 370 for (int i = 150; i < (entryCount - 150); i++) { 371 assertFalse(symbolMap.containsSymbol(createTask("symbol" + i))); 373 372 } 374 373 375 374 for (int i = (entryCount - 150); i < entryCount; i++) { 376 assertTrue(symbolMap.containsSymbol(createTask Instance("symbol" + i)));375 assertTrue(symbolMap.containsSymbol(createTask("symbol" + i))); 377 376 } 378 377 } … … 380 379 @Test(expected = java.lang.IllegalArgumentException.class) 381 380 public void testContainsSymbol_6() { 382 SymbolMap<ITask Instance, String> symbolMap = new TaskSymbolBucketedMap<String>383 (new Task InstanceComparator(TaskEquality.SEMANTICALLY_EQUAL));381 SymbolMap<ITask, String> symbolMap = new TaskSymbolBucketedMap<String> 382 (new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 384 383 385 384 symbolMap.containsSymbol(null); … … 388 387 @Test 389 388 public void testGetValue_1() { 390 SymbolMap<ITask Instance, String> symbolMap = new TaskSymbolBucketedMap<String>391 (new Task InstanceComparator(TaskEquality.SEMANTICALLY_EQUAL));392 393 assertNull(symbolMap.getValue(createTask Instance("symbol")));389 SymbolMap<ITask, String> symbolMap = new TaskSymbolBucketedMap<String> 390 (new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 391 392 assertNull(symbolMap.getValue(createTask("symbol"))); 394 393 } 395 394 396 395 @Test 397 396 public void testGetValue_2() { 398 SymbolMap<ITask Instance, String> symbolMap = new TaskSymbolBucketedMap<String>399 (new Task InstanceComparator(TaskEquality.SEMANTICALLY_EQUAL));400 401 symbolMap.addSymbol(createTask Instance("symbol1"), "value1");402 403 assertNotNull(symbolMap.getValue(createTask Instance("symbol1")));397 SymbolMap<ITask, String> symbolMap = new TaskSymbolBucketedMap<String> 398 (new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 399 400 symbolMap.addSymbol(createTask("symbol1"), "value1"); 401 402 assertNotNull(symbolMap.getValue(createTask("symbol1"))); 404 403 } 405 404 406 405 @Test 407 406 public void testGetValue_3() { 408 SymbolMap<ITask Instance, String> symbolMap = new TaskSymbolBucketedMap<String>409 (new Task InstanceComparator(TaskEquality.SEMANTICALLY_EQUAL));410 411 symbolMap.addSymbol(createTask Instance("symbol1"), null);412 413 assertNull(symbolMap.getValue(createTask Instance("symbol1")));407 SymbolMap<ITask, String> symbolMap = new TaskSymbolBucketedMap<String> 408 (new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 409 410 symbolMap.addSymbol(createTask("symbol1"), null); 411 412 assertNull(symbolMap.getValue(createTask("symbol1"))); 414 413 } 415 414 416 415 @Test 417 416 public void testGetValue_4() { 418 SymbolMap<ITask Instance, String> symbolMap = new TaskSymbolBucketedMap<String>419 (new Task InstanceComparator(TaskEquality.SEMANTICALLY_EQUAL));420 421 int entryCount = 2000; 422 423 for (int i = 0; i < entryCount; i++) { 424 symbolMap.addSymbol(createTask Instance("symbol" + i), "value" + i);425 } 426 427 for (int i = 0; i < entryCount; i++) { 428 assertNotNull(symbolMap.getValue(createTask Instance("symbol" + i)));417 SymbolMap<ITask, String> symbolMap = new TaskSymbolBucketedMap<String> 418 (new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 419 420 int entryCount = 2000; 421 422 for (int i = 0; i < entryCount; i++) { 423 symbolMap.addSymbol(createTask("symbol" + i), "value" + i); 424 } 425 426 for (int i = 0; i < entryCount; i++) { 427 assertNotNull(symbolMap.getValue(createTask("symbol" + i))); 429 428 } 430 429 } … … 432 431 @Test 433 432 public void testGetValue_5() { 434 SymbolMap<ITask Instance, String> symbolMap = new TaskSymbolBucketedMap<String>435 (new Task InstanceComparator(TaskEquality.SEMANTICALLY_EQUAL));436 437 int entryCount = 2000; 438 439 for (int i = 0; i < entryCount; i++) { 440 if (i % 7 == 0) { 441 symbolMap.addSymbol(createTask Instance("symbol" + i), "value" + i);442 } 443 else { 444 symbolMap.addSymbol(createTask Instance("symbol" + i), null);445 } 446 } 447 448 for (int i = 0; i < entryCount; i++) { 449 if (i % 7 == 0) { 450 assertNotNull(symbolMap.getValue(createTask Instance("symbol" + i)));451 } 452 else { 453 assertNull(symbolMap.getValue(createTask Instance("symbol" + i)));433 SymbolMap<ITask, String> symbolMap = new TaskSymbolBucketedMap<String> 434 (new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 435 436 int entryCount = 2000; 437 438 for (int i = 0; i < entryCount; i++) { 439 if (i % 7 == 0) { 440 symbolMap.addSymbol(createTask("symbol" + i), "value" + i); 441 } 442 else { 443 symbolMap.addSymbol(createTask("symbol" + i), null); 444 } 445 } 446 447 for (int i = 0; i < entryCount; i++) { 448 if (i % 7 == 0) { 449 assertNotNull(symbolMap.getValue(createTask("symbol" + i))); 450 } 451 else { 452 assertNull(symbolMap.getValue(createTask("symbol" + i))); 454 453 } 455 454 } … … 458 457 @Test 459 458 public void testGetValue_6() { 460 SymbolMap<ITask Instance, String> symbolMap = new TaskSymbolBucketedMap<String>461 (new Task InstanceComparator(TaskEquality.SEMANTICALLY_EQUAL));462 463 int entryCount = 2000; 464 465 for (int i = 0; i < entryCount; i++) { 466 symbolMap.addSymbol(createTask Instance("symbol" + i), "value" + i);467 } 468 469 for (int i = 150; i < (entryCount - 150); i++) { 470 symbolMap.removeSymbol(createTask Instance("symbol" + i));459 SymbolMap<ITask, String> symbolMap = new TaskSymbolBucketedMap<String> 460 (new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 461 462 int entryCount = 2000; 463 464 for (int i = 0; i < entryCount; i++) { 465 symbolMap.addSymbol(createTask("symbol" + i), "value" + i); 466 } 467 468 for (int i = 150; i < (entryCount - 150); i++) { 469 symbolMap.removeSymbol(createTask("symbol" + i)); 471 470 } 472 471 473 472 for (int i = 0; i < 150; i++) { 474 assertNotNull(symbolMap.getValue(createTask Instance("symbol" + i)));475 } 476 477 for (int i = 150; i < (entryCount - 150); i++) { 478 assertNull(symbolMap.getValue(createTask Instance("symbol" + i)));473 assertNotNull(symbolMap.getValue(createTask("symbol" + i))); 474 } 475 476 for (int i = 150; i < (entryCount - 150); i++) { 477 assertNull(symbolMap.getValue(createTask("symbol" + i))); 479 478 } 480 479 481 480 for (int i = (entryCount - 150); i < entryCount; i++) { 482 assertNotNull(symbolMap.getValue(createTask Instance("symbol" + i)));481 assertNotNull(symbolMap.getValue(createTask("symbol" + i))); 483 482 } 484 483 } … … 486 485 @Test(expected = java.lang.IllegalArgumentException.class) 487 486 public void testGetValue_7() { 488 SymbolMap<ITask Instance, String> symbolMap = new TaskSymbolBucketedMap<String>489 (new Task InstanceComparator(TaskEquality.SEMANTICALLY_EQUAL));487 SymbolMap<ITask, String> symbolMap = new TaskSymbolBucketedMap<String> 488 (new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 490 489 491 490 symbolMap.getValue(null); … … 494 493 @Test 495 494 public void testRemoveSymbol_1() { 496 SymbolMap<ITask Instance, String> symbolMap = new TaskSymbolBucketedMap<String>497 (new Task InstanceComparator(TaskEquality.SEMANTICALLY_EQUAL));498 499 assertNull(symbolMap.removeSymbol(createTask Instance("symbol")));495 SymbolMap<ITask, String> symbolMap = new TaskSymbolBucketedMap<String> 496 (new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 497 498 assertNull(symbolMap.removeSymbol(createTask("symbol"))); 500 499 } 501 500 502 501 @Test 503 502 public void testRemoveSymbol_2() { 504 SymbolMap<ITask Instance, String> symbolMap = new TaskSymbolBucketedMap<String>505 (new Task InstanceComparator(TaskEquality.SEMANTICALLY_EQUAL));506 507 symbolMap.addSymbol(createTask Instance("symbol1"), "value1");508 509 assertNotNull(symbolMap.removeSymbol(createTask Instance("symbol1")));503 SymbolMap<ITask, String> symbolMap = new TaskSymbolBucketedMap<String> 504 (new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 505 506 symbolMap.addSymbol(createTask("symbol1"), "value1"); 507 508 assertNotNull(symbolMap.removeSymbol(createTask("symbol1"))); 510 509 assertEquals(0, symbolMap.size()); 511 510 } … … 513 512 @Test 514 513 public void testRemoveSymbol_3() { 515 SymbolMap<ITask Instance, String> symbolMap = new TaskSymbolBucketedMap<String>516 (new Task InstanceComparator(TaskEquality.SEMANTICALLY_EQUAL));517 518 symbolMap.addSymbol(createTask Instance("symbol1"), null);519 520 assertNull(symbolMap.removeSymbol(createTask Instance("symbol1")));514 SymbolMap<ITask, String> symbolMap = new TaskSymbolBucketedMap<String> 515 (new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 516 517 symbolMap.addSymbol(createTask("symbol1"), null); 518 519 assertNull(symbolMap.removeSymbol(createTask("symbol1"))); 521 520 assertEquals(0, symbolMap.size()); 522 521 } … … 524 523 @Test 525 524 public void testRemoveSymbol_4() { 526 SymbolMap<ITask Instance, String> symbolMap = new TaskSymbolBucketedMap<String>527 (new Task InstanceComparator(TaskEquality.SEMANTICALLY_EQUAL));528 529 int entryCount = 2000; 530 531 for (int i = 0; i < entryCount; i++) { 532 symbolMap.addSymbol(createTask Instance("symbol" + i), "value" + i);533 } 534 535 for (int i = 0; i < entryCount; i++) { 536 assertNotNull(symbolMap.removeSymbol(createTask Instance("symbol" + i)));525 SymbolMap<ITask, String> symbolMap = new TaskSymbolBucketedMap<String> 526 (new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 527 528 int entryCount = 2000; 529 530 for (int i = 0; i < entryCount; i++) { 531 symbolMap.addSymbol(createTask("symbol" + i), "value" + i); 532 } 533 534 for (int i = 0; i < entryCount; i++) { 535 assertNotNull(symbolMap.removeSymbol(createTask("symbol" + i))); 537 536 } 538 537 … … 542 541 @Test 543 542 public void testRemoveSymbol_5() { 544 SymbolMap<ITask Instance, String> symbolMap = new TaskSymbolBucketedMap<String>545 (new Task InstanceComparator(TaskEquality.SEMANTICALLY_EQUAL));546 547 int entryCount = 2000; 548 549 for (int i = 0; i < entryCount; i++) { 550 if (i % 7 == 0) { 551 symbolMap.addSymbol(createTask Instance("symbol" + i), "value" + i);552 } 553 else { 554 symbolMap.addSymbol(createTask Instance("symbol" + i), null);555 } 556 } 557 558 for (int i = 0; i < entryCount; i++) { 559 if (i % 7 == 0) { 560 assertNotNull(symbolMap.removeSymbol(createTask Instance("symbol" + i)));561 } 562 else { 563 assertNull(symbolMap.removeSymbol(createTask Instance("symbol" + i)));543 SymbolMap<ITask, String> symbolMap = new TaskSymbolBucketedMap<String> 544 (new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 545 546 int entryCount = 2000; 547 548 for (int i = 0; i < entryCount; i++) { 549 if (i % 7 == 0) { 550 symbolMap.addSymbol(createTask("symbol" + i), "value" + i); 551 } 552 else { 553 symbolMap.addSymbol(createTask("symbol" + i), null); 554 } 555 } 556 557 for (int i = 0; i < entryCount; i++) { 558 if (i % 7 == 0) { 559 assertNotNull(symbolMap.removeSymbol(createTask("symbol" + i))); 560 } 561 else { 562 assertNull(symbolMap.removeSymbol(createTask("symbol" + i))); 564 563 } 565 564 } … … 570 569 @Test 571 570 public void testRemoveSymbol_6() { 572 SymbolMap<ITask Instance, String> symbolMap = new TaskSymbolBucketedMap<String>573 (new Task InstanceComparator(TaskEquality.SEMANTICALLY_EQUAL));574 575 int entryCount = 2000; 576 577 for (int i = 0; i < entryCount; i++) { 578 symbolMap.addSymbol(createTask Instance("symbol" + i), "value" + i);579 } 580 581 for (int i = 150; i < (entryCount - 150); i++) { 582 symbolMap.removeSymbol(createTask Instance("symbol" + i));571 SymbolMap<ITask, String> symbolMap = new TaskSymbolBucketedMap<String> 572 (new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 573 574 int entryCount = 2000; 575 576 for (int i = 0; i < entryCount; i++) { 577 symbolMap.addSymbol(createTask("symbol" + i), "value" + i); 578 } 579 580 for (int i = 150; i < (entryCount - 150); i++) { 581 symbolMap.removeSymbol(createTask("symbol" + i)); 583 582 } 584 583 585 584 for (int i = 0; i < 150; i++) { 586 assertNotNull(symbolMap.removeSymbol(createTask Instance("symbol" + i)));587 } 588 589 for (int i = 150; i < (entryCount - 150); i++) { 590 assertNull(symbolMap.removeSymbol(createTask Instance("symbol" + i)));585 assertNotNull(symbolMap.removeSymbol(createTask("symbol" + i))); 586 } 587 588 for (int i = 150; i < (entryCount - 150); i++) { 589 assertNull(symbolMap.removeSymbol(createTask("symbol" + i))); 591 590 } 592 591 593 592 for (int i = (entryCount - 150); i < entryCount; i++) { 594 assertNotNull(symbolMap.removeSymbol(createTask Instance("symbol" + i)));593 assertNotNull(symbolMap.removeSymbol(createTask("symbol" + i))); 595 594 } 596 595 … … 600 599 @Test(expected = java.lang.IllegalArgumentException.class) 601 600 public void testRemoveSymbol_7() { 602 SymbolMap<ITask Instance, String> symbolMap = new TaskSymbolBucketedMap<String>603 (new Task InstanceComparator(TaskEquality.SEMANTICALLY_EQUAL));601 SymbolMap<ITask, String> symbolMap = new TaskSymbolBucketedMap<String> 602 (new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 604 603 605 604 symbolMap.removeSymbol(null); … … 608 607 @Test 609 608 public void testGetSymbols_1() { 610 SymbolMap<ITask Instance, String> symbolMap = new TaskSymbolBucketedMap<String>611 (new Task InstanceComparator(TaskEquality.SEMANTICALLY_EQUAL));609 SymbolMap<ITask, String> symbolMap = new TaskSymbolBucketedMap<String> 610 (new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 612 611 613 612 assertNotNull(symbolMap.getSymbols()); … … 617 616 @Test 618 617 public void testGetSymbols_2() { 619 SymbolMap<ITask Instance, String> symbolMap = new TaskSymbolBucketedMap<String>620 (new Task InstanceComparator(TaskEquality.SEMANTICALLY_EQUAL));618 SymbolMap<ITask, String> symbolMap = new TaskSymbolBucketedMap<String> 619 (new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 621 620 622 ITask Instance task = createTaskInstance("symbol1");621 ITask task = createTask("symbol1"); 623 622 symbolMap.addSymbol(task, "value1"); 624 623 … … 630 629 @Test 631 630 public void testGetSymbols_3() { 632 SymbolMap<ITask Instance, String> symbolMap = new TaskSymbolBucketedMap<String>633 (new Task InstanceComparator(TaskEquality.SEMANTICALLY_EQUAL));634 635 ITask Instance task = createTaskInstance("symbol1");631 SymbolMap<ITask, String> symbolMap = new TaskSymbolBucketedMap<String> 632 (new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 633 634 ITask task = createTask("symbol1"); 636 635 symbolMap.addSymbol(task, null); 637 636 … … 643 642 @Test 644 643 public void testGetSymbols_4() { 645 SymbolMap<ITask Instance, String> symbolMap = new TaskSymbolBucketedMap<String>646 (new Task InstanceComparator(TaskEquality.SEMANTICALLY_EQUAL));647 Set<ITask Instance> expectedSymbols = new HashSet<ITaskInstance>();648 649 int entryCount = 2000; 650 651 for (int i = 0; i < entryCount; i++) { 652 ITask Instance task = createTaskInstance("symbol" + i);644 SymbolMap<ITask, String> symbolMap = new TaskSymbolBucketedMap<String> 645 (new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 646 Set<ITask> expectedSymbols = new HashSet<ITask>(); 647 648 int entryCount = 2000; 649 650 for (int i = 0; i < entryCount; i++) { 651 ITask task = createTask("symbol" + i); 653 652 symbolMap.addSymbol(task, "value" + i); 654 653 expectedSymbols.add(task); … … 658 657 assertEquals(entryCount, symbolMap.getSymbols().size()); 659 658 660 Iterator<ITask Instance> iterator = symbolMap.getSymbols().iterator();659 Iterator<ITask> iterator = symbolMap.getSymbols().iterator(); 661 660 for (int i = 0; i < entryCount; i++) { 662 661 assertTrue(iterator.hasNext()); … … 670 669 @Test 671 670 public void testGetSymbols_5() { 672 SymbolMap<ITask Instance, String> symbolMap = new TaskSymbolBucketedMap<String>673 (new Task InstanceComparator(TaskEquality.SEMANTICALLY_EQUAL));674 Set<ITask Instance> expectedSymbols = new HashSet<ITaskInstance>();675 676 int entryCount = 2000; 677 678 for (int i = 0; i < entryCount; i++) { 679 ITask Instance task = createTaskInstance("symbol" + i);671 SymbolMap<ITask, String> symbolMap = new TaskSymbolBucketedMap<String> 672 (new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 673 Set<ITask> expectedSymbols = new HashSet<ITask>(); 674 675 int entryCount = 2000; 676 677 for (int i = 0; i < entryCount; i++) { 678 ITask task = createTask("symbol" + i); 680 679 681 680 if (i % 7 == 0) { … … 692 691 assertEquals(entryCount, symbolMap.getSymbols().size()); 693 692 694 Iterator<ITask Instance> iterator = symbolMap.getSymbols().iterator();693 Iterator<ITask> iterator = symbolMap.getSymbols().iterator(); 695 694 for (int i = 0; i < entryCount; i++) { 696 695 assertTrue(iterator.hasNext()); … … 704 703 @Test 705 704 public void testGetSymbols_6() { 706 SymbolMap<ITask Instance, String> symbolMap = new TaskSymbolBucketedMap<String>707 (new Task InstanceComparator(TaskEquality.SEMANTICALLY_EQUAL));708 List<ITask Instance> expectedSymbols = new ArrayList<ITaskInstance>();709 710 int entryCount = 2000; 711 712 for (int i = 0; i < entryCount; i++) { 713 ITask Instance task = createTaskInstance("symbol" + i);705 SymbolMap<ITask, String> symbolMap = new TaskSymbolBucketedMap<String> 706 (new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 707 List<ITask> expectedSymbols = new ArrayList<ITask>(); 708 709 int entryCount = 2000; 710 711 for (int i = 0; i < entryCount; i++) { 712 ITask task = createTask("symbol" + i); 714 713 symbolMap.addSymbol(task, "value" + i); 715 714 expectedSymbols.add(task); … … 723 722 assertEquals(2 * 150, symbolMap.getSymbols().size()); 724 723 725 Iterator<ITask Instance> iterator = symbolMap.getSymbols().iterator();724 Iterator<ITask> iterator = symbolMap.getSymbols().iterator(); 726 725 for (int i = 0; i < 2 * 150; i++) { 727 726 assertTrue(iterator.hasNext()); … … 735 734 @Test 736 735 public void testGetValues_1() { 737 SymbolMap<ITask Instance, String> symbolMap = new TaskSymbolBucketedMap<String>738 (new Task InstanceComparator(TaskEquality.SEMANTICALLY_EQUAL));736 SymbolMap<ITask, String> symbolMap = new TaskSymbolBucketedMap<String> 737 (new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 739 738 740 739 assertNotNull(symbolMap.getValues()); … … 744 743 @Test 745 744 public void testGetValues_2() { 746 SymbolMap<ITask Instance, String> symbolMap = new TaskSymbolBucketedMap<String>747 (new Task InstanceComparator(TaskEquality.SEMANTICALLY_EQUAL));748 749 symbolMap.addSymbol(createTask Instance("symbol1"), "value1");745 SymbolMap<ITask, String> symbolMap = new TaskSymbolBucketedMap<String> 746 (new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 747 748 symbolMap.addSymbol(createTask("symbol1"), "value1"); 750 749 751 750 assertNotNull(symbolMap.getValues()); … … 756 755 @Test 757 756 public void testGetValues_3() { 758 SymbolMap<ITask Instance, String> symbolMap = new TaskSymbolBucketedMap<String>759 (new Task InstanceComparator(TaskEquality.SEMANTICALLY_EQUAL));760 761 symbolMap.addSymbol(createTask Instance("symbol1"), null);757 SymbolMap<ITask, String> symbolMap = new TaskSymbolBucketedMap<String> 758 (new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 759 760 symbolMap.addSymbol(createTask("symbol1"), null); 762 761 763 762 assertNotNull(symbolMap.getValues()); … … 768 767 @Test 769 768 public void testGetValues_4() { 770 SymbolMap<ITask Instance, String> symbolMap = new TaskSymbolBucketedMap<String>771 (new Task InstanceComparator(TaskEquality.SEMANTICALLY_EQUAL));769 SymbolMap<ITask, String> symbolMap = new TaskSymbolBucketedMap<String> 770 (new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 772 771 Set<String> expectedValues = new HashSet<String>(); 773 772 … … 775 774 776 775 for (int i = 0; i < entryCount; i++) { 777 symbolMap.addSymbol(createTask Instance("symbol" + i), "value" + i);776 symbolMap.addSymbol(createTask("symbol" + i), "value" + i); 778 777 expectedValues.add("value" + i); 779 778 } … … 794 793 @Test 795 794 public void testGetValues_5() { 796 SymbolMap<ITask Instance, String> symbolMap = new TaskSymbolBucketedMap<String>797 (new Task InstanceComparator(TaskEquality.SEMANTICALLY_EQUAL));795 SymbolMap<ITask, String> symbolMap = new TaskSymbolBucketedMap<String> 796 (new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 798 797 Set<String> expectedValues = new HashSet<String>(); 799 798 … … 802 801 for (int i = 0; i < entryCount; i++) { 803 802 if (i % 7 == 0) { 804 symbolMap.addSymbol(createTask Instance("symbol" + i), "value" + i);803 symbolMap.addSymbol(createTask("symbol" + i), "value" + i); 805 804 expectedValues.add("value" + i); 806 805 } 807 806 else { 808 symbolMap.addSymbol(createTask Instance("symbol" + i), null);807 symbolMap.addSymbol(createTask("symbol" + i), null); 809 808 expectedValues.add(null); 810 809 } … … 826 825 @Test 827 826 public void testGetValues_6() { 828 SymbolMap<ITask Instance, String> symbolMap = new TaskSymbolBucketedMap<String>829 (new Task InstanceComparator(TaskEquality.SEMANTICALLY_EQUAL));827 SymbolMap<ITask, String> symbolMap = new TaskSymbolBucketedMap<String> 828 (new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 830 829 Set<String> expectedValues = new HashSet<String>(); 831 830 … … 833 832 834 833 for (int i = 0; i < entryCount; i++) { 835 symbolMap.addSymbol(createTask Instance("symbol" + i), "value" + i);834 symbolMap.addSymbol(createTask("symbol" + i), "value" + i); 836 835 expectedValues.add("value" + i); 837 836 } 838 837 839 838 for (int i = 150; i < (entryCount - 150); i++) { 840 symbolMap.removeSymbol(createTask Instance("symbol" + i));839 symbolMap.removeSymbol(createTask("symbol" + i)); 841 840 expectedValues.remove("value" + i); 842 841 } … … 857 856 @Test 858 857 public void testClear_1() { 859 SymbolMap<ITask Instance, String> symbolMap = new TaskSymbolBucketedMap<String>860 (new Task InstanceComparator(TaskEquality.SEMANTICALLY_EQUAL));858 SymbolMap<ITask, String> symbolMap = new TaskSymbolBucketedMap<String> 859 (new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 861 860 862 861 symbolMap.clear(); … … 866 865 @Test 867 866 public void testClear_2() { 868 SymbolMap<ITask Instance, String> symbolMap = new TaskSymbolBucketedMap<String>869 (new Task InstanceComparator(TaskEquality.SEMANTICALLY_EQUAL));870 871 symbolMap.addSymbol(createTask Instance("symbol1"), "value1");867 SymbolMap<ITask, String> symbolMap = new TaskSymbolBucketedMap<String> 868 (new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 869 870 symbolMap.addSymbol(createTask("symbol1"), "value1"); 872 871 873 872 symbolMap.clear(); … … 877 876 @Test 878 877 public void testClear_3() { 879 SymbolMap<ITask Instance, String> symbolMap = new TaskSymbolBucketedMap<String>880 (new Task InstanceComparator(TaskEquality.SEMANTICALLY_EQUAL));881 882 symbolMap.addSymbol(createTask Instance("symbol1"), null);878 SymbolMap<ITask, String> symbolMap = new TaskSymbolBucketedMap<String> 879 (new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 880 881 symbolMap.addSymbol(createTask("symbol1"), null); 883 882 884 883 symbolMap.clear(); … … 888 887 @Test 889 888 public void testClear_4() { 890 SymbolMap<ITask Instance, String> symbolMap = new TaskSymbolBucketedMap<String>891 (new Task InstanceComparator(TaskEquality.SEMANTICALLY_EQUAL));892 893 int entryCount = 2000; 894 895 for (int i = 0; i < entryCount; i++) { 896 symbolMap.addSymbol(createTask Instance("symbol" + i), "value" + i);889 SymbolMap<ITask, String> symbolMap = new TaskSymbolBucketedMap<String> 890 (new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 891 892 int entryCount = 2000; 893 894 for (int i = 0; i < entryCount; i++) { 895 symbolMap.addSymbol(createTask("symbol" + i), "value" + i); 897 896 } 898 897 … … 903 902 @Test 904 903 public void testClear_5() { 905 SymbolMap<ITask Instance, String> symbolMap = new TaskSymbolBucketedMap<String>906 (new Task InstanceComparator(TaskEquality.SEMANTICALLY_EQUAL));907 908 int entryCount = 2000; 909 910 for (int i = 0; i < entryCount; i++) { 911 if (i % 7 == 0) { 912 symbolMap.addSymbol(createTask Instance("symbol" + i), "value" + i);913 } 914 else { 915 symbolMap.addSymbol(createTask Instance("symbol" + i), null);904 SymbolMap<ITask, String> symbolMap = new TaskSymbolBucketedMap<String> 905 (new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 906 907 int entryCount = 2000; 908 909 for (int i = 0; i < entryCount; i++) { 910 if (i % 7 == 0) { 911 symbolMap.addSymbol(createTask("symbol" + i), "value" + i); 912 } 913 else { 914 symbolMap.addSymbol(createTask("symbol" + i), null); 916 915 } 917 916 } … … 923 922 @Test 924 923 public void testClear_6() { 925 SymbolMap<ITask Instance, String> symbolMap = new TaskSymbolBucketedMap<String>926 (new Task InstanceComparator(TaskEquality.SEMANTICALLY_EQUAL));927 928 int entryCount = 2000; 929 930 for (int i = 0; i < entryCount; i++) { 931 symbolMap.addSymbol(createTask Instance("symbol" + i), "value" + i);932 } 933 934 for (int i = 150; i < (entryCount - 150); i++) { 935 symbolMap.removeSymbol(createTask Instance("symbol" + i));924 SymbolMap<ITask, String> symbolMap = new TaskSymbolBucketedMap<String> 925 (new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 926 927 int entryCount = 2000; 928 929 for (int i = 0; i < entryCount; i++) { 930 symbolMap.addSymbol(createTask("symbol" + i), "value" + i); 931 } 932 933 for (int i = 150; i < (entryCount - 150); i++) { 934 symbolMap.removeSymbol(createTask("symbol" + i)); 936 935 } 937 936 … … 942 941 @Test 943 942 public void testEquals_1() { 944 SymbolMap<ITask Instance, String> symbolMap1 = new TaskSymbolBucketedMap<String>945 (new Task InstanceComparator(TaskEquality.SEMANTICALLY_EQUAL));946 947 SymbolMap<ITask Instance, String> symbolMap2 = new TaskSymbolBucketedMap<String>948 (new Task InstanceComparator(TaskEquality.SEMANTICALLY_EQUAL));943 SymbolMap<ITask, String> symbolMap1 = new TaskSymbolBucketedMap<String> 944 (new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 945 946 SymbolMap<ITask, String> symbolMap2 = new TaskSymbolBucketedMap<String> 947 (new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 949 948 950 949 assertTrue(symbolMap1.equals(symbolMap2)); … … 953 952 @Test 954 953 public void testEquals_2() { 955 SymbolMap<ITask Instance, String> symbolMap1 = new TaskSymbolBucketedMap<String>956 (new Task InstanceComparator(TaskEquality.SEMANTICALLY_EQUAL));957 958 SymbolMap<ITask Instance, String> symbolMap2 = new TaskSymbolBucketedMap<String>959 (new Task InstanceComparator(TaskEquality.SEMANTICALLY_EQUAL));960 961 symbolMap1.addSymbol(createTask Instance("symbol1"), "value1");954 SymbolMap<ITask, String> symbolMap1 = new TaskSymbolBucketedMap<String> 955 (new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 956 957 SymbolMap<ITask, String> symbolMap2 = new TaskSymbolBucketedMap<String> 958 (new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 959 960 symbolMap1.addSymbol(createTask("symbol1"), "value1"); 962 961 963 962 assertFalse(symbolMap1.equals(symbolMap2)); … … 966 965 @Test 967 966 public void testEquals_3() { 968 SymbolMap<ITask Instance, String> symbolMap1 = new TaskSymbolBucketedMap<String>969 (new Task InstanceComparator(TaskEquality.SEMANTICALLY_EQUAL));970 971 SymbolMap<ITask Instance, String> symbolMap2 = new TaskSymbolBucketedMap<String>972 (new Task InstanceComparator(TaskEquality.SEMANTICALLY_EQUAL));973 974 ITask Instance task = createTaskInstance("symbol1");967 SymbolMap<ITask, String> symbolMap1 = new TaskSymbolBucketedMap<String> 968 (new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 969 970 SymbolMap<ITask, String> symbolMap2 = new TaskSymbolBucketedMap<String> 971 (new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 972 973 ITask task = createTask("symbol1"); 975 974 symbolMap1.addSymbol(task, "value1"); 976 975 symbolMap2.addSymbol(task, "value1"); … … 981 980 @Test 982 981 public void testEquals_4() { 983 SymbolMap<ITask Instance, String> symbolMap1 = new TaskSymbolBucketedMap<String>984 (new Task InstanceComparator(TaskEquality.SEMANTICALLY_EQUAL));982 SymbolMap<ITask, String> symbolMap1 = new TaskSymbolBucketedMap<String> 983 (new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 985 984 986 SymbolMap<ITask Instance, String> symbolMap2 = new TaskSymbolBucketedMap<String>987 (new Task InstanceComparator(TaskEquality.SEMANTICALLY_EQUAL));985 SymbolMap<ITask, String> symbolMap2 = new TaskSymbolBucketedMap<String> 986 (new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 988 987 989 988 int entryCount = 1000; 990 989 991 990 for (int i = 0; i < entryCount; i++) { 992 ITask Instance task = createTaskInstance("symbol1");991 ITask task = createTask("symbol1"); 993 992 symbolMap1.addSymbol(task, "value" + i); 994 993 assertFalse(symbolMap1.equals(symbolMap2)); … … 1000 999 @Test 1001 1000 public void testEquals_5() { 1002 SymbolMap<ITask Instance, String> symbolMap1 = new TaskSymbolBucketedMap<String>1003 (new Task InstanceComparator(TaskEquality.SEMANTICALLY_EQUAL));1001 SymbolMap<ITask, String> symbolMap1 = new TaskSymbolBucketedMap<String> 1002 (new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 1004 1003 1005 SymbolMap<ITask Instance, String> symbolMap2 = new TaskSymbolBucketedMap<String>1006 (new Task InstanceComparator(TaskEquality.SEMANTICALLY_EQUAL));1004 SymbolMap<ITask, String> symbolMap2 = new TaskSymbolBucketedMap<String> 1005 (new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 1007 1006 1008 1007 int entryCount = 1000; 1009 1008 1010 1009 for (int i = 0; i < entryCount; i++) { 1011 ITask Instance task = createTaskInstance("symbol" + i);1010 ITask task = createTask("symbol" + i); 1012 1011 if (i % 7 == 0) { 1013 1012 symbolMap1.addSymbol(task, "value" + i); … … 1027 1026 @Test 1028 1027 public void testEquals_6() { 1029 SymbolMap<ITask Instance, String> symbolMap1 = new TaskSymbolBucketedMap<String>1030 (new Task InstanceComparator(TaskEquality.SEMANTICALLY_EQUAL));1028 SymbolMap<ITask, String> symbolMap1 = new TaskSymbolBucketedMap<String> 1029 (new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 1031 1030 1032 SymbolMap<ITask Instance, String> symbolMap2 = new TaskSymbolBucketedMap<String>1033 (new Task InstanceComparator(TaskEquality.SEMANTICALLY_EQUAL));1031 SymbolMap<ITask, String> symbolMap2 = new TaskSymbolBucketedMap<String> 1032 (new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 1034 1033 1035 1034 int entryCount = 1000; 1036 1035 1037 ITask Instance[] taskInstances = new ITaskInstance[entryCount];1038 1039 for (int i = 0; i < entryCount; i++) { 1040 ITask Instance task = createTaskInstance("symbol" + i);1041 task Instances[i] = task;1036 ITask[] tasks = new ITask[entryCount]; 1037 1038 for (int i = 0; i < entryCount; i++) { 1039 ITask task = createTask("symbol" + i); 1040 tasks[i] = task; 1042 1041 symbolMap1.addSymbol(task, "value" + i); 1043 1042 assertFalse(symbolMap1.equals(symbolMap2)); … … 1047 1046 1048 1047 for (int i = 150; i < (entryCount - 150); i++) { 1049 symbolMap1.removeSymbol(task Instances[i]);1048 symbolMap1.removeSymbol(tasks[i]); 1050 1049 assertFalse(symbolMap1.equals(symbolMap2)); 1051 symbolMap2.removeSymbol(task Instances[i]);1050 symbolMap2.removeSymbol(tasks[i]); 1052 1051 assertTrue(symbolMap1.equals(symbolMap2)); 1053 1052 } … … 1057 1056 * 1058 1057 */ 1059 private ITask Instance createTaskInstance(String id) {1058 private ITask createTask(String id) { 1060 1059 ITask task = tasks.get(id); 1061 1060 Event event = null; … … 1071 1070 } 1072 1071 1073 return taskFactory.createNewTaskInstance((IEventTask) task, event); 1074 } 1075 1076 private void assertSymbolMapEntries(SymbolMap<ITaskInstance, String> symbolMap, 1077 ITaskInstance[] symbols, 1078 String[] values) 1072 taskFactory.createNewTaskInstance((IEventTask) task, event); 1073 1074 return task; 1075 } 1076 1077 private void assertSymbolMapEntries(SymbolMap<ITask, String> symbolMap, 1078 ITask[] symbols, 1079 String[] values) 1079 1080 { 1080 1081 assertEquals(symbols.length, symbolMap.size());
Note: See TracChangeset
for help on using the changeset viewer.