Index: /trunk/autoquest-core-usability-evaluation-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/contains/ContainsAndEndsWithEventTest.java =================================================================== --- /trunk/autoquest-core-usability-evaluation-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/contains/ContainsAndEndsWithEventTest.java (revision 1204) +++ /trunk/autoquest-core-usability-evaluation-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/contains/ContainsAndEndsWithEventTest.java (revision 1205) @@ -24,6 +24,6 @@ import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskModel; -import de.ugoe.cs.autoquest.usability.rules.patterns.UsagePattern; -import de.ugoe.cs.autoquest.usability.rules.patterns.UsagePatternBuilder; +import de.ugoe.cs.autoquest.usability.rules.patterns.InteractionPattern; +import de.ugoe.cs.autoquest.usability.rules.patterns.InteractionPatternBuilder; import de.ugoe.cs.autoquest.usability.testutil.GenerateTaskModelUtil; @@ -46,5 +46,5 @@ "}"; ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec); - UsagePattern pattern = new UsagePatternBuilder().concernedNode(SEQUENCE).contains(TEXT_INPUT).endsWith(TEXT_INPUT).build(); + InteractionPattern pattern = new InteractionPatternBuilder().concernedNode(SEQUENCE).contains(TEXT_INPUT).endsWith(TEXT_INPUT).build(); // When boolean patternContained = pattern.containedIn(taskTree); @@ -66,5 +66,5 @@ "}"; ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec); - UsagePattern pattern = new UsagePatternBuilder().concernedNode(SELECTION).contains(TEXT_INPUT).endsWith(MOUSE_CLICK).build(); + InteractionPattern pattern = new InteractionPatternBuilder().concernedNode(SELECTION).contains(TEXT_INPUT).endsWith(MOUSE_CLICK).build(); // When boolean patternContained = pattern.containedIn(taskTree); Index: /trunk/autoquest-core-usability-evaluation-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/contains/ContainsEventTest.java =================================================================== --- /trunk/autoquest-core-usability-evaluation-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/contains/ContainsEventTest.java (revision 1204) +++ /trunk/autoquest-core-usability-evaluation-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/contains/ContainsEventTest.java (revision 1205) @@ -23,6 +23,6 @@ import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskModel; -import de.ugoe.cs.autoquest.usability.rules.patterns.UsagePattern; -import de.ugoe.cs.autoquest.usability.rules.patterns.UsagePatternBuilder; +import de.ugoe.cs.autoquest.usability.rules.patterns.InteractionPattern; +import de.ugoe.cs.autoquest.usability.rules.patterns.InteractionPatternBuilder; import de.ugoe.cs.autoquest.usability.testutil.GenerateTaskModelUtil; @@ -45,5 +45,5 @@ "}"; ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec); - UsagePattern pattern = new UsagePatternBuilder().concernedNode(SEQUENCE).contains(TEXT_INPUT).build(); + InteractionPattern pattern = new InteractionPatternBuilder().concernedNode(SEQUENCE).contains(TEXT_INPUT).build(); // When boolean patternContained = pattern.containedIn(taskTree); @@ -64,5 +64,5 @@ "}"; ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec); - UsagePattern pattern = new UsagePatternBuilder().concernedNode(SELECTION).contains(TEXT_INPUT).build(); + InteractionPattern pattern = new InteractionPatternBuilder().concernedNode(SELECTION).contains(TEXT_INPUT).build(); // When boolean patternContained = pattern.containedIn(taskTree); Index: /trunk/autoquest-core-usability-evaluation-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/contains/ContainsPatternTest.java =================================================================== --- /trunk/autoquest-core-usability-evaluation-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/contains/ContainsPatternTest.java (revision 1204) +++ /trunk/autoquest-core-usability-evaluation-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/contains/ContainsPatternTest.java (revision 1205) @@ -23,6 +23,6 @@ import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskModel; -import de.ugoe.cs.autoquest.usability.rules.patterns.UsagePattern; -import de.ugoe.cs.autoquest.usability.rules.patterns.UsagePatternBuilder; +import de.ugoe.cs.autoquest.usability.rules.patterns.InteractionPattern; +import de.ugoe.cs.autoquest.usability.rules.patterns.InteractionPatternBuilder; import de.ugoe.cs.autoquest.usability.testutil.GenerateTaskModelUtil; @@ -50,7 +50,7 @@ "}"; ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec); - UsagePatternBuilder patternBuilder = new UsagePatternBuilder(); - UsagePattern containsPattern = patternBuilder.concernedNode(SELECTION).startsWith(TEXT_INPUT).endsWith(TEXT_INPUT).build(); - UsagePattern pattern = patternBuilder.concernedNode(SEQUENCE).contains(containsPattern).build(); + InteractionPatternBuilder patternBuilder = new InteractionPatternBuilder(); + InteractionPattern containsPattern = patternBuilder.concernedNode(SELECTION).startsWith(TEXT_INPUT).endsWith(TEXT_INPUT).build(); + InteractionPattern pattern = patternBuilder.concernedNode(SEQUENCE).contains(containsPattern).build(); // When boolean patternContained = pattern.containedIn(taskTree); @@ -79,5 +79,5 @@ "}"; ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec); - UsagePattern pattern = new UsagePatternBuilder().concernedNode(SELECTION).contains(TEXT_INPUT).build(); + InteractionPattern pattern = new InteractionPatternBuilder().concernedNode(SELECTION).contains(TEXT_INPUT).build(); // When boolean patternContained = pattern.containedIn(taskTree); Index: /trunk/autoquest-core-usability-evaluation-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/endswith/EndsWithEventTest.java =================================================================== --- /trunk/autoquest-core-usability-evaluation-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/endswith/EndsWithEventTest.java (revision 1204) +++ /trunk/autoquest-core-usability-evaluation-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/endswith/EndsWithEventTest.java (revision 1205) @@ -22,6 +22,6 @@ import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskModel; -import de.ugoe.cs.autoquest.usability.rules.patterns.UsagePattern; -import de.ugoe.cs.autoquest.usability.rules.patterns.UsagePatternBuilder; +import de.ugoe.cs.autoquest.usability.rules.patterns.InteractionPattern; +import de.ugoe.cs.autoquest.usability.rules.patterns.InteractionPatternBuilder; import de.ugoe.cs.autoquest.usability.testutil.GenerateTaskModelUtil; @@ -52,5 +52,5 @@ "}"; ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec); - UsagePattern pattern = new UsagePatternBuilder().concernedNode(SEQUENCE).endsWith(TEXT_INPUT).build(); + InteractionPattern pattern = new InteractionPatternBuilder().concernedNode(SEQUENCE).endsWith(TEXT_INPUT).build(); // When boolean patternContained = pattern.containedIn(taskTree); @@ -83,5 +83,5 @@ "}"; ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec); - UsagePattern pattern = new UsagePatternBuilder().concernedNode(SEQUENCE).endsWith(TEXT_INPUT).build(); + InteractionPattern pattern = new InteractionPatternBuilder().concernedNode(SEQUENCE).endsWith(TEXT_INPUT).build(); // When boolean patternContained = pattern.containedIn(taskTree); Index: /trunk/autoquest-core-usability-evaluation-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/endswith/EndsWithPatternTest.java =================================================================== --- /trunk/autoquest-core-usability-evaluation-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/endswith/EndsWithPatternTest.java (revision 1204) +++ /trunk/autoquest-core-usability-evaluation-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/endswith/EndsWithPatternTest.java (revision 1205) @@ -25,6 +25,6 @@ import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskModel; -import de.ugoe.cs.autoquest.usability.rules.patterns.UsagePattern; -import de.ugoe.cs.autoquest.usability.rules.patterns.UsagePatternBuilder; +import de.ugoe.cs.autoquest.usability.rules.patterns.InteractionPattern; +import de.ugoe.cs.autoquest.usability.rules.patterns.InteractionPatternBuilder; import de.ugoe.cs.autoquest.usability.testutil.GenerateTaskModelUtil; @@ -39,5 +39,5 @@ @Test - public void starts_with_pattern_positive() { + public void ends_with_pattern_positive() { // Given String spec = "UserSession {" + @@ -48,5 +48,5 @@ " Sequence seq2 {" + " TextInput target4 {}" + - " MouseClick target2 {}" + + " MouseClick target5 {}" + " }" + " }" + @@ -54,5 +54,5 @@ " Sequence seq3 {" + " TextInput target4 {}" + - " EventTask target2 {}" + + " EventTask target3 {}" + " }" + " }" + @@ -60,7 +60,7 @@ "}"; ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec); - UsagePatternBuilder patternBuilder = new UsagePatternBuilder(); - UsagePattern endsWithPattern = patternBuilder.concernedNode(SELECTION).startsWith(TEXT_INPUT).endsWith(MOUSE_CLICK).build(); - UsagePattern pattern = patternBuilder.concernedNode(SEQUENCE).endsWith(endsWithPattern).build(); + InteractionPatternBuilder patternBuilder = new InteractionPatternBuilder(); + InteractionPattern endsWithPattern = patternBuilder.concernedNode(SELECTION).startsWith(TEXT_INPUT).endsWith(MOUSE_CLICK).build(); + InteractionPattern pattern = patternBuilder.concernedNode(SEQUENCE).endsWith(endsWithPattern).build(); // When boolean patternContained = pattern.containedIn(taskTree); @@ -70,33 +70,35 @@ @Test - public void starts_with_pattern_negative() { + public void ends_with_pattern_negative() { // Given String spec = "UserSession {" + - " Selection sel1 {" + - " Sequence seq1 {" + - " EventTask target1 {}" + - " EventTask target2 {}" + - " }" + - " }" + - " Selection sel1 {" + - " Iteration it1 {" + - " Sequence seq2 {" + - " MouseClick target5 {}" + - " EventTask target4 {}" + + " Sequence seg0 {" + + " Selection sel1 {" + + " Sequence seq1 {" + + " EventTask target1 {}" + " EventTask target2 {}" + " }" + " }" + - " }" + - " Selection sel1 {" + - " Sequence seq3 {" + - " EventTask target5 {}" + - " EventTask target6 {}" + + " Selection sel1 {" + + " Iteration it1 {" + + " Sequence seq2 {" + + " MouseClick target5 {}" + + " EventTask target4 {}" + + " EventTask target2 {}" + + " }" + + " }" + + " }" + + " Selection sel1 {" + + " Sequence seq3 {" + + " EventTask target5 {}" + + " EventTask target6 {}" + + " }" + " }" + " }" + "}"; ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec); - UsagePatternBuilder patternBuilder = new UsagePatternBuilder(); - UsagePattern endsWithPattern = patternBuilder.concernedNode(ITERATION).startsWith(MOUSE_CLICK).contains(TEXT_INPUT).build(); - UsagePattern pattern = patternBuilder.concernedNode(SEQUENCE).endsWith(endsWithPattern).build(); + InteractionPatternBuilder patternBuilder = new InteractionPatternBuilder(); + InteractionPattern endsWithPattern = patternBuilder.concernedNode(ITERATION).startsWith(MOUSE_CLICK).contains(TEXT_INPUT).build(); + InteractionPattern pattern = patternBuilder.concernedNode(SEQUENCE).endsWith(endsWithPattern).build(); // When boolean patternContained = pattern.containedIn(taskTree); Index: /trunk/autoquest-core-usability-evaluation-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/startswith/StartsAndEndsWithEventAndContainsEventTest.java =================================================================== --- /trunk/autoquest-core-usability-evaluation-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/startswith/StartsAndEndsWithEventAndContainsEventTest.java (revision 1204) +++ /trunk/autoquest-core-usability-evaluation-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/startswith/StartsAndEndsWithEventAndContainsEventTest.java (revision 1205) @@ -23,6 +23,6 @@ import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskModel; -import de.ugoe.cs.autoquest.usability.rules.patterns.UsagePattern; -import de.ugoe.cs.autoquest.usability.rules.patterns.UsagePatternBuilder; +import de.ugoe.cs.autoquest.usability.rules.patterns.InteractionPattern; +import de.ugoe.cs.autoquest.usability.rules.patterns.InteractionPatternBuilder; import de.ugoe.cs.autoquest.usability.testutil.GenerateTaskModelUtil; @@ -52,5 +52,5 @@ "}"; ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec); - UsagePattern pattern = new UsagePatternBuilder().concernedNode(SEQUENCE).startsWith(TEXT_INPUT).contains(MOUSE_CLICK).endsWith(TEXT_INPUT).build(); + InteractionPattern pattern = new InteractionPatternBuilder().concernedNode(SEQUENCE).startsWith(TEXT_INPUT).contains(MOUSE_CLICK).endsWith(TEXT_INPUT).build(); // When boolean patternContained = pattern.containedIn(taskTree); @@ -83,5 +83,5 @@ "}"; ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec); - UsagePattern pattern = new UsagePatternBuilder().concernedNode(SEQUENCE).startsWith(TEXT_INPUT).contains(MOUSE_CLICK).endsWith(TEXT_INPUT).build(); + InteractionPattern pattern = new InteractionPatternBuilder().concernedNode(SEQUENCE).startsWith(TEXT_INPUT).contains(MOUSE_CLICK).endsWith(TEXT_INPUT).build(); // When boolean patternContained = pattern.containedIn(taskTree); Index: /trunk/autoquest-core-usability-evaluation-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/startswith/StartsAndEndsWithEventTest.java =================================================================== --- /trunk/autoquest-core-usability-evaluation-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/startswith/StartsAndEndsWithEventTest.java (revision 1204) +++ /trunk/autoquest-core-usability-evaluation-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/startswith/StartsAndEndsWithEventTest.java (revision 1205) @@ -24,6 +24,6 @@ import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskModel; -import de.ugoe.cs.autoquest.usability.rules.patterns.UsagePattern; -import de.ugoe.cs.autoquest.usability.rules.patterns.UsagePatternBuilder; +import de.ugoe.cs.autoquest.usability.rules.patterns.InteractionPattern; +import de.ugoe.cs.autoquest.usability.rules.patterns.InteractionPatternBuilder; import de.ugoe.cs.autoquest.usability.testutil.GenerateTaskModelUtil; @@ -52,5 +52,5 @@ "}"; ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec); - UsagePattern pattern = new UsagePatternBuilder().concernedNode(SEQUENCE).startsWith(TEXT_INPUT).endsWith(MOUSE_CLICK).build(); + InteractionPattern pattern = new InteractionPatternBuilder().concernedNode(SEQUENCE).startsWith(TEXT_INPUT).endsWith(MOUSE_CLICK).build(); // When boolean patternContained = pattern.containedIn(taskTree); @@ -76,5 +76,5 @@ "}"; ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec); - UsagePattern pattern = new UsagePatternBuilder().concernedNode(ITERATION).startsWith(TEXT_INPUT).endsWith(MOUSE_CLICK).build(); + InteractionPattern pattern = new InteractionPatternBuilder().concernedNode(ITERATION).startsWith(TEXT_INPUT).endsWith(MOUSE_CLICK).build(); // When boolean patternContained = pattern.containedIn(taskTree); Index: /trunk/autoquest-core-usability-evaluation-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/startswith/StartsAndEndsWithPatternAndContainsPatternTest.java =================================================================== --- /trunk/autoquest-core-usability-evaluation-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/startswith/StartsAndEndsWithPatternAndContainsPatternTest.java (revision 1204) +++ /trunk/autoquest-core-usability-evaluation-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/startswith/StartsAndEndsWithPatternAndContainsPatternTest.java (revision 1205) @@ -24,6 +24,6 @@ import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskModel; -import de.ugoe.cs.autoquest.usability.rules.patterns.UsagePattern; -import de.ugoe.cs.autoquest.usability.rules.patterns.UsagePatternBuilder; +import de.ugoe.cs.autoquest.usability.rules.patterns.InteractionPattern; +import de.ugoe.cs.autoquest.usability.rules.patterns.InteractionPatternBuilder; import de.ugoe.cs.autoquest.usability.testutil.GenerateTaskModelUtil; @@ -55,9 +55,9 @@ "}"; ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec); - UsagePatternBuilder builder = new UsagePatternBuilder(); - UsagePattern startsWithPattern = builder.concernedNode(ITERATION).contains(MOUSE_CLICK).build(); - UsagePattern containedPattern = builder.concernedNode(SEQUENCE).startsWith(MOUSE_CLICK).endsWith(TEXT_INPUT).build(); - UsagePattern endsWithPattern = builder.concernedNode(ITERATION).contains(TEXT_INPUT).build(); - UsagePattern pattern = new UsagePatternBuilder().concernedNode(SEQUENCE).startsWith(startsWithPattern).contains(containedPattern).endsWith(endsWithPattern).build(); + InteractionPatternBuilder builder = new InteractionPatternBuilder(); + InteractionPattern startsWithPattern = builder.concernedNode(ITERATION).contains(MOUSE_CLICK).build(); + InteractionPattern containedPattern = builder.concernedNode(SEQUENCE).startsWith(MOUSE_CLICK).endsWith(TEXT_INPUT).build(); + InteractionPattern endsWithPattern = builder.concernedNode(ITERATION).contains(TEXT_INPUT).build(); + InteractionPattern pattern = new InteractionPatternBuilder().concernedNode(SEQUENCE).startsWith(startsWithPattern).contains(containedPattern).endsWith(endsWithPattern).build(); // When boolean patternContained = pattern.containedIn(taskTree); @@ -84,9 +84,9 @@ "}"; ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec); - UsagePatternBuilder builder = new UsagePatternBuilder(); - UsagePattern startsWithPattern = builder.concernedNode(ITERATION).contains(MOUSE_CLICK).build(); - UsagePattern containedPattern = builder.concernedNode(SEQUENCE).startsWith(MOUSE_CLICK).endsWith(TEXT_INPUT).build(); - UsagePattern endsWithPattern = builder.concernedNode(ITERATION).contains(TEXT_INPUT).build(); - UsagePattern pattern = new UsagePatternBuilder().concernedNode(SEQUENCE).startsWith(startsWithPattern).contains(containedPattern).endsWith(endsWithPattern).build(); + InteractionPatternBuilder builder = new InteractionPatternBuilder(); + InteractionPattern startsWithPattern = builder.concernedNode(ITERATION).contains(MOUSE_CLICK).build(); + InteractionPattern containedPattern = builder.concernedNode(SEQUENCE).startsWith(MOUSE_CLICK).endsWith(TEXT_INPUT).build(); + InteractionPattern endsWithPattern = builder.concernedNode(ITERATION).contains(TEXT_INPUT).build(); + InteractionPattern pattern = new InteractionPatternBuilder().concernedNode(SEQUENCE).startsWith(startsWithPattern).contains(containedPattern).endsWith(endsWithPattern).build(); // When boolean patternContained = pattern.containedIn(taskTree); Index: /trunk/autoquest-core-usability-evaluation-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/startswith/StartsAndEndsWithPatternTest.java =================================================================== --- /trunk/autoquest-core-usability-evaluation-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/startswith/StartsAndEndsWithPatternTest.java (revision 1204) +++ /trunk/autoquest-core-usability-evaluation-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/startswith/StartsAndEndsWithPatternTest.java (revision 1205) @@ -25,6 +25,6 @@ import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskModel; -import de.ugoe.cs.autoquest.usability.rules.patterns.UsagePattern; -import de.ugoe.cs.autoquest.usability.rules.patterns.UsagePatternBuilder; +import de.ugoe.cs.autoquest.usability.rules.patterns.InteractionPattern; +import de.ugoe.cs.autoquest.usability.rules.patterns.InteractionPatternBuilder; import de.ugoe.cs.autoquest.usability.testutil.GenerateTaskModelUtil; @@ -59,8 +59,8 @@ "}"; ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec); - UsagePatternBuilder patternBuilder = new UsagePatternBuilder(); - UsagePattern startsWithPattern = patternBuilder.concernedNode(ITERATION).contains(MOUSE_CLICK).build(); - UsagePattern endsWithPattern = patternBuilder.concernedNode(SELECTION).startsWith(TEXT_INPUT).endsWith(MOUSE_CLICK).build(); - UsagePattern pattern = patternBuilder.concernedNode(SEQUENCE).startsWith(startsWithPattern).endsWith(endsWithPattern).build(); + InteractionPatternBuilder patternBuilder = new InteractionPatternBuilder(); + InteractionPattern startsWithPattern = patternBuilder.concernedNode(ITERATION).contains(MOUSE_CLICK).build(); + InteractionPattern endsWithPattern = patternBuilder.concernedNode(SELECTION).startsWith(TEXT_INPUT).endsWith(MOUSE_CLICK).build(); + InteractionPattern pattern = patternBuilder.concernedNode(SEQUENCE).startsWith(startsWithPattern).endsWith(endsWithPattern).build(); // When boolean patternContained = pattern.containedIn(taskTree); @@ -90,8 +90,8 @@ "}"; ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec); - UsagePatternBuilder patternBuilder = new UsagePatternBuilder(); - UsagePattern startsWithPattern = patternBuilder.concernedNode(ITERATION).contains(MOUSE_CLICK).build(); - UsagePattern endsWithPattern = patternBuilder.concernedNode(SELECTION).startsWith(TEXT_INPUT).endsWith(MOUSE_CLICK).build(); - UsagePattern pattern = patternBuilder.concernedNode(ITERATION).startsWith(endsWithPattern).endsWith(startsWithPattern).build(); + InteractionPatternBuilder patternBuilder = new InteractionPatternBuilder(); + InteractionPattern startsWithPattern = patternBuilder.concernedNode(ITERATION).contains(MOUSE_CLICK).build(); + InteractionPattern endsWithPattern = patternBuilder.concernedNode(SELECTION).startsWith(TEXT_INPUT).endsWith(MOUSE_CLICK).build(); + InteractionPattern pattern = patternBuilder.concernedNode(ITERATION).startsWith(endsWithPattern).endsWith(startsWithPattern).build(); // When boolean patternContained = pattern.containedIn(taskTree); Index: /trunk/autoquest-core-usability-evaluation-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/startswith/StartsWithEventAndContainsEventTest.java =================================================================== --- /trunk/autoquest-core-usability-evaluation-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/startswith/StartsWithEventAndContainsEventTest.java (revision 1204) +++ /trunk/autoquest-core-usability-evaluation-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/startswith/StartsWithEventAndContainsEventTest.java (revision 1205) @@ -23,6 +23,6 @@ import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskModel; -import de.ugoe.cs.autoquest.usability.rules.patterns.UsagePattern; -import de.ugoe.cs.autoquest.usability.rules.patterns.UsagePatternBuilder; +import de.ugoe.cs.autoquest.usability.rules.patterns.InteractionPattern; +import de.ugoe.cs.autoquest.usability.rules.patterns.InteractionPatternBuilder; import de.ugoe.cs.autoquest.usability.testutil.GenerateTaskModelUtil; @@ -51,5 +51,5 @@ "}"; ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec); - UsagePattern pattern = new UsagePatternBuilder().concernedNode(SEQUENCE).startsWith(TEXT_INPUT).contains(MOUSE_CLICK).build(); + InteractionPattern pattern = new InteractionPatternBuilder().concernedNode(SEQUENCE).startsWith(TEXT_INPUT).contains(MOUSE_CLICK).build(); // When boolean patternContained = pattern.containedIn(taskTree); @@ -82,5 +82,5 @@ "}"; ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec); - UsagePattern pattern = new UsagePatternBuilder().concernedNode(SEQUENCE).startsWith(TEXT_INPUT).contains(MOUSE_CLICK).build(); + InteractionPattern pattern = new InteractionPatternBuilder().concernedNode(SEQUENCE).startsWith(TEXT_INPUT).contains(MOUSE_CLICK).build(); // When boolean patternContained = pattern.containedIn(taskTree); Index: /trunk/autoquest-core-usability-evaluation-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/startswith/StartsWithEventAndContainsPatternTest.java =================================================================== --- /trunk/autoquest-core-usability-evaluation-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/startswith/StartsWithEventAndContainsPatternTest.java (revision 1204) +++ /trunk/autoquest-core-usability-evaluation-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/startswith/StartsWithEventAndContainsPatternTest.java (revision 1205) @@ -24,6 +24,6 @@ import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskModel; -import de.ugoe.cs.autoquest.usability.rules.patterns.UsagePattern; -import de.ugoe.cs.autoquest.usability.rules.patterns.UsagePatternBuilder; +import de.ugoe.cs.autoquest.usability.rules.patterns.InteractionPattern; +import de.ugoe.cs.autoquest.usability.rules.patterns.InteractionPatternBuilder; import de.ugoe.cs.autoquest.usability.testutil.GenerateTaskModelUtil; @@ -44,11 +44,12 @@ " TextInput t1 {}" + " Selection sel1 {" + - " Sequence seq1 {" + + " Sequence seq2 {" + " MouseClick t2 {}" + " }" + " }" + " Selection sel1 {" + - " Sequence seq1 {" + - " TextInput t3 {}" + + " Sequence seq3 {" + + " EventTask t3 {}" + + " MouseClick t5 {}" + " }" + " }" + @@ -56,7 +57,7 @@ "}"; ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec); - UsagePatternBuilder builder = new UsagePatternBuilder(); - UsagePattern containedPattern = builder.concernedNode(SEQUENCE).startsWith(MOUSE_CLICK).build(); - UsagePattern pattern = builder.concernedNode(SEQUENCE).startsWith(TEXT_INPUT).contains(containedPattern).build(); + InteractionPatternBuilder builder = new InteractionPatternBuilder(); + InteractionPattern endsWithPattern = builder.concernedNode(SELECTION).startsWith(MOUSE_CLICK).build(); + InteractionPattern pattern = builder.concernedNode(SEQUENCE).startsWith(TEXT_INPUT).endsWith(endsWithPattern).build(); // When boolean patternContained = pattern.containedIn(taskTree); @@ -92,7 +93,7 @@ "}"; ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec); - UsagePatternBuilder builder = new UsagePatternBuilder(); - UsagePattern containedPattern = builder.concernedNode(SELECTION).startsWith(TEXT_INPUT).endsWith(MOUSE_CLICK).build(); - UsagePattern pattern = builder.concernedNode(SEQUENCE).startsWith(MOUSE_CLICK).contains(containedPattern).build(); + InteractionPatternBuilder builder = new InteractionPatternBuilder(); + InteractionPattern endsWithPattern = builder.concernedNode(SEQUENCE).startsWith(TEXT_INPUT).endsWith(MOUSE_CLICK).build(); + InteractionPattern pattern = builder.concernedNode(SEQUENCE).startsWith(MOUSE_CLICK).endsWith(endsWithPattern).build(); // When boolean patternContained = pattern.containedIn(taskTree); Index: /trunk/autoquest-core-usability-evaluation-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/startswith/StartsWithEventAndEndsWithPatternTest.java =================================================================== --- /trunk/autoquest-core-usability-evaluation-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/startswith/StartsWithEventAndEndsWithPatternTest.java (revision 1204) +++ /trunk/autoquest-core-usability-evaluation-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/startswith/StartsWithEventAndEndsWithPatternTest.java (revision 1205) @@ -24,6 +24,6 @@ import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskModel; -import de.ugoe.cs.autoquest.usability.rules.patterns.UsagePattern; -import de.ugoe.cs.autoquest.usability.rules.patterns.UsagePatternBuilder; +import de.ugoe.cs.autoquest.usability.rules.patterns.InteractionPattern; +import de.ugoe.cs.autoquest.usability.rules.patterns.InteractionPatternBuilder; import de.ugoe.cs.autoquest.usability.testutil.GenerateTaskModelUtil; @@ -50,7 +50,7 @@ "}"; ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec); - UsagePatternBuilder builder = new UsagePatternBuilder(); - UsagePattern endsWithPattern = builder.concernedNode(ITERATION).startsWith(MOUSE_CLICK).build(); - UsagePattern pattern = new UsagePatternBuilder().concernedNode(SEQUENCE).startsWith(TEXT_INPUT).contains(MOUSE_CLICK).endsWith(endsWithPattern).build(); + InteractionPatternBuilder builder = new InteractionPatternBuilder(); + InteractionPattern endsWithPattern = builder.concernedNode(ITERATION).startsWith(MOUSE_CLICK).build(); + InteractionPattern pattern = new InteractionPatternBuilder().concernedNode(SEQUENCE).startsWith(TEXT_INPUT).contains(MOUSE_CLICK).endsWith(endsWithPattern).build(); // When boolean patternContained = pattern.containedIn(taskTree); @@ -72,7 +72,7 @@ "}"; ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec); - UsagePatternBuilder builder = new UsagePatternBuilder(); - UsagePattern endsWithPattern = builder.concernedNode(ITERATION).startsWith(MOUSE_CLICK).build(); - UsagePattern pattern = new UsagePatternBuilder().concernedNode(SEQUENCE).startsWith(TEXT_INPUT).contains(MOUSE_CLICK).endsWith(endsWithPattern).build(); + InteractionPatternBuilder builder = new InteractionPatternBuilder(); + InteractionPattern endsWithPattern = builder.concernedNode(ITERATION).startsWith(MOUSE_CLICK).build(); + InteractionPattern pattern = new InteractionPatternBuilder().concernedNode(SEQUENCE).startsWith(TEXT_INPUT).contains(MOUSE_CLICK).endsWith(endsWithPattern).build(); // When boolean patternContained = pattern.containedIn(taskTree); Index: /trunk/autoquest-core-usability-evaluation-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/startswith/StartsWithEventContainsEventEndsWithPatternTest.java =================================================================== --- /trunk/autoquest-core-usability-evaluation-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/startswith/StartsWithEventContainsEventEndsWithPatternTest.java (revision 1204) +++ /trunk/autoquest-core-usability-evaluation-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/startswith/StartsWithEventContainsEventEndsWithPatternTest.java (revision 1205) @@ -24,6 +24,6 @@ import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskModel; -import de.ugoe.cs.autoquest.usability.rules.patterns.UsagePattern; -import de.ugoe.cs.autoquest.usability.rules.patterns.UsagePatternBuilder; +import de.ugoe.cs.autoquest.usability.rules.patterns.InteractionPattern; +import de.ugoe.cs.autoquest.usability.rules.patterns.InteractionPatternBuilder; import de.ugoe.cs.autoquest.usability.testutil.GenerateTaskModelUtil; @@ -50,7 +50,7 @@ "}"; ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec); - UsagePatternBuilder builder = new UsagePatternBuilder(); - UsagePattern endsWithPattern = builder.concernedNode(ITERATION).startsWith(MOUSE_CLICK).build(); - UsagePattern pattern = new UsagePatternBuilder().concernedNode(SEQUENCE).startsWith(TEXT_INPUT).endsWith(endsWithPattern).build(); + InteractionPatternBuilder builder = new InteractionPatternBuilder(); + InteractionPattern endsWithPattern = builder.concernedNode(ITERATION).startsWith(MOUSE_CLICK).build(); + InteractionPattern pattern = new InteractionPatternBuilder().concernedNode(SEQUENCE).startsWith(TEXT_INPUT).endsWith(endsWithPattern).build(); // When boolean patternContained = pattern.containedIn(taskTree); @@ -72,7 +72,7 @@ "}"; ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec); - UsagePatternBuilder builder = new UsagePatternBuilder(); - UsagePattern endsWithPattern = builder.concernedNode(ITERATION).startsWith(MOUSE_CLICK).build(); - UsagePattern pattern = new UsagePatternBuilder().concernedNode(SEQUENCE).startsWith(TEXT_INPUT).endsWith(endsWithPattern).build(); + InteractionPatternBuilder builder = new InteractionPatternBuilder(); + InteractionPattern endsWithPattern = builder.concernedNode(ITERATION).startsWith(MOUSE_CLICK).build(); + InteractionPattern pattern = new InteractionPatternBuilder().concernedNode(SEQUENCE).startsWith(TEXT_INPUT).endsWith(endsWithPattern).build(); // When boolean patternContained = pattern.containedIn(taskTree); Index: /trunk/autoquest-core-usability-evaluation-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/startswith/StartsWithEventContainsPatternAndEndsWithEventTest.java =================================================================== --- /trunk/autoquest-core-usability-evaluation-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/startswith/StartsWithEventContainsPatternAndEndsWithEventTest.java (revision 1204) +++ /trunk/autoquest-core-usability-evaluation-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/startswith/StartsWithEventContainsPatternAndEndsWithEventTest.java (revision 1205) @@ -24,6 +24,6 @@ import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskModel; -import de.ugoe.cs.autoquest.usability.rules.patterns.UsagePattern; -import de.ugoe.cs.autoquest.usability.rules.patterns.UsagePatternBuilder; +import de.ugoe.cs.autoquest.usability.rules.patterns.InteractionPattern; +import de.ugoe.cs.autoquest.usability.rules.patterns.InteractionPatternBuilder; import de.ugoe.cs.autoquest.usability.testutil.GenerateTaskModelUtil; @@ -52,15 +52,15 @@ " MouseClick t2 {}" + " }" + - " }" + - " TextInput t3 {}" + - " MouseClick t2 {}" + - " Iteration iter1 {" + - " TextInput t4 {}" + + " TextInput t3 {}" + + " MouseClick t2 {}" + + " Iteration iter1 {" + + " TextInput t4 {}" + + " }" + " }" + "}"; ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec); - UsagePatternBuilder builder = new UsagePatternBuilder(); - UsagePattern containedPattern = builder.concernedNode(SELECTION).startsWith(MOUSE_CLICK).endsWith(TEXT_INPUT).build(); - UsagePattern pattern = new UsagePatternBuilder().concernedNode(SEQUENCE).startsWith(TEXT_INPUT).contains(containedPattern).endsWith(TEXT_INPUT).build(); + InteractionPatternBuilder builder = new InteractionPatternBuilder(); + InteractionPattern containedPattern = builder.concernedNode(SELECTION).startsWith(MOUSE_CLICK).endsWith(TEXT_INPUT).build(); + InteractionPattern pattern = new InteractionPatternBuilder().concernedNode(SEQUENCE).startsWith(TEXT_INPUT).contains(containedPattern).endsWith(TEXT_INPUT).build(); // When boolean patternContained = pattern.containedIn(taskTree); @@ -92,7 +92,7 @@ "}"; ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec); - UsagePatternBuilder builder = new UsagePatternBuilder(); - UsagePattern containedPattern = builder.concernedNode(SELECTION).startsWith(MOUSE_CLICK).endsWith(TEXT_INPUT).build(); - UsagePattern pattern = new UsagePatternBuilder().concernedNode(SEQUENCE).startsWith(TEXT_INPUT).contains(containedPattern).endsWith(TEXT_INPUT).build(); + InteractionPatternBuilder builder = new InteractionPatternBuilder(); + InteractionPattern containedPattern = builder.concernedNode(SELECTION).startsWith(MOUSE_CLICK).endsWith(TEXT_INPUT).build(); + InteractionPattern pattern = new InteractionPatternBuilder().concernedNode(SEQUENCE).startsWith(TEXT_INPUT).contains(containedPattern).endsWith(TEXT_INPUT).build(); // When boolean patternContained = pattern.containedIn(taskTree); Index: /trunk/autoquest-core-usability-evaluation-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/startswith/StartsWithEventContainsPatternAndEndsWithPatternTest.java =================================================================== --- /trunk/autoquest-core-usability-evaluation-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/startswith/StartsWithEventContainsPatternAndEndsWithPatternTest.java (revision 1204) +++ /trunk/autoquest-core-usability-evaluation-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/startswith/StartsWithEventContainsPatternAndEndsWithPatternTest.java (revision 1205) @@ -25,6 +25,6 @@ import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskModel; -import de.ugoe.cs.autoquest.usability.rules.patterns.UsagePattern; -import de.ugoe.cs.autoquest.usability.rules.patterns.UsagePatternBuilder; +import de.ugoe.cs.autoquest.usability.rules.patterns.InteractionPattern; +import de.ugoe.cs.autoquest.usability.rules.patterns.InteractionPatternBuilder; import de.ugoe.cs.autoquest.usability.testutil.GenerateTaskModelUtil; @@ -61,8 +61,8 @@ "}"; ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec); - UsagePatternBuilder builder = new UsagePatternBuilder(); - UsagePattern containedPattern = builder.concernedNode(SELECTION).startsWith(MOUSE_CLICK).endsWith(TEXT_INPUT).build(); - UsagePattern endsWithPattern = builder.concernedNode(ITERATION).startsWith(MOUSE_CLICK).build(); - UsagePattern pattern = new UsagePatternBuilder().concernedNode(SEQUENCE).startsWith(TEXT_INPUT).contains(containedPattern).endsWith(endsWithPattern).build(); + InteractionPatternBuilder builder = new InteractionPatternBuilder(); + InteractionPattern containedPattern = builder.concernedNode(SELECTION).startsWith(MOUSE_CLICK).endsWith(TEXT_INPUT).build(); + InteractionPattern endsWithPattern = builder.concernedNode(ITERATION).startsWith(MOUSE_CLICK).build(); + InteractionPattern pattern = new InteractionPatternBuilder().concernedNode(SEQUENCE).startsWith(TEXT_INPUT).contains(containedPattern).endsWith(endsWithPattern).build(); // When boolean patternContained = pattern.containedIn(taskTree); @@ -91,7 +91,7 @@ "}"; ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec); - UsagePatternBuilder builder = new UsagePatternBuilder(); - UsagePattern endsWithPattern = builder.concernedNode(ITERATION).startsWith(MOUSE_CLICK).build(); - UsagePattern pattern = new UsagePatternBuilder().concernedNode(SEQUENCE).startsWith(TEXT_INPUT).contains(MOUSE_CLICK).endsWith(endsWithPattern).build(); + InteractionPatternBuilder builder = new InteractionPatternBuilder(); + InteractionPattern endsWithPattern = builder.concernedNode(ITERATION).startsWith(MOUSE_CLICK).build(); + InteractionPattern pattern = new InteractionPatternBuilder().concernedNode(SEQUENCE).startsWith(TEXT_INPUT).contains(MOUSE_CLICK).endsWith(endsWithPattern).build(); // When boolean patternContained = pattern.containedIn(taskTree); Index: /trunk/autoquest-core-usability-evaluation-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/startswith/StartsWithEventTest.java =================================================================== --- /trunk/autoquest-core-usability-evaluation-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/startswith/StartsWithEventTest.java (revision 1204) +++ /trunk/autoquest-core-usability-evaluation-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/startswith/StartsWithEventTest.java (revision 1205) @@ -22,6 +22,6 @@ import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskModel; -import de.ugoe.cs.autoquest.usability.rules.patterns.UsagePattern; -import de.ugoe.cs.autoquest.usability.rules.patterns.UsagePatternBuilder; +import de.ugoe.cs.autoquest.usability.rules.patterns.InteractionPattern; +import de.ugoe.cs.autoquest.usability.rules.patterns.InteractionPatternBuilder; import de.ugoe.cs.autoquest.usability.testutil.GenerateTaskModelUtil; @@ -50,5 +50,5 @@ "}"; ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec); - UsagePattern pattern = new UsagePatternBuilder().concernedNode(SEQUENCE).startsWith(TEXT_INPUT).build(); + InteractionPattern pattern = new InteractionPatternBuilder().concernedNode(SEQUENCE).startsWith(TEXT_INPUT).build(); // When boolean patternContained = pattern.containedIn(taskTree); @@ -71,5 +71,5 @@ "}"; ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec); - UsagePattern pattern = new UsagePatternBuilder().concernedNode(SEQUENCE).startsWith(TEXT_INPUT).build(); + InteractionPattern pattern = new InteractionPatternBuilder().concernedNode(SEQUENCE).startsWith(TEXT_INPUT).build(); // When boolean patternContained = pattern.containedIn(taskTree); Index: /trunk/autoquest-core-usability-evaluation-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/startswith/StartsWithPatternAndContainsEventTest.java =================================================================== --- /trunk/autoquest-core-usability-evaluation-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/startswith/StartsWithPatternAndContainsEventTest.java (revision 1204) +++ /trunk/autoquest-core-usability-evaluation-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/startswith/StartsWithPatternAndContainsEventTest.java (revision 1205) @@ -24,6 +24,6 @@ import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskModel; -import de.ugoe.cs.autoquest.usability.rules.patterns.UsagePattern; -import de.ugoe.cs.autoquest.usability.rules.patterns.UsagePatternBuilder; +import de.ugoe.cs.autoquest.usability.rules.patterns.InteractionPattern; +import de.ugoe.cs.autoquest.usability.rules.patterns.InteractionPatternBuilder; import de.ugoe.cs.autoquest.usability.testutil.GenerateTaskModelUtil; @@ -54,7 +54,7 @@ "}"; ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec); - UsagePatternBuilder patternBuilder = new UsagePatternBuilder(); - UsagePattern startsWithPattern = patternBuilder.concernedNode(ITERATION).startsWith(TEXT_INPUT).build(); - UsagePattern pattern = patternBuilder.concernedNode(SEQUENCE).startsWith(startsWithPattern).contains(MOUSE_CLICK).build(); + InteractionPatternBuilder patternBuilder = new InteractionPatternBuilder(); + InteractionPattern startsWithPattern = patternBuilder.concernedNode(ITERATION).startsWith(TEXT_INPUT).build(); + InteractionPattern pattern = patternBuilder.concernedNode(SEQUENCE).startsWith(startsWithPattern).contains(MOUSE_CLICK).build(); // When boolean patternContained = pattern.containedIn(taskTree); @@ -79,7 +79,7 @@ "}"; ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec); - UsagePatternBuilder patternBuilder = new UsagePatternBuilder(); - UsagePattern startsWithPattern = patternBuilder.concernedNode(ITERATION).contains(TEXT_INPUT).build(); - UsagePattern pattern = patternBuilder.concernedNode(SEQUENCE).startsWith(startsWithPattern).contains(MOUSE_CLICK).build(); + InteractionPatternBuilder patternBuilder = new InteractionPatternBuilder(); + InteractionPattern startsWithPattern = patternBuilder.concernedNode(ITERATION).contains(TEXT_INPUT).build(); + InteractionPattern pattern = patternBuilder.concernedNode(SEQUENCE).startsWith(startsWithPattern).contains(MOUSE_CLICK).build(); // When boolean patternContained = pattern.containedIn(taskTree); Index: /trunk/autoquest-core-usability-evaluation-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/startswith/StartsWithPatternAndContainsPatternTest.java =================================================================== --- /trunk/autoquest-core-usability-evaluation-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/startswith/StartsWithPatternAndContainsPatternTest.java (revision 1204) +++ /trunk/autoquest-core-usability-evaluation-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/startswith/StartsWithPatternAndContainsPatternTest.java (revision 1205) @@ -25,6 +25,6 @@ import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskModel; -import de.ugoe.cs.autoquest.usability.rules.patterns.UsagePattern; -import de.ugoe.cs.autoquest.usability.rules.patterns.UsagePatternBuilder; +import de.ugoe.cs.autoquest.usability.rules.patterns.InteractionPattern; +import de.ugoe.cs.autoquest.usability.rules.patterns.InteractionPatternBuilder; import de.ugoe.cs.autoquest.usability.testutil.GenerateTaskModelUtil; @@ -62,8 +62,8 @@ "}"; ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec); - UsagePatternBuilder patternBuilder = new UsagePatternBuilder(); - UsagePattern startsWithPattern = patternBuilder.concernedNode(ITERATION).contains(MOUSE_CLICK).build(); - UsagePattern containedPattern = patternBuilder.concernedNode(SELECTION).startsWith(TEXT_INPUT).endsWith(MOUSE_CLICK).build(); - UsagePattern pattern = patternBuilder.concernedNode(SEQUENCE).startsWith(startsWithPattern).contains(containedPattern).build(); + InteractionPatternBuilder patternBuilder = new InteractionPatternBuilder(); + InteractionPattern startsWithPattern = patternBuilder.concernedNode(ITERATION).contains(MOUSE_CLICK).build(); + InteractionPattern containedPattern = patternBuilder.concernedNode(SELECTION).startsWith(TEXT_INPUT).endsWith(MOUSE_CLICK).build(); + InteractionPattern pattern = patternBuilder.concernedNode(SEQUENCE).startsWith(startsWithPattern).contains(containedPattern).build(); // When boolean patternContained = pattern.containedIn(taskTree); @@ -96,8 +96,8 @@ "}"; ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec); - UsagePatternBuilder patternBuilder = new UsagePatternBuilder(); - UsagePattern startsWithPattern = patternBuilder.concernedNode(ITERATION).contains(MOUSE_CLICK).build(); - UsagePattern endsWithPattern = patternBuilder.concernedNode(SELECTION).startsWith(TEXT_INPUT).endsWith(MOUSE_CLICK).build(); - UsagePattern pattern = patternBuilder.concernedNode(ITERATION).startsWith(endsWithPattern).endsWith(startsWithPattern).build(); + InteractionPatternBuilder patternBuilder = new InteractionPatternBuilder(); + InteractionPattern startsWithPattern = patternBuilder.concernedNode(ITERATION).contains(MOUSE_CLICK).build(); + InteractionPattern endsWithPattern = patternBuilder.concernedNode(SELECTION).startsWith(TEXT_INPUT).endsWith(MOUSE_CLICK).build(); + InteractionPattern pattern = patternBuilder.concernedNode(ITERATION).startsWith(endsWithPattern).endsWith(startsWithPattern).build(); // When boolean patternContained = pattern.containedIn(taskTree); Index: /trunk/autoquest-core-usability-evaluation-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/startswith/StartsWithPatternAndEndsWithEventTest.java =================================================================== --- /trunk/autoquest-core-usability-evaluation-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/startswith/StartsWithPatternAndEndsWithEventTest.java (revision 1204) +++ /trunk/autoquest-core-usability-evaluation-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/startswith/StartsWithPatternAndEndsWithEventTest.java (revision 1205) @@ -24,6 +24,6 @@ import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskModel; -import de.ugoe.cs.autoquest.usability.rules.patterns.UsagePattern; -import de.ugoe.cs.autoquest.usability.rules.patterns.UsagePatternBuilder; +import de.ugoe.cs.autoquest.usability.rules.patterns.InteractionPattern; +import de.ugoe.cs.autoquest.usability.rules.patterns.InteractionPatternBuilder; import de.ugoe.cs.autoquest.usability.testutil.GenerateTaskModelUtil; @@ -59,7 +59,7 @@ "}"; ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec); - UsagePatternBuilder patternBuilder = new UsagePatternBuilder(); - UsagePattern startsWithPattern = patternBuilder.concernedNode(SELECTION).startsWith(TEXT_INPUT).endsWith(MOUSE_CLICK).build(); - UsagePattern pattern = patternBuilder.concernedNode(SEQUENCE).startsWith(startsWithPattern).endsWith(TEXT_INPUT).build(); + InteractionPatternBuilder patternBuilder = new InteractionPatternBuilder(); + InteractionPattern startsWithPattern = patternBuilder.concernedNode(SELECTION).startsWith(TEXT_INPUT).endsWith(MOUSE_CLICK).build(); + InteractionPattern pattern = patternBuilder.concernedNode(SEQUENCE).startsWith(startsWithPattern).endsWith(TEXT_INPUT).build(); // When boolean patternContained = pattern.containedIn(taskTree); @@ -90,7 +90,7 @@ "}"; ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec); - UsagePatternBuilder patternBuilder = new UsagePatternBuilder(); - UsagePattern startsWithPattern = patternBuilder.concernedNode(SELECTION).startsWith(TEXT_INPUT).endsWith(MOUSE_CLICK).build(); - UsagePattern pattern = patternBuilder.concernedNode(SEQUENCE).startsWith(startsWithPattern).endsWith(TEXT_INPUT).build(); + InteractionPatternBuilder patternBuilder = new InteractionPatternBuilder(); + InteractionPattern startsWithPattern = patternBuilder.concernedNode(SELECTION).startsWith(TEXT_INPUT).endsWith(MOUSE_CLICK).build(); + InteractionPattern pattern = patternBuilder.concernedNode(SEQUENCE).startsWith(startsWithPattern).endsWith(TEXT_INPUT).build(); // When boolean patternContained = pattern.containedIn(taskTree); Index: /trunk/autoquest-core-usability-evaluation-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/startswith/StartsWithPatternContainsEventAndEndsWithEventTest.java =================================================================== --- /trunk/autoquest-core-usability-evaluation-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/startswith/StartsWithPatternContainsEventAndEndsWithEventTest.java (revision 1204) +++ /trunk/autoquest-core-usability-evaluation-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/startswith/StartsWithPatternContainsEventAndEndsWithEventTest.java (revision 1205) @@ -24,6 +24,6 @@ import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskModel; -import de.ugoe.cs.autoquest.usability.rules.patterns.UsagePattern; -import de.ugoe.cs.autoquest.usability.rules.patterns.UsagePatternBuilder; +import de.ugoe.cs.autoquest.usability.rules.patterns.InteractionPattern; +import de.ugoe.cs.autoquest.usability.rules.patterns.InteractionPatternBuilder; import de.ugoe.cs.autoquest.usability.testutil.GenerateTaskModelUtil; @@ -44,5 +44,5 @@ " Selection sel1 {" + " Sequence seq2 {" + - " TextInput target4 {}" + + " TextInput target1 {}" + " MouseClick target2 {}" + " }" + @@ -50,16 +50,16 @@ " Selection sel1 {" + " Sequence seq3 {" + - " TextInput target4 {}" + - " EventTask target2 {}" + + " TextInput target3 {}" + + " EventTask target4 {}" + " }" + " }" + - " MouseClick target2 {}" + - " TextInput target3 {}" + + " MouseClick target5 {}" + + " TextInput target6 {}" + " }" + "}"; ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec); - UsagePatternBuilder patternBuilder = new UsagePatternBuilder(); - UsagePattern startsWithPattern = patternBuilder.concernedNode(SELECTION).startsWith(TEXT_INPUT).endsWith(MOUSE_CLICK).build(); - UsagePattern pattern = patternBuilder.concernedNode(SEQUENCE).startsWith(startsWithPattern).contains(MOUSE_CLICK).endsWith(TEXT_INPUT).build(); + InteractionPatternBuilder patternBuilder = new InteractionPatternBuilder(); + InteractionPattern startsWithPattern = patternBuilder.concernedNode(SELECTION).startsWith(TEXT_INPUT).endsWith(MOUSE_CLICK).build(); + InteractionPattern pattern = patternBuilder.concernedNode(SEQUENCE).startsWith(startsWithPattern).contains(MOUSE_CLICK).endsWith(TEXT_INPUT).build(); // When boolean patternContained = pattern.containedIn(taskTree); @@ -90,7 +90,7 @@ "}"; ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec); - UsagePatternBuilder patternBuilder = new UsagePatternBuilder(); - UsagePattern startsWithPattern = patternBuilder.concernedNode(SELECTION).startsWith(TEXT_INPUT).endsWith(MOUSE_CLICK).build(); - UsagePattern pattern = patternBuilder.concernedNode(SEQUENCE).startsWith(startsWithPattern).contains(MOUSE_CLICK).endsWith(TEXT_INPUT).build(); + InteractionPatternBuilder patternBuilder = new InteractionPatternBuilder(); + InteractionPattern startsWithPattern = patternBuilder.concernedNode(SELECTION).startsWith(TEXT_INPUT).endsWith(MOUSE_CLICK).build(); + InteractionPattern pattern = patternBuilder.concernedNode(SEQUENCE).startsWith(startsWithPattern).contains(MOUSE_CLICK).endsWith(TEXT_INPUT).build(); // When boolean patternContained = pattern.containedIn(taskTree); Index: /trunk/autoquest-core-usability-evaluation-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/startswith/StartsWithPatternContainsEventAndEndsWithPatternTest.java =================================================================== --- /trunk/autoquest-core-usability-evaluation-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/startswith/StartsWithPatternContainsEventAndEndsWithPatternTest.java (revision 1204) +++ /trunk/autoquest-core-usability-evaluation-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/startswith/StartsWithPatternContainsEventAndEndsWithPatternTest.java (revision 1205) @@ -16,4 +16,5 @@ import static de.ugoe.cs.autoquest.usability.tasktree.filters.EventTypeFilter.MOUSE_CLICK; +import static de.ugoe.cs.autoquest.usability.tasktree.filters.EventTypeFilter.SCROLL; import static de.ugoe.cs.autoquest.usability.tasktree.filters.EventTypeFilter.TEXT_INPUT; import static de.ugoe.cs.autoquest.usability.tasktree.filters.TaskTypeFilter.SELECTION; @@ -24,6 +25,6 @@ import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskModel; -import de.ugoe.cs.autoquest.usability.rules.patterns.UsagePattern; -import de.ugoe.cs.autoquest.usability.rules.patterns.UsagePatternBuilder; +import de.ugoe.cs.autoquest.usability.rules.patterns.InteractionPattern; +import de.ugoe.cs.autoquest.usability.rules.patterns.InteractionPatternBuilder; import de.ugoe.cs.autoquest.usability.testutil.GenerateTaskModelUtil; @@ -54,25 +55,25 @@ " }" + " }" + - " }" + - " MouseClick target2 {}" + - " TextInput target3 {}" + - " Selection sel2 {" + - " Sequence seq4 {" + - " TextInput target4 {}" + - " MouseClick target2 {}" + + " MouseClick target2 {}" + + " TextInput target3 {}" + + " Selection sel2 {" + + " Sequence seq5 {" + + " TextInput target4 {}" + + " MouseClick target2 {}" + + " }" + " }" + - " }" + - " Selection sel2 {" + - " Sequence seq5 {" + - " TextInput target4 {}" + - " EventTask target2 {}" + + " Selection sel2 {" + + " Sequence seq6 {" + + " TextInput target4 {}" + + " EventTask target2 {}" + + " }" + " }" + " }" + "}"; ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec); - UsagePatternBuilder patternBuilder = new UsagePatternBuilder(); - UsagePattern startsWithPattern = patternBuilder.concernedNode(SELECTION).startsWith(TEXT_INPUT).endsWith(MOUSE_CLICK).build(); - UsagePattern endsWithPattern = patternBuilder.concernedNode(SELECTION).startsWith(TEXT_INPUT).endsWith(MOUSE_CLICK).build(); - UsagePattern pattern = patternBuilder.concernedNode(SEQUENCE).startsWith(startsWithPattern).contains(MOUSE_CLICK).endsWith(endsWithPattern).build(); + InteractionPatternBuilder patternBuilder = new InteractionPatternBuilder(); + InteractionPattern startsWithPattern = patternBuilder.concernedNode(SELECTION).startsWith(TEXT_INPUT).endsWith(MOUSE_CLICK).build(); + InteractionPattern endsWithPattern = patternBuilder.concernedNode(SELECTION).startsWith(TEXT_INPUT).endsWith(MOUSE_CLICK).build(); + InteractionPattern pattern = patternBuilder.concernedNode(SEQUENCE).startsWith(startsWithPattern).contains(MOUSE_CLICK).endsWith(endsWithPattern).build(); // When boolean patternContained = pattern.containedIn(taskTree); @@ -89,5 +90,5 @@ " Sequence seq2 {" + " TextInput target4 {}" + - " MouseClick target2 {}" + + " MouseClick target3 {}" + " }" + " }" + @@ -98,25 +99,25 @@ " }" + " }" + - " }" + - " EventTask target2 {}" + - " TextInput target3 {}" + - " Selection sel2 {" + - " Sequence seq4 {" + - " TextInput target4 {}" + - " MouseClick target2 {}" + + " EventTask target2 {}" + + " TextInput target1 {}" + + " Selection sel2 {" + + " Sequence seq5 {" + + " TextInput target4 {}" + + " MouseClick target3 {}" + + " }" + " }" + - " }" + - " Selection sel2 {" + - " Sequence seq5 {" + - " TextInput target4 {}" + - " EventTask target2 {}" + + " Selection sel2 {" + + " Sequence seq6 {" + + " TextInput target4 {}" + + " EventTask target2 {}" + + " }" + " }" + " }" + "}"; ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec); - UsagePatternBuilder patternBuilder = new UsagePatternBuilder(); - UsagePattern startsWithPattern = patternBuilder.concernedNode(SELECTION).startsWith(TEXT_INPUT).endsWith(MOUSE_CLICK).build(); - UsagePattern endsWithPattern = patternBuilder.concernedNode(SELECTION).startsWith(TEXT_INPUT).endsWith(MOUSE_CLICK).build(); - UsagePattern pattern = patternBuilder.concernedNode(SEQUENCE).startsWith(startsWithPattern).contains(MOUSE_CLICK).endsWith(endsWithPattern).build(); + InteractionPatternBuilder patternBuilder = new InteractionPatternBuilder(); + InteractionPattern startsWithPattern = patternBuilder.concernedNode(SELECTION).startsWith(TEXT_INPUT).endsWith(MOUSE_CLICK).build(); + InteractionPattern endsWithPattern = patternBuilder.concernedNode(SELECTION).startsWith(TEXT_INPUT).endsWith(MOUSE_CLICK).build(); + InteractionPattern pattern = patternBuilder.concernedNode(SEQUENCE).startsWith(startsWithPattern).contains(SCROLL).endsWith(endsWithPattern).build(); // When boolean patternContained = pattern.containedIn(taskTree); Index: /trunk/autoquest-core-usability-evaluation-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/startswith/StartsWithPatternContainsPatternAndEndsWithEventTest.java =================================================================== --- /trunk/autoquest-core-usability-evaluation-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/startswith/StartsWithPatternContainsPatternAndEndsWithEventTest.java (revision 1204) +++ /trunk/autoquest-core-usability-evaluation-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/startswith/StartsWithPatternContainsPatternAndEndsWithEventTest.java (revision 1205) @@ -24,6 +24,6 @@ import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskModel; -import de.ugoe.cs.autoquest.usability.rules.patterns.UsagePattern; -import de.ugoe.cs.autoquest.usability.rules.patterns.UsagePatternBuilder; +import de.ugoe.cs.autoquest.usability.rules.patterns.InteractionPattern; +import de.ugoe.cs.autoquest.usability.rules.patterns.InteractionPatternBuilder; import de.ugoe.cs.autoquest.usability.testutil.GenerateTaskModelUtil; @@ -45,25 +45,25 @@ " Sequence seq2 {" + " TextInput target4 {}" + - " MouseClick target2 {}" + + " MouseClick target1 {}" + " }" + " }" + " Selection sel1 {" + " Sequence seq3 {" + - " TextInput target4 {}" + - " EventTask target2 {}" + + " TextInput target3 {}" + + " EventTask target5 {}" + " }" + " }" + + " Sequence seq4 {" + + " MouseClick target6 {}" + + " EventTask t5 {}" + + " }" + + " TextInput target7 {}" + " }" + - " Sequence seq4 {" + - " MouseClick target2 {}" + - " EventTask t5 {}" + - " }" + - " TextInput target3 {}" + "}"; ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec); - UsagePatternBuilder patternBuilder = new UsagePatternBuilder(); - UsagePattern startsWithPattern = patternBuilder.concernedNode(SELECTION).startsWith(TEXT_INPUT).endsWith(MOUSE_CLICK).build(); - UsagePattern containsPattern = patternBuilder.concernedNode(SEQUENCE).startsWith(MOUSE_CLICK).build(); - UsagePattern pattern = patternBuilder.concernedNode(SEQUENCE).startsWith(startsWithPattern).contains(containsPattern).endsWith(TEXT_INPUT).build(); + InteractionPatternBuilder patternBuilder = new InteractionPatternBuilder(); + InteractionPattern startsWithPattern = patternBuilder.concernedNode(SELECTION).startsWith(TEXT_INPUT).endsWith(MOUSE_CLICK).build(); + InteractionPattern containsPattern = patternBuilder.concernedNode(SEQUENCE).startsWith(MOUSE_CLICK).build(); + InteractionPattern pattern = patternBuilder.concernedNode(SEQUENCE).startsWith(startsWithPattern).contains(containsPattern).endsWith(TEXT_INPUT).build(); // When boolean patternContained = pattern.containedIn(taskTree); @@ -97,8 +97,8 @@ "}"; ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec); - UsagePatternBuilder patternBuilder = new UsagePatternBuilder(); - UsagePattern startsWithPattern = patternBuilder.concernedNode(SELECTION).startsWith(TEXT_INPUT).endsWith(MOUSE_CLICK).build(); - UsagePattern containsPattern = patternBuilder.concernedNode(SEQUENCE).startsWith(MOUSE_CLICK).endsWith(TEXT_INPUT).build(); - UsagePattern pattern = patternBuilder.concernedNode(SEQUENCE).startsWith(startsWithPattern).contains(containsPattern).endsWith(TEXT_INPUT).build(); + InteractionPatternBuilder patternBuilder = new InteractionPatternBuilder(); + InteractionPattern startsWithPattern = patternBuilder.concernedNode(SELECTION).startsWith(TEXT_INPUT).endsWith(MOUSE_CLICK).build(); + InteractionPattern containsPattern = patternBuilder.concernedNode(SEQUENCE).startsWith(MOUSE_CLICK).endsWith(TEXT_INPUT).build(); + InteractionPattern pattern = patternBuilder.concernedNode(SEQUENCE).startsWith(startsWithPattern).contains(containsPattern).endsWith(TEXT_INPUT).build(); // When boolean patternContained = pattern.containedIn(taskTree); Index: /trunk/autoquest-core-usability-evaluation-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/startswith/StartsWithPatternTest.java =================================================================== --- /trunk/autoquest-core-usability-evaluation-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/startswith/StartsWithPatternTest.java (revision 1204) +++ /trunk/autoquest-core-usability-evaluation-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/startswith/StartsWithPatternTest.java (revision 1205) @@ -24,6 +24,6 @@ import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskModel; -import de.ugoe.cs.autoquest.usability.rules.patterns.UsagePattern; -import de.ugoe.cs.autoquest.usability.rules.patterns.UsagePatternBuilder; +import de.ugoe.cs.autoquest.usability.rules.patterns.InteractionPattern; +import de.ugoe.cs.autoquest.usability.rules.patterns.InteractionPatternBuilder; import de.ugoe.cs.autoquest.usability.testutil.GenerateTaskModelUtil; @@ -57,7 +57,7 @@ "}"; ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec); - UsagePatternBuilder patternBuilder = new UsagePatternBuilder(); - UsagePattern startsWithPattern = patternBuilder.concernedNode(ITERATION).startsWith(TEXT_INPUT).contains(MOUSE_CLICK).build(); - UsagePattern pattern = patternBuilder.concernedNode(SEQUENCE).startsWith(startsWithPattern).build(); + InteractionPatternBuilder patternBuilder = new InteractionPatternBuilder(); + InteractionPattern startsWithPattern = patternBuilder.concernedNode(ITERATION).startsWith(TEXT_INPUT).contains(MOUSE_CLICK).build(); + InteractionPattern pattern = patternBuilder.concernedNode(SEQUENCE).startsWith(startsWithPattern).build(); // When boolean patternContained = pattern.containedIn(taskTree); @@ -86,7 +86,7 @@ "}"; ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec); - UsagePatternBuilder patternBuilder = new UsagePatternBuilder(); - UsagePattern startsWithPattern = patternBuilder.concernedNode(SEQUENCE).startsWith(MOUSE_CLICK).endsWith(TEXT_INPUT).build(); - UsagePattern pattern = patternBuilder.concernedNode(SEQUENCE).startsWith(startsWithPattern).build(); + InteractionPatternBuilder patternBuilder = new InteractionPatternBuilder(); + InteractionPattern startsWithPattern = patternBuilder.concernedNode(SEQUENCE).startsWith(MOUSE_CLICK).endsWith(TEXT_INPUT).build(); + InteractionPattern pattern = patternBuilder.concernedNode(SEQUENCE).startsWith(startsWithPattern).build(); // When boolean patternContained = pattern.containedIn(taskTree);