Renames.

corese-stack · Sep 13, 2024 · 25d22d9 · 25d22d9
1 parent e1f2b0e
commit 25d22d9
Show file tree

Hide file tree

Showing 9 changed files with 560 additions and 58 deletions.
diff --git a/src/test/java/fr/inria/corese/core/datatype/CoreseDateTest.java b/src/test/java/fr/inria/corese/core/datatype/CoreseDateTest.java
@@ -6,12 +6,12 @@
 
 import org.junit.Test;
 
-import fr.inria.corese.sparql.api.IDatatype;
-import fr.inria.corese.sparql.datatype.CoreseDate;
-import fr.inria.corese.sparql.datatype.CoreseDateTime;
-import fr.inria.corese.sparql.datatype.CoreseDecimal;
-import fr.inria.corese.sparql.datatype.DatatypeMap;
-import fr.inria.corese.sparql.datatype.XSD;
+import fr.inria.corese.core.sparql.api.IDatatype;
+import fr.inria.corese.core.sparql.datatype.CoreseDate;
+import fr.inria.corese.core.sparql.datatype.CoreseDateTime;
+import fr.inria.corese.core.sparql.datatype.CoreseDecimal;
+import fr.inria.corese.core.sparql.datatype.DatatypeMap;
+import fr.inria.corese.core.sparql.datatype.XSD;
 
 public class CoreseDateTest {
 
@@ -148,4 +148,4 @@ public void getTimezone() throws DatatypeConfigurationException {
         assertEquals(DatatypeMap.newLiteral("+PT11H"), date.getTimezone());
     }
 
-}
+}
diff --git a/src/test/java/fr/inria/corese/core/datatype/CoreseDecimalTest.java b/src/test/java/fr/inria/corese/core/datatype/CoreseDecimalTest.java
@@ -6,13 +6,13 @@
 
 import org.junit.Test;
 
-import fr.inria.corese.sparql.api.IDatatype;
-import fr.inria.corese.sparql.datatype.CoreseDecimal;
-import fr.inria.corese.sparql.datatype.CoreseDouble;
-import fr.inria.corese.sparql.datatype.CoreseFloat;
-import fr.inria.corese.sparql.datatype.DatatypeMap;
-import fr.inria.corese.sparql.datatype.XSD;
-import fr.inria.corese.sparql.exceptions.CoreseDatatypeException;
+import fr.inria.corese.core.sparql.api.IDatatype;
+import fr.inria.corese.core.sparql.datatype.CoreseDecimal;
+import fr.inria.corese.core.sparql.datatype.CoreseDouble;
+import fr.inria.corese.core.sparql.datatype.CoreseFloat;
+import fr.inria.corese.core.sparql.datatype.DatatypeMap;
+import fr.inria.corese.core.sparql.datatype.XSD;
+import fr.inria.corese.core.sparql.exceptions.CoreseDatatypeException;
 
 public class CoreseDecimalTest {
 
@@ -312,4 +312,4 @@ public void decimalValueNumbers() {
         assertEquals(BigDecimal.valueOf(number_integer), corese_integer.decimalValue());
     }
 
-}
+}
diff --git a/src/test/java/fr/inria/corese/core/engine/TestQuery1.java b/src/test/java/fr/inria/corese/core/engine/TestQuery1.java
@@ -20,8 +20,8 @@
 import org.junit.Test;
 import org.xml.sax.SAXException;
 
-import fr.inria.corese.compiler.eval.QuerySolver;
-import fr.inria.corese.compiler.result.XMLResult;
+import fr.inria.corese.core.compiler.eval.QuerySolver;
+import fr.inria.corese.core.compiler.result.XMLResult;
 import fr.inria.corese.core.Graph;
 import fr.inria.corese.core.GraphStore;
 import fr.inria.corese.core.load.Load;
@@ -40,31 +40,31 @@
 import fr.inria.corese.core.transform.Transformer;
 import fr.inria.corese.core.util.Property;
 import fr.inria.corese.core.util.SPINProcess;
-import fr.inria.corese.kgram.api.core.DatatypeValue;
-import fr.inria.corese.kgram.api.core.Edge;
-import fr.inria.corese.kgram.api.core.ExprType;
-import fr.inria.corese.kgram.api.core.Node;
-import fr.inria.corese.kgram.api.core.PointerType;
-import fr.inria.corese.kgram.core.Mapping;
-import fr.inria.corese.kgram.core.Mappings;
-import fr.inria.corese.kgram.core.Query;
-import fr.inria.corese.kgram.event.StatListener;
-import fr.inria.corese.sparql.api.IDatatype;
-import fr.inria.corese.sparql.datatype.DatatypeMap;
-import fr.inria.corese.sparql.datatype.RDF;
-import fr.inria.corese.sparql.datatype.extension.CoresePointer;
-import fr.inria.corese.sparql.exceptions.EngineException;
-import fr.inria.corese.sparql.exceptions.LDScriptException;
-import fr.inria.corese.sparql.exceptions.UndefinedExpressionException;
-import fr.inria.corese.sparql.storage.api.IStorage;
-import fr.inria.corese.sparql.storage.api.Parameters;
-import fr.inria.corese.sparql.triple.function.term.Binding;
-import fr.inria.corese.sparql.triple.parser.ASTQuery;
-import fr.inria.corese.sparql.triple.parser.Access;
-import fr.inria.corese.sparql.triple.parser.Access.Feature;
-import fr.inria.corese.sparql.triple.parser.Context;
-import fr.inria.corese.sparql.triple.parser.Dataset;
-import fr.inria.corese.sparql.triple.parser.NSManager;
+import fr.inria.corese.core.kgram.api.core.DatatypeValue;
+import fr.inria.corese.core.kgram.api.core.Edge;
+import fr.inria.corese.core.kgram.api.core.ExprType;
+import fr.inria.corese.core.kgram.api.core.Node;
+import fr.inria.corese.core.kgram.api.core.PointerType;
+import fr.inria.corese.core.kgram.core.Mapping;
+import fr.inria.corese.core.kgram.core.Mappings;
+import fr.inria.corese.core.kgram.core.Query;
+import fr.inria.corese.core.kgram.event.StatListener;
+import fr.inria.corese.core.sparql.api.IDatatype;
+import fr.inria.corese.core.sparql.datatype.DatatypeMap;
+import fr.inria.corese.core.sparql.datatype.RDF;
+import fr.inria.corese.core.sparql.datatype.extension.CoresePointer;
+import fr.inria.corese.core.sparql.exceptions.EngineException;
+import fr.inria.corese.core.sparql.exceptions.LDScriptException;
+import fr.inria.corese.core.sparql.exceptions.UndefinedExpressionException;
+import fr.inria.corese.core.sparql.storage.api.IStorage;
+import fr.inria.corese.core.sparql.storage.api.Parameters;
+import fr.inria.corese.core.sparql.triple.function.term.Binding;
+import fr.inria.corese.core.sparql.triple.parser.ASTQuery;
+import fr.inria.corese.core.sparql.triple.parser.Access;
+import fr.inria.corese.core.sparql.triple.parser.Access.Feature;
+import fr.inria.corese.core.sparql.triple.parser.Context;
+import fr.inria.corese.core.sparql.triple.parser.Dataset;
+import fr.inria.corese.core.sparql.triple.parser.NSManager;
 
 public class TestQuery1 {
     // private static org.slf4j.Logger logger =
@@ -106,7 +106,7 @@ static public void init() {
         }
         // Option.isOption = false;
         // QueryProcess.setJoin(true);
-        // fr.inria.corese.compiler.parser.Transformer.ISBGP = !true;
+        // fr.inria.corese.core.compiler.parser.Transformer.ISBGP = !true;
         // QueryProcess.setPlanDefault(Query.QP_HEURISTICS_BASED);
 
         QueryProcess.testAlgebra(!true);
@@ -6040,8 +6040,7 @@ public void testTrig() throws LoadException, EngineException {
 
         Transformer pp = Transformer.create(g, Transformer.TRIG);
         String str = pp.transform();
-        assertEquals(14923, str.length());
-
+        assertEquals(14928, str.length());
     }
 
     @Test
@@ -8142,7 +8141,7 @@ public void test49() {
                 + "</doc>'^^rdf:XMLLiteral   "
                 + "}";
 
-        String phrase = TestQuery1.class.getResource("/text/phrase.xml").getPath();
+        String phrase = TestQuery1.class.getResource("/data/text/phrase.xml").getPath();
 
         String query = ""
                 + "base      <http://www.example.org/schema/>"

diff --git a/src/test/java/fr/inria/corese/core/engine/TestQuery2.java b/src/test/java/fr/inria/corese/core/engine/TestQuery2.java
@@ -6,11 +6,11 @@
 
 import fr.inria.corese.core.Graph;
 import fr.inria.corese.core.query.QueryProcess;
-import fr.inria.corese.kgram.core.Mappings;
-import fr.inria.corese.kgram.core.Query;
-import fr.inria.corese.kgram.core.SparqlException;
-import fr.inria.corese.sparql.exceptions.EngineException;
-import fr.inria.corese.sparql.triple.parser.NSManager;
+import fr.inria.corese.core.kgram.core.Mappings;
+import fr.inria.corese.core.kgram.core.Query;
+import fr.inria.corese.core.kgram.core.SparqlException;
+import fr.inria.corese.core.sparql.exceptions.EngineException;
+import fr.inria.corese.core.sparql.triple.parser.NSManager;
 
 /**
  *

diff --git a/src/test/java/fr/inria/corese/core/engine/TestRuleEngine.java b/src/test/java/fr/inria/corese/core/engine/TestRuleEngine.java
@@ -9,7 +9,7 @@
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import fr.inria.corese.compiler.eval.QuerySolver;
+import fr.inria.corese.core.compiler.eval.QuerySolver;
 import fr.inria.corese.core.EdgeFactory;
 import fr.inria.corese.core.Graph;
 import fr.inria.corese.core.GraphStore;
@@ -19,19 +19,19 @@
 import fr.inria.corese.core.query.QueryEngine;
 import fr.inria.corese.core.query.QueryProcess;
 import fr.inria.corese.core.rule.RuleEngine;
-import fr.inria.corese.kgram.core.Mappings;
-import fr.inria.corese.kgram.core.Query;
-import fr.inria.corese.sparql.api.IDatatype;
-import fr.inria.corese.sparql.exceptions.EngineException;
-import fr.inria.corese.sparql.storage.api.Parameters;
+import fr.inria.corese.core.kgram.core.Mappings;
+import fr.inria.corese.core.kgram.core.Query;
+import fr.inria.corese.core.sparql.api.IDatatype;
+import fr.inria.corese.core.sparql.exceptions.EngineException;
+import fr.inria.corese.core.sparql.storage.api.Parameters;
 
 /**
  * Test rule engines and pipeline
  *
  */
 public class TestRuleEngine {
 
-    static String data = TestRuleEngine.class.getResource("/data").getPath();
+    static String data = TestRuleEngine.class.getResource("/data/").getPath();
     static Graph graph;
     static Engine rengine;
     static RuleEngine fengine;

diff --git a/src/test/resources/data/text/phrase.xml b/src/test/resources/data/text/phrase.xml
@@ -0,0 +1,12 @@
+<doc>
+	<phrase>
+		<subject>Cat</subject>
+		<verb>on</verb>
+		<object>mat</object>
+	</phrase>
+	<phrase>
+		<subject>Cat</subject>
+		<verb>eat</verb>
+		<object>mouse</object>
+	</phrase>
+</doc>