Changeset 2146 for trunk/autoquest-core-events-test/src/test/java/de/ugoe/cs/autoquest/eventcore/guimodel/GUIModelTest.java

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-core-events-test/src/test/java/de/ugoe/cs/autoquest/eventcore/guimodel/GUIModelTest.java (modified) (11 diffs)

trunk/autoquest-core-events-test/src/test/java/de/ugoe/cs/autoquest/eventcore/guimodel/GUIModelTest.java

@@ -23 +23 @@
 import org.junit.Test;
 
+import de.ugoe.cs.autoquest.eventcore.EventTargetModelConfigurationException;
+import de.ugoe.cs.autoquest.eventcore.HierarchicalEventTargetModel;
+import de.ugoe.cs.autoquest.eventcore.IEventTargetFactory;
+import de.ugoe.cs.autoquest.eventcore.IEventTargetSpec;
+import de.ugoe.cs.autoquest.eventcore.IHierarchicalEventTarget;
+import de.ugoe.cs.autoquest.eventcore.IHierarchicalEventTargetModel;
+
 /**
  *
@@ -32 +39 @@
      * 
      */
-    private IGUIElementFactory guiElementFactory = new TestGUIElementFactory();
+    private IEventTargetFactory guiElementFactory = new TestGUIElementFactory();
 
     /**
@@ -399 +406 @@
         IGUIElement guiElem9 = model.getChildren(guiElem1).get(1);
         
-        model.groupGUIElements(Arrays.asList(guiElem2, guiElem9), "newGroup");
+        model.groupEventTargets(Arrays.asList(guiElem2, guiElem9), "newGroup", guiElementFactory);
         
         assertEquals(1, model.getChildren(guiElem1).size());
@@ -475 +482 @@
         IGUIElement guiElem5 = model.getChildren(guiElem2).get(1);
         
-        model.groupGUIElements(Arrays.asList(guiElem3, guiElem5), "newGroup");
+        model.groupEventTargets(Arrays.asList(guiElem3, guiElem5), "newGroup", guiElementFactory);
         
         assertEquals(1, model.getChildren(guiElem2).size());
@@ -551 +558 @@
         IGUIElement guiElem4 = model.getChildren(guiElem3).get(0);
         
-        model.groupGUIElements(Arrays.asList(guiElem4), "newGroup");
+        model.groupEventTargets(Arrays.asList(guiElem4), "newGroup", guiElementFactory);
         
         assertEquals(1, model.getChildren(guiElem3).size());
@@ -629 +636 @@
         IGUIElement guiElem6 = model.getChildren(guiElem5).get(0);
 
-        model.groupGUIElements(Arrays.asList(guiElem4, guiElem6), "newGroup");
+        model.groupEventTargets(Arrays.asList(guiElem4, guiElem6), "newGroup", guiElementFactory);
     }
 
@@ -685 +692 @@
         //         \-- guiElem10
         
-        GUIModel.Traverser traverser = model.getTraverser();
+        IHierarchicalEventTargetModel.Traverser<IGUIElement> traverser = model.getTraverser();
         assertNotNull(traverser);
         assertTrue(traverser.hasFirstChild());
@@ -890 +897 @@
         //         \-- guiElem10
         
-        GUIModel.Traverser traverser = model.getTraverser(target);
+        IHierarchicalEventTargetModel.Traverser<IGUIElement> traverser = model.getTraverser(target);
         assertNotNull(traverser);
         assertFalse(traverser.hasFirstChild());
@@ -985 +992 @@
      * @author Patrick Harms
      */
-    private class TestGUIElementFactory implements IGUIElementFactory {
+    private class TestGUIElementFactory implements IEventTargetFactory {
 
         /* (non-Javadoc)
          * @see IGUIElementFactory#instantiateGUIElement(IGUIElementSpec, IGUIElement)
          */
+        @SuppressWarnings("unchecked")
         @Override
-        public IGUIElement instantiateGUIElement(IGUIElementSpec specification, IGUIElement parent)
-            throws GUIModelConfigurationException
+        public <T extends IHierarchicalEventTarget> T instantiateEventTarget(IEventTargetSpec specification,
+                                                                             T                parent)
+            throws EventTargetModelConfigurationException
         {
             assertTrue(specification instanceof TestGUIElementSpec);
             
-            return new TestGUIElement((TestGUIElementSpec) specification, parent);
+            return (T) new TestGUIElement((TestGUIElementSpec) specification, (IGUIElement) parent);
+        }
+
+        /* (non-Javadoc)
+         * @see IEventTargetFactory#instantiateGroup(String, IHierarchicalEventTarget, HierarchicalEventTargetModel)
+         */
+        @SuppressWarnings("unchecked")
+        @Override
+        public <T extends IHierarchicalEventTarget> T instantiateGroup(String                          groupName,
+                                                                       T                               parent,
+                                                                       HierarchicalEventTargetModel<T> hierarchicalEventTargetModel)
+        {
+            return (T) new GUIElementGroup(groupName, (IGUIElement) parent, (GUIModel) hierarchicalEventTargetModel);
         }
 
@@ -1053 +1074 @@
          */
         @Override
-        public boolean getSimilarity(IGUIElementSpec other) {
+        public boolean getSimilarity(IEventTargetSpec other) {
             return (other instanceof TestGUIElementSpec ?
                 ((TestGUIElementSpec) other).similarityId.equals(similarityId) : false);
@@ -1105 +1126 @@
          */
         @Override
-        public void updateSpecification(IGUIElementSpec furtherSpec) {
+        public void updateSpecification(IEventTargetSpec furtherSpec) {
             // do nothing
         }