Refactor AtCanvasPolicy

Author: ferpasri

core/src/org/testar/core/policy/AtCanvasPolicy.java

@@ -36,8 +36,6 @@ public CustomPoliciesEditor(String policiesResourcePath) {
                         "widgetFilterPolicies=",
                         "replaceVisiblePolicies=false",
                         "visiblePolicies=",
-                        "replaceAtCanvasPolicies=false",
-                        "atCanvasPolicies=",
                         "replaceTopLevelPolicies=false",
                         "topLevelPolicies=",
                         ""

dialog/src/org/testar/dialog/editor/CustomPoliciesEditor.java

@@ -36,8 +36,6 @@ public final class PolicyWorkspaceHelper {
                     "org.testar.core.policy.WidgetFilterPolicy", "allows", "return true;"),
             new PolicyDefinition("visiblePolicies", "Visible policies", "VisiblePolicy",
                     "org.testar.core.policy.VisiblePolicy", "isVisible", "return true;"),
-            new PolicyDefinition("atCanvasPolicies", "At-canvas policies", "AtCanvasPolicy",
-                    "org.testar.core.policy.AtCanvasPolicy", "isAtCanvas", "return true;"),
             new PolicyDefinition("topLevelPolicies", "Top-level policies", "TopLevelPolicy",
                     "org.testar.core.policy.TopLevelPolicy", "isTopLevel", "return true;")
     };

dialog/src/org/testar/dialog/helper/PolicyWorkspaceHelper.java

@@ -255,9 +255,6 @@ The main policy contracts are in `org.testar.core.policy`.
 - `VisiblePolicy`
   Decides whether a widget should be considered visible for state, action, oracle, or reporting logic.
   File: `core/src/org/testar/core/policy/VisiblePolicy.java`
-- `AtCanvasPolicy`
-  Decides whether a widget should be considered inside the actionable or inspectable canvas area.
-  File: `core/src/org/testar/core/policy/AtCanvasPolicy.java`
 - `TopLevelPolicy`
   Decides whether a widget should be treated as a top-level widget for higher-level queries or orchestration.
   File: `core/src/org/testar/core/policy/TopLevelPolicy.java`
@@ -384,8 +381,6 @@ Examples:
   Produces one `WidgetFilterPolicy` from one or more explicit widget-filter rules.
 - `CompositeVisiblePolicy`
   Produces one `VisiblePolicy` from one or more visibility rules.
-- `CompositeAtCanvasPolicy`
-  Produces one `AtCanvasPolicy` from one or more canvas-scope rules.
 - `CompositeTopLevelPolicy`
   Produces one `TopLevelPolicy` from one or more top-level rules.
 
@@ -449,7 +444,6 @@ It stores effective policies by their policy-interface type, for example:
 - `BlockedPolicy.class`
 - `WidgetFilterPolicy.class`
 - `VisiblePolicy.class`
-- `AtCanvasPolicy.class`
 - `TopLevelPolicy.class`
 
 This shows the intended role of `engine`:
@@ -705,7 +699,6 @@ The current derivation gating in `StateActionDeriver` uses:
 - `BlockedPolicy`
 - `WidgetFilterPolicy`
 - `VisiblePolicy`
-- `AtCanvasPolicy`
 - `TopLevelPolicy`
 
 Then the widget-level deriver uses capability policies such as:

docs/ARCHITECTURE.md

@@ -7,7 +7,6 @@ flowchart LR
         BP["BlockedPolicy"]
         WFP["WidgetFilterPolicy"]
         VP["VisiblePolicy"]
-        ACP["AtCanvasPolicy"]
         TLP["TopLevelPolicy"]
     end
 
@@ -19,7 +18,6 @@ flowchart LR
         CBP["CompositeBlockedPolicy<br/>semantics: ANY"]
         CWFP["CompositeWidgetFilterPolicy<br/>semantics: ALL"]
         CVP["CompositeVisiblePolicy<br/>semantics: ALL"]
-        CACP["CompositeAtCanvasPolicy<br/>semantics: ALL"]
         CTLP["CompositeTopLevelPolicy<br/>semantics: ALL"]
     end
 
@@ -35,7 +33,6 @@ flowchart LR
         PTP["PlatformTypeablePolicy (WindowsTypeablePolicy / WebdriverTypeablePolicy / AndroidTypeablePolicy)"]
         PSP["PlatformScrollablePolicy (WindowsScrollablePolicy / WebdriverScrollablePolicy / AndroidScrollablePolicy)"]
         PVP["PlatformVisiblePolicy (WindowsVisiblePolicy / WebdriverVisiblePolicy / AndroidVisiblePolicy)"]
-        PACP["PlatformAtCanvasPolicy (WebdriverAtCanvasPolicy / AndroidAtCanvasPolicy)"]
     end
 
     subgraph CustomPolicyImplementations["custom policy implementations"]
@@ -56,7 +53,6 @@ flowchart LR
     PTP -. implements .-> TP
     PSP -. implements .-> SP
     PVP -. implements .-> VP
-    PACP -. implements .-> ACP
 
     TEP -. implements .-> EP
     TBP -. implements .-> BP
@@ -73,7 +69,6 @@ flowchart LR
     BP -- "1..n policies" --> CBP
     WFP -- "1..n policies" --> CWFP
     VP -- "1..n policies" --> CVP
-    ACP -- "1..n policies" --> CACP
     TLP -- "1..n policies" --> CTLP
 
     CCP --> PPC
@@ -83,7 +78,6 @@ flowchart LR
     CBP --> PPC
     CWFP --> PPC
     CVP --> PPC
-    CACP --> PPC
     CTLP --> PPC
 
     PPC --> SPC

docs/policy/architecture_policy_composition.mmd

@@ -11,7 +11,6 @@
 
 import org.testar.core.Assert;
 import org.testar.core.action.Action;
-import org.testar.core.policy.AtCanvasPolicy;
 import org.testar.core.policy.BlockedPolicy;
 import org.testar.core.policy.EnabledPolicy;
 import org.testar.core.state.SUT;
@@ -42,14 +41,12 @@ public Set<Action> derive(SUT system, State state, SessionPolicyContext context)
         BlockedPolicy blockedPolicy = context.require(BlockedPolicy.class);
         WidgetFilterPolicy widgetFilterPolicy = context.require(WidgetFilterPolicy.class);
         VisiblePolicy visiblePolicy = context.require(VisiblePolicy.class);
-        AtCanvasPolicy atCanvasPolicy = context.require(AtCanvasPolicy.class);
         TopLevelPolicy topLevelPolicy = context.require(TopLevelPolicy.class);
         for (Widget widget : state) {
             if (enabledPolicy.isEnabled(widget)
                     && !blockedPolicy.isBlocked(widget)
                     && widgetFilterPolicy.allows(widget)
                     && visiblePolicy.isVisible(widget)
-                    && atCanvasPolicy.isAtCanvas(widget)
                     && topLevelPolicy.isTopLevel(widget)) {
                 actions.addAll(widgetActionDeriver.derive(system, state, widget, context));
             }

engine/src/org/testar/engine/action/derivation/StateActionDeriver.java

@@ -10,7 +10,6 @@
 import org.testar.core.action.Action;
 import org.testar.core.action.ActionRoles;
 import org.testar.core.alayer.Role;
-import org.testar.core.policy.AtCanvasPolicy;
 import org.testar.core.policy.BlockedPolicy;
 import org.testar.core.policy.ClickablePolicy;
 import org.testar.core.policy.EnabledPolicy;
@@ -25,7 +24,6 @@
 import org.testar.core.tag.TaggableBase;
 import org.testar.core.tag.Tags;
 import org.testar.engine.policy.SessionPolicyContext;
-import org.testar.engine.policy.composite.CompositeAtCanvasPolicy;
 import org.testar.engine.policy.composite.CompositeBlockedPolicy;
 import org.testar.engine.policy.composite.CompositeClickablePolicy;
 import org.testar.engine.policy.composite.CompositeEnabledPolicy;
@@ -133,7 +131,6 @@ public void exposesComposedPoliciesThroughContext() {
         BlockedPolicy blocked = widget -> false;
         WidgetFilterPolicy filter = widget -> true;
         VisiblePolicy visible = widget -> true;
-        AtCanvasPolicy atCanvas = widget -> true;
         TopLevelPolicy topLevel = widget -> true;
 
         ComposedActionDerivationService service = new ComposedActionDerivationService(
@@ -145,7 +142,6 @@ public void exposesComposedPoliciesThroughContext() {
                         Arrays.asList(blocked),
                         Arrays.asList(filter),
                         Arrays.asList(visible),
-                        Arrays.asList(atCanvas),
                         Arrays.asList(topLevel)
                 ),
                 new ActionDerivationPlan(
@@ -163,7 +159,6 @@ public void exposesComposedPoliciesThroughContext() {
         Assert.assertFalse(service.context().require(BlockedPolicy.class).isBlocked(widget));
         Assert.assertTrue(service.context().require(WidgetFilterPolicy.class).allows(widget));
         Assert.assertTrue(service.context().require(VisiblePolicy.class).isVisible(widget));
-        Assert.assertTrue(service.context().require(AtCanvasPolicy.class).isAtCanvas(widget));
         Assert.assertTrue(service.context().require(TopLevelPolicy.class).isTopLevel(widget));
     }
 
@@ -316,7 +311,6 @@ private SessionPolicyContext context(java.util.List<ClickablePolicy> clickablePo
                 blockedPolicies,
                 widgetFilterPolicies,
                 Collections.singletonList(widget -> true),
-                Collections.singletonList(widget -> true),
                 Collections.singletonList(widget -> true)
         );
     }
@@ -328,7 +322,6 @@ private SessionPolicyContext context(java.util.List<ClickablePolicy> clickablePo
                                          java.util.List<BlockedPolicy> blockedPolicies,
                                          java.util.List<WidgetFilterPolicy> widgetFilterPolicies,
                                          java.util.List<VisiblePolicy> visiblePolicies,
-                                         java.util.List<AtCanvasPolicy> atCanvasPolicies,
                                          java.util.List<TopLevelPolicy> topLevelPolicies) {
         return new SessionPolicyContext(
                 new CompositeClickablePolicy(clickablePolicies),
@@ -338,7 +331,6 @@ private SessionPolicyContext context(java.util.List<ClickablePolicy> clickablePo
                 new CompositeBlockedPolicy(blockedPolicies),
                 new CompositeWidgetFilterPolicy(widgetFilterPolicies),
                 new CompositeVisiblePolicy(visiblePolicies),
-                new CompositeAtCanvasPolicy(atCanvasPolicies),
                 new CompositeTopLevelPolicy(topLevelPolicies)
         );
     }

engine/src/org/testar/engine/policy/composite/CompositeAtCanvasPolicy.java

@@ -16,7 +16,6 @@
 import org.testar.engine.policy.SessionPolicyContext;
 import org.testar.engine.policy.TagBlockedPolicy;
 import org.testar.engine.policy.TagEnabledPolicy;
-import org.testar.engine.policy.composite.CompositeAtCanvasPolicy;
 import org.testar.engine.policy.composite.CompositeBlockedPolicy;
 import org.testar.engine.policy.composite.CompositeClickablePolicy;
 import org.testar.engine.policy.composite.CompositeEnabledPolicy;
@@ -125,7 +124,6 @@ private static SessionPolicyContext allowAllContext() {
                 new CompositeBlockedPolicy(Collections.singletonList(new TagBlockedPolicy())),
                 new CompositeWidgetFilterPolicy(Collections.singletonList(widget -> true)),
                 new CompositeVisiblePolicy(Collections.singletonList(widget -> true)),
-                new CompositeAtCanvasPolicy(Collections.singletonList(widget -> true)),
                 new CompositeTopLevelPolicy(Collections.singletonList(widget -> true))
         );
     }
@@ -139,7 +137,6 @@ private static SessionPolicyContext filteredContext(WidgetStub filteredWidget) {
                 new CompositeBlockedPolicy(Collections.singletonList(widget -> false)),
                 new CompositeWidgetFilterPolicy(Collections.singletonList(widget -> widget != filteredWidget)),
                 new CompositeVisiblePolicy(Collections.singletonList(widget -> true)),
-                new CompositeAtCanvasPolicy(Collections.singletonList(widget -> true)),
                 new CompositeTopLevelPolicy(Collections.singletonList(widget -> true))
         );
     }

engine/test/org/testar/engine/action/derivation/ComposedActionDerivationServiceTest.java

@@ -12,7 +12,6 @@
 import java.util.Set;
 
 import org.testar.core.Assert;
-import org.testar.core.policy.AtCanvasPolicy;
 import org.testar.core.policy.BlockedPolicy;
 import org.testar.core.policy.ClickablePolicy;
 import org.testar.core.policy.EnabledPolicy;
@@ -24,7 +23,6 @@
 import org.testar.core.policy.VisiblePolicy;
 import org.testar.core.policy.WidgetFilterPolicy;
 import org.testar.engine.policy.SessionPolicyContext;
-import org.testar.engine.policy.composite.CompositeAtCanvasPolicy;
 import org.testar.engine.policy.composite.CompositeBlockedPolicy;
 import org.testar.engine.policy.composite.CompositeClickablePolicy;
 import org.testar.engine.policy.composite.CompositeEnabledPolicy;
@@ -119,9 +117,6 @@ private static Policy composePolicies(Class<? extends Policy> policyType,
         if (policyType == VisiblePolicy.class) {
             return new CompositeVisiblePolicy((List<VisiblePolicy>) policies);
         }
-        if (policyType == AtCanvasPolicy.class) {
-            return new CompositeAtCanvasPolicy((List<AtCanvasPolicy>) policies);
-        }
         if (policyType == TopLevelPolicy.class) {
             return new CompositeTopLevelPolicy((List<TopLevelPolicy>) policies);
         }