Ignore:
Timestamp:
08/14/13 17:04:42 (11 years ago)
Author:
pharms
Message:
  • rework of task model to move event instance stuff to task instances
  • introduction of sequence, selection, iteration and optional instances
File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/autoquest-core-tasktrees-test/src/test/java/de/ugoe/cs/autoquest/tasktrees/temporalrelation/TaskSymbolBucketedMapTest.java

    r1285 r1294  
    2828import org.junit.Test; 
    2929 
     30import de.ugoe.cs.autoquest.eventcore.Event; 
    3031import de.ugoe.cs.autoquest.tasktrees.taskequality.TaskEquality; 
     32import de.ugoe.cs.autoquest.tasktrees.treeifc.IEventTask; 
     33import de.ugoe.cs.autoquest.tasktrees.treeifc.IEventTaskInstance; 
    3134import de.ugoe.cs.autoquest.tasktrees.treeifc.ITask; 
    3235import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskFactory; 
    … …  
    6063    @Test 
    6164    public void testSymbolMap_1() { 
    62         SymbolMap<ITaskInstance, String> symbolMap = 
    63             new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
     65        SymbolMap<ITaskInstance, String> symbolMap = new TaskSymbolBucketedMap<String> 
     66            (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
    6467         
    6568        assertNotNull(symbolMap); 
    … …  
    6972    @Test 
    7073    public void testSymbolMap_2() { 
    71         TaskSymbolBucketedMap<String> symbolMap1 = 
    72             new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
     74        TaskSymbolBucketedMap<String> symbolMap1 = new TaskSymbolBucketedMap<String> 
     75            (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
    7376         
    7477        ITaskInstance taskInstance = createTaskInstance("symbol"); 
    … …  
    8992    @Test 
    9093    public void testAddSymbol_1() { 
    91         SymbolMap<ITaskInstance, String> symbolMap = 
    92             new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
     94        SymbolMap<ITaskInstance, String> symbolMap = new TaskSymbolBucketedMap<String> 
     95            (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
    9396             
    9497        ITaskInstance taskInstance = createTaskInstance("symbol"); 
    … …  
    102105    @Test 
    103106    public void testAddSymbol_2() { 
    104         SymbolMap<ITaskInstance, String> symbolMap = 
    105             new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
     107        SymbolMap<ITaskInstance, String> symbolMap = new TaskSymbolBucketedMap<String> 
     108            (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
    106109         
    107110        int entryCount = 2000; 
    … …  
    122125    @Test 
    123126    public void testAddSymbol_3() { 
    124         SymbolMap<ITaskInstance, String> symbolMap = 
    125             new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
     127        SymbolMap<ITaskInstance, String> symbolMap = new TaskSymbolBucketedMap<String> 
     128            (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
    126129         
    127130        int entryCount = 2000; 
    … …  
    148151    @Test(expected = java.lang.IllegalArgumentException.class) 
    149152    public void testAddSymbol_4() { 
    150         SymbolMap<ITaskInstance, String> symbolMap = 
    151             new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
     153        SymbolMap<ITaskInstance, String> symbolMap = new TaskSymbolBucketedMap<String> 
     154            (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
    152155             
    153156        symbolMap.addSymbol(null, null); 
    … …  
    156159    @Test 
    157160    public void testSize_1() { 
    158         SymbolMap<ITaskInstance, String> symbolMap = 
    159             new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
     161        SymbolMap<ITaskInstance, String> symbolMap = new TaskSymbolBucketedMap<String> 
     162            (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
    160163             
    161164        assertEquals(0, symbolMap.size()); 
    … …  
    164167    @Test 
    165168    public void testSize_2() { 
    166         SymbolMap<ITaskInstance, String> symbolMap = 
    167             new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
     169        SymbolMap<ITaskInstance, String> symbolMap = new TaskSymbolBucketedMap<String> 
     170            (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
    168171             
    169172        symbolMap.addSymbol(createTaskInstance("symbol1"), "value1"); 
    … …  
    174177    @Test 
    175178    public void testSize_3() { 
    176         SymbolMap<ITaskInstance, String> symbolMap = 
    177             new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
     179        SymbolMap<ITaskInstance, String> symbolMap = new TaskSymbolBucketedMap<String> 
     180            (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
    178181         
    179182        int entryCount = 2000; 
    … …  
    188191    @Test 
    189192    public void testSize_4() { 
    190         SymbolMap<ITaskInstance, String> symbolMap = 
    191             new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
     193        SymbolMap<ITaskInstance, String> symbolMap = new TaskSymbolBucketedMap<String> 
     194            (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
    192195         
    193196        int entryCount = 2000; 
    … …  
    207210    @Test 
    208211    public void testSize_5() { 
    209         SymbolMap<ITaskInstance, String> symbolMap = 
    210             new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
     212        SymbolMap<ITaskInstance, String> symbolMap = new TaskSymbolBucketedMap<String> 
     213            (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
    211214         
    212215        int entryCount = 2000; 
    … …  
    225228    @Test 
    226229    public void testIsEmpty_1() { 
    227         SymbolMap<ITaskInstance, String> symbolMap = 
    228             new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
     230        SymbolMap<ITaskInstance, String> symbolMap = new TaskSymbolBucketedMap<String> 
     231            (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
    229232             
    230233        assertTrue(symbolMap.isEmpty()); 
    … …  
    233236    @Test 
    234237    public void testIsEmpty_2() { 
    235         SymbolMap<ITaskInstance, String> symbolMap = 
    236             new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
     238        SymbolMap<ITaskInstance, String> symbolMap = new TaskSymbolBucketedMap<String> 
     239            (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
    237240             
    238241        symbolMap.addSymbol(createTaskInstance("symbol1"), "value1"); 
    … …  
    243246    @Test 
    244247    public void testIsEmpty_3() { 
    245         SymbolMap<ITaskInstance, String> symbolMap = 
    246             new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
     248        SymbolMap<ITaskInstance, String> symbolMap = new TaskSymbolBucketedMap<String> 
     249            (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
    247250         
    248251        int entryCount = 2000; 
    … …  
    257260    @Test 
    258261    public void testIsEmpty_4() { 
    259         SymbolMap<ITaskInstance, String> symbolMap = 
    260             new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
     262        SymbolMap<ITaskInstance, String> symbolMap = new TaskSymbolBucketedMap<String> 
     263            (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
    261264         
    262265        int entryCount = 2000; 
    … …  
    276279    @Test 
    277280    public void testIsEmpty_5() { 
    278         SymbolMap<ITaskInstance, String> symbolMap = 
    279             new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
     281        SymbolMap<ITaskInstance, String> symbolMap = new TaskSymbolBucketedMap<String> 
     282            (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
    280283         
    281284        int entryCount = 2000; 
    … …  
    294297    @Test 
    295298    public void testContainsSymbol_1() { 
    296         SymbolMap<ITaskInstance, String> symbolMap = 
    297             new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
     299        SymbolMap<ITaskInstance, String> symbolMap = new TaskSymbolBucketedMap<String> 
     300            (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
    298301             
    299302        assertFalse(symbolMap.containsSymbol(createTaskInstance("symbol"))); 
    … …  
    302305    @Test 
    303306    public void testContainsSymbol_2() { 
    304         SymbolMap<ITaskInstance, String> symbolMap = 
    305             new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
     307        SymbolMap<ITaskInstance, String> symbolMap = new TaskSymbolBucketedMap<String> 
     308            (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
    306309             
    307310        symbolMap.addSymbol(createTaskInstance("symbol1"), "value1"); 
    … …  
    312315    @Test 
    313316    public void testContainsSymbol_3() { 
    314         SymbolMap<ITaskInstance, String> symbolMap = 
    315             new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
     317        SymbolMap<ITaskInstance, String> symbolMap = new TaskSymbolBucketedMap<String> 
     318            (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
    316319         
    317320        int entryCount = 2000; 
    … …  
    328331    @Test 
    329332    public void testContainsSymbol_4() { 
    330         SymbolMap<ITaskInstance, String> symbolMap = 
    331             new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
     333        SymbolMap<ITaskInstance, String> symbolMap = new TaskSymbolBucketedMap<String> 
     334            (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
    332335         
    333336        int entryCount = 2000; 
    … …  
    349352    @Test 
    350353    public void testContainsSymbol_5() { 
    351         SymbolMap<ITaskInstance, String> symbolMap = 
    352             new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
     354        SymbolMap<ITaskInstance, String> symbolMap = new TaskSymbolBucketedMap<String> 
     355            (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
    353356         
    354357        int entryCount = 2000; 
    … …  
    377380    @Test(expected = java.lang.IllegalArgumentException.class) 
    378381    public void testContainsSymbol_6() { 
    379         SymbolMap<ITaskInstance, String> symbolMap = 
    380             new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
     382        SymbolMap<ITaskInstance, String> symbolMap = new TaskSymbolBucketedMap<String> 
     383            (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
    381384             
    382385        symbolMap.containsSymbol(null); 
    … …  
    385388    @Test 
    386389    public void testGetValue_1() { 
    387         SymbolMap<ITaskInstance, String> symbolMap = 
    388             new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
     390        SymbolMap<ITaskInstance, String> symbolMap = new TaskSymbolBucketedMap<String> 
     391            (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
    389392             
    390393        assertNull(symbolMap.getValue(createTaskInstance("symbol"))); 
    … …  
    393396    @Test 
    394397    public void testGetValue_2() { 
    395         SymbolMap<ITaskInstance, String> symbolMap = 
    396             new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
     398        SymbolMap<ITaskInstance, String> symbolMap = new TaskSymbolBucketedMap<String> 
     399            (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
    397400             
    398401        symbolMap.addSymbol(createTaskInstance("symbol1"), "value1"); 
    … …  
    403406    @Test 
    404407    public void testGetValue_3() { 
    405         SymbolMap<ITaskInstance, String> symbolMap = 
    406             new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
     408        SymbolMap<ITaskInstance, String> symbolMap = new TaskSymbolBucketedMap<String> 
     409            (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
    407410             
    408411        symbolMap.addSymbol(createTaskInstance("symbol1"), null); 
    … …  
    413416    @Test 
    414417    public void testGetValue_4() { 
    415         SymbolMap<ITaskInstance, String> symbolMap = 
    416             new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
     418        SymbolMap<ITaskInstance, String> symbolMap = new TaskSymbolBucketedMap<String> 
     419            (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
    417420         
    418421        int entryCount = 2000; 
    … …  
    429432    @Test 
    430433    public void testGetValue_5() { 
    431         SymbolMap<ITaskInstance, String> symbolMap = 
    432             new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
     434        SymbolMap<ITaskInstance, String> symbolMap = new TaskSymbolBucketedMap<String> 
     435            (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
    433436         
    434437        int entryCount = 2000; 
    … …  
    455458    @Test 
    456459    public void testGetValue_6() { 
    457         SymbolMap<ITaskInstance, String> symbolMap = 
    458             new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
     460        SymbolMap<ITaskInstance, String> symbolMap = new TaskSymbolBucketedMap<String> 
     461            (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
    459462         
    460463        int entryCount = 2000; 
    … …  
    483486    @Test(expected = java.lang.IllegalArgumentException.class) 
    484487    public void testGetValue_7() { 
    485         SymbolMap<ITaskInstance, String> symbolMap = 
    486             new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
     488        SymbolMap<ITaskInstance, String> symbolMap = new TaskSymbolBucketedMap<String> 
     489            (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
    487490             
    488491        symbolMap.getValue(null); 
    … …  
    491494    @Test 
    492495    public void testRemoveSymbol_1() { 
    493         SymbolMap<ITaskInstance, String> symbolMap = 
    494             new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
     496        SymbolMap<ITaskInstance, String> symbolMap = new TaskSymbolBucketedMap<String> 
     497            (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
    495498             
    496499        assertNull(symbolMap.removeSymbol(createTaskInstance("symbol"))); 
    … …  
    499502    @Test 
    500503    public void testRemoveSymbol_2() { 
    501         SymbolMap<ITaskInstance, String> symbolMap = 
    502             new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
     504        SymbolMap<ITaskInstance, String> symbolMap = new TaskSymbolBucketedMap<String> 
     505            (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
    503506             
    504507        symbolMap.addSymbol(createTaskInstance("symbol1"), "value1"); 
    … …  
    510513    @Test 
    511514    public void testRemoveSymbol_3() { 
    512         SymbolMap<ITaskInstance, String> symbolMap = 
    513             new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
     515        SymbolMap<ITaskInstance, String> symbolMap = new TaskSymbolBucketedMap<String> 
     516            (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
    514517             
    515518        symbolMap.addSymbol(createTaskInstance("symbol1"), null); 
    … …  
    521524    @Test 
    522525    public void testRemoveSymbol_4() { 
    523         SymbolMap<ITaskInstance, String> symbolMap = 
    524             new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
     526        SymbolMap<ITaskInstance, String> symbolMap = new TaskSymbolBucketedMap<String> 
     527            (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
    525528         
    526529        int entryCount = 2000; 
    … …  
    539542    @Test 
    540543    public void testRemoveSymbol_5() { 
    541         SymbolMap<ITaskInstance, String> symbolMap = 
    542             new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
     544        SymbolMap<ITaskInstance, String> symbolMap = new TaskSymbolBucketedMap<String> 
     545            (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
    543546         
    544547        int entryCount = 2000; 
    … …  
    567570    @Test 
    568571    public void testRemoveSymbol_6() { 
    569         SymbolMap<ITaskInstance, String> symbolMap = 
    570             new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
     572        SymbolMap<ITaskInstance, String> symbolMap = new TaskSymbolBucketedMap<String> 
     573            (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
    571574         
    572575        int entryCount = 2000; 
    … …  
    597600    @Test(expected = java.lang.IllegalArgumentException.class) 
    598601    public void testRemoveSymbol_7() { 
    599         SymbolMap<ITaskInstance, String> symbolMap = 
    600             new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
     602        SymbolMap<ITaskInstance, String> symbolMap = new TaskSymbolBucketedMap<String> 
     603            (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
    601604             
    602605        symbolMap.removeSymbol(null); 
    … …  
    605608    @Test 
    606609    public void testGetSymbols_1() { 
    607         SymbolMap<ITaskInstance, String> symbolMap = 
    608             new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
     610        SymbolMap<ITaskInstance, String> symbolMap = new TaskSymbolBucketedMap<String> 
     611            (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
    609612             
    610613        assertNotNull(symbolMap.getSymbols()); 
    … …  
    614617    @Test 
    615618    public void testGetSymbols_2() { 
    616         SymbolMap<ITaskInstance, String> symbolMap = 
    617             new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
     619        SymbolMap<ITaskInstance, String> symbolMap = new TaskSymbolBucketedMap<String> 
     620            (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
    618621          
    619622        ITaskInstance task = createTaskInstance("symbol1"); 
    … …  
    627630    @Test 
    628631    public void testGetSymbols_3() { 
    629         SymbolMap<ITaskInstance, String> symbolMap = 
    630             new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
     632        SymbolMap<ITaskInstance, String> symbolMap = new TaskSymbolBucketedMap<String> 
     633            (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
    631634             
    632635        ITaskInstance task = createTaskInstance("symbol1"); 
    … …  
    640643    @Test 
    641644    public void testGetSymbols_4() { 
    642         SymbolMap<ITaskInstance, String> symbolMap = 
    643             new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
     645        SymbolMap<ITaskInstance, String> symbolMap = new TaskSymbolBucketedMap<String> 
     646            (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
    644647        Set<ITaskInstance> expectedSymbols = new HashSet<ITaskInstance>(); 
    645648         
    … …  
    667670    @Test 
    668671    public void testGetSymbols_5() { 
    669         SymbolMap<ITaskInstance, String> symbolMap = 
    670             new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
     672        SymbolMap<ITaskInstance, String> symbolMap = new TaskSymbolBucketedMap<String> 
     673            (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
    671674        Set<ITaskInstance> expectedSymbols = new HashSet<ITaskInstance>(); 
    672675         
    … …  
    701704    @Test 
    702705    public void testGetSymbols_6() { 
    703         SymbolMap<ITaskInstance, String> symbolMap = 
    704             new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
     706        SymbolMap<ITaskInstance, String> symbolMap = new TaskSymbolBucketedMap<String> 
     707            (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
    705708        List<ITaskInstance> expectedSymbols = new ArrayList<ITaskInstance>(); 
    706709         
    … …  
    732735    @Test 
    733736    public void testGetValues_1() { 
    734         SymbolMap<ITaskInstance, String> symbolMap = 
    735             new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
     737        SymbolMap<ITaskInstance, String> symbolMap = new TaskSymbolBucketedMap<String> 
     738            (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
    736739             
    737740        assertNotNull(symbolMap.getValues()); 
    … …  
    741744    @Test 
    742745    public void testGetValues_2() { 
    743         SymbolMap<ITaskInstance, String> symbolMap = 
    744             new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
     746        SymbolMap<ITaskInstance, String> symbolMap = new TaskSymbolBucketedMap<String> 
     747            (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
    745748             
    746749        symbolMap.addSymbol(createTaskInstance("symbol1"), "value1"); 
    … …  
    753756    @Test 
    754757    public void testGetValues_3() { 
    755         SymbolMap<ITaskInstance, String> symbolMap = 
    756             new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
     758        SymbolMap<ITaskInstance, String> symbolMap = new TaskSymbolBucketedMap<String> 
     759            (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
    757760             
    758761        symbolMap.addSymbol(createTaskInstance("symbol1"), null); 
    … …  
    765768    @Test 
    766769    public void testGetValues_4() { 
    767         SymbolMap<ITaskInstance, String> symbolMap = 
    768             new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
     770        SymbolMap<ITaskInstance, String> symbolMap = new TaskSymbolBucketedMap<String> 
     771            (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
    769772        Set<String> expectedValues = new HashSet<String>(); 
    770773         
    … …  
    791794    @Test 
    792795    public void testGetValues_5() { 
    793         SymbolMap<ITaskInstance, String> symbolMap = 
    794             new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
     796        SymbolMap<ITaskInstance, String> symbolMap = new TaskSymbolBucketedMap<String> 
     797            (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
    795798        Set<String> expectedValues = new HashSet<String>(); 
    796799         
    … …  
    823826    @Test 
    824827    public void testGetValues_6() { 
    825         SymbolMap<ITaskInstance, String> symbolMap = 
    826             new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
     828        SymbolMap<ITaskInstance, String> symbolMap = new TaskSymbolBucketedMap<String> 
     829            (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
    827830        Set<String> expectedValues = new HashSet<String>(); 
    828831         
    … …  
    854857    @Test 
    855858    public void testClear_1() { 
    856         SymbolMap<ITaskInstance, String> symbolMap = 
    857             new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
     859        SymbolMap<ITaskInstance, String> symbolMap = new TaskSymbolBucketedMap<String> 
     860            (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
    858861         
    859862        symbolMap.clear(); 
    … …  
    863866    @Test 
    864867    public void testClear_2() { 
    865         SymbolMap<ITaskInstance, String> symbolMap = 
    866             new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
     868        SymbolMap<ITaskInstance, String> symbolMap = new TaskSymbolBucketedMap<String> 
     869            (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
    867870             
    868871        symbolMap.addSymbol(createTaskInstance("symbol1"), "value1"); 
    … …  
    874877    @Test 
    875878    public void testClear_3() { 
    876         SymbolMap<ITaskInstance, String> symbolMap = 
    877             new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
     879        SymbolMap<ITaskInstance, String> symbolMap = new TaskSymbolBucketedMap<String> 
     880            (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
    878881             
    879882        symbolMap.addSymbol(createTaskInstance("symbol1"), null); 
    … …  
    885888    @Test 
    886889    public void testClear_4() { 
    887         SymbolMap<ITaskInstance, String> symbolMap = 
    888             new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
     890        SymbolMap<ITaskInstance, String> symbolMap = new TaskSymbolBucketedMap<String> 
     891            (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
    889892         
    890893        int entryCount = 2000; 
    … …  
    900903    @Test 
    901904    public void testClear_5() { 
    902         SymbolMap<ITaskInstance, String> symbolMap = 
    903             new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
     905        SymbolMap<ITaskInstance, String> symbolMap = new TaskSymbolBucketedMap<String> 
     906            (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
    904907         
    905908        int entryCount = 2000; 
    … …  
    920923    @Test 
    921924    public void testClear_6() { 
    922         SymbolMap<ITaskInstance, String> symbolMap = 
    923             new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
     925        SymbolMap<ITaskInstance, String> symbolMap = new TaskSymbolBucketedMap<String> 
     926            (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
    924927         
    925928        int entryCount = 2000; 
    … …  
    939942    @Test 
    940943    public void testEquals_1() { 
    941         SymbolMap<ITaskInstance, String> symbolMap1 = 
    942             new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
    943          
    944         SymbolMap<ITaskInstance, String> symbolMap2 = 
    945             new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
     944        SymbolMap<ITaskInstance, String> symbolMap1 = new TaskSymbolBucketedMap<String> 
     945            (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
     946         
     947        SymbolMap<ITaskInstance, String> symbolMap2 = new TaskSymbolBucketedMap<String> 
     948            (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
    946949         
    947950        assertTrue(symbolMap1.equals(symbolMap2)); 
    … …  
    950953    @Test 
    951954    public void testEquals_2() { 
    952         SymbolMap<ITaskInstance, String> symbolMap1 = 
    953             new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
    954              
    955         SymbolMap<ITaskInstance, String> symbolMap2 = 
    956             new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
     955        SymbolMap<ITaskInstance, String> symbolMap1 = new TaskSymbolBucketedMap<String> 
     956            (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
     957             
     958        SymbolMap<ITaskInstance, String> symbolMap2 = new TaskSymbolBucketedMap<String> 
     959            (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
    957960             
    958961        symbolMap1.addSymbol(createTaskInstance("symbol1"), "value1"); 
    … …  
    963966    @Test 
    964967    public void testEquals_3() { 
    965         SymbolMap<ITaskInstance, String> symbolMap1 = 
    966             new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
    967              
    968         SymbolMap<ITaskInstance, String> symbolMap2 = 
    969             new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
     968        SymbolMap<ITaskInstance, String> symbolMap1 = new TaskSymbolBucketedMap<String> 
     969            (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
     970             
     971        SymbolMap<ITaskInstance, String> symbolMap2 = new TaskSymbolBucketedMap<String> 
     972            (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
    970973         
    971974        ITaskInstance task = createTaskInstance("symbol1"); 
    … …  
    978981    @Test 
    979982    public void testEquals_4() { 
    980         SymbolMap<ITaskInstance, String> symbolMap1 = 
    981             new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
     983        SymbolMap<ITaskInstance, String> symbolMap1 = new TaskSymbolBucketedMap<String> 
     984            (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
    982985                 
    983         SymbolMap<ITaskInstance, String> symbolMap2 = 
    984             new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
     986        SymbolMap<ITaskInstance, String> symbolMap2 = new TaskSymbolBucketedMap<String> 
     987            (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
    985988         
    986989        int entryCount = 1000; 
    … …  
    9971000    @Test 
    9981001    public void testEquals_5() { 
    999         SymbolMap<ITaskInstance, String> symbolMap1 = 
    1000             new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
     1002        SymbolMap<ITaskInstance, String> symbolMap1 = new TaskSymbolBucketedMap<String> 
     1003            (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
    10011004                
    1002         SymbolMap<ITaskInstance, String> symbolMap2 = 
    1003             new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
     1005        SymbolMap<ITaskInstance, String> symbolMap2 = new TaskSymbolBucketedMap<String> 
     1006            (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
    10041007         
    10051008        int entryCount = 1000; 
    … …  
    10241027    @Test 
    10251028    public void testEquals_6() { 
    1026         SymbolMap<ITaskInstance, String> symbolMap1 = 
    1027             new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
     1029        SymbolMap<ITaskInstance, String> symbolMap1 = new TaskSymbolBucketedMap<String> 
     1030            (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
    10281031                 
    1029         SymbolMap<ITaskInstance, String> symbolMap2 = 
    1030             new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
     1032        SymbolMap<ITaskInstance, String> symbolMap2 = new TaskSymbolBucketedMap<String> 
     1033            (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 
    10311034         
    10321035        int entryCount = 1000; 
    … …  
    10521055     
    10531056    /** 
    1054      * <p> 
    1055      * TODO: comment 
    1056      * </p> 
    10571057     * 
    1058      * @param string 
    1059      * @return 
    10601058     */ 
    10611059    private ITaskInstance createTaskInstance(String id) { 
    10621060        ITask task = tasks.get(id); 
    1063          
     1061        Event event = null; 
     1062        
    10641063        if (task == null) { 
    1065             task = taskFactory.createNewEventTask 
    1066                 (new DummyInteraction(id, 0), new DummyGUIElement("default")); 
    1067              
     1064            event = new Event(new DummyInteraction(id, 0), new DummyGUIElement("default")); 
     1065            task = taskFactory.createNewEventTask(event.toString()); 
     1066            
    10681067            tasks.put(id, task); 
    10691068        } 
    1070          
    1071         return taskFactory.createNewTaskInstance(task); 
     1069        else { 
     1070            event = ((IEventTaskInstance) task.getInstances().iterator().next()).getEvent(); 
     1071        } 
     1072        
     1073        return taskFactory.createNewTaskInstance((IEventTask) task, event); 
    10721074    } 
    10731075 
Note: See TracChangeset for help on using the changeset viewer.