Support for owl:rational (#355)

#354
mdesalvo · Jan 23, 2025 · 9fa3dd2 · 9fa3dd2
1 parent 5042917
commit 9fa3dd2
Show file tree

Hide file tree

Showing 22 changed files with 242 additions and 71 deletions.
diff --git a/RDFSharp.Test/Model/RDFGraphTest.cs b/RDFSharp.Test/Model/RDFGraphTest.cs
@@ -1925,14 +1925,19 @@ public void ShouldRaiseExceptionOnImportingFromRelativeUri()
         [TestMethod]
         public void ShouldExtractDatatypeDefinitionsFromGraph()
         {
-            RDFDatatype exLength6 = new RDFDatatype(new Uri("ex:length6"), RDFModelEnums.RDFDatatypes.XSD_STRING, [    new RDFLengthFacet(6) ]);
+            RDFDatatype exLength6 = new RDFDatatype(new Uri("ex:length6"), RDFModelEnums.RDFDatatypes.XSD_STRING, [ new RDFLengthFacet(6) ]);
             RDFDatatype exMinLength6 = new RDFDatatype(new Uri("ex:minlength6"), RDFModelEnums.RDFDatatypes.XSD_STRING, [ new RDFMinLengthFacet(6) ]);
             RDFDatatype exMaxLength6 = new RDFDatatype(new Uri("ex:maxlength6"), RDFModelEnums.RDFDatatypes.XSD_STRING, [ new RDFMaxLengthFacet(6) ]);
             RDFDatatype exMaxInclusive6 = new RDFDatatype(new Uri("ex:maxinclusive6"), RDFModelEnums.RDFDatatypes.XSD_DOUBLE, [new RDFMaxInclusiveFacet(6)]);
             RDFDatatype exMinInclusive6 = new RDFDatatype(new Uri("ex:mininclusive6"), RDFModelEnums.RDFDatatypes.XSD_DOUBLE, [new RDFMinInclusiveFacet(6)]);
             RDFDatatype exMaxExclusive6 = new RDFDatatype(new Uri("ex:maxexclusive6"), RDFModelEnums.RDFDatatypes.XSD_DOUBLE, [new RDFMaxExclusiveFacet(6)]);
             RDFDatatype exMinExclusive6 = new RDFDatatype(new Uri("ex:minexclusive6"), RDFModelEnums.RDFDatatypes.XSD_DOUBLE, [new RDFMinExclusiveFacet(6)]);
-            RDFDatatype exPatternEx = new RDFDatatype(new Uri("ex:patternex"), RDFModelEnums.RDFDatatypes.XSD_STRING, [    new RDFPatternFacet("^ex") ]);
+            RDFDatatype exMaxInclusive6R = new RDFDatatype(new Uri("ex:maxinclusive6R"), RDFModelEnums.RDFDatatypes.OWL_RATIONAL, [new RDFMaxInclusiveFacet(6)]);
+            RDFDatatype exMinInclusive6R = new RDFDatatype(new Uri("ex:mininclusive6R"), RDFModelEnums.RDFDatatypes.OWL_RATIONAL, [new RDFMinInclusiveFacet(6)]);
+            RDFDatatype exMaxExclusive6R = new RDFDatatype(new Uri("ex:maxexclusive6R"), RDFModelEnums.RDFDatatypes.OWL_RATIONAL, [new RDFMaxExclusiveFacet(6)]);
+            RDFDatatype exMinExclusive6R = new RDFDatatype(new Uri("ex:minexclusive6R"), RDFModelEnums.RDFDatatypes.OWL_RATIONAL, [new RDFMinExclusiveFacet(6)]);
+            RDFDatatype aliasRational = new RDFDatatype(new Uri("ex:aliasRational"), RDFModelEnums.RDFDatatypes.OWL_RATIONAL, null);
+            RDFDatatype exPatternEx = new RDFDatatype(new Uri("ex:patternex"), RDFModelEnums.RDFDatatypes.XSD_STRING, [ new RDFPatternFacet("^ex") ]);
             RDFDatatype exInteger = new RDFDatatype(new Uri("ex:integer"), RDFModelEnums.RDFDatatypes.XSD_INTEGER, null);
             RDFGraph graph = new RDFGraph()
               .AddDatatype(exLength6)
@@ -1942,6 +1947,11 @@ public void ShouldExtractDatatypeDefinitionsFromGraph()
               .AddDatatype(exMinInclusive6)
               .AddDatatype(exMaxExclusive6)
               .AddDatatype(exMinExclusive6)
+              .AddDatatype(exMaxInclusive6R)
+              .AddDatatype(exMinInclusive6R)
+              .AddDatatype(exMaxExclusive6R)
+              .AddDatatype(exMinExclusive6R)
+              .AddDatatype(aliasRational)
               .AddDatatype(exPatternEx)
               .AddDatatype(exInteger);
             List<RDFDatatype> datatypes = graph.ExtractDatatypeDefinitions();
@@ -1974,6 +1984,25 @@ public void ShouldExtractDatatypeDefinitionsFromGraph()
                                              && dt.TargetDatatype == RDFModelEnums.RDFDatatypes.XSD_DOUBLE
                                              && dt.Facets.Single() is RDFMinExclusiveFacet minexclusiveFacet
                                              && minexclusiveFacet.ExclusiveLowerBound == 6));
+            Assert.IsTrue(datatypes.Any(dt => string.Equals(dt.URI.ToString(), "ex:maxinclusive6R")
+                                              && dt.TargetDatatype == RDFModelEnums.RDFDatatypes.OWL_RATIONAL
+                                              && dt.Facets.Single() is RDFMaxInclusiveFacet maxinclusiveFacet
+                                              && maxinclusiveFacet.InclusiveUpperBound == 6));
+            Assert.IsTrue(datatypes.Any(dt => string.Equals(dt.URI.ToString(), "ex:mininclusive6R")
+                                              && dt.TargetDatatype == RDFModelEnums.RDFDatatypes.OWL_RATIONAL
+                                              && dt.Facets.Single() is RDFMinInclusiveFacet mininclusiveFacet
+                                              && mininclusiveFacet.InclusiveLowerBound == 6));
+            Assert.IsTrue(datatypes.Any(dt => string.Equals(dt.URI.ToString(), "ex:maxexclusive6R")
+                                             && dt.TargetDatatype == RDFModelEnums.RDFDatatypes.OWL_RATIONAL
+                                             && dt.Facets.Single() is RDFMaxExclusiveFacet maxexclusiveFacet
+                                             && maxexclusiveFacet.ExclusiveUpperBound == 6));
+            Assert.IsTrue(datatypes.Any(dt => string.Equals(dt.URI.ToString(), "ex:minexclusive6R")
+                                             && dt.TargetDatatype == RDFModelEnums.RDFDatatypes.OWL_RATIONAL
+                                             && dt.Facets.Single() is RDFMinExclusiveFacet minexclusiveFacet
+                                             && minexclusiveFacet.ExclusiveLowerBound == 6));
+            Assert.IsTrue(datatypes.Any(dt => string.Equals(dt.URI.ToString(), "ex:aliasRational")
+                                             && dt.TargetDatatype == RDFModelEnums.RDFDatatypes.OWL_RATIONAL
+                                             && dt.Facets.Count == 0));
             Assert.IsTrue(datatypes.Any(dt => string.Equals(dt.URI.ToString(), "ex:patternex")
                                                && dt.TargetDatatype == RDFModelEnums.RDFDatatypes.XSD_STRING
                                                && dt.Facets.Single() is RDFPatternFacet patternFacet

diff --git a/RDFSharp.Test/Model/RDFModelUtilitiesTest.cs b/RDFSharp.Test/Model/RDFModelUtilitiesTest.cs
@@ -1558,6 +1558,7 @@ public void ShouldNotGetGraphNamespaces()
         [DataRow("http://www.w3.org/2001/XMLSchema#NCName", RDFModelEnums.RDFDatatypes.XSD_NCNAME)]
         [DataRow("http://www.w3.org/2001/XMLSchema#ID", RDFModelEnums.RDFDatatypes.XSD_ID)]
         [DataRow("http://www.w3.org/2002/07/owl#real", RDFModelEnums.RDFDatatypes.OWL_REAL)]
+        [DataRow("http://www.w3.org/2002/07/owl#rational", RDFModelEnums.RDFDatatypes.OWL_RATIONAL)]
         [DataRow("http://www.opengis.net/ont/geosparql#gmlLiteral", RDFModelEnums.RDFDatatypes.GEOSPARQL_GML)]
         [DataRow("http://www.opengis.net/ont/geosparql#wktLiteral", RDFModelEnums.RDFDatatypes.GEOSPARQL_WKT)]
         [DataRow("http://www.w3.org/2006/time#generalDay", RDFModelEnums.RDFDatatypes.TIME_GENERALDAY)]
@@ -1612,6 +1613,7 @@ public void ShouldGetDatatypeFromEnum(string expected, RDFModelEnums.RDFDatatype
         [DataRow("http://www.w3.org/2001/XMLSchema#NCName", RDFModelEnums.RDFDatatypes.XSD_NCNAME)]
         [DataRow("http://www.w3.org/2001/XMLSchema#ID", RDFModelEnums.RDFDatatypes.XSD_ID)]
         [DataRow("http://www.w3.org/2002/07/owl#real", RDFModelEnums.RDFDatatypes.OWL_REAL)]
+        [DataRow("http://www.w3.org/2002/07/owl#rational", RDFModelEnums.RDFDatatypes.OWL_RATIONAL)]
         [DataRow("http://www.opengis.net/ont/geosparql#gmlLiteral", RDFModelEnums.RDFDatatypes.GEOSPARQL_GML)]
         [DataRow("http://www.opengis.net/ont/geosparql#wktLiteral", RDFModelEnums.RDFDatatypes.GEOSPARQL_WKT)]
         [DataRow("http://www.w3.org/2006/time#generalDay", RDFModelEnums.RDFDatatypes.TIME_GENERALDAY)]

diff --git a/RDFSharp.Test/Model/RDFTypedLiteralTest.cs b/RDFSharp.Test/Model/RDFTypedLiteralTest.cs
@@ -305,6 +305,10 @@ public void ShouldCreateTypedLiteralOfDatetimeCategory(string value, RDFModelEnu
         [DataRow("1", RDFModelEnums.RDFDatatypes.XSD_POSITIVEINTEGER)]
         [DataRow(" 1 ", RDFModelEnums.RDFDatatypes.XSD_POSITIVEINTEGER)]
         [DataRow("4", RDFModelEnums.RDFDatatypes.OWL_REAL)]
+        [DataRow("4", RDFModelEnums.RDFDatatypes.OWL_RATIONAL)]
+        [DataRow("4/9", RDFModelEnums.RDFDatatypes.OWL_RATIONAL)]
+        [DataRow("-4", RDFModelEnums.RDFDatatypes.OWL_RATIONAL)]
+        [DataRow("-4/9", RDFModelEnums.RDFDatatypes.OWL_RATIONAL)]
         public void ShouldCreateTypedLiteralOfDecimalCategory(string value, RDFModelEnums.RDFDatatypes datatype)
         {
             RDFTypedLiteral tl = new RDFTypedLiteral(value, datatype);
@@ -631,6 +635,17 @@ public void ShouldNotCreateTypedLiteralOfDatetimeCategory(string value, RDFModel
         [DataRow("", RDFModelEnums.RDFDatatypes.OWL_REAL)]
         [DataRow(null, RDFModelEnums.RDFDatatypes.OWL_REAL)]
         [DataRow("4,00", RDFModelEnums.RDFDatatypes.OWL_REAL)]
+        [DataRow("4/", RDFModelEnums.RDFDatatypes.OWL_RATIONAL)]
+        [DataRow("4/0", RDFModelEnums.RDFDatatypes.OWL_RATIONAL)]
+        [DataRow("4/-9", RDFModelEnums.RDFDatatypes.OWL_RATIONAL)]
+        [DataRow("-4/", RDFModelEnums.RDFDatatypes.OWL_RATIONAL)]
+        [DataRow("-4/0", RDFModelEnums.RDFDatatypes.OWL_RATIONAL)]
+        [DataRow("/", RDFModelEnums.RDFDatatypes.OWL_RATIONAL)]
+        [DataRow("-/", RDFModelEnums.RDFDatatypes.OWL_RATIONAL)]
+        [DataRow("/-", RDFModelEnums.RDFDatatypes.OWL_RATIONAL)]
+        [DataRow("/9", RDFModelEnums.RDFDatatypes.OWL_RATIONAL)]
+        [DataRow("/-9", RDFModelEnums.RDFDatatypes.OWL_RATIONAL)]
+        [DataRow("4/02", RDFModelEnums.RDFDatatypes.OWL_RATIONAL)]
         public void ShouldNotCreateTypedLiteralOfDecimalCategory(string value, RDFModelEnums.RDFDatatypes datatype)
             => Assert.ThrowsException<RDFModelException>(() => new RDFTypedLiteral(value, datatype));
 

diff --git a/RDFSharp.Test/Query/Mirella/Algebra/Aggregators/RDFSumAggregatorTest.cs b/RDFSharp.Test/Query/Mirella/Algebra/Aggregators/RDFSumAggregatorTest.cs
@@ -75,7 +75,7 @@ public void ShouldApplyModifierWithSumAggregator()
             table.Columns.Add("?B", typeof(string));
             table.Columns.Add("?C", typeof(string));
             DataRow row0 = table.NewRow();
-            row0["?A"] = new RDFTypedLiteral("27", RDFModelEnums.RDFDatatypes.XSD_FLOAT).ToString();
+            row0["?A"] = new RDFTypedLiteral("54/2", RDFModelEnums.RDFDatatypes.OWL_RATIONAL).ToString();
             row0["?B"] = new RDFPlainLiteral("hello", "en-US").ToString();
             row0["?C"] = new RDFResource("ex:value1").ToString();
             table.Rows.Add(row0);

diff --git a/RDFSharp.Test/Query/Mirella/Algebra/Expressions/RDFAbsExpressionTest.cs b/RDFSharp.Test/Query/Mirella/Algebra/Expressions/RDFAbsExpressionTest.cs
@@ -15,7 +15,6 @@ limitations under the License.
 */
 
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using System.Collections.Generic;
 using System.Data;
 using RDFSharp.Model;
 using RDFSharp.Query;
@@ -67,7 +66,7 @@ public void ShouldApplyExpressionWithExpressionAndCalculateResult()
             table.Columns.Add("?A", typeof(string));
             table.Columns.Add("?B", typeof(string));
             DataRow row = table.NewRow();
-            row["?A"] = new RDFTypedLiteral("5.1", RDFModelEnums.RDFDatatypes.XSD_DOUBLE).ToString();
+            row["?A"] = new RDFTypedLiteral("10/2", RDFModelEnums.RDFDatatypes.OWL_RATIONAL).ToString();
             row["?B"] = new RDFTypedLiteral("25", RDFModelEnums.RDFDatatypes.XSD_INT).ToString();
             table.Rows.Add(row);
             table.AcceptChanges();
@@ -77,7 +76,7 @@ public void ShouldApplyExpressionWithExpressionAndCalculateResult()
             RDFPatternMember expressionResult = expression.ApplyExpression(table.Rows[0]);
 
             Assert.IsNotNull(expressionResult);
-            Assert.IsTrue(expressionResult.Equals(new RDFTypedLiteral("19.9", RDFModelEnums.RDFDatatypes.XSD_DOUBLE)));
+            Assert.IsTrue(expressionResult.Equals(new RDFTypedLiteral("20", RDFModelEnums.RDFDatatypes.XSD_DOUBLE)));
         }
 
         [TestMethod]

diff --git a/RDFSharp.Test/Query/Mirella/Algebra/Expressions/RDFAddExpressionTest.cs b/RDFSharp.Test/Query/Mirella/Algebra/Expressions/RDFAddExpressionTest.cs
@@ -15,7 +15,6 @@ limitations under the License.
 */
 
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using System.Collections.Generic;
 using System.Data;
 using RDFSharp.Model;
 using RDFSharp.Query;
@@ -173,7 +172,7 @@ public void ShouldApplyExpressionWithEEAndCalculateResult()
             table.Columns.Add("?A", typeof(string));
             table.Columns.Add("?B", typeof(string));
             DataRow row = table.NewRow();
-            row["?A"] = new RDFTypedLiteral("5.1", RDFModelEnums.RDFDatatypes.XSD_DOUBLE).ToString();
+            row["?A"] = new RDFTypedLiteral("10/2", RDFModelEnums.RDFDatatypes.OWL_RATIONAL).ToString();
             row["?B"] = new RDFTypedLiteral("25", RDFModelEnums.RDFDatatypes.XSD_INT).ToString();
             table.Rows.Add(row);
             table.AcceptChanges();
@@ -184,7 +183,7 @@ public void ShouldApplyExpressionWithEEAndCalculateResult()
             RDFPatternMember expressionResult = expression.ApplyExpression(table.Rows[0]);
 
             Assert.IsNotNull(expressionResult);
-            Assert.IsTrue(expressionResult.Equals(new RDFTypedLiteral("60.2", RDFModelEnums.RDFDatatypes.XSD_DOUBLE)));
+            Assert.IsTrue(expressionResult.Equals(new RDFTypedLiteral("60", RDFModelEnums.RDFDatatypes.XSD_DOUBLE)));
         }
 
         [TestMethod]
@@ -195,7 +194,7 @@ public void ShouldApplyExpressionWithEEAndCalculateResult2()
             table.Columns.Add("?B", typeof(string));
             DataRow row = table.NewRow();
             row["?A"] = new RDFTypedLiteral("5.1", RDFModelEnums.RDFDatatypes.XSD_DOUBLE).ToString();
-            row["?B"] = new RDFTypedLiteral("25", RDFModelEnums.RDFDatatypes.XSD_INT).ToString();
+            row["?B"] = new RDFTypedLiteral("50/2", RDFModelEnums.RDFDatatypes.OWL_RATIONAL).ToString();
             table.Rows.Add(row);
             table.AcceptChanges();
 

diff --git a/RDFSharp.Test/Query/Mirella/Algebra/Expressions/RDFCeilExpressionTest.cs b/RDFSharp.Test/Query/Mirella/Algebra/Expressions/RDFCeilExpressionTest.cs
@@ -15,7 +15,6 @@ limitations under the License.
 */
 
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using System.Collections.Generic;
 using System.Data;
 using RDFSharp.Model;
 using RDFSharp.Query;
@@ -68,7 +67,7 @@ public void ShouldApplyExpressionWithExpressionAndCalculateResult()
             table.Columns.Add("?B", typeof(string));
             DataRow row = table.NewRow();
             row["?A"] = new RDFTypedLiteral("5.1", RDFModelEnums.RDFDatatypes.XSD_DOUBLE).ToString();
-            row["?B"] = new RDFTypedLiteral("25", RDFModelEnums.RDFDatatypes.XSD_INT).ToString();
+            row["?B"] = new RDFTypedLiteral("50/2", RDFModelEnums.RDFDatatypes.OWL_RATIONAL).ToString();
             table.Rows.Add(row);
             table.AcceptChanges();
 
@@ -87,7 +86,7 @@ public void ShouldApplyExpressionWithVariableAndCalculateResult()
             table.Columns.Add("?A", typeof(string));
             table.Columns.Add("?B", typeof(string));
             DataRow row = table.NewRow();
-            row["?A"] = new RDFTypedLiteral("5.1", RDFModelEnums.RDFDatatypes.XSD_DOUBLE).ToString();
+            row["?A"] = new RDFTypedLiteral("11/2", RDFModelEnums.RDFDatatypes.OWL_RATIONAL).ToString();
             row["?B"] = new RDFTypedLiteral("25", RDFModelEnums.RDFDatatypes.XSD_INT).ToString();
             table.Rows.Add(row);
             table.AcceptChanges();

diff --git a/RDFSharp.Test/Query/Mirella/Algebra/Expressions/RDFComparisonExpressionTest.cs b/RDFSharp.Test/Query/Mirella/Algebra/Expressions/RDFComparisonExpressionTest.cs
@@ -15,7 +15,6 @@ limitations under the License.
 */
 
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using System.Collections.Generic;
 using System.Data;
 using RDFSharp.Model;
 using RDFSharp.Query;
@@ -402,7 +401,7 @@ public void ShouldApplyExpressionWithEEAndCalculateResultTrue()
             table.Columns.Add("?B", typeof(string));
             DataRow row = table.NewRow();
             row["?A"] = new RDFTypedLiteral("5.1", RDFModelEnums.RDFDatatypes.XSD_DOUBLE).ToString();
-            row["?B"] = new RDFTypedLiteral("25", RDFModelEnums.RDFDatatypes.XSD_INT).ToString();
+            row["?B"] = new RDFTypedLiteral("50/2", RDFModelEnums.RDFDatatypes.OWL_RATIONAL).ToString();
             table.Rows.Add(row);
             table.AcceptChanges();
 
@@ -422,7 +421,7 @@ public void ShouldApplyExpressionWithEEAndCalculateResultFalse()
             table.Columns.Add("?A", typeof(string));
             table.Columns.Add("?B", typeof(string));
             DataRow row = table.NewRow();
-            row["?A"] = new RDFTypedLiteral("5.1", RDFModelEnums.RDFDatatypes.XSD_DOUBLE).ToString();
+            row["?A"] = new RDFTypedLiteral("10/2", RDFModelEnums.RDFDatatypes.OWL_RATIONAL).ToString();
             row["?B"] = new RDFTypedLiteral("25", RDFModelEnums.RDFDatatypes.XSD_INT).ToString();
             table.Rows.Add(row);
             table.AcceptChanges();

diff --git a/RDFSharp.Test/Query/Mirella/Algebra/Expressions/RDFFloorExpressionTest.cs b/RDFSharp.Test/Query/Mirella/Algebra/Expressions/RDFFloorExpressionTest.cs
@@ -15,7 +15,6 @@ limitations under the License.
 */
 
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using System.Collections.Generic;
 using System.Data;
 using RDFSharp.Model;
 using RDFSharp.Query;
@@ -67,8 +66,8 @@ public void ShouldApplyExpressionWithExpressionAndCalculateResult()
             table.Columns.Add("?A", typeof(string));
             table.Columns.Add("?B", typeof(string));
             DataRow row = table.NewRow();
-            row["?A"] = new RDFTypedLiteral("5.1", RDFModelEnums.RDFDatatypes.XSD_DOUBLE).ToString();
-            row["?B"] = new RDFTypedLiteral("25", RDFModelEnums.RDFDatatypes.XSD_INT).ToString();
+            row["?A"] = new RDFTypedLiteral("10/2", RDFModelEnums.RDFDatatypes.OWL_RATIONAL).ToString();
+            row["?B"] = new RDFTypedLiteral("25.1", RDFModelEnums.RDFDatatypes.XSD_DOUBLE).ToString();
             table.Rows.Add(row);
             table.AcceptChanges();
 
@@ -88,16 +87,16 @@ public void ShouldApplyExpressionWithVariableAndCalculateResult()
             table.Columns.Add("?B", typeof(string));
             DataRow row = table.NewRow();
             row["?A"] = new RDFTypedLiteral("5.1", RDFModelEnums.RDFDatatypes.XSD_DOUBLE).ToString();
-            row["?B"] = new RDFTypedLiteral("25", RDFModelEnums.RDFDatatypes.XSD_INT).ToString();
+            row["?B"] = new RDFTypedLiteral("50/2", RDFModelEnums.RDFDatatypes.OWL_RATIONAL).ToString();
             table.Rows.Add(row);
             table.AcceptChanges();
 
             RDFFloorExpression expression = new RDFFloorExpression(
-                new RDFVariable("?A"));
+                new RDFVariable("?B"));
             RDFPatternMember expressionResult = expression.ApplyExpression(table.Rows[0]);
 
             Assert.IsNotNull(expressionResult);
-            Assert.IsTrue(expressionResult.Equals(new RDFTypedLiteral("5", RDFModelEnums.RDFDatatypes.XSD_DOUBLE)));
+            Assert.IsTrue(expressionResult.Equals(new RDFTypedLiteral("25", RDFModelEnums.RDFDatatypes.XSD_DOUBLE)));
         }
 
         [TestMethod]

diff --git a/RDFSharp.Test/Query/Mirella/Algebra/Expressions/RDFRoundExpressionTest.cs b/RDFSharp.Test/Query/Mirella/Algebra/Expressions/RDFRoundExpressionTest.cs
@@ -15,7 +15,6 @@ limitations under the License.
 */
 
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using System.Collections.Generic;
 using System.Data;
 using RDFSharp.Model;
 using RDFSharp.Query;
@@ -68,7 +67,7 @@ public void ShouldApplyExpressionWithExpressionAndCalculateResult()
             table.Columns.Add("?B", typeof(string));
             DataRow row = table.NewRow();
             row["?A"] = new RDFTypedLiteral("5.1", RDFModelEnums.RDFDatatypes.XSD_DOUBLE).ToString();
-            row["?B"] = new RDFTypedLiteral("25", RDFModelEnums.RDFDatatypes.XSD_INT).ToString();
+            row["?B"] = new RDFTypedLiteral("50/2", RDFModelEnums.RDFDatatypes.OWL_RATIONAL).ToString();
             table.Rows.Add(row);
             table.AcceptChanges();
 
@@ -87,7 +86,7 @@ public void ShouldApplyExpressionWithVariableAndCalculateResult()
             table.Columns.Add("?A", typeof(string));
             table.Columns.Add("?B", typeof(string));
             DataRow row = table.NewRow();
-            row["?A"] = new RDFTypedLiteral("5.7", RDFModelEnums.RDFDatatypes.XSD_DOUBLE).ToString();
+            row["?A"] = new RDFTypedLiteral("11/4", RDFModelEnums.RDFDatatypes.OWL_RATIONAL).ToString();
             row["?B"] = new RDFTypedLiteral("25", RDFModelEnums.RDFDatatypes.XSD_INT).ToString();
             table.Rows.Add(row);
             table.AcceptChanges();
@@ -97,7 +96,7 @@ public void ShouldApplyExpressionWithVariableAndCalculateResult()
             RDFPatternMember expressionResult = expression.ApplyExpression(table.Rows[0]);
 
             Assert.IsNotNull(expressionResult);
-            Assert.IsTrue(expressionResult.Equals(new RDFTypedLiteral("6", RDFModelEnums.RDFDatatypes.XSD_DOUBLE)));
+            Assert.IsTrue(expressionResult.Equals(new RDFTypedLiteral("3", RDFModelEnums.RDFDatatypes.XSD_DOUBLE)));
         }
 
         [TestMethod]