Changeset 1846 for trunk/autoquest-core-tasktrees-test/src/test/java/de/ugoe/cs/autoquest/tasktrees/temporalrelation/TaskSymbolIdentityMapTest.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/TaskSymbolIdentityMapTest.java
r1294 r1846 33 33 import de.ugoe.cs.autoquest.tasktrees.treeifc.ITask; 34 34 import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskFactory; 35 import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskInstance;36 35 import de.ugoe.cs.autoquest.tasktrees.treeimpl.TaskFactory; 37 36 import de.ugoe.cs.autoquest.test.DummyGUIElement; … … 62 61 @Test 63 62 public void testSymbolMap_1() { 64 SymbolMap<ITask Instance, String> symbolMap = new TaskSymbolIdentityMap<String>();63 SymbolMap<ITask, String> symbolMap = new TaskSymbolIdentityMap<String>(); 65 64 66 65 assertNotNull(symbolMap); … … 72 71 TaskSymbolIdentityMap<String> symbolMap1 = new TaskSymbolIdentityMap<String>(); 73 72 74 ITask Instance taskInstance = createTaskInstance("symbol");75 symbolMap1.addSymbol(task Instance, "value");76 77 SymbolMap<ITask Instance, String> symbolMap2 = new TaskSymbolIdentityMap<String>(symbolMap1);73 ITask task = createTask("symbol"); 74 symbolMap1.addSymbol(task, "value"); 75 76 SymbolMap<ITask, String> symbolMap2 = new TaskSymbolIdentityMap<String>(symbolMap1); 78 77 79 78 assertNotNull(symbolMap2); 80 assertSymbolMapEntries(symbolMap2, new ITask Instance[] { taskInstance},79 assertSymbolMapEntries(symbolMap2, new ITask[] { task }, 81 80 new String[] { "value" }); 82 81 } … … 89 88 @Test 90 89 public void testAddSymbol_1() { 91 SymbolMap<ITask Instance, String> symbolMap = new TaskSymbolIdentityMap<String>();92 93 ITask Instance taskInstance = createTaskInstance("symbol");94 symbolMap.addSymbol(task Instance, "value1");90 SymbolMap<ITask, String> symbolMap = new TaskSymbolIdentityMap<String>(); 91 92 ITask task = createTask("symbol"); 93 symbolMap.addSymbol(task, "value1"); 95 94 96 95 assertNotNull(symbolMap); 97 assertSymbolMapEntries(symbolMap, new ITask Instance[] { taskInstance},96 assertSymbolMapEntries(symbolMap, new ITask[] { task }, 98 97 new String[] { "value1" }); 99 98 } … … 101 100 @Test 102 101 public void testAddSymbol_2() { 103 SymbolMap<ITask Instance, String> symbolMap = new TaskSymbolIdentityMap<String>();104 105 int entryCount = 2000; 106 107 ITask Instance[] symbols = new ITaskInstance[entryCount];102 SymbolMap<ITask, String> symbolMap = new TaskSymbolIdentityMap<String>(); 103 104 int entryCount = 2000; 105 106 ITask[] symbols = new ITask[entryCount]; 108 107 String[] values = new String[entryCount]; 109 108 110 109 for (int i = 0; i < entryCount; i++) { 111 symbols[i] = createTask Instance("symbol" + i);110 symbols[i] = createTask("symbol" + i); 112 111 symbolMap.addSymbol(symbols[i], "value" + i); 113 112 values[i] = "value" + i; … … 120 119 @Test 121 120 public void testAddSymbol_3() { 122 SymbolMap<ITask Instance, String> symbolMap = new TaskSymbolIdentityMap<String>();123 124 int entryCount = 2000; 125 126 ITask Instance[] symbols = new ITaskInstance[entryCount];121 SymbolMap<ITask, String> symbolMap = new TaskSymbolIdentityMap<String>(); 122 123 int entryCount = 2000; 124 125 ITask[] symbols = new ITask[entryCount]; 127 126 String[] values = new String[entryCount]; 128 127 129 128 for (int i = 0; i < entryCount; i++) { 130 symbols[i] = createTask Instance("symbol" + i);129 symbols[i] = createTask("symbol" + i); 131 130 if (i % 7 == 0) { 132 131 values[i] = "value" + i; … … 145 144 @Test(expected = java.lang.IllegalArgumentException.class) 146 145 public void testAddSymbol_4() { 147 SymbolMap<ITask Instance, String> symbolMap = new TaskSymbolIdentityMap<String>();146 SymbolMap<ITask, String> symbolMap = new TaskSymbolIdentityMap<String>(); 148 147 149 148 symbolMap.addSymbol(null, null); … … 152 151 @Test 153 152 public void testSize_1() { 154 SymbolMap<ITask Instance, String> symbolMap = new TaskSymbolIdentityMap<String>();153 SymbolMap<ITask, String> symbolMap = new TaskSymbolIdentityMap<String>(); 155 154 156 155 assertEquals(0, symbolMap.size()); … … 159 158 @Test 160 159 public void testSize_2() { 161 SymbolMap<ITask Instance, String> symbolMap = new TaskSymbolIdentityMap<String>();162 163 symbolMap.addSymbol(createTask Instance("symbol1"), "value1");160 SymbolMap<ITask, String> symbolMap = new TaskSymbolIdentityMap<String>(); 161 162 symbolMap.addSymbol(createTask("symbol1"), "value1"); 164 163 165 164 assertEquals(1, symbolMap.size()); … … 168 167 @Test 169 168 public void testSize_3() { 170 SymbolMap<ITask Instance, String> symbolMap = new TaskSymbolIdentityMap<String>();171 172 int entryCount = 2000; 173 174 for (int i = 0; i < entryCount; i++) { 175 symbolMap.addSymbol(createTask Instance("symbol" + i), "value" + i);169 SymbolMap<ITask, String> symbolMap = new TaskSymbolIdentityMap<String>(); 170 171 int entryCount = 2000; 172 173 for (int i = 0; i < entryCount; i++) { 174 symbolMap.addSymbol(createTask("symbol" + i), "value" + i); 176 175 } 177 176 … … 181 180 @Test 182 181 public void testSize_4() { 183 SymbolMap<ITask Instance, String> symbolMap = new TaskSymbolIdentityMap<String>();184 185 int entryCount = 2000; 186 187 for (int i = 0; i < entryCount; i++) { 188 if (i % 7 == 0) { 189 symbolMap.addSymbol(createTask Instance("symbol" + i), "value" + i);190 } 191 else { 192 symbolMap.addSymbol(createTask Instance("symbol" + i), null);182 SymbolMap<ITask, String> symbolMap = new TaskSymbolIdentityMap<String>(); 183 184 int entryCount = 2000; 185 186 for (int i = 0; i < entryCount; i++) { 187 if (i % 7 == 0) { 188 symbolMap.addSymbol(createTask("symbol" + i), "value" + i); 189 } 190 else { 191 symbolMap.addSymbol(createTask("symbol" + i), null); 193 192 } 194 193 } … … 199 198 @Test 200 199 public void testSize_5() { 201 SymbolMap<ITask Instance, String> symbolMap = new TaskSymbolIdentityMap<String>();202 203 int entryCount = 2000; 204 205 for (int i = 0; i < entryCount; i++) { 206 symbolMap.addSymbol(createTask Instance("symbol" + i), "value" + i);207 } 208 209 for (int i = 150; i < (entryCount - 150); i++) { 210 symbolMap.removeSymbol(createTask Instance("symbol" + i));200 SymbolMap<ITask, String> symbolMap = new TaskSymbolIdentityMap<String>(); 201 202 int entryCount = 2000; 203 204 for (int i = 0; i < entryCount; i++) { 205 symbolMap.addSymbol(createTask("symbol" + i), "value" + i); 206 } 207 208 for (int i = 150; i < (entryCount - 150); i++) { 209 symbolMap.removeSymbol(createTask("symbol" + i)); 211 210 } 212 211 … … 216 215 @Test 217 216 public void testIsEmpty_1() { 218 SymbolMap<ITask Instance, String> symbolMap = new TaskSymbolIdentityMap<String>();217 SymbolMap<ITask, String> symbolMap = new TaskSymbolIdentityMap<String>(); 219 218 220 219 assertTrue(symbolMap.isEmpty()); … … 223 222 @Test 224 223 public void testIsEmpty_2() { 225 SymbolMap<ITask Instance, String> symbolMap = new TaskSymbolIdentityMap<String>();226 227 symbolMap.addSymbol(createTask Instance("symbol1"), "value1");224 SymbolMap<ITask, String> symbolMap = new TaskSymbolIdentityMap<String>(); 225 226 symbolMap.addSymbol(createTask("symbol1"), "value1"); 228 227 229 228 assertFalse(symbolMap.isEmpty()); … … 232 231 @Test 233 232 public void testIsEmpty_3() { 234 SymbolMap<ITask Instance, String> symbolMap = new TaskSymbolIdentityMap<String>();235 236 int entryCount = 2000; 237 238 for (int i = 0; i < entryCount; i++) { 239 symbolMap.addSymbol(createTask Instance("symbol" + i), "value" + i);233 SymbolMap<ITask, String> symbolMap = new TaskSymbolIdentityMap<String>(); 234 235 int entryCount = 2000; 236 237 for (int i = 0; i < entryCount; i++) { 238 symbolMap.addSymbol(createTask("symbol" + i), "value" + i); 240 239 } 241 240 … … 245 244 @Test 246 245 public void testIsEmpty_4() { 247 SymbolMap<ITask Instance, String> symbolMap = new TaskSymbolIdentityMap<String>();248 249 int entryCount = 2000; 250 251 for (int i = 0; i < entryCount; i++) { 252 if (i % 7 == 0) { 253 symbolMap.addSymbol(createTask Instance("symbol" + i), "value" + i);254 } 255 else { 256 symbolMap.addSymbol(createTask Instance("symbol" + i), null);246 SymbolMap<ITask, String> symbolMap = new TaskSymbolIdentityMap<String>(); 247 248 int entryCount = 2000; 249 250 for (int i = 0; i < entryCount; i++) { 251 if (i % 7 == 0) { 252 symbolMap.addSymbol(createTask("symbol" + i), "value" + i); 253 } 254 else { 255 symbolMap.addSymbol(createTask("symbol" + i), null); 257 256 } 258 257 } … … 263 262 @Test 264 263 public void testIsEmpty_5() { 265 SymbolMap<ITask Instance, String> symbolMap = new TaskSymbolIdentityMap<String>();266 267 int entryCount = 2000; 268 269 for (int i = 0; i < entryCount; i++) { 270 symbolMap.addSymbol(createTask Instance("symbol" + i), "value" + i);271 } 272 273 for (int i = 150; i < (entryCount - 150); i++) { 274 symbolMap.removeSymbol(createTask Instance("symbol" + i));264 SymbolMap<ITask, String> symbolMap = new TaskSymbolIdentityMap<String>(); 265 266 int entryCount = 2000; 267 268 for (int i = 0; i < entryCount; i++) { 269 symbolMap.addSymbol(createTask("symbol" + i), "value" + i); 270 } 271 272 for (int i = 150; i < (entryCount - 150); i++) { 273 symbolMap.removeSymbol(createTask("symbol" + i)); 275 274 } 276 275 … … 280 279 @Test 281 280 public void testContainsSymbol_1() { 282 SymbolMap<ITask Instance, String> symbolMap = new TaskSymbolIdentityMap<String>();283 284 assertFalse(symbolMap.containsSymbol(createTask Instance("symbol")));281 SymbolMap<ITask, String> symbolMap = new TaskSymbolIdentityMap<String>(); 282 283 assertFalse(symbolMap.containsSymbol(createTask("symbol"))); 285 284 } 286 285 287 286 @Test 288 287 public void testContainsSymbol_2() { 289 SymbolMap<ITask Instance, String> symbolMap = new TaskSymbolIdentityMap<String>();290 291 symbolMap.addSymbol(createTask Instance("symbol1"), "value1");292 293 assertTrue(symbolMap.containsSymbol(createTask Instance("symbol1")));288 SymbolMap<ITask, String> symbolMap = new TaskSymbolIdentityMap<String>(); 289 290 symbolMap.addSymbol(createTask("symbol1"), "value1"); 291 292 assertTrue(symbolMap.containsSymbol(createTask("symbol1"))); 294 293 } 295 294 296 295 @Test 297 296 public void testContainsSymbol_3() { 298 SymbolMap<ITask Instance, String> symbolMap = new TaskSymbolIdentityMap<String>();299 300 int entryCount = 2000; 301 302 for (int i = 0; i < entryCount; i++) { 303 symbolMap.addSymbol(createTask Instance("symbol" + i), "value" + i);304 } 305 306 for (int i = 0; i < entryCount; i++) { 307 assertTrue(symbolMap.containsSymbol(createTask Instance("symbol" + i)));297 SymbolMap<ITask, String> symbolMap = new TaskSymbolIdentityMap<String>(); 298 299 int entryCount = 2000; 300 301 for (int i = 0; i < entryCount; i++) { 302 symbolMap.addSymbol(createTask("symbol" + i), "value" + i); 303 } 304 305 for (int i = 0; i < entryCount; i++) { 306 assertTrue(symbolMap.containsSymbol(createTask("symbol" + i))); 308 307 } 309 308 } … … 311 310 @Test 312 311 public void testContainsSymbol_4() { 313 SymbolMap<ITask Instance, String> symbolMap = new TaskSymbolIdentityMap<String>();314 315 int entryCount = 2000; 316 317 for (int i = 0; i < entryCount; i++) { 318 if (i % 7 == 0) { 319 symbolMap.addSymbol(createTask Instance("symbol" + i), "value" + i);320 } 321 else { 322 symbolMap.addSymbol(createTask Instance("symbol" + i), null);323 } 324 } 325 326 for (int i = 0; i < entryCount; i++) { 327 assertTrue(symbolMap.containsSymbol(createTask Instance("symbol" + i)));312 SymbolMap<ITask, String> symbolMap = new TaskSymbolIdentityMap<String>(); 313 314 int entryCount = 2000; 315 316 for (int i = 0; i < entryCount; i++) { 317 if (i % 7 == 0) { 318 symbolMap.addSymbol(createTask("symbol" + i), "value" + i); 319 } 320 else { 321 symbolMap.addSymbol(createTask("symbol" + i), null); 322 } 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_5() { 333 SymbolMap<ITask Instance, String> symbolMap = new TaskSymbolIdentityMap<String>();334 335 int entryCount = 2000; 336 337 for (int i = 0; i < entryCount; i++) { 338 symbolMap.addSymbol(createTask Instance("symbol" + i), "value" + i);339 } 340 341 for (int i = 150; i < (entryCount - 150); i++) { 342 symbolMap.removeSymbol(createTask Instance("symbol" + i));332 SymbolMap<ITask, String> symbolMap = new TaskSymbolIdentityMap<String>(); 333 334 int entryCount = 2000; 335 336 for (int i = 0; i < entryCount; i++) { 337 symbolMap.addSymbol(createTask("symbol" + i), "value" + i); 338 } 339 340 for (int i = 150; i < (entryCount - 150); i++) { 341 symbolMap.removeSymbol(createTask("symbol" + i)); 343 342 } 344 343 345 344 for (int i = 0; i < 150; i++) { 346 assertTrue(symbolMap.containsSymbol(createTask Instance("symbol" + i)));347 } 348 349 for (int i = 150; i < (entryCount - 150); i++) { 350 assertFalse(symbolMap.containsSymbol(createTask Instance("symbol" + i)));345 assertTrue(symbolMap.containsSymbol(createTask("symbol" + i))); 346 } 347 348 for (int i = 150; i < (entryCount - 150); i++) { 349 assertFalse(symbolMap.containsSymbol(createTask("symbol" + i))); 351 350 } 352 351 353 352 for (int i = (entryCount - 150); i < entryCount; i++) { 354 assertTrue(symbolMap.containsSymbol(createTask Instance("symbol" + i)));353 assertTrue(symbolMap.containsSymbol(createTask("symbol" + i))); 355 354 } 356 355 } … … 358 357 @Test(expected = java.lang.IllegalArgumentException.class) 359 358 public void testContainsSymbol_6() { 360 SymbolMap<ITask Instance, String> symbolMap = new TaskSymbolIdentityMap<String>();359 SymbolMap<ITask, String> symbolMap = new TaskSymbolIdentityMap<String>(); 361 360 362 361 symbolMap.containsSymbol(null); … … 365 364 @Test 366 365 public void testGetValue_1() { 367 SymbolMap<ITask Instance, String> symbolMap = new TaskSymbolIdentityMap<String>();368 369 assertNull(symbolMap.getValue(createTask Instance("symbol")));366 SymbolMap<ITask, String> symbolMap = new TaskSymbolIdentityMap<String>(); 367 368 assertNull(symbolMap.getValue(createTask("symbol"))); 370 369 } 371 370 372 371 @Test 373 372 public void testGetValue_2() { 374 SymbolMap<ITask Instance, String> symbolMap = new TaskSymbolIdentityMap<String>();375 376 symbolMap.addSymbol(createTask Instance("symbol1"), "value1");377 378 assertNotNull(symbolMap.getValue(createTask Instance("symbol1")));373 SymbolMap<ITask, String> symbolMap = new TaskSymbolIdentityMap<String>(); 374 375 symbolMap.addSymbol(createTask("symbol1"), "value1"); 376 377 assertNotNull(symbolMap.getValue(createTask("symbol1"))); 379 378 } 380 379 381 380 @Test 382 381 public void testGetValue_3() { 383 SymbolMap<ITask Instance, String> symbolMap = new TaskSymbolIdentityMap<String>();384 385 symbolMap.addSymbol(createTask Instance("symbol1"), null);386 387 assertNull(symbolMap.getValue(createTask Instance("symbol1")));382 SymbolMap<ITask, String> symbolMap = new TaskSymbolIdentityMap<String>(); 383 384 symbolMap.addSymbol(createTask("symbol1"), null); 385 386 assertNull(symbolMap.getValue(createTask("symbol1"))); 388 387 } 389 388 390 389 @Test 391 390 public void testGetValue_4() { 392 SymbolMap<ITask Instance, String> symbolMap = new TaskSymbolIdentityMap<String>();393 394 int entryCount = 2000; 395 396 for (int i = 0; i < entryCount; i++) { 397 symbolMap.addSymbol(createTask Instance("symbol" + i), "value" + i);398 } 399 400 for (int i = 0; i < entryCount; i++) { 401 assertNotNull(symbolMap.getValue(createTask Instance("symbol" + i)));391 SymbolMap<ITask, String> symbolMap = new TaskSymbolIdentityMap<String>(); 392 393 int entryCount = 2000; 394 395 for (int i = 0; i < entryCount; i++) { 396 symbolMap.addSymbol(createTask("symbol" + i), "value" + i); 397 } 398 399 for (int i = 0; i < entryCount; i++) { 400 assertNotNull(symbolMap.getValue(createTask("symbol" + i))); 402 401 } 403 402 } … … 405 404 @Test 406 405 public void testGetValue_5() { 407 SymbolMap<ITask Instance, String> symbolMap = new TaskSymbolIdentityMap<String>();408 409 int entryCount = 2000; 410 411 for (int i = 0; i < entryCount; i++) { 412 if (i % 7 == 0) { 413 symbolMap.addSymbol(createTask Instance("symbol" + i), "value" + i);414 } 415 else { 416 symbolMap.addSymbol(createTask Instance("symbol" + i), null);417 } 418 } 419 420 for (int i = 0; i < entryCount; i++) { 421 if (i % 7 == 0) { 422 assertNotNull(symbolMap.getValue(createTask Instance("symbol" + i)));423 } 424 else { 425 assertNull(symbolMap.getValue(createTask Instance("symbol" + i)));406 SymbolMap<ITask, String> symbolMap = new TaskSymbolIdentityMap<String>(); 407 408 int entryCount = 2000; 409 410 for (int i = 0; i < entryCount; i++) { 411 if (i % 7 == 0) { 412 symbolMap.addSymbol(createTask("symbol" + i), "value" + i); 413 } 414 else { 415 symbolMap.addSymbol(createTask("symbol" + i), null); 416 } 417 } 418 419 for (int i = 0; i < entryCount; i++) { 420 if (i % 7 == 0) { 421 assertNotNull(symbolMap.getValue(createTask("symbol" + i))); 422 } 423 else { 424 assertNull(symbolMap.getValue(createTask("symbol" + i))); 426 425 } 427 426 } … … 430 429 @Test 431 430 public void testGetValue_6() { 432 SymbolMap<ITask Instance, String> symbolMap = new TaskSymbolIdentityMap<String>();433 434 int entryCount = 2000; 435 436 for (int i = 0; i < entryCount; i++) { 437 symbolMap.addSymbol(createTask Instance("symbol" + i), "value" + i);438 } 439 440 for (int i = 150; i < (entryCount - 150); i++) { 441 symbolMap.removeSymbol(createTask Instance("symbol" + i));431 SymbolMap<ITask, String> symbolMap = new TaskSymbolIdentityMap<String>(); 432 433 int entryCount = 2000; 434 435 for (int i = 0; i < entryCount; i++) { 436 symbolMap.addSymbol(createTask("symbol" + i), "value" + i); 437 } 438 439 for (int i = 150; i < (entryCount - 150); i++) { 440 symbolMap.removeSymbol(createTask("symbol" + i)); 442 441 } 443 442 444 443 for (int i = 0; i < 150; i++) { 445 assertNotNull(symbolMap.getValue(createTask Instance("symbol" + i)));446 } 447 448 for (int i = 150; i < (entryCount - 150); i++) { 449 assertNull(symbolMap.getValue(createTask Instance("symbol" + i)));444 assertNotNull(symbolMap.getValue(createTask("symbol" + i))); 445 } 446 447 for (int i = 150; i < (entryCount - 150); i++) { 448 assertNull(symbolMap.getValue(createTask("symbol" + i))); 450 449 } 451 450 452 451 for (int i = (entryCount - 150); i < entryCount; i++) { 453 assertNotNull(symbolMap.getValue(createTask Instance("symbol" + i)));452 assertNotNull(symbolMap.getValue(createTask("symbol" + i))); 454 453 } 455 454 } … … 457 456 @Test(expected = java.lang.IllegalArgumentException.class) 458 457 public void testGetValue_7() { 459 SymbolMap<ITask Instance, String> symbolMap = new TaskSymbolIdentityMap<String>();458 SymbolMap<ITask, String> symbolMap = new TaskSymbolIdentityMap<String>(); 460 459 461 460 symbolMap.getValue(null); … … 464 463 @Test 465 464 public void testRemoveSymbol_1() { 466 SymbolMap<ITask Instance, String> symbolMap = new TaskSymbolIdentityMap<String>();467 468 assertNull(symbolMap.removeSymbol(createTask Instance("symbol")));465 SymbolMap<ITask, String> symbolMap = new TaskSymbolIdentityMap<String>(); 466 467 assertNull(symbolMap.removeSymbol(createTask("symbol"))); 469 468 } 470 469 471 470 @Test 472 471 public void testRemoveSymbol_2() { 473 SymbolMap<ITask Instance, String> symbolMap = new TaskSymbolIdentityMap<String>();474 475 symbolMap.addSymbol(createTask Instance("symbol1"), "value1");476 477 assertNotNull(symbolMap.removeSymbol(createTask Instance("symbol1")));472 SymbolMap<ITask, String> symbolMap = new TaskSymbolIdentityMap<String>(); 473 474 symbolMap.addSymbol(createTask("symbol1"), "value1"); 475 476 assertNotNull(symbolMap.removeSymbol(createTask("symbol1"))); 478 477 assertEquals(0, symbolMap.size()); 479 478 } … … 481 480 @Test 482 481 public void testRemoveSymbol_3() { 483 SymbolMap<ITask Instance, String> symbolMap = new TaskSymbolIdentityMap<String>();484 485 symbolMap.addSymbol(createTask Instance("symbol1"), null);486 487 assertNull(symbolMap.removeSymbol(createTask Instance("symbol1")));482 SymbolMap<ITask, String> symbolMap = new TaskSymbolIdentityMap<String>(); 483 484 symbolMap.addSymbol(createTask("symbol1"), null); 485 486 assertNull(symbolMap.removeSymbol(createTask("symbol1"))); 488 487 assertEquals(0, symbolMap.size()); 489 488 } … … 491 490 @Test 492 491 public void testRemoveSymbol_4() { 493 SymbolMap<ITask Instance, String> symbolMap = new TaskSymbolIdentityMap<String>();494 495 int entryCount = 2000; 496 497 for (int i = 0; i < entryCount; i++) { 498 symbolMap.addSymbol(createTask Instance("symbol" + i), "value" + i);499 } 500 501 for (int i = 0; i < entryCount; i++) { 502 assertNotNull(symbolMap.removeSymbol(createTask Instance("symbol" + i)));492 SymbolMap<ITask, String> symbolMap = new TaskSymbolIdentityMap<String>(); 493 494 int entryCount = 2000; 495 496 for (int i = 0; i < entryCount; i++) { 497 symbolMap.addSymbol(createTask("symbol" + i), "value" + i); 498 } 499 500 for (int i = 0; i < entryCount; i++) { 501 assertNotNull(symbolMap.removeSymbol(createTask("symbol" + i))); 503 502 } 504 503 … … 508 507 @Test 509 508 public void testRemoveSymbol_5() { 510 SymbolMap<ITask Instance, String> symbolMap = new TaskSymbolIdentityMap<String>();511 512 int entryCount = 2000; 513 514 for (int i = 0; i < entryCount; i++) { 515 if (i % 7 == 0) { 516 symbolMap.addSymbol(createTask Instance("symbol" + i), "value" + i);517 } 518 else { 519 symbolMap.addSymbol(createTask Instance("symbol" + i), null);520 } 521 } 522 523 for (int i = 0; i < entryCount; i++) { 524 if (i % 7 == 0) { 525 assertNotNull(symbolMap.removeSymbol(createTask Instance("symbol" + i)));526 } 527 else { 528 assertNull(symbolMap.removeSymbol(createTask Instance("symbol" + i)));509 SymbolMap<ITask, String> symbolMap = new TaskSymbolIdentityMap<String>(); 510 511 int entryCount = 2000; 512 513 for (int i = 0; i < entryCount; i++) { 514 if (i % 7 == 0) { 515 symbolMap.addSymbol(createTask("symbol" + i), "value" + i); 516 } 517 else { 518 symbolMap.addSymbol(createTask("symbol" + i), null); 519 } 520 } 521 522 for (int i = 0; i < entryCount; i++) { 523 if (i % 7 == 0) { 524 assertNotNull(symbolMap.removeSymbol(createTask("symbol" + i))); 525 } 526 else { 527 assertNull(symbolMap.removeSymbol(createTask("symbol" + i))); 529 528 } 530 529 } … … 535 534 @Test 536 535 public void testRemoveSymbol_6() { 537 SymbolMap<ITask Instance, String> symbolMap = new TaskSymbolIdentityMap<String>();538 539 int entryCount = 2000; 540 541 for (int i = 0; i < entryCount; i++) { 542 symbolMap.addSymbol(createTask Instance("symbol" + i), "value" + i);543 } 544 545 for (int i = 150; i < (entryCount - 150); i++) { 546 symbolMap.removeSymbol(createTask Instance("symbol" + i));536 SymbolMap<ITask, String> symbolMap = new TaskSymbolIdentityMap<String>(); 537 538 int entryCount = 2000; 539 540 for (int i = 0; i < entryCount; i++) { 541 symbolMap.addSymbol(createTask("symbol" + i), "value" + i); 542 } 543 544 for (int i = 150; i < (entryCount - 150); i++) { 545 symbolMap.removeSymbol(createTask("symbol" + i)); 547 546 } 548 547 549 548 for (int i = 0; i < 150; i++) { 550 assertNotNull(symbolMap.removeSymbol(createTask Instance("symbol" + i)));551 } 552 553 for (int i = 150; i < (entryCount - 150); i++) { 554 assertNull(symbolMap.removeSymbol(createTask Instance("symbol" + i)));549 assertNotNull(symbolMap.removeSymbol(createTask("symbol" + i))); 550 } 551 552 for (int i = 150; i < (entryCount - 150); i++) { 553 assertNull(symbolMap.removeSymbol(createTask("symbol" + i))); 555 554 } 556 555 557 556 for (int i = (entryCount - 150); i < entryCount; i++) { 558 assertNotNull(symbolMap.removeSymbol(createTask Instance("symbol" + i)));557 assertNotNull(symbolMap.removeSymbol(createTask("symbol" + i))); 559 558 } 560 559 … … 564 563 @Test(expected = java.lang.IllegalArgumentException.class) 565 564 public void testRemoveSymbol_7() { 566 SymbolMap<ITask Instance, String> symbolMap = new TaskSymbolIdentityMap<String>();565 SymbolMap<ITask, String> symbolMap = new TaskSymbolIdentityMap<String>(); 567 566 568 567 symbolMap.removeSymbol(null); … … 571 570 @Test 572 571 public void testGetSymbols_1() { 573 SymbolMap<ITask Instance, String> symbolMap = new TaskSymbolIdentityMap<String>();572 SymbolMap<ITask, String> symbolMap = new TaskSymbolIdentityMap<String>(); 574 573 575 574 assertNotNull(symbolMap.getSymbols()); … … 579 578 @Test 580 579 public void testGetSymbols_2() { 581 SymbolMap<ITask Instance, String> symbolMap = new TaskSymbolIdentityMap<String>();580 SymbolMap<ITask, String> symbolMap = new TaskSymbolIdentityMap<String>(); 582 581 583 ITask Instance task = createTaskInstance("symbol1");582 ITask task = createTask("symbol1"); 584 583 symbolMap.addSymbol(task, "value1"); 585 584 … … 591 590 @Test 592 591 public void testGetSymbols_3() { 593 SymbolMap<ITask Instance, String> symbolMap = new TaskSymbolIdentityMap<String>();594 595 ITask Instance task = createTaskInstance("symbol1");592 SymbolMap<ITask, String> symbolMap = new TaskSymbolIdentityMap<String>(); 593 594 ITask task = createTask("symbol1"); 596 595 symbolMap.addSymbol(task, null); 597 596 … … 603 602 @Test 604 603 public void testGetSymbols_4() { 605 SymbolMap<ITask Instance, String> symbolMap = new TaskSymbolIdentityMap<String>();606 Set<ITask Instance> expectedSymbols = new HashSet<ITaskInstance>();607 608 int entryCount = 2000; 609 610 for (int i = 0; i < entryCount; i++) { 611 ITask Instance task = createTaskInstance("symbol" + i);604 SymbolMap<ITask, String> symbolMap = new TaskSymbolIdentityMap<String>(); 605 Set<ITask> expectedSymbols = new HashSet<ITask>(); 606 607 int entryCount = 2000; 608 609 for (int i = 0; i < entryCount; i++) { 610 ITask task = createTask("symbol" + i); 612 611 symbolMap.addSymbol(task, "value" + i); 613 612 expectedSymbols.add(task); … … 617 616 assertEquals(entryCount, symbolMap.getSymbols().size()); 618 617 619 Iterator<ITask Instance> iterator = symbolMap.getSymbols().iterator();618 Iterator<ITask> iterator = symbolMap.getSymbols().iterator(); 620 619 for (int i = 0; i < entryCount; i++) { 621 620 assertTrue(iterator.hasNext()); … … 629 628 @Test 630 629 public void testGetSymbols_5() { 631 SymbolMap<ITask Instance, String> symbolMap = new TaskSymbolIdentityMap<String>();632 Set<ITask Instance> expectedSymbols = new HashSet<ITaskInstance>();633 634 int entryCount = 2000; 635 636 for (int i = 0; i < entryCount; i++) { 637 ITask Instance task = createTaskInstance("symbol" + i);630 SymbolMap<ITask, String> symbolMap = new TaskSymbolIdentityMap<String>(); 631 Set<ITask> expectedSymbols = new HashSet<ITask>(); 632 633 int entryCount = 2000; 634 635 for (int i = 0; i < entryCount; i++) { 636 ITask task = createTask("symbol" + i); 638 637 639 638 if (i % 7 == 0) { … … 650 649 assertEquals(entryCount, symbolMap.getSymbols().size()); 651 650 652 Iterator<ITask Instance> iterator = symbolMap.getSymbols().iterator();651 Iterator<ITask> iterator = symbolMap.getSymbols().iterator(); 653 652 for (int i = 0; i < entryCount; i++) { 654 653 assertTrue(iterator.hasNext()); … … 662 661 @Test 663 662 public void testGetSymbols_6() { 664 SymbolMap<ITask Instance, String> symbolMap = new TaskSymbolIdentityMap<String>();665 List<ITask Instance> expectedSymbols = new ArrayList<ITaskInstance>();666 667 int entryCount = 2000; 668 669 for (int i = 0; i < entryCount; i++) { 670 ITask Instance task = createTaskInstance("symbol" + i);663 SymbolMap<ITask, String> symbolMap = new TaskSymbolIdentityMap<String>(); 664 List<ITask> expectedSymbols = new ArrayList<ITask>(); 665 666 int entryCount = 2000; 667 668 for (int i = 0; i < entryCount; i++) { 669 ITask task = createTask("symbol" + i); 671 670 symbolMap.addSymbol(task, "value" + i); 672 671 expectedSymbols.add(task); … … 680 679 assertEquals(2 * 150, symbolMap.getSymbols().size()); 681 680 682 Iterator<ITask Instance> iterator = symbolMap.getSymbols().iterator();681 Iterator<ITask> iterator = symbolMap.getSymbols().iterator(); 683 682 for (int i = 0; i < 2 * 150; i++) { 684 683 assertTrue(iterator.hasNext()); … … 692 691 @Test 693 692 public void testGetValues_1() { 694 SymbolMap<ITask Instance, String> symbolMap = new TaskSymbolIdentityMap<String>();693 SymbolMap<ITask, String> symbolMap = new TaskSymbolIdentityMap<String>(); 695 694 696 695 assertNotNull(symbolMap.getValues()); … … 700 699 @Test 701 700 public void testGetValues_2() { 702 SymbolMap<ITask Instance, String> symbolMap = new TaskSymbolIdentityMap<String>();703 704 symbolMap.addSymbol(createTask Instance("symbol1"), "value1");701 SymbolMap<ITask, String> symbolMap = new TaskSymbolIdentityMap<String>(); 702 703 symbolMap.addSymbol(createTask("symbol1"), "value1"); 705 704 706 705 assertNotNull(symbolMap.getValues()); … … 711 710 @Test 712 711 public void testGetValues_3() { 713 SymbolMap<ITask Instance, String> symbolMap = new TaskSymbolIdentityMap<String>();714 715 symbolMap.addSymbol(createTask Instance("symbol1"), null);712 SymbolMap<ITask, String> symbolMap = new TaskSymbolIdentityMap<String>(); 713 714 symbolMap.addSymbol(createTask("symbol1"), null); 716 715 717 716 assertNotNull(symbolMap.getValues()); … … 722 721 @Test 723 722 public void testGetValues_4() { 724 SymbolMap<ITask Instance, String> symbolMap = new TaskSymbolIdentityMap<String>();723 SymbolMap<ITask, String> symbolMap = new TaskSymbolIdentityMap<String>(); 725 724 Set<String> expectedValues = new HashSet<String>(); 726 725 … … 728 727 729 728 for (int i = 0; i < entryCount; i++) { 730 symbolMap.addSymbol(createTask Instance("symbol" + i), "value" + i);729 symbolMap.addSymbol(createTask("symbol" + i), "value" + i); 731 730 expectedValues.add("value" + i); 732 731 } … … 747 746 @Test 748 747 public void testGetValues_5() { 749 SymbolMap<ITask Instance, String> symbolMap = new TaskSymbolIdentityMap<String>();748 SymbolMap<ITask, String> symbolMap = new TaskSymbolIdentityMap<String>(); 750 749 Set<String> expectedValues = new HashSet<String>(); 751 750 … … 754 753 for (int i = 0; i < entryCount; i++) { 755 754 if (i % 7 == 0) { 756 symbolMap.addSymbol(createTask Instance("symbol" + i), "value" + i);755 symbolMap.addSymbol(createTask("symbol" + i), "value" + i); 757 756 expectedValues.add("value" + i); 758 757 } 759 758 else { 760 symbolMap.addSymbol(createTask Instance("symbol" + i), null);759 symbolMap.addSymbol(createTask("symbol" + i), null); 761 760 expectedValues.add(null); 762 761 } … … 778 777 @Test 779 778 public void testGetValues_6() { 780 SymbolMap<ITask Instance, String> symbolMap = new TaskSymbolIdentityMap<String>();779 SymbolMap<ITask, String> symbolMap = new TaskSymbolIdentityMap<String>(); 781 780 Set<String> expectedValues = new HashSet<String>(); 782 781 … … 784 783 785 784 for (int i = 0; i < entryCount; i++) { 786 symbolMap.addSymbol(createTask Instance("symbol" + i), "value" + i);785 symbolMap.addSymbol(createTask("symbol" + i), "value" + i); 787 786 expectedValues.add("value" + i); 788 787 } 789 788 790 789 for (int i = 150; i < (entryCount - 150); i++) { 791 symbolMap.removeSymbol(createTask Instance("symbol" + i));790 symbolMap.removeSymbol(createTask("symbol" + i)); 792 791 expectedValues.remove("value" + i); 793 792 } … … 808 807 @Test 809 808 public void testClear_1() { 810 SymbolMap<ITask Instance, String> symbolMap = new TaskSymbolIdentityMap<String>();809 SymbolMap<ITask, String> symbolMap = new TaskSymbolIdentityMap<String>(); 811 810 812 811 symbolMap.clear(); … … 816 815 @Test 817 816 public void testClear_2() { 818 SymbolMap<ITask Instance, String> symbolMap = new TaskSymbolIdentityMap<String>();819 820 symbolMap.addSymbol(createTask Instance("symbol1"), "value1");817 SymbolMap<ITask, String> symbolMap = new TaskSymbolIdentityMap<String>(); 818 819 symbolMap.addSymbol(createTask("symbol1"), "value1"); 821 820 822 821 symbolMap.clear(); … … 826 825 @Test 827 826 public void testClear_3() { 828 SymbolMap<ITask Instance, String> symbolMap = new TaskSymbolIdentityMap<String>();829 830 symbolMap.addSymbol(createTask Instance("symbol1"), null);827 SymbolMap<ITask, String> symbolMap = new TaskSymbolIdentityMap<String>(); 828 829 symbolMap.addSymbol(createTask("symbol1"), null); 831 830 832 831 symbolMap.clear(); … … 836 835 @Test 837 836 public void testClear_4() { 838 SymbolMap<ITask Instance, String> symbolMap = new TaskSymbolIdentityMap<String>();839 840 int entryCount = 2000; 841 842 for (int i = 0; i < entryCount; i++) { 843 symbolMap.addSymbol(createTask Instance("symbol" + i), "value" + i);837 SymbolMap<ITask, String> symbolMap = new TaskSymbolIdentityMap<String>(); 838 839 int entryCount = 2000; 840 841 for (int i = 0; i < entryCount; i++) { 842 symbolMap.addSymbol(createTask("symbol" + i), "value" + i); 844 843 } 845 844 … … 850 849 @Test 851 850 public void testClear_5() { 852 SymbolMap<ITask Instance, String> symbolMap = new TaskSymbolIdentityMap<String>();853 854 int entryCount = 2000; 855 856 for (int i = 0; i < entryCount; i++) { 857 if (i % 7 == 0) { 858 symbolMap.addSymbol(createTask Instance("symbol" + i), "value" + i);859 } 860 else { 861 symbolMap.addSymbol(createTask Instance("symbol" + i), null);851 SymbolMap<ITask, String> symbolMap = new TaskSymbolIdentityMap<String>(); 852 853 int entryCount = 2000; 854 855 for (int i = 0; i < entryCount; i++) { 856 if (i % 7 == 0) { 857 symbolMap.addSymbol(createTask("symbol" + i), "value" + i); 858 } 859 else { 860 symbolMap.addSymbol(createTask("symbol" + i), null); 862 861 } 863 862 } … … 869 868 @Test 870 869 public void testClear_6() { 871 SymbolMap<ITask Instance, String> symbolMap = new TaskSymbolIdentityMap<String>();872 873 int entryCount = 2000; 874 875 for (int i = 0; i < entryCount; i++) { 876 symbolMap.addSymbol(createTask Instance("symbol" + i), "value" + i);877 } 878 879 for (int i = 150; i < (entryCount - 150); i++) { 880 symbolMap.removeSymbol(createTask Instance("symbol" + i));870 SymbolMap<ITask, String> symbolMap = new TaskSymbolIdentityMap<String>(); 871 872 int entryCount = 2000; 873 874 for (int i = 0; i < entryCount; i++) { 875 symbolMap.addSymbol(createTask("symbol" + i), "value" + i); 876 } 877 878 for (int i = 150; i < (entryCount - 150); i++) { 879 symbolMap.removeSymbol(createTask("symbol" + i)); 881 880 } 882 881 … … 887 886 @Test 888 887 public void testEquals_1() { 889 SymbolMap<ITask Instance, String> symbolMap1 = new TaskSymbolIdentityMap<String>();890 891 SymbolMap<ITask Instance, String> symbolMap2 = new TaskSymbolIdentityMap<String>();888 SymbolMap<ITask, String> symbolMap1 = new TaskSymbolIdentityMap<String>(); 889 890 SymbolMap<ITask, String> symbolMap2 = new TaskSymbolIdentityMap<String>(); 892 891 893 892 assertTrue(symbolMap1.equals(symbolMap2)); … … 896 895 @Test 897 896 public void testEquals_2() { 898 SymbolMap<ITask Instance, String> symbolMap1 = new TaskSymbolIdentityMap<String>();899 900 SymbolMap<ITask Instance, String> symbolMap2 = new TaskSymbolIdentityMap<String>();901 902 symbolMap1.addSymbol(createTask Instance("symbol1"), "value1");897 SymbolMap<ITask, String> symbolMap1 = new TaskSymbolIdentityMap<String>(); 898 899 SymbolMap<ITask, String> symbolMap2 = new TaskSymbolIdentityMap<String>(); 900 901 symbolMap1.addSymbol(createTask("symbol1"), "value1"); 903 902 904 903 assertFalse(symbolMap1.equals(symbolMap2)); … … 907 906 @Test 908 907 public void testEquals_3() { 909 SymbolMap<ITask Instance, String> symbolMap1 = new TaskSymbolIdentityMap<String>();910 911 SymbolMap<ITask Instance, String> symbolMap2 = new TaskSymbolIdentityMap<String>();912 913 ITask Instance task = createTaskInstance("symbol1");908 SymbolMap<ITask, String> symbolMap1 = new TaskSymbolIdentityMap<String>(); 909 910 SymbolMap<ITask, String> symbolMap2 = new TaskSymbolIdentityMap<String>(); 911 912 ITask task = createTask("symbol1"); 914 913 symbolMap1.addSymbol(task, "value1"); 915 914 symbolMap2.addSymbol(task, "value1"); … … 920 919 @Test 921 920 public void testEquals_4() { 922 SymbolMap<ITask Instance, String> symbolMap1 = new TaskSymbolIdentityMap<String>();921 SymbolMap<ITask, String> symbolMap1 = new TaskSymbolIdentityMap<String>(); 923 922 924 SymbolMap<ITask Instance, String> symbolMap2 = new TaskSymbolIdentityMap<String>();923 SymbolMap<ITask, String> symbolMap2 = new TaskSymbolIdentityMap<String>(); 925 924 926 925 int entryCount = 1000; 927 926 928 927 for (int i = 0; i < entryCount; i++) { 929 ITask Instance task = createTaskInstance("symbol1");928 ITask task = createTask("symbol1"); 930 929 symbolMap1.addSymbol(task, "value" + i); 931 930 assertFalse(symbolMap1.equals(symbolMap2)); … … 937 936 @Test 938 937 public void testEquals_5() { 939 SymbolMap<ITask Instance, String> symbolMap1 = new TaskSymbolIdentityMap<String>();938 SymbolMap<ITask, String> symbolMap1 = new TaskSymbolIdentityMap<String>(); 940 939 941 SymbolMap<ITask Instance, String> symbolMap2 = new TaskSymbolIdentityMap<String>();940 SymbolMap<ITask, String> symbolMap2 = new TaskSymbolIdentityMap<String>(); 942 941 943 942 int entryCount = 1000; 944 943 945 944 for (int i = 0; i < entryCount; i++) { 946 ITask Instance task = createTaskInstance("symbol" + i);945 ITask task = createTask("symbol" + i); 947 946 if (i % 7 == 0) { 948 947 symbolMap1.addSymbol(task, "value" + i); … … 962 961 @Test 963 962 public void testEquals_6() { 964 SymbolMap<ITask Instance, String> symbolMap1 = new TaskSymbolIdentityMap<String>();963 SymbolMap<ITask, String> symbolMap1 = new TaskSymbolIdentityMap<String>(); 965 964 966 SymbolMap<ITask Instance, String> symbolMap2 = new TaskSymbolIdentityMap<String>();965 SymbolMap<ITask, String> symbolMap2 = new TaskSymbolIdentityMap<String>(); 967 966 968 967 int entryCount = 1000; 969 968 970 ITask Instance[] taskInstances = new ITaskInstance[entryCount];971 972 for (int i = 0; i < entryCount; i++) { 973 ITask Instance task = createTaskInstance("symbol" + i);974 task Instances[i] = task;969 ITask[] tasks = new ITask[entryCount]; 970 971 for (int i = 0; i < entryCount; i++) { 972 ITask task = createTask("symbol" + i); 973 tasks[i] = task; 975 974 symbolMap1.addSymbol(task, "value" + i); 976 975 assertFalse(symbolMap1.equals(symbolMap2)); … … 980 979 981 980 for (int i = 150; i < (entryCount - 150); i++) { 982 symbolMap1.removeSymbol(task Instances[i]);981 symbolMap1.removeSymbol(tasks[i]); 983 982 assertFalse(symbolMap1.equals(symbolMap2)); 984 symbolMap2.removeSymbol(task Instances[i]);983 symbolMap2.removeSymbol(tasks[i]); 985 984 assertTrue(symbolMap1.equals(symbolMap2)); 986 985 } … … 989 988 @Test 990 989 public void testPerformance_Contains_1() { 991 SymbolMap<ITask Instance, String> symbolMap1 = new TaskSymbolIdentityMap<String>();990 SymbolMap<ITask, String> symbolMap1 = new TaskSymbolIdentityMap<String>(); 992 991 int mapSize = 100000; 993 992 int noOfLookups = 1000000; 994 993 995 ITask Instance[] taskInstances = new ITaskInstance[mapSize];994 ITask[] tasks = new ITask[mapSize]; 996 995 997 996 for (int i = 0; i < mapSize; i++) { 998 ITask Instance task = createTaskInstance("symbol" + i);999 task Instances[i] = task;997 ITask task = createTask("symbol" + i); 998 tasks[i] = task; 1000 999 symbolMap1.addSymbol(task, "value" + i); 1001 1000 } … … 1003 1002 long start = System.currentTimeMillis(); 1004 1003 for (int i = 0; i < noOfLookups; i++) { 1005 symbolMap1.containsSymbol(task Instances[noOfLookups % mapSize]);1004 symbolMap1.containsSymbol(tasks[noOfLookups % mapSize]); 1006 1005 } 1007 1006 … … 1012 1011 @Test 1013 1012 public void testPerformance_GetValue_1() { 1014 SymbolMap<ITask Instance, String> symbolMap1 = new TaskSymbolIdentityMap<String>();1013 SymbolMap<ITask, String> symbolMap1 = new TaskSymbolIdentityMap<String>(); 1015 1014 int mapSize = 100000; 1016 1015 int noOfLookups = 1000000; 1017 1016 1018 ITask Instance[] taskInstances = new ITaskInstance[mapSize];1017 ITask[] tasks = new ITask[mapSize]; 1019 1018 1020 1019 for (int i = 0; i < mapSize; i++) { 1021 ITask Instance task = createTaskInstance("symbol" + i);1022 task Instances[i] = task;1020 ITask task = createTask("symbol" + i); 1021 tasks[i] = task; 1023 1022 symbolMap1.addSymbol(task, "value" + i); 1024 1023 } … … 1026 1025 long start = System.currentTimeMillis(); 1027 1026 for (int i = 0; i < noOfLookups; i++) { 1028 symbolMap1.getValue(task Instances[noOfLookups % mapSize]);1027 symbolMap1.getValue(tasks[noOfLookups % mapSize]); 1029 1028 } 1030 1029 … … 1036 1035 @Test 1037 1036 public void testPerformance_AddRemove_1() { 1038 SymbolMap<ITask Instance, String> symbolMap1 = new TaskSymbolIdentityMap<String>();1037 SymbolMap<ITask, String> symbolMap1 = new TaskSymbolIdentityMap<String>(); 1039 1038 int mapSize = 100000; 1040 1039 int noOfLookups = 1000000; 1041 1040 1042 ITask Instance[] taskInstances = new ITaskInstance[mapSize];1041 ITask[] tasks = new ITask[mapSize]; 1043 1042 1044 1043 for (int i = 0; i < mapSize; i++) { 1045 ITask Instance task = createTaskInstance("symbol" + i);1046 task Instances[i] = task;1044 ITask task = createTask("symbol" + i); 1045 tasks[i] = task; 1047 1046 symbolMap1.addSymbol(task, "value" + i); 1048 1047 } … … 1050 1049 long start = System.currentTimeMillis(); 1051 1050 for (int i = 0; i < noOfLookups; i++) { 1052 ITask Instance task = taskInstances[noOfLookups % mapSize];1051 ITask task = tasks[noOfLookups % mapSize]; 1053 1052 symbolMap1.addSymbol(task, symbolMap1.removeSymbol(task)); 1054 1053 } … … 1061 1060 * 1062 1061 */ 1063 private ITask Instance createTaskInstance(String id) {1062 private ITask createTask(String id) { 1064 1063 ITask task = tasks.get(id); 1065 1064 Event event = null; … … 1075 1074 } 1076 1075 1077 return taskFactory.createNewTaskInstance((IEventTask) task, event); 1078 } 1079 1080 private void assertSymbolMapEntries(SymbolMap<ITaskInstance, String> symbolMap, 1081 ITaskInstance[] symbols, 1082 String[] values) 1076 taskFactory.createNewTaskInstance((IEventTask) task, event); 1077 1078 return task; 1079 } 1080 1081 private void assertSymbolMapEntries(SymbolMap<ITask, String> symbolMap, 1082 ITask[] symbols, 1083 String[] values) 1083 1084 { 1084 1085 assertEquals(symbols.length, symbolMap.size());
Note: See TracChangeset
for help on using the changeset viewer.