Changeset 1218 for trunk


Ignore:
Timestamp:
06/06/13 17:09:49 (12 years ago)
Author:
adeicke
Message:

Adjustments according to renaming refactorings.

Location:
trunk/autoquest-core-usability-evaluation-test/src/main/java/de/ugoe/cs/autoquest/usability
Files:
1 added
1 deleted
29 edited
1 moved

Legend:

Unmodified
Added
Removed

  • trunk/autoquest-core-usability-evaluation-test/src/main/java/de/ugoe/cs/autoquest/usability/AllTests.java

    r1151 r1218  
    2222import de.ugoe.cs.autoquest.usability.rules.metrics.TextInputEntryRepetitionsEvaluatorTest; 
    2323import de.ugoe.cs.autoquest.usability.rules.metrics.TextInputRatioEvaluatorTest; 
    24 import de.ugoe.cs.autoquest.usability.rules.patterns.LongFormUsageDefectTest; 
     24import de.ugoe.cs.autoquest.usability.rules.patterns.LongFormUsageProblemTest; 
    2525import de.ugoe.cs.autoquest.usability.rules.patterns.visitors.contains.ContainsAndEndsWithEventTest; 
    2626import de.ugoe.cs.autoquest.usability.rules.patterns.visitors.contains.ContainsEventTest; 
    … …  
    7575      // P -> E 
    7676      // P -> P 
    77       LongFormUsageDefectTest.class 
     77      LongFormUsageProblemTest.class 
    7878    } 
    7979) 

  • trunk/autoquest-core-usability-evaluation-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/metrics/NoLetterOrDigitTextInputsEvaluatorTest.java

    r1201 r1218  
    2828 
    2929import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskModel; 
    30 import de.ugoe.cs.autoquest.usability.result.UsabilityDefect; 
     30import de.ugoe.cs.autoquest.usability.result.UsabilityProblemDescription; 
    3131import de.ugoe.cs.autoquest.usability.testutil.GenerateTaskModelUtil; 
    3232 
    … …  
    5050        ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec); 
    5151        // When 
    52         Optional<UsabilityDefect> recommendation = new NoLetterOrDigitRatioMetric(taskTree).calculate(); 
     52        Optional<UsabilityProblemDescription> recommendation = new NoLetterOrDigitRatioMetric(taskTree).calculate(); 
    5353        // Then 
    5454        assertThat(recommendation).is(absent()); 
    … …  
    6666        ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec); 
    6767        // When 
    68         Optional<UsabilityDefect> recommendation = new NoLetterOrDigitRatioMetric(taskTree).calculate(); 
     68        Optional<UsabilityProblemDescription> recommendation = new NoLetterOrDigitRatioMetric(taskTree).calculate(); 
    6969        // Then 
    7070        assertThat(recommendation).is(present()).has(infoRecommendationSeverityLevel()); 
    … …  
    8181        ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec); 
    8282        // When 
    83         Optional<UsabilityDefect> recommendation = new NoLetterOrDigitRatioMetric(taskTree).calculate(); 
     83        Optional<UsabilityProblemDescription> recommendation = new NoLetterOrDigitRatioMetric(taskTree).calculate(); 
    8484        // Then 
    8585        assertThat(recommendation).is(present()).has(lowRecommendationSeverityLevel()); 
    … …  
    9696        ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec); 
    9797        // When 
    98         Optional<UsabilityDefect> recommendation = new NoLetterOrDigitRatioMetric(taskTree).calculate(); 
     98        Optional<UsabilityProblemDescription> recommendation = new NoLetterOrDigitRatioMetric(taskTree).calculate(); 
    9999        // Then 
    100100        assertThat(recommendation).is(present()).has(mediumRecommendationSeverityLevel()); 
    … …  
    111111        ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec); 
    112112        // When 
    113         Optional<UsabilityDefect> recommendation = new NoLetterOrDigitRatioMetric(taskTree).calculate(); 
     113        Optional<UsabilityProblemDescription> recommendation = new NoLetterOrDigitRatioMetric(taskTree).calculate(); 
    114114        // Then 
    115115        assertThat(recommendation).is(present()).has(highRecommendationSeverityLevel()); 

  • trunk/autoquest-core-usability-evaluation-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/metrics/TextInputEntryRepetitionsEvaluatorTest.java

    r1201 r1218  
    2828 
    2929import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskModel; 
    30 import de.ugoe.cs.autoquest.usability.result.UsabilityDefect; 
     30import de.ugoe.cs.autoquest.usability.result.UsabilityProblemDescription; 
    3131import de.ugoe.cs.autoquest.usability.testutil.GenerateTaskModelUtil; 
    3232 
    … …  
    5050        ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec); 
    5151        // When 
    52         Optional<UsabilityDefect> recommendation = new TextInputEntryRepetitionsMetric(taskTree).calculate(); 
     52        Optional<UsabilityProblemDescription> recommendation = new TextInputEntryRepetitionsMetric(taskTree).calculate(); 
    5353        // Then 
    5454        assertThat(recommendation).is(absent()); 
    … …  
    7070        ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec); 
    7171        // When 
    72         Optional<UsabilityDefect> recommendation = new TextInputEntryRepetitionsMetric(taskTree).calculate(); 
     72        Optional<UsabilityProblemDescription> recommendation = new TextInputEntryRepetitionsMetric(taskTree).calculate(); 
    7373        // Then 
    7474        assertThat(recommendation).is(present()).has(infoRecommendationSeverityLevel()); 
    … …  
    9090        ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec); 
    9191        // When 
    92         Optional<UsabilityDefect> recommendation = new TextInputEntryRepetitionsMetric(taskTree).calculate(); 
     92        Optional<UsabilityProblemDescription> recommendation = new TextInputEntryRepetitionsMetric(taskTree).calculate(); 
    9393        // Then 
    9494        assertThat(recommendation).is(present()).has(lowRecommendationSeverityLevel()); 
    … …  
    137137        ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec); 
    138138        // When 
    139         Optional<UsabilityDefect> recommendation = new TextInputEntryRepetitionsMetric(taskTree).calculate(); 
     139        Optional<UsabilityProblemDescription> recommendation = new TextInputEntryRepetitionsMetric(taskTree).calculate(); 
    140140        // Then 
    141141        assertThat(recommendation).is(present()).has(mediumRecommendationSeverityLevel()); 
    … …  
    184184        ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec); 
    185185        // When 
    186         Optional<UsabilityDefect> recommendation = new TextInputEntryRepetitionsMetric(taskTree).calculate(); 
     186        Optional<UsabilityProblemDescription> recommendation = new TextInputEntryRepetitionsMetric(taskTree).calculate(); 
    187187        // Then 
    188188        assertThat(recommendation).is(present()).has(highRecommendationSeverityLevel()); 

  • trunk/autoquest-core-usability-evaluation-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/metrics/TextInputRatioEvaluatorTest.java

    r1201 r1218  
    2828 
    2929import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskModel; 
    30 import de.ugoe.cs.autoquest.usability.result.UsabilityDefect; 
     30import de.ugoe.cs.autoquest.usability.result.UsabilityProblemDescription; 
    3131import de.ugoe.cs.autoquest.usability.testutil.GenerateTaskModelUtil; 
    3232 
    … …  
    5757        ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec); 
    5858        // When 
    59         Optional<UsabilityDefect> recommendation = new TextInputRatioMetric(taskTree).calculate(); 
     59        Optional<UsabilityProblemDescription> recommendation = new TextInputRatioMetric(taskTree).calculate(); 
    6060        // Then 
    6161        assertThat(recommendation).is(absent()); 
    … …  
    7676        ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec); 
    7777        // When 
    78         Optional<UsabilityDefect> recommendation = new TextInputRatioMetric(taskTree).calculate(); 
     78        Optional<UsabilityProblemDescription> recommendation = new TextInputRatioMetric(taskTree).calculate(); 
    7979        // Then 
    8080        assertThat(recommendation).is(present()).has(infoRecommendationSeverityLevel()); 
    … …  
    9595        ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec); 
    9696        // When 
    97         Optional<UsabilityDefect> recommendation = new TextInputRatioMetric(taskTree).calculate(); 
     97        Optional<UsabilityProblemDescription> recommendation = new TextInputRatioMetric(taskTree).calculate(); 
    9898        // Then 
    9999        assertThat(recommendation).is(present()).has(lowRecommendationSeverityLevel()); 
    … …  
    113113        ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec); 
    114114        // When 
    115         Optional<UsabilityDefect> recommendation = new TextInputRatioMetric(taskTree).calculate(); 
     115        Optional<UsabilityProblemDescription> recommendation = new TextInputRatioMetric(taskTree).calculate(); 
    116116        // Then 
    117117        assertThat(recommendation).is(present()).has(mediumRecommendationSeverityLevel()); 
    … …  
    126126        ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec); 
    127127        // When 
    128         Optional<UsabilityDefect> recommendation = new TextInputRatioMetric(taskTree).calculate(); 
     128        Optional<UsabilityProblemDescription> recommendation = new TextInputRatioMetric(taskTree).calculate(); 
    129129        // Then 
    130130        assertThat(recommendation).is(present()).has(highRecommendationSeverityLevel()); 

  • trunk/autoquest-core-usability-evaluation-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/LongFormUsageProblemTest.java

    r1216 r1218  
    2424 
    2525import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskModel; 
    26 import de.ugoe.cs.autoquest.usability.result.UsabilityDefect; 
     26import de.ugoe.cs.autoquest.usability.result.UsabilityProblemDescription; 
    2727import de.ugoe.cs.autoquest.usability.testutil.GenerateTaskModelUtil; 
    2828 
    … …  
    3434 * @author Alexander Deicke 
    3535 */ 
    36 public class LongFormUsageDefectTest { 
     36public class LongFormUsageProblemTest { 
    3737 
    3838        @Test 
    … …  
    5353        ITaskModel taskModel = GenerateTaskModelUtil.getTaskModelFromSpec(spec); 
    5454        // When 
    55         Optional<UsabilityDefect> recommendation = new LongFormUsageDefect(taskModel).check(); 
     55        Optional<UsabilityProblemDescription> recommendation = new LongFormUsageProblem(taskModel).check(); 
    5656        // Then 
    5757        assertThat(recommendation).is(present()); 
    … …  
    7171        ITaskModel taskModel = GenerateTaskModelUtil.getTaskModelFromSpec(spec); 
    7272        // When 
    73         Optional<UsabilityDefect> recommendation = new LongFormUsageDefect(taskModel).check(); 
     73        Optional<UsabilityProblemDescription> recommendation = new LongFormUsageProblem(taskModel).check(); 
    7474        // Then 
    7575        assertThat(recommendation).is(absent()); 

  • trunk/autoquest-core-usability-evaluation-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/contains/ContainsAndEndsWithEventTest.java

    r1205 r1218  
    1515package de.ugoe.cs.autoquest.usability.rules.patterns.visitors.contains; 
    1616 
    17 import static de.ugoe.cs.autoquest.usability.tasktree.filters.EventTypeFilter.MOUSE_CLICK; 
    18 import static de.ugoe.cs.autoquest.usability.tasktree.filters.EventTypeFilter.TEXT_INPUT; 
    19 import static de.ugoe.cs.autoquest.usability.tasktree.filters.TaskTypeFilter.SELECTION; 
    20 import static de.ugoe.cs.autoquest.usability.tasktree.filters.TaskTypeFilter.SEQUENCE; 
     17import static de.ugoe.cs.autoquest.usability.taskmodel.filter.types.EventTypeFilter.MOUSE_CLICK; 
     18import static de.ugoe.cs.autoquest.usability.taskmodel.filter.types.EventTypeFilter.TEXT_INPUT; 
     19import static de.ugoe.cs.autoquest.usability.taskmodel.filter.types.TaskTypeFilter.SELECTION; 
     20import static de.ugoe.cs.autoquest.usability.taskmodel.filter.types.TaskTypeFilter.SEQUENCE; 
    2121import static org.fest.assertions.api.Assertions.assertThat; 
    2222 
    … …  
    4646                      "}"; 
    4747        ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec); 
    48         InteractionPattern pattern = new InteractionPatternBuilder().concernedNode(SEQUENCE).contains(TEXT_INPUT).endsWith(TEXT_INPUT).build(); 
     48        InteractionPattern pattern = InteractionPatternBuilder.newPattern().rootTask(SEQUENCE).containsEvent(TEXT_INPUT).endsWithEvent(TEXT_INPUT).patternFinished().build(); 
    4949        // When 
    5050        boolean patternContained = pattern.containedIn(taskTree); 
    … …  
    6666                      "}"; 
    6767        ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec); 
    68         InteractionPattern pattern = new InteractionPatternBuilder().concernedNode(SELECTION).contains(TEXT_INPUT).endsWith(MOUSE_CLICK).build(); 
     68        InteractionPattern pattern = InteractionPatternBuilder.newPattern().rootTask(SELECTION).containsEvent(TEXT_INPUT).endsWithEvent(MOUSE_CLICK).patternFinished().build(); 
    6969        // When 
    7070        boolean patternContained = pattern.containedIn(taskTree); 

  • trunk/autoquest-core-usability-evaluation-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/contains/ContainsEventTest.java

    r1205 r1218  
    1515package de.ugoe.cs.autoquest.usability.rules.patterns.visitors.contains; 
    1616 
    17 import static de.ugoe.cs.autoquest.usability.tasktree.filters.EventTypeFilter.TEXT_INPUT; 
    18 import static de.ugoe.cs.autoquest.usability.tasktree.filters.TaskTypeFilter.SELECTION; 
    19 import static de.ugoe.cs.autoquest.usability.tasktree.filters.TaskTypeFilter.SEQUENCE; 
     17import static de.ugoe.cs.autoquest.usability.taskmodel.filter.types.EventTypeFilter.TEXT_INPUT; 
     18import static de.ugoe.cs.autoquest.usability.taskmodel.filter.types.TaskTypeFilter.SELECTION; 
     19import static de.ugoe.cs.autoquest.usability.taskmodel.filter.types.TaskTypeFilter.SEQUENCE; 
    2020import static org.fest.assertions.api.Assertions.assertThat; 
    2121 
    … …  
    4545                      "}"; 
    4646        ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec); 
    47         InteractionPattern pattern = new InteractionPatternBuilder().concernedNode(SEQUENCE).contains(TEXT_INPUT).build(); 
     47        InteractionPattern pattern = InteractionPatternBuilder.newPattern().rootTask(SEQUENCE).containsEvent(TEXT_INPUT).patternFinished().build(); 
    4848        // When 
    4949        boolean patternContained = pattern.containedIn(taskTree); 
    … …  
    6464                      "}"; 
    6565        ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec); 
    66         InteractionPattern pattern = new InteractionPatternBuilder().concernedNode(SELECTION).contains(TEXT_INPUT).build(); 
     66        InteractionPattern pattern = InteractionPatternBuilder.newPattern().rootTask(SELECTION).containsEvent(TEXT_INPUT).patternFinished().build(); 
    6767        // When 
    6868        boolean patternContained = pattern.containedIn(taskTree); 

  • trunk/autoquest-core-usability-evaluation-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/contains/ContainsPatternTest.java

    r1205 r1218  
    1515package de.ugoe.cs.autoquest.usability.rules.patterns.visitors.contains; 
    1616 
    17 import static de.ugoe.cs.autoquest.usability.tasktree.filters.EventTypeFilter.TEXT_INPUT; 
    18 import static de.ugoe.cs.autoquest.usability.tasktree.filters.TaskTypeFilter.SELECTION; 
    19 import static de.ugoe.cs.autoquest.usability.tasktree.filters.TaskTypeFilter.SEQUENCE; 
     17import static de.ugoe.cs.autoquest.usability.taskmodel.filter.types.EventTypeFilter.TEXT_INPUT; 
     18import static de.ugoe.cs.autoquest.usability.taskmodel.filter.types.TaskTypeFilter.SELECTION; 
     19import static de.ugoe.cs.autoquest.usability.taskmodel.filter.types.TaskTypeFilter.SEQUENCE; 
    2020import static org.fest.assertions.api.Assertions.assertThat; 
    2121 
    … …  
    5050                      "}"; 
    5151        ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec); 
    52         InteractionPatternBuilder patternBuilder = new InteractionPatternBuilder(); 
    53         InteractionPattern containsPattern = patternBuilder.concernedNode(SELECTION).startsWith(TEXT_INPUT).endsWith(TEXT_INPUT).build(); 
    54         InteractionPattern pattern = patternBuilder.concernedNode(SEQUENCE).contains(containsPattern).build(); 
     52        InteractionPattern containsPattern = InteractionPatternBuilder.newPattern().rootTask(SELECTION).startsWithEvent(TEXT_INPUT).endsWithEvent(TEXT_INPUT).patternFinished().build(); 
     53        InteractionPattern pattern = InteractionPatternBuilder.newPattern().rootTask(SEQUENCE).containsPattern(containsPattern).patternFinished().build(); 
    5554        // When 
    5655        boolean patternContained = pattern.containedIn(taskTree); 
    … …  
    7978                      "}"; 
    8079        ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec); 
    81         InteractionPattern pattern = new InteractionPatternBuilder().concernedNode(SELECTION).contains(TEXT_INPUT).build(); 
     80        InteractionPattern pattern = InteractionPatternBuilder.newPattern().rootTask(SELECTION).containsEvent(TEXT_INPUT).patternFinished().build(); 
    8281        // When 
    8382        boolean patternContained = pattern.containedIn(taskTree); 

  • trunk/autoquest-core-usability-evaluation-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/endswith/EndsWithEventTest.java

    r1205 r1218  
    1515package de.ugoe.cs.autoquest.usability.rules.patterns.visitors.endswith; 
    1616 
    17 import static de.ugoe.cs.autoquest.usability.tasktree.filters.EventTypeFilter.TEXT_INPUT; 
    18 import static de.ugoe.cs.autoquest.usability.tasktree.filters.TaskTypeFilter.SEQUENCE; 
     17import static de.ugoe.cs.autoquest.usability.taskmodel.filter.types.EventTypeFilter.TEXT_INPUT; 
     18import static de.ugoe.cs.autoquest.usability.taskmodel.filter.types.TaskTypeFilter.SEQUENCE; 
    1919import static org.fest.assertions.api.Assertions.assertThat; 
    2020 
    … …  
    5252                      "}"; 
    5353        ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec); 
    54         InteractionPattern pattern = new InteractionPatternBuilder().concernedNode(SEQUENCE).endsWith(TEXT_INPUT).build(); 
     54        InteractionPattern pattern = InteractionPatternBuilder.newPattern().rootTask(SEQUENCE).endsWithEvent(TEXT_INPUT).patternFinished().build(); 
    5555        // When 
    5656        boolean patternContained = pattern.containedIn(taskTree); 
    … …  
    8383                      "}"; 
    8484        ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec); 
    85         InteractionPattern pattern = new InteractionPatternBuilder().concernedNode(SEQUENCE).endsWith(TEXT_INPUT).build(); 
     85        InteractionPattern pattern = InteractionPatternBuilder.newPattern().rootTask(SEQUENCE).endsWithEvent(TEXT_INPUT).patternFinished().build(); 
    8686        // When 
    8787        boolean patternContained = pattern.containedIn(taskTree); 

  • trunk/autoquest-core-usability-evaluation-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/endswith/EndsWithPatternTest.java

    r1205 r1218  
    1515package de.ugoe.cs.autoquest.usability.rules.patterns.visitors.endswith; 
    1616 
    17 import static de.ugoe.cs.autoquest.usability.tasktree.filters.EventTypeFilter.MOUSE_CLICK; 
    18 import static de.ugoe.cs.autoquest.usability.tasktree.filters.EventTypeFilter.TEXT_INPUT; 
    19 import static de.ugoe.cs.autoquest.usability.tasktree.filters.TaskTypeFilter.ITERATION; 
    20 import static de.ugoe.cs.autoquest.usability.tasktree.filters.TaskTypeFilter.SELECTION; 
    21 import static de.ugoe.cs.autoquest.usability.tasktree.filters.TaskTypeFilter.SEQUENCE; 
     17import static de.ugoe.cs.autoquest.usability.taskmodel.filter.types.EventTypeFilter.MOUSE_CLICK; 
     18import static de.ugoe.cs.autoquest.usability.taskmodel.filter.types.EventTypeFilter.TEXT_INPUT; 
     19import static de.ugoe.cs.autoquest.usability.taskmodel.filter.types.TaskTypeFilter.ITERATION; 
     20import static de.ugoe.cs.autoquest.usability.taskmodel.filter.types.TaskTypeFilter.SELECTION; 
     21import static de.ugoe.cs.autoquest.usability.taskmodel.filter.types.TaskTypeFilter.SEQUENCE; 
    2222import static org.fest.assertions.api.Assertions.assertThat; 
    2323 
    … …  
    6060                      "}"; 
    6161        ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec); 
    62         InteractionPatternBuilder patternBuilder = new InteractionPatternBuilder(); 
    63         InteractionPattern endsWithPattern = patternBuilder.concernedNode(SELECTION).startsWith(TEXT_INPUT).endsWith(MOUSE_CLICK).build(); 
    64         InteractionPattern pattern = patternBuilder.concernedNode(SEQUENCE).endsWith(endsWithPattern).build(); 
     62        InteractionPattern endsWithPattern = InteractionPatternBuilder.newPattern().rootTask(SELECTION).startsWithEvent(TEXT_INPUT).endsWithEvent(MOUSE_CLICK).patternFinished().build(); 
     63        InteractionPattern pattern = InteractionPatternBuilder.newPattern().rootTask(SEQUENCE).endsWithPattern(endsWithPattern).patternFinished().build(); 
    6564        // When 
    6665        boolean patternContained = pattern.containedIn(taskTree); 
    … …  
    9897                      "}"; 
    9998        ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec); 
    100         InteractionPatternBuilder patternBuilder = new InteractionPatternBuilder(); 
    101         InteractionPattern endsWithPattern = patternBuilder.concernedNode(ITERATION).startsWith(MOUSE_CLICK).contains(TEXT_INPUT).build(); 
    102         InteractionPattern pattern = patternBuilder.concernedNode(SEQUENCE).endsWith(endsWithPattern).build(); 
     99        InteractionPattern endsWithPattern = InteractionPatternBuilder.newPattern().rootTask(ITERATION).startsWithEvent(MOUSE_CLICK).containsEvent(TEXT_INPUT).patternFinished().build(); 
     100        InteractionPattern pattern = InteractionPatternBuilder.newPattern().rootTask(SEQUENCE).endsWithPattern(endsWithPattern).patternFinished().build(); 
    103101        // When 
    104102        boolean patternContained = pattern.containedIn(taskTree); 

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

    r1205 r1218  
    1515package de.ugoe.cs.autoquest.usability.rules.patterns.visitors.startswith; 
    1616 
    17 import static de.ugoe.cs.autoquest.usability.tasktree.filters.EventTypeFilter.MOUSE_CLICK; 
    18 import static de.ugoe.cs.autoquest.usability.tasktree.filters.EventTypeFilter.TEXT_INPUT; 
    19 import static de.ugoe.cs.autoquest.usability.tasktree.filters.TaskTypeFilter.SEQUENCE; 
     17import static de.ugoe.cs.autoquest.usability.taskmodel.filter.types.EventTypeFilter.MOUSE_CLICK; 
     18import static de.ugoe.cs.autoquest.usability.taskmodel.filter.types.EventTypeFilter.TEXT_INPUT; 
     19import static de.ugoe.cs.autoquest.usability.taskmodel.filter.types.TaskTypeFilter.SEQUENCE; 
    2020import static org.fest.assertions.api.Assertions.assertThat; 
    2121 
    … …  
    5252                      "}"; 
    5353        ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec); 
    54         InteractionPattern pattern = new InteractionPatternBuilder().concernedNode(SEQUENCE).startsWith(TEXT_INPUT).contains(MOUSE_CLICK).endsWith(TEXT_INPUT).build(); 
     54        InteractionPattern pattern = InteractionPatternBuilder.newPattern().rootTask(SEQUENCE).startsWithEvent(TEXT_INPUT).containsEvent(MOUSE_CLICK).endsWithEvent(TEXT_INPUT).patternFinished().build(); 
    5555        // When 
    5656        boolean patternContained = pattern.containedIn(taskTree); 
    … …  
    8383                      "}"; 
    8484        ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec); 
    85         InteractionPattern pattern = new InteractionPatternBuilder().concernedNode(SEQUENCE).startsWith(TEXT_INPUT).contains(MOUSE_CLICK).endsWith(TEXT_INPUT).build(); 
     85        InteractionPattern pattern = InteractionPatternBuilder.newPattern().rootTask(SEQUENCE).startsWithEvent(TEXT_INPUT).containsEvent(MOUSE_CLICK).endsWithEvent(TEXT_INPUT).patternFinished().build(); 
    8686        // When 
    8787        boolean patternContained = pattern.containedIn(taskTree); 

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

    r1205 r1218  
    1515package de.ugoe.cs.autoquest.usability.rules.patterns.visitors.startswith; 
    1616 
    17 import static de.ugoe.cs.autoquest.usability.tasktree.filters.EventTypeFilter.MOUSE_CLICK; 
    18 import static de.ugoe.cs.autoquest.usability.tasktree.filters.EventTypeFilter.TEXT_INPUT; 
    19 import static de.ugoe.cs.autoquest.usability.tasktree.filters.TaskTypeFilter.ITERATION; 
    20 import static de.ugoe.cs.autoquest.usability.tasktree.filters.TaskTypeFilter.SEQUENCE; 
     17import static de.ugoe.cs.autoquest.usability.taskmodel.filter.types.EventTypeFilter.MOUSE_CLICK; 
     18import static de.ugoe.cs.autoquest.usability.taskmodel.filter.types.EventTypeFilter.TEXT_INPUT; 
     19import static de.ugoe.cs.autoquest.usability.taskmodel.filter.types.TaskTypeFilter.ITERATION; 
     20import static de.ugoe.cs.autoquest.usability.taskmodel.filter.types.TaskTypeFilter.SEQUENCE; 
    2121import static org.fest.assertions.api.Assertions.assertThat; 
    2222 
    … …  
    5252                      "}"; 
    5353        ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec); 
    54         InteractionPattern pattern = new InteractionPatternBuilder().concernedNode(SEQUENCE).startsWith(TEXT_INPUT).endsWith(MOUSE_CLICK).build(); 
     54        InteractionPattern pattern = InteractionPatternBuilder.newPattern().rootTask(SEQUENCE).startsWithEvent(TEXT_INPUT).endsWithEvent(MOUSE_CLICK).patternFinished().build(); 
    5555        // When 
    5656        boolean patternContained = pattern.containedIn(taskTree); 
    … …  
    7676                      "}"; 
    7777        ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec); 
    78         InteractionPattern pattern = new InteractionPatternBuilder().concernedNode(ITERATION).startsWith(TEXT_INPUT).endsWith(MOUSE_CLICK).build(); 
     78        InteractionPattern pattern = InteractionPatternBuilder.newPattern().rootTask(ITERATION).startsWithEvent(TEXT_INPUT).endsWithEvent(MOUSE_CLICK).patternFinished().build(); 
    7979        // When 
    8080        boolean patternContained = pattern.containedIn(taskTree); 

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

    r1205 r1218  
    1515package de.ugoe.cs.autoquest.usability.rules.patterns.visitors.startswith; 
    1616 
    17 import static de.ugoe.cs.autoquest.usability.tasktree.filters.EventTypeFilter.MOUSE_CLICK; 
    18 import static de.ugoe.cs.autoquest.usability.tasktree.filters.EventTypeFilter.TEXT_INPUT; 
    19 import static de.ugoe.cs.autoquest.usability.tasktree.filters.TaskTypeFilter.ITERATION; 
    20 import static de.ugoe.cs.autoquest.usability.tasktree.filters.TaskTypeFilter.SEQUENCE; 
     17import static de.ugoe.cs.autoquest.usability.taskmodel.filter.types.EventTypeFilter.MOUSE_CLICK; 
     18import static de.ugoe.cs.autoquest.usability.taskmodel.filter.types.EventTypeFilter.TEXT_INPUT; 
     19import static de.ugoe.cs.autoquest.usability.taskmodel.filter.types.TaskTypeFilter.ITERATION; 
     20import static de.ugoe.cs.autoquest.usability.taskmodel.filter.types.TaskTypeFilter.SEQUENCE; 
    2121import static org.fest.assertions.api.Assertions.assertThat; 
    2222 
    … …  
    5555                      "}"; 
    5656        ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec); 
    57         InteractionPatternBuilder builder = new InteractionPatternBuilder(); 
    58         InteractionPattern startsWithPattern = builder.concernedNode(ITERATION).contains(MOUSE_CLICK).build(); 
    59         InteractionPattern containedPattern = builder.concernedNode(SEQUENCE).startsWith(MOUSE_CLICK).endsWith(TEXT_INPUT).build(); 
    60         InteractionPattern endsWithPattern = builder.concernedNode(ITERATION).contains(TEXT_INPUT).build(); 
    61         InteractionPattern pattern = new InteractionPatternBuilder().concernedNode(SEQUENCE).startsWith(startsWithPattern).contains(containedPattern).endsWith(endsWithPattern).build(); 
     57        InteractionPattern startsWithPattern = InteractionPatternBuilder.newPattern().rootTask(ITERATION).containsEvent(MOUSE_CLICK).patternFinished().build(); 
     58        InteractionPattern containedPattern = InteractionPatternBuilder.newPattern().rootTask(SEQUENCE).startsWithEvent(MOUSE_CLICK).endsWithEvent(TEXT_INPUT).patternFinished().build(); 
     59        InteractionPattern endsWithPattern = InteractionPatternBuilder.newPattern().rootTask(ITERATION).containsEvent(TEXT_INPUT).patternFinished().build(); 
     60        InteractionPattern pattern = InteractionPatternBuilder.newPattern().rootTask(SEQUENCE).startsWithPattern(startsWithPattern).containsPattern(containedPattern).endsWithPattern(endsWithPattern).patternFinished().build(); 
    6261        // When 
    6362        boolean patternContained = pattern.containedIn(taskTree); 
    … …  
    8483                      "}"; 
    8584        ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec); 
    86         InteractionPatternBuilder builder = new InteractionPatternBuilder(); 
    87         InteractionPattern startsWithPattern = builder.concernedNode(ITERATION).contains(MOUSE_CLICK).build(); 
    88         InteractionPattern containedPattern = builder.concernedNode(SEQUENCE).startsWith(MOUSE_CLICK).endsWith(TEXT_INPUT).build(); 
    89         InteractionPattern endsWithPattern = builder.concernedNode(ITERATION).contains(TEXT_INPUT).build(); 
    90         InteractionPattern pattern = new InteractionPatternBuilder().concernedNode(SEQUENCE).startsWith(startsWithPattern).contains(containedPattern).endsWith(endsWithPattern).build(); 
     85        InteractionPattern startsWithPattern = InteractionPatternBuilder.newPattern().rootTask(ITERATION).containsEvent(MOUSE_CLICK).patternFinished().build(); 
     86        InteractionPattern containedPattern = InteractionPatternBuilder.newPattern().rootTask(SEQUENCE).startsWithEvent(MOUSE_CLICK).endsWithEvent(TEXT_INPUT).patternFinished().build(); 
     87        InteractionPattern endsWithPattern = InteractionPatternBuilder.newPattern().rootTask(ITERATION).containsEvent(TEXT_INPUT).patternFinished().build(); 
     88        InteractionPattern pattern = InteractionPatternBuilder.newPattern().rootTask(SEQUENCE).startsWithPattern(startsWithPattern).containsPattern(containedPattern).endsWithPattern(endsWithPattern).patternFinished().build(); 
    9189        // When 
    9290        boolean patternContained = pattern.containedIn(taskTree); 

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

    r1205 r1218  
    1515package de.ugoe.cs.autoquest.usability.rules.patterns.visitors.startswith; 
    1616 
    17 import static de.ugoe.cs.autoquest.usability.tasktree.filters.EventTypeFilter.MOUSE_CLICK; 
    18 import static de.ugoe.cs.autoquest.usability.tasktree.filters.EventTypeFilter.TEXT_INPUT; 
    19 import static de.ugoe.cs.autoquest.usability.tasktree.filters.TaskTypeFilter.ITERATION; 
    20 import static de.ugoe.cs.autoquest.usability.tasktree.filters.TaskTypeFilter.SELECTION; 
    21 import static de.ugoe.cs.autoquest.usability.tasktree.filters.TaskTypeFilter.SEQUENCE; 
     17import static de.ugoe.cs.autoquest.usability.taskmodel.filter.types.EventTypeFilter.MOUSE_CLICK; 
     18import static de.ugoe.cs.autoquest.usability.taskmodel.filter.types.EventTypeFilter.TEXT_INPUT; 
     19import static de.ugoe.cs.autoquest.usability.taskmodel.filter.types.TaskTypeFilter.ITERATION; 
     20import static de.ugoe.cs.autoquest.usability.taskmodel.filter.types.TaskTypeFilter.SELECTION; 
     21import static de.ugoe.cs.autoquest.usability.taskmodel.filter.types.TaskTypeFilter.SEQUENCE; 
    2222import static org.fest.assertions.api.Assertions.assertThat; 
    2323 
    … …  
    5959                      "}"; 
    6060        ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec); 
    61         InteractionPatternBuilder patternBuilder = new InteractionPatternBuilder(); 
    62         InteractionPattern startsWithPattern = patternBuilder.concernedNode(ITERATION).contains(MOUSE_CLICK).build(); 
    63         InteractionPattern endsWithPattern = patternBuilder.concernedNode(SELECTION).startsWith(TEXT_INPUT).endsWith(MOUSE_CLICK).build(); 
    64         InteractionPattern pattern = patternBuilder.concernedNode(SEQUENCE).startsWith(startsWithPattern).endsWith(endsWithPattern).build(); 
     61        InteractionPattern startsWithPattern = InteractionPatternBuilder.newPattern().rootTask(ITERATION).containsEvent(MOUSE_CLICK).patternFinished().build(); 
     62        InteractionPattern endsWithPattern = InteractionPatternBuilder.newPattern().rootTask(SELECTION).startsWithEvent(TEXT_INPUT).endsWithEvent(MOUSE_CLICK).patternFinished().build(); 
     63        InteractionPattern pattern = InteractionPatternBuilder.newPattern().rootTask(SEQUENCE).startsWithPattern(startsWithPattern).endsWithPattern(endsWithPattern).patternFinished().build(); 
    6564        // When 
    6665        boolean patternContained = pattern.containedIn(taskTree); 
    … …  
    9089                      "}"; 
    9190        ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec); 
    92         InteractionPatternBuilder patternBuilder = new InteractionPatternBuilder(); 
    93         InteractionPattern startsWithPattern = patternBuilder.concernedNode(ITERATION).contains(MOUSE_CLICK).build(); 
    94         InteractionPattern endsWithPattern = patternBuilder.concernedNode(SELECTION).startsWith(TEXT_INPUT).endsWith(MOUSE_CLICK).build(); 
    95         InteractionPattern pattern = patternBuilder.concernedNode(ITERATION).startsWith(endsWithPattern).endsWith(startsWithPattern).build(); 
     91        InteractionPattern startsWithPattern = InteractionPatternBuilder.newPattern().rootTask(ITERATION).containsEvent(MOUSE_CLICK).patternFinished().build(); 
     92        InteractionPattern endsWithPattern = InteractionPatternBuilder.newPattern().rootTask(SELECTION).startsWithEvent(TEXT_INPUT).endsWithEvent(MOUSE_CLICK).patternFinished().build(); 
     93        InteractionPattern pattern = InteractionPatternBuilder.newPattern().rootTask(ITERATION).startsWithPattern(endsWithPattern).endsWithPattern(startsWithPattern).patternFinished().build(); 
    9694        // When 
    9795        boolean patternContained = pattern.containedIn(taskTree); 

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

    r1205 r1218  
    1515package de.ugoe.cs.autoquest.usability.rules.patterns.visitors.startswith; 
    1616 
    17 import static de.ugoe.cs.autoquest.usability.tasktree.filters.EventTypeFilter.MOUSE_CLICK; 
    18 import static de.ugoe.cs.autoquest.usability.tasktree.filters.EventTypeFilter.TEXT_INPUT; 
    19 import static de.ugoe.cs.autoquest.usability.tasktree.filters.TaskTypeFilter.SEQUENCE; 
     17import static de.ugoe.cs.autoquest.usability.taskmodel.filter.types.EventTypeFilter.MOUSE_CLICK; 
     18import static de.ugoe.cs.autoquest.usability.taskmodel.filter.types.EventTypeFilter.TEXT_INPUT; 
     19import static de.ugoe.cs.autoquest.usability.taskmodel.filter.types.TaskTypeFilter.SEQUENCE; 
    2020import static org.fest.assertions.api.Assertions.assertThat; 
    2121 
    … …  
    5151                      "}"; 
    5252        ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec); 
    53         InteractionPattern pattern = new InteractionPatternBuilder().concernedNode(SEQUENCE).startsWith(TEXT_INPUT).contains(MOUSE_CLICK).build(); 
     53        InteractionPattern pattern = InteractionPatternBuilder.newPattern().rootTask(SEQUENCE).startsWithEvent(TEXT_INPUT).containsEvent(MOUSE_CLICK).patternFinished().build(); 
    5454        // When 
    5555        boolean patternContained = pattern.containedIn(taskTree); 
    … …  
    8282                      "}"; 
    8383        ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec); 
    84         InteractionPattern pattern = new InteractionPatternBuilder().concernedNode(SEQUENCE).startsWith(TEXT_INPUT).contains(MOUSE_CLICK).build(); 
     84        InteractionPattern pattern = InteractionPatternBuilder.newPattern().rootTask(SEQUENCE).startsWithEvent(TEXT_INPUT).containsEvent(MOUSE_CLICK).patternFinished().build(); 
    8585        // When 
    8686        boolean patternContained = pattern.containedIn(taskTree); 

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

    r1205 r1218  
    1515package de.ugoe.cs.autoquest.usability.rules.patterns.visitors.startswith; 
    1616 
    17 import static de.ugoe.cs.autoquest.usability.tasktree.filters.EventTypeFilter.MOUSE_CLICK; 
    18 import static de.ugoe.cs.autoquest.usability.tasktree.filters.EventTypeFilter.TEXT_INPUT; 
    19 import static de.ugoe.cs.autoquest.usability.tasktree.filters.TaskTypeFilter.SELECTION; 
    20 import static de.ugoe.cs.autoquest.usability.tasktree.filters.TaskTypeFilter.SEQUENCE; 
     17import static de.ugoe.cs.autoquest.usability.taskmodel.filter.types.EventTypeFilter.MOUSE_CLICK; 
     18import static de.ugoe.cs.autoquest.usability.taskmodel.filter.types.EventTypeFilter.TEXT_INPUT; 
     19import static de.ugoe.cs.autoquest.usability.taskmodel.filter.types.TaskTypeFilter.SELECTION; 
     20import static de.ugoe.cs.autoquest.usability.taskmodel.filter.types.TaskTypeFilter.SEQUENCE; 
    2121import static org.fest.assertions.api.Assertions.assertThat; 
    2222 
    … …  
    5757                      "}"; 
    5858        ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec); 
    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(); 
     59        InteractionPattern endsWithPattern = InteractionPatternBuilder.newPattern().rootTask(SELECTION).startsWithEvent(MOUSE_CLICK).patternFinished().build(); 
     60        InteractionPattern pattern = InteractionPatternBuilder.newPattern().rootTask(SEQUENCE).startsWithEvent(TEXT_INPUT).endsWithPattern(endsWithPattern).patternFinished().build(); 
    6261        // When 
    6362        boolean patternContained = pattern.containedIn(taskTree); 
    … …  
    9392                      "}"; 
    9493        ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec); 
    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(); 
     94        InteractionPattern endsWithPattern = InteractionPatternBuilder.newPattern().rootTask(SEQUENCE).startsWithEvent(TEXT_INPUT).endsWithEvent(MOUSE_CLICK).patternFinished().build(); 
     95        InteractionPattern pattern = InteractionPatternBuilder.newPattern().rootTask(SEQUENCE).startsWithEvent(MOUSE_CLICK).endsWithPattern(endsWithPattern).patternFinished().build(); 
    9896        // When 
    9997        boolean patternContained = pattern.containedIn(taskTree); 

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

    r1205 r1218  
    1515package de.ugoe.cs.autoquest.usability.rules.patterns.visitors.startswith; 
    1616 
    17 import static de.ugoe.cs.autoquest.usability.tasktree.filters.EventTypeFilter.MOUSE_CLICK; 
    18 import static de.ugoe.cs.autoquest.usability.tasktree.filters.EventTypeFilter.TEXT_INPUT; 
    19 import static de.ugoe.cs.autoquest.usability.tasktree.filters.TaskTypeFilter.ITERATION; 
    20 import static de.ugoe.cs.autoquest.usability.tasktree.filters.TaskTypeFilter.SEQUENCE; 
     17import static de.ugoe.cs.autoquest.usability.taskmodel.filter.types.EventTypeFilter.MOUSE_CLICK; 
     18import static de.ugoe.cs.autoquest.usability.taskmodel.filter.types.EventTypeFilter.TEXT_INPUT; 
     19import static de.ugoe.cs.autoquest.usability.taskmodel.filter.types.TaskTypeFilter.ITERATION; 
     20import static de.ugoe.cs.autoquest.usability.taskmodel.filter.types.TaskTypeFilter.SEQUENCE; 
    2121import static org.fest.assertions.api.Assertions.assertThat; 
    2222 
    … …  
    5050                      "}"; 
    5151        ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec); 
    52         InteractionPatternBuilder builder = new InteractionPatternBuilder(); 
    53         InteractionPattern endsWithPattern = builder.concernedNode(ITERATION).startsWith(MOUSE_CLICK).build(); 
    54         InteractionPattern pattern = new InteractionPatternBuilder().concernedNode(SEQUENCE).startsWith(TEXT_INPUT).contains(MOUSE_CLICK).endsWith(endsWithPattern).build(); 
     52        InteractionPattern endsWithPattern = InteractionPatternBuilder.newPattern().rootTask(ITERATION).startsWithEvent(MOUSE_CLICK).patternFinished().build(); 
     53        InteractionPattern pattern = InteractionPatternBuilder.newPattern().rootTask(SEQUENCE).startsWithEvent(TEXT_INPUT).containsEvent(MOUSE_CLICK).endsWithPattern(endsWithPattern).patternFinished().build(); 
    5554        // When 
    5655        boolean patternContained = pattern.containedIn(taskTree); 
    … …  
    7271                      "}"; 
    7372        ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec); 
    74         InteractionPatternBuilder builder = new InteractionPatternBuilder(); 
    75         InteractionPattern endsWithPattern = builder.concernedNode(ITERATION).startsWith(MOUSE_CLICK).build(); 
    76         InteractionPattern pattern = new InteractionPatternBuilder().concernedNode(SEQUENCE).startsWith(TEXT_INPUT).contains(MOUSE_CLICK).endsWith(endsWithPattern).build(); 
     73        InteractionPattern endsWithPattern = InteractionPatternBuilder.newPattern().rootTask(ITERATION).startsWithEvent(MOUSE_CLICK).patternFinished().build(); 
     74        InteractionPattern pattern = InteractionPatternBuilder.newPattern().rootTask(SEQUENCE).startsWithEvent(TEXT_INPUT).containsEvent(MOUSE_CLICK).endsWithPattern(endsWithPattern).patternFinished().build(); 
    7775        // When 
    7876        boolean patternContained = pattern.containedIn(taskTree); 

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

    r1205 r1218  
    1515package de.ugoe.cs.autoquest.usability.rules.patterns.visitors.startswith; 
    1616 
    17 import static de.ugoe.cs.autoquest.usability.tasktree.filters.EventTypeFilter.MOUSE_CLICK; 
    18 import static de.ugoe.cs.autoquest.usability.tasktree.filters.EventTypeFilter.TEXT_INPUT; 
    19 import static de.ugoe.cs.autoquest.usability.tasktree.filters.TaskTypeFilter.ITERATION; 
    20 import static de.ugoe.cs.autoquest.usability.tasktree.filters.TaskTypeFilter.SEQUENCE; 
     17import static de.ugoe.cs.autoquest.usability.taskmodel.filter.types.EventTypeFilter.MOUSE_CLICK; 
     18import static de.ugoe.cs.autoquest.usability.taskmodel.filter.types.EventTypeFilter.TEXT_INPUT; 
     19import static de.ugoe.cs.autoquest.usability.taskmodel.filter.types.TaskTypeFilter.ITERATION; 
     20import static de.ugoe.cs.autoquest.usability.taskmodel.filter.types.TaskTypeFilter.SEQUENCE; 
    2121import static org.fest.assertions.api.Assertions.assertThat; 
    2222 
    … …  
    5050                      "}"; 
    5151        ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec); 
    52         InteractionPatternBuilder builder = new InteractionPatternBuilder(); 
    53         InteractionPattern endsWithPattern = builder.concernedNode(ITERATION).startsWith(MOUSE_CLICK).build(); 
    54         InteractionPattern pattern = new InteractionPatternBuilder().concernedNode(SEQUENCE).startsWith(TEXT_INPUT).endsWith(endsWithPattern).build(); 
     52        InteractionPattern endsWithPattern = InteractionPatternBuilder.newPattern().rootTask(ITERATION).startsWithEvent(MOUSE_CLICK).patternFinished().build(); 
     53        InteractionPattern pattern = InteractionPatternBuilder.newPattern().rootTask(SEQUENCE).startsWithEvent(TEXT_INPUT).endsWithPattern(endsWithPattern).patternFinished().build(); 
    5554        // When 
    5655        boolean patternContained = pattern.containedIn(taskTree); 
    … …  
    7271                      "}"; 
    7372        ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec); 
    74         InteractionPatternBuilder builder = new InteractionPatternBuilder(); 
    75         InteractionPattern endsWithPattern = builder.concernedNode(ITERATION).startsWith(MOUSE_CLICK).build(); 
    76         InteractionPattern pattern = new InteractionPatternBuilder().concernedNode(SEQUENCE).startsWith(TEXT_INPUT).endsWith(endsWithPattern).build(); 
     73        InteractionPattern endsWithPattern = InteractionPatternBuilder.newPattern().rootTask(ITERATION).startsWithEvent(MOUSE_CLICK).patternFinished().build(); 
     74        InteractionPattern pattern = InteractionPatternBuilder.newPattern().rootTask(SEQUENCE).startsWithEvent(TEXT_INPUT).endsWithPattern(endsWithPattern).patternFinished().build(); 
    7775        // When 
    7876        boolean patternContained = pattern.containedIn(taskTree); 

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

    r1205 r1218  
    1515package de.ugoe.cs.autoquest.usability.rules.patterns.visitors.startswith; 
    1616 
    17 import static de.ugoe.cs.autoquest.usability.tasktree.filters.EventTypeFilter.MOUSE_CLICK; 
    18 import static de.ugoe.cs.autoquest.usability.tasktree.filters.EventTypeFilter.TEXT_INPUT; 
    19 import static de.ugoe.cs.autoquest.usability.tasktree.filters.TaskTypeFilter.SELECTION; 
    20 import static de.ugoe.cs.autoquest.usability.tasktree.filters.TaskTypeFilter.SEQUENCE; 
     17import static de.ugoe.cs.autoquest.usability.taskmodel.filter.types.EventTypeFilter.MOUSE_CLICK; 
     18import static de.ugoe.cs.autoquest.usability.taskmodel.filter.types.EventTypeFilter.TEXT_INPUT; 
     19import static de.ugoe.cs.autoquest.usability.taskmodel.filter.types.TaskTypeFilter.SELECTION; 
     20import static de.ugoe.cs.autoquest.usability.taskmodel.filter.types.TaskTypeFilter.SEQUENCE; 
    2121import static org.fest.assertions.api.Assertions.assertThat; 
    2222 
    … …  
    6060                      "}"; 
    6161        ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec); 
    62         InteractionPatternBuilder builder = new InteractionPatternBuilder(); 
    63         InteractionPattern containedPattern = builder.concernedNode(SELECTION).startsWith(MOUSE_CLICK).endsWith(TEXT_INPUT).build(); 
    64         InteractionPattern pattern = new InteractionPatternBuilder().concernedNode(SEQUENCE).startsWith(TEXT_INPUT).contains(containedPattern).endsWith(TEXT_INPUT).build(); 
     62        InteractionPattern containedPattern = InteractionPatternBuilder.newPattern().rootTask(SELECTION).startsWithEvent(MOUSE_CLICK).endsWithEvent(TEXT_INPUT).patternFinished().build(); 
     63        InteractionPattern pattern = InteractionPatternBuilder.newPattern().rootTask(SEQUENCE).startsWithEvent(TEXT_INPUT).containsPattern(containedPattern).endsWithEvent(TEXT_INPUT).patternFinished().build(); 
    6564        // When 
    6665        boolean patternContained = pattern.containedIn(taskTree); 
    … …  
    9291                      "}"; 
    9392        ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec); 
    94         InteractionPatternBuilder builder = new InteractionPatternBuilder(); 
    95         InteractionPattern containedPattern = builder.concernedNode(SELECTION).startsWith(MOUSE_CLICK).endsWith(TEXT_INPUT).build(); 
    96         InteractionPattern pattern = new InteractionPatternBuilder().concernedNode(SEQUENCE).startsWith(TEXT_INPUT).contains(containedPattern).endsWith(TEXT_INPUT).build(); 
     93        InteractionPattern containedPattern = InteractionPatternBuilder.newPattern().rootTask(SELECTION).startsWithEvent(MOUSE_CLICK).endsWithEvent(TEXT_INPUT).patternFinished().build(); 
     94        InteractionPattern pattern = InteractionPatternBuilder.newPattern().rootTask(SEQUENCE).startsWithEvent(TEXT_INPUT).containsPattern(containedPattern).endsWithEvent(TEXT_INPUT).patternFinished().build(); 
    9795        // When 
    9896        boolean patternContained = pattern.containedIn(taskTree); 

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

    r1205 r1218  
    1515package de.ugoe.cs.autoquest.usability.rules.patterns.visitors.startswith; 
    1616 
    17 import static de.ugoe.cs.autoquest.usability.tasktree.filters.EventTypeFilter.MOUSE_CLICK; 
    18 import static de.ugoe.cs.autoquest.usability.tasktree.filters.EventTypeFilter.TEXT_INPUT; 
    19 import static de.ugoe.cs.autoquest.usability.tasktree.filters.TaskTypeFilter.ITERATION; 
    20 import static de.ugoe.cs.autoquest.usability.tasktree.filters.TaskTypeFilter.SELECTION; 
    21 import static de.ugoe.cs.autoquest.usability.tasktree.filters.TaskTypeFilter.SEQUENCE; 
     17import static de.ugoe.cs.autoquest.usability.taskmodel.filter.types.EventTypeFilter.MOUSE_CLICK; 
     18import static de.ugoe.cs.autoquest.usability.taskmodel.filter.types.EventTypeFilter.TEXT_INPUT; 
     19import static de.ugoe.cs.autoquest.usability.taskmodel.filter.types.TaskTypeFilter.ITERATION; 
     20import static de.ugoe.cs.autoquest.usability.taskmodel.filter.types.TaskTypeFilter.SELECTION; 
     21import static de.ugoe.cs.autoquest.usability.taskmodel.filter.types.TaskTypeFilter.SEQUENCE; 
    2222import static org.fest.assertions.api.Assertions.assertThat; 
    2323 
    … …  
    6161                      "}"; 
    6262        ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec); 
    63         InteractionPatternBuilder builder = new InteractionPatternBuilder(); 
    64         InteractionPattern containedPattern = builder.concernedNode(SELECTION).startsWith(MOUSE_CLICK).endsWith(TEXT_INPUT).build(); 
    65         InteractionPattern endsWithPattern = builder.concernedNode(ITERATION).startsWith(MOUSE_CLICK).build(); 
    66         InteractionPattern pattern = new InteractionPatternBuilder().concernedNode(SEQUENCE).startsWith(TEXT_INPUT).contains(containedPattern).endsWith(endsWithPattern).build(); 
     63        InteractionPattern containedPattern = InteractionPatternBuilder.newPattern().rootTask(SELECTION).startsWithEvent(MOUSE_CLICK).endsWithEvent(TEXT_INPUT).patternFinished().build(); 
     64        InteractionPattern endsWithPattern = InteractionPatternBuilder.newPattern().rootTask(ITERATION).startsWithEvent(MOUSE_CLICK).patternFinished().build(); 
     65        InteractionPattern pattern = InteractionPatternBuilder.newPattern().rootTask(SEQUENCE).startsWithEvent(TEXT_INPUT).containsPattern(containedPattern).endsWithPattern(endsWithPattern).patternFinished().build(); 
    6766        // When 
    6867        boolean patternContained = pattern.containedIn(taskTree); 
    … …  
    9190                      "}"; 
    9291        ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec); 
    93         InteractionPatternBuilder builder = new InteractionPatternBuilder(); 
    94         InteractionPattern endsWithPattern = builder.concernedNode(ITERATION).startsWith(MOUSE_CLICK).build(); 
    95         InteractionPattern pattern = new InteractionPatternBuilder().concernedNode(SEQUENCE).startsWith(TEXT_INPUT).contains(MOUSE_CLICK).endsWith(endsWithPattern).build(); 
     92        InteractionPattern endsWithPattern = InteractionPatternBuilder.newPattern().rootTask(ITERATION).startsWithEvent(MOUSE_CLICK).patternFinished().build(); 
     93        InteractionPattern pattern = InteractionPatternBuilder.newPattern().rootTask(SEQUENCE).startsWithEvent(TEXT_INPUT).containsEvent(MOUSE_CLICK).endsWithPattern(endsWithPattern).patternFinished().build(); 
    9694        // When 
    9795        boolean patternContained = pattern.containedIn(taskTree); 

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

    r1205 r1218  
    1515package de.ugoe.cs.autoquest.usability.rules.patterns.visitors.startswith; 
    1616 
    17 import static de.ugoe.cs.autoquest.usability.tasktree.filters.EventTypeFilter.TEXT_INPUT; 
    18 import static de.ugoe.cs.autoquest.usability.tasktree.filters.TaskTypeFilter.SEQUENCE; 
     17import static de.ugoe.cs.autoquest.usability.taskmodel.filter.types.EventTypeFilter.TEXT_INPUT; 
     18import static de.ugoe.cs.autoquest.usability.taskmodel.filter.types.TaskTypeFilter.SEQUENCE; 
    1919import static org.fest.assertions.api.Assertions.assertThat; 
    2020 
    … …  
    3939        // Given 
    4040        String spec = "UserSession {" + 
    41                               "  Selection sel1 {" + 
     41                      "  Selection sel1 {" + 
    4242                      "    EventTask target1 {}" + 
    4343                      "  }" + 
    … …  
    5050                      "}"; 
    5151        ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec); 
    52         InteractionPattern pattern = new InteractionPatternBuilder().concernedNode(SEQUENCE).startsWith(TEXT_INPUT).build(); 
     52        InteractionPattern pattern = InteractionPatternBuilder.newPattern().rootTask(SEQUENCE).startsWithEvent(TEXT_INPUT).patternFinished().build(); 
    5353        // When 
    5454        boolean patternContained = pattern.containedIn(taskTree); 
    … …  
    6161        // Given 
    6262        String spec = "UserSession {" + 
    63                               "  Iteration iter1 {" + 
     63                      "  Iteration iter1 {" + 
    6464                      "    Selection sel1 {" + 
    6565                      "      EventTask target2 {}" + 
    … …  
    7171                      "}"; 
    7272        ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec); 
    73         InteractionPattern pattern = new InteractionPatternBuilder().concernedNode(SEQUENCE).startsWith(TEXT_INPUT).build(); 
     73        InteractionPattern pattern = InteractionPatternBuilder.newPattern().rootTask(SEQUENCE).startsWithEvent(TEXT_INPUT).patternFinished().build(); 
    7474        // When 
    7575        boolean patternContained = pattern.containedIn(taskTree); 

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

    r1205 r1218  
    1515package de.ugoe.cs.autoquest.usability.rules.patterns.visitors.startswith; 
    1616 
    17 import static de.ugoe.cs.autoquest.usability.tasktree.filters.EventTypeFilter.MOUSE_CLICK; 
    18 import static de.ugoe.cs.autoquest.usability.tasktree.filters.EventTypeFilter.TEXT_INPUT; 
    19 import static de.ugoe.cs.autoquest.usability.tasktree.filters.TaskTypeFilter.ITERATION; 
    20 import static de.ugoe.cs.autoquest.usability.tasktree.filters.TaskTypeFilter.SEQUENCE; 
     17import static de.ugoe.cs.autoquest.usability.taskmodel.filter.types.EventTypeFilter.MOUSE_CLICK; 
     18import static de.ugoe.cs.autoquest.usability.taskmodel.filter.types.EventTypeFilter.TEXT_INPUT; 
     19import static de.ugoe.cs.autoquest.usability.taskmodel.filter.types.TaskTypeFilter.ITERATION; 
     20import static de.ugoe.cs.autoquest.usability.taskmodel.filter.types.TaskTypeFilter.SEQUENCE; 
    2121import static org.fest.assertions.api.Assertions.assertThat; 
    2222 
    … …  
    5454                      "}"; 
    5555        ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec); 
    56         InteractionPatternBuilder patternBuilder = new InteractionPatternBuilder(); 
    57         InteractionPattern startsWithPattern = patternBuilder.concernedNode(ITERATION).startsWith(TEXT_INPUT).build(); 
    58         InteractionPattern pattern = patternBuilder.concernedNode(SEQUENCE).startsWith(startsWithPattern).contains(MOUSE_CLICK).build(); 
     56        InteractionPattern startsWithPattern = InteractionPatternBuilder.newPattern().rootTask(ITERATION).startsWithEvent(TEXT_INPUT).patternFinished().build(); 
     57        InteractionPattern pattern = InteractionPatternBuilder.newPattern().rootTask(SEQUENCE).startsWithPattern(startsWithPattern).containsEvent(MOUSE_CLICK).patternFinished().build(); 
    5958        // When 
    6059        boolean patternContained = pattern.containedIn(taskTree); 
    … …  
    7978                      "}"; 
    8079        ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec); 
    81         InteractionPatternBuilder patternBuilder = new InteractionPatternBuilder(); 
    82         InteractionPattern startsWithPattern = patternBuilder.concernedNode(ITERATION).contains(TEXT_INPUT).build(); 
    83         InteractionPattern pattern = patternBuilder.concernedNode(SEQUENCE).startsWith(startsWithPattern).contains(MOUSE_CLICK).build(); 
     80        InteractionPattern startsWithPattern = InteractionPatternBuilder.newPattern().rootTask(ITERATION).containsEvent(TEXT_INPUT).patternFinished().build(); 
     81        InteractionPattern pattern = InteractionPatternBuilder.newPattern().rootTask(SEQUENCE).startsWithPattern(startsWithPattern).containsEvent(MOUSE_CLICK).patternFinished().build(); 
    8482        // When 
    8583        boolean patternContained = pattern.containedIn(taskTree); 

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

    r1205 r1218  
    1515package de.ugoe.cs.autoquest.usability.rules.patterns.visitors.startswith; 
    1616 
    17 import static de.ugoe.cs.autoquest.usability.tasktree.filters.EventTypeFilter.MOUSE_CLICK; 
    18 import static de.ugoe.cs.autoquest.usability.tasktree.filters.EventTypeFilter.TEXT_INPUT; 
    19 import static de.ugoe.cs.autoquest.usability.tasktree.filters.TaskTypeFilter.ITERATION; 
    20 import static de.ugoe.cs.autoquest.usability.tasktree.filters.TaskTypeFilter.SELECTION; 
    21 import static de.ugoe.cs.autoquest.usability.tasktree.filters.TaskTypeFilter.SEQUENCE; 
     17import static de.ugoe.cs.autoquest.usability.taskmodel.filter.types.EventTypeFilter.MOUSE_CLICK; 
     18import static de.ugoe.cs.autoquest.usability.taskmodel.filter.types.EventTypeFilter.TEXT_INPUT; 
     19import static de.ugoe.cs.autoquest.usability.taskmodel.filter.types.TaskTypeFilter.ITERATION; 
     20import static de.ugoe.cs.autoquest.usability.taskmodel.filter.types.TaskTypeFilter.SELECTION; 
     21import static de.ugoe.cs.autoquest.usability.taskmodel.filter.types.TaskTypeFilter.SEQUENCE; 
    2222import static org.fest.assertions.api.Assertions.assertThat; 
    2323 
    … …  
    6262                      "}"; 
    6363        ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec); 
    64         InteractionPatternBuilder patternBuilder = new InteractionPatternBuilder(); 
    65         InteractionPattern startsWithPattern = patternBuilder.concernedNode(ITERATION).contains(MOUSE_CLICK).build(); 
    66         InteractionPattern containedPattern = patternBuilder.concernedNode(SELECTION).startsWith(TEXT_INPUT).endsWith(MOUSE_CLICK).build(); 
    67         InteractionPattern pattern = patternBuilder.concernedNode(SEQUENCE).startsWith(startsWithPattern).contains(containedPattern).build(); 
     64        InteractionPattern startsWithPattern = InteractionPatternBuilder.newPattern().rootTask(ITERATION).containsEvent(MOUSE_CLICK).patternFinished().build(); 
     65        InteractionPattern containedPattern = InteractionPatternBuilder.newPattern().rootTask(SELECTION).startsWithEvent(TEXT_INPUT).endsWithEvent(MOUSE_CLICK).patternFinished().build(); 
     66        InteractionPattern pattern = InteractionPatternBuilder.newPattern().rootTask(SEQUENCE).startsWithPattern(startsWithPattern).containsPattern(containedPattern).patternFinished().build(); 
    6867        // When 
    6968        boolean patternContained = pattern.containedIn(taskTree); 
    … …  
    9695                      "}"; 
    9796        ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec); 
    98         InteractionPatternBuilder patternBuilder = new InteractionPatternBuilder(); 
    99         InteractionPattern startsWithPattern = patternBuilder.concernedNode(ITERATION).contains(MOUSE_CLICK).build(); 
    100         InteractionPattern endsWithPattern = patternBuilder.concernedNode(SELECTION).startsWith(TEXT_INPUT).endsWith(MOUSE_CLICK).build(); 
    101         InteractionPattern pattern = patternBuilder.concernedNode(ITERATION).startsWith(endsWithPattern).endsWith(startsWithPattern).build(); 
     97        InteractionPattern startsWithPattern = InteractionPatternBuilder.newPattern().rootTask(ITERATION).containsEvent(MOUSE_CLICK).patternFinished().build(); 
     98        InteractionPattern endsWithPattern = InteractionPatternBuilder.newPattern().rootTask(SELECTION).startsWithEvent(TEXT_INPUT).endsWithEvent(MOUSE_CLICK).patternFinished().build(); 
     99        InteractionPattern pattern = InteractionPatternBuilder.newPattern().rootTask(ITERATION).startsWithPattern(endsWithPattern).endsWithPattern(startsWithPattern).patternFinished().build(); 
    102100        // When 
    103101        boolean patternContained = pattern.containedIn(taskTree); 

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

    r1205 r1218  
    1515package de.ugoe.cs.autoquest.usability.rules.patterns.visitors.startswith; 
    1616 
    17 import static de.ugoe.cs.autoquest.usability.tasktree.filters.EventTypeFilter.MOUSE_CLICK; 
    18 import static de.ugoe.cs.autoquest.usability.tasktree.filters.EventTypeFilter.TEXT_INPUT; 
    19 import static de.ugoe.cs.autoquest.usability.tasktree.filters.TaskTypeFilter.SELECTION; 
    20 import static de.ugoe.cs.autoquest.usability.tasktree.filters.TaskTypeFilter.SEQUENCE; 
     17import static de.ugoe.cs.autoquest.usability.taskmodel.filter.types.EventTypeFilter.MOUSE_CLICK; 
     18import static de.ugoe.cs.autoquest.usability.taskmodel.filter.types.EventTypeFilter.TEXT_INPUT; 
     19import static de.ugoe.cs.autoquest.usability.taskmodel.filter.types.TaskTypeFilter.SELECTION; 
     20import static de.ugoe.cs.autoquest.usability.taskmodel.filter.types.TaskTypeFilter.SEQUENCE; 
    2121import static org.fest.assertions.api.Assertions.assertThat; 
    2222 
    … …  
    5959                      "}"; 
    6060        ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec); 
    61         InteractionPatternBuilder patternBuilder = new InteractionPatternBuilder(); 
    62         InteractionPattern startsWithPattern = patternBuilder.concernedNode(SELECTION).startsWith(TEXT_INPUT).endsWith(MOUSE_CLICK).build(); 
    63         InteractionPattern pattern = patternBuilder.concernedNode(SEQUENCE).startsWith(startsWithPattern).endsWith(TEXT_INPUT).build(); 
     61        InteractionPattern startsWithPattern = InteractionPatternBuilder.newPattern().rootTask(SELECTION).startsWithEvent(TEXT_INPUT).endsWithEvent(MOUSE_CLICK).patternFinished().build(); 
     62        InteractionPattern pattern = InteractionPatternBuilder.newPattern().rootTask(SEQUENCE).startsWithPattern(startsWithPattern).endsWithEvent(TEXT_INPUT).patternFinished().build(); 
    6463        // When 
    6564        boolean patternContained = pattern.containedIn(taskTree); 
    … …  
    9089                      "}"; 
    9190        ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec); 
    92         InteractionPatternBuilder patternBuilder = new InteractionPatternBuilder(); 
    93         InteractionPattern startsWithPattern = patternBuilder.concernedNode(SELECTION).startsWith(TEXT_INPUT).endsWith(MOUSE_CLICK).build(); 
    94         InteractionPattern pattern = patternBuilder.concernedNode(SEQUENCE).startsWith(startsWithPattern).endsWith(TEXT_INPUT).build(); 
     91        InteractionPattern startsWithPattern = InteractionPatternBuilder.newPattern().rootTask(SELECTION).startsWithEvent(TEXT_INPUT).endsWithEvent(MOUSE_CLICK).patternFinished().build(); 
     92        InteractionPattern pattern = InteractionPatternBuilder.newPattern().rootTask(SEQUENCE).startsWithPattern(startsWithPattern).endsWithEvent(TEXT_INPUT).patternFinished().build(); 
    9593        // When 
    9694        boolean patternContained = pattern.containedIn(taskTree); 

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

    r1205 r1218  
    1515package de.ugoe.cs.autoquest.usability.rules.patterns.visitors.startswith; 
    1616 
    17 import static de.ugoe.cs.autoquest.usability.tasktree.filters.EventTypeFilter.MOUSE_CLICK; 
    18 import static de.ugoe.cs.autoquest.usability.tasktree.filters.EventTypeFilter.TEXT_INPUT; 
    19 import static de.ugoe.cs.autoquest.usability.tasktree.filters.TaskTypeFilter.SELECTION; 
    20 import static de.ugoe.cs.autoquest.usability.tasktree.filters.TaskTypeFilter.SEQUENCE; 
     17import static de.ugoe.cs.autoquest.usability.taskmodel.filter.types.EventTypeFilter.MOUSE_CLICK; 
     18import static de.ugoe.cs.autoquest.usability.taskmodel.filter.types.EventTypeFilter.TEXT_INPUT; 
     19import static de.ugoe.cs.autoquest.usability.taskmodel.filter.types.TaskTypeFilter.SELECTION; 
     20import static de.ugoe.cs.autoquest.usability.taskmodel.filter.types.TaskTypeFilter.SEQUENCE; 
    2121import static org.fest.assertions.api.Assertions.assertThat; 
    2222 
    … …  
    5959                      "}"; 
    6060        ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec); 
    61         InteractionPatternBuilder patternBuilder = new InteractionPatternBuilder(); 
    62         InteractionPattern startsWithPattern = patternBuilder.concernedNode(SELECTION).startsWith(TEXT_INPUT).endsWith(MOUSE_CLICK).build(); 
    63         InteractionPattern pattern = patternBuilder.concernedNode(SEQUENCE).startsWith(startsWithPattern).contains(MOUSE_CLICK).endsWith(TEXT_INPUT).build(); 
     61        InteractionPattern startsWithPattern = InteractionPatternBuilder.newPattern().rootTask(SELECTION).startsWithEvent(TEXT_INPUT).endsWithEvent(MOUSE_CLICK).patternFinished().build(); 
     62        InteractionPattern pattern = InteractionPatternBuilder.newPattern().rootTask(SEQUENCE).startsWithPattern(startsWithPattern).containsEvent(MOUSE_CLICK).endsWithEvent(TEXT_INPUT).patternFinished().build(); 
    6463        // When 
    6564        boolean patternContained = pattern.containedIn(taskTree); 
    … …  
    9089                      "}"; 
    9190        ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec); 
    92         InteractionPatternBuilder patternBuilder = new InteractionPatternBuilder(); 
    93         InteractionPattern startsWithPattern = patternBuilder.concernedNode(SELECTION).startsWith(TEXT_INPUT).endsWith(MOUSE_CLICK).build(); 
    94         InteractionPattern pattern = patternBuilder.concernedNode(SEQUENCE).startsWith(startsWithPattern).contains(MOUSE_CLICK).endsWith(TEXT_INPUT).build(); 
     91        InteractionPattern startsWithPattern = InteractionPatternBuilder.newPattern().rootTask(SELECTION).startsWithEvent(TEXT_INPUT).endsWithEvent(MOUSE_CLICK).patternFinished().build(); 
     92        InteractionPattern pattern = InteractionPatternBuilder.newPattern().rootTask(SEQUENCE).startsWithPattern(startsWithPattern).containsEvent(MOUSE_CLICK).endsWithEvent(TEXT_INPUT).patternFinished().build(); 
    9593        // When 
    9694        boolean patternContained = pattern.containedIn(taskTree); 

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

    r1205 r1218  
    1515package de.ugoe.cs.autoquest.usability.rules.patterns.visitors.startswith; 
    1616 
    17 import static de.ugoe.cs.autoquest.usability.tasktree.filters.EventTypeFilter.MOUSE_CLICK; 
    18 import static de.ugoe.cs.autoquest.usability.tasktree.filters.EventTypeFilter.SCROLL; 
    19 import static de.ugoe.cs.autoquest.usability.tasktree.filters.EventTypeFilter.TEXT_INPUT; 
    20 import static de.ugoe.cs.autoquest.usability.tasktree.filters.TaskTypeFilter.SELECTION; 
    21 import static de.ugoe.cs.autoquest.usability.tasktree.filters.TaskTypeFilter.SEQUENCE; 
     17import static de.ugoe.cs.autoquest.usability.taskmodel.filter.types.EventTypeFilter.MOUSE_CLICK; 
     18import static de.ugoe.cs.autoquest.usability.taskmodel.filter.types.EventTypeFilter.SCROLL; 
     19import static de.ugoe.cs.autoquest.usability.taskmodel.filter.types.EventTypeFilter.TEXT_INPUT; 
     20import static de.ugoe.cs.autoquest.usability.taskmodel.filter.types.TaskTypeFilter.SELECTION; 
     21import static de.ugoe.cs.autoquest.usability.taskmodel.filter.types.TaskTypeFilter.SEQUENCE; 
    2222import static org.fest.assertions.api.Assertions.assertThat; 
    2323 
    … …  
    7272                      "}"; 
    7373        ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec); 
    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(); 
     74        InteractionPattern startsWithPattern = InteractionPatternBuilder.newPattern().rootTask(SELECTION).startsWithEvent(TEXT_INPUT).endsWithEvent(MOUSE_CLICK).patternFinished().build(); 
     75        InteractionPattern endsWithPattern = InteractionPatternBuilder.newPattern().rootTask(SELECTION).startsWithEvent(TEXT_INPUT).endsWithEvent(MOUSE_CLICK).patternFinished().build(); 
     76        InteractionPattern pattern = InteractionPatternBuilder.newPattern().rootTask(SEQUENCE).startsWithPattern(startsWithPattern).containsEvent(MOUSE_CLICK).endsWithPattern(endsWithPattern).patternFinished().build(); 
    7877        // When 
    7978        boolean patternContained = pattern.containedIn(taskTree); 
    … …  
    116115                      "}"; 
    117116        ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec); 
    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(); 
     117        InteractionPattern startsWithPattern = InteractionPatternBuilder.newPattern().rootTask(SELECTION).startsWithEvent(TEXT_INPUT).endsWithEvent(MOUSE_CLICK).patternFinished().build(); 
     118        InteractionPattern endsWithPattern = InteractionPatternBuilder.newPattern().rootTask(SELECTION).startsWithEvent(TEXT_INPUT).endsWithEvent(MOUSE_CLICK).patternFinished().build(); 
     119        InteractionPattern pattern = InteractionPatternBuilder.newPattern().rootTask(SEQUENCE).startsWithPattern(startsWithPattern).containsEvent(SCROLL).endsWithPattern(endsWithPattern).patternFinished().build(); 
    122120        // When 
    123121        boolean patternContained = pattern.containedIn(taskTree); 

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

    r1205 r1218  
    1515package de.ugoe.cs.autoquest.usability.rules.patterns.visitors.startswith; 
    1616 
    17 import static de.ugoe.cs.autoquest.usability.tasktree.filters.EventTypeFilter.MOUSE_CLICK; 
    18 import static de.ugoe.cs.autoquest.usability.tasktree.filters.EventTypeFilter.TEXT_INPUT; 
    19 import static de.ugoe.cs.autoquest.usability.tasktree.filters.TaskTypeFilter.SELECTION; 
    20 import static de.ugoe.cs.autoquest.usability.tasktree.filters.TaskTypeFilter.SEQUENCE; 
     17import static de.ugoe.cs.autoquest.usability.taskmodel.filter.types.EventTypeFilter.MOUSE_CLICK; 
     18import static de.ugoe.cs.autoquest.usability.taskmodel.filter.types.EventTypeFilter.TEXT_INPUT; 
     19import static de.ugoe.cs.autoquest.usability.taskmodel.filter.types.TaskTypeFilter.SELECTION; 
     20import static de.ugoe.cs.autoquest.usability.taskmodel.filter.types.TaskTypeFilter.SEQUENCE; 
    2121import static org.fest.assertions.api.Assertions.assertThat; 
    2222 
    … …  
    6262                      "}"; 
    6363        ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec); 
    64         InteractionPatternBuilder patternBuilder = new InteractionPatternBuilder(); 
    65         InteractionPattern startsWithPattern = patternBuilder.concernedNode(SELECTION).startsWith(TEXT_INPUT).endsWith(MOUSE_CLICK).build(); 
    66         InteractionPattern containsPattern = patternBuilder.concernedNode(SEQUENCE).startsWith(MOUSE_CLICK).build(); 
    67         InteractionPattern pattern = patternBuilder.concernedNode(SEQUENCE).startsWith(startsWithPattern).contains(containsPattern).endsWith(TEXT_INPUT).build(); 
     64        InteractionPattern startsWithPattern = InteractionPatternBuilder.newPattern().rootTask(SELECTION).startsWithEvent(TEXT_INPUT).endsWithEvent(MOUSE_CLICK).patternFinished().build(); 
     65        InteractionPattern containsPattern = InteractionPatternBuilder.newPattern().rootTask(SEQUENCE).startsWithEvent(MOUSE_CLICK).patternFinished().build(); 
     66        InteractionPattern pattern = InteractionPatternBuilder.newPattern().rootTask(SEQUENCE).startsWithPattern(startsWithPattern).containsPattern(containsPattern).endsWithEvent(TEXT_INPUT).patternFinished().build(); 
    6867        // When 
    6968        boolean patternContained = pattern.containedIn(taskTree); 
    … …  
    9796                      "}"; 
    9897        ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec); 
    99         InteractionPatternBuilder patternBuilder = new InteractionPatternBuilder(); 
    100         InteractionPattern startsWithPattern = patternBuilder.concernedNode(SELECTION).startsWith(TEXT_INPUT).endsWith(MOUSE_CLICK).build(); 
    101         InteractionPattern containsPattern = patternBuilder.concernedNode(SEQUENCE).startsWith(MOUSE_CLICK).endsWith(TEXT_INPUT).build(); 
    102         InteractionPattern pattern = patternBuilder.concernedNode(SEQUENCE).startsWith(startsWithPattern).contains(containsPattern).endsWith(TEXT_INPUT).build(); 
     98        InteractionPattern startsWithPattern = InteractionPatternBuilder.newPattern().rootTask(SELECTION).startsWithEvent(TEXT_INPUT).endsWithEvent(MOUSE_CLICK).patternFinished().build(); 
     99        InteractionPattern containsPattern = InteractionPatternBuilder.newPattern().rootTask(SEQUENCE).startsWithEvent(MOUSE_CLICK).endsWithEvent(TEXT_INPUT).patternFinished().build(); 
     100        InteractionPattern pattern = InteractionPatternBuilder.newPattern().rootTask(SEQUENCE).startsWithPattern(startsWithPattern).containsPattern(containsPattern).endsWithEvent(TEXT_INPUT).patternFinished().build(); 
    103101        // When 
    104102        boolean patternContained = pattern.containedIn(taskTree); 

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

    r1205 r1218  
    1515package de.ugoe.cs.autoquest.usability.rules.patterns.visitors.startswith; 
    1616 
    17 import static de.ugoe.cs.autoquest.usability.tasktree.filters.EventTypeFilter.MOUSE_CLICK; 
    18 import static de.ugoe.cs.autoquest.usability.tasktree.filters.EventTypeFilter.TEXT_INPUT; 
    19 import static de.ugoe.cs.autoquest.usability.tasktree.filters.TaskTypeFilter.ITERATION; 
    20 import static de.ugoe.cs.autoquest.usability.tasktree.filters.TaskTypeFilter.SEQUENCE; 
     17import static de.ugoe.cs.autoquest.usability.taskmodel.filter.types.EventTypeFilter.MOUSE_CLICK; 
     18import static de.ugoe.cs.autoquest.usability.taskmodel.filter.types.EventTypeFilter.TEXT_INPUT; 
     19import static de.ugoe.cs.autoquest.usability.taskmodel.filter.types.TaskTypeFilter.ITERATION; 
     20import static de.ugoe.cs.autoquest.usability.taskmodel.filter.types.TaskTypeFilter.SEQUENCE; 
    2121import static org.fest.assertions.api.Assertions.assertThat; 
    2222 
    … …  
    5757                      "}"; 
    5858        ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec); 
    59         InteractionPatternBuilder patternBuilder = new InteractionPatternBuilder(); 
    60         InteractionPattern startsWithPattern = patternBuilder.concernedNode(ITERATION).startsWith(TEXT_INPUT).contains(MOUSE_CLICK).build(); 
    61         InteractionPattern pattern = patternBuilder.concernedNode(SEQUENCE).startsWith(startsWithPattern).build(); 
     59        InteractionPattern startsWithPattern = InteractionPatternBuilder.newPattern().rootTask(ITERATION).startsWithEvent(TEXT_INPUT).containsEvent(MOUSE_CLICK).patternFinished().build(); 
     60        InteractionPattern pattern = InteractionPatternBuilder.newPattern().rootTask(SEQUENCE).startsWithPattern(startsWithPattern).patternFinished().build(); 
    6261        // When 
    6362        boolean patternContained = pattern.containedIn(taskTree); 
    … …  
    8685                      "}"; 
    8786        ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec); 
    88         InteractionPatternBuilder patternBuilder = new InteractionPatternBuilder(); 
    89         InteractionPattern startsWithPattern = patternBuilder.concernedNode(SEQUENCE).startsWith(MOUSE_CLICK).endsWith(TEXT_INPUT).build(); 
    90         InteractionPattern pattern = patternBuilder.concernedNode(SEQUENCE).startsWith(startsWithPattern).build(); 
     87        InteractionPattern startsWithPattern = InteractionPatternBuilder.newPattern().rootTask(SEQUENCE).startsWithEvent(MOUSE_CLICK).endsWithEvent(TEXT_INPUT).patternFinished().build(); 
     88        InteractionPattern pattern = InteractionPatternBuilder.newPattern().rootTask(SEQUENCE).startsWithPattern(startsWithPattern).patternFinished().build(); 
    9189        // When 
    9290        boolean patternContained = pattern.containedIn(taskTree); 

  • trunk/autoquest-core-usability-evaluation-test/src/main/java/de/ugoe/cs/autoquest/usability/testutil/FestConditionUtil.java

    r1141 r1218  
    1919import com.google.common.base.Optional; 
    2020 
    21 import de.ugoe.cs.autoquest.usability.result.UsabilityDefect; 
    22 import de.ugoe.cs.autoquest.usability.result.UsabilityDefectSeverityLevel; 
     21import de.ugoe.cs.autoquest.usability.result.UsabilityProblemDescription; 
     22import de.ugoe.cs.autoquest.usability.result.UsabilityProblemSeverityLevel; 
    2323import de.ugoe.cs.autoquest.usability.rules.UsabilityResult; 
    2424 
    … …  
    4141            @Override 
    4242            public boolean matches(UsabilityResult usabilityResult) { 
    43                 return !usabilityResult.hasDefects(); 
     43                return !usabilityResult.hasDetectedProblems(); 
    4444            } 
    4545        }; 
    … …  
    5151            @Override 
    5252            public boolean matches(UsabilityResult usabilityResult) { 
    53                 return usabilityResult.hasDefects(); 
     53                return usabilityResult.hasDetectedProblems(); 
    5454            } 
    5555        }; 
    5656    } 
    5757 
    58     public static Condition<Optional<UsabilityDefect>> present() { 
    59         return new Condition<Optional<UsabilityDefect>>() { 
     58    public static Condition<Optional<UsabilityProblemDescription>> present() { 
     59        return new Condition<Optional<UsabilityProblemDescription>>() { 
    6060 
    6161            @Override 
    62             public boolean matches(Optional<UsabilityDefect> usabilityGuidlineRecommendation) { 
     62            public boolean matches(Optional<UsabilityProblemDescription> usabilityGuidlineRecommendation) { 
    6363                return usabilityGuidlineRecommendation.isPresent(); 
    6464            } 
    … …  
    6767    } 
    6868 
    69     public static Condition<Optional<UsabilityDefect>> absent() { 
    70         return new Condition<Optional<UsabilityDefect>>() { 
     69    public static Condition<Optional<UsabilityProblemDescription>> absent() { 
     70        return new Condition<Optional<UsabilityProblemDescription>>() { 
    7171 
    7272            @Override 
    73             public boolean matches(Optional<UsabilityDefect> usabilityGuidlineRecommendation) { 
     73            public boolean matches(Optional<UsabilityProblemDescription> usabilityGuidlineRecommendation) { 
    7474                return !usabilityGuidlineRecommendation.isPresent(); 
    7575            } 
    … …  
    7878    } 
    7979 
    80     public static Condition<Optional<UsabilityDefect>> infoRecommendationSeverityLevel() { 
    81         return new Condition<Optional<UsabilityDefect>>() { 
     80    public static Condition<Optional<UsabilityProblemDescription>> infoRecommendationSeverityLevel() { 
     81        return new Condition<Optional<UsabilityProblemDescription>>() { 
    8282 
    8383            @Override 
    84             public boolean matches(Optional<UsabilityDefect> usabilityGuidlineRecommendation) { 
     84            public boolean matches(Optional<UsabilityProblemDescription> usabilityGuidlineRecommendation) { 
    8585                return usabilityGuidlineRecommendation.get().getSeverityLevel() 
    86                     .equals(UsabilityDefectSeverityLevel.INFO); 
     86                    .equals(UsabilityProblemSeverityLevel.INFO); 
    8787            } 
    8888 
    … …  
    9090    } 
    9191 
    92     public static Condition<Optional<UsabilityDefect>> lowRecommendationSeverityLevel() { 
    93         return new Condition<Optional<UsabilityDefect>>() { 
     92    public static Condition<Optional<UsabilityProblemDescription>> lowRecommendationSeverityLevel() { 
     93        return new Condition<Optional<UsabilityProblemDescription>>() { 
    9494 
    9595            @Override 
    96             public boolean matches(Optional<UsabilityDefect> usabilityGuidlineRecommendation) { 
     96            public boolean matches(Optional<UsabilityProblemDescription> usabilityGuidlineRecommendation) { 
    9797                return usabilityGuidlineRecommendation.get().getSeverityLevel() 
    98                     .equals(UsabilityDefectSeverityLevel.LOW); 
     98                    .equals(UsabilityProblemSeverityLevel.LOW); 
    9999            } 
    100100 
    … …  
    102102    } 
    103103 
    104     public static Condition<Optional<UsabilityDefect>> mediumRecommendationSeverityLevel() { 
    105         return new Condition<Optional<UsabilityDefect>>() { 
     104    public static Condition<Optional<UsabilityProblemDescription>> mediumRecommendationSeverityLevel() { 
     105        return new Condition<Optional<UsabilityProblemDescription>>() { 
    106106 
    107107            @Override 
    108             public boolean matches(Optional<UsabilityDefect> usabilityGuidlineRecommendation) { 
     108            public boolean matches(Optional<UsabilityProblemDescription> usabilityGuidlineRecommendation) { 
    109109                return usabilityGuidlineRecommendation.get().getSeverityLevel() 
    110                     .equals(UsabilityDefectSeverityLevel.MEDIUM); 
     110                    .equals(UsabilityProblemSeverityLevel.MEDIUM); 
    111111            } 
    112112 
    … …  
    114114    } 
    115115 
    116     public static Condition<Optional<UsabilityDefect>> highRecommendationSeverityLevel() { 
    117         return new Condition<Optional<UsabilityDefect>>() { 
     116    public static Condition<Optional<UsabilityProblemDescription>> highRecommendationSeverityLevel() { 
     117        return new Condition<Optional<UsabilityProblemDescription>>() { 
    118118 
    119119            @Override 
    120             public boolean matches(Optional<UsabilityDefect> usabilityGuidlineRecommendation) { 
     120            public boolean matches(Optional<UsabilityProblemDescription> usabilityGuidlineRecommendation) { 
    121121                return usabilityGuidlineRecommendation.get().getSeverityLevel() 
    122                     .equals(UsabilityDefectSeverityLevel.HIGH); 
     122                    .equals(UsabilityProblemSeverityLevel.HIGH); 
    123123            } 
    124124 

  • trunk/autoquest-core-usability-evaluation-test/src/main/java/de/ugoe/cs/autoquest/usability/testutil/GenerateTaskModelUtil.java

    r1165 r1218  
    1515package de.ugoe.cs.autoquest.usability.testutil; 
    1616 
     17import java.util.Arrays; 
    1718import java.util.List; 
    1819import java.util.logging.Level; 
    … …  
    5152    private static final String taskTreeName = "taskTree"; 
    5253     
    53     public static ITaskModel getTaskModelFromSpec(String spec) { 
     54    public static ITaskModel getTaskModelFromSpec(String... userSessions) { 
    5455        ITaskFactory factory = new TaskFactory(); 
    55         ITaskInstanceList taskInstances = new TaskTreeDecoder(factory, new TaskBuilder()).decode(spec); 
    56         List<IUserSession> userSessions = Lists.newArrayList(); 
    57         userSessions.add((IUserSession) taskInstances); 
    58         return factory.createTaskModel(userSessions); 
     56        TaskTreeDecoder taskTreeDecoder = new TaskTreeDecoder(factory, new TaskBuilder()); 
     57        List<IUserSession> userSessionsList = Lists.newArrayList(); 
     58        for(String userSession: Arrays.asList(userSessions)) { 
     59                ITaskInstanceList taskInstances = taskTreeDecoder.decode(userSession); 
     60                userSessionsList.add((IUserSession) taskInstances); 
     61        } 
     62        return factory.createTaskModel(userSessionsList); 
    5963    } 
    6064     
    6165    public static ITaskModel getTaskTreeFromFile(String filename) { 
    62         new TextConsole(Level.OFF); 
     66        new TextConsole(Level.ALL); 
    6367        parseTraceFile(filename); 
    6468        condenseGuiModel(); 
Note: See TracChangeset for help on using the changeset viewer.