add new constructor with inputStream for GroovyDynamicModelsSupplier (#…

…1613) Signed-off-by: AbdelHedhili <[email protected]>
powsybl · Feb 3, 2021 · 201c749 · 201c749
1 parent 994af25
commit 201c749
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 0 deletions.
diff --git a/...n-dsl/src/main/java/com/powsybl/dynamicsimulation/groovy/GroovyDynamicModelsSupplier.java b/...n-dsl/src/main/java/com/powsybl/dynamicsimulation/groovy/GroovyDynamicModelsSupplier.java
@@ -7,6 +7,7 @@
 
 package com.powsybl.dynamicsimulation.groovy;
 
+import java.io.InputStream;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -43,6 +44,11 @@ public GroovyDynamicModelsSupplier(Path path, List<DynamicModelGroovyExtension>
         this.extensions = Objects.requireNonNull(extensions);
     }
 
+    public GroovyDynamicModelsSupplier(InputStream is, List<DynamicModelGroovyExtension> extensions) {
+        this.codeSource = GroovyScripts.load(is);
+        this.extensions = Objects.requireNonNull(extensions);
+    }
+
     @Override
     public String getName() {
         return null;

diff --git a/...sl/src/test/java/com/powsybl/dynamicsimulation/groovy/GroovyDynamicModelSupplierTest.java b/...sl/src/test/java/com/powsybl/dynamicsimulation/groovy/GroovyDynamicModelSupplierTest.java
@@ -54,7 +54,22 @@ public void test() {
         assertTrue(extensions.get(0) instanceof DynamicModelGroovyExtension);
 
         DynamicModelsSupplier supplier = new GroovyDynamicModelsSupplier(fileSystem.getPath("/dynamicModels.groovy"), extensions);
+        testDynamicModels(supplier, network);
+    }
+
+    @Test
+    public void testWithInputStream() {
+        Network network = EurostagTutorialExample1Factory.create();
+
+        List<DynamicModelGroovyExtension> extensions = GroovyExtension.find(DynamicModelGroovyExtension.class, "dummy");
+        assertEquals(1, extensions.size());
+        assertTrue(extensions.get(0) instanceof DynamicModelGroovyExtension);
+
+        DynamicModelsSupplier supplier = new GroovyDynamicModelsSupplier(getClass().getResourceAsStream("/dynamicModels.groovy"), extensions);
+        testDynamicModels(supplier, network);
+    }
 
+    public void testDynamicModels(DynamicModelsSupplier supplier, Network network) {
         List<DynamicModel> dynamicModels = supplier.get(network);
         assertEquals(2, dynamicModels.size());