Ignore:
Timestamp:
05/01/13 14:33:31 (11 years ago)
Author:
adeicke
Message:

Fixing taskmodel specs and apply renaming refactoring (UsagePattern? -> InteractionPattern?).

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/autoquest-core-usability-evaluation-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/startswith/StartsWithPatternContainsEventAndEndsWithPatternTest.java

    r1170 r1205  
    1616 
    1717import static de.ugoe.cs.autoquest.usability.tasktree.filters.EventTypeFilter.MOUSE_CLICK; 
     18import static de.ugoe.cs.autoquest.usability.tasktree.filters.EventTypeFilter.SCROLL; 
    1819import static de.ugoe.cs.autoquest.usability.tasktree.filters.EventTypeFilter.TEXT_INPUT; 
    1920import static de.ugoe.cs.autoquest.usability.tasktree.filters.TaskTypeFilter.SELECTION; 
     
    2425 
    2526import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskModel; 
    26 import de.ugoe.cs.autoquest.usability.rules.patterns.UsagePattern; 
    27 import de.ugoe.cs.autoquest.usability.rules.patterns.UsagePatternBuilder; 
     27import de.ugoe.cs.autoquest.usability.rules.patterns.InteractionPattern; 
     28import de.ugoe.cs.autoquest.usability.rules.patterns.InteractionPatternBuilder; 
    2829import de.ugoe.cs.autoquest.usability.testutil.GenerateTaskModelUtil; 
    2930 
     
    5455                      "      }" + 
    5556                      "    }" + 
    56                       "  }" + 
    57                       "  MouseClick target2 {}" + 
    58                       "  TextInput target3 {}" + 
    59                       "  Selection sel2 {" + 
    60                       "    Sequence seq4 {" + 
    61                       "      TextInput target4 {}" + 
    62                       "      MouseClick target2 {}" + 
     57                      "    MouseClick target2 {}" + 
     58                      "    TextInput target3 {}" + 
     59                      "    Selection sel2 {" + 
     60                      "      Sequence seq5 {" + 
     61                      "        TextInput target4 {}" + 
     62                      "        MouseClick target2 {}" + 
     63                      "      }" + 
    6364                      "    }" + 
    64                       "  }" + 
    65                       "  Selection sel2 {" + 
    66                       "    Sequence seq5 {" + 
    67                       "      TextInput target4 {}" + 
    68                       "      EventTask target2 {}" + 
     65                      "    Selection sel2 {" + 
     66                      "      Sequence seq6 {" + 
     67                      "        TextInput target4 {}" + 
     68                      "        EventTask target2 {}" + 
     69                      "      }" + 
    6970                      "    }" + 
    7071                      "  }" + 
    7172                      "}"; 
    7273        ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec); 
    73         UsagePatternBuilder patternBuilder = new UsagePatternBuilder(); 
    74         UsagePattern startsWithPattern = patternBuilder.concernedNode(SELECTION).startsWith(TEXT_INPUT).endsWith(MOUSE_CLICK).build(); 
    75         UsagePattern endsWithPattern = patternBuilder.concernedNode(SELECTION).startsWith(TEXT_INPUT).endsWith(MOUSE_CLICK).build(); 
    76         UsagePattern pattern = patternBuilder.concernedNode(SEQUENCE).startsWith(startsWithPattern).contains(MOUSE_CLICK).endsWith(endsWithPattern).build(); 
     74        InteractionPatternBuilder patternBuilder = new InteractionPatternBuilder(); 
     75        InteractionPattern startsWithPattern = patternBuilder.concernedNode(SELECTION).startsWith(TEXT_INPUT).endsWith(MOUSE_CLICK).build(); 
     76        InteractionPattern endsWithPattern = patternBuilder.concernedNode(SELECTION).startsWith(TEXT_INPUT).endsWith(MOUSE_CLICK).build(); 
     77        InteractionPattern pattern = patternBuilder.concernedNode(SEQUENCE).startsWith(startsWithPattern).contains(MOUSE_CLICK).endsWith(endsWithPattern).build(); 
    7778        // When 
    7879        boolean patternContained = pattern.containedIn(taskTree); 
     
    8990                      "      Sequence seq2 {" + 
    9091                      "        TextInput target4 {}" + 
    91                       "        MouseClick target2 {}" + 
     92                      "        MouseClick target3 {}" + 
    9293                      "      }" + 
    9394                      "    }" + 
     
    9899                      "      }" + 
    99100                      "    }" + 
    100                       "  }" + 
    101                       "  EventTask target2 {}" + 
    102                       "  TextInput target3 {}" + 
    103                       "  Selection sel2 {" + 
    104                       "    Sequence seq4 {" + 
    105                       "      TextInput target4 {}" + 
    106                       "      MouseClick target2 {}" + 
     101                      "    EventTask target2 {}" + 
     102                      "    TextInput target1 {}" + 
     103                      "    Selection sel2 {" + 
     104                      "      Sequence seq5 {" + 
     105                      "        TextInput target4 {}" + 
     106                      "        MouseClick target3 {}" + 
     107                      "      }" + 
    107108                      "    }" + 
    108                       "  }" + 
    109                       "  Selection sel2 {" + 
    110                       "    Sequence seq5 {" + 
    111                       "      TextInput target4 {}" + 
    112                       "      EventTask target2 {}" + 
     109                      "    Selection sel2 {" + 
     110                      "      Sequence seq6 {" + 
     111                      "        TextInput target4 {}" + 
     112                      "        EventTask target2 {}" + 
     113                      "      }" + 
    113114                      "    }" + 
    114115                      "  }" + 
    115116                      "}"; 
    116117        ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec); 
    117         UsagePatternBuilder patternBuilder = new UsagePatternBuilder(); 
    118         UsagePattern startsWithPattern = patternBuilder.concernedNode(SELECTION).startsWith(TEXT_INPUT).endsWith(MOUSE_CLICK).build(); 
    119         UsagePattern endsWithPattern = patternBuilder.concernedNode(SELECTION).startsWith(TEXT_INPUT).endsWith(MOUSE_CLICK).build(); 
    120         UsagePattern pattern = patternBuilder.concernedNode(SEQUENCE).startsWith(startsWithPattern).contains(MOUSE_CLICK).endsWith(endsWithPattern).build(); 
     118        InteractionPatternBuilder patternBuilder = new InteractionPatternBuilder(); 
     119        InteractionPattern startsWithPattern = patternBuilder.concernedNode(SELECTION).startsWith(TEXT_INPUT).endsWith(MOUSE_CLICK).build(); 
     120        InteractionPattern endsWithPattern = patternBuilder.concernedNode(SELECTION).startsWith(TEXT_INPUT).endsWith(MOUSE_CLICK).build(); 
     121        InteractionPattern pattern = patternBuilder.concernedNode(SEQUENCE).startsWith(startsWithPattern).contains(SCROLL).endsWith(endsWithPattern).build(); 
    121122        // When 
    122123        boolean patternContained = pattern.containedIn(taskTree); 
Note: See TracChangeset for help on using the changeset viewer.