Changeset 2146 for trunk/autoquest-plugin-html-test/src/test/java/de/ugoe/cs/autoquest

Timestamp:

05/19/17 11:31:29 (7 years ago)

Author:

pharms

Message:

• refactored GUI model so that hierarchical event target structures can also be used and created by plugins not being strictly for GUIs

File:

• trunk/autoquest-plugin-html-test/src/test/java/de/ugoe/cs/autoquest/plugin/html/commands/CMDcondenseHTMLGUIModelTest.java (modified) (5 diffs)

trunk/autoquest-plugin-html-test/src/test/java/de/ugoe/cs/autoquest/plugin/html/commands/CMDcondenseHTMLGUIModelTest.java

@@ -26 +26 @@
 import org.junit.Test;
 
+import de.ugoe.cs.autoquest.eventcore.HierarchicalEventTargetGroup;
+import de.ugoe.cs.autoquest.eventcore.EventTargetModelException;
+import de.ugoe.cs.autoquest.eventcore.IHierarchicalEventTargetModel;
 import de.ugoe.cs.autoquest.eventcore.guimodel.GUIElementFactory;
-import de.ugoe.cs.autoquest.eventcore.guimodel.GUIElementGroup;
 import de.ugoe.cs.autoquest.eventcore.guimodel.GUIModel;
-import de.ugoe.cs.autoquest.eventcore.guimodel.GUIModel.Traverser;
-import de.ugoe.cs.autoquest.eventcore.guimodel.GUIModelException;
 import de.ugoe.cs.autoquest.eventcore.guimodel.IGUIElement;
 import de.ugoe.cs.autoquest.eventcore.guimodel.IGUIElementSpec;
@@ -343 +343 @@
      */
     private GUIModel generateGUIModel(String[] guiSpec)
-        throws IllegalArgumentException, GUIModelException
+        throws IllegalArgumentException, EventTargetModelException
     {
         GUIModel model = new GUIModel(true);
@@ -430 +430 @@
         }
         
-        GUIModel.Traverser traverser = guiModel.getTraverser();
+        IHierarchicalEventTargetModel.Traverser<IGUIElement> traverser = guiModel.getTraverser();
         
         assertPaths(traverser, "", paths);
@@ -440 +440 @@
      *
      */
-    private void assertPaths(Traverser traverser, String path, List<String> paths) {
+    private void assertPaths(IHierarchicalEventTargetModel.Traverser<IGUIElement> traverser, String path, List<String> paths) {
         if (traverser.hasFirstChild()) {
             IGUIElement childElement = traverser.firstChild();
@@ -481 +481 @@
             }
         }
-        else if (childElement instanceof GUIElementGroup) {
-            String tmp = ((GUIElementGroup) childElement).getStringIdentifier();
+        else if (childElement instanceof HierarchicalEventTargetGroup) {
+            String tmp = ((HierarchicalEventTargetGroup) childElement).getStringIdentifier();
             tmp = tmp.replaceAll("/", "");
             tmp = tmp.replaceAll("\\[", "");