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/StartsWithEventAndContainsPatternTest.java

    r1170 r1205  
    2424 
    2525import 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; 
     26import de.ugoe.cs.autoquest.usability.rules.patterns.InteractionPattern; 
     27import de.ugoe.cs.autoquest.usability.rules.patterns.InteractionPatternBuilder; 
    2828import de.ugoe.cs.autoquest.usability.testutil.GenerateTaskModelUtil; 
    2929 
    … …  
    4444                      "    TextInput t1 {}" + 
    4545                      "    Selection sel1 {" + 
    46                       "      Sequence seq1 {" + 
     46                      "      Sequence seq2 {" + 
    4747                      "        MouseClick t2 {}" + 
    4848                      "      }" + 
    4949                      "    }" + 
    5050                      "    Selection sel1 {" + 
    51                       "      Sequence seq1 {" + 
    52                       "        TextInput t3 {}" + 
     51                      "      Sequence seq3 {" + 
     52                      "        EventTask t3 {}" + 
     53                      "        MouseClick t5 {}" + 
    5354                      "      }" + 
    5455                      "    }" + 
    … …  
    5657                      "}"; 
    5758        ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec); 
    58         UsagePatternBuilder builder = new UsagePatternBuilder(); 
    59         UsagePattern containedPattern = builder.concernedNode(SEQUENCE).startsWith(MOUSE_CLICK).build(); 
    60         UsagePattern pattern = builder.concernedNode(SEQUENCE).startsWith(TEXT_INPUT).contains(containedPattern).build(); 
     59        InteractionPatternBuilder builder = new InteractionPatternBuilder(); 
     60        InteractionPattern endsWithPattern = builder.concernedNode(SELECTION).startsWith(MOUSE_CLICK).build(); 
     61        InteractionPattern pattern = builder.concernedNode(SEQUENCE).startsWith(TEXT_INPUT).endsWith(endsWithPattern).build(); 
    6162        // When 
    6263        boolean patternContained = pattern.containedIn(taskTree); 
    … …  
    9293                      "}"; 
    9394        ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec); 
    94         UsagePatternBuilder builder = new UsagePatternBuilder(); 
    95         UsagePattern containedPattern = builder.concernedNode(SELECTION).startsWith(TEXT_INPUT).endsWith(MOUSE_CLICK).build(); 
    96         UsagePattern pattern = builder.concernedNode(SEQUENCE).startsWith(MOUSE_CLICK).contains(containedPattern).build(); 
     95        InteractionPatternBuilder builder = new InteractionPatternBuilder(); 
     96        InteractionPattern endsWithPattern = builder.concernedNode(SEQUENCE).startsWith(TEXT_INPUT).endsWith(MOUSE_CLICK).build(); 
     97        InteractionPattern pattern = builder.concernedNode(SEQUENCE).startsWith(MOUSE_CLICK).endsWith(endsWithPattern).build(); 
    9798        // When 
    9899        boolean patternContained = pattern.containedIn(taskTree); 
Note: See TracChangeset for help on using the changeset viewer.