Changed test samples to adapt to new default role of rules with

parameters (viz., possibly condition)
nl-utwente-groove · Dec 4, 2024 · 3957e28 · 3957e28
1 parent 5a8dfb6
commit 3957e28
Show file tree

Hide file tree

Showing 10 changed files with 47 additions and 20 deletions.
diff --git a/junit/control/abc.gps/a.gpr b/junit/control/abc.gps/a.gpr
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <gxl xmlns="http://www.gupro.de/GXL/gxl-1.0.dtd">
-    <graph edgemode="directed" edgeids="false" role="rule" id="a">
+    <graph role="rule" edgeids="false" edgemode="directed" id="a">
+        <attr name="actionRole">
+            <string>transformer</string>
+        </attr>
         <attr name="$version">
             <string>curly</string>
         </attr>
@@ -9,7 +12,7 @@
                 <string>125 59 19 19</string>
             </attr>
         </node>
-        <edge to="n0" from="n0">
+        <edge from="n0" to="n0">
             <attr name="label">
                 <string>par:</string>
             </attr>

diff --git a/junit/control/abc.gps/b.gpr b/junit/control/abc.gps/b.gpr
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <gxl xmlns="http://www.gupro.de/GXL/gxl-1.0.dtd">
-    <graph edgemode="directed" edgeids="false" role="rule" id="b">
+    <graph role="rule" edgeids="false" edgemode="directed" id="b">
+        <attr name="actionRole">
+            <string>transformer</string>
+        </attr>
         <attr name="$version">
             <string>curly</string>
         </attr>
@@ -9,7 +12,7 @@
                 <string>85 82 19 19</string>
             </attr>
         </node>
-        <edge to="n0" from="n0">
+        <edge from="n0" to="n0">
             <attr name="label">
                 <string>par:</string>
             </attr>

diff --git a/junit/control/abc.gps/c.gpr b/junit/control/abc.gps/c.gpr
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <gxl xmlns="http://www.gupro.de/GXL/gxl-1.0.dtd">
-    <graph edgemode="directed" edgeids="false" role="rule" id="c">
+    <graph role="rule" edgeids="false" edgemode="directed" id="c">
+        <attr name="actionRole">
+            <string>transformer</string>
+        </attr>
         <attr name="$version">
             <string>curly</string>
         </attr>
@@ -9,7 +12,7 @@
                 <string>135 89 19 19</string>
             </attr>
         </node>
-        <edge to="n0" from="n0">
+        <edge from="n0" to="n0">
             <attr name="label">
                 <string>par:</string>
             </attr>

diff --git a/junit/control/abc.gps/d.gpr b/junit/control/abc.gps/d.gpr
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <gxl xmlns="http://www.gupro.de/GXL/gxl-1.0.dtd">
-    <graph edgemode="directed" edgeids="false" role="rule" id="d">
+    <graph role="rule" edgeids="false" edgemode="directed" id="d">
+        <attr name="actionRole">
+            <string>transformer</string>
+        </attr>
         <attr name="$version">
             <string>curly</string>
         </attr>
@@ -9,7 +12,7 @@
                 <string>148 88 19 19</string>
             </attr>
         </node>
-        <edge to="n0" from="n0">
+        <edge from="n0" to="n0">
             <attr name="label">
                 <string>par:</string>
             </attr>

diff --git a/junit/control/emptyrules.gps/a.gpr b/junit/control/emptyrules.gps/a.gpr
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <gxl xmlns="http://www.gupro.de/GXL/gxl-1.0.dtd">
-    <graph edgemode="directed" edgeids="false" role="rule" id="a">
+    <graph role="rule" edgeids="false" edgemode="directed" id="a">
+        <attr name="actionRole">
+            <string>transformer</string>
+        </attr>
         <attr name="$version">
             <string>curly</string>
         </attr>
@@ -9,7 +12,7 @@
                 <string>97 60 19 19</string>
             </attr>
         </node>
-        <edge to="n0" from="n0">
+        <edge from="n0" to="n0">
             <attr name="label">
                 <string>par:</string>
             </attr>

diff --git a/junit/control/emptyrules.gps/b.gpr b/junit/control/emptyrules.gps/b.gpr
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <gxl xmlns="http://www.gupro.de/GXL/gxl-1.0.dtd">
-    <graph edgemode="directed" edgeids="false" role="rule" id="b">
+    <graph role="rule" edgeids="false" edgemode="directed" id="b">
+        <attr name="actionRole">
+            <string>transformer</string>
+        </attr>
         <attr name="$version">
             <string>curly</string>
         </attr>
@@ -9,7 +12,7 @@
                 <string>90 53 19 19</string>
             </attr>
         </node>
-        <edge to="n0" from="n0">
+        <edge from="n0" to="n0">
             <attr name="label">
                 <string>par:</string>
             </attr>

diff --git a/junit/control/emptyrules.gps/c.gpr b/junit/control/emptyrules.gps/c.gpr
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <gxl xmlns="http://www.gupro.de/GXL/gxl-1.0.dtd">
-    <graph edgemode="directed" edgeids="false" role="rule" id="c">
+    <graph role="rule" edgeids="false" edgemode="directed" id="c">
+        <attr name="actionRole">
+            <string>transformer</string>
+        </attr>
         <attr name="$version">
             <string>curly</string>
         </attr>
@@ -9,7 +12,7 @@
                 <string>117 79 19 19</string>
             </attr>
         </node>
-        <edge to="n0" from="n0">
+        <edge from="n0" to="n0">
             <attr name="label">
                 <string>par:</string>
             </attr>

diff --git a/junit/control/emptyrules.gps/d.gpr b/junit/control/emptyrules.gps/d.gpr
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <gxl xmlns="http://www.gupro.de/GXL/gxl-1.0.dtd">
-    <graph edgemode="directed" edgeids="false" role="rule" id="d">
+    <graph role="rule" edgeids="false" edgemode="directed" id="d">
+        <attr name="actionRole">
+            <string>transformer</string>
+        </attr>
         <attr name="$version">
             <string>curly</string>
         </attr>
@@ -9,7 +12,7 @@
                 <string>121 81 19 19</string>
             </attr>
         </node>
-        <edge to="n0" from="n0">
+        <edge from="n0" to="n0">
             <attr name="label">
                 <string>par:</string>
             </attr>

diff --git a/junit/control/emptyrules.gps/e.gpr b/junit/control/emptyrules.gps/e.gpr
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <gxl xmlns="http://www.gupro.de/GXL/gxl-1.0.dtd">
-    <graph edgemode="directed" edgeids="false" role="rule" id="e">
+    <graph role="rule" edgeids="false" edgemode="directed" id="e">
+        <attr name="actionRole">
+            <string>transformer</string>
+        </attr>
         <attr name="$version">
             <string>curly</string>
         </attr>
@@ -9,7 +12,7 @@
                 <string>91 84 19 19</string>
             </attr>
         </node>
-        <edge to="n0" from="n0">
+        <edge from="n0" to="n0">
             <attr name="label">
                 <string>par:</string>
             </attr>

diff --git a/src/main/java/nl/utwente/groove/grammar/Rule.java b/src/main/java/nl/utwente/groove/grammar/Rule.java
@@ -504,9 +504,9 @@ public CheckPolicy getPolicy() {
      * and has zero priority.
      */
     private boolean isPropertyLike() {
-        boolean result = !isModifying() && getPriority() == 0 && getHiddenPars().isEmpty();
+        boolean result = !isModifying() && getPriority() == 0;
         if (result) {
-            result = getSignature().stream().allMatch(v -> !v.isInOnly());
+            result = getSignature().stream().noneMatch(UnitPar::isInOnly);
         }
         return result;
     }