[Mulgara-svn] r970 - in trunk/jxdata/iTQL: . advance_queries

[pag at mulgara.org]

Author: pag
Date: 2008-05-30 18:38:39 -0700 (Fri, 30 May 2008)
New Revision: 970

Added:
   trunk/jxdata/iTQL/advance_queries/queryResult6.txt
   trunk/jxdata/iTQL/advance_queries/queryResult7.txt
   trunk/jxdata/iTQL/advance_queries/result2.txt
   trunk/jxdata/iTQL/data-02-ext.ttl
Modified:
   trunk/jxdata/iTQL/advance_queries/test.jxu
Log:
Added tests for duplicate variables, especially when one is a graph variable

Added: trunk/jxdata/iTQL/advance_queries/queryResult6.txt
===================================================================
--- trunk/jxdata/iTQL/advance_queries/queryResult6.txt	                        (rev 0)
+++ trunk/jxdata/iTQL/advance_queries/queryResult6.txt	2008-05-31 01:38:39 UTC (rev 970)
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<answer xmlns="http://mulgara.org/tql#"><query><variables><g/><a/><b/></variables><solution><g resource="@server@#"/><a resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#type"/><b resource="http://mulgara.org/mulgara#Model"/></solution><solution><g resource="@server@#data-02"/><a resource="http://example.org/data/x"/><b resource="http://example.org/data/y"/></solution><solution><g resource="@server@#data-02"/><a resource="@server@#data-02"/><b resource="@server@#data-02"/></solution></query></answer>

Added: trunk/jxdata/iTQL/advance_queries/queryResult7.txt
===================================================================
--- trunk/jxdata/iTQL/advance_queries/queryResult7.txt	                        (rev 0)
+++ trunk/jxdata/iTQL/advance_queries/queryResult7.txt	2008-05-31 01:38:39 UTC (rev 970)
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<answer xmlns="http://mulgara.org/tql#"><query><variables><g/></variables><solution><g resource="@server@#data-02"/></solution></query></answer>

Added: trunk/jxdata/iTQL/advance_queries/result2.txt
===================================================================
--- trunk/jxdata/iTQL/advance_queries/result2.txt	                        (rev 0)
+++ trunk/jxdata/iTQL/advance_queries/result2.txt	2008-05-31 01:38:39 UTC (rev 970)
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<answer xmlns="http://mulgara.org/tql#"><query><message>Successfully loaded 6 statements from @baseuri@/jxtest/iTQL/data-02-ext.ttl into @server@#data-02</message></query></answer>

Modified: trunk/jxdata/iTQL/advance_queries/test.jxu
===================================================================
--- trunk/jxdata/iTQL/advance_queries/test.jxu	2008-05-31 01:37:55 UTC (rev 969)
+++ trunk/jxdata/iTQL/advance_queries/test.jxu	2008-05-31 01:38:39 UTC (rev 970)
@@ -53,5 +53,33 @@
     <fail>Output failed.  Check badQuery5Result.xml for output.</fail>
   </ifEqual>
 
+  <!-- New data set. Test for multiple variables in constraints. data-02-ext.ttl -->
+  <set name="modelName" value="@server@#data-02" />
+  <set name="loadCommand" value="load &lt;@baseuri@/jxtest/iTQL/data-02-ext.ttl&gt; into &lt;@server@#data-02&gt; ;" />
+  <eval stepClass="org.mulgara.store.jxunit.LoadDataJX" />
+
+  <ifEqual converse="true" file="result2.txt" name="loadResult">
+    <save name="loadResult" file="badLoadResult2.xml"/>
+    <fail>Output failed.  Check badLoadResult2.xml for output.</fail>
+  </ifEqual>
+
+  <!-- Test #6: Query for variable as both subject and graph -->
+  <set name="query" value="select $g $a $b from &lt;@server@#&gt; where $g $a $b in $g order by $g $a;"/>
+
+  <eval stepClass="org.mulgara.store.jxunit.QueryJX" />
+  <ifEqual converse="true" file="queryResult6.txt" name="queryResult">
+    <save name="queryResult" file="badQuery6Result.xml"/>
+    <fail>Output failed.  Check badQuery6Result.xml for output.</fail>
+  </ifEqual>
+
+  <!-- Test #7: Query for variable as all of subject, predicate, object and graph-->
+  <set name="query" value="select $g from &lt;@server@#&gt; where $g $g $g in $g;"/>
+
+  <eval stepClass="org.mulgara.store.jxunit.QueryJX" />
+  <ifEqual converse="true" file="queryResult7.txt" name="queryResult">
+    <save name="queryResult" file="badQuery7Result.xml"/>
+    <fail>Output failed.  Check badQuery7Result.xml for output.</fail>
+  </ifEqual>
+
 </jxu>
 

Added: trunk/jxdata/iTQL/data-02-ext.ttl
===================================================================
--- trunk/jxdata/iTQL/data-02-ext.ttl	                        (rev 0)
+++ trunk/jxdata/iTQL/data-02-ext.ttl	2008-05-31 01:38:39 UTC (rev 970)
@@ -0,0 +1,10 @@
+ at prefix : <http://example.org/data/> .
+
+
+:y :y :x .
+:x :y :y .
+:y :x :y .
+:x :x :x .
+<@server@#data-02> :x :y .
+<@server@#data-02> <@server@#data-02> <@server@#data-02> .
+