X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=bundles%2Forg.simantics.tests.modelled%2Fsrc%2Forg%2Fsimantics%2Ftests%2Fmodelled%2FTestsGraphUtils.java;h=c5253bd5a37ad138d159b4b7b938ad3a159cbf6e;hp=cf5c8e36590853930a63bcf0c18f95de7a128166;hb=2ec5d3e88fb2277929b249fd0d2eb32ab24f2f58;hpb=0580ea8b675c868685993b0780c9ecc31010f681

diff --git a/bundles/org.simantics.tests.modelled/src/org/simantics/tests/modelled/TestsGraphUtils.java b/bundles/org.simantics.tests.modelled/src/org/simantics/tests/modelled/TestsGraphUtils.java
index cf5c8e365..c5253bd5a 100644
--- a/bundles/org.simantics.tests.modelled/src/org/simantics/tests/modelled/TestsGraphUtils.java
+++ b/bundles/org.simantics.tests.modelled/src/org/simantics/tests/modelled/TestsGraphUtils.java
@@ -1,98 +1,113 @@
-package org.simantics.tests.modelled;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.StringReader;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.regex.Pattern;
-
-import org.simantics.databoard.Bindings;
-import org.simantics.db.Resource;
-import org.simantics.db.WriteGraph;
-import org.simantics.db.common.utils.NameUtils;
-import org.simantics.db.exception.DatabaseException;
-import org.simantics.layer0.Layer0;
-import org.simantics.scl.compiler.commands.CommandSession;
-import org.simantics.scl.compiler.commands.TestScriptExecutor;
-import org.simantics.scl.compiler.module.Module;
-import org.simantics.scl.compiler.module.coverage.CombinedCoverage;
-import org.simantics.scl.compiler.module.coverage.CoverageUtils;
-import org.simantics.scl.compiler.module.options.ModuleCompilationOptions;
-import org.simantics.scl.compiler.module.options.ModuleCompilationOptionsAdvisor;
-import org.simantics.scl.compiler.module.repository.ModuleRepository;
-import org.simantics.scl.compiler.runtime.RuntimeModule;
-import org.simantics.scl.osgi.SCLOsgi;
-import org.simantics.scl.runtime.reporting.SCLReportingHandler;
-import org.simantics.tests.modelled.ontology.TestsResource;
-
-public class TestsGraphUtils {
-
-    private static final String STS_TEST_PREFIX = "STSTest";
-    private static final String STS_SUITE_PREFIX = "STSSuite";
-    
-    private TestsGraphUtils() {}
-    
-    public static Resource createSTSTest(WriteGraph graph, Resource parent) throws DatabaseException {
-        String name = NameUtils.findFreshEscapedName(graph, STS_TEST_PREFIX, parent);
-        Resource stsTest = graph.newResource();
-        
-        Layer0 L0 = Layer0.getInstance(graph);
-        TestsResource TESTS = TestsResource.getInstance(graph);
-        
-        graph.claim(parent, L0.ConsistsOf, L0.PartOf, stsTest);
-        graph.claim(stsTest, L0.InstanceOf, TESTS.STSTest);
-        graph.claimLiteral(stsTest, L0.HasName, name, Bindings.STRING);
-        graph.claimLiteral(stsTest, TESTS.STSTest_definition, "", Bindings.STRING);
-        return stsTest;
-    }
-    
-    public static Resource createSTSSuite(WriteGraph graph, Resource parent) throws DatabaseException {
-        String name = NameUtils.findFreshEscapedName(graph, STS_SUITE_PREFIX, parent);
-        Resource stsSuite = graph.newResource();
-        
-        Layer0 L0 = Layer0.getInstance(graph);
-        TestsResource TESTS = TestsResource.getInstance(graph);
-        
-        graph.claim(parent, L0.ConsistsOf, L0.PartOf, stsSuite);
-        graph.claim(stsSuite, L0.InstanceOf, TESTS.STSSuite);
-        graph.claimLiteral(stsSuite, L0.HasName, name, Bindings.STRING);
-        return stsSuite;
-    }
-
-    public static CombinedCoverage runSTSTestDefinition(String definition, List<Pattern> moduleNameFilters, SCLReportingHandler handler) throws IOException {
-        
-//        ModuleRepository repo = SCLOsgi.MODULE_REPOSITORY;
-        ModuleRepository repo = new ModuleRepository(SCLOsgi.SOURCE_REPOSITORY);
-        repo.setAdvisor(new ModuleCompilationOptionsAdvisor() {
-            
-            @Override
-            public ModuleCompilationOptions getOptions(String moduleName) {
-                boolean coverage = false;
-                for (Pattern p : moduleNameFilters) {
-                    if (p.matcher(moduleName.toLowerCase()).find()) {
-                        coverage = true;
-                        break;
-                    }
-                }
-                return new ModuleCompilationOptions(coverage);
-            }
-        });
-        
-        CommandSession session = new CommandSession(repo, handler);
-        TestScriptExecutor executor = new TestScriptExecutor(session, new BufferedReader(new StringReader(definition)), handler);
-        try {
-            executor.execute();
-        } catch (Throwable t) {
-            t.printStackTrace();
-        }
-        Collection<RuntimeModule> runtimeModules = session.getRuntimeEnvironment().getRuntimeModules();
-        List<Module> modules = new ArrayList<>(runtimeModules.size());
-        for (RuntimeModule module : runtimeModules) {
-            modules.add(module.getModule());
-        }
-        CombinedCoverage coverage = CoverageUtils.getCoverage(modules);
-        return coverage;
-    }
-}
+package org.simantics.tests.modelled;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.StringReader;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.regex.Pattern;
+
+import org.simantics.databoard.Bindings;
+import org.simantics.db.Resource;
+import org.simantics.db.WriteGraph;
+import org.simantics.db.common.utils.NameUtils;
+import org.simantics.db.exception.DatabaseException;
+import org.simantics.layer0.Layer0;
+import org.simantics.scl.compiler.commands.CommandSession;
+import org.simantics.scl.compiler.commands.TestScriptExecutor;
+import org.simantics.scl.compiler.module.Module;
+import org.simantics.scl.compiler.module.coverage.CombinedCoverage;
+import org.simantics.scl.compiler.module.coverage.CoverageUtils;
+import org.simantics.scl.compiler.module.options.ModuleCompilationOptions;
+import org.simantics.scl.compiler.module.options.ModuleCompilationOptionsAdvisor;
+import org.simantics.scl.compiler.module.repository.ModuleRepository;
+import org.simantics.scl.compiler.runtime.RuntimeModule;
+import org.simantics.scl.osgi.SCLOsgi;
+import org.simantics.scl.runtime.reporting.SCLReportingHandler;
+import org.simantics.tests.modelled.ontology.TestsResource;
+
+public class TestsGraphUtils {
+
+    private static final String STS_TEST_PREFIX = "STSTest";
+    private static final String STS_SUITE_PREFIX = "STSSuite";
+    private static final String STS_VARIABLE_PREFIX = "STSVariable";
+    
+    private TestsGraphUtils() {}
+    
+    public static Resource createSTSVariable(WriteGraph graph, Resource parent) throws DatabaseException {
+        String name = NameUtils.findFreshEscapedName(graph, STS_VARIABLE_PREFIX, parent);
+        Resource stsVariable = graph.newResource();
+        
+        Layer0 L0 = Layer0.getInstance(graph);
+        TestsResource TESTS = TestsResource.getInstance(graph);
+        
+        graph.claim(parent, L0.ConsistsOf, L0.PartOf, stsVariable);
+        graph.claim(stsVariable, L0.InstanceOf, TESTS.STSVariable);
+        graph.claimLiteral(stsVariable, L0.HasName, name, Bindings.STRING);
+        graph.claimLiteral(stsVariable, TESTS.STSVariable_definition, "", Bindings.STRING);
+        return stsVariable;
+    }
+    
+    public static Resource createSTSTest(WriteGraph graph, Resource parent) throws DatabaseException {
+        String name = NameUtils.findFreshEscapedName(graph, STS_TEST_PREFIX, parent);
+        Resource stsTest = graph.newResource();
+        
+        Layer0 L0 = Layer0.getInstance(graph);
+        TestsResource TESTS = TestsResource.getInstance(graph);
+        
+        graph.claim(parent, L0.ConsistsOf, L0.PartOf, stsTest);
+        graph.claim(stsTest, L0.InstanceOf, TESTS.STSTest);
+        graph.claimLiteral(stsTest, L0.HasName, name, Bindings.STRING);
+        graph.claimLiteral(stsTest, TESTS.STSTest_definition, "", Bindings.STRING);
+        return stsTest;
+    }
+    
+    public static Resource createSTSSuite(WriteGraph graph, Resource parent) throws DatabaseException {
+        String name = NameUtils.findFreshEscapedName(graph, STS_SUITE_PREFIX, parent);
+        Resource stsSuite = graph.newResource();
+        
+        Layer0 L0 = Layer0.getInstance(graph);
+        TestsResource TESTS = TestsResource.getInstance(graph);
+        
+        graph.claim(parent, L0.ConsistsOf, L0.PartOf, stsSuite);
+        graph.claim(stsSuite, L0.InstanceOf, TESTS.STSSuite);
+        graph.claimLiteral(stsSuite, L0.HasName, name, Bindings.STRING);
+        return stsSuite;
+    }
+
+    public static CombinedCoverage runSTSTestDefinition(String definition, List<Pattern> moduleNameFilters, SCLReportingHandler handler) throws IOException {
+        
+//        ModuleRepository repo = SCLOsgi.MODULE_REPOSITORY;
+        ModuleRepository repo = new ModuleRepository(SCLOsgi.SOURCE_REPOSITORY);
+        repo.setAdvisor(new ModuleCompilationOptionsAdvisor() {
+            
+            @Override
+            public ModuleCompilationOptions getOptions(String moduleName) {
+                boolean coverage = false;
+                for (Pattern p : moduleNameFilters) {
+                    if (p.matcher(moduleName.toLowerCase()).find()) {
+                        coverage = true;
+                        break;
+                    }
+                }
+                return new ModuleCompilationOptions(coverage);
+            }
+        });
+        
+        CommandSession session = new CommandSession(repo, handler);
+        TestScriptExecutor executor = new TestScriptExecutor(session, new BufferedReader(new StringReader(definition)), handler);
+        try {
+            executor.execute();
+        } catch (Throwable t) {
+            t.printStackTrace();
+        }
+        Collection<RuntimeModule> runtimeModules = session.getRuntimeEnvironment().getRuntimeModules();
+        List<Module> modules = new ArrayList<>(runtimeModules.size());
+        for (RuntimeModule module : runtimeModules) {
+            modules.add(module.getModule());
+        }
+        CombinedCoverage coverage = CoverageUtils.getCoverage(modules);
+        return coverage;
+    }
+}