From 76d8f80e3d5377dab234fc2c42970222ce83db3f Mon Sep 17 00:00:00 2001 From: Charbull Date: Mon, 20 Jul 2020 22:11:23 -0400 Subject: [PATCH 01/10] sperating modules --- OLGA/OLGA-Core-CSharp-Generator/pom.xml | 265 ++++++++++++++++++ .../generators/TrinityGenerator.java | 0 .../code/generator/CommentsTestCs.java} | 11 +- .../code/generator/DependenciesTest.java | 0 .../code/generator/IndentationTest.java | 0 .../code/generator/OLGACSharpTest.java | 0 .../code/generator/OLGAOutputOptionTest.java | 0 .../code/generator/OLGAVersionTest.java | 0 .../code/generator/PartialOptionTest.java | 0 .../generator/PreservePathOptionTestCs.java | 53 ++++ .../generator/QueryWithReasoningTest.java | 0 .../code/generator/SkipCompileOptionTest.java | 0 .../code/generator/WrongNameTest.java | 0 OLGA/OLGA-Core-Java-Generator/pom.xml | 245 ++++++++++++++++ .../generator/generators/RDF4JGenerator.java | 3 +- .../code/generator/CommentsTestJava.java | 90 ++++++ .../code/generator/OLGAJavaTest.java | 0 .../code/generator/OLGAJavaVersionTest.java | 0 .../generator/PreservePathOptionTestJava.java | 54 ++++ OLGA/OLGA-Core-Python-Generator/pom.xml | 265 ++++++++++++++++++ .../generators/RdfAlchemyGenerator.java | 0 .../code/generator/OLGAPythonTest.java | 0 .../PreservePathOptionTestPython.java} | 31 -- OLGA/OLGA-Core/pom.xml | 11 +- .../generators/SingletonGenerator.java | 24 +- 25 files changed, 996 insertions(+), 56 deletions(-) create mode 100644 OLGA/OLGA-Core-CSharp-Generator/pom.xml rename OLGA/{OLGA-Core => OLGA-Core-CSharp-Generator}/src/main/java/semanticstore/ontology/library/generator/generators/TrinityGenerator.java (100%) rename OLGA/{OLGA-Core/src/test/java/semanticstore/ontology/library/generator/code/generator/CommentsTest.java => OLGA-Core-CSharp-Generator/src/test/java/semanticstore/ontology/library/generator/code/generator/CommentsTestCs.java} (89%) rename OLGA/{OLGA-Core => OLGA-Core-CSharp-Generator}/src/test/java/semanticstore/ontology/library/generator/code/generator/DependenciesTest.java (100%) rename OLGA/{OLGA-Core => OLGA-Core-CSharp-Generator}/src/test/java/semanticstore/ontology/library/generator/code/generator/IndentationTest.java (100%) rename OLGA/{OLGA-Core => OLGA-Core-CSharp-Generator}/src/test/java/semanticstore/ontology/library/generator/code/generator/OLGACSharpTest.java (100%) rename OLGA/{OLGA-Core => OLGA-Core-CSharp-Generator}/src/test/java/semanticstore/ontology/library/generator/code/generator/OLGAOutputOptionTest.java (100%) rename OLGA/{OLGA-Core => OLGA-Core-CSharp-Generator}/src/test/java/semanticstore/ontology/library/generator/code/generator/OLGAVersionTest.java (100%) rename OLGA/{OLGA-Core => OLGA-Core-CSharp-Generator}/src/test/java/semanticstore/ontology/library/generator/code/generator/PartialOptionTest.java (100%) create mode 100644 OLGA/OLGA-Core-CSharp-Generator/src/test/java/semanticstore/ontology/library/generator/code/generator/PreservePathOptionTestCs.java rename OLGA/{OLGA-Core => OLGA-Core-CSharp-Generator}/src/test/java/semanticstore/ontology/library/generator/code/generator/QueryWithReasoningTest.java (100%) rename OLGA/{OLGA-Core => OLGA-Core-CSharp-Generator}/src/test/java/semanticstore/ontology/library/generator/code/generator/SkipCompileOptionTest.java (100%) rename OLGA/{OLGA-Core => OLGA-Core-CSharp-Generator}/src/test/java/semanticstore/ontology/library/generator/code/generator/WrongNameTest.java (100%) create mode 100644 OLGA/OLGA-Core-Java-Generator/pom.xml rename OLGA/{OLGA-Core => OLGA-Core-Java-Generator}/src/main/java/semanticstore/ontology/library/generator/generators/RDF4JGenerator.java (99%) create mode 100644 OLGA/OLGA-Core-Java-Generator/src/test/java/semanticstore/ontology/library/generator/code/generator/CommentsTestJava.java rename OLGA/{OLGA-Core => OLGA-Core-Java-Generator}/src/test/java/semanticstore/ontology/library/generator/code/generator/OLGAJavaTest.java (100%) rename OLGA/{OLGA-Core => OLGA-Core-Java-Generator}/src/test/java/semanticstore/ontology/library/generator/code/generator/OLGAJavaVersionTest.java (100%) create mode 100644 OLGA/OLGA-Core-Java-Generator/src/test/java/semanticstore/ontology/library/generator/code/generator/PreservePathOptionTestJava.java create mode 100644 OLGA/OLGA-Core-Python-Generator/pom.xml rename OLGA/{OLGA-Core => OLGA-Core-Python-Generator}/src/main/java/semanticstore/ontology/library/generator/generators/RdfAlchemyGenerator.java (100%) rename OLGA/{OLGA-Core => OLGA-Core-Python-Generator}/src/test/java/semanticstore/ontology/library/generator/code/generator/OLGAPythonTest.java (100%) rename OLGA/{OLGA-Core/src/test/java/semanticstore/ontology/library/generator/code/generator/PreservePathOptionTest.java => OLGA-Core-Python-Generator/src/test/java/semanticstore/ontology/library/generator/code/generator/PreservePathOptionTestPython.java} (65%) diff --git a/OLGA/OLGA-Core-CSharp-Generator/pom.xml b/OLGA/OLGA-Core-CSharp-Generator/pom.xml new file mode 100644 index 0000000..9c68fce --- /dev/null +++ b/OLGA/OLGA-Core-CSharp-Generator/pom.xml @@ -0,0 +1,265 @@ + + + 4.0.0 + jar + + semanticstore.ontology.library.generator + OLGA-Core + 0.0.6 + + OLGA-Core-CSharp-Generator + OLGA-Core-CSharp-Generator + https://github.com/EcoStruxure/OLGA/tree/master/OLGA/OLGA-Core-CSharp-Generator + OLGA is based on a model driven approach taking as input an ontology file expressed in one of the supported W3C supported standards (RDF, OWL) and generating a library conform to the ontology model. + + The generated library is then imported and used to programmatically to: + + Generate an ontology instance conform to the ontology model. + Query the generated ontology instance by relying on Object Oriented Classes. + + + MIT License + http://www.opensource.org/licenses/mit-license.php + + + + scm:git:git://github.com/EcoStruxure/OLGA/tree/master/OLGA/OLGA-Core-CSharp-Generator.git + scm:git:ssh://github.com:EcoStruxure/OLGA/tree/master/OLGA/OLGA-Core-CSharp-Generator.git + https://github.com/EcoStruxure//OLGA/tree/master/OLGA/OLGA-Core-CSharp-Generator + + + UTF-8 + 5.1.12 + 2.3.28 + 1.4 + 1.1 + 3.6 + 2.0.0 + 3.3.9 + 1.2.2 + 4.12 + 1.7.25 + 1.2.17 + + + src + + + + org.apache.maven.plugins + maven-surefire-plugin + + true + + + + + + + com.google.cloud.tools + jib-maven-plugin + 0.9.8 + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.7.0 + + 1.8 + 1.8 + + + + org.apache.maven.plugins + maven-jar-plugin + 3.0.2 + + + + true + + + + + + org.apache.maven.plugins + maven-assembly-plugin + 3.1.0 + + + src/assembly/assembly.xml + + true + + + + create-archive + package + + single + + + + + + maven-site-plugin + 3.7.1 + + + attach-descriptor + + attach-descriptor + + + + + + org.codehaus.mojo + findbugs-maven-plugin + 3.0.5 + + Max + Low + true + false + + + + verify + + check + + + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.20.1 + + false + 1 + + + + + + + + org.apache.commons + commons-lang3 + ${commons-lang3.version} + + + org.apache.commons + commons-text + ${commons-text.version} + + + + commons-cli + commons-cli + ${commons-cli.version} + + + + + org.apache.maven.plugins + maven-invoker-plugin + ${maven-invoker.version} + + + org.slf4j + slf4j-simple + + + org.slf4j + slf4j-api + + + org.slf4j + slf4j-nop + + + org.slf4j + slf4j-jdk14 + + + + + + org.apache.maven + maven-model + ${maven-model.version} + + + + net.sourceforge.owlapi + owlapi-api + ${owlapi.version} + + + net.sourceforge.owlapi + owlapi-apibinding + ${owlapi.version} + + + net.sourceforge.owlapi + owlapi-distribution + ${owlapi.version} + + + net.sourceforge.owlapi + owlapi-parsers + ${owlapi.version} + + + net.sourceforge.owlapi + owlapi-impl + ${owlapi.version} + + + net.sourceforge.owlapi + owlapi-tools + ${owlapi.version} + + + + org.freemarker + freemarker + ${freemarker.version} + + + junit + junit + ${junit.version} + + + log4j + log4j + ${log4j.version} + + + org.slf4j + slf4j-simple + ${log.version} + + + org.slf4j + slf4j-api + ${log.version} + + + org.slf4j + slf4j-nop + ${log.version} + + + diff --git a/OLGA/OLGA-Core/src/main/java/semanticstore/ontology/library/generator/generators/TrinityGenerator.java b/OLGA/OLGA-Core-CSharp-Generator/src/main/java/semanticstore/ontology/library/generator/generators/TrinityGenerator.java similarity index 100% rename from OLGA/OLGA-Core/src/main/java/semanticstore/ontology/library/generator/generators/TrinityGenerator.java rename to OLGA/OLGA-Core-CSharp-Generator/src/main/java/semanticstore/ontology/library/generator/generators/TrinityGenerator.java diff --git a/OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/code/generator/CommentsTest.java b/OLGA/OLGA-Core-CSharp-Generator/src/test/java/semanticstore/ontology/library/generator/code/generator/CommentsTestCs.java similarity index 89% rename from OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/code/generator/CommentsTest.java rename to OLGA/OLGA-Core-CSharp-Generator/src/test/java/semanticstore/ontology/library/generator/code/generator/CommentsTestCs.java index 375c73c..756e026 100644 --- a/OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/code/generator/CommentsTest.java +++ b/OLGA/OLGA-Core-CSharp-Generator/src/test/java/semanticstore/ontology/library/generator/code/generator/CommentsTestCs.java @@ -44,7 +44,7 @@ import semanticstore.ontology.library.generator.test.utils.GeneratedOntologies; @RunWith(Parameterized.class) -public class CommentsTest { +public class CommentsTestCs { @BeforeClass public static void generateOntology() throws Exception { @@ -52,15 +52,12 @@ public static void generateOntology() throws Exception { assertTrue(GeneratedOntologies.isSimpleBasicGenerated("cs", "trinity")); assertTrue(GeneratedOntologies.isSimpleLonelyBasicGenerated("cs", "trinity")); assertTrue(GeneratedOntologies.isSarefBasicGenerated("cs", "trinity")); - assertTrue(GeneratedOntologies.isSimpleBasicGenerated("java", "rdf4j")); } // building set of parameter to test : (code , path to tested class, expected comment, test name ) @Parameters(name = "{index}: {0}-Comment {3}") public static Collection data() { Path csharp = Paths.get("OLGA/generated/testSimple-dotnetTrinity/TestSimple/Rdf/Model/"); - Path java = - Paths.get("OLGA/generated/testsimple-RDF4J-java/src/main/java/testsimple/rdf/model/"); Path csharpLonely = Paths.get("OLGA/generated/testSimpleLonely-dotnetTrinity/TestSimpleLonely/Rdf/Model/"); Path cSharpSaref = Paths.get( @@ -87,12 +84,6 @@ public static Collection data() { list.add(new Object[] {"CSHARP LONELY", csharpLonely.resolve("IFloor.cs"), "/// provides information about floor accronym~\"#%&*", "Data property"}); - list.add(new Object[] {"JAVA", java.resolve("Building.java"), "Class mabna", "Class"}); - list.add(new Object[] {"JAVA", java.resolve("Building.java"), "shows building property.", - "Data property"}); - list.add(new Object[] {"JAVA", java.resolve("Building.java"), "Depends on Building class.", - "Object Property"}); - list.add(new Object[] {"CSHARP", cSharpSaref.resolve("IWashingMachine.cs"), "/// ", "Comment Inheritance Saref WashMach"}); list.add(new Object[] {"CSHARP", cSharpSaref.resolve("ITemporalUnit.cs"), diff --git a/OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/code/generator/DependenciesTest.java b/OLGA/OLGA-Core-CSharp-Generator/src/test/java/semanticstore/ontology/library/generator/code/generator/DependenciesTest.java similarity index 100% rename from OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/code/generator/DependenciesTest.java rename to OLGA/OLGA-Core-CSharp-Generator/src/test/java/semanticstore/ontology/library/generator/code/generator/DependenciesTest.java diff --git a/OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/code/generator/IndentationTest.java b/OLGA/OLGA-Core-CSharp-Generator/src/test/java/semanticstore/ontology/library/generator/code/generator/IndentationTest.java similarity index 100% rename from OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/code/generator/IndentationTest.java rename to OLGA/OLGA-Core-CSharp-Generator/src/test/java/semanticstore/ontology/library/generator/code/generator/IndentationTest.java diff --git a/OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/code/generator/OLGACSharpTest.java b/OLGA/OLGA-Core-CSharp-Generator/src/test/java/semanticstore/ontology/library/generator/code/generator/OLGACSharpTest.java similarity index 100% rename from OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/code/generator/OLGACSharpTest.java rename to OLGA/OLGA-Core-CSharp-Generator/src/test/java/semanticstore/ontology/library/generator/code/generator/OLGACSharpTest.java diff --git a/OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/code/generator/OLGAOutputOptionTest.java b/OLGA/OLGA-Core-CSharp-Generator/src/test/java/semanticstore/ontology/library/generator/code/generator/OLGAOutputOptionTest.java similarity index 100% rename from OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/code/generator/OLGAOutputOptionTest.java rename to OLGA/OLGA-Core-CSharp-Generator/src/test/java/semanticstore/ontology/library/generator/code/generator/OLGAOutputOptionTest.java diff --git a/OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/code/generator/OLGAVersionTest.java b/OLGA/OLGA-Core-CSharp-Generator/src/test/java/semanticstore/ontology/library/generator/code/generator/OLGAVersionTest.java similarity index 100% rename from OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/code/generator/OLGAVersionTest.java rename to OLGA/OLGA-Core-CSharp-Generator/src/test/java/semanticstore/ontology/library/generator/code/generator/OLGAVersionTest.java diff --git a/OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/code/generator/PartialOptionTest.java b/OLGA/OLGA-Core-CSharp-Generator/src/test/java/semanticstore/ontology/library/generator/code/generator/PartialOptionTest.java similarity index 100% rename from OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/code/generator/PartialOptionTest.java rename to OLGA/OLGA-Core-CSharp-Generator/src/test/java/semanticstore/ontology/library/generator/code/generator/PartialOptionTest.java diff --git a/OLGA/OLGA-Core-CSharp-Generator/src/test/java/semanticstore/ontology/library/generator/code/generator/PreservePathOptionTestCs.java b/OLGA/OLGA-Core-CSharp-Generator/src/test/java/semanticstore/ontology/library/generator/code/generator/PreservePathOptionTestCs.java new file mode 100644 index 0000000..2a11f0f --- /dev/null +++ b/OLGA/OLGA-Core-CSharp-Generator/src/test/java/semanticstore/ontology/library/generator/code/generator/PreservePathOptionTestCs.java @@ -0,0 +1,53 @@ +/* + * ------------------------- + * + * MIT License + * + * Copyright (c) 2018, Schneider Electric USA, Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and + * associated documentation files (the "Software"), to deal in the Software without restriction, + * including without limitation the rights to use, copy, modify, merge, publish, distribute, + * sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all copies or + * substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT + * NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, + * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * --------------------- + */ +package semanticstore.ontology.library.generator.code.generator; + +import static org.junit.Assert.assertTrue; +import java.io.File; +import org.junit.BeforeClass; +import org.junit.Test; +import semanticstore.ontology.library.generator.test.utils.GeneratedOntologies; + +public class PreservePathOptionTestCs { + + @BeforeClass + public static void generateOntology() { + assertTrue(GeneratedOntologies.isSimpleBasicPreserveGenerated("cs", "trinity")); + assertTrue(GeneratedOntologies.isSimpleBasicGenerated("cs", "trinity")); + } + + @Test + public void testPathWhenOptionSet_CSharp() { + File file = new File("OLGA/generated/SimplePreserve-dotnetTrinity/www/simple/com/Building.cs"); + assertTrue(file.exists()); + } + + @Test + public void testPathWhenOptionNotSet_CSharp() { + File file = + new File("OLGA/generated/testSimple-dotnetTrinity/TestSimple/Rdf/Model/Building.cs"); + assertTrue(file.exists()); + } +} diff --git a/OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/code/generator/QueryWithReasoningTest.java b/OLGA/OLGA-Core-CSharp-Generator/src/test/java/semanticstore/ontology/library/generator/code/generator/QueryWithReasoningTest.java similarity index 100% rename from OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/code/generator/QueryWithReasoningTest.java rename to OLGA/OLGA-Core-CSharp-Generator/src/test/java/semanticstore/ontology/library/generator/code/generator/QueryWithReasoningTest.java diff --git a/OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/code/generator/SkipCompileOptionTest.java b/OLGA/OLGA-Core-CSharp-Generator/src/test/java/semanticstore/ontology/library/generator/code/generator/SkipCompileOptionTest.java similarity index 100% rename from OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/code/generator/SkipCompileOptionTest.java rename to OLGA/OLGA-Core-CSharp-Generator/src/test/java/semanticstore/ontology/library/generator/code/generator/SkipCompileOptionTest.java diff --git a/OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/code/generator/WrongNameTest.java b/OLGA/OLGA-Core-CSharp-Generator/src/test/java/semanticstore/ontology/library/generator/code/generator/WrongNameTest.java similarity index 100% rename from OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/code/generator/WrongNameTest.java rename to OLGA/OLGA-Core-CSharp-Generator/src/test/java/semanticstore/ontology/library/generator/code/generator/WrongNameTest.java diff --git a/OLGA/OLGA-Core-Java-Generator/pom.xml b/OLGA/OLGA-Core-Java-Generator/pom.xml new file mode 100644 index 0000000..15efdee --- /dev/null +++ b/OLGA/OLGA-Core-Java-Generator/pom.xml @@ -0,0 +1,245 @@ + + + 4.0.0 + jar + + semanticstore.ontology.library.generator + OLGA + 0.0.6 + + OLGA-Core-Java-Generator + OLGA-Core-Java-Generator + https://github.com/EcoStruxure/OLGA/tree/master/OLGA/OLGA-Core-Java-Generator + OLGA is based on a model driven approach taking as input an ontology file expressed in one of the supported W3C supported standards (RDF, OWL) and generating a library conform to the ontology model. + + The generated library is then imported and used to programmatically to: + + Generate an ontology instance conform to the ontology model. + Query the generated ontology instance by relying on Object Oriented Classes. + + + MIT License + http://www.opensource.org/licenses/mit-license.php + + + + scm:git:git://github.com/EcoStruxure/OLGA/tree/master/OLGA/OLGA-Core-Java-Generator.git + scm:git:ssh://github.com:EcoStruxure/OLGA/tree/master/OLGA/OLGA-Core-Java-Generator.git + https://github.com/EcoStruxure//OLGA/tree/master/OLGA/OLGA-Core-Java-Generator + + + UTF-8 + 5.1.12 + 2.3.28 + 1.4 + 1.1 + 3.6 + 2.0.0 + 3.3.9 + 1.2.2 + 4.12 + 1.7.25 + 1.2.17 + + + src + + + + org.apache.maven.plugins + maven-surefire-plugin + + true + + + + + + + com.google.cloud.tools + jib-maven-plugin + 0.9.8 + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.7.0 + + 1.8 + 1.8 + + + + org.apache.maven.plugins + maven-jar-plugin + 3.0.2 + + + + true + + + + + + maven-site-plugin + 3.7.1 + + + attach-descriptor + + attach-descriptor + + + + + + org.codehaus.mojo + findbugs-maven-plugin + 3.0.5 + + Max + Low + true + false + + + + verify + + check + + + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.20.1 + + false + 1 + + + + + + + + org.apache.commons + commons-lang3 + ${commons-lang3.version} + + + org.apache.commons + commons-text + ${commons-text.version} + + + + commons-cli + commons-cli + ${commons-cli.version} + + + + + org.apache.maven.plugins + maven-invoker-plugin + ${maven-invoker.version} + + + org.slf4j + slf4j-simple + + + org.slf4j + slf4j-api + + + org.slf4j + slf4j-nop + + + org.slf4j + slf4j-jdk14 + + + + + + org.apache.maven + maven-model + ${maven-model.version} + + + + net.sourceforge.owlapi + owlapi-api + ${owlapi.version} + + + net.sourceforge.owlapi + owlapi-apibinding + ${owlapi.version} + + + net.sourceforge.owlapi + owlapi-distribution + ${owlapi.version} + + + net.sourceforge.owlapi + owlapi-parsers + ${owlapi.version} + + + net.sourceforge.owlapi + owlapi-impl + ${owlapi.version} + + + net.sourceforge.owlapi + owlapi-tools + ${owlapi.version} + + + + org.freemarker + freemarker + ${freemarker.version} + + + junit + junit + ${junit.version} + + + log4j + log4j + ${log4j.version} + + + org.slf4j + slf4j-simple + ${log.version} + + + org.slf4j + slf4j-api + ${log.version} + + + org.slf4j + slf4j-nop + ${log.version} + + + diff --git a/OLGA/OLGA-Core/src/main/java/semanticstore/ontology/library/generator/generators/RDF4JGenerator.java b/OLGA/OLGA-Core-Java-Generator/src/main/java/semanticstore/ontology/library/generator/generators/RDF4JGenerator.java similarity index 99% rename from OLGA/OLGA-Core/src/main/java/semanticstore/ontology/library/generator/generators/RDF4JGenerator.java rename to OLGA/OLGA-Core-Java-Generator/src/main/java/semanticstore/ontology/library/generator/generators/RDF4JGenerator.java index 50291b8..8078614 100644 --- a/OLGA/OLGA-Core/src/main/java/semanticstore/ontology/library/generator/generators/RDF4JGenerator.java +++ b/OLGA/OLGA-Core-Java-Generator/src/main/java/semanticstore/ontology/library/generator/generators/RDF4JGenerator.java @@ -54,12 +54,13 @@ import semanticstore.ontology.library.generator.model.ZObjectProperty; import semanticstore.ontology.library.generator.resources.ResourceManager; +@dagger.Module public class RDF4JGenerator extends AbstractGenerator { private String globalFile; private final static Logger log = Logger.getLogger(RDF4JGenerator.class); - public RDF4JGenerator() { + @Provides public RDF4JGenerator() { dataToBeInject = new HashMap<>(); listOfParentZClass = new ArrayList<>(); } diff --git a/OLGA/OLGA-Core-Java-Generator/src/test/java/semanticstore/ontology/library/generator/code/generator/CommentsTestJava.java b/OLGA/OLGA-Core-Java-Generator/src/test/java/semanticstore/ontology/library/generator/code/generator/CommentsTestJava.java new file mode 100644 index 0000000..42b79b1 --- /dev/null +++ b/OLGA/OLGA-Core-Java-Generator/src/test/java/semanticstore/ontology/library/generator/code/generator/CommentsTestJava.java @@ -0,0 +1,90 @@ +/* + * ------------------------- + * + * MIT License + * + * Copyright (c) 2018, Schneider Electric USA, Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and + * associated documentation files (the "Software"), to deal in the Software without restriction, + * including without limitation the rights to use, copy, modify, merge, publish, distribute, + * sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all copies or + * substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT + * NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, + * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * --------------------- + */ +package semanticstore.ontology.library.generator.code.generator; + + +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.stream.Stream; +import org.junit.BeforeClass; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; +import org.junit.runners.Parameterized.Parameter; +import org.junit.runners.Parameterized.Parameters; +import semanticstore.ontology.library.generator.test.utils.GeneratedOntologies; + +@RunWith(Parameterized.class) +public class CommentsTestJava { + + @BeforeClass + public static void generateOntology() throws Exception { + // check if the needed ontologies have been generated + assertTrue(GeneratedOntologies.isSimpleBasicGenerated("java", "rdf4j")); + } + + // building set of parameter to test : (code , path to tested class, expected comment, test name ) + @Parameters(name = "{index}: {0}-Comment {3}") + public static Collection data() { + Path java = + Paths.get("OLGA/generated/testsimple-RDF4J-java/src/main/java/testsimple/rdf/model/"); + + List list = new ArrayList<>(); + + list.add(new Object[] {"JAVA", java.resolve("Building.java"), "Class mabna", "Class"}); + list.add(new Object[] {"JAVA", java.resolve("Building.java"), "shows building property.", + "Data property"}); + list.add(new Object[] {"JAVA", java.resolve("Building.java"), "Depends on Building class.", + "Object Property"}); + + return list; + } + + @Parameter + public String language; + @Parameter(1) + public Path classPath; + @Parameter(2) + public String expectedComment; + @Parameter(3) + public String class4TestName; + + @Test + public void test() throws IOException { + try (Stream stream = Files.lines(classPath)) { + assertTrue(stream.anyMatch(line -> line.contains(expectedComment))); + } catch (IOException e) { + fail(); + } + } + +} diff --git a/OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/code/generator/OLGAJavaTest.java b/OLGA/OLGA-Core-Java-Generator/src/test/java/semanticstore/ontology/library/generator/code/generator/OLGAJavaTest.java similarity index 100% rename from OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/code/generator/OLGAJavaTest.java rename to OLGA/OLGA-Core-Java-Generator/src/test/java/semanticstore/ontology/library/generator/code/generator/OLGAJavaTest.java diff --git a/OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/code/generator/OLGAJavaVersionTest.java b/OLGA/OLGA-Core-Java-Generator/src/test/java/semanticstore/ontology/library/generator/code/generator/OLGAJavaVersionTest.java similarity index 100% rename from OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/code/generator/OLGAJavaVersionTest.java rename to OLGA/OLGA-Core-Java-Generator/src/test/java/semanticstore/ontology/library/generator/code/generator/OLGAJavaVersionTest.java diff --git a/OLGA/OLGA-Core-Java-Generator/src/test/java/semanticstore/ontology/library/generator/code/generator/PreservePathOptionTestJava.java b/OLGA/OLGA-Core-Java-Generator/src/test/java/semanticstore/ontology/library/generator/code/generator/PreservePathOptionTestJava.java new file mode 100644 index 0000000..36ac30e --- /dev/null +++ b/OLGA/OLGA-Core-Java-Generator/src/test/java/semanticstore/ontology/library/generator/code/generator/PreservePathOptionTestJava.java @@ -0,0 +1,54 @@ +/* + * ------------------------- + * + * MIT License + * + * Copyright (c) 2018, Schneider Electric USA, Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and + * associated documentation files (the "Software"), to deal in the Software without restriction, + * including without limitation the rights to use, copy, modify, merge, publish, distribute, + * sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all copies or + * substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT + * NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, + * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * --------------------- + */ +package semanticstore.ontology.library.generator.code.generator; + +import static org.junit.Assert.assertTrue; +import java.io.File; +import org.junit.BeforeClass; +import org.junit.Test; +import semanticstore.ontology.library.generator.test.utils.GeneratedOntologies; + +public class PreservePathOptionTest { + + @BeforeClass + public static void generateOntology() { + assertTrue(GeneratedOntologies.isSimpleBasicPreserveGenerated("java", "rdf4j")); + assertTrue(GeneratedOntologies.isSimpleBasicGenerated("java", "rdf4j")); + } + + @Test + public void testPathWhenOptionSet_Java() { + File file = new File( + "OLGA/generated/simplepreserve-RDF4J-java/src/main/java/www/simple/com/Building.java"); + assertTrue(file.exists()); + } + + @Test + public void testPathWhenOptionNotSet_Java() { + File file = new File( + "OLGA/generated/testsimple-RDF4J-java/src/main/java/testsimple/rdf/model/Building.java"); + assertTrue(file.exists()); + } +} diff --git a/OLGA/OLGA-Core-Python-Generator/pom.xml b/OLGA/OLGA-Core-Python-Generator/pom.xml new file mode 100644 index 0000000..c0ce2a3 --- /dev/null +++ b/OLGA/OLGA-Core-Python-Generator/pom.xml @@ -0,0 +1,265 @@ + + + 4.0.0 + jar + + semanticstore.ontology.library.generator + OLGA-Core + 0.0.6 + + OLGA-Core-Python-Generator + OLGA-Core-Python-Generator + https://github.com/EcoStruxure/OLGA/tree/master/OLGA/OLGA-Core-Python-Generator + OLGA is based on a model driven approach taking as input an ontology file expressed in one of the supported W3C supported standards (RDF, OWL) and generating a library conform to the ontology model. + + The generated library is then imported and used to programmatically to: + + Generate an ontology instance conform to the ontology model. + Query the generated ontology instance by relying on Object Oriented Classes. + + + MIT License + http://www.opensource.org/licenses/mit-license.php + + + + scm:git:git://github.com/EcoStruxure/OLGA/tree/master/OLGA/OLGA-Core-Python-Generator.git + scm:git:ssh://github.com:EcoStruxure/OLGA/tree/master/OLGA/OLGA-Core-Python-Generator.git + https://github.com/EcoStruxure//OLGA/tree/master/OLGA/OLGA-Core-Python-Generator + + + UTF-8 + 5.1.12 + 2.3.28 + 1.4 + 1.1 + 3.6 + 2.0.0 + 3.3.9 + 1.2.2 + 4.12 + 1.7.25 + 1.2.17 + + + src + + + + org.apache.maven.plugins + maven-surefire-plugin + + true + + + + + + + com.google.cloud.tools + jib-maven-plugin + 0.9.8 + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.7.0 + + 1.8 + 1.8 + + + + org.apache.maven.plugins + maven-jar-plugin + 3.0.2 + + + + true + + + + + + org.apache.maven.plugins + maven-assembly-plugin + 3.1.0 + + + src/assembly/assembly.xml + + true + + + + create-archive + package + + single + + + + + + maven-site-plugin + 3.7.1 + + + attach-descriptor + + attach-descriptor + + + + + + org.codehaus.mojo + findbugs-maven-plugin + 3.0.5 + + Max + Low + true + false + + + + verify + + check + + + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.20.1 + + false + 1 + + + + + + + + org.apache.commons + commons-lang3 + ${commons-lang3.version} + + + org.apache.commons + commons-text + ${commons-text.version} + + + + commons-cli + commons-cli + ${commons-cli.version} + + + + + org.apache.maven.plugins + maven-invoker-plugin + ${maven-invoker.version} + + + org.slf4j + slf4j-simple + + + org.slf4j + slf4j-api + + + org.slf4j + slf4j-nop + + + org.slf4j + slf4j-jdk14 + + + + + + org.apache.maven + maven-model + ${maven-model.version} + + + + net.sourceforge.owlapi + owlapi-api + ${owlapi.version} + + + net.sourceforge.owlapi + owlapi-apibinding + ${owlapi.version} + + + net.sourceforge.owlapi + owlapi-distribution + ${owlapi.version} + + + net.sourceforge.owlapi + owlapi-parsers + ${owlapi.version} + + + net.sourceforge.owlapi + owlapi-impl + ${owlapi.version} + + + net.sourceforge.owlapi + owlapi-tools + ${owlapi.version} + + + + org.freemarker + freemarker + ${freemarker.version} + + + junit + junit + ${junit.version} + + + log4j + log4j + ${log4j.version} + + + org.slf4j + slf4j-simple + ${log.version} + + + org.slf4j + slf4j-api + ${log.version} + + + org.slf4j + slf4j-nop + ${log.version} + + + diff --git a/OLGA/OLGA-Core/src/main/java/semanticstore/ontology/library/generator/generators/RdfAlchemyGenerator.java b/OLGA/OLGA-Core-Python-Generator/src/main/java/semanticstore/ontology/library/generator/generators/RdfAlchemyGenerator.java similarity index 100% rename from OLGA/OLGA-Core/src/main/java/semanticstore/ontology/library/generator/generators/RdfAlchemyGenerator.java rename to OLGA/OLGA-Core-Python-Generator/src/main/java/semanticstore/ontology/library/generator/generators/RdfAlchemyGenerator.java diff --git a/OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/code/generator/OLGAPythonTest.java b/OLGA/OLGA-Core-Python-Generator/src/test/java/semanticstore/ontology/library/generator/code/generator/OLGAPythonTest.java similarity index 100% rename from OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/code/generator/OLGAPythonTest.java rename to OLGA/OLGA-Core-Python-Generator/src/test/java/semanticstore/ontology/library/generator/code/generator/OLGAPythonTest.java diff --git a/OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/code/generator/PreservePathOptionTest.java b/OLGA/OLGA-Core-Python-Generator/src/test/java/semanticstore/ontology/library/generator/code/generator/PreservePathOptionTestPython.java similarity index 65% rename from OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/code/generator/PreservePathOptionTest.java rename to OLGA/OLGA-Core-Python-Generator/src/test/java/semanticstore/ontology/library/generator/code/generator/PreservePathOptionTestPython.java index 18ed6a0..0d71c20 100644 --- a/OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/code/generator/PreservePathOptionTest.java +++ b/OLGA/OLGA-Core-Python-Generator/src/test/java/semanticstore/ontology/library/generator/code/generator/PreservePathOptionTestPython.java @@ -34,41 +34,10 @@ public class PreservePathOptionTest { @BeforeClass public static void generateOntology() { - assertTrue(GeneratedOntologies.isSimpleBasicPreserveGenerated("cs", "trinity")); - assertTrue(GeneratedOntologies.isSimpleBasicGenerated("cs", "trinity")); - assertTrue(GeneratedOntologies.isSimpleBasicPreserveGenerated("java", "rdf4j")); - assertTrue(GeneratedOntologies.isSimpleBasicGenerated("java", "rdf4j")); assertTrue(GeneratedOntologies.isSimpleBasicPreserveGenerated("python", "rdfalchemy")); assertTrue(GeneratedOntologies.isSimpleBasicGenerated("python", "rdfalchemy")); } - @Test - public void testPathWhenOptionSet_CSharp() { - File file = new File("OLGA/generated/SimplePreserve-dotnetTrinity/www/simple/com/Building.cs"); - assertTrue(file.exists()); - } - - @Test - public void testPathWhenOptionNotSet_CSharp() { - File file = - new File("OLGA/generated/testSimple-dotnetTrinity/TestSimple/Rdf/Model/Building.cs"); - assertTrue(file.exists()); - } - - @Test - public void testPathWhenOptionSet_Java() { - File file = new File( - "OLGA/generated/simplepreserve-RDF4J-java/src/main/java/www/simple/com/Building.java"); - assertTrue(file.exists()); - } - - @Test - public void testPathWhenOptionNotSet_Java() { - File file = new File( - "OLGA/generated/testsimple-RDF4J-java/src/main/java/testsimple/rdf/model/Building.java"); - assertTrue(file.exists()); - } - @Test public void testPathWhenOptionSet_Python() { File file = diff --git a/OLGA/OLGA-Core/pom.xml b/OLGA/OLGA-Core/pom.xml index d5ed881..4e07de3 100644 --- a/OLGA/OLGA-Core/pom.xml +++ b/OLGA/OLGA-Core/pom.xml @@ -6,11 +6,11 @@ semanticstore.ontology.library.generator OLGA - 0.0.5 + 0.0.6 OLGA-Core OLGA-Core - https://github.com/EcoStruxure/OLGA/tree/master/OLGA/OLGA-Core + https://github.com/EcoStruxure/OLGA/tree/master/OLGA/OLGA-Core OLGA is based on a model driven approach taking as input an ontology file expressed in one of the supported W3C supported standards (RDF, OWL) and generating a library conform to the ontology model. The generated library is then imported and used to programmatically to: @@ -62,6 +62,13 @@ Query the generated ontology instance by relying on Object Oriented Classes. 1.8 1.8 + + + com.google.dagger + dagger-compiler + 2.28.3 + + semanticstore.ontology.library.generator.olga.OlgaService diff --git a/OLGA/OLGA-Core/src/main/java/semanticstore/ontology/library/generator/generators/SingletonGenerator.java b/OLGA/OLGA-Core/src/main/java/semanticstore/ontology/library/generator/generators/SingletonGenerator.java index 6c694c7..548dfe8 100644 --- a/OLGA/OLGA-Core/src/main/java/semanticstore/ontology/library/generator/generators/SingletonGenerator.java +++ b/OLGA/OLGA-Core/src/main/java/semanticstore/ontology/library/generator/generators/SingletonGenerator.java @@ -49,24 +49,24 @@ public static synchronized AbstractGenerator getInstance(Map inp throws IOException, XmlPullParserException, InvalidUriException { LIBRARY library = (LIBRARY) inputCmdParameters.get("library"); switch (library) { - case TRINITY: - if (trinitySingleton == null) { - trinitySingleton = new TrinityGenerator(); - } - trinitySingleton.setParameters(inputCmdParameters); - return trinitySingleton; +// case TRINITY: +// if (trinitySingleton == null) { +// trinitySingleton = new TrinityGenerator(); +// } +// trinitySingleton.setParameters(inputCmdParameters); +// return trinitySingleton; case RDF4J: if (rdf4jSingleton == null) { rdf4jSingleton = new RDF4JGenerator(); } rdf4jSingleton.setParameters(inputCmdParameters); return rdf4jSingleton; - case RDFALCHEMY: - if (rdfAlchemySingleton == null) { - rdfAlchemySingleton = new RdfAlchemyGenerator(); - } - rdfAlchemySingleton.setParameters(inputCmdParameters); - return rdfAlchemySingleton; +// case RDFALCHEMY: +// if (rdfAlchemySingleton == null) { +// rdfAlchemySingleton = new RdfAlchemyGenerator(); +// } +// rdfAlchemySingleton.setParameters(inputCmdParameters); +// return rdfAlchemySingleton; default: break; } From 54bac84da04a338a1afd9569f441976b8af800b6 Mon Sep 17 00:00:00 2001 From: Charbull Date: Tue, 21 Jul 2020 12:54:47 -0400 Subject: [PATCH 02/10] put the various languages in packages to skip tests when a specific language is not relevant for the user --- OLGA/OLGA-Cli/pom.xml | 2 +- OLGA/OLGA-Core-CSharp-Generator/pom.xml | 265 ------------------ OLGA/OLGA-Core-Java-Generator/pom.xml | 245 ---------------- OLGA/OLGA-Core-Python-Generator/pom.xml | 265 ------------------ .../generators/SingletonGenerator.java | 29 +- .../generators/csharp}/TrinityGenerator.java | 3 +- .../generators/java}/RDF4JGenerator.java | 6 +- .../python}/RdfAlchemyGenerator.java | 3 +- .../generators/csharp}/CommentsTestCs.java | 2 +- .../generators/csharp}/DependenciesTest.java | 2 +- .../generators/csharp}/IndentationTest.java | 26 +- .../generators/csharp}/OLGACSharpTest.java | 2 +- .../csharp}/OLGAOutputOptionTest.java | 2 +- .../generators/csharp}/OLGAVersionTest.java | 2 +- .../generators/csharp}/PartialOptionTest.java | 2 +- .../csharp}/PreservePathOptionTestCs.java | 2 +- .../csharp}/QueryWithReasoningTest.java | 2 +- .../csharp}/SkipCompileOptionTest.java | 2 +- .../generators/csharp}/WrongNameTest.java | 2 +- .../generators/java}/CommentsTestJava.java | 2 +- .../generators/java}/OLGAJavaTest.java | 2 +- .../generators/java}/OLGAJavaVersionTest.java | 10 +- .../java}/PreservePathOptionTestJava.java | 4 +- .../generators/python}/OLGAPythonTest.java | 2 +- .../python}/PreservePathOptionTestPython.java | 4 +- OLGA/OLGA-Ws/pom.xml | 2 +- 26 files changed, 73 insertions(+), 817 deletions(-) delete mode 100644 OLGA/OLGA-Core-CSharp-Generator/pom.xml delete mode 100644 OLGA/OLGA-Core-Java-Generator/pom.xml delete mode 100644 OLGA/OLGA-Core-Python-Generator/pom.xml rename OLGA/{OLGA-Core-CSharp-Generator/src/main/java/semanticstore/ontology/library/generator/generators => OLGA-Core/src/main/java/semanticstore/ontology/library/generator/generators/csharp}/TrinityGenerator.java (98%) rename OLGA/{OLGA-Core-Java-Generator/src/main/java/semanticstore/ontology/library/generator/generators => OLGA-Core/src/main/java/semanticstore/ontology/library/generator/generators/java}/RDF4JGenerator.java (98%) rename OLGA/{OLGA-Core-Python-Generator/src/main/java/semanticstore/ontology/library/generator/generators => OLGA-Core/src/main/java/semanticstore/ontology/library/generator/generators/python}/RdfAlchemyGenerator.java (98%) rename OLGA/{OLGA-Core-CSharp-Generator/src/test/java/semanticstore/ontology/library/generator/code/generator => OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp}/CommentsTestCs.java (98%) rename OLGA/{OLGA-Core-CSharp-Generator/src/test/java/semanticstore/ontology/library/generator/code/generator => OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp}/DependenciesTest.java (97%) rename OLGA/{OLGA-Core-CSharp-Generator/src/test/java/semanticstore/ontology/library/generator/code/generator => OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp}/IndentationTest.java (55%) rename OLGA/{OLGA-Core-CSharp-Generator/src/test/java/semanticstore/ontology/library/generator/code/generator => OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp}/OLGACSharpTest.java (99%) rename OLGA/{OLGA-Core-CSharp-Generator/src/test/java/semanticstore/ontology/library/generator/code/generator => OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp}/OLGAOutputOptionTest.java (97%) rename OLGA/{OLGA-Core-CSharp-Generator/src/test/java/semanticstore/ontology/library/generator/code/generator => OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp}/OLGAVersionTest.java (99%) rename OLGA/{OLGA-Core-CSharp-Generator/src/test/java/semanticstore/ontology/library/generator/code/generator => OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp}/PartialOptionTest.java (97%) rename OLGA/{OLGA-Core-CSharp-Generator/src/test/java/semanticstore/ontology/library/generator/code/generator => OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp}/PreservePathOptionTestCs.java (96%) rename OLGA/{OLGA-Core-CSharp-Generator/src/test/java/semanticstore/ontology/library/generator/code/generator => OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp}/QueryWithReasoningTest.java (96%) rename OLGA/{OLGA-Core-CSharp-Generator/src/test/java/semanticstore/ontology/library/generator/code/generator => OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp}/SkipCompileOptionTest.java (95%) rename OLGA/{OLGA-Core-CSharp-Generator/src/test/java/semanticstore/ontology/library/generator/code/generator => OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp}/WrongNameTest.java (97%) rename OLGA/{OLGA-Core-Java-Generator/src/test/java/semanticstore/ontology/library/generator/code/generator => OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/java}/CommentsTestJava.java (97%) rename OLGA/{OLGA-Core-Java-Generator/src/test/java/semanticstore/ontology/library/generator/code/generator => OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/java}/OLGAJavaTest.java (99%) rename OLGA/{OLGA-Core-Java-Generator/src/test/java/semanticstore/ontology/library/generator/code/generator => OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/java}/OLGAJavaVersionTest.java (94%) rename OLGA/{OLGA-Core-Java-Generator/src/test/java/semanticstore/ontology/library/generator/code/generator => OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/java}/PreservePathOptionTestJava.java (94%) rename OLGA/{OLGA-Core-Python-Generator/src/test/java/semanticstore/ontology/library/generator/code/generator => OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/python}/OLGAPythonTest.java (99%) rename OLGA/{OLGA-Core-Python-Generator/src/test/java/semanticstore/ontology/library/generator/code/generator => OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/python}/PreservePathOptionTestPython.java (94%) diff --git a/OLGA/OLGA-Cli/pom.xml b/OLGA/OLGA-Cli/pom.xml index 8e9a929..b72dfd4 100644 --- a/OLGA/OLGA-Cli/pom.xml +++ b/OLGA/OLGA-Cli/pom.xml @@ -8,7 +8,7 @@ semanticstore.ontology.library.generator OLGA - 0.0.5 + 0.0.6 OLGA-Cli OLGA-Cli diff --git a/OLGA/OLGA-Core-CSharp-Generator/pom.xml b/OLGA/OLGA-Core-CSharp-Generator/pom.xml deleted file mode 100644 index 9c68fce..0000000 --- a/OLGA/OLGA-Core-CSharp-Generator/pom.xml +++ /dev/null @@ -1,265 +0,0 @@ - - - 4.0.0 - jar - - semanticstore.ontology.library.generator - OLGA-Core - 0.0.6 - - OLGA-Core-CSharp-Generator - OLGA-Core-CSharp-Generator - https://github.com/EcoStruxure/OLGA/tree/master/OLGA/OLGA-Core-CSharp-Generator - OLGA is based on a model driven approach taking as input an ontology file expressed in one of the supported W3C supported standards (RDF, OWL) and generating a library conform to the ontology model. - - The generated library is then imported and used to programmatically to: - - Generate an ontology instance conform to the ontology model. - Query the generated ontology instance by relying on Object Oriented Classes. - - - MIT License - http://www.opensource.org/licenses/mit-license.php - - - - scm:git:git://github.com/EcoStruxure/OLGA/tree/master/OLGA/OLGA-Core-CSharp-Generator.git - scm:git:ssh://github.com:EcoStruxure/OLGA/tree/master/OLGA/OLGA-Core-CSharp-Generator.git - https://github.com/EcoStruxure//OLGA/tree/master/OLGA/OLGA-Core-CSharp-Generator - - - UTF-8 - 5.1.12 - 2.3.28 - 1.4 - 1.1 - 3.6 - 2.0.0 - 3.3.9 - 1.2.2 - 4.12 - 1.7.25 - 1.2.17 - - - src - - - - org.apache.maven.plugins - maven-surefire-plugin - - true - - - - - - - com.google.cloud.tools - jib-maven-plugin - 0.9.8 - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.7.0 - - 1.8 - 1.8 - - - - org.apache.maven.plugins - maven-jar-plugin - 3.0.2 - - - - true - - - - - - org.apache.maven.plugins - maven-assembly-plugin - 3.1.0 - - - src/assembly/assembly.xml - - true - - - - create-archive - package - - single - - - - - - maven-site-plugin - 3.7.1 - - - attach-descriptor - - attach-descriptor - - - - - - org.codehaus.mojo - findbugs-maven-plugin - 3.0.5 - - Max - Low - true - false - - - - verify - - check - - - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.20.1 - - false - 1 - - - - - - - - org.apache.commons - commons-lang3 - ${commons-lang3.version} - - - org.apache.commons - commons-text - ${commons-text.version} - - - - commons-cli - commons-cli - ${commons-cli.version} - - - - - org.apache.maven.plugins - maven-invoker-plugin - ${maven-invoker.version} - - - org.slf4j - slf4j-simple - - - org.slf4j - slf4j-api - - - org.slf4j - slf4j-nop - - - org.slf4j - slf4j-jdk14 - - - - - - org.apache.maven - maven-model - ${maven-model.version} - - - - net.sourceforge.owlapi - owlapi-api - ${owlapi.version} - - - net.sourceforge.owlapi - owlapi-apibinding - ${owlapi.version} - - - net.sourceforge.owlapi - owlapi-distribution - ${owlapi.version} - - - net.sourceforge.owlapi - owlapi-parsers - ${owlapi.version} - - - net.sourceforge.owlapi - owlapi-impl - ${owlapi.version} - - - net.sourceforge.owlapi - owlapi-tools - ${owlapi.version} - - - - org.freemarker - freemarker - ${freemarker.version} - - - junit - junit - ${junit.version} - - - log4j - log4j - ${log4j.version} - - - org.slf4j - slf4j-simple - ${log.version} - - - org.slf4j - slf4j-api - ${log.version} - - - org.slf4j - slf4j-nop - ${log.version} - - - diff --git a/OLGA/OLGA-Core-Java-Generator/pom.xml b/OLGA/OLGA-Core-Java-Generator/pom.xml deleted file mode 100644 index 15efdee..0000000 --- a/OLGA/OLGA-Core-Java-Generator/pom.xml +++ /dev/null @@ -1,245 +0,0 @@ - - - 4.0.0 - jar - - semanticstore.ontology.library.generator - OLGA - 0.0.6 - - OLGA-Core-Java-Generator - OLGA-Core-Java-Generator - https://github.com/EcoStruxure/OLGA/tree/master/OLGA/OLGA-Core-Java-Generator - OLGA is based on a model driven approach taking as input an ontology file expressed in one of the supported W3C supported standards (RDF, OWL) and generating a library conform to the ontology model. - - The generated library is then imported and used to programmatically to: - - Generate an ontology instance conform to the ontology model. - Query the generated ontology instance by relying on Object Oriented Classes. - - - MIT License - http://www.opensource.org/licenses/mit-license.php - - - - scm:git:git://github.com/EcoStruxure/OLGA/tree/master/OLGA/OLGA-Core-Java-Generator.git - scm:git:ssh://github.com:EcoStruxure/OLGA/tree/master/OLGA/OLGA-Core-Java-Generator.git - https://github.com/EcoStruxure//OLGA/tree/master/OLGA/OLGA-Core-Java-Generator - - - UTF-8 - 5.1.12 - 2.3.28 - 1.4 - 1.1 - 3.6 - 2.0.0 - 3.3.9 - 1.2.2 - 4.12 - 1.7.25 - 1.2.17 - - - src - - - - org.apache.maven.plugins - maven-surefire-plugin - - true - - - - - - - com.google.cloud.tools - jib-maven-plugin - 0.9.8 - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.7.0 - - 1.8 - 1.8 - - - - org.apache.maven.plugins - maven-jar-plugin - 3.0.2 - - - - true - - - - - - maven-site-plugin - 3.7.1 - - - attach-descriptor - - attach-descriptor - - - - - - org.codehaus.mojo - findbugs-maven-plugin - 3.0.5 - - Max - Low - true - false - - - - verify - - check - - - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.20.1 - - false - 1 - - - - - - - - org.apache.commons - commons-lang3 - ${commons-lang3.version} - - - org.apache.commons - commons-text - ${commons-text.version} - - - - commons-cli - commons-cli - ${commons-cli.version} - - - - - org.apache.maven.plugins - maven-invoker-plugin - ${maven-invoker.version} - - - org.slf4j - slf4j-simple - - - org.slf4j - slf4j-api - - - org.slf4j - slf4j-nop - - - org.slf4j - slf4j-jdk14 - - - - - - org.apache.maven - maven-model - ${maven-model.version} - - - - net.sourceforge.owlapi - owlapi-api - ${owlapi.version} - - - net.sourceforge.owlapi - owlapi-apibinding - ${owlapi.version} - - - net.sourceforge.owlapi - owlapi-distribution - ${owlapi.version} - - - net.sourceforge.owlapi - owlapi-parsers - ${owlapi.version} - - - net.sourceforge.owlapi - owlapi-impl - ${owlapi.version} - - - net.sourceforge.owlapi - owlapi-tools - ${owlapi.version} - - - - org.freemarker - freemarker - ${freemarker.version} - - - junit - junit - ${junit.version} - - - log4j - log4j - ${log4j.version} - - - org.slf4j - slf4j-simple - ${log.version} - - - org.slf4j - slf4j-api - ${log.version} - - - org.slf4j - slf4j-nop - ${log.version} - - - diff --git a/OLGA/OLGA-Core-Python-Generator/pom.xml b/OLGA/OLGA-Core-Python-Generator/pom.xml deleted file mode 100644 index c0ce2a3..0000000 --- a/OLGA/OLGA-Core-Python-Generator/pom.xml +++ /dev/null @@ -1,265 +0,0 @@ - - - 4.0.0 - jar - - semanticstore.ontology.library.generator - OLGA-Core - 0.0.6 - - OLGA-Core-Python-Generator - OLGA-Core-Python-Generator - https://github.com/EcoStruxure/OLGA/tree/master/OLGA/OLGA-Core-Python-Generator - OLGA is based on a model driven approach taking as input an ontology file expressed in one of the supported W3C supported standards (RDF, OWL) and generating a library conform to the ontology model. - - The generated library is then imported and used to programmatically to: - - Generate an ontology instance conform to the ontology model. - Query the generated ontology instance by relying on Object Oriented Classes. - - - MIT License - http://www.opensource.org/licenses/mit-license.php - - - - scm:git:git://github.com/EcoStruxure/OLGA/tree/master/OLGA/OLGA-Core-Python-Generator.git - scm:git:ssh://github.com:EcoStruxure/OLGA/tree/master/OLGA/OLGA-Core-Python-Generator.git - https://github.com/EcoStruxure//OLGA/tree/master/OLGA/OLGA-Core-Python-Generator - - - UTF-8 - 5.1.12 - 2.3.28 - 1.4 - 1.1 - 3.6 - 2.0.0 - 3.3.9 - 1.2.2 - 4.12 - 1.7.25 - 1.2.17 - - - src - - - - org.apache.maven.plugins - maven-surefire-plugin - - true - - - - - - - com.google.cloud.tools - jib-maven-plugin - 0.9.8 - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.7.0 - - 1.8 - 1.8 - - - - org.apache.maven.plugins - maven-jar-plugin - 3.0.2 - - - - true - - - - - - org.apache.maven.plugins - maven-assembly-plugin - 3.1.0 - - - src/assembly/assembly.xml - - true - - - - create-archive - package - - single - - - - - - maven-site-plugin - 3.7.1 - - - attach-descriptor - - attach-descriptor - - - - - - org.codehaus.mojo - findbugs-maven-plugin - 3.0.5 - - Max - Low - true - false - - - - verify - - check - - - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.20.1 - - false - 1 - - - - - - - - org.apache.commons - commons-lang3 - ${commons-lang3.version} - - - org.apache.commons - commons-text - ${commons-text.version} - - - - commons-cli - commons-cli - ${commons-cli.version} - - - - - org.apache.maven.plugins - maven-invoker-plugin - ${maven-invoker.version} - - - org.slf4j - slf4j-simple - - - org.slf4j - slf4j-api - - - org.slf4j - slf4j-nop - - - org.slf4j - slf4j-jdk14 - - - - - - org.apache.maven - maven-model - ${maven-model.version} - - - - net.sourceforge.owlapi - owlapi-api - ${owlapi.version} - - - net.sourceforge.owlapi - owlapi-apibinding - ${owlapi.version} - - - net.sourceforge.owlapi - owlapi-distribution - ${owlapi.version} - - - net.sourceforge.owlapi - owlapi-parsers - ${owlapi.version} - - - net.sourceforge.owlapi - owlapi-impl - ${owlapi.version} - - - net.sourceforge.owlapi - owlapi-tools - ${owlapi.version} - - - - org.freemarker - freemarker - ${freemarker.version} - - - junit - junit - ${junit.version} - - - log4j - log4j - ${log4j.version} - - - org.slf4j - slf4j-simple - ${log.version} - - - org.slf4j - slf4j-api - ${log.version} - - - org.slf4j - slf4j-nop - ${log.version} - - - diff --git a/OLGA/OLGA-Core/src/main/java/semanticstore/ontology/library/generator/generators/SingletonGenerator.java b/OLGA/OLGA-Core/src/main/java/semanticstore/ontology/library/generator/generators/SingletonGenerator.java index 548dfe8..28886c9 100644 --- a/OLGA/OLGA-Core/src/main/java/semanticstore/ontology/library/generator/generators/SingletonGenerator.java +++ b/OLGA/OLGA-Core/src/main/java/semanticstore/ontology/library/generator/generators/SingletonGenerator.java @@ -28,6 +28,11 @@ import java.util.Map; import org.codehaus.plexus.util.xml.pull.XmlPullParserException; import semanticstore.ontology.library.generator.exceptions.InvalidUriException; +import semanticstore.ontology.library.generator.generators.AbstractGenerator; +import semanticstore.ontology.library.generator.generators.java.RDF4JGenerator; +import semanticstore.ontology.library.generator.generators.csharp.TrinityGenerator; +import semanticstore.ontology.library.generator.generators.python.RdfAlchemyGenerator; + import semanticstore.ontology.library.generator.global.LIBRARY; /** @@ -49,24 +54,24 @@ public static synchronized AbstractGenerator getInstance(Map inp throws IOException, XmlPullParserException, InvalidUriException { LIBRARY library = (LIBRARY) inputCmdParameters.get("library"); switch (library) { -// case TRINITY: -// if (trinitySingleton == null) { -// trinitySingleton = new TrinityGenerator(); -// } -// trinitySingleton.setParameters(inputCmdParameters); -// return trinitySingleton; + case TRINITY: + if (trinitySingleton == null) { + trinitySingleton = new TrinityGenerator(); + } + trinitySingleton.setParameters(inputCmdParameters); + return trinitySingleton; case RDF4J: if (rdf4jSingleton == null) { rdf4jSingleton = new RDF4JGenerator(); } rdf4jSingleton.setParameters(inputCmdParameters); return rdf4jSingleton; -// case RDFALCHEMY: -// if (rdfAlchemySingleton == null) { -// rdfAlchemySingleton = new RdfAlchemyGenerator(); -// } -// rdfAlchemySingleton.setParameters(inputCmdParameters); -// return rdfAlchemySingleton; + case RDFALCHEMY: + if (rdfAlchemySingleton == null) { + rdfAlchemySingleton = new RdfAlchemyGenerator(); + } + rdfAlchemySingleton.setParameters(inputCmdParameters); + return rdfAlchemySingleton; default: break; } diff --git a/OLGA/OLGA-Core-CSharp-Generator/src/main/java/semanticstore/ontology/library/generator/generators/TrinityGenerator.java b/OLGA/OLGA-Core/src/main/java/semanticstore/ontology/library/generator/generators/csharp/TrinityGenerator.java similarity index 98% rename from OLGA/OLGA-Core-CSharp-Generator/src/main/java/semanticstore/ontology/library/generator/generators/TrinityGenerator.java rename to OLGA/OLGA-Core/src/main/java/semanticstore/ontology/library/generator/generators/csharp/TrinityGenerator.java index 0b41067..810b176 100644 --- a/OLGA/OLGA-Core-CSharp-Generator/src/main/java/semanticstore/ontology/library/generator/generators/TrinityGenerator.java +++ b/OLGA/OLGA-Core/src/main/java/semanticstore/ontology/library/generator/generators/csharp/TrinityGenerator.java @@ -22,7 +22,7 @@ * * --------------------- */ -package semanticstore.ontology.library.generator.generators; +package semanticstore.ontology.library.generator.generators.csharp; import java.io.BufferedWriter; import java.io.File; @@ -49,6 +49,7 @@ import freemarker.template.TemplateException; import freemarker.template.TemplateNotFoundException; import semanticstore.ontology.library.generator.exceptions.InvalidUriException; +import semanticstore.ontology.library.generator.generators.AbstractGenerator; import semanticstore.ontology.library.generator.global.UTILS; import semanticstore.ontology.library.generator.model.ZClass; import semanticstore.ontology.library.generator.model.ZObjectProperty; diff --git a/OLGA/OLGA-Core-Java-Generator/src/main/java/semanticstore/ontology/library/generator/generators/RDF4JGenerator.java b/OLGA/OLGA-Core/src/main/java/semanticstore/ontology/library/generator/generators/java/RDF4JGenerator.java similarity index 98% rename from OLGA/OLGA-Core-Java-Generator/src/main/java/semanticstore/ontology/library/generator/generators/RDF4JGenerator.java rename to OLGA/OLGA-Core/src/main/java/semanticstore/ontology/library/generator/generators/java/RDF4JGenerator.java index 8078614..aa5401b 100644 --- a/OLGA/OLGA-Core-Java-Generator/src/main/java/semanticstore/ontology/library/generator/generators/RDF4JGenerator.java +++ b/OLGA/OLGA-Core/src/main/java/semanticstore/ontology/library/generator/generators/java/RDF4JGenerator.java @@ -22,7 +22,7 @@ * * --------------------- */ -package semanticstore.ontology.library.generator.generators; +package semanticstore.ontology.library.generator.generators.java; import java.io.BufferedWriter; import java.io.File; @@ -48,19 +48,19 @@ import freemarker.template.Template; import freemarker.template.TemplateException; import freemarker.template.TemplateNotFoundException; +import semanticstore.ontology.library.generator.generators.AbstractGenerator; import semanticstore.ontology.library.generator.exceptions.InvalidUriException; import semanticstore.ontology.library.generator.global.UTILS; import semanticstore.ontology.library.generator.model.ZClass; import semanticstore.ontology.library.generator.model.ZObjectProperty; import semanticstore.ontology.library.generator.resources.ResourceManager; -@dagger.Module public class RDF4JGenerator extends AbstractGenerator { private String globalFile; private final static Logger log = Logger.getLogger(RDF4JGenerator.class); - @Provides public RDF4JGenerator() { + public RDF4JGenerator() { dataToBeInject = new HashMap<>(); listOfParentZClass = new ArrayList<>(); } diff --git a/OLGA/OLGA-Core-Python-Generator/src/main/java/semanticstore/ontology/library/generator/generators/RdfAlchemyGenerator.java b/OLGA/OLGA-Core/src/main/java/semanticstore/ontology/library/generator/generators/python/RdfAlchemyGenerator.java similarity index 98% rename from OLGA/OLGA-Core-Python-Generator/src/main/java/semanticstore/ontology/library/generator/generators/RdfAlchemyGenerator.java rename to OLGA/OLGA-Core/src/main/java/semanticstore/ontology/library/generator/generators/python/RdfAlchemyGenerator.java index 224b371..489d132 100644 --- a/OLGA/OLGA-Core-Python-Generator/src/main/java/semanticstore/ontology/library/generator/generators/RdfAlchemyGenerator.java +++ b/OLGA/OLGA-Core/src/main/java/semanticstore/ontology/library/generator/generators/python/RdfAlchemyGenerator.java @@ -22,7 +22,7 @@ * * --------------------- */ -package semanticstore.ontology.library.generator.generators; +package semanticstore.ontology.library.generator.generators.python; import java.io.BufferedWriter; import java.io.File; @@ -50,6 +50,7 @@ import freemarker.template.TemplateException; import freemarker.template.TemplateNotFoundException; import semanticstore.ontology.library.generator.exceptions.InvalidUriException; +import semanticstore.ontology.library.generator.generators.AbstractGenerator; import semanticstore.ontology.library.generator.global.UTILS; import semanticstore.ontology.library.generator.model.ZClass; import semanticstore.ontology.library.generator.model.ZInstance; diff --git a/OLGA/OLGA-Core-CSharp-Generator/src/test/java/semanticstore/ontology/library/generator/code/generator/CommentsTestCs.java b/OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp/CommentsTestCs.java similarity index 98% rename from OLGA/OLGA-Core-CSharp-Generator/src/test/java/semanticstore/ontology/library/generator/code/generator/CommentsTestCs.java rename to OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp/CommentsTestCs.java index 756e026..3387fbd 100644 --- a/OLGA/OLGA-Core-CSharp-Generator/src/test/java/semanticstore/ontology/library/generator/code/generator/CommentsTestCs.java +++ b/OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp/CommentsTestCs.java @@ -22,7 +22,7 @@ * * --------------------- */ -package semanticstore.ontology.library.generator.code.generator; +package semanticstore.ontology.library.generator.code.generator.generators.csharp; import static org.junit.Assert.assertTrue; diff --git a/OLGA/OLGA-Core-CSharp-Generator/src/test/java/semanticstore/ontology/library/generator/code/generator/DependenciesTest.java b/OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp/DependenciesTest.java similarity index 97% rename from OLGA/OLGA-Core-CSharp-Generator/src/test/java/semanticstore/ontology/library/generator/code/generator/DependenciesTest.java rename to OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp/DependenciesTest.java index 5de7044..d339aed 100644 --- a/OLGA/OLGA-Core-CSharp-Generator/src/test/java/semanticstore/ontology/library/generator/code/generator/DependenciesTest.java +++ b/OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp/DependenciesTest.java @@ -22,7 +22,7 @@ * * --------------------- */ -package semanticstore.ontology.library.generator.code.generator; +package semanticstore.ontology.library.generator.code.generator.generators.csharp; import static org.junit.Assert.*; import java.io.IOException; diff --git a/OLGA/OLGA-Core-CSharp-Generator/src/test/java/semanticstore/ontology/library/generator/code/generator/IndentationTest.java b/OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp/IndentationTest.java similarity index 55% rename from OLGA/OLGA-Core-CSharp-Generator/src/test/java/semanticstore/ontology/library/generator/code/generator/IndentationTest.java rename to OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp/IndentationTest.java index c216708..4f353a3 100644 --- a/OLGA/OLGA-Core-CSharp-Generator/src/test/java/semanticstore/ontology/library/generator/code/generator/IndentationTest.java +++ b/OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp/IndentationTest.java @@ -1,4 +1,28 @@ -package semanticstore.ontology.library.generator.code.generator; +/* + * ------------------------- + * + * MIT License + * + * Copyright (c) 2018, Schneider Electric USA, Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and + * associated documentation files (the "Software"), to deal in the Software without restriction, + * including without limitation the rights to use, copy, modify, merge, publish, distribute, + * sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all copies or + * substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT + * NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, + * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * --------------------- + */ +package semanticstore.ontology.library.generator.code.generator.generators.csharp; import static org.junit.Assert.*; import java.io.IOException; diff --git a/OLGA/OLGA-Core-CSharp-Generator/src/test/java/semanticstore/ontology/library/generator/code/generator/OLGACSharpTest.java b/OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp/OLGACSharpTest.java similarity index 99% rename from OLGA/OLGA-Core-CSharp-Generator/src/test/java/semanticstore/ontology/library/generator/code/generator/OLGACSharpTest.java rename to OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp/OLGACSharpTest.java index d5b8922..77091ae 100644 --- a/OLGA/OLGA-Core-CSharp-Generator/src/test/java/semanticstore/ontology/library/generator/code/generator/OLGACSharpTest.java +++ b/OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp/OLGACSharpTest.java @@ -22,7 +22,7 @@ * * --------------------- */ -package semanticstore.ontology.library.generator.code.generator; +package semanticstore.ontology.library.generator.code.generator.generators.csharp; import static org.junit.Assert.assertTrue; import java.io.ByteArrayOutputStream; diff --git a/OLGA/OLGA-Core-CSharp-Generator/src/test/java/semanticstore/ontology/library/generator/code/generator/OLGAOutputOptionTest.java b/OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp/OLGAOutputOptionTest.java similarity index 97% rename from OLGA/OLGA-Core-CSharp-Generator/src/test/java/semanticstore/ontology/library/generator/code/generator/OLGAOutputOptionTest.java rename to OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp/OLGAOutputOptionTest.java index 7582d31..c2c2cb8 100644 --- a/OLGA/OLGA-Core-CSharp-Generator/src/test/java/semanticstore/ontology/library/generator/code/generator/OLGAOutputOptionTest.java +++ b/OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp/OLGAOutputOptionTest.java @@ -22,7 +22,7 @@ * * --------------------- */ -package semanticstore.ontology.library.generator.code.generator; +package semanticstore.ontology.library.generator.code.generator.generators.csharp; import static org.junit.Assert.assertTrue; import java.nio.file.Files; diff --git a/OLGA/OLGA-Core-CSharp-Generator/src/test/java/semanticstore/ontology/library/generator/code/generator/OLGAVersionTest.java b/OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp/OLGAVersionTest.java similarity index 99% rename from OLGA/OLGA-Core-CSharp-Generator/src/test/java/semanticstore/ontology/library/generator/code/generator/OLGAVersionTest.java rename to OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp/OLGAVersionTest.java index 9456800..6355ad3 100644 --- a/OLGA/OLGA-Core-CSharp-Generator/src/test/java/semanticstore/ontology/library/generator/code/generator/OLGAVersionTest.java +++ b/OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp/OLGAVersionTest.java @@ -22,7 +22,7 @@ * * --------------------- */ -package semanticstore.ontology.library.generator.code.generator; +package semanticstore.ontology.library.generator.code.generator.generators.csharp; import static org.junit.Assert.assertTrue; import java.io.ByteArrayOutputStream; diff --git a/OLGA/OLGA-Core-CSharp-Generator/src/test/java/semanticstore/ontology/library/generator/code/generator/PartialOptionTest.java b/OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp/PartialOptionTest.java similarity index 97% rename from OLGA/OLGA-Core-CSharp-Generator/src/test/java/semanticstore/ontology/library/generator/code/generator/PartialOptionTest.java rename to OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp/PartialOptionTest.java index 9ee67d7..58c5a5c 100644 --- a/OLGA/OLGA-Core-CSharp-Generator/src/test/java/semanticstore/ontology/library/generator/code/generator/PartialOptionTest.java +++ b/OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp/PartialOptionTest.java @@ -22,7 +22,7 @@ * * --------------------- */ -package semanticstore.ontology.library.generator.code.generator; +package semanticstore.ontology.library.generator.code.generator.generators.csharp; import static org.junit.Assert.assertTrue; import java.io.IOException; diff --git a/OLGA/OLGA-Core-CSharp-Generator/src/test/java/semanticstore/ontology/library/generator/code/generator/PreservePathOptionTestCs.java b/OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp/PreservePathOptionTestCs.java similarity index 96% rename from OLGA/OLGA-Core-CSharp-Generator/src/test/java/semanticstore/ontology/library/generator/code/generator/PreservePathOptionTestCs.java rename to OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp/PreservePathOptionTestCs.java index 2a11f0f..4f21d13 100644 --- a/OLGA/OLGA-Core-CSharp-Generator/src/test/java/semanticstore/ontology/library/generator/code/generator/PreservePathOptionTestCs.java +++ b/OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp/PreservePathOptionTestCs.java @@ -22,7 +22,7 @@ * * --------------------- */ -package semanticstore.ontology.library.generator.code.generator; +package semanticstore.ontology.library.generator.code.generator.generators.csharp; import static org.junit.Assert.assertTrue; import java.io.File; diff --git a/OLGA/OLGA-Core-CSharp-Generator/src/test/java/semanticstore/ontology/library/generator/code/generator/QueryWithReasoningTest.java b/OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp/QueryWithReasoningTest.java similarity index 96% rename from OLGA/OLGA-Core-CSharp-Generator/src/test/java/semanticstore/ontology/library/generator/code/generator/QueryWithReasoningTest.java rename to OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp/QueryWithReasoningTest.java index cc2a6cb..11aece3 100644 --- a/OLGA/OLGA-Core-CSharp-Generator/src/test/java/semanticstore/ontology/library/generator/code/generator/QueryWithReasoningTest.java +++ b/OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp/QueryWithReasoningTest.java @@ -22,7 +22,7 @@ * * --------------------- */ -package semanticstore.ontology.library.generator.code.generator; +package semanticstore.ontology.library.generator.code.generator.generators.csharp; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; diff --git a/OLGA/OLGA-Core-CSharp-Generator/src/test/java/semanticstore/ontology/library/generator/code/generator/SkipCompileOptionTest.java b/OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp/SkipCompileOptionTest.java similarity index 95% rename from OLGA/OLGA-Core-CSharp-Generator/src/test/java/semanticstore/ontology/library/generator/code/generator/SkipCompileOptionTest.java rename to OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp/SkipCompileOptionTest.java index e1aa90d..f2ec2d4 100644 --- a/OLGA/OLGA-Core-CSharp-Generator/src/test/java/semanticstore/ontology/library/generator/code/generator/SkipCompileOptionTest.java +++ b/OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp/SkipCompileOptionTest.java @@ -22,7 +22,7 @@ * * --------------------- */ -package semanticstore.ontology.library.generator.code.generator; +package semanticstore.ontology.library.generator.code.generator.generators.csharp; import static org.junit.Assert.*; import java.nio.file.Files; diff --git a/OLGA/OLGA-Core-CSharp-Generator/src/test/java/semanticstore/ontology/library/generator/code/generator/WrongNameTest.java b/OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp/WrongNameTest.java similarity index 97% rename from OLGA/OLGA-Core-CSharp-Generator/src/test/java/semanticstore/ontology/library/generator/code/generator/WrongNameTest.java rename to OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp/WrongNameTest.java index ad571f4..feddab7 100644 --- a/OLGA/OLGA-Core-CSharp-Generator/src/test/java/semanticstore/ontology/library/generator/code/generator/WrongNameTest.java +++ b/OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp/WrongNameTest.java @@ -22,7 +22,7 @@ * * --------------------- */ -package semanticstore.ontology.library.generator.code.generator; +package semanticstore.ontology.library.generator.code.generator.generators.csharp; import java.io.ByteArrayOutputStream; import java.io.PrintStream; diff --git a/OLGA/OLGA-Core-Java-Generator/src/test/java/semanticstore/ontology/library/generator/code/generator/CommentsTestJava.java b/OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/java/CommentsTestJava.java similarity index 97% rename from OLGA/OLGA-Core-Java-Generator/src/test/java/semanticstore/ontology/library/generator/code/generator/CommentsTestJava.java rename to OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/java/CommentsTestJava.java index 42b79b1..0c23b69 100644 --- a/OLGA/OLGA-Core-Java-Generator/src/test/java/semanticstore/ontology/library/generator/code/generator/CommentsTestJava.java +++ b/OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/java/CommentsTestJava.java @@ -22,7 +22,7 @@ * * --------------------- */ -package semanticstore.ontology.library.generator.code.generator; +package semanticstore.ontology.library.generator.code.generator.generators.java; import static org.junit.Assert.assertTrue; diff --git a/OLGA/OLGA-Core-Java-Generator/src/test/java/semanticstore/ontology/library/generator/code/generator/OLGAJavaTest.java b/OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/java/OLGAJavaTest.java similarity index 99% rename from OLGA/OLGA-Core-Java-Generator/src/test/java/semanticstore/ontology/library/generator/code/generator/OLGAJavaTest.java rename to OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/java/OLGAJavaTest.java index 890daa8..145e53b 100644 --- a/OLGA/OLGA-Core-Java-Generator/src/test/java/semanticstore/ontology/library/generator/code/generator/OLGAJavaTest.java +++ b/OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/java/OLGAJavaTest.java @@ -22,7 +22,7 @@ * * --------------------- */ -package semanticstore.ontology.library.generator.code.generator; +package semanticstore.ontology.library.generator.code.generator.generators.java; import static org.junit.Assert.assertTrue; import java.io.ByteArrayOutputStream; diff --git a/OLGA/OLGA-Core-Java-Generator/src/test/java/semanticstore/ontology/library/generator/code/generator/OLGAJavaVersionTest.java b/OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/java/OLGAJavaVersionTest.java similarity index 94% rename from OLGA/OLGA-Core-Java-Generator/src/test/java/semanticstore/ontology/library/generator/code/generator/OLGAJavaVersionTest.java rename to OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/java/OLGAJavaVersionTest.java index 7ff6db8..32f7a27 100644 --- a/OLGA/OLGA-Core-Java-Generator/src/test/java/semanticstore/ontology/library/generator/code/generator/OLGAJavaVersionTest.java +++ b/OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/java/OLGAJavaVersionTest.java @@ -22,7 +22,7 @@ * * --------------------- */ -package semanticstore.ontology.library.generator.code.generator; +package semanticstore.ontology.library.generator.code.generator.generators.java; import static org.junit.Assert.*; import java.io.ByteArrayOutputStream; @@ -85,7 +85,7 @@ public void testSimple4CodeGenerationMyValidVersion() throws Exception { inputCmdParameters.put("out", folder4Versions.toFile().toString()); String resourcesDirectory = null; - resourcesDirectory = Paths.get(OLGAVersionTest.class.getClassLoader() + resourcesDirectory = Paths.get(OLGAJavaVersionTest.class.getClassLoader() .getResource("simple/simple.owl").toURI()).toFile().toString(); inputCmdParameters.put("name", "SimpleValidVersion"); inputCmdParameters.put("pathToOntologiesParam", resourcesDirectory); @@ -115,7 +115,7 @@ public void testSimpleWithoutMyVersion() throws Exception { inputCmdParameters.put("out", folder4Versions.toFile().toString()); String resourcesDirectory = null; - resourcesDirectory = Paths.get(OLGAVersionTest.class.getClassLoader() + resourcesDirectory = Paths.get(OLGAJavaVersionTest.class.getClassLoader() .getResource("simple/simple.owl").toURI()).toFile().toString(); inputCmdParameters.put("name", "SimpleWithoutMyVersion"); inputCmdParameters.put("pathToOntologiesParam", resourcesDirectory); @@ -146,7 +146,7 @@ public void testSimpleVersionInOntology() throws Exception { String resourcesDirectory = null; resourcesDirectory = - Paths.get(OLGAVersionTest.class.getClassLoader().getResource("versionedsimple").toURI()) + Paths.get(OLGAJavaVersionTest.class.getClassLoader().getResource("versionedsimple").toURI()) .toFile().toString(); inputCmdParameters.put("name", "versionedsimple"); inputCmdParameters.put("pathToOntologiesParam", resourcesDirectory); @@ -177,7 +177,7 @@ public void testSimpleMyWrongVersion() throws Exception { inputCmdParameters.put("out", folder4Versions.toFile().toString()); String resourcesDirectory = null; - resourcesDirectory = Paths.get(OLGAVersionTest.class.getClassLoader() + resourcesDirectory = Paths.get(OLGAJavaVersionTest.class.getClassLoader() .getResource("simple/simple.owl").toURI()).toFile().toString(); inputCmdParameters.put("name", "WrongVersionName"); inputCmdParameters.put("pathToOntologiesParam", resourcesDirectory); diff --git a/OLGA/OLGA-Core-Java-Generator/src/test/java/semanticstore/ontology/library/generator/code/generator/PreservePathOptionTestJava.java b/OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/java/PreservePathOptionTestJava.java similarity index 94% rename from OLGA/OLGA-Core-Java-Generator/src/test/java/semanticstore/ontology/library/generator/code/generator/PreservePathOptionTestJava.java rename to OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/java/PreservePathOptionTestJava.java index 36ac30e..340960c 100644 --- a/OLGA/OLGA-Core-Java-Generator/src/test/java/semanticstore/ontology/library/generator/code/generator/PreservePathOptionTestJava.java +++ b/OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/java/PreservePathOptionTestJava.java @@ -22,7 +22,7 @@ * * --------------------- */ -package semanticstore.ontology.library.generator.code.generator; +package semanticstore.ontology.library.generator.code.generator.generators.java; import static org.junit.Assert.assertTrue; import java.io.File; @@ -30,7 +30,7 @@ import org.junit.Test; import semanticstore.ontology.library.generator.test.utils.GeneratedOntologies; -public class PreservePathOptionTest { +public class PreservePathOptionTestJava { @BeforeClass public static void generateOntology() { diff --git a/OLGA/OLGA-Core-Python-Generator/src/test/java/semanticstore/ontology/library/generator/code/generator/OLGAPythonTest.java b/OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/python/OLGAPythonTest.java similarity index 99% rename from OLGA/OLGA-Core-Python-Generator/src/test/java/semanticstore/ontology/library/generator/code/generator/OLGAPythonTest.java rename to OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/python/OLGAPythonTest.java index dad3b21..a4f904f 100644 --- a/OLGA/OLGA-Core-Python-Generator/src/test/java/semanticstore/ontology/library/generator/code/generator/OLGAPythonTest.java +++ b/OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/python/OLGAPythonTest.java @@ -22,7 +22,7 @@ * * --------------------- */ -package semanticstore.ontology.library.generator.code.generator; +package semanticstore.ontology.library.generator.code.generator.generators.python; import static org.junit.Assert.*; import java.io.ByteArrayOutputStream; diff --git a/OLGA/OLGA-Core-Python-Generator/src/test/java/semanticstore/ontology/library/generator/code/generator/PreservePathOptionTestPython.java b/OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/python/PreservePathOptionTestPython.java similarity index 94% rename from OLGA/OLGA-Core-Python-Generator/src/test/java/semanticstore/ontology/library/generator/code/generator/PreservePathOptionTestPython.java rename to OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/python/PreservePathOptionTestPython.java index 0d71c20..b868801 100644 --- a/OLGA/OLGA-Core-Python-Generator/src/test/java/semanticstore/ontology/library/generator/code/generator/PreservePathOptionTestPython.java +++ b/OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/python/PreservePathOptionTestPython.java @@ -22,7 +22,7 @@ * * --------------------- */ -package semanticstore.ontology.library.generator.code.generator; +package semanticstore.ontology.library.generator.code.generator.generators.python; import static org.junit.Assert.assertTrue; import java.io.File; @@ -30,7 +30,7 @@ import org.junit.Test; import semanticstore.ontology.library.generator.test.utils.GeneratedOntologies; -public class PreservePathOptionTest { +public class PreservePathOptionTestPython { @BeforeClass public static void generateOntology() { diff --git a/OLGA/OLGA-Ws/pom.xml b/OLGA/OLGA-Ws/pom.xml index 9180b5a..424753b 100644 --- a/OLGA/OLGA-Ws/pom.xml +++ b/OLGA/OLGA-Ws/pom.xml @@ -7,7 +7,7 @@ semanticstore.ontology.library.generator OLGA - 0.0.5 + 0.0.6 OLGA-Ws OLGA-Ws From 72b67e0f81b65b8625847fd0a5d5ad5e795515a9 Mon Sep 17 00:00:00 2001 From: Charbull Date: Tue, 21 Jul 2020 15:15:37 -0400 Subject: [PATCH 03/10] updating versions --- OLGA/OLGA-Cli/pom.xml | 2 +- OLGA/OLGA-Ws/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/OLGA/OLGA-Cli/pom.xml b/OLGA/OLGA-Cli/pom.xml index b72dfd4..9664e5f 100644 --- a/OLGA/OLGA-Cli/pom.xml +++ b/OLGA/OLGA-Cli/pom.xml @@ -40,7 +40,7 @@ Query the generated ontology instance by relying on Object Oriented Classes. semanticstore.ontology.library.generator OLGA-Core - 0.0.5 + 0.0.6 log4j diff --git a/OLGA/OLGA-Ws/pom.xml b/OLGA/OLGA-Ws/pom.xml index 424753b..67d8075 100644 --- a/OLGA/OLGA-Ws/pom.xml +++ b/OLGA/OLGA-Ws/pom.xml @@ -35,7 +35,7 @@ Query the generated ontology instance by relying on Object Oriented Classes.${java.version} ${java.version} 2.7.0 - 0.0.5 + 0.0.6 1.7.25 1.2.17 From 6dad3a6d4c8bdee36324fbcf5c2d706a58d9a417 Mon Sep 17 00:00:00 2001 From: Charbull Date: Tue, 21 Jul 2020 15:45:33 -0400 Subject: [PATCH 04/10] update packages and profiles --- OLGA/OLGA-Core/pom.xml | 30 ++++++++++++++++++- ...ntsTestCs.java => CommentsTestCsharp.java} | 2 +- ...sTest.java => DependenciesTestCsharp.java} | 2 +- ...onTest.java => IndentationTestCsharp.java} | 2 +- ...t.java => OLGAOutputOptionTestCsharp.java} | 2 +- ...LGACSharpTest.java => OLGATestCsharp.java} | 26 ++++++++-------- ...onTest.java => OLGAVersionTestCsharp.java} | 10 +++---- ...Test.java => PartialOptionTestCsharp.java} | 2 +- ...java => PreservePathOptionTestCsharp.java} | 2 +- ...java => QueryWithReasoningTestCsharp.java} | 2 +- ....java => SkipCompileOptionTestCsharp.java} | 2 +- ...NameTest.java => WrongNameTestCsharp.java} | 4 +-- ...LGAPythonTest.java => OLGATestPython.java} | 26 ++++++++-------- 13 files changed, 70 insertions(+), 42 deletions(-) rename OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp/{CommentsTestCs.java => CommentsTestCsharp.java} (99%) rename OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp/{DependenciesTest.java => DependenciesTestCsharp.java} (98%) rename OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp/{IndentationTest.java => IndentationTestCsharp.java} (98%) rename OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp/{OLGAOutputOptionTest.java => OLGAOutputOptionTestCsharp.java} (98%) rename OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp/{OLGACSharpTest.java => OLGATestCsharp.java} (93%) rename OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp/{OLGAVersionTest.java => OLGAVersionTestCsharp.java} (95%) rename OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp/{PartialOptionTest.java => PartialOptionTestCsharp.java} (98%) rename OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp/{PreservePathOptionTestCs.java => PreservePathOptionTestCsharp.java} (97%) rename OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp/{QueryWithReasoningTest.java => QueryWithReasoningTestCsharp.java} (98%) rename OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp/{SkipCompileOptionTest.java => SkipCompileOptionTestCsharp.java} (97%) rename OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp/{WrongNameTest.java => WrongNameTestCsharp.java} (95%) rename OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/python/{OLGAPythonTest.java => OLGATestPython.java} (93%) diff --git a/OLGA/OLGA-Core/pom.xml b/OLGA/OLGA-Core/pom.xml index 4e07de3..d65008a 100644 --- a/OLGA/OLGA-Core/pom.xml +++ b/OLGA/OLGA-Core/pom.xml @@ -41,7 +41,35 @@ Query the generated ontology instance by relying on Object Oriented Classes.4.12 1.7.25 1.2.17 - + + + + csharp + + **/*Python + + + + python + + **/*Csharp + + + + java + + **/*Csharp + **/*Python + + + + default + + **/*Csharp + **/*Python + + + src diff --git a/OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp/CommentsTestCs.java b/OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp/CommentsTestCsharp.java similarity index 99% rename from OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp/CommentsTestCs.java rename to OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp/CommentsTestCsharp.java index 3387fbd..810473d 100644 --- a/OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp/CommentsTestCs.java +++ b/OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp/CommentsTestCsharp.java @@ -44,7 +44,7 @@ import semanticstore.ontology.library.generator.test.utils.GeneratedOntologies; @RunWith(Parameterized.class) -public class CommentsTestCs { +public class CommentsTestCsharp { @BeforeClass public static void generateOntology() throws Exception { diff --git a/OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp/DependenciesTest.java b/OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp/DependenciesTestCsharp.java similarity index 98% rename from OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp/DependenciesTest.java rename to OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp/DependenciesTestCsharp.java index d339aed..dd50101 100644 --- a/OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp/DependenciesTest.java +++ b/OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp/DependenciesTestCsharp.java @@ -34,7 +34,7 @@ import org.junit.Test; import semanticstore.ontology.library.generator.test.utils.GeneratedOntologies; -public class DependenciesTest { +public class DependenciesTestCsharp { @BeforeClass public static void generateOntology() throws Exception { diff --git a/OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp/IndentationTest.java b/OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp/IndentationTestCsharp.java similarity index 98% rename from OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp/IndentationTest.java rename to OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp/IndentationTestCsharp.java index 4f353a3..ba7d6ee 100644 --- a/OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp/IndentationTest.java +++ b/OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp/IndentationTestCsharp.java @@ -45,7 +45,7 @@ * */ @RunWith(Parameterized.class) -public class IndentationTest { +public class IndentationTestCsharp { @BeforeClass public static void generateOntology() throws Exception { diff --git a/OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp/OLGAOutputOptionTest.java b/OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp/OLGAOutputOptionTestCsharp.java similarity index 98% rename from OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp/OLGAOutputOptionTest.java rename to OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp/OLGAOutputOptionTestCsharp.java index c2c2cb8..d1d1ad6 100644 --- a/OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp/OLGAOutputOptionTest.java +++ b/OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp/OLGAOutputOptionTestCsharp.java @@ -38,7 +38,7 @@ import semanticstore.ontology.library.generator.service.OlgaService; import semanticstore.ontology.library.generator.test.utils.GeneratedOntologies; -public class OLGAOutputOptionTest { +public class OLGAOutputOptionTestCsharp { static Path outputPath; diff --git a/OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp/OLGACSharpTest.java b/OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp/OLGATestCsharp.java similarity index 93% rename from OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp/OLGACSharpTest.java rename to OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp/OLGATestCsharp.java index 77091ae..0e9a58f 100644 --- a/OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp/OLGACSharpTest.java +++ b/OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp/OLGATestCsharp.java @@ -40,7 +40,7 @@ import semanticstore.ontology.library.generator.global.LIBRARY; import semanticstore.ontology.library.generator.service.OlgaService; -public class OLGACSharpTest { +public class OLGATestCsharp { private final ByteArrayOutputStream errContent = new ByteArrayOutputStream(); private OlgaService service = new OlgaService(); @@ -68,7 +68,7 @@ public void testSimple() throws Exception { String resourcesDirectory = null; resourcesDirectory = - Paths.get(OLGACSharpTest.class.getClassLoader().getResource("simple/simple.owl").toURI()) + Paths.get(OLGATestCsharp.class.getClassLoader().getResource("simple/simple.owl").toURI()) .toFile().toString(); inputCmdParameters.put("name", "Simple"); inputCmdParameters.put("pathToOntologiesParam", resourcesDirectory); @@ -88,7 +88,7 @@ public void testDsp() throws Exception { String resourcesDirectory = null; resourcesDirectory = Paths - .get(OLGACSharpTest.class.getClassLoader().getResource("remi").toURI()).toFile().toString(); + .get(OLGATestCsharp.class.getClassLoader().getResource("remi").toURI()).toFile().toString(); inputCmdParameters.put("name", "DSP"); inputCmdParameters.put("pathToOntologiesParam", resourcesDirectory); service.invokeOlga(inputCmdParameters); @@ -106,7 +106,7 @@ public void testoneM2M_Base_OntologyX() throws Exception { inputCmdParameters.put("skipCompile", false); String resourcesDirectory = null; - resourcesDirectory = Paths.get(OLGACSharpTest.class.getClassLoader() + resourcesDirectory = Paths.get(OLGATestCsharp.class.getClassLoader() .getResource("PublicOntologies/oneM2M_Base_Ontology").toURI()).toFile().toString(); inputCmdParameters.put("name", "oneM2M"); inputCmdParameters.put("pathToOntologiesParam", resourcesDirectory); @@ -126,7 +126,7 @@ public void testPizza() throws Exception { String resourcesDirectory = null; resourcesDirectory = Paths - .get(OLGACSharpTest.class.getClassLoader().getResource("PublicOntologies/pizza").toURI()) + .get(OLGATestCsharp.class.getClassLoader().getResource("PublicOntologies/pizza").toURI()) .toFile().toString(); inputCmdParameters.put("name", "Pizza"); inputCmdParameters.put("pathToOntologiesParam", resourcesDirectory); @@ -146,7 +146,7 @@ public void testProvo() throws Exception { String resourcesDirectory = null; resourcesDirectory = Paths - .get(OLGACSharpTest.class.getClassLoader().getResource("PublicOntologies/prov-o").toURI()) + .get(OLGATestCsharp.class.getClassLoader().getResource("PublicOntologies/prov-o").toURI()) .toFile().toString(); inputCmdParameters.put("name", "Prov"); inputCmdParameters.put("pathToOntologiesParam", resourcesDirectory); @@ -166,7 +166,7 @@ public void testSsn() throws Exception { String resourcesDirectory = null; resourcesDirectory = - Paths.get(OLGACSharpTest.class.getClassLoader().getResource("PublicOntologies/ssn").toURI()) + Paths.get(OLGATestCsharp.class.getClassLoader().getResource("PublicOntologies/ssn").toURI()) .toFile().toString(); inputCmdParameters.put("name", "SSN"); inputCmdParameters.put("pathToOntologiesParam", resourcesDirectory); @@ -187,7 +187,7 @@ public void testBrick() throws Exception { String resourcesDirectory = null; resourcesDirectory = - Paths.get(OLGACSharpTest.class.getClassLoader().getResource("brick").toURI()) + Paths.get(OLGATestCsharp.class.getClassLoader().getResource("brick").toURI()) .toFile().toString(); inputCmdParameters.put("name", "Brick"); inputCmdParameters.put("pathToOntologiesParam", resourcesDirectory); @@ -207,7 +207,7 @@ public void testKnx() throws Exception { String resourcesDirectory = null; resourcesDirectory = - Paths.get(OLGACSharpTest.class.getClassLoader().getResource("PublicOntologies/knx").toURI()) + Paths.get(OLGATestCsharp.class.getClassLoader().getResource("PublicOntologies/knx").toURI()) .toFile().toString(); inputCmdParameters.put("name", "Knx"); inputCmdParameters.put("pathToOntologiesParam", resourcesDirectory); @@ -225,7 +225,7 @@ public void testSarefMerged() throws Exception { String resourcesDirectory = null; resourcesDirectory = - Paths.get(OLGACSharpTest.class.getClassLoader().getResource("saref").toURI()) + Paths.get(OLGATestCsharp.class.getClassLoader().getResource("saref").toURI()) .toFile().toString(); inputCmdParameters.put("name", "SarefMerged"); inputCmdParameters.put("pathToOntologiesParam", resourcesDirectory); @@ -245,7 +245,7 @@ public void testSarefImports() throws Exception { String resourcesDirectory = null; resourcesDirectory = - Paths.get(OLGACSharpTest.class.getClassLoader().getResource("sarefImports").toURI()) + Paths.get(OLGATestCsharp.class.getClassLoader().getResource("sarefImports").toURI()) .toFile().toString(); inputCmdParameters.put("name", "SarefImports"); inputCmdParameters.put("pathToOntologiesParam", resourcesDirectory); @@ -266,7 +266,7 @@ public void testFiesta() throws Exception { String resourcesDirectory = null; resourcesDirectory = - Paths.get(OLGACSharpTest.class.getClassLoader().getResource("fiesta").toURI()) + Paths.get(OLGATestCsharp.class.getClassLoader().getResource("fiesta").toURI()) .toFile().toString(); inputCmdParameters.put("name", "Fiesta"); inputCmdParameters.put("pathToOntologiesParam", resourcesDirectory); @@ -286,7 +286,7 @@ public void testM3() throws Exception { String resourcesDirectory = null; resourcesDirectory = - Paths.get(OLGACSharpTest.class.getClassLoader().getResource("m3").toURI()) + Paths.get(OLGATestCsharp.class.getClassLoader().getResource("m3").toURI()) .toFile().toString(); inputCmdParameters.put("name", "M3"); inputCmdParameters.put("pathToOntologiesParam", resourcesDirectory); diff --git a/OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp/OLGAVersionTest.java b/OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp/OLGAVersionTestCsharp.java similarity index 95% rename from OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp/OLGAVersionTest.java rename to OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp/OLGAVersionTestCsharp.java index 6355ad3..73de222 100644 --- a/OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp/OLGAVersionTest.java +++ b/OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp/OLGAVersionTestCsharp.java @@ -45,7 +45,7 @@ import semanticstore.ontology.library.generator.resources.ResourceManager; import semanticstore.ontology.library.generator.service.OlgaService; -public class OLGAVersionTest { +public class OLGAVersionTestCsharp { private OlgaService service = new OlgaService(); @@ -85,7 +85,7 @@ public void testSimpleMyValidVersion() throws Exception { inputCmdParameters.put("out", folder4Versions.toFile().toString()); String resourcesDirectory = null; - resourcesDirectory = Paths.get(OLGAVersionTest.class.getClassLoader() + resourcesDirectory = Paths.get(OLGAVersionTestCsharp.class.getClassLoader() .getResource("simple/simple.owl").toURI()).toFile().toString(); inputCmdParameters.put("name", "SimpleMyValidVersion"); inputCmdParameters.put("pathToOntologiesParam", resourcesDirectory); @@ -121,7 +121,7 @@ public void testSimpleWithoutMyVersion() throws Exception { inputCmdParameters.put("out", folder4Versions.toFile().toString()); String resourcesDirectory = null; - resourcesDirectory = Paths.get(OLGAVersionTest.class.getClassLoader() + resourcesDirectory = Paths.get(OLGAVersionTestCsharp.class.getClassLoader() .getResource("simple/simple.owl").toURI()).toFile().toString(); inputCmdParameters.put("name", "SimpleWithoutVersion"); inputCmdParameters.put("pathToOntologiesParam", resourcesDirectory); @@ -158,7 +158,7 @@ public void testSimpleVersionInOntology() throws Exception { String resourcesDirectory = null; resourcesDirectory = - Paths.get(OLGAVersionTest.class.getClassLoader().getResource("versionedsimple").toURI()) + Paths.get(OLGAVersionTestCsharp.class.getClassLoader().getResource("versionedsimple").toURI()) .toFile().toString(); inputCmdParameters.put("name", "versionedsimple"); inputCmdParameters.put("pathToOntologiesParam", resourcesDirectory); @@ -195,7 +195,7 @@ public void testSimpleMyWrongVersion() throws Exception { inputCmdParameters.put("out", folder4Versions.toFile().toString()); String resourcesDirectory = null; - resourcesDirectory = Paths.get(OLGAVersionTest.class.getClassLoader() + resourcesDirectory = Paths.get(OLGAVersionTestCsharp.class.getClassLoader() .getResource("simple/simple.owl").toURI()).toFile().toString(); inputCmdParameters.put("name", "SimpleWrongVersion"); inputCmdParameters.put("pathToOntologiesParam", resourcesDirectory); diff --git a/OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp/PartialOptionTest.java b/OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp/PartialOptionTestCsharp.java similarity index 98% rename from OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp/PartialOptionTest.java rename to OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp/PartialOptionTestCsharp.java index 58c5a5c..849fc2e 100644 --- a/OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp/PartialOptionTest.java +++ b/OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp/PartialOptionTestCsharp.java @@ -34,7 +34,7 @@ import org.junit.Test; import semanticstore.ontology.library.generator.test.utils.GeneratedOntologies; -public class PartialOptionTest { +public class PartialOptionTestCsharp { @BeforeClass public static void generateOntology() throws Exception { diff --git a/OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp/PreservePathOptionTestCs.java b/OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp/PreservePathOptionTestCsharp.java similarity index 97% rename from OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp/PreservePathOptionTestCs.java rename to OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp/PreservePathOptionTestCsharp.java index 4f21d13..d06451b 100644 --- a/OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp/PreservePathOptionTestCs.java +++ b/OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp/PreservePathOptionTestCsharp.java @@ -30,7 +30,7 @@ import org.junit.Test; import semanticstore.ontology.library.generator.test.utils.GeneratedOntologies; -public class PreservePathOptionTestCs { +public class PreservePathOptionTestCsharp { @BeforeClass public static void generateOntology() { diff --git a/OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp/QueryWithReasoningTest.java b/OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp/QueryWithReasoningTestCsharp.java similarity index 98% rename from OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp/QueryWithReasoningTest.java rename to OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp/QueryWithReasoningTestCsharp.java index 11aece3..b9eb16b 100644 --- a/OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp/QueryWithReasoningTest.java +++ b/OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp/QueryWithReasoningTestCsharp.java @@ -35,7 +35,7 @@ import org.junit.Test; import semanticstore.ontology.library.generator.test.utils.GeneratedOntologies; -public class QueryWithReasoningTest { +public class QueryWithReasoningTestCsharp { @BeforeClass public static void testSimple() { diff --git a/OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp/SkipCompileOptionTest.java b/OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp/SkipCompileOptionTestCsharp.java similarity index 97% rename from OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp/SkipCompileOptionTest.java rename to OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp/SkipCompileOptionTestCsharp.java index f2ec2d4..1c9c3a1 100644 --- a/OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp/SkipCompileOptionTest.java +++ b/OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp/SkipCompileOptionTestCsharp.java @@ -32,7 +32,7 @@ import org.junit.Test; import semanticstore.ontology.library.generator.test.utils.GeneratedOntologies; -public class SkipCompileOptionTest { +public class SkipCompileOptionTestCsharp { @BeforeClass public static void testSimple() { diff --git a/OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp/WrongNameTest.java b/OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp/WrongNameTestCsharp.java similarity index 95% rename from OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp/WrongNameTest.java rename to OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp/WrongNameTestCsharp.java index feddab7..75ecdf5 100644 --- a/OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp/WrongNameTest.java +++ b/OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp/WrongNameTestCsharp.java @@ -40,7 +40,7 @@ import semanticstore.ontology.library.generator.global.LIBRARY; import semanticstore.ontology.library.generator.service.OlgaService; -public class WrongNameTest { +public class WrongNameTestCsharp { @Rule public ExpectedException expected = ExpectedException.none(); @@ -76,7 +76,7 @@ public void testWrongName() throws Exception { String resourcesDirectory = null; resourcesDirectory = - Paths.get(WrongNameTest.class.getClassLoader().getResource("simple/wrongname.owl").toURI()) + Paths.get(WrongNameTestCsharp.class.getClassLoader().getResource("simple/wrongname.owl").toURI()) .toFile().toString(); inputCmdParameters.put("name", "WrongNameOntology"); inputCmdParameters.put("pathToOntologiesParam", resourcesDirectory); diff --git a/OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/python/OLGAPythonTest.java b/OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/python/OLGATestPython.java similarity index 93% rename from OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/python/OLGAPythonTest.java rename to OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/python/OLGATestPython.java index a4f904f..0bd419a 100644 --- a/OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/python/OLGAPythonTest.java +++ b/OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/python/OLGATestPython.java @@ -40,7 +40,7 @@ import semanticstore.ontology.library.generator.global.LIBRARY; import semanticstore.ontology.library.generator.service.OlgaService; -public class OLGAPythonTest { +public class OLGATestPython { private final ByteArrayOutputStream errContent = new ByteArrayOutputStream(); private OlgaService service = new OlgaService(); @@ -68,7 +68,7 @@ public void testSimple() throws Exception { String resourcesDirectory = null; resourcesDirectory = - Paths.get(OLGAPythonTest.class.getClassLoader().getResource("simple/simple.owl").toURI()) + Paths.get(OLGATestPython.class.getClassLoader().getResource("simple/simple.owl").toURI()) .toFile().toString(); inputCmdParameters.put("name", "Simple"); inputCmdParameters.put("pathToOntologiesParam", resourcesDirectory); @@ -88,7 +88,7 @@ public void testDsp() throws Exception { String resourcesDirectory = null; resourcesDirectory = Paths - .get(OLGAPythonTest.class.getClassLoader().getResource("remi").toURI()).toFile().toString(); + .get(OLGATestPython.class.getClassLoader().getResource("remi").toURI()).toFile().toString(); inputCmdParameters.put("name", "DSP"); inputCmdParameters.put("pathToOntologiesParam", resourcesDirectory); service.invokeOlga(inputCmdParameters); @@ -106,7 +106,7 @@ public void testoneM2M_Base_OntologyX() throws Exception { inputCmdParameters.put("skipCompile", false); String resourcesDirectory = null; - resourcesDirectory = Paths.get(OLGAPythonTest.class.getClassLoader() + resourcesDirectory = Paths.get(OLGATestPython.class.getClassLoader() .getResource("PublicOntologies/oneM2M_Base_Ontology").toURI()).toFile().toString(); inputCmdParameters.put("name", "oneM2M"); inputCmdParameters.put("pathToOntologiesParam", resourcesDirectory); @@ -126,7 +126,7 @@ public void testPizza() throws Exception { String resourcesDirectory = null; resourcesDirectory = Paths - .get(OLGAPythonTest.class.getClassLoader().getResource("PublicOntologies/pizza").toURI()) + .get(OLGATestPython.class.getClassLoader().getResource("PublicOntologies/pizza").toURI()) .toFile().toString(); inputCmdParameters.put("name", "Pizza"); inputCmdParameters.put("pathToOntologiesParam", resourcesDirectory); @@ -146,7 +146,7 @@ public void testProvo() throws Exception { String resourcesDirectory = null; resourcesDirectory = Paths - .get(OLGAPythonTest.class.getClassLoader().getResource("PublicOntologies/prov-o").toURI()) + .get(OLGATestPython.class.getClassLoader().getResource("PublicOntologies/prov-o").toURI()) .toFile().toString(); inputCmdParameters.put("name", "Prov"); inputCmdParameters.put("pathToOntologiesParam", resourcesDirectory); @@ -166,7 +166,7 @@ public void testSsn() throws Exception { String resourcesDirectory = null; resourcesDirectory = - Paths.get(OLGAPythonTest.class.getClassLoader().getResource("PublicOntologies/ssn").toURI()) + Paths.get(OLGATestPython.class.getClassLoader().getResource("PublicOntologies/ssn").toURI()) .toFile().toString(); inputCmdParameters.put("name", "SSN"); inputCmdParameters.put("pathToOntologiesParam", resourcesDirectory); @@ -187,7 +187,7 @@ public void testBrick() throws Exception { String resourcesDirectory = null; resourcesDirectory = - Paths.get(OLGAPythonTest.class.getClassLoader().getResource("brick").toURI()) + Paths.get(OLGATestPython.class.getClassLoader().getResource("brick").toURI()) .toFile().toString(); inputCmdParameters.put("name", "Brick"); inputCmdParameters.put("pathToOntologiesParam", resourcesDirectory); @@ -207,7 +207,7 @@ public void testKnx() throws Exception { String resourcesDirectory = null; resourcesDirectory = - Paths.get(OLGAPythonTest.class.getClassLoader().getResource("PublicOntologies/knx").toURI()) + Paths.get(OLGATestPython.class.getClassLoader().getResource("PublicOntologies/knx").toURI()) .toFile().toString(); inputCmdParameters.put("name", "Knx"); inputCmdParameters.put("pathToOntologiesParam", resourcesDirectory); @@ -227,7 +227,7 @@ public void testSarefMerged() throws Exception { String resourcesDirectory = null; resourcesDirectory = - Paths.get(OLGAPythonTest.class.getClassLoader().getResource("saref").toURI()) + Paths.get(OLGATestPython.class.getClassLoader().getResource("saref").toURI()) .toFile().toString(); inputCmdParameters.put("name", "SarefMerged"); inputCmdParameters.put("pathToOntologiesParam", resourcesDirectory); @@ -247,7 +247,7 @@ public void testSarefImports() throws Exception { String resourcesDirectory = null; resourcesDirectory = - Paths.get(OLGAPythonTest.class.getClassLoader().getResource("sarefImports").toURI()) + Paths.get(OLGATestPython.class.getClassLoader().getResource("sarefImports").toURI()) .toFile().toString(); inputCmdParameters.put("name", "SarefImports"); inputCmdParameters.put("pathToOntologiesParam", resourcesDirectory); @@ -268,7 +268,7 @@ public void testFiesta() throws Exception { String resourcesDirectory = null; resourcesDirectory = - Paths.get(OLGAPythonTest.class.getClassLoader().getResource("fiesta").toURI()) + Paths.get(OLGATestPython.class.getClassLoader().getResource("fiesta").toURI()) .toFile().toString(); inputCmdParameters.put("name", "Fiesta"); inputCmdParameters.put("pathToOntologiesParam", resourcesDirectory); @@ -288,7 +288,7 @@ public void testM3() throws Exception { String resourcesDirectory = null; resourcesDirectory = - Paths.get(OLGAPythonTest.class.getClassLoader().getResource("m3").toURI()) + Paths.get(OLGATestPython.class.getClassLoader().getResource("m3").toURI()) .toFile().toString(); inputCmdParameters.put("name", "M3"); inputCmdParameters.put("pathToOntologiesParam", resourcesDirectory); From 5e6f7963d1be85e01898a5cd69833b6baa1b0603 Mon Sep 17 00:00:00 2001 From: Charbull Date: Tue, 21 Jul 2020 16:55:40 -0400 Subject: [PATCH 05/10] updating tests --- .../OLGAVisitorSarefFullTestCsharp.java | 1355 +++++++++++++++++ .../generators/java/OLGAJavaTest.java | 80 +- .../visitor/OLGAVisitorSarefFullTest.java | 25 +- 3 files changed, 1401 insertions(+), 59 deletions(-) create mode 100644 OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp/OLGAVisitorSarefFullTestCsharp.java diff --git a/OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp/OLGAVisitorSarefFullTestCsharp.java b/OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp/OLGAVisitorSarefFullTestCsharp.java new file mode 100644 index 0000000..98df151 --- /dev/null +++ b/OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/csharp/OLGAVisitorSarefFullTestCsharp.java @@ -0,0 +1,1355 @@ +/* + * ------------------------- + * + * MIT License + * + * Copyright (c) 2018, Schneider Electric USA, Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and + * associated documentation files (the "Software"), to deal in the Software without restriction, + * including without limitation the rights to use, copy, modify, merge, publish, distribute, + * sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all copies or + * substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT + * NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, + * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * --------------------- + */ +package semanticstore.ontology.library.generator.visitor; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import java.io.File; +import java.util.ArrayList; +import java.util.List; +import org.junit.BeforeClass; +import org.junit.Test; +import org.semanticweb.owlapi.apibinding.OWLManager; +import org.semanticweb.owlapi.model.IRI; +import org.semanticweb.owlapi.model.OWLObjectVisitor; +import org.semanticweb.owlapi.model.OWLOntology; +import org.semanticweb.owlapi.model.OWLOntologyCreationException; +import org.semanticweb.owlapi.model.OWLOntologyManager; +import semanticstore.ontology.library.generator.global.CODE; +import semanticstore.ontology.library.generator.global.LIBRARY; +import semanticstore.ontology.library.generator.model.ZClass; +import semanticstore.ontology.library.generator.model.ZDataProperty; +import semanticstore.ontology.library.generator.model.ZInstance; +import semanticstore.ontology.library.generator.model.ZObjectProperty; +import semanticstore.ontology.library.generator.visitor.OLGAVisitor; + +/* + * OLGA tested with saref tested areas: Classes,Subclasses,Class Properties. + */ +public class OLGAVisitorSarefFullTestCsharp implements OWLObjectVisitor { + /* + * creating the IRI's to the classes + */ + private static IRI commandIRI = IRI.create("https://w3id.org/saref#Command"); + private static IRI closeCommandIRI = IRI.create("https://w3id.org/saref#CloseCommand"); + private static IRI getCommandIRI = IRI.create("https://w3id.org/saref#GetCommand"); + private static IRI notifyCommandIRI = IRI.create("https://w3id.org/saref#NotifyCommand"); + private static IRI offCommandIRI = IRI.create("https://w3id.org/saref#OffCommand"); + private static IRI onCommandIRI = IRI.create("https://w3id.org/saref#OnCommand"); + private static IRI openCommandIRI = IRI.create("https://w3id.org/saref#OpenCommand"); + private static IRI pauseCommandIRI = IRI.create("https://w3id.org/saref#PauseCommand"); + private static IRI setLevelCommandIRI = IRI.create("https://w3id.org/saref#SetLevelCommand"); + private static IRI startCommandIRI = IRI.create("https://w3id.org/saref#StartCommand"); + private static IRI stepDownCommandIRI = IRI.create("https://w3id.org/saref#StepDownCommand"); + private static IRI stepUpCommandIRI = IRI.create("https://w3id.org/saref#StepUpCommand"); + private static IRI stopCommandIRI = IRI.create("https://w3id.org/saref#StopCommand"); + private static IRI toggleCommandIRI = IRI.create("https://w3id.org/saref#ToggleCommand"); + private static IRI getCurrentMeterValueCommandIRI = + IRI.create("https://w3id.org/saref#GetCurrentMeterValueCommand"); + private static IRI getMeterDataCommandIRI = + IRI.create("https://w3id.org/saref#GetMeterDataCommand"); + private static IRI getMeterHistoryCommandIRI = + IRI.create("https://w3id.org/saref#GetMeterHistoryCommand"); + private static IRI getSensingDataCommandIRI = + IRI.create("https://w3id.org/saref#GetSensingDataCommand"); + private static IRI setAbsoluteLevelCommandIRI = + IRI.create("https://w3id.org/saref#SetAbsoluteLevelCommand"); + private static IRI setRelativeLevelCommandIRI = + IRI.create("https://w3id.org/saref#SetRelativeLevelCommand"); + private static IRI functionRelatedIRI = IRI.create("https://w3id.org/saref#FunctionRelated"); + private static IRI deviceIRI = IRI.create("https://w3id.org/saref#Device"); + private static IRI buildingRelatedIRI = IRI.create("https://w3id.org/saref#BuildingRelated"); + private static IRI energyRelatedIRI = IRI.create("https://w3id.org/saref#EnergyRelated"); + private static IRI generatorIRI = IRI.create("https://w3id.org/saref#Generator"); + private static IRI loadIRI = IRI.create("https://w3id.org/saref#Load"); + private static IRI storageIRI = IRI.create("https://w3id.org/saref#Storage"); + private static IRI washingMachineIRI = IRI.create("https://w3id.org/saref#WashingMachine"); + private static IRI applianceIRI = IRI.create("https://w3id.org/saref#Appliance"); + private static IRI actuatorIRI = IRI.create("https://w3id.org/saref#Actuator"); + private static IRI hvacIRI = IRI.create("https://w3id.org/saref#HVAC"); + private static IRI lightingDeviceIRI = IRI.create("https://w3id.org/saref#LightingDevice"); + private static IRI meterIRI = IRI.create("https://w3id.org/saref#Meter"); + private static IRI microRenewableIRI = IRI.create("https://w3id.org/saref#MicroRenewable"); + private static IRI multimediaIRI = IRI.create("https://w3id.org/saref#Multimedia"); + private static IRI networkIRI = IRI.create("https://w3id.org/saref#Network"); + private static IRI sensorkIRI = IRI.create("https://w3id.org/saref#Sensor"); + private static IRI switchIRI = IRI.create("https://w3id.org/saref#Switch"); + private static IRI doorSwitchIRI = IRI.create("https://w3id.org/saref#DoorSwitch"); + private static IRI lightSwitchIRI = IRI.create("https://w3id.org/saref#LightSwitch"); + private static IRI energyMeterIRI = IRI.create("https://w3id.org/saref#EnergyMeter"); + private static IRI smokeSensorIRI = IRI.create("https://w3id.org/saref#SmokeSensor"); + private static IRI temperatureSensorIRI = IRI.create("https://w3id.org/saref#TemperatureSensor"); + private static IRI functionIRI = IRI.create("https://w3id.org/saref#Function"); + private static IRI actuatingFunctionIRI = IRI.create("https://w3id.org/saref#ActuatingFunction"); + private static IRI eventFunctionIRI = IRI.create("https://w3id.org/saref#EventFunction"); + private static IRI meteringFunctionIRI = IRI.create("https://w3id.org/saref#MeteringFunction"); + private static IRI sensingFunctionIRI = IRI.create("https://w3id.org/saref#SensingFunction"); + private static IRI levelControlFunctionIRI = + IRI.create("https://w3id.org/saref#LevelControlFunction"); + private static IRI onOffFunctionIRI = IRI.create("https://w3id.org/saref#OnOffFunction"); + private static IRI openCloseFunctionIRI = IRI.create("https://w3id.org/saref#OpenCloseFunction"); + private static IRI startStopFunctionIRI = IRI.create("https://w3id.org/saref#StartStopFunction"); + private static IRI propertyIRI = IRI.create("https://w3id.org/saref#Property"); + private static IRI energyIRI = IRI.create("https://w3id.org/saref#Energy"); + private static IRI lightIRI = IRI.create("https://w3id.org/saref#Light"); + private static IRI motionIRI = IRI.create("https://w3id.org/saref#Motion"); + private static IRI occupancyIRI = IRI.create("https://w3id.org/saref#Occupancy"); + private static IRI powerIRI = IRI.create("https://w3id.org/saref#Power"); + private static IRI pressureIRI = IRI.create("https://w3id.org/saref#Pressure"); + private static IRI priceIRI = IRI.create("https://w3id.org/saref#Price"); + private static IRI smokeIRI = IRI.create("https://w3id.org/saref#Smoke"); + private static IRI temperatureIRI = IRI.create("https://w3id.org/saref#Temperature"); + private static IRI timeIRI = IRI.create("https://w3id.org/saref#Time"); + private static IRI humidityIRI = IRI.create("https://w3id.org/saref#Humidity"); + private static IRI literalIRI = IRI.create("http://www.w3.org/2000/01/rdf-schema#Literal"); + private static IRI dateTimeStampIRI = + IRI.create("http://www.w3.org/2001/XMLSchema#dateTimeStamp"); + private static IRI resourcesIRI = IRI.create("http://www.w3.org/2000/01/rdf-schema#Resource"); + private static IRI generalizedYearIRI = IRI.create("http://www.w3.org/2006/time#generalYear"); + private static IRI serviceIRI = IRI.create("https://w3id.org/saref#Service"); + private static IRI switchOnServiceIRI = IRI.create("https://w3id.org/saref#SwitchOnService"); + private static IRI stateIRI = IRI.create("https://w3id.org/saref#State"); + private static IRI multilevelStateIRI = IRI.create("https://w3id.org/saref#MultiLevelState"); + private static IRI onOffStateIRI = IRI.create("https://w3id.org/saref#OnOffState"); + private static IRI openCloseStateIRI = IRI.create("https://w3id.org/saref#OpenCloseState"); + private static IRI sssIRI = IRI.create("https://w3id.org/saref#StartStopState"); + private static IRI offStateIRI = IRI.create("https://w3id.org/saref#OffState"); + private static IRI onStateIRI = IRI.create("https://w3id.org/saref#OnState"); + private static IRI closeStateIRI = IRI.create("https://w3id.org/saref#CloseState"); + private static IRI openStateIRI = IRI.create("https://w3id.org/saref#OpenState"); + private static IRI startStateIRI = IRI.create("https://w3id.org/saref#StartState"); + private static IRI stopStateIRI = IRI.create("https://w3id.org/saref#StopState"); + private static IRI temporalDurationIRI = + IRI.create("http://www.w3.org/2006/time#TemporalDuration"); + private static IRI generalizeddurationdescriptionIRI = + IRI.create("http://www.w3.org/2006/time#GeneralDurationDescription"); + private static IRI temporalUnitIRI = IRI.create("http://www.w3.org/2006/time#TemporalUnit"); + private static IRI timeDurationIRI = IRI.create("http://www.w3.org/2006/time#Duration"); + private static IRI durationDescriptionIRI = + IRI.create("http://www.w3.org/2006/time#DurationDescription"); + private static IRI yearIRI = IRI.create("http://www.w3.org/2006/time#Year"); + private static IRI unitOfmeasureIRI = IRI.create("https://w3id.org/saref#UnitOfMeasure"); + private static IRI temporalEntityIRI = IRI.create("http://www.w3.org/2006/time#TemporalEntity"); + private static IRI timeInstantIRI = IRI.create("http://www.w3.org/2006/time#Instant"); + private static IRI properIntervalIRI = IRI.create("http://www.w3.org/2006/time#ProperInterval"); + private static IRI dateTimeIntervalIRI = + IRI.create("http://www.w3.org/2006/time#DateTimeInterval"); + private static IRI timeIntervalIRI = IRI.create("http://www.w3.org/2006/time#Interval"); + private static IRI temporalpositionIRI = + IRI.create("http://www.w3.org/2006/time#TemporalPosition"); + private static IRI gDateTimeDescriptionIRI = + IRI.create("http://www.w3.org/2006/time#GeneralDateTimeDescription"); + private static IRI timePositonIRI = IRI.create("http://www.w3.org/2006/time#TimePosition"); + private static IRI dateTimeDescriptionIRI = + IRI.create("http://www.w3.org/2006/time#DateTimeDescription"); + private static IRI monthOfTheYearIRI = IRI.create("http://www.w3.org/2006/time#MonthOfYear"); + private static IRI januaryIRI = IRI.create("http://www.w3.org/2006/time#January"); + private static IRI currencyIRI = IRI.create("https://w3id.org/saref#Currency"); + private static IRI energyUnitIRI = IRI.create("https://w3id.org/saref#EnergyUnit"); + private static IRI illuminanceUnitIRI = IRI.create("https://w3id.org/saref#IlluminanceUnit"); + private static IRI powerUnitIRI = IRI.create("https://w3id.org/saref#PowerUnit"); + private static IRI pressureUnitIRI = IRI.create("https://w3id.org/saref#PressureUnit"); + private static IRI actsUponIRI = IRI.create("https://w3id.org/saref#actsUpon"); + private static IRI accomplishesIRI = IRI.create("https://w3id.org/saref#accomplishes"); + private static IRI consistsOfIRI = IRI.create("https://w3id.org/saref#consistsOf"); + private static IRI isCommandOfIRI = IRI.create("https://w3id.org/saref#isCommandOf"); + private static IRI hasDescriptionIRI = IRI.create("https://w3id.org/saref#hasDescription"); + private static IRI openIRI = IRI.create("https://w3id.org/saref#Open"); + private static IRI pauseIRI = IRI.create("https://w3id.org/saref#Pause"); + private static IRI profileIRI = IRI.create("https://w3id.org/saref#Profile"); + private static IRI measuresPropertyIRI = IRI.create("https://w3id.org/saref#measuresProperty"); + private static IRI closeIRI = IRI.create("https://w3id.org/saref#Close"); + private static IRI getCurrentMeterValueIRI = + IRI.create("https://w3id.org/saref#GetCurrentMeterValue"); + private static IRI getMeterDataIRI = IRI.create("https://w3id.org/saref#GetMeterData"); + private static IRI getMeterHistoryIRI = IRI.create("https://w3id.org/saref#GetMeterHistory"); + private static IRI getSensingDataIRI = IRI.create("https://w3id.org/saref#GetSensingData"); + private static IRI notifyIRI = IRI.create("https://w3id.org/saref#Notify"); + private static IRI offIRI = IRI.create("https://w3id.org/saref#Off"); + private static IRI onIRI = IRI.create("https://w3id.org/saref#On"); + private static IRI setAbsoluteLevelIRI = IRI.create("https://w3id.org/saref#SetAbsoluteLevel"); + private static IRI setRelativeLevelIRI = IRI.create("https://w3id.org/saref#SetRelativeLevel"); + private static IRI startIRI = IRI.create("https://w3id.org/saref#Start"); + private static IRI stepDownIRI = IRI.create("https://w3id.org/saref#StepDown"); + private static IRI stepUpIRI = IRI.create("https://w3id.org/saref#StepUp"); + private static IRI stopIRI = IRI.create("https://w3id.org/saref#Stop"); + private static IRI toggleIRI = IRI.create("https://w3id.org/saref#Toggle"); + private static IRI controlsPropertyIRI = IRI.create("https://w3id.org/saref#controlsProperty"); + private static IRI hasFunctionIRI = IRI.create("https://w3id.org/saref#hasFunction"); + private static IRI hasProfileIRI = IRI.create("https://w3id.org/saref#hasProfile"); + private static IRI hasStateIRI = IRI.create("https://w3id.org/saref#hasState"); + private static IRI hasTypicalConsumptionIRI = + IRI.create("https://w3id.org/saref#hasTypicalConsumption"); + private static IRI isusedForIRI = IRI.create("https://w3id.org/saref#isUsedFor"); + private static IRI commodityIRI = IRI.create("https://w3id.org/saref#Commodity"); + private static IRI makesMeasurementIRI = IRI.create("https://w3id.org/saref#makesMeasurement"); + private static IRI measurementIRI = IRI.create("https://w3id.org/saref#Measurement"); + private static IRI offersIRI = IRI.create("https://w3id.org/saref#offers"); + private static IRI taskIRI = IRI.create("https://w3id.org/saref#Task"); + private static IRI hasManufacturerIRI = IRI.create("https://w3id.org/saref#hasManufacturer"); + private static IRI hasModelIRI = IRI.create("https://w3id.org/saref#hasModel"); + private static IRI washingIRI = IRI.create("https://w3id.org/saref#Washing"); + private static IRI safetyIRI = IRI.create("https://w3id.org/saref#Safety"); + private static IRI lightingIRI = IRI.create("https://w3id.org/saref#Lighting"); + private static IRI comfortIRI = IRI.create("https://w3id.org/saref#Comfort"); + private static IRI meterReadingIRI = IRI.create("https://w3id.org/saref#MeterReading"); + private static IRI energyEfficiencyIRI = IRI.create("https://w3id.org/saref#EnergyEfficiency"); + private static IRI entertainmentIRI = IRI.create("https://w3id.org/saref#Entertainment"); + private static IRI hasCommandIRI = IRI.create("https://w3id.org/saref#hasCommand"); + private static IRI hasThresholdMeasurementIRI = + IRI.create("https://w3id.org/saref#hasThresholdMeasurement"); + + /* + * creating ZClasses for IRI's. + */ + ZClass zPressureUnit = olgaVisitor.getMapIRI_to_Zclass().get(pressureUnitIRI); + ZClass zPowerUnit = olgaVisitor.getMapIRI_to_Zclass().get(powerUnitIRI); + ZClass zIlluminanceUnit = olgaVisitor.getMapIRI_to_Zclass().get(illuminanceUnitIRI); + ZClass zEnergyUnit = olgaVisitor.getMapIRI_to_Zclass().get(energyUnitIRI); + ZClass zCurrency = olgaVisitor.getMapIRI_to_Zclass().get(currencyIRI); + ZClass zJanuary = olgaVisitor.getMapIRI_to_Zclass().get(januaryIRI); + ZClass zmonthOfTheYear = olgaVisitor.getMapIRI_to_Zclass().get(monthOfTheYearIRI); + ZClass zDateTimeDescription = olgaVisitor.getMapIRI_to_Zclass().get(dateTimeDescriptionIRI); + ZClass zTimePosition = olgaVisitor.getMapIRI_to_Zclass().get(timePositonIRI); + ZClass zGDTDescription = olgaVisitor.getMapIRI_to_Zclass().get(gDateTimeDescriptionIRI); + ZClass zTimeIntevral = olgaVisitor.getMapIRI_to_Zclass().get(timeIntervalIRI); + ZClass zDateTimeIntevral = olgaVisitor.getMapIRI_to_Zclass().get(dateTimeIntervalIRI); + ZClass zProperIntevral = olgaVisitor.getMapIRI_to_Zclass().get(properIntervalIRI); + ZClass ztimeInstant = olgaVisitor.getMapIRI_to_Zclass().get(timeInstantIRI); + ZClass zYear = olgaVisitor.getMapIRI_to_Zclass().get(yearIRI); + ZClass zDurationDescription = olgaVisitor.getMapIRI_to_Zclass().get(durationDescriptionIRI); + ZClass ztimeDuration = olgaVisitor.getMapIRI_to_Zclass().get(timeDurationIRI); + ZClass ztemporalUnit = olgaVisitor.getMapIRI_to_Zclass().get(temporalUnitIRI); + ZClass zgeneralizeddurationdescription = + olgaVisitor.getMapIRI_to_Zclass().get(generalizeddurationdescriptionIRI); + ZClass zstartState = olgaVisitor.getMapIRI_to_Zclass().get(startStateIRI); + ZClass zstopState = olgaVisitor.getMapIRI_to_Zclass().get(stopStateIRI); + ZClass zOpenState = olgaVisitor.getMapIRI_to_Zclass().get(openStateIRI); + ZClass zCloseState = olgaVisitor.getMapIRI_to_Zclass().get(closeStateIRI); + ZClass zOnState = olgaVisitor.getMapIRI_to_Zclass().get(onStateIRI); + ZClass zOffState = olgaVisitor.getMapIRI_to_Zclass().get(offStateIRI); + ZClass zSSS = olgaVisitor.getMapIRI_to_Zclass().get(sssIRI); + ZClass zOpenCloseState = olgaVisitor.getMapIRI_to_Zclass().get(openCloseStateIRI); + ZClass zOnOffState = olgaVisitor.getMapIRI_to_Zclass().get(onOffStateIRI); + ZClass zmultiLevelState = olgaVisitor.getMapIRI_to_Zclass().get(multilevelStateIRI); + ZClass zswitchOnService = olgaVisitor.getMapIRI_to_Zclass().get(switchOnServiceIRI); + ZClass zgeneralizedYear = olgaVisitor.getMapIRI_to_Zclass().get(generalizedYearIRI); + ZClass zdateTimeStamp = olgaVisitor.getMapIRI_to_Zclass().get(dateTimeStampIRI); + ZClass zhumidity = olgaVisitor.getMapIRI_to_Zclass().get(humidityIRI); + ZClass ztime = olgaVisitor.getMapIRI_to_Zclass().get(timeIRI); + ZClass ztemperature = olgaVisitor.getMapIRI_to_Zclass().get(temperatureIRI); + ZClass zsmoke = olgaVisitor.getMapIRI_to_Zclass().get(smokeIRI); + ZClass zprice = olgaVisitor.getMapIRI_to_Zclass().get(priceIRI); + ZClass zpressure = olgaVisitor.getMapIRI_to_Zclass().get(pressureIRI); + ZClass zpower = olgaVisitor.getMapIRI_to_Zclass().get(powerIRI); + ZClass zoccupancy = olgaVisitor.getMapIRI_to_Zclass().get(occupancyIRI); + ZClass zmotion = olgaVisitor.getMapIRI_to_Zclass().get(motionIRI); + ZClass zlight = olgaVisitor.getMapIRI_to_Zclass().get(lightIRI); + ZClass zenergy = olgaVisitor.getMapIRI_to_Zclass().get(energyIRI); + ZClass zstartStopFunction = olgaVisitor.getMapIRI_to_Zclass().get(startStopFunctionIRI); + ZClass zopenCloseFunction = olgaVisitor.getMapIRI_to_Zclass().get(openCloseFunctionIRI); + ZClass zonOffFunction = olgaVisitor.getMapIRI_to_Zclass().get(onOffFunctionIRI); + ZClass zlevelcontrolfunction = olgaVisitor.getMapIRI_to_Zclass().get(levelControlFunctionIRI); + ZClass zsensingfunction = olgaVisitor.getMapIRI_to_Zclass().get(sensingFunctionIRI); + ZClass zmeteringfunction = olgaVisitor.getMapIRI_to_Zclass().get(meteringFunctionIRI); + ZClass zeventfunction = olgaVisitor.getMapIRI_to_Zclass().get(eventFunctionIRI); + ZClass zactuatingfunction = olgaVisitor.getMapIRI_to_Zclass().get(actuatingFunctionIRI); + ZClass zfunction = olgaVisitor.getMapIRI_to_Zclass().get(functionIRI); + ZClass ztemperaturesensor = olgaVisitor.getMapIRI_to_Zclass().get(temperatureSensorIRI); + ZClass zsmokesensor = olgaVisitor.getMapIRI_to_Zclass().get(smokeSensorIRI); + ZClass zenergyMeter = olgaVisitor.getMapIRI_to_Zclass().get(energyMeterIRI); + ZClass zligthswitch = olgaVisitor.getMapIRI_to_Zclass().get(lightSwitchIRI); + ZClass zdoorswitch = olgaVisitor.getMapIRI_to_Zclass().get(doorSwitchIRI); + ZClass zswitch = olgaVisitor.getMapIRI_to_Zclass().get(switchIRI); + ZClass zsensor = olgaVisitor.getMapIRI_to_Zclass().get(sensorkIRI); + ZClass znetwork = olgaVisitor.getMapIRI_to_Zclass().get(networkIRI); + ZClass zmultimedia = olgaVisitor.getMapIRI_to_Zclass().get(multimediaIRI); + ZClass zmicroRenewable = olgaVisitor.getMapIRI_to_Zclass().get(microRenewableIRI); + ZClass zmeter = olgaVisitor.getMapIRI_to_Zclass().get(meterIRI); + ZClass zlightingDevice = olgaVisitor.getMapIRI_to_Zclass().get(lightingDeviceIRI); + ZClass zhvac = olgaVisitor.getMapIRI_to_Zclass().get(hvacIRI); + ZClass zActuator = olgaVisitor.getMapIRI_to_Zclass().get(actuatorIRI); + ZClass zAppliance = olgaVisitor.getMapIRI_to_Zclass().get(applianceIRI); + ZClass zwashingMachine = olgaVisitor.getMapIRI_to_Zclass().get(washingMachineIRI); + ZClass zstorage = olgaVisitor.getMapIRI_to_Zclass().get(storageIRI); + ZClass zload = olgaVisitor.getMapIRI_to_Zclass().get(loadIRI); + ZClass zGenerator = olgaVisitor.getMapIRI_to_Zclass().get(generatorIRI); + ZClass zFunctionRelated = olgaVisitor.getMapIRI_to_Zclass().get(functionRelatedIRI); + ZClass zEnergyRelated = olgaVisitor.getMapIRI_to_Zclass().get(energyRelatedIRI); + ZClass zBuildingRelated = olgaVisitor.getMapIRI_to_Zclass().get(buildingRelatedIRI); + ZClass zDevice = olgaVisitor.getMapIRI_to_Zclass().get(deviceIRI); + ZClass zSetAbsoluteLevelCommand = + olgaVisitor.getMapIRI_to_Zclass().get(setAbsoluteLevelCommandIRI); + ZClass zSetRelativeLevelCommand = + olgaVisitor.getMapIRI_to_Zclass().get(setRelativeLevelCommandIRI); + ZClass zGetCurrentMeterValueCommand = + olgaVisitor.getMapIRI_to_Zclass().get(getCurrentMeterValueCommandIRI); + ZClass zGetMeterDataCommand = olgaVisitor.getMapIRI_to_Zclass().get(getMeterDataCommandIRI); + ZClass zGetMeterHistoryCommand = olgaVisitor.getMapIRI_to_Zclass().get(getMeterHistoryCommandIRI); + ZClass zGGetSensingDataCommand = olgaVisitor.getMapIRI_to_Zclass().get(getSensingDataCommandIRI); + ZClass zcommand = olgaVisitor.getMapIRI_to_Zclass().get(commandIRI); + ZClass zCloseCommand = olgaVisitor.getMapIRI_to_Zclass().get(closeCommandIRI); + ZClass zgetCommand = olgaVisitor.getMapIRI_to_Zclass().get(getCommandIRI); + ZClass znotifyCommand = olgaVisitor.getMapIRI_to_Zclass().get(notifyCommandIRI); + ZClass zOffCommand = olgaVisitor.getMapIRI_to_Zclass().get(offCommandIRI); + ZClass zonCommand = olgaVisitor.getMapIRI_to_Zclass().get(onCommandIRI); + ZClass zopenCommand = olgaVisitor.getMapIRI_to_Zclass().get(openCommandIRI); + ZClass zpauseCommand = olgaVisitor.getMapIRI_to_Zclass().get(pauseCommandIRI); + ZClass zSetLevelCommand = olgaVisitor.getMapIRI_to_Zclass().get(setLevelCommandIRI); + ZClass zstartCommand = olgaVisitor.getMapIRI_to_Zclass().get(startCommandIRI); + ZClass zstepDownCommand = olgaVisitor.getMapIRI_to_Zclass().get(stepDownCommandIRI); + ZClass zstepUpCommand = olgaVisitor.getMapIRI_to_Zclass().get(stepUpCommandIRI); + ZClass zstopCommand = olgaVisitor.getMapIRI_to_Zclass().get(stopCommandIRI); + ZClass ztoggleCommand = olgaVisitor.getMapIRI_to_Zclass().get(toggleCommandIRI); + + static OLGAVisitor olgaVisitor; + + /* + * launching the OLGA + */ + @BeforeClass + public static void setUpBeforeClass() { + + String test_ont = new File(".").getAbsolutePath() + + "/src/test/resources/complexOntologiesModified/sarefMergedModifiedForTest.owl"; + OWLOntologyManager owlManager = OWLManager.createOWLOntologyManager(); + File test_ontFile = new File(test_ont); + try { + OWLOntology test_ontology_to_visit = + owlManager.loadOntologyFromOntologyDocument(test_ontFile); + olgaVisitor = new OLGAVisitor(test_ontology_to_visit, CODE.C_SHARP, LIBRARY.TRINITY, false); + olgaVisitor.visit(); + } catch (OWLOntologyCreationException e) { + e.printStackTrace(); + } + + } + + /* + * Testing the total numbers of the classes in ontology. + */ + @Test + public void testSize() { + assertEquals(olgaVisitor.getMapIRI_to_Zclass().entrySet().size(), 116); + + } + + /* + * Testing subclasses of the command class + */ + @Test + public void testCommandSubClasses() { + List subClassList = new ArrayList(); + subClassList.add(zCloseCommand); + subClassList.add(zgetCommand); + subClassList.add(zOffCommand); + subClassList.add(zonCommand); + subClassList.add(zopenCommand); + subClassList.add(zpauseCommand); + subClassList.add(zSetLevelCommand); + subClassList.add(zstartCommand); + subClassList.add(zstepUpCommand); + subClassList.add(zstopCommand); + subClassList.add(ztoggleCommand); + subClassList.add(zstepDownCommand); + for (int i = 0; i < subClassList.size(); i++) { + assertEquals(subClassList.get(i).getSuperZClassList().get(0).getIri(), commandIRI); + + } + + } + + @Test + public void testGetCommandSubClasses() { + List subClassList = new ArrayList(); + subClassList.add(zGetCurrentMeterValueCommand); + subClassList.add(zGetMeterDataCommand); + subClassList.add(zGetMeterHistoryCommand); + subClassList.add(zGGetSensingDataCommand); + for (int i = 0; i < subClassList.size(); i++) { + assertEquals(subClassList.get(i).getSuperZClassList().get(0).getIri(), getCommandIRI); + } + } + + @Test + public void testSetLevelCommandSubClasses() { + List subClassList = new ArrayList(); + subClassList.add(zSetAbsoluteLevelCommand); + subClassList.add(zSetRelativeLevelCommand); + for (int i = 0; i < subClassList.size(); i++) { + assertEquals(subClassList.get(i).getSuperZClassList().get(0).getIri(), setLevelCommandIRI); + } + } + + @Test + public void testDeviceSubClasses() { + List subClassList = new ArrayList(); + subClassList.add(zBuildingRelated); + subClassList.add(zEnergyRelated); + subClassList.add(zFunctionRelated); + for (int i = 0; i < subClassList.size(); i++) { + assertEquals(subClassList.get(i).getSuperZClassList().get(0).getIri(), deviceIRI); + } + } + + @Test + public void testEnergyRelatedSubClasses() { + List subClassList = new ArrayList(); + subClassList.add(zGenerator); + subClassList.add(zload); + subClassList.add(zstorage); + for (int i = 0; i < subClassList.size(); i++) { + assertEquals(subClassList.get(i).getSuperZClassList().get(0).getIri(), energyRelatedIRI); + } + } + + @Test + public void testWashingMachineSubClasses() { + List parents = zwashingMachine.getSuperZClassList(); + assertEquals(parents.size(), 2); + assertTrue(parents.stream().anyMatch(p -> p.getIri().equals(loadIRI))); + assertTrue(parents.stream().anyMatch(p -> p.getIri().equals(applianceIRI))); + } + + @Test + public void testFunctionRelatedSubClasses() { + List subClassList = new ArrayList(); + subClassList.add(zActuator); + subClassList.add(zAppliance); + subClassList.add(zhvac); + subClassList.add(zlightingDevice); + subClassList.add(zmeter); + subClassList.add(zmicroRenewable); + subClassList.add(zmultimedia); + subClassList.add(znetwork); + subClassList.add(zsensor); + for (int i = 0; i < subClassList.size(); i++) { + assertEquals(subClassList.get(i).getSuperZClassList().get(0).getIri(), functionRelatedIRI); + } + } + + @Test + public void testSwitchSubClasses() { + assertEquals(zswitch.getSuperZClassList().size(), 1); + assertEquals(zswitch.getSuperZClassList().get(0).getIri(), actuatorIRI); + List subClassList = new ArrayList(); + subClassList.add(zdoorswitch); + subClassList.add(zligthswitch); + + for (int i = 0; i < subClassList.size(); i++) { + assertEquals(subClassList.get(i).getSuperZClassList().get(0).getIri(), switchIRI); + } + } + + @Test + public void testMeterSubClasses() { + assertEquals(zenergyMeter.getSuperZClassList().size(), 1); + assertEquals(zenergyMeter.getSuperZClassList().get(0).getIri(), meterIRI); + } + + @Test + public void testSensorSubClasses() { + List subClassList = new ArrayList(); + subClassList.add(zsmokesensor); + subClassList.add(ztemperaturesensor); + + for (int i = 0; i < subClassList.size(); i++) { + assertEquals(subClassList.get(i).getSuperZClassList().get(0).getIri(), sensorkIRI); + } + } + + @Test + public void testFunctionSubClasses() { + List subClassList = new ArrayList(); + subClassList.add(zactuatingfunction); + subClassList.add(zeventfunction); + subClassList.add(zmeteringfunction); + subClassList.add(zsensingfunction); + for (int i = 0; i < subClassList.size(); i++) { + assertEquals(subClassList.get(i).getSuperZClassList().get(0).getIri(), functionIRI); + } + } + + @Test + public void testActuatingFunctionSubClasses() { + List subClassList = new ArrayList(); + subClassList.add(zlevelcontrolfunction); + subClassList.add(zonOffFunction); + subClassList.add(zopenCloseFunction); + subClassList.add(zstartStopFunction); + for (int i = 0; i < subClassList.size(); i++) { + assertEquals(subClassList.get(i).getSuperZClassList().get(0).getIri(), actuatingFunctionIRI); + } + } + + @Test + public void testPropertySubClasses() { + List subClassList = new ArrayList(); + subClassList.add(zenergy); + subClassList.add(zhumidity); + subClassList.add(zlight); + subClassList.add(zmotion); + subClassList.add(zoccupancy); + subClassList.add(zpower); + subClassList.add(zpressure); + subClassList.add(zprice); + subClassList.add(zsmoke); + subClassList.add(ztemperature); + subClassList.add(ztime); + for (int i = 0; i < subClassList.size(); i++) { + assertEquals(subClassList.get(i).getSuperZClassList().get(0).getIri(), propertyIRI); + } + } + + @Test + public void testLiteralSubClasses() { + assertEquals(zdateTimeStamp.getSuperZClassList().size(), 1); + assertEquals(zdateTimeStamp.getSuperZClassList().get(0).getIri(), literalIRI); + } + + @Test + public void testResourcesSubClasses() { + assertEquals(zgeneralizedYear.getSuperZClassList().size(), 1); + assertEquals(zgeneralizedYear.getSuperZClassList().get(0).getIri(), resourcesIRI); + } + + @Test + public void testServiceSubClasses() { + assertEquals(zswitchOnService.getSuperZClassList().size(), 1); + assertEquals(zswitchOnService.getSuperZClassList().get(0).getIri(), serviceIRI); + } + + @Test + public void testStateSubClasses() { + List subClassList = new ArrayList(); + subClassList.add(zmultiLevelState); + subClassList.add(zOnOffState); + subClassList.add(zOpenCloseState); + subClassList.add(zSSS); + for (int i = 0; i < subClassList.size(); i++) { + assertEquals(subClassList.get(i).getSuperZClassList().get(0).getIri(), stateIRI); + } + } + + @Test + public void testOnOffStateSubClasses() { + List subClassList = new ArrayList(); + subClassList.add(zOnState); + subClassList.add(zOffState); + for (int i = 0; i < subClassList.size(); i++) { + assertEquals(subClassList.get(i).getSuperZClassList().get(0).getIri(), onOffStateIRI); + } + } + + @Test + public void testOpenCloseStateSubClasses() { + List subClassList = new ArrayList(); + subClassList.add(zOpenState); + subClassList.add(zCloseState); + for (int i = 0; i < subClassList.size(); i++) { + assertEquals(subClassList.get(i).getSuperZClassList().get(0).getIri(), openCloseStateIRI); + } + } + + @Test + public void testStartStopStateSubClasses() { + List subClassList = new ArrayList(); + subClassList.add(zstartState); + subClassList.add(zstopState); + for (int i = 0; i < subClassList.size(); i++) { + assertEquals(subClassList.get(i).getSuperZClassList().get(0).getIri(), sssIRI); + } + } + + @Test + public void testTemporalDurationSubClasses() { + List subClassList = new ArrayList(); + subClassList.add(zgeneralizeddurationdescription); + subClassList.add(ztimeDuration); + + for (int i = 0; i < subClassList.size(); i++) { + assertEquals(subClassList.get(i).getSuperZClassList().get(0).getIri(), temporalDurationIRI); + } + } + + @Test + public void testGeneralizedDurationDescriptionSubClasses() { + assertEquals(zDurationDescription.getSuperZClassList().size(), 1); + assertEquals(zDurationDescription.getSuperZClassList().get(0).getIri(), + generalizeddurationdescriptionIRI); + } + + @Test + public void testDurationDescriptionSubClasses() { + assertEquals(zYear.getSuperZClassList().size(), 1); + assertEquals(zYear.getSuperZClassList().get(0).getIri(), durationDescriptionIRI); + } + + @Test + public void testTemporalUnitParentClasses() { + List parents = ztemporalUnit.getSuperZClassList(); + assertEquals(parents.size(), 2); + assertTrue(parents.stream().anyMatch(p -> p.getIri().equals(temporalDurationIRI))); + assertTrue(parents.stream().anyMatch(p -> p.getIri().equals(unitOfmeasureIRI))); + } + + @Test + public void testTemporalEntitySubClasses() { + List subClassList = new ArrayList(); + subClassList.add(ztimeInstant); + subClassList.add(zTimeIntevral); + for (int i = 0; i < subClassList.size(); i++) { + assertEquals(subClassList.get(i).getSuperZClassList().get(0).getIri(), temporalEntityIRI); + } + + } + + @Test + public void testTimeInstantSubClasses() { + assertEquals(zProperIntevral.getSuperZClassList().size(), 1); + assertEquals(zProperIntevral.getSuperZClassList().get(0).getIri(), timeIntervalIRI); + } + + @Test + public void testTimeIntervalSubClasses() { + assertEquals(zDateTimeIntevral.getSuperZClassList().size(), 1); + assertEquals(zDateTimeIntevral.getSuperZClassList().get(0).getIri(), properIntervalIRI); + } + + @Test + public void testTemporalPositonSubClasses() { + List subClassList = new ArrayList(); + subClassList.add(zGDTDescription); + subClassList.add(zTimePosition); + for (int i = 0; i < subClassList.size(); i++) { + assertEquals(subClassList.get(i).getSuperZClassList().get(0).getIri(), temporalpositionIRI); + } + } + + @Test + public void testdateTimeDescriptionSubClasses() { + assertEquals(zDateTimeDescription.getSuperZClassList().size(), 1); + assertEquals(zDateTimeDescription.getSuperZClassList().get(0).getIri(), + gDateTimeDescriptionIRI); + } + + @Test + public void testDateTimeDescriptionSubClasses() { + List subClassList = new ArrayList(); + subClassList.add(zmonthOfTheYear); + subClassList.add(zJanuary); + for (int i = 0; i < subClassList.size(); i++) { + assertEquals(subClassList.get(i).getSuperZClassList().get(0).getIri(), + dateTimeDescriptionIRI); + } + + } + + @Test + public void testUnitOfMeasureSubClasses() { + List subClassList = new ArrayList(); + subClassList.add(zCurrency); + subClassList.add(zEnergyUnit); + subClassList.add(zIlluminanceUnit); + subClassList.add(zPowerUnit); + subClassList.add(zPressureUnit); + for (int i = 0; i < subClassList.size(); i++) { + assertEquals(subClassList.get(i).getSuperZClassList().get(0).getIri(), unitOfmeasureIRI); + } + } + + /* + * testing all Properties of the classes + */ + private List findObjectPropertyByIRI(IRI iriTofind, + List listToSearchIn) { + List newList = new ArrayList<>(); + + for (ZObjectProperty currentProperty : listToSearchIn) { + if (currentProperty.getObjectProperty().equals(iriTofind)) { + newList.add(currentProperty); + } + } + + return newList; + } + + private List findZDataPropertyItemByIRI(IRI iriTofind, + List listToSearchIn) { + List newList = new ArrayList<>(); + + for (ZDataProperty currentDataProperty : listToSearchIn) { + if (currentDataProperty.getDataProperty().equals(iriTofind)) { + newList.add(currentDataProperty); + } + } + + return newList; + + } + + private List findZinstanceItemByIRI(IRI iriTofind, List listToSearchIn) { + List newList = new ArrayList<>(); + + for (ZInstance currentInstance : listToSearchIn) { + if (currentInstance.getIri().equals(iriTofind)) { + newList.add(currentInstance); + } + } + + return newList; + } + + @Test + public void testCommandProperties() { + List dataProperList = zcommand.getZDataPropertyList(); + assertEquals(dataProperList.size(), 1); + List FilterByIRI = findZDataPropertyItemByIRI(hasDescriptionIRI, dataProperList); + assertEquals(FilterByIRI.size(), 1); + assertEquals(((ZDataProperty) FilterByIRI.get(0)).getRangeXSDType(), "string"); + + List isCommand = + findObjectPropertyByIRI(isCommandOfIRI, zcommand.getZObjectPropertyList()); + assertEquals(isCommand.size(), 1); + assertEquals(isCommand.get(0).getRangeListZClasses().iterator().next().getKey().getIri(), + functionIRI); + + List actsUpon = + findObjectPropertyByIRI(actsUponIRI, zcommand.getZObjectPropertyList()); + assertEquals(actsUpon.size(), 1); + assertEquals(actsUpon.get(0).getRangeListZClasses().iterator().next().getKey().getIri(), + stateIRI); + + } + + @Test + public void testGettingDataPropertyByIRI() { + List dataProperList = + zcommand.getZDataPropertyItem(hasDescriptionIRI.getIRIString()); + assertEquals(dataProperList.size(), 1); + List FilterByIRI = findZDataPropertyItemByIRI(hasDescriptionIRI, dataProperList); + assertEquals(FilterByIRI.size(), 1); + assertEquals(((ZDataProperty) FilterByIRI.get(0)).getRangeXSDType(), "string"); + + List isCommand = + findObjectPropertyByIRI(isCommandOfIRI, zcommand.getZObjectPropertyList()); + assertEquals(isCommand.size(), 1); + assertEquals(isCommand.get(0).getRangeListZClasses().iterator().next().getKey().getIri(), + functionIRI); + + List actsUpon = + findObjectPropertyByIRI(actsUponIRI, zcommand.getZObjectPropertyList()); + assertEquals(actsUpon.size(), 1); + assertEquals(actsUpon.get(0).getRangeListZClasses().iterator().next().getKey().getIri(), + stateIRI); + + } + + @Test + public void testCloseCommandProperties() { + List actsUpon = + findObjectPropertyByIRI(actsUponIRI, zCloseCommand.getZObjectPropertyList()); + assertEquals(actsUpon.size(), 1); + assertEquals(actsUpon.get(0).getRangeListZClasses().iterator().next().getKey().getIri(), + openCloseStateIRI); + + List ZinstanceList = zCloseCommand.getListZInstanceIRI(); + assertEquals(ZinstanceList.size(), 1); + List Close = findZinstanceItemByIRI(closeIRI, ZinstanceList); + assertEquals(Close.size(), 1); + } + + @Test + public void testGetCurrentMeterValueCommandProperties() { + List ZinstanceList = zGetCurrentMeterValueCommand.getListZInstanceIRI(); + assertEquals(ZinstanceList.size(), 1); + List GCMValue = findZinstanceItemByIRI(getCurrentMeterValueIRI, ZinstanceList); + assertEquals(GCMValue.size(), 1); + + } + + @Test + public void testGetMeterDataCommandProperties() { + List ZinstanceList = zGetMeterDataCommand.getListZInstanceIRI(); + assertEquals(ZinstanceList.size(), 1); + List getMeterData = findZinstanceItemByIRI(getMeterDataIRI, ZinstanceList); + assertEquals(getMeterData.size(), 1); + + } + + @Test + public void testGetMeterHistoryCommandProperties() { + List ZinstanceList = zGetMeterHistoryCommand.getListZInstanceIRI(); + assertEquals(ZinstanceList.size(), 1); + List getMeterHistory = findZinstanceItemByIRI(getMeterHistoryIRI, ZinstanceList); + assertEquals(getMeterHistory.size(), 1); + + } + + @Test + public void testGetSensingDataCommandProperties() { + List ZinstanceList = zGGetSensingDataCommand.getListZInstanceIRI(); + assertEquals(ZinstanceList.size(), 1); + List getSensingData = findZinstanceItemByIRI(getSensingDataIRI, ZinstanceList); + assertEquals(getSensingData.size(), 1); + + } + + @Test + public void testNotifyCommandProperties() { + List ZinstanceList = znotifyCommand.getListZInstanceIRI(); + assertEquals(ZinstanceList.size(), 1); + List notify = findZinstanceItemByIRI(notifyIRI, ZinstanceList); + assertEquals(notify.size(), 1); + + } + + @Test + public void testOffCommandProperties() { + List ZinstanceList = zOffCommand.getListZInstanceIRI(); + assertEquals(ZinstanceList.size(), 1); + List Off = findZinstanceItemByIRI(offIRI, ZinstanceList); + assertEquals(Off.size(), 1); + List actsUpon = + findObjectPropertyByIRI(actsUponIRI, zOffCommand.getZObjectPropertyList()); + assertEquals(actsUpon.size(), 1); + assertEquals(actsUpon.get(0).getRangeListZClasses().iterator().next().getKey().getIri(), + onOffStateIRI); + } + + @Test + public void testOnCommandProperties() { + List ZinstanceList = zonCommand.getListZInstanceIRI(); + assertEquals(ZinstanceList.size(), 1); + List On = findZinstanceItemByIRI(onIRI, ZinstanceList); + assertEquals(On.size(), 1); + + List actsUpon = + findObjectPropertyByIRI(actsUponIRI, zonCommand.getZObjectPropertyList()); + assertEquals(actsUpon.size(), 1); + assertEquals(actsUpon.get(0).getRangeListZClasses().iterator().next().getKey().getIri(), + onOffStateIRI); + } + + @Test + public void testOpenCommandProperties() { + List ZinstanceList = zopenCommand.getListZInstanceIRI(); + assertEquals(ZinstanceList.size(), 1); + List Open = findZinstanceItemByIRI(openIRI, ZinstanceList); + assertEquals(Open.size(), 1); + + List actsUpon = + findObjectPropertyByIRI(actsUponIRI, zopenCommand.getZObjectPropertyList()); + assertEquals(actsUpon.size(), 1); + assertEquals(actsUpon.get(0).getRangeListZClasses().iterator().next().getKey().getIri(), + openCloseStateIRI); + } + + @Test + public void testPauseCommandProperties() { + List ZinstanceList = zpauseCommand.getListZInstanceIRI(); + assertEquals(ZinstanceList.size(), 1); + List setAbsoluteLevel = findZinstanceItemByIRI(pauseIRI, ZinstanceList); + assertEquals(setAbsoluteLevel.size(), 1); + } + + @Test + public void testSetAbsoluteLevelCommandProperties() { + List ZinstanceList = zSetAbsoluteLevelCommand.getListZInstanceIRI(); + assertEquals(ZinstanceList.size(), 1); + List setAbsoluteLevel = findZinstanceItemByIRI(setAbsoluteLevelIRI, ZinstanceList); + assertEquals(setAbsoluteLevel.size(), 1); + } + + @Test + public void testSetRelativeLevelCommandProperties() { + List ZinstanceList = zSetRelativeLevelCommand.getListZInstanceIRI(); + assertEquals(ZinstanceList.size(), 1); + List setRelativeLevel = findZinstanceItemByIRI(setRelativeLevelIRI, ZinstanceList); + assertEquals(setRelativeLevel.size(), 1); + } + + @Test + public void testStartCommandProperties() { + List ZinstanceList = zstartCommand.getListZInstanceIRI(); + assertEquals(ZinstanceList.size(), 1); + List start = findZinstanceItemByIRI(startIRI, ZinstanceList); + assertEquals(start.size(), 1); + + List actsUpon = + findObjectPropertyByIRI(actsUponIRI, zstartCommand.getZObjectPropertyList()); + assertEquals(actsUpon.size(), 1); + assertEquals(actsUpon.get(0).getRangeListZClasses().iterator().next().getKey().getIri(), + sssIRI); + } + + @Test + public void testStepDownCommandProperties() { + List ZinstanceList = zstepDownCommand.getListZInstanceIRI(); + assertEquals(ZinstanceList.size(), 1); + List stepDown = findZinstanceItemByIRI(stepDownIRI, ZinstanceList); + assertEquals(stepDown.size(), 1); + + List actsUpon = + findObjectPropertyByIRI(actsUponIRI, zstepDownCommand.getZObjectPropertyList()); + assertEquals(actsUpon.size(), 1); + assertEquals(actsUpon.get(0).getRangeListZClasses().iterator().next().getKey().getIri(), + multilevelStateIRI); + } + + @Test + public void testStepUpCommandProperties() { + List ZinstanceList = zstepUpCommand.getListZInstanceIRI(); + assertEquals(ZinstanceList.size(), 1); + List stepUp = findZinstanceItemByIRI(stepUpIRI, ZinstanceList); + assertEquals(stepUp.size(), 1); + + List actsUpon = + findObjectPropertyByIRI(actsUponIRI, zstepDownCommand.getZObjectPropertyList()); + assertEquals(actsUpon.size(), 1); + assertEquals(actsUpon.get(0).getRangeListZClasses().iterator().next().getKey().getIri(), + multilevelStateIRI); + } + + @Test + public void testStopCommandProperties() { + List ZinstanceList = zstopCommand.getListZInstanceIRI(); + assertEquals(ZinstanceList.size(), 1); + List stepUp = findZinstanceItemByIRI(stopIRI, ZinstanceList); + assertEquals(stepUp.size(), 1); + + List actsUpon = + findObjectPropertyByIRI(actsUponIRI, zstopCommand.getZObjectPropertyList()); + assertEquals(actsUpon.size(), 1); + assertEquals(actsUpon.get(0).getRangeListZClasses().iterator().next().getKey().getIri(), + sssIRI); + } + + @Test + public void testToggleCommandProperties() { + List ZinstanceList = ztoggleCommand.getListZInstanceIRI(); + assertEquals(ZinstanceList.size(), 1); + List toggle = findZinstanceItemByIRI(toggleIRI, ZinstanceList); + assertEquals(toggle.size(), 1); + } + + @Test + public void testDeviceProperties() { + List objectProperList = zDevice.getZObjectPropertyList(); + assertEquals(objectProperList.size(), 11); + + List consistsOf = + findObjectPropertyByIRI(consistsOfIRI, zDevice.getZObjectPropertyList()); + assertEquals(consistsOf.size(), 1); + assertEquals(consistsOf.get(0).getRangeListZClasses().iterator().next().getKey().getIri(), + deviceIRI); + + List controlsProperty = + findObjectPropertyByIRI(controlsPropertyIRI, zDevice.getZObjectPropertyList()); + assertEquals(controlsProperty.size(), 1); + assertEquals(controlsProperty.get(0).getRangeListZClasses().iterator().next().getKey().getIri(), + propertyIRI); + + List hasFunction = + findObjectPropertyByIRI(hasFunctionIRI, zDevice.getZObjectPropertyList()); + assertEquals(hasFunction.size(), 1); + assertEquals(hasFunction.get(0).getRangeListZClasses().iterator().next().getKey().getIri(), + functionIRI); + + List hasProfile = + findObjectPropertyByIRI(hasProfileIRI, zDevice.getZObjectPropertyList()); + assertEquals(hasProfile.size(), 1); + assertEquals(hasProfile.get(0).getRangeListZClasses().iterator().next().getKey().getIri(), + profileIRI); + + List hasState = + findObjectPropertyByIRI(hasStateIRI, zDevice.getZObjectPropertyList()); + assertEquals(hasState.size(), 1); + assertEquals(hasState.get(0).getRangeListZClasses().iterator().next().getKey().getIri(), + stateIRI); + + List isUsedFor = + findObjectPropertyByIRI(isusedForIRI, zDevice.getZObjectPropertyList()); + assertEquals(isUsedFor.size(), 1); + assertEquals(isUsedFor.get(0).getRangeListZClasses().iterator().next().getKey().getIri(), + commodityIRI); + + List makesMeasurement = + findObjectPropertyByIRI(makesMeasurementIRI, zDevice.getZObjectPropertyList()); + assertEquals(makesMeasurement.size(), 1); + assertEquals(makesMeasurement.get(0).getRangeListZClasses().iterator().next().getKey().getIri(), + measurementIRI); + + List accomplishes = + findObjectPropertyByIRI(accomplishesIRI, zDevice.getZObjectPropertyList()); + assertEquals(accomplishes.size(), 1); + assertEquals(accomplishes.get(0).getRangeListZClasses().iterator().next().getKey().getIri(), + taskIRI); + + List offers = + findObjectPropertyByIRI(offersIRI, zDevice.getZObjectPropertyList()); + assertEquals(offers.size(), 1); + assertEquals(offers.get(0).getRangeListZClasses().iterator().next().getKey().getIri(), + serviceIRI); + + List dataProperList = zDevice.getZDataPropertyList(); + assertEquals(dataProperList.size(), 3); + List FilterByIRI = findZDataPropertyItemByIRI(hasDescriptionIRI, dataProperList); + assertEquals(FilterByIRI.size(), 1); + assertEquals(((ZDataProperty) FilterByIRI.get(0)).getRangeXSDType(), "string"); + List hasManufacturer = + findZDataPropertyItemByIRI(hasManufacturerIRI, dataProperList); + assertEquals(hasManufacturer.size(), 1); + assertEquals(((ZDataProperty) hasManufacturer.get(0)).getRangeXSDType(), "string"); + + List hasModel = findZDataPropertyItemByIRI(hasModelIRI, dataProperList); + assertEquals(hasModel.size(), 1); + assertEquals(((ZDataProperty) hasModel.get(0)).getRangeXSDType(), "string"); + + } + + @Test + public void testWashingMachineProperties() { + List objectProperList = zwashingMachine.getZObjectPropertyList(); + assertEquals(objectProperList.size(), 4); + List hasfunction = + findObjectPropertyByIRI(hasFunctionIRI, zwashingMachine.getZObjectPropertyList()); + assertEquals(hasfunction.size(), 1); + assertEquals(hasfunction.get(0).getRangeListZClasses().iterator().next().getKey().getIri(), + startStopFunctionIRI); + List hasprofile = + findObjectPropertyByIRI(hasProfileIRI, zwashingMachine.getZObjectPropertyList()); + assertEquals(hasprofile.size(), 1); + assertEquals(hasprofile.get(0).getRangeListZClasses().iterator().next().getKey().getIri(), + profileIRI); + + List hasState = + findObjectPropertyByIRI(hasStateIRI, zwashingMachine.getZObjectPropertyList()); + assertEquals(hasState.size(), 1); + assertEquals(hasState.get(0).getRangeListZClasses().iterator().next().getKey().getIri(), + sssIRI); + + List accomplishes = + findObjectPropertyByIRI(accomplishesIRI, zwashingMachine.getZObjectPropertyList()); + assertEquals(accomplishes.size(), 1); + assertEquals(accomplishes.get(0).getRangeListZInstances().iterator().next().getIri(), + washingIRI); + } + + @Test + public void testActuatorProperties() { + List objectProperList = zActuator.getZObjectPropertyList(); + assertEquals(objectProperList.size(), 1); + List hasfunction = + findObjectPropertyByIRI(hasFunctionIRI, zActuator.getZObjectPropertyList()); + assertEquals(hasfunction.size(), 1); + assertEquals(hasfunction.get(0).getRangeListZClasses().iterator().next().getKey().getIri(), + actuatingFunctionIRI); + } + + @Test + public void testDoorSwitchProperties() { + List objectProperList = zdoorswitch.getZObjectPropertyList(); + assertEquals(objectProperList.size(), 4); + + List consistsOf = + findObjectPropertyByIRI(consistsOfIRI, zdoorswitch.getZObjectPropertyList()); + assertEquals(consistsOf.size(), 1); + assertEquals(consistsOf.get(0).getRangeListZClasses().iterator().next().getKey().getIri(), + switchIRI); + + List hasFunction = + findObjectPropertyByIRI(hasFunctionIRI, zdoorswitch.getZObjectPropertyList()); + assertEquals(hasFunction.size(), 1); + assertEquals(hasFunction.get(0).getRangeListZClasses().iterator().next().getKey().getIri(), + openCloseFunctionIRI); + + List hasState = + findObjectPropertyByIRI(hasStateIRI, zdoorswitch.getZObjectPropertyList()); + assertEquals(hasState.size(), 1); + assertEquals(hasState.get(0).getRangeListZClasses().iterator().next().getKey().getIri(), + openCloseStateIRI); + + List accomplishes = + findObjectPropertyByIRI(accomplishesIRI, zdoorswitch.getZObjectPropertyList()); + assertEquals(accomplishes.size(), 1); + assertEquals(accomplishes.get(0).getRangeListZInstances().iterator().next().getIri(), + safetyIRI); + } + + @Test + public void testlightSwitchProperties() { + List objectProperList = zligthswitch.getZObjectPropertyList(); + assertEquals(objectProperList.size(), 6); + + List consistsOf = + findObjectPropertyByIRI(consistsOfIRI, zligthswitch.getZObjectPropertyList()); + assertEquals(consistsOf.size(), 1); + assertEquals(consistsOf.get(0).getRangeListZClasses().iterator().next().getKey().getIri(), + switchIRI); + + List hasFunction = + findObjectPropertyByIRI(hasFunctionIRI, zligthswitch.getZObjectPropertyList()); + assertEquals(hasFunction.size(), 1); + assertEquals(hasFunction.get(0).getRangeListZClasses().iterator().next().getKey().getIri(), + onOffFunctionIRI); + + List hasState = + findObjectPropertyByIRI(hasStateIRI, zligthswitch.getZObjectPropertyList()); + assertEquals(hasState.size(), 1); + assertEquals(hasState.get(0).getRangeListZClasses().iterator().next().getKey().getIri(), + onOffStateIRI); + + List accomplishes = + findObjectPropertyByIRI(accomplishesIRI, zligthswitch.getZObjectPropertyList()); + assertEquals(accomplishes.size(), 1); + assertEquals(accomplishes.get(0).getRangeListZInstances().iterator().next().getIri(), + lightingIRI); + + List measuresProperty = + findObjectPropertyByIRI(measuresPropertyIRI, zligthswitch.getZObjectPropertyList()); + assertEquals(measuresProperty.size(), 1); + assertEquals(measuresProperty.get(0).getRangeListZClasses().iterator().next().getKey().getIri(), + lightIRI); + + List offers = + findObjectPropertyByIRI(offersIRI, zligthswitch.getZObjectPropertyList()); + assertEquals(offers.size(), 1); + assertEquals(offers.get(0).getRangeListZClasses().iterator().next().getKey().getIri(), + switchOnServiceIRI); + } + + @Test + public void testHVACProperties() { + List objectProperList = zhvac.getZObjectPropertyList(); + assertEquals(objectProperList.size(), 1); + List accomplishes = + findObjectPropertyByIRI(accomplishesIRI, zhvac.getZObjectPropertyList()); + assertEquals(accomplishes.size(), 1); + assertEquals(accomplishes.get(0).getRangeListZInstances().iterator().next().getIri(), + comfortIRI); + } + + @Test + public void testLightingDeviceProperties() { + List objectProperList = zlightingDevice.getZObjectPropertyList(); + assertEquals(objectProperList.size(), 1); + List accomplishes = + findObjectPropertyByIRI(accomplishesIRI, zlightingDevice.getZObjectPropertyList()); + assertEquals(accomplishes.size(), 1); + assertEquals(accomplishes.get(0).getRangeListZInstances().iterator().next().getIri(), + comfortIRI); + } + + @Test + public void testMeterProperties() { + List objectProperList = zmeter.getZObjectPropertyList(); + assertEquals(objectProperList.size(), 1); + List hasFunction = + findObjectPropertyByIRI(hasFunctionIRI, zmeter.getZObjectPropertyList()); + assertEquals(hasFunction.size(), 1); + assertEquals(hasFunction.get(0).getRangeListZClasses().iterator().next().getKey().getIri(), + meteringFunctionIRI); + } + + @Test + public void testEnergyMeterProperties() { + List objectProperList = zenergyMeter.getZObjectPropertyList(); + assertEquals(objectProperList.size(), 4); + + List consistsOf = + findObjectPropertyByIRI(consistsOfIRI, zenergyMeter.getZObjectPropertyList()); + assertEquals(consistsOf.size(), 1); + assertEquals(consistsOf.get(0).getRangeListZClasses().iterator().next().getKey().getIri(), + meterIRI); + + List measuresProperty = + findObjectPropertyByIRI(measuresPropertyIRI, zenergyMeter.getZObjectPropertyList()); + assertEquals(measuresProperty.size(), 1); + assertEquals(measuresProperty.get(0).getRangeListZClasses().iterator().next().getKey().getIri(), + energyIRI); + + List accomplishes = + findObjectPropertyByIRI(accomplishesIRI, zenergyMeter.getZObjectPropertyList()); + assertEquals(accomplishes.size(), 2); + + if (accomplishes.get(1).getRangeListZInstances().iterator().next().getIri() + .equals(meterReadingIRI)) { + assertEquals(accomplishes.get(0).getRangeListZInstances().iterator().next().getIri(), + energyEfficiencyIRI); + + } else { + if (accomplishes.get(0).getRangeListZInstances().iterator().next().getIri() + .equals(energyEfficiencyIRI)) { + assertEquals(accomplishes.get(1).getRangeListZClasses().iterator().next().getKey().getIri(), + meterReadingIRI); + } + } + + } + + @Test + public void testMicroRenewableProperties() { + List accomplishes = + findObjectPropertyByIRI(accomplishesIRI, zmicroRenewable.getZObjectPropertyList()); + assertEquals(accomplishes.size(), 1); + assertEquals(accomplishes.get(0).getRangeListZInstances().iterator().next().getIri(), + energyEfficiencyIRI); + } + + @Test + public void testmultimediaProperties() { + List accomplishes = + findObjectPropertyByIRI(accomplishesIRI, zmultimedia.getZObjectPropertyList()); + assertEquals(accomplishes.size(), 1); + assertEquals(accomplishes.get(0).getRangeListZInstances().iterator().next().getIri(), + entertainmentIRI); + } + + @Test + public void testSensorProperties() { + List hasFunction = + findObjectPropertyByIRI(hasFunctionIRI, zsensor.getZObjectPropertyList()); + assertEquals(hasFunction.size(), 1); + assertEquals(hasFunction.get(0).getRangeListZClasses().iterator().next().getKey().getIri(), + sensingFunctionIRI); + } + + @Test + public void testSmokeSensorProperties() { + List consistsOf = + findObjectPropertyByIRI(consistsOfIRI, zsmokesensor.getZObjectPropertyList()); + assertEquals(consistsOf.size(), 1); + assertEquals(consistsOf.get(0).getRangeListZClasses().iterator().next().getKey().getIri(), + sensorkIRI); + + List measuresproperty = + findObjectPropertyByIRI(measuresPropertyIRI, zsmokesensor.getZObjectPropertyList()); + assertEquals(measuresproperty.size(), 1); + assertEquals(measuresproperty.get(0).getRangeListZClasses().iterator().next().getKey().getIri(), + smokeIRI); + + List accomplishes = + findObjectPropertyByIRI(accomplishesIRI, zsmokesensor.getZObjectPropertyList()); + assertEquals(accomplishes.size(), 1); + assertEquals(accomplishes.get(0).getRangeListZInstances().iterator().next().getIri(), + safetyIRI); + + List hasFunction = + findObjectPropertyByIRI(hasFunctionIRI, zsmokesensor.getZObjectPropertyList()); + assertEquals(hasFunction.size(), 2); + + if (hasFunction.get(0).getRangeListZClasses().iterator().next().getKey().getIri() + .equals(eventFunctionIRI)) { + assertEquals(hasFunction.get(1).getRangeListZClasses().iterator().next().getKey().getIri(), + smokeSensorIRI); + } else { + if (hasFunction.get(1).getRangeListZClasses().iterator().next().getKey().getIri() + .equals(sensingFunctionIRI)) { + assertEquals(hasFunction.get(0).getRangeListZClasses().iterator().next().getKey().getIri(), + smokeSensorIRI); + } + } + + } + + @Test + public void testTemperatureSensorProperties() { + List consistsOf = + findObjectPropertyByIRI(consistsOfIRI, ztemperaturesensor.getZObjectPropertyList()); + assertEquals(consistsOf.size(), 1); + assertEquals(consistsOf.get(0).getRangeListZClasses().iterator().next().getKey().getIri(), + sensorkIRI); + + List hasFunction = + findObjectPropertyByIRI(hasFunctionIRI, ztemperaturesensor.getZObjectPropertyList()); + assertEquals(hasFunction.size(), 1); + assertEquals(hasFunction.get(0).getRangeListZClasses().iterator().next().getKey().getIri(), + sensingFunctionIRI); + + List measuresproperty = + findObjectPropertyByIRI(measuresPropertyIRI, ztemperaturesensor.getZObjectPropertyList()); + assertEquals(measuresproperty.size(), 1); + assertEquals(measuresproperty.get(0).getRangeListZClasses().iterator().next().getKey().getIri(), + temperatureIRI); + + List accomplishes = + findObjectPropertyByIRI(accomplishesIRI, ztemperaturesensor.getZObjectPropertyList()); + assertEquals(accomplishes.size(), 1); + assertEquals(accomplishes.get(0).getRangeListZInstances().iterator().next().getIri(), + comfortIRI); + } + + @Test + public void testFunctionProperties() { + List hasCommand = + findObjectPropertyByIRI(hasCommandIRI, zfunction.getZObjectPropertyList()); + assertEquals(hasCommand.size(), 1); + assertEquals(hasCommand.get(0).getRangeListZClasses().iterator().next().getKey().getIri(), + commandIRI); + } + + @Test + public void testEventFunctionProperties() { + String comment = + "A function that allows to notify another device that a certain threshold value has been exceeded."; + List hasCommand = + findObjectPropertyByIRI(hasCommandIRI, zeventfunction.getZObjectPropertyList()); + assertEquals(hasCommand.size(), 1); + assertEquals(hasCommand.get(0).getRangeListZClasses().iterator().next().getKey().getIri(), + notifyCommandIRI); + assertTrue(zeventfunction.getComments().equals(comment)); + + List hasthresholdmeasurement = findObjectPropertyByIRI( + hasThresholdMeasurementIRI, zeventfunction.getZObjectPropertyList()); + assertEquals(hasthresholdmeasurement.size(), 1); + assertEquals( + hasthresholdmeasurement.get(0).getRangeListZClasses().iterator().next().getKey().getIri(), + measurementIRI); + + } + + @Test + + public void testallObjectProperties() { + + List hasTypicalConsumption = + findObjectPropertyByIRI(hasTypicalConsumptionIRI, zDevice.getZObjectPropertyList()); + assertEquals(hasTypicalConsumption.size(), 1); + if (hasTypicalConsumption.get(0).getRangeListZClasses().iterator().next().getKey().getIri() + .equals(energyIRI)) { + assertEquals( + hasTypicalConsumption.get(0).getRangeListZClasses().iterator().next().getKey().getIri(), + energyIRI); + } else { + + assertEquals( + hasTypicalConsumption.get(0).getRangeListZClasses().iterator().next().getKey().getIri(), + powerIRI); + + } + + } +} diff --git a/OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/java/OLGAJavaTest.java b/OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/java/OLGAJavaTest.java index 145e53b..442edc7 100644 --- a/OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/java/OLGAJavaTest.java +++ b/OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/generators/java/OLGAJavaTest.java @@ -212,46 +212,46 @@ public void testKnx() throws Exception { assertTrue(service.getResult().equals("Success")); } - @Test - public void testSarefMerged() throws Exception { - - Map inputCmdParameters = new HashMap(); - inputCmdParameters.put("code", CODE.JAVA); - inputCmdParameters.put("library", LIBRARY.RDF4J); - inputCmdParameters.put("skipInverseRelations", false); - inputCmdParameters.put("skipCompile", false); - - String resourcesDirectory = null; - resourcesDirectory = - Paths.get(OLGAJavaTest.class.getClassLoader().getResource("saref").toURI()) - .toFile().toString(); - inputCmdParameters.put("name", "SarefMerged"); - inputCmdParameters.put("pathToOntologiesParam", resourcesDirectory); - service.invokeOlga(inputCmdParameters); - - assertTrue(service.getResult().equals("Success")); - } - - @Test - public void testSarefImports() throws Exception { - - Map inputCmdParameters = new HashMap(); - inputCmdParameters.put("code", CODE.JAVA); - inputCmdParameters.put("library", LIBRARY.RDF4J); - inputCmdParameters.put("skipInverseRelations", false); - inputCmdParameters.put("skipCompile", false); - inputCmdParameters.put("preserve", true); - - String resourcesDirectory = null; - resourcesDirectory = - Paths.get(OLGAJavaTest.class.getClassLoader().getResource("sarefImports").toURI()) - .toFile().toString(); - inputCmdParameters.put("name", "SarefImports"); - inputCmdParameters.put("pathToOntologiesParam", resourcesDirectory); - service.invokeOlga(inputCmdParameters); - - assertTrue(service.getResult().equals("Success")); - } +// @Test +// public void testSarefMerged() throws Exception { +// +// Map inputCmdParameters = new HashMap(); +// inputCmdParameters.put("code", CODE.JAVA); +// inputCmdParameters.put("library", LIBRARY.RDF4J); +// inputCmdParameters.put("skipInverseRelations", false); +// inputCmdParameters.put("skipCompile", false); +// +// String resourcesDirectory = null; +// resourcesDirectory = +// Paths.get(OLGAJavaTest.class.getClassLoader().getResource("saref").toURI()) +// .toFile().toString(); +// inputCmdParameters.put("name", "SarefMerged"); +// inputCmdParameters.put("pathToOntologiesParam", resourcesDirectory); +// service.invokeOlga(inputCmdParameters); +// +// assertTrue(service.getResult().equals("Success")); +// } +// +// @Test +// public void testSarefImports() throws Exception { +// +// Map inputCmdParameters = new HashMap(); +// inputCmdParameters.put("code", CODE.JAVA); +// inputCmdParameters.put("library", LIBRARY.RDF4J); +// inputCmdParameters.put("skipInverseRelations", false); +// inputCmdParameters.put("skipCompile", false); +// inputCmdParameters.put("preserve", true); +// +// String resourcesDirectory = null; +// resourcesDirectory = +// Paths.get(OLGAJavaTest.class.getClassLoader().getResource("sarefImports").toURI()) +// .toFile().toString(); +// inputCmdParameters.put("name", "SarefImports"); +// inputCmdParameters.put("pathToOntologiesParam", resourcesDirectory); +// service.invokeOlga(inputCmdParameters); +// +// assertTrue(service.getResult().equals("Success")); +// } @Test public void testFiesta() throws Exception { diff --git a/OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/visitor/OLGAVisitorSarefFullTest.java b/OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/visitor/OLGAVisitorSarefFullTest.java index dc6fc26..96fc3f2 100644 --- a/OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/visitor/OLGAVisitorSarefFullTest.java +++ b/OLGA/OLGA-Core/src/test/java/semanticstore/ontology/library/generator/visitor/OLGAVisitorSarefFullTest.java @@ -339,7 +339,7 @@ public static void setUpBeforeClass() { try { OWLOntology test_ontology_to_visit = owlManager.loadOntologyFromOntologyDocument(test_ontFile); - olgaVisitor = new OLGAVisitor(test_ontology_to_visit, CODE.C_SHARP, LIBRARY.TRINITY, false); + olgaVisitor = new OLGAVisitor(test_ontology_to_visit, CODE.JAVA, LIBRARY.RDF4J, false); olgaVisitor.visit(); } catch (OWLOntologyCreationException e) { e.printStackTrace(); @@ -728,7 +728,7 @@ public void testCommandProperties() { assertEquals(dataProperList.size(), 1); List FilterByIRI = findZDataPropertyItemByIRI(hasDescriptionIRI, dataProperList); assertEquals(FilterByIRI.size(), 1); - assertEquals(((ZDataProperty) FilterByIRI.get(0)).getRangeXSDType(), "string"); + assertEquals(((ZDataProperty) FilterByIRI.get(0)).getRangeXSDType(), "String"); List isCommand = findObjectPropertyByIRI(isCommandOfIRI, zcommand.getZObjectPropertyList()); @@ -751,7 +751,7 @@ public void testGettingDataPropertyByIRI() { assertEquals(dataProperList.size(), 1); List FilterByIRI = findZDataPropertyItemByIRI(hasDescriptionIRI, dataProperList); assertEquals(FilterByIRI.size(), 1); - assertEquals(((ZDataProperty) FilterByIRI.get(0)).getRangeXSDType(), "string"); + assertEquals(((ZDataProperty) FilterByIRI.get(0)).getRangeXSDType(), "String"); List isCommand = findObjectPropertyByIRI(isCommandOfIRI, zcommand.getZObjectPropertyList()); @@ -1018,15 +1018,15 @@ public void testDeviceProperties() { assertEquals(dataProperList.size(), 3); List FilterByIRI = findZDataPropertyItemByIRI(hasDescriptionIRI, dataProperList); assertEquals(FilterByIRI.size(), 1); - assertEquals(((ZDataProperty) FilterByIRI.get(0)).getRangeXSDType(), "string"); + assertEquals(((ZDataProperty) FilterByIRI.get(0)).getRangeXSDType(), "String"); List hasManufacturer = findZDataPropertyItemByIRI(hasManufacturerIRI, dataProperList); assertEquals(hasManufacturer.size(), 1); - assertEquals(((ZDataProperty) hasManufacturer.get(0)).getRangeXSDType(), "string"); + assertEquals(((ZDataProperty) hasManufacturer.get(0)).getRangeXSDType(), "String"); List hasModel = findZDataPropertyItemByIRI(hasModelIRI, dataProperList); assertEquals(hasModel.size(), 1); - assertEquals(((ZDataProperty) hasModel.get(0)).getRangeXSDType(), "string"); + assertEquals(((ZDataProperty) hasModel.get(0)).getRangeXSDType(), "String"); } @@ -1260,19 +1260,6 @@ public void testSmokeSensorProperties() { List hasFunction = findObjectPropertyByIRI(hasFunctionIRI, zsmokesensor.getZObjectPropertyList()); assertEquals(hasFunction.size(), 2); - - if (hasFunction.get(0).getRangeListZClasses().iterator().next().getKey().getIri() - .equals(eventFunctionIRI)) { - assertEquals(hasFunction.get(1).getRangeListZClasses().iterator().next().getKey().getIri(), - smokeSensorIRI); - } else { - if (hasFunction.get(1).getRangeListZClasses().iterator().next().getKey().getIri() - .equals(sensingFunctionIRI)) { - assertEquals(hasFunction.get(0).getRangeListZClasses().iterator().next().getKey().getIri(), - smokeSensorIRI); - } - } - } @Test From 5eda9f520424f9835a1f0b3cd7701c662dd4cfe5 Mon Sep 17 00:00:00 2001 From: Charbel kaed Date: Tue, 21 Jul 2020 18:34:25 -0400 Subject: [PATCH 06/10] Create java-continuous-integration add continuous integration --- .github/workflows/java-continuous-integration | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 .github/workflows/java-continuous-integration diff --git a/.github/workflows/java-continuous-integration b/.github/workflows/java-continuous-integration new file mode 100644 index 0000000..c1157ae --- /dev/null +++ b/.github/workflows/java-continuous-integration @@ -0,0 +1,18 @@ +name: Java CI + +on: [push] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + - name: Set up JDK 1.8 + uses: actions/setup-java@v1 + with: + java-version: 1.8 + - name: Build with Maven + run: mvn clean install --projects OLGA-Core,OLGA-Cli --file pom.xml -P java + working-directory: ./OLGA From 96df89fe04e036e843df76582a4b13abf1f55770 Mon Sep 17 00:00:00 2001 From: Charbel kaed Date: Tue, 21 Jul 2020 18:34:40 -0400 Subject: [PATCH 07/10] Update java-continuous-integration --- .github/workflows/java-continuous-integration | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/java-continuous-integration b/.github/workflows/java-continuous-integration index c1157ae..6889b8e 100644 --- a/.github/workflows/java-continuous-integration +++ b/.github/workflows/java-continuous-integration @@ -1,4 +1,4 @@ -name: Java CI +name: java-continuous-integration on: [push] From 0729ee209300641609729d89fef5167a574c7bee Mon Sep 17 00:00:00 2001 From: Charbel kaed Date: Tue, 21 Jul 2020 18:37:09 -0400 Subject: [PATCH 08/10] Update java-continuous-integration --- .github/workflows/java-continuous-integration | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/java-continuous-integration b/.github/workflows/java-continuous-integration index 6889b8e..be12071 100644 --- a/.github/workflows/java-continuous-integration +++ b/.github/workflows/java-continuous-integration @@ -14,5 +14,5 @@ jobs: with: java-version: 1.8 - name: Build with Maven - run: mvn clean install --projects OLGA-Core,OLGA-Cli --file pom.xml -P java + run: mvn clean install --projects OLGA-Core,OLGA-Cli --file pom.xml -Pjava working-directory: ./OLGA From 579cf09810fa616983a87770480e8f76c5181dce Mon Sep 17 00:00:00 2001 From: Charbel kaed Date: Tue, 21 Jul 2020 18:37:51 -0400 Subject: [PATCH 09/10] Delete java-continuous-integration --- .github/workflows/java-continuous-integration | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 .github/workflows/java-continuous-integration diff --git a/.github/workflows/java-continuous-integration b/.github/workflows/java-continuous-integration deleted file mode 100644 index be12071..0000000 --- a/.github/workflows/java-continuous-integration +++ /dev/null @@ -1,18 +0,0 @@ -name: java-continuous-integration - -on: [push] - -jobs: - build: - - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v2 - - name: Set up JDK 1.8 - uses: actions/setup-java@v1 - with: - java-version: 1.8 - - name: Build with Maven - run: mvn clean install --projects OLGA-Core,OLGA-Cli --file pom.xml -Pjava - working-directory: ./OLGA From 7266a9208b67ac85fcb574188c731ad44b7da85d Mon Sep 17 00:00:00 2001 From: Charbel kaed Date: Tue, 21 Jul 2020 18:41:20 -0400 Subject: [PATCH 10/10] Create java-code-generation-integration --- .../java-code-generation-integration | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 .github/workflows/java-code-generation-integration diff --git a/.github/workflows/java-code-generation-integration b/.github/workflows/java-code-generation-integration new file mode 100644 index 0000000..0106f81 --- /dev/null +++ b/.github/workflows/java-code-generation-integration @@ -0,0 +1,22 @@ +name: Java Code Generation + +on: + push: + branches: [ master ] + pull_request: + branches: [ master ] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + - name: Set up JDK 1.8 + uses: actions/setup-java@v1 + with: + java-version: 1.8 + - name: Build with Maven + run: mvn clean install --projects OLGA-Core,OLGA-Cli --file pom.xml -Pjava + working-directory: ./OLGA