Fix bug 108 remove binded dsl extension methods in script task

itesla · Sep 20, 2017 · f66ab30 · f66ab30
1 parent bd740fa
commit f66ab30
Show file tree

Hide file tree

Showing 6 changed files with 72 additions and 14 deletions.
diff --git a/action/action-dsl/pom.xml b/action/action-dsl/pom.xml
@@ -11,7 +11,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-        
+
     <parent>
         <groupId>eu.itesla_project</groupId>
         <artifactId>action</artifactId>
@@ -62,7 +62,7 @@
             <artifactId>iidm-api</artifactId>
             <version>${project.version}</version>
         </dependency>
-        
+
 
         <!-- Test dependencies -->
         <dependency>
@@ -97,6 +97,12 @@
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>action-util</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
 
     </dependencies>
 

diff --git a/action/action-dsl/src/main/groovy/eu/itesla_project/action/dsl/ActionDslLoader.groovy b/action/action-dsl/src/main/groovy/eu/itesla_project/action/dsl/ActionDslLoader.groovy
@@ -112,17 +112,17 @@ class ActionDslLoader extends DslLoader {
             // contingencies
             binding.contingency = { String id, Closure<Void> closure ->
                 def cloned = closure.clone()
-                ContingencySpec spec = new ContingencySpec()
-                cloned.delegate = spec
+                ContingencySpec contingencySpec = new ContingencySpec()
+                cloned.delegate = contingencySpec
                 cloned()
-                if (!spec.equipments) {
+                if (!contingencySpec.equipments) {
                     throw new RuntimeException("'equipments' field is not set")
                 }
-                if (spec.equipments.length == 0) {
+                if (contingencySpec.equipments.length == 0) {
                     throw new RuntimeException("'equipments' field is empty")
                 }
                 def elements = []
-                for (String equipment : spec.equipments) {
+                for (String equipment : contingencySpec.equipments) {
                     Identifiable identifiable = network.getIdentifiable(equipment)
                     if (identifiable == null) {
                         throw new ActionDslException("Equipment '" + equipment + "' of contingency '" + id + "' not found")
@@ -148,18 +148,18 @@ class ActionDslLoader extends DslLoader {
             // rules
             binding.rule = { String id, Closure<Void> closure ->
                 def cloned = closure.clone()
-                RuleSpec spec = new RuleSpec()
-                cloned.delegate = spec
+                RuleSpec ruleSpec = new RuleSpec()
+                cloned.delegate = ruleSpec
                 cloned()
-                if (!spec.when) {
+                if (!ruleSpec.when) {
                     throw new RuntimeException("'when' field is not set")
                 }
-                if (spec.apply.length == 0) {
+                if (ruleSpec.apply.length == 0) {
                     throw new RuntimeException("'apply' field is empty")
                 }
-                Rule rule = new Rule(id, new ExpressionCondition(spec.when), spec.life, spec.apply)
-                if (spec.description) {
-                    rule.setDescription(spec.description)
+                Rule rule = new Rule(id, new ExpressionCondition(ruleSpec.when), ruleSpec.life, ruleSpec.apply)
+                if (ruleSpec.description) {
+                    rule.setDescription(ruleSpec.description)
                 }
                 rulesDb.addRule(rule)
                 LOGGER.debug("Found rule '{}'", id)

diff --git a/...ction-dsl/src/main/groovy/eu/itesla_project/action/dsl/task/ScriptDslTaskExtension.groovy b/...ction-dsl/src/main/groovy/eu/itesla_project/action/dsl/task/ScriptDslTaskExtension.groovy
@@ -7,6 +7,7 @@
 package eu.itesla_project.action.dsl.task
 
 import com.google.auto.service.AutoService
+import eu.itesla_project.action.dsl.ActionDslException
 import eu.itesla_project.action.dsl.DslConstants
 import eu.itesla_project.action.dsl.spi.DslTaskExtension
 import eu.itesla_project.computation.ComputationManager
@@ -27,7 +28,11 @@ class ScriptDslTaskExtension implements DslTaskExtension, DslConstants {
                 binding.setVariable("computationManager", computationManager)
                 binding.setVariable(SCRIPT_IS_RUNNING, true)
                 try {
+                    closure.owner.delegate.metaClass = null
+                    closure.resolveStrategy = Closure.OWNER_ONLY
                     closure.call()
+                } catch (MissingMethodException e) {
+                    throw new ActionDslException(e)
                 } finally {
                     binding.setVariable(SCRIPT_IS_RUNNING, null)
                     binding.setVariable("network", oldNetwork)

diff --git a/action/action-dsl/src/main/java/eu/itesla_project/action/dsl/ActionDslException.java b/action/action-dsl/src/main/java/eu/itesla_project/action/dsl/ActionDslException.java
@@ -18,4 +18,8 @@ public ActionDslException(String message) {
     public ActionDslException(String message, Throwable cause) {
         super(message, cause);
     }
+
+    public ActionDslException(Throwable cause) {
+        super(cause);
+    }
 }
diff --git a/action/action-dsl/src/test/java/eu/itesla_project/action/dsl/ActionDslLoaderTest.java b/action/action-dsl/src/test/java/eu/itesla_project/action/dsl/ActionDslLoaderTest.java
@@ -13,6 +13,7 @@
 import groovy.lang.GroovyCodeSource;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.rules.ExpectedException;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -22,6 +23,9 @@
  */
 public class ActionDslLoaderTest {
 
+    @org.junit.Rule
+    public final ExpectedException exception = ExpectedException.none();
+
     private Network network;
 
     @Before
@@ -54,4 +58,22 @@ public void test() {
         assertEquals("action description", action.getDescription());
         assertEquals(0, action.getTasks().size());
     }
+
+    @Test
+    public void testDslExtension() {
+        ActionDb actionDb = new ActionDslLoader(new GroovyCodeSource(getClass().getResource("/actions2.groovy"))).load(network);
+        Action another = actionDb.getAction("anotherAction");
+        exception.expect(RuntimeException.class);
+        exception.expectMessage("Switch 'switchId' not found");
+        another.run(network, null);
+    }
+
+    @Test
+    public void testUnvalidate() {
+        ActionDb actionDb = new ActionDslLoader(new GroovyCodeSource(getClass().getResource("/actions2.groovy"))).load(network);
+        Action someAction = actionDb.getAction("someAction");
+        someAction.getId();
+        exception.expect(ActionDslException.class);
+        someAction.run(network, null);
+    }
 }
diff --git a/action/action-dsl/src/test/resources/actions2.groovy b/action/action-dsl/src/test/resources/actions2.groovy
@@ -0,0 +1,21 @@
+rule ('Memoriser_Prise_Init_TD_Boutre') {
+    when !contingencyOccurred()
+    life 1
+    apply 'someAction'
+}
+
+action ('someAction') {
+    description 'asdf'
+    tasks {
+        script {
+            transformer('NGEN_NHV1').r = 3
+            closeSwitch('switchId')
+        }
+    }
+}
+
+action ('anotherAction') {
+    tasks {
+        closeSwitch('switchId')
+    }
+}