Changeset 1190 for trunk/autoquest-core-tasktrees-test

Timestamp:

04/29/13 16:43:17 (11 years ago)

Author:

pharms

Message:

• remove a find bugs warning

Location:

trunk/autoquest-core-tasktrees-test/src/test/java/de/ugoe/cs/autoquest/tasktrees

Files:

• taskequality/IterationComparisonRuleTest.java (modified) (2 diffs)
• taskequality/SelectionComparisonRuleTest.java (modified) (2 diffs)
• taskequality/SequenceComparisonRuleTest.java (modified) (2 diffs)
• taskequality/TaskAndIterationComparisonRuleTest.java (modified) (2 diffs)
• taskequality/TaskAndSelectionComparisonRuleTest.java (modified) (2 diffs)
• temporalrelation/AbstractTemporalRelationshipTC.java (modified) (4 diffs)

trunk/autoquest-core-tasktrees-test/src/test/java/de/ugoe/cs/autoquest/tasktrees/taskequality/IterationComparisonRuleTest.java

@@ -24 +24 @@
 import de.ugoe.cs.autoquest.tasktrees.taskequality.IterationComparisonRule;
 import de.ugoe.cs.autoquest.tasktrees.taskequality.TaskEquality;
-import de.ugoe.cs.autoquest.tasktrees.taskequality.TaskEqualityRuleManager;
 import de.ugoe.cs.autoquest.tasktrees.treeifc.IIteration;
 import de.ugoe.cs.autoquest.tasktrees.treeifc.ISelection;
@@ -44 +43 @@
     @Test
     public void test() {
-        TaskEqualityRuleManager manager = new TaskEqualityRuleManager();
-        manager.init();
-        
         ITaskFactory taskFactory = new TaskFactory();
         ITaskBuilder treeBuilder = new TaskBuilder();
         
-        IterationComparisonRule rule = new IterationComparisonRule(manager);
+        IterationComparisonRule rule = new IterationComparisonRule();
         
         IEventType eventType1 = new StringEventType("eventType1");

trunk/autoquest-core-tasktrees-test/src/test/java/de/ugoe/cs/autoquest/tasktrees/taskequality/SelectionComparisonRuleTest.java

@@ -24 +24 @@
 import de.ugoe.cs.autoquest.tasktrees.taskequality.TaskEquality;
 import de.ugoe.cs.autoquest.tasktrees.taskequality.SelectionComparisonRule;
-import de.ugoe.cs.autoquest.tasktrees.taskequality.TaskEqualityRuleManager;
 import de.ugoe.cs.autoquest.tasktrees.treeifc.ISelection;
 import de.ugoe.cs.autoquest.tasktrees.treeifc.ISequence;
@@ -44 +43 @@
     @Test
     public void test() {
-        TaskEqualityRuleManager manager = new TaskEqualityRuleManager();
-        manager.init();
-        
         ITaskFactory taskFactory = new TaskFactory();
         ITaskBuilder treeBuilder = new TaskBuilder();
         
-        SelectionComparisonRule rule = new SelectionComparisonRule(manager);
+        SelectionComparisonRule rule = new SelectionComparisonRule();
         
         IEventType eventType1 = new StringEventType("eventType1");

trunk/autoquest-core-tasktrees-test/src/test/java/de/ugoe/cs/autoquest/tasktrees/taskequality/SequenceComparisonRuleTest.java

@@ -24 +24 @@
 import de.ugoe.cs.autoquest.tasktrees.taskequality.TaskEquality;
 import de.ugoe.cs.autoquest.tasktrees.taskequality.SequenceComparisonRule;
-import de.ugoe.cs.autoquest.tasktrees.taskequality.TaskEqualityRuleManager;
 import de.ugoe.cs.autoquest.tasktrees.treeifc.ISelection;
 import de.ugoe.cs.autoquest.tasktrees.treeifc.ISequence;
@@ -44 +43 @@
     @Test
     public void test() {
-        TaskEqualityRuleManager manager = new TaskEqualityRuleManager();
-        manager.init();
-        
         ITaskFactory taskFactory = new TaskFactory();
         ITaskBuilder treeBuilder = new TaskBuilder();
         
-        SequenceComparisonRule rule = new SequenceComparisonRule(manager);
+        SequenceComparisonRule rule = new SequenceComparisonRule();
         
         IEventType eventType1 = new StringEventType("eventType1");

trunk/autoquest-core-tasktrees-test/src/test/java/de/ugoe/cs/autoquest/tasktrees/taskequality/TaskAndIterationComparisonRuleTest.java

@@ -24 +24 @@
 import de.ugoe.cs.autoquest.tasktrees.taskequality.TaskAndIterationComparisonRule;
 import de.ugoe.cs.autoquest.tasktrees.taskequality.TaskEquality;
-import de.ugoe.cs.autoquest.tasktrees.taskequality.TaskEqualityRuleManager;
 import de.ugoe.cs.autoquest.tasktrees.treeifc.IIteration;
 import de.ugoe.cs.autoquest.tasktrees.treeifc.ISelection;
@@ -44 +43 @@
     @Test
     public void test() {
-        TaskEqualityRuleManager manager = new TaskEqualityRuleManager();
-        manager.init();
-        
         ITaskFactory taskFactory = new TaskFactory();
         ITaskBuilder treeBuilder = new TaskBuilder();
         
-        TaskAndIterationComparisonRule rule = new TaskAndIterationComparisonRule(manager);
+        TaskAndIterationComparisonRule rule = new TaskAndIterationComparisonRule();
         
         IEventType eventType1 = new StringEventType("eventType1");

trunk/autoquest-core-tasktrees-test/src/test/java/de/ugoe/cs/autoquest/tasktrees/taskequality/TaskAndSelectionComparisonRuleTest.java

@@ -24 +24 @@
 import de.ugoe.cs.autoquest.tasktrees.taskequality.TaskAndSelectionComparisonRule;
 import de.ugoe.cs.autoquest.tasktrees.taskequality.TaskEquality;
-import de.ugoe.cs.autoquest.tasktrees.taskequality.TaskEqualityRuleManager;
 import de.ugoe.cs.autoquest.tasktrees.treeifc.ISelection;
 import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskBuilder;
@@ -43 +42 @@
     @Test
     public void test() {
-        TaskEqualityRuleManager manager = new TaskEqualityRuleManager();
-        manager.init();
-        
         ITaskFactory taskFactory = new TaskFactory();
         ITaskBuilder treeBuilder = new TaskBuilder();
         
-        TaskAndSelectionComparisonRule rule = new TaskAndSelectionComparisonRule(manager);
+        TaskAndSelectionComparisonRule rule = new TaskAndSelectionComparisonRule();
         
         IEventType eventType1 = new StringEventType("eventType1");

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

@@ -33 +33 @@
 import de.ugoe.cs.autoquest.tasktrees.TaskTreeValidator;
 import de.ugoe.cs.autoquest.tasktrees.taskequality.TaskEquality;
-import de.ugoe.cs.autoquest.tasktrees.taskequality.TaskEqualityRuleManager;
-import de.ugoe.cs.autoquest.tasktrees.testutils.Utilities;
 import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskInstanceList;
 import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskBuilder;
@@ -62 +60 @@
     private TaskTreeEncoder encoder = new TaskTreeEncoder();
     
-    /** */
-    private TaskEqualityRuleManager taskEqualityRuleManager =
-        Utilities.getTaskEqualityRuleManagerForTests();
-
     /**
      *
@@ -97 +91 @@
                     parameters.add(taskBuilder);
                 }
-                else if (TaskEqualityRuleManager.class.equals(type)) {
-                    parameters.add(taskEqualityRuleManager);
-                }
                 else if (TaskEquality.class.equals(type)) {
                     parameters.add(TaskEquality.LEXICALLY_EQUAL);
@@ -192 +183 @@
                     parameters.add(taskBuilder);
                 }
-                else if (TaskEqualityRuleManager.class.equals(type)) {
-                    parameters.add(taskEqualityRuleManager);
-                }
                 else if (TaskEquality.class.equals(type)) {
                     parameters.add(TaskEquality.LEXICALLY_EQUAL);