Menu
▾
▴
mxquery-commit — Commit Notifications
You can subscribe to this list here.
| 2011 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(71) |
Jun
(43) |
Jul
(9) |
Aug
(10) |
Sep
(21) |
Oct
(38) |
Nov
|
Dec
(11) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2012 |
Jan
|
Feb
(21) |
Mar
(9) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <pm_...@us...> - 2011-08-31 11:22:47
|
Revision: 4439
http://mxquery.svn.sourceforge.net/mxquery/?rev=4439&view=rev
Author: pm_fischer
Date: 2011-08-31 11:22:41 +0000 (Wed, 31 Aug 2011)
Log Message:
-----------
Add test for XHTML serialization (empty, not empty content model,
')
Added Paths:
-----------
trunk/MXQuery_Testing/src/ch/ethz/mxquery/test/HTMLSerializerTests.java
Added: trunk/MXQuery_Testing/src/ch/ethz/mxquery/test/HTMLSerializerTests.java
===================================================================
--- trunk/MXQuery_Testing/src/ch/ethz/mxquery/test/HTMLSerializerTests.java (rev 0)
+++ trunk/MXQuery_Testing/src/ch/ethz/mxquery/test/HTMLSerializerTests.java 2011-08-31 11:22:41 UTC (rev 4439)
@@ -0,0 +1,129 @@
+package ch.ethz.mxquery.test;
+
+import ch.ethz.mxquery.model.XDMIterator;
+import ch.ethz.mxquery.query.PreparedStatement;
+import ch.ethz.mxquery.testsuite.XQueryTestBase;
+import ch.ethz.mxquery.xdmio.XDMSerializer;
+import ch.ethz.mxquery.xdmio.XDMSerializerSettings;
+
+public class HTMLSerializerTests extends XQueryTestBase {
+
+ public void testDefaultSerialization() throws Exception{
+ String query = "<html><head/><body/></html>";
+ doQuery(prepareQuery(query, false,false, false, false, false));
+ assertEquals(resultBuffer.toString().trim(), "<html><head/><body/></html>");
+ };
+
+ public void testXMLSerialization() throws Exception{
+ String query = "<html><head/><body/></html>";
+ PreparedStatement prep = prepareQuery(query, false,false, false, false, false);
+
+ result = prep.evaluate();
+ resultBuffer = new StringBuffer();
+ storeBuffer = new StringBuffer();
+ XDMSerializerSettings ser = prep.getOutputSettings();
+ if (ser == null)
+ ser = new XDMSerializerSettings();
+ ser.setOutputMethod(XDMSerializerSettings.METHOD_XML);
+ ser.setOmitXMLDeclaration(true);
+ XDMSerializer ip = new XDMSerializer(ser);
+ resultBuffer.append(ip.eventsToXML(result));
+
+ prep.applyPUL();
+ if (result.getExpressionCategoryType(false) == XDMIterator.EXPR_CATEGORY_UPDATING)
+ storeBuffer.append(result.getContext().getStores().toString());
+ result.close(false);
+ assertEquals(resultBuffer.toString().trim(), "<html><head/><body/></html>");
+ };
+
+ public void testXHTMLSerialization() throws Exception{
+ String query = "<html><head/><body/></html>";
+ PreparedStatement prep = prepareQuery(query, false,false, false, false, false);
+
+ result = prep.evaluate();
+ resultBuffer = new StringBuffer();
+ storeBuffer = new StringBuffer();
+ XDMSerializerSettings ser = prep.getOutputSettings();
+ if (ser == null)
+ ser = new XDMSerializerSettings();
+ ser.setOutputMethod(XDMSerializerSettings.METHOD_XHTML);
+ ser.setOmitXMLDeclaration(true);
+ XDMSerializer ip = new XDMSerializer(ser);
+ resultBuffer.append(ip.eventsToXML(result));
+
+ prep.applyPUL();
+ if (result.getExpressionCategoryType(false) == XDMIterator.EXPR_CATEGORY_UPDATING)
+ storeBuffer.append(result.getContext().getStores().toString());
+ result.close(false);
+ assertEquals(resultBuffer.toString().trim(), "<html><head></head><body></body></html>");
+ };
+
+ public void testXHTMLSerialization_2() throws Exception{
+ String query = "<html><head><script/></head><body><br/></body></html>";
+ PreparedStatement prep = prepareQuery(query, false,false, false, false, false);
+
+ result = prep.evaluate();
+ resultBuffer = new StringBuffer();
+ storeBuffer = new StringBuffer();
+ XDMSerializerSettings ser = prep.getOutputSettings();
+ if (ser == null)
+ ser = new XDMSerializerSettings();
+ ser.setOutputMethod(XDMSerializerSettings.METHOD_XHTML);
+ ser.setOmitXMLDeclaration(true);
+ XDMSerializer ip = new XDMSerializer(ser);
+ resultBuffer.append(ip.eventsToXML(result));
+
+ prep.applyPUL();
+ if (result.getExpressionCategoryType(false) == XDMIterator.EXPR_CATEGORY_UPDATING)
+ storeBuffer.append(result.getContext().getStores().toString());
+ result.close(false);
+ assertEquals(resultBuffer.toString().trim(), "<html><head><script></script></head><body><br /></body></html>");
+ };
+
+
+ public void testXHTMLSerialization_3() throws Exception{
+ String query = "<html><head><script/></head><body><area/><base/><br/><col/><hr/><img/><input/><link/><meta/><basefont/><frame/><isindex/><param/></body></html>";
+ PreparedStatement prep = prepareQuery(query, false,false, false, false, false);
+
+ result = prep.evaluate();
+ resultBuffer = new StringBuffer();
+ storeBuffer = new StringBuffer();
+ XDMSerializerSettings ser = prep.getOutputSettings();
+ if (ser == null)
+ ser = new XDMSerializerSettings();
+ ser.setOutputMethod(XDMSerializerSettings.METHOD_XHTML);
+ ser.setOmitXMLDeclaration(true);
+ XDMSerializer ip = new XDMSerializer(ser);
+ resultBuffer.append(ip.eventsToXML(result));
+
+ prep.applyPUL();
+ if (result.getExpressionCategoryType(false) == XDMIterator.EXPR_CATEGORY_UPDATING)
+ storeBuffer.append(result.getContext().getStores().toString());
+ result.close(false);
+ assertEquals(resultBuffer.toString().trim(), "<html><head><script></script></head><body><area /><base /><br /><col /><hr /><img /><input /><link /><meta /><basefont /><frame /><isindex /><param /></body></html>");
+ };
+
+
+ public void testXHTMLSerialization_Apos() throws Exception{
+ String query = "<html><head><script/></head><body>'</body></html>";
+ PreparedStatement prep = prepareQuery(query, false,false, false, false, false);
+
+ result = prep.evaluate();
+ resultBuffer = new StringBuffer();
+ storeBuffer = new StringBuffer();
+ XDMSerializerSettings ser = prep.getOutputSettings();
+ if (ser == null)
+ ser = new XDMSerializerSettings();
+ ser.setOutputMethod(XDMSerializerSettings.METHOD_XHTML);
+ ser.setOmitXMLDeclaration(true);
+ XDMSerializer ip = new XDMSerializer(ser);
+ resultBuffer.append(ip.eventsToXML(result));
+
+ prep.applyPUL();
+ if (result.getExpressionCategoryType(false) == XDMIterator.EXPR_CATEGORY_UPDATING)
+ storeBuffer.append(result.getContext().getStores().toString());
+ result.close(false);
+ assertEquals(resultBuffer.toString().trim(), "<html><head><script></script></head><body>'</body></html>");
+ };
+
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pm_...@us...> - 2011-08-17 14:01:45
|
Revision: 4438
http://mxquery.svn.sourceforge.net/mxquery/?rev=4438&view=rev
Author: pm_fischer
Date: 2011-08-17 14:01:36 +0000 (Wed, 17 Aug 2011)
Log Message:
-----------
fix a an error with complex nested predicates
Modified Paths:
--------------
trunk/MXQuery/src/ch/ethz/mxquery/iterators/FFLWORIterator.java
Modified: trunk/MXQuery/src/ch/ethz/mxquery/iterators/FFLWORIterator.java
===================================================================
--- trunk/MXQuery/src/ch/ethz/mxquery/iterators/FFLWORIterator.java 2011-08-17 14:00:34 UTC (rev 4437)
+++ trunk/MXQuery/src/ch/ethz/mxquery/iterators/FFLWORIterator.java 2011-08-17 14:01:36 UTC (rev 4438)
@@ -83,7 +83,8 @@
super.current = returnExpr;
if (!doNextBinding()) {
- freeResources(false);
+ freeResources(true);
+ endOfSeq = true;
current = null;
return Token.END_SEQUENCE_TOKEN;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pm_...@us...> - 2011-08-17 14:00:43
|
Revision: 4437
http://mxquery.svn.sourceforge.net/mxquery/?rev=4437&view=rev
Author: pm_fischer
Date: 2011-08-17 14:00:34 +0000 (Wed, 17 Aug 2011)
Log Message:
-----------
first simplification
Modified Paths:
--------------
trunk/MXQuery/aggregate2.xquery
Modified: trunk/MXQuery/aggregate2.xquery
===================================================================
--- trunk/MXQuery/aggregate2.xquery 2011-08-17 13:59:55 UTC (rev 4436)
+++ trunk/MXQuery/aggregate2.xquery 2011-08-17 14:00:34 UTC (rev 4437)
@@ -4,36 +4,13 @@
(: declare variable $tmfile as document-node() external;
declare variable $notmfile as document-node() external; :)
-declare function local:read-files($files)
-{
- <contents>
- {
- for $name in $files/files/file
- return <content>{doc($name)/measurements}</content>
- }
- </contents>
-};
-
-declare function local:get-kinds()
-{
- doc($tmfiles/files/file[1])/measurements/kind/data(@name)
-};
-
-
-declare function local:extract-x-axis-for-kind($kind)
-{
- doc($tmfiles/files/file[1])/measurements/kind[@name=$kind]/values/value/data(version)
-};
-
declare function local:normalize-kind($file, $kind, $x-axis)
{
- let $f := doc($file)/measurements/kind[@name=$kind]
+ let $f := doc($file)/measurements/kind
return
- <kind name="{$kind}">
- <average>{$f/data(average)}</average>
<values>
{
- for $v in $x-axis
+ for $v in doc($tmfiles/files/file[1])/measurements/kind/values/value/data(version)
return <value>
<version>{$v}</version>
<time>{
@@ -46,117 +23,11 @@
</value>
}
</values>
- </kind>
};
-declare function local:compute-average($files, $kind, $x-axis)
-{
- let $normalized-contents := for $f in $files return local:normalize-kind($f, $kind, $x-axis)
- return
- <kind name="{$kind}">
- <average>{avg($normalized-contents/data(average))}</average>
- <values>
- {
- for $v in $x-axis
- return <value>
- <version>{$v}</version>
- <time>{
- avg($normalized-contents/values/value[version=$v]/time)
- }</time>
- </value>
- }
- </values>
- </kind>
-};
-
for $kind in "insert1"
- let $x-axis := local:extract-x-axis-for-kind($kind)
let $kind-notm := local:normalize-kind($notmfiles/files/file[1],
$kind,
- $x-axis)
+ ())
+
return $kind-notm
-(: <html>
- <head>
- <meta charset="utf-8"/>
- <style>
- body {{font-family:Arial}}
- div#id-display {{}}
- span.version {{background-color:gray;color:white;width:100%;display:block}}
- span.content {{display:block}}
- ul.listing li {{list-style:none;border-bottom:solid 1px}}
- ul.listing {{margin:0px;padding:0px}}
- span.element {{color:blue}}
- span.attribute {{color:red}}
- span.text {{color:black}}
- span.comment {{color:purple}}
- span.reference {{font-size:6pt;color:gray}}
- span.pi {{color:green}}
- hr.document-separator {{border: 1px dashed gray}}
- .error {{color:red}}
- .tree-id {{font-size: 18pt; color: green}}
- .ordpath {{font-size: 18pt; color: red}}
- .version-id {{font-size: 18pt; color: blue}}
- .selected {{background-color: yellow}}
- .doselect {{color: black}}
- .isselected {{color: green;text-weight: bold}}
- .invisible {{display: none}}
- .selectable {{cursor: pointer}}
- </style>
- <script type="text/javascript" src="https://www.google.com/jsapi"></script>
- {
- for $kind in local:get-kinds()
- let $kind-tm := local:compute-average($tmfiles/files/file,
- $kind,
- local:extract-x-axis-for-kind($kind))
- let $kind-notm := local:compute-average($notmfiles/files/file,
- $kind,
- local:extract-x-axis-for-kind($kind))
- return
- <script type="text/javascript">
- google.load("visualization", "1", {{packages:["corechart"]}});
- google.setOnLoadCallback(drawChart);
- function drawChart() {{
- var data = new google.visualization.DataTable();
- data.addColumn('string', '# Versions');
- data.addColumn('number', 'Time Travel');
- data.addColumn('number', 'No time travel');
- data.addRows({count($kind-tm/values/value)});
- {
- for $t at $p in $kind-tm/values/value
- let $t-notm := $kind-notm/values/value[version eq $t/version]
- return
- <dummy>data.setValue({$p - 1}, 0, '{$t/data(version)}');data.setValue({$p - 1}, 1, {$t/data(time)});data.setValue({$p - 1}, 2, {$t-notm/data(time)});</dummy>/data(.)
- }
- var chart = new google.visualization.LineChart(document.getElementById('chart_div_{$kind-tm/data(@name)}'));
- chart.draw(data, {{width: 800, height: 240, title: 'y = execution time (ms) for the x-th execution of query {$kind-tm/data(@name)}'}});
- }}
- </script>
- }
- </head>
- <body>
- <div>
- <h1>Measurement summary</h1>
- {
- for $kind in local:get-kinds()
- let $kind-tm := local:compute-average($tmfiles/files/file,
- $kind,
- local:extract-x-axis-for-kind($kind))
- let $kind-notm := local:compute-average($notmfiles/files/file,
- $kind,
- local:extract-x-axis-for-kind($kind))
- return
- let $average-time-tm := $kind-tm/data(average)
- let $average-time-notm := $kind-notm/data(average)
- let $standard-deviation-time-tm := math:sqrt(avg($kind-tm/values/value/math:pow(time - $average-time-tm, 2)))
- let $standard-deviation-time-notm := math:sqrt(avg($kind-notm/values/value/math:pow(time - $average-time-notm,2)))
- return
- <div>
- <h2>Kind: {$kind-tm/data(@name)}</h2>
- <p>Execution time with time travel-enabled Sausalito: average {round($average-time-tm)} +/- {round($standard-deviation-time-tm)} ms</p>
- <p>Execution time in original Sausalito: average {round($average-time-notm)} +/- {round($standard-deviation-time-notm)} ms</p>
- <div id="chart_div_{$kind-tm/data(@name)}"/>
- </div>
- }
- </div>
- </body>
- </html> :)
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pm_...@us...> - 2011-08-17 14:00:04
|
Revision: 4436
http://mxquery.svn.sourceforge.net/mxquery/?rev=4436&view=rev
Author: pm_fischer
Date: 2011-08-17 13:59:55 +0000 (Wed, 17 Aug 2011)
Log Message:
-----------
Ghislain's test cases
Added Paths:
-----------
trunk/MXQuery/aggregate2.xquery
trunk/MXQuery/notm.xml
trunk/MXQuery/tm.xml
Added: trunk/MXQuery/aggregate2.xquery
===================================================================
--- trunk/MXQuery/aggregate2.xquery (rev 0)
+++ trunk/MXQuery/aggregate2.xquery 2011-08-17 13:59:55 UTC (rev 4436)
@@ -0,0 +1,162 @@
+declare variable $tmfiles external;
+declare variable $notmfiles external;
+
+(: declare variable $tmfile as document-node() external;
+declare variable $notmfile as document-node() external; :)
+
+declare function local:read-files($files)
+{
+ <contents>
+ {
+ for $name in $files/files/file
+ return <content>{doc($name)/measurements}</content>
+ }
+ </contents>
+};
+
+declare function local:get-kinds()
+{
+ doc($tmfiles/files/file[1])/measurements/kind/data(@name)
+};
+
+
+declare function local:extract-x-axis-for-kind($kind)
+{
+ doc($tmfiles/files/file[1])/measurements/kind[@name=$kind]/values/value/data(version)
+};
+
+declare function local:normalize-kind($file, $kind, $x-axis)
+{
+ let $f := doc($file)/measurements/kind[@name=$kind]
+ return
+ <kind name="{$kind}">
+ <average>{$f/data(average)}</average>
+ <values>
+ {
+ for $v in $x-axis
+ return <value>
+ <version>{$v}</version>
+ <time>{
+ let $nv := $f/values/value[xs:integer(version) le xs:integer($v)][last()]
+ (: adding or removing [last()] on the line above changes the number of elements outputs in the FLWOR! :)
+ return
+ if ($nv) then data($nv[last()]/time) else data($f/values/value[last()]/time)
+
+ }</time>
+ </value>
+ }
+ </values>
+ </kind>
+};
+
+declare function local:compute-average($files, $kind, $x-axis)
+{
+ let $normalized-contents := for $f in $files return local:normalize-kind($f, $kind, $x-axis)
+ return
+ <kind name="{$kind}">
+ <average>{avg($normalized-contents/data(average))}</average>
+ <values>
+ {
+ for $v in $x-axis
+ return <value>
+ <version>{$v}</version>
+ <time>{
+ avg($normalized-contents/values/value[version=$v]/time)
+ }</time>
+ </value>
+ }
+ </values>
+ </kind>
+};
+
+ for $kind in "insert1"
+ let $x-axis := local:extract-x-axis-for-kind($kind)
+ let $kind-notm := local:normalize-kind($notmfiles/files/file[1],
+ $kind,
+ $x-axis)
+ return $kind-notm
+(: <html>
+ <head>
+ <meta charset="utf-8"/>
+ <style>
+ body {{font-family:Arial}}
+ div#id-display {{}}
+ span.version {{background-color:gray;color:white;width:100%;display:block}}
+ span.content {{display:block}}
+ ul.listing li {{list-style:none;border-bottom:solid 1px}}
+ ul.listing {{margin:0px;padding:0px}}
+ span.element {{color:blue}}
+ span.attribute {{color:red}}
+ span.text {{color:black}}
+ span.comment {{color:purple}}
+ span.reference {{font-size:6pt;color:gray}}
+ span.pi {{color:green}}
+ hr.document-separator {{border: 1px dashed gray}}
+ .error {{color:red}}
+ .tree-id {{font-size: 18pt; color: green}}
+ .ordpath {{font-size: 18pt; color: red}}
+ .version-id {{font-size: 18pt; color: blue}}
+ .selected {{background-color: yellow}}
+ .doselect {{color: black}}
+ .isselected {{color: green;text-weight: bold}}
+ .invisible {{display: none}}
+ .selectable {{cursor: pointer}}
+ </style>
+ <script type="text/javascript" src="https://www.google.com/jsapi"></script>
+ {
+ for $kind in local:get-kinds()
+ let $kind-tm := local:compute-average($tmfiles/files/file,
+ $kind,
+ local:extract-x-axis-for-kind($kind))
+ let $kind-notm := local:compute-average($notmfiles/files/file,
+ $kind,
+ local:extract-x-axis-for-kind($kind))
+ return
+ <script type="text/javascript">
+ google.load("visualization", "1", {{packages:["corechart"]}});
+ google.setOnLoadCallback(drawChart);
+ function drawChart() {{
+ var data = new google.visualization.DataTable();
+ data.addColumn('string', '# Versions');
+ data.addColumn('number', 'Time Travel');
+ data.addColumn('number', 'No time travel');
+ data.addRows({count($kind-tm/values/value)});
+ {
+ for $t at $p in $kind-tm/values/value
+ let $t-notm := $kind-notm/values/value[version eq $t/version]
+ return
+ <dummy>data.setValue({$p - 1}, 0, '{$t/data(version)}');data.setValue({$p - 1}, 1, {$t/data(time)});data.setValue({$p - 1}, 2, {$t-notm/data(time)});</dummy>/data(.)
+ }
+ var chart = new google.visualization.LineChart(document.getElementById('chart_div_{$kind-tm/data(@name)}'));
+ chart.draw(data, {{width: 800, height: 240, title: 'y = execution time (ms) for the x-th execution of query {$kind-tm/data(@name)}'}});
+ }}
+ </script>
+ }
+ </head>
+ <body>
+ <div>
+ <h1>Measurement summary</h1>
+ {
+ for $kind in local:get-kinds()
+ let $kind-tm := local:compute-average($tmfiles/files/file,
+ $kind,
+ local:extract-x-axis-for-kind($kind))
+ let $kind-notm := local:compute-average($notmfiles/files/file,
+ $kind,
+ local:extract-x-axis-for-kind($kind))
+ return
+ let $average-time-tm := $kind-tm/data(average)
+ let $average-time-notm := $kind-notm/data(average)
+ let $standard-deviation-time-tm := math:sqrt(avg($kind-tm/values/value/math:pow(time - $average-time-tm, 2)))
+ let $standard-deviation-time-notm := math:sqrt(avg($kind-notm/values/value/math:pow(time - $average-time-notm,2)))
+ return
+ <div>
+ <h2>Kind: {$kind-tm/data(@name)}</h2>
+ <p>Execution time with time travel-enabled Sausalito: average {round($average-time-tm)} +/- {round($standard-deviation-time-tm)} ms</p>
+ <p>Execution time in original Sausalito: average {round($average-time-notm)} +/- {round($standard-deviation-time-notm)} ms</p>
+ <div id="chart_div_{$kind-tm/data(@name)}"/>
+ </div>
+ }
+ </div>
+ </body>
+ </html> :)
\ No newline at end of file
Added: trunk/MXQuery/notm.xml
===================================================================
--- trunk/MXQuery/notm.xml (rev 0)
+++ trunk/MXQuery/notm.xml 2011-08-17 13:59:55 UTC (rev 4436)
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
@@ Diff output truncated at 100000 characters. @@
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <et...@us...> - 2011-08-07 15:59:27
|
Revision: 4435
http://mxquery.svn.sourceforge.net/mxquery/?rev=4435&view=rev
Author: etterth
Date: 2011-08-07 15:59:21 +0000 (Sun, 07 Aug 2011)
Log Message:
-----------
- Removed Js test comparison workarounds (no NaN, -Infinity)
Modified Paths:
--------------
trunk/MXQuery/xqib_src/ch/ethz/mxqjs/test/TestValidator.java
Modified: trunk/MXQuery/xqib_src/ch/ethz/mxqjs/test/TestValidator.java
===================================================================
--- trunk/MXQuery/xqib_src/ch/ethz/mxqjs/test/TestValidator.java 2011-08-02 19:36:49 UTC (rev 4434)
+++ trunk/MXQuery/xqib_src/ch/ethz/mxqjs/test/TestValidator.java 2011-08-07 15:59:21 UTC (rev 4435)
@@ -14,22 +14,22 @@
if (str.equals(test)) {
return;
}
- if (str.replace('"', '\'').equals(test)) {
- return;
- }
- if (str.equals(test.replace('"', '\''))) {
- return;
- }
- // 1/0 is INF in JS
- if ("NaN".equals(str)) {
- if ("-INF".equals(test) || "INF".equals(test))
- return;
- }
- //there is no -0 in JS
- if ("-0".equals(str)) {
- if ("0".equals(test))
- return;
- }
+// if (str.replace('"', '\'').equals(test)) {
+// return;
+// }
+// if (str.equals(test.replace('"', '\''))) {
+// return;
+// }
+// // 1/0 is INF in JS
+// if ("NaN".equals(str)) {
+// if ("-INF".equals(test) || "INF".equals(test))
+// return;
+// }
+// //there is no -0 in JS
+// if ("-0".equals(str)) {
+// if ("0".equals(test))
+// return;
+// }
}
if (comparetype.equals("XML")) {
Document testdoc = parseDocument(test);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <et...@us...> - 2011-08-02 19:36:55
|
Revision: 4434
http://mxquery.svn.sourceforge.net/mxquery/?rev=4434&view=rev
Author: etterth
Date: 2011-08-02 19:36:49 +0000 (Tue, 02 Aug 2011)
Log Message:
-----------
possible fix for encoding errors in XQIB_Testing
Modified Paths:
--------------
trunk/XQIB_Testing/build.xml
Modified: trunk/XQIB_Testing/build.xml
===================================================================
--- trunk/XQIB_Testing/build.xml 2011-08-01 11:22:38 UTC (rev 4433)
+++ trunk/XQIB_Testing/build.xml 2011-08-02 19:36:49 UTC (rev 4434)
@@ -53,11 +53,13 @@
<target name="build-subprojects"/>
<target depends="init" name="build-project">
<echo message="${ant.project.name}: ${ant.file}"/>
- <javac debug="true" debuglevel="${debuglevel}" destdir="bin" source="${source}" target="${target}">
+ <javac debug="true" debuglevel="${debuglevel}"
+ destdir="bin" source="${source}" target="${target}" encoding="utf-8">
<src path="src"/>
<classpath refid="XQIB_Testing.classpath"/>
</javac>
- <javac debug="true" debuglevel="${debuglevel}" destdir="bin" source="${source}" target="${target}">
+ <javac debug="true" debuglevel="${debuglevel}"
+ destdir="bin" source="${source}" target="${target}" encoding="utf-8">
<src path="test"/>
<classpath refid="XQIB_Testing.classpath"/>
</javac>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <et...@us...> - 2011-08-01 11:22:44
|
Revision: 4433
http://mxquery.svn.sourceforge.net/mxquery/?rev=4433&view=rev
Author: etterth
Date: 2011-08-01 11:22:38 +0000 (Mon, 01 Aug 2011)
Log Message:
-----------
updated build script to automatically execute new browsertests
Modified Paths:
--------------
trunk/XQIB_Testing/build.xml
Modified: trunk/XQIB_Testing/build.xml
===================================================================
--- trunk/XQIB_Testing/build.xml 2011-08-01 11:13:40 UTC (rev 4432)
+++ trunk/XQIB_Testing/build.xml 2011-08-01 11:22:38 UTC (rev 4433)
@@ -409,7 +409,12 @@
<mkdir dir="${junit.output.dir}" />
<junit printsummary="withOutAndErr">
<formatter type="xml" />
- <test name="ch.ethz.mxquery.browsertests.MultiplicationTable" todir="${junit.output.dir}" />
+ <batchtest todir="${junit.output.dir}" >
+ <fileset dir="bin" >
+ <include name="ch/ethz/mxquery/browsertests/*.class"/>
+ </fileset>
+ </batchtest>
+
<classpath refid="XQIB_Testing.classpath" />
</junit>
</target>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <et...@us...> - 2011-08-01 11:13:46
|
Revision: 4432
http://mxquery.svn.sourceforge.net/mxquery/?rev=4432&view=rev
Author: etterth
Date: 2011-08-01 11:13:40 +0000 (Mon, 01 Aug 2011)
Log Message:
-----------
added JavaScript tests
Added Paths:
-----------
trunk/XQIB_Testing/src/ch/ethz/mxquery/browsertests/JsApi.java
trunk/XQIB_Testing/webapps/test/js-call1.html
trunk/XQIB_Testing/webapps/test/jsapi1.html
Added: trunk/XQIB_Testing/src/ch/ethz/mxquery/browsertests/JsApi.java
===================================================================
--- trunk/XQIB_Testing/src/ch/ethz/mxquery/browsertests/JsApi.java (rev 0)
+++ trunk/XQIB_Testing/src/ch/ethz/mxquery/browsertests/JsApi.java 2011-08-01 11:13:40 UTC (rev 4432)
@@ -0,0 +1,46 @@
+package ch.ethz.mxquery.browsertests;
+
+import java.util.List;
+import java.util.NoSuchElementException;
+
+import org.junit.Assert;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.openqa.selenium.WebElement;
+
+import ch.ethz.mxquery.testsuite.XQueryTestBase;
+
+public class JsApi extends XQueryTestBase {
+
+
+ @Test
+ /**
+ * call js from xqib
+ */
+ public void js_call() throws Exception {
+ driver.get("http://127.0.0.1:8090/test/js-call1.html");
+ String resultstr = driver.findElementById("a").getText();
+ Assert.assertEquals("the text was \"XQIB\"", resultstr);
+
+ }
+
+ @Test
+ /**
+ * call xqib from js
+ */
+ public void js_api() throws Exception {
+ driver.get("http://127.0.0.1:8090/test/jsapi1.html");
+ WebElement button = driver.findElementById("button");
+ button.click();
+
+ List<WebElement> result = driver.findElementsByXPath("//div[@id='output']/div");
+
+ Assert.assertEquals(result.size(), 2);
+ Assert.assertEquals(result.get(0).getText(),"div generated by XQIB with \"Some Text\" which was passed from JS");
+ Assert.assertEquals(result.get(1).getText(),"div generated by XQIB with \"Some more text\" which was passed from JS");
+
+
+
+ };
+
+}
Added: trunk/XQIB_Testing/webapps/test/js-call1.html
===================================================================
--- trunk/XQIB_Testing/webapps/test/js-call1.html (rev 0)
+++ trunk/XQIB_Testing/webapps/test/js-call1.html 2011-08-01 11:13:40 UTC (rev 4432)
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <title>XQIB: Sample page</title>
+ <meta charset="UTF-8"/>
+ <script type="text/javascript" src="mxqueryjs/mxqueryjs.nocache.js"></script>
+<script type="text/javascript">
+ foo = function (arg1){ return 'the text was "' + arg1 + '"';};
+</script>
+ <script type="application/xquery">
+ let $x := b:js-call('window.foo', string(b:dom()/id('a')/text()))
+ return
+ replace value of node b:dom()/id('a') with $x
+ </script>
+ </head>
+ <body>
+ <h1 id='a'>XQIB</h1>
+ </body>
+</html>
Added: trunk/XQIB_Testing/webapps/test/jsapi1.html
===================================================================
--- trunk/XQIB_Testing/webapps/test/jsapi1.html (rev 0)
+++ trunk/XQIB_Testing/webapps/test/jsapi1.html 2011-08-01 11:13:40 UTC (rev 4432)
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <title>XQIB: Sample page</title>
+ <meta charset="UTF-8"/>
+ <link href="style.css" rel="stylesheet" type="text/css">
+ <script type="text/javascript" src="mxqueryjs/mxqueryjs.nocache.js"></script>
+ <script type="application/xquery" >
+ module namespace m = "http://www.XQIB.org/module";
+
+ declare function m:generateDiv($node as node()+) {
+ for $x in $node/text()
+ return
+ <div>{concat('div generated by XQIB with "',$x,'" which was passed from JS')}</div>
+ };
+ </script>
+ <script type="text/javascript" >
+ handle = function () {
+ var output = xqib.call('http://www.XQIB.org/module','generateDiv',document.getElementsByTagName('h1'))
+ for (i=0;i<output.length;i++){
+ document.getElementById('output').appendChild(output[i]);
+ }
+ };
+ </script>
+ </head>
+ <body>
+ <a href="index.html"><< Index</a>
+ <h1>Some Text</h1>
+ <h1>Some more text</h1>
+ <div><a href="ModuleImport_new.html">Page</a> | <a href="ModuleImport_new_source.html">Source</a></div>
+ <input type='button' value='Test calling XQIB' onclick='handle()' id='button'/>
+<div id='output' />
+ </body>
+</html>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <et...@us...> - 2011-08-01 10:48:54
|
Revision: 4431
http://mxquery.svn.sourceforge.net/mxquery/?rev=4431&view=rev
Author: etterth
Date: 2011-08-01 10:48:47 +0000 (Mon, 01 Aug 2011)
Log Message:
-----------
forecast tests added
Added Paths:
-----------
trunk/XQIB_Testing/src/ch/ethz/mxquery/browsertests/AsyncWeatherForecast.java
trunk/XQIB_Testing/src/ch/ethz/mxquery/browsertests/WeatherForecast.java
trunk/XQIB_Testing/webapps/test/WeatherREST.html
trunk/XQIB_Testing/webapps/test/WeatherRESTasync.html
trunk/XQIB_Testing/webapps/test/forecast2.xml
Added: trunk/XQIB_Testing/src/ch/ethz/mxquery/browsertests/AsyncWeatherForecast.java
===================================================================
--- trunk/XQIB_Testing/src/ch/ethz/mxquery/browsertests/AsyncWeatherForecast.java (rev 0)
+++ trunk/XQIB_Testing/src/ch/ethz/mxquery/browsertests/AsyncWeatherForecast.java 2011-08-01 10:48:47 UTC (rev 4431)
@@ -0,0 +1,51 @@
+package ch.ethz.mxquery.browsertests;
+
+import java.util.List;
+import java.util.NoSuchElementException;
+
+import org.junit.Assert;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.openqa.selenium.WebElement;
+
+import ch.ethz.mxquery.testsuite.XQueryTestBase;
+
+public class AsyncWeatherForecast extends XQueryTestBase {
+
+ @BeforeClass
+ public static void page() {
+ driver.get("http://127.0.0.1:8090/test/WeatherRESTasync.html");
+ }
+
+ @Test
+ /**
+ * checks if the result is generated immediately or not
+ */
+ public void asyncness() throws Exception {
+ WebElement weather_textfield = driver.findElementByName("city");
+ weather_textfield.clear();
+ weather_textfield.sendKeys("Zurich");
+ WebElement weather_button = driver.findElementByName("button");
+ // weather_button.click();
+ Object result = driver
+ .executeScript("document.getElementsByName('button')[0].click();\n"
+ + "return document.getElementById('temperature') == null");
+ Assert.assertTrue("this implementation is not async", (Boolean) result);
+
+ };
+
+ @Test
+ public void zurich_weather() throws Exception {
+ WebElement weather_textfield = driver.findElementByName("city");
+ weather_textfield.clear();
+ weather_textfield.sendKeys("Zurich");
+ WebElement weather_button = driver.findElementByName("button");
+ weather_button.click();
+ Thread.sleep(2000);
+ WebElement temperature_container = driver
+ .findElementById("temperature");
+ String temperature = temperature_container.getText();
+
+ Assert.assertEquals("20 °C", temperature);
+ };
+}
Added: trunk/XQIB_Testing/src/ch/ethz/mxquery/browsertests/WeatherForecast.java
===================================================================
--- trunk/XQIB_Testing/src/ch/ethz/mxquery/browsertests/WeatherForecast.java (rev 0)
+++ trunk/XQIB_Testing/src/ch/ethz/mxquery/browsertests/WeatherForecast.java 2011-08-01 10:48:47 UTC (rev 4431)
@@ -0,0 +1,50 @@
+package ch.ethz.mxquery.browsertests;
+
+import java.util.List;
+
+import org.junit.Assert;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.openqa.selenium.WebElement;
+
+import ch.ethz.mxquery.testsuite.XQueryTestBase;
+
+public class WeatherForecast extends XQueryTestBase {
+ @BeforeClass
+ public static void page() {
+ driver.get("http://127.0.0.1:8090/test/WeatherREST.html");
+ }
+
+ @Test
+ /**
+ * checks if the result is generated immediately or not
+ */
+ public void non_asyncness() throws Exception {
+ WebElement weather_textfield = driver.findElementByName("city");
+ weather_textfield.clear();
+ weather_textfield.sendKeys("Zurich");
+ WebElement weather_button = driver.findElementByName("button");
+ // weather_button.click();
+ Object result = driver
+ .executeScript("document.getElementsByName('button')[0].click();\n"
+ + "return document.getElementById('temperature') == null");
+ Assert.assertFalse("this implementation is async", (Boolean) result);
+
+ };
+
+ @Test
+ public void zurich_weather() throws Exception {
+ // driver.get("http://127.0.0.1:8090/test/WeatherREST.html");
+ WebElement weather_textfield = driver.findElementByName("city");
+ weather_textfield.clear();
+ weather_textfield.sendKeys("Zurich");
+ WebElement weather_button = driver.findElementByName("button");
+ weather_button.click();
+ WebElement temperature_container = driver
+ .findElementById("temperature");
+ String temperature = temperature_container.getText();
+
+ Assert.assertEquals("20 °C", temperature);
+ };
+
+}
Added: trunk/XQIB_Testing/webapps/test/WeatherREST.html
===================================================================
--- trunk/XQIB_Testing/webapps/test/WeatherREST.html (rev 0)
+++ trunk/XQIB_Testing/webapps/test/WeatherREST.html 2011-08-01 10:48:47 UTC (rev 4431)
@@ -0,0 +1,62 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <title>XQIB: Sample page</title>
+ <meta charset="UTF-8"/>
+ <link href="style.css" rel="stylesheet" type="text/css">
+ <script type="text/javascript" src="mxqueryjs/mxqueryjs.nocache.js"></script>
+ <script type="application/xquery">
+ import module namespace http-client = "http://expath.org/ns/http-client";
+
+ declare updating function local:getWeather($loc, $evtObj) {
+ let $city := b:dom()//input[@name="city"]/data(@value)
+ let $forecast := http-client:send-request(
+ <http-client:request href="forecast2.xml" method="get"/>
+ )[2]/*:forecast
+ let $currentcity := $forecast/*:city[@*:name=$city]
+ return
+ if (count($currentcity) = 0)
+ then
+ insert node
+ <div id="result">City not found! Please try one of:
+ <ul>{
+ for $i in $forecast/*:city
+ return <li>{$i/data(@*:name)}</li>
+ }</ul>
+ </div>
+ as last into b:dom()//body
+ else
+ insert node
+ <div id="result">
+ <h1>Weather in {$city}</h1>
+ <p id="temperature">{$currentcity/*:temperature/text()} °C</p>
+ <p>{
+ if($currentcity/*:weather = "Sunny")
+ then
+ <img src="sunny.gif"/>
+ else if ($currentcity/*:weather = "Cloudy")
+ then
+ <img src="cloudy.gif"/>
+ else
+ <img src="rainy.gif"/>
+ }</p>
+ </div>
+ as last into b:dom()//body,
+ delete node b:dom()//div
+ };
+
+
+ b:addEventListener(b:dom()//input[@name="button"], "onclick", local:getWeather#2)
+
+ </script>
+ </head>
+ <body>
+ <a href="index.html"><< Index</a>
+ <h1>Weather forecast</h1>
+ <a href="WeatherREST.html">Page</a> | <a href="WeatherREST_source.html">Source</a>
+ <p/>
+ <input type="text" value="" style="font-size: 30pt; font-weight: bold" name="city"/>
+ <input type="button" value="Go!" style="font-size: 30pt; font-weight: bold" name="button"/>
+ <div id="result"><img src="JupiterZeus.gif"/></div>
+ </body>
+</html>
Added: trunk/XQIB_Testing/webapps/test/WeatherRESTasync.html
===================================================================
--- trunk/XQIB_Testing/webapps/test/WeatherRESTasync.html (rev 0)
+++ trunk/XQIB_Testing/webapps/test/WeatherRESTasync.html 2011-08-01 10:48:47 UTC (rev 4431)
@@ -0,0 +1,66 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <title>XQIB: Sample page</title>
+ <meta charset="UTF-8"/>
+ <link href="style.css" rel="stylesheet" type="text/css">
+ <script type="text/javascript" src="mxqueryjs/mxqueryjs.nocache.js"></script>
+ <script type="application/xquery">
+ import module namespace http-client = "http://expath.org/ns/http-client";
+
+ declare updating function local:weatherResult($result){
+ let $city := b:dom()//input[@name="city"]/data(@value)
+ let $forecast := $result[2]/*:forecast
+ let $currentcity := $forecast/*:city[@*:name=$city]
+ return
+ if (count($currentcity) = 0)
+ then
+ insert node
+ <div id="result">City not found! Please try one of:
+ <ul>{
+ for $i in $forecast/*:city
+ return <li>{$i/data(@*:name)}</li>
+ }</ul>
+ </div>
+ as last into b:dom()//body
+ else
+ insert node
+ <div id="result">
+ <h1>Weather in {$city}</h1>
+ <p id="temperature">{$currentcity/*:temperature/text()} °C</p>
+ <p>{
+ if($currentcity/*:weather = "Sunny")
+ then
+ <img src="sunny.gif"/>
+ else if ($currentcity/*:weather = "Cloudy")
+ then
+ <img src="cloudy.gif"/>
+ else
+ <img src="rainy.gif"/>
+ }</p>
+ </div>
+ as last into b:dom()//body,
+ delete node b:dom()//div
+ };
+
+ declare updating function local:getWeather($loc, $evtObj) {
+ http-client:async-request(<http-client:request href="forecast2.xml" method="get"/>,
+ local:weatherResult#1
+ )
+ };
+
+
+ b:addEventListener(b:dom()//input[@name="button"], "onclick", local:getWeather#2)
+
+ </script>
+ </head>
+ <body>
+ <a href="index.html"><< Index</a>
+ <h1>Weather forecast</h1>
+ <a href="WeatherREST.html">Page</a> | <a href="WeatherREST_source.html">Source</a>
+ <p/>
+ <input type="text" value="" style="font-size: 30pt; font-weight: bold" name="city"/>
+ <input type="button" value="Go!" style="font-size: 30pt; font-weight: bold" name="button"/>
+ <div id="result"><img src="JupiterZeus.gif"/></div>
+ </body>
+</html>
Added: trunk/XQIB_Testing/webapps/test/forecast2.xml
===================================================================
--- trunk/XQIB_Testing/webapps/test/forecast2.xml (rev 0)
+++ trunk/XQIB_Testing/webapps/test/forecast2.xml 2011-08-01 10:48:47 UTC (rev 4431)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<forecast>
+ <city name="Zurich">
+ <weather>Sunny</weather>
+ <temperature>20</temperature>
+ </city>
+ <city name="Paris">
+ <weather>Cloudy</weather>
+ <temperature>15</temperature>
+ </city>
+ <city name="London">
+ <weather>Rainy</weather>
+ <temperature>10</temperature>
+ </city>
+ <city name="Vancouver">
+ <weather>Sunny</weather>
+ <temperature>25</temperature>
+ </city>
+</forecast>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <et...@us...> - 2011-07-21 10:40:39
|
Revision: 4430
http://mxquery.svn.sourceforge.net/mxquery/?rev=4430&view=rev
Author: etterth
Date: 2011-07-21 10:40:33 +0000 (Thu, 21 Jul 2011)
Log Message:
-----------
- Changed test name so that it should work without annotation support
Modified Paths:
--------------
trunk/XQIB_Testing/src/ch/ethz/mxquery/browsertests/MultiplicationTable.java
Modified: trunk/XQIB_Testing/src/ch/ethz/mxquery/browsertests/MultiplicationTable.java
===================================================================
--- trunk/XQIB_Testing/src/ch/ethz/mxquery/browsertests/MultiplicationTable.java 2011-07-21 10:15:40 UTC (rev 4429)
+++ trunk/XQIB_Testing/src/ch/ethz/mxquery/browsertests/MultiplicationTable.java 2011-07-21 10:40:33 UTC (rev 4430)
@@ -9,7 +9,7 @@
import ch.ethz.mxquery.testsuite.XQueryTestBase;
public class MultiplicationTable extends XQueryTestBase{
@Test
- public void plus_generates_result() throws Exception{
+ public void test_plus_generates_result() throws Exception{
driver.get("http://127.0.0.1:8090/test/MultiplicationTable.html");
WebElement plus_button = driver.findElementById("buttonplus");
plus_button.click();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <et...@us...> - 2011-07-21 10:15:46
|
Revision: 4429
http://mxquery.svn.sourceforge.net/mxquery/?rev=4429&view=rev
Author: etterth
Date: 2011-07-21 10:15:40 +0000 (Thu, 21 Jul 2011)
Log Message:
-----------
- More status messages for test cases
Modified Paths:
--------------
trunk/XQIB_Testing/src/ch/ethz/mxquery/testsuite/XQueryTestBase.java
Modified: trunk/XQIB_Testing/src/ch/ethz/mxquery/testsuite/XQueryTestBase.java
===================================================================
--- trunk/XQIB_Testing/src/ch/ethz/mxquery/testsuite/XQueryTestBase.java 2011-07-21 10:07:44 UTC (rev 4428)
+++ trunk/XQIB_Testing/src/ch/ethz/mxquery/testsuite/XQueryTestBase.java 2011-07-21 10:15:40 UTC (rev 4429)
@@ -13,8 +13,11 @@
@BeforeClass
public static void setUp() {
try {
+ System.out.println("Starting firefox driver");
driver = new FirefoxDriver();
+ System.out.println("firefox driver started");
driver.get("http://127.0.0.1:8090/test/test.html");
+ System.out.println("loaded page with title " + driver.getTitle());
} catch (Throwable e) {
e.printStackTrace();
// TODO: handle exception
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <et...@us...> - 2011-07-21 10:07:50
|
Revision: 4428
http://mxquery.svn.sourceforge.net/mxquery/?rev=4428&view=rev
Author: etterth
Date: 2011-07-21 10:07:44 +0000 (Thu, 21 Jul 2011)
Log Message:
-----------
- Added printing for errors in Test Setup
Modified Paths:
--------------
trunk/XQIB_Testing/src/ch/ethz/mxquery/testsuite/XQueryTestBase.java
Modified: trunk/XQIB_Testing/src/ch/ethz/mxquery/testsuite/XQueryTestBase.java
===================================================================
--- trunk/XQIB_Testing/src/ch/ethz/mxquery/testsuite/XQueryTestBase.java 2011-07-18 16:56:47 UTC (rev 4427)
+++ trunk/XQIB_Testing/src/ch/ethz/mxquery/testsuite/XQueryTestBase.java 2011-07-21 10:07:44 UTC (rev 4428)
@@ -11,16 +11,20 @@
protected static RemoteWebDriver driver;
@BeforeClass
- public static void setUp() throws Exception {
- driver = new FirefoxDriver();
-
- driver.get("http://127.0.0.1:8090/test/test.html");
-// driver.get("http://127.0.0.1:8888/asyncREST.html?gwt.codesvr=127.0.0.1:9997");
+ public static void setUp() {
+ try {
+ driver = new FirefoxDriver();
+ driver.get("http://127.0.0.1:8090/test/test.html");
+ } catch (Throwable e) {
+ e.printStackTrace();
+ // TODO: handle exception
+ }
+ // driver.get("http://127.0.0.1:8888/asyncREST.html?gwt.codesvr=127.0.0.1:9997");
}
@AfterClass
public static void tearDown() throws Exception {
driver.close();
}
-
+
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <et...@us...> - 2011-07-18 16:56:53
|
Revision: 4427
http://mxquery.svn.sourceforge.net/mxquery/?rev=4427&view=rev
Author: etterth
Date: 2011-07-18 16:56:47 +0000 (Mon, 18 Jul 2011)
Log Message:
-----------
added logs directory for XQIB tests
Added Paths:
-----------
trunk/XQIB_Testing/lib/apache-tomcat-6.0.32/logs/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <et...@us...> - 2011-07-02 17:08:25
|
Revision: 4426
http://mxquery.svn.sourceforge.net/mxquery/?rev=4426&view=rev
Author: etterth
Date: 2011-07-02 17:08:19 +0000 (Sat, 02 Jul 2011)
Log Message:
-----------
- Fix for tests
Modified Paths:
--------------
trunk/MXQuery_Testing/src/ch/ethz/mxquery/smstest/DirectStoreRandomFifo.java
trunk/MXQuery_Testing/src/ch/ethz/mxquery/smstest/DirectStoreSharedRandomFifo.java
trunk/MXQuery_Testing/src/ch/ethz/mxquery/smstest/DirectStoreWrapped.java
trunk/MXQuery_Testing/src/ch/ethz/mxquery/smstest/DirectStoreWrappedAtomic.java
trunk/MXQuery_Testing/src/ch/ethz/mxquery/smstest/DirectStoreWrappedComment.java
trunk/MXQuery_Testing/src/ch/ethz/mxquery/smstest/DirectStoreWrappedThread.java
trunk/MXQuery_Testing/src/ch/ethz/mxquery/smstest/GKQueryOutputQueue.java
trunk/MXQuery_Testing/src/ch/ethz/mxquery/smstest/GKQueryThread.java
trunk/MXQuery_Testing/src/ch/ethz/mxquery/smstest/QueryThreadOutputQueue.java
Modified: trunk/MXQuery_Testing/src/ch/ethz/mxquery/smstest/DirectStoreRandomFifo.java
===================================================================
--- trunk/MXQuery_Testing/src/ch/ethz/mxquery/smstest/DirectStoreRandomFifo.java 2011-07-02 16:37:07 UTC (rev 4425)
+++ trunk/MXQuery_Testing/src/ch/ethz/mxquery/smstest/DirectStoreRandomFifo.java 2011-07-02 17:08:19 UTC (rev 4426)
@@ -89,7 +89,7 @@
new StringReader(item3), true, Context.NO_VALIDATION,
QueryLocation.OUTSIDE_QUERY_LOC);
- Window wnd = ss.getIterator(Context.getGlobalContext());
+ Window wnd = (Window) ss.getIterator(Context.getGlobalContext());
//iss.getInitialLocks();
Modified: trunk/MXQuery_Testing/src/ch/ethz/mxquery/smstest/DirectStoreSharedRandomFifo.java
===================================================================
--- trunk/MXQuery_Testing/src/ch/ethz/mxquery/smstest/DirectStoreSharedRandomFifo.java 2011-07-02 16:37:07 UTC (rev 4425)
+++ trunk/MXQuery_Testing/src/ch/ethz/mxquery/smstest/DirectStoreSharedRandomFifo.java 2011-07-02 17:08:19 UTC (rev 4426)
@@ -89,7 +89,7 @@
new StringReader(item3), true, Context.NO_VALIDATION,
QueryLocation.OUTSIDE_QUERY_LOC);
- Window wnd = ss.getIterator(Context.getGlobalContext());
+ Window wnd = (Window) ss.getIterator(Context.getGlobalContext());
//iss.getInitialLocks();
Modified: trunk/MXQuery_Testing/src/ch/ethz/mxquery/smstest/DirectStoreWrapped.java
===================================================================
--- trunk/MXQuery_Testing/src/ch/ethz/mxquery/smstest/DirectStoreWrapped.java 2011-07-02 16:37:07 UTC (rev 4425)
+++ trunk/MXQuery_Testing/src/ch/ethz/mxquery/smstest/DirectStoreWrapped.java 2011-07-02 17:08:19 UTC (rev 4426)
@@ -78,7 +78,7 @@
new StringReader(item3), true, Context.NO_VALIDATION,
QueryLocation.OUTSIDE_QUERY_LOC);
- Window wnd = iss.getStore().getIterator(Context.getGlobalContext());
+ Window wnd = (Window) iss.getStore().getIterator(Context.getGlobalContext());
//iss.getInitialLocks();
Modified: trunk/MXQuery_Testing/src/ch/ethz/mxquery/smstest/DirectStoreWrappedAtomic.java
===================================================================
--- trunk/MXQuery_Testing/src/ch/ethz/mxquery/smstest/DirectStoreWrappedAtomic.java 2011-07-02 16:37:07 UTC (rev 4425)
+++ trunk/MXQuery_Testing/src/ch/ethz/mxquery/smstest/DirectStoreWrappedAtomic.java 2011-07-02 17:08:19 UTC (rev 4426)
@@ -72,7 +72,7 @@
// new StringReader(item2), true, Context.NO_VALIDATION,
// QueryLocation.OUTSIDE_QUERY_LOC);
- Window wnd = iss.getStore().getIterator(Context.getGlobalContext());
+ Window wnd = (Window) iss.getStore().getIterator(Context.getGlobalContext());
//iss.getInitialLocks();
Modified: trunk/MXQuery_Testing/src/ch/ethz/mxquery/smstest/DirectStoreWrappedComment.java
===================================================================
--- trunk/MXQuery_Testing/src/ch/ethz/mxquery/smstest/DirectStoreWrappedComment.java 2011-07-02 16:37:07 UTC (rev 4425)
+++ trunk/MXQuery_Testing/src/ch/ethz/mxquery/smstest/DirectStoreWrappedComment.java 2011-07-02 17:08:19 UTC (rev 4426)
@@ -73,7 +73,7 @@
// new StringReader(item2), true, Context.NO_VALIDATION,
// QueryLocation.OUTSIDE_QUERY_LOC);
- Window wnd = iss.getStore().getIterator(Context.getGlobalContext());
+ Window wnd = (Window) iss.getStore().getIterator(Context.getGlobalContext());
//iss.getInitialLocks();
Modified: trunk/MXQuery_Testing/src/ch/ethz/mxquery/smstest/DirectStoreWrappedThread.java
===================================================================
--- trunk/MXQuery_Testing/src/ch/ethz/mxquery/smstest/DirectStoreWrappedThread.java 2011-07-02 16:37:07 UTC (rev 4425)
+++ trunk/MXQuery_Testing/src/ch/ethz/mxquery/smstest/DirectStoreWrappedThread.java 2011-07-02 17:08:19 UTC (rev 4426)
@@ -98,7 +98,7 @@
feed.start();
- Window wnd = iss.getStore().getIterator(Context.getGlobalContext());
+ Window wnd = (Window) iss.getStore().getIterator(Context.getGlobalContext());
//iss.getInitialLocks();
Modified: trunk/MXQuery_Testing/src/ch/ethz/mxquery/smstest/GKQueryOutputQueue.java
===================================================================
--- trunk/MXQuery_Testing/src/ch/ethz/mxquery/smstest/GKQueryOutputQueue.java 2011-07-02 16:37:07 UTC (rev 4425)
+++ trunk/MXQuery_Testing/src/ch/ethz/mxquery/smstest/GKQueryOutputQueue.java 2011-07-02 17:08:19 UTC (rev 4426)
@@ -92,7 +92,7 @@
ser.setOmitXMLDeclaration(true);
XDMSerializer ip = new XDMSerializer(ser);
try {
- IndexIterator xi = outputQueue.getIterator(Context.getGlobalContext());
+ IndexIterator xi = (IndexIterator) outputQueue.getIterator(Context.getGlobalContext());
while (xi.hasNextItem()) {
String item = ip.eventsToXML(xi.nextItem());
System.out.println(item);
@@ -152,7 +152,7 @@
StreamStore sr = result.getContext().getStores().createStreamStore(
StoreFactory.LAZY_SEQ_FIFO, "output-stream");
sr.setIterator(result);
- Window output = sr.getIterator(result.getContext());
+ Window output = (Window) sr.getIterator(result.getContext());
Window curr = null;
XDMSerializerSettings ser = new XDMSerializerSettings();
ser.setOmitXMLDeclaration(true);
Modified: trunk/MXQuery_Testing/src/ch/ethz/mxquery/smstest/GKQueryThread.java
===================================================================
--- trunk/MXQuery_Testing/src/ch/ethz/mxquery/smstest/GKQueryThread.java 2011-07-02 16:37:07 UTC (rev 4425)
+++ trunk/MXQuery_Testing/src/ch/ethz/mxquery/smstest/GKQueryThread.java 2011-07-02 17:08:19 UTC (rev 4426)
@@ -127,7 +127,7 @@
StreamStore sr = result.getContext().getStores().createStreamStore(
StoreFactory.LAZY_SEQ_FIFO, "output-stream");
sr.setIterator(result);
- Window output = sr.getIterator(result.getContext());
+ Window output = (Window) sr.getIterator(result.getContext());
//iss.getInitialLocks();
Modified: trunk/MXQuery_Testing/src/ch/ethz/mxquery/smstest/QueryThreadOutputQueue.java
===================================================================
--- trunk/MXQuery_Testing/src/ch/ethz/mxquery/smstest/QueryThreadOutputQueue.java 2011-07-02 16:37:07 UTC (rev 4425)
+++ trunk/MXQuery_Testing/src/ch/ethz/mxquery/smstest/QueryThreadOutputQueue.java 2011-07-02 17:08:19 UTC (rev 4426)
@@ -127,7 +127,7 @@
StreamStore sr = result.getContext().getStores().createStreamStore(
StoreFactory.LAZY_SEQ_FIFO, "output-stream");
sr.setIterator(result);
- Window output = sr.getIterator(result.getContext());
+ Window output = (Window) sr.getIterator(result.getContext());
//iss.getInitialLocks();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <et...@us...> - 2011-07-02 16:37:14
|
Revision: 4425
http://mxquery.svn.sourceforge.net/mxquery/?rev=4425&view=rev
Author: etterth
Date: 2011-07-02 16:37:07 +0000 (Sat, 02 Jul 2011)
Log Message:
-----------
- possible fix for midp build
Modified Paths:
--------------
trunk/MXQuery/midp_src/ch/ethz/mxquery/bindings/WindowBuffer.java
trunk/MXQuery/midp_src/ch/ethz/mxquery/sms/MMimpl/TokenBufferStore.java
Modified: trunk/MXQuery/midp_src/ch/ethz/mxquery/bindings/WindowBuffer.java
===================================================================
--- trunk/MXQuery/midp_src/ch/ethz/mxquery/bindings/WindowBuffer.java 2011-07-02 14:59:31 UTC (rev 4424)
+++ trunk/MXQuery/midp_src/ch/ethz/mxquery/bindings/WindowBuffer.java 2011-07-02 16:37:07 UTC (rev 4425)
@@ -26,6 +26,7 @@
import ch.ethz.mxquery.datamodel.MXQueryNumber;
import ch.ethz.mxquery.datamodel.Source;
import ch.ethz.mxquery.model.DataflowAnalysis;
+import ch.ethz.mxquery.model.Iterator;
import ch.ethz.mxquery.model.XDMIterator;
import ch.ethz.mxquery.bindings.WindowBuffer;
import ch.ethz.mxquery.bindings.WindowEarlyBindingParallel;
@@ -465,7 +466,7 @@
return null;
}
- public Window getIterator(Context ctx) throws MXQueryException {
+ public Iterator getIterator(Context ctx) throws MXQueryException {
return tokenBuffer.getIterator(ctx);
}
Modified: trunk/MXQuery/midp_src/ch/ethz/mxquery/sms/MMimpl/TokenBufferStore.java
===================================================================
--- trunk/MXQuery/midp_src/ch/ethz/mxquery/sms/MMimpl/TokenBufferStore.java 2011-07-02 14:59:31 UTC (rev 4424)
+++ trunk/MXQuery/midp_src/ch/ethz/mxquery/sms/MMimpl/TokenBufferStore.java 2011-07-02 16:37:07 UTC (rev 4425)
@@ -18,6 +18,7 @@
import ch.ethz.mxquery.bindings.WindowBuffer;
import ch.ethz.mxquery.exceptions.MXQueryException;
import ch.ethz.mxquery.datamodel.Identifier;
+import ch.ethz.mxquery.model.Iterator;
import ch.ethz.mxquery.model.XDMIterator;
import ch.ethz.mxquery.model.Window;
import ch.ethz.mxquery.sms.interfaces.AppendUpdate;
@@ -710,7 +711,7 @@
}
- public Window getIterator(Context ctx) throws MXQueryException{
+ public Iterator getIterator(Context ctx) throws MXQueryException{
Window wnd = cont.getNewWindowIterator(1, Window.END_OF_STREAM_POSITION);
wnd.setContext(ctx, false);
return wnd;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <et...@us...> - 2011-07-02 14:59:39
|
Revision: 4424
http://mxquery.svn.sourceforge.net/mxquery/?rev=4424&view=rev
Author: etterth
Date: 2011-07-02 14:59:31 +0000 (Sat, 02 Jul 2011)
Log Message:
-----------
- Used Iterator instead of Window in Source.getIterator
Modified Paths:
--------------
trunk/MXQuery/src/ch/ethz/mxquery/bindings/WindowBuffer.java
trunk/MXQuery/src/ch/ethz/mxquery/bindings/WindowFactory.java
trunk/MXQuery/src/ch/ethz/mxquery/datamodel/Source.java
trunk/MXQuery/src/ch/ethz/mxquery/dmcq/Gatekeeper.java
trunk/MXQuery/src/ch/ethz/mxquery/dmcq/Merger.java
trunk/MXQuery/src/ch/ethz/mxquery/dmcq/QueryVersion.java
trunk/MXQuery/src/ch/ethz/mxquery/extensionsModules/expathhttp/HttpIO.java
trunk/MXQuery/src/ch/ethz/mxquery/extensionsModules/zorbaRest/HttpIO.java
trunk/MXQuery/src/ch/ethz/mxquery/iterators/ComputedCommentConstrIterator.java
trunk/MXQuery/src/ch/ethz/mxquery/iterators/ComputedPIConstrIterator.java
trunk/MXQuery/src/ch/ethz/mxquery/iterators/ComputedTextConstrIterator.java
trunk/MXQuery/src/ch/ethz/mxquery/iterators/TokenIterator.java
trunk/MXQuery/src/ch/ethz/mxquery/iterators/XMLAttrIterator.java
trunk/MXQuery/src/ch/ethz/mxquery/iterators/XMLContent.java
trunk/MXQuery/src/ch/ethz/mxquery/iterators/update/TransformIterator.java
trunk/MXQuery/src/ch/ethz/mxquery/model/updatePrimitives/PendingUpdateList.java
trunk/MXQuery/src/ch/ethz/mxquery/sms/MMimpl/FIFOStore.java
trunk/MXQuery/src/ch/ethz/mxquery/sms/MMimpl/InPlaceStore.java
trunk/MXQuery/src/ch/ethz/mxquery/sms/MMimpl/IndexRandomStore.java
trunk/MXQuery/src/ch/ethz/mxquery/sms/MMimpl/LazyFIFOStore.java
trunk/MXQuery/src/ch/ethz/mxquery/sms/MMimpl/UpdateTokenBuffer.java
trunk/MXQuery/src/ch/ethz/mxquery/update/store/llImpl/LLStore.java
trunk/MXQuery/src/ch/ethz/mxquery/update/store/llImpl/LLStoreIterator.java
trunk/MXQuery/src/ch/ethz/mxquery/update/store/llImpl/LLStoreSet.java
trunk/MXQuery/src/ch/ethz/mxquery/xdmio/xmlAdapters/XDMImportAdapter.java
trunk/MXQuery/src/examples/StreamLifecycleExample.java
Modified: trunk/MXQuery/src/ch/ethz/mxquery/bindings/WindowBuffer.java
===================================================================
--- trunk/MXQuery/src/ch/ethz/mxquery/bindings/WindowBuffer.java 2011-07-01 02:44:27 UTC (rev 4423)
+++ trunk/MXQuery/src/ch/ethz/mxquery/bindings/WindowBuffer.java 2011-07-02 14:59:31 UTC (rev 4424)
@@ -26,6 +26,7 @@
import ch.ethz.mxquery.exceptions.MXQueryException;
import ch.ethz.mxquery.iterators.VariableIterator;
import ch.ethz.mxquery.model.DataflowAnalysis;
+import ch.ethz.mxquery.model.Iterator;
import ch.ethz.mxquery.model.VariableHolder;
import ch.ethz.mxquery.model.WindowVariable;
import ch.ethz.mxquery.model.Window;
@@ -463,7 +464,7 @@
return null;
}
- public Window getIterator(Context ctx) throws MXQueryException {
+ public Iterator getIterator(Context ctx) throws MXQueryException {
return tokenBuffer.getIterator(ctx);
}
Modified: trunk/MXQuery/src/ch/ethz/mxquery/bindings/WindowFactory.java
===================================================================
--- trunk/MXQuery/src/ch/ethz/mxquery/bindings/WindowFactory.java 2011-07-01 02:44:27 UTC (rev 4423)
+++ trunk/MXQuery/src/ch/ethz/mxquery/bindings/WindowFactory.java 2011-07-02 14:59:31 UTC (rev 4424)
@@ -63,7 +63,7 @@
newSource.setIterator(sourceIter);
MaterializingStore ms = (MaterializingStore)newSource;
ms.materialize();
- Window ret = newSource.getIterator(runtime);
+ Window ret = (Window) newSource.getIterator(runtime);
return ret;
// }
}
Modified: trunk/MXQuery/src/ch/ethz/mxquery/datamodel/Source.java
===================================================================
--- trunk/MXQuery/src/ch/ethz/mxquery/datamodel/Source.java 2011-07-01 02:44:27 UTC (rev 4423)
+++ trunk/MXQuery/src/ch/ethz/mxquery/datamodel/Source.java 2011-07-02 14:59:31 UTC (rev 4424)
@@ -19,7 +19,7 @@
import ch.ethz.mxquery.contextConfig.Context;
import ch.ethz.mxquery.exceptions.MXQueryException;
-import ch.ethz.mxquery.model.Window;
+import ch.ethz.mxquery.model.Iterator;
/**
* Interface for sources that can provide nodes with IDs
@@ -40,7 +40,7 @@
* @return Iterator a (Window) Iterator to access the contents of this source
* @throws MXQueryException
*/
- public Window getIterator(Context ctx) throws MXQueryException;
+ public Iterator getIterator(Context ctx) throws MXQueryException;
public Source copySource(Context ctx, Vector nestedPredCtxStack) throws MXQueryException;
/**
Modified: trunk/MXQuery/src/ch/ethz/mxquery/dmcq/Gatekeeper.java
===================================================================
--- trunk/MXQuery/src/ch/ethz/mxquery/dmcq/Gatekeeper.java 2011-07-01 02:44:27 UTC (rev 4423)
+++ trunk/MXQuery/src/ch/ethz/mxquery/dmcq/Gatekeeper.java 2011-07-02 14:59:31 UTC (rev 4424)
@@ -58,7 +58,7 @@
this.coor = qv.getCoordinator();
}
//TODO: Ask Peter about the context that is required in this case
- underlying = iss.getStore().getIterator(null);
+ underlying = (Window) iss.getStore().getIterator(null);
} catch (Exception e) {
e.printStackTrace();
}
Modified: trunk/MXQuery/src/ch/ethz/mxquery/dmcq/Merger.java
===================================================================
--- trunk/MXQuery/src/ch/ethz/mxquery/dmcq/Merger.java 2011-07-01 02:44:27 UTC (rev 4423)
+++ trunk/MXQuery/src/ch/ethz/mxquery/dmcq/Merger.java 2011-07-02 14:59:31 UTC (rev 4424)
@@ -609,7 +609,7 @@
private void init() throws MXQueryException {
- outputWindow = outputQueue.getIterator(context);
+ outputWindow = (Window) outputQueue.getIterator(context);
MergeThread mt = new MergeThread();
mt.start();
called ++;
Modified: trunk/MXQuery/src/ch/ethz/mxquery/dmcq/QueryVersion.java
===================================================================
--- trunk/MXQuery/src/ch/ethz/mxquery/dmcq/QueryVersion.java 2011-07-01 02:44:27 UTC (rev 4423)
+++ trunk/MXQuery/src/ch/ethz/mxquery/dmcq/QueryVersion.java 2011-07-02 14:59:31 UTC (rev 4424)
@@ -262,7 +262,7 @@
StreamStore sr = result.getContext().getStores().createStreamStore(
StoreFactory.LAZY_SEQ_FIFO, "output-stream");
sr.setIterator(result);
- this.output = sr.getIterator(result.getContext());
+ this.output = (Window) sr.getIterator(result.getContext());
Vector xm = result.getAllSubItersRecursive();
for (int i=0;i<xm.size();i++) {
Modified: trunk/MXQuery/src/ch/ethz/mxquery/extensionsModules/expathhttp/HttpIO.java
===================================================================
--- trunk/MXQuery/src/ch/ethz/mxquery/extensionsModules/expathhttp/HttpIO.java 2011-07-01 02:44:27 UTC (rev 4423)
+++ trunk/MXQuery/src/ch/ethz/mxquery/extensionsModules/expathhttp/HttpIO.java 2011-07-02 14:59:31 UTC (rev 4424)
@@ -57,8 +57,8 @@
import ch.ethz.mxquery.iterators.SequenceTypeIterator;
import ch.ethz.mxquery.iterators.TokenIterator;
import ch.ethz.mxquery.model.CurrentBasedIterator;
+import ch.ethz.mxquery.model.Iterator;
import ch.ethz.mxquery.model.Wildcard;
-import ch.ethz.mxquery.model.Window;
import ch.ethz.mxquery.model.XDMIterator;
import ch.ethz.mxquery.model.ws.MultiPartFormOutputStream;
import ch.ethz.mxquery.query.PreparedStatement;
@@ -814,7 +814,7 @@
return (Source) copy(ctx, null, false, nestedPredCtxStack);
}
- public Window getIterator(Context ctx) throws MXQueryException {
+ public Iterator getIterator(Context ctx) throws MXQueryException {
return WindowFactory.getNewWindow(context, this); }
public String getURI() {
Modified: trunk/MXQuery/src/ch/ethz/mxquery/extensionsModules/zorbaRest/HttpIO.java
===================================================================
--- trunk/MXQuery/src/ch/ethz/mxquery/extensionsModules/zorbaRest/HttpIO.java 2011-07-01 02:44:27 UTC (rev 4423)
+++ trunk/MXQuery/src/ch/ethz/mxquery/extensionsModules/zorbaRest/HttpIO.java 2011-07-02 14:59:31 UTC (rev 4424)
@@ -53,8 +53,8 @@
import ch.ethz.mxquery.functions.fn.EncodeForURI;
import ch.ethz.mxquery.iterators.TokenIterator;
import ch.ethz.mxquery.model.CurrentBasedIterator;
+import ch.ethz.mxquery.model.Iterator;
import ch.ethz.mxquery.model.TokenSequenceIterator;
-import ch.ethz.mxquery.model.Window;
import ch.ethz.mxquery.model.XDMIterator;
import ch.ethz.mxquery.model.ws.MultiPartFormOutputStream;
import ch.ethz.mxquery.util.LineReader;
@@ -722,7 +722,7 @@
return (Source) copy(ctx, null, false, nestedPredCtxStack);
}
- public Window getIterator(Context ctx) throws MXQueryException {
+ public Iterator getIterator(Context ctx) throws MXQueryException {
return WindowFactory.getNewWindow(context, this); }
public String getURI() {
Modified: trunk/MXQuery/src/ch/ethz/mxquery/iterators/ComputedCommentConstrIterator.java
===================================================================
--- trunk/MXQuery/src/ch/ethz/mxquery/iterators/ComputedCommentConstrIterator.java 2011-07-01 02:44:27 UTC (rev 4423)
+++ trunk/MXQuery/src/ch/ethz/mxquery/iterators/ComputedCommentConstrIterator.java 2011-07-02 14:59:31 UTC (rev 4424)
@@ -32,8 +32,8 @@
import ch.ethz.mxquery.exceptions.ErrorCodes;
import ch.ethz.mxquery.exceptions.MXQueryException;
import ch.ethz.mxquery.exceptions.QueryLocation;
+import ch.ethz.mxquery.model.Iterator;
import ch.ethz.mxquery.model.TokenBasedIterator;
-import ch.ethz.mxquery.model.Window;
import ch.ethz.mxquery.model.XDMIterator;
@@ -88,7 +88,7 @@
return (Source) copy(ctx, null, false, nestedPredCtxStack);
}
- public Window getIterator(Context ctx) throws MXQueryException {
+ public Iterator getIterator(Context ctx) throws MXQueryException {
return WindowFactory.getNewWindow(context, this);
}
public boolean isExprParameter(int valueToCheck, boolean recursive) {
Modified: trunk/MXQuery/src/ch/ethz/mxquery/iterators/ComputedPIConstrIterator.java
===================================================================
--- trunk/MXQuery/src/ch/ethz/mxquery/iterators/ComputedPIConstrIterator.java 2011-07-01 02:44:27 UTC (rev 4423)
+++ trunk/MXQuery/src/ch/ethz/mxquery/iterators/ComputedPIConstrIterator.java 2011-07-02 14:59:31 UTC (rev 4424)
@@ -34,8 +34,8 @@
import ch.ethz.mxquery.exceptions.ErrorCodes;
import ch.ethz.mxquery.exceptions.MXQueryException;
import ch.ethz.mxquery.exceptions.QueryLocation;
+import ch.ethz.mxquery.model.Iterator;
import ch.ethz.mxquery.model.TokenBasedIterator;
-import ch.ethz.mxquery.model.Window;
import ch.ethz.mxquery.model.XDMIterator;
@@ -110,7 +110,7 @@
return (Source) copy(ctx, null, false, nestedPredCtxStack);
}
- public Window getIterator(Context ctx) throws MXQueryException {
+ public Iterator getIterator(Context ctx) throws MXQueryException {
return WindowFactory.getNewWindow(context, this);
}
public boolean isExprParameter(int valueToCheck, boolean recursive) {
Modified: trunk/MXQuery/src/ch/ethz/mxquery/iterators/ComputedTextConstrIterator.java
===================================================================
--- trunk/MXQuery/src/ch/ethz/mxquery/iterators/ComputedTextConstrIterator.java 2011-07-01 02:44:27 UTC (rev 4423)
+++ trunk/MXQuery/src/ch/ethz/mxquery/iterators/ComputedTextConstrIterator.java 2011-07-02 14:59:31 UTC (rev 4424)
@@ -28,8 +28,8 @@
import ch.ethz.mxquery.exceptions.ErrorCodes;
import ch.ethz.mxquery.exceptions.MXQueryException;
import ch.ethz.mxquery.exceptions.QueryLocation;
+import ch.ethz.mxquery.model.Iterator;
import ch.ethz.mxquery.model.TokenBasedIterator;
-import ch.ethz.mxquery.model.Window;
import ch.ethz.mxquery.model.XDMIterator;
public class ComputedTextConstrIterator extends TokenBasedIterator implements Source{
@@ -97,7 +97,7 @@
return (Source) copy(ctx, null, false, nestedPredCtxStack);
}
- public Window getIterator(Context ctx) throws MXQueryException {
+ public Iterator getIterator(Context ctx) throws MXQueryException {
return WindowFactory.getNewWindow(context, this);
}
public boolean isExprParameter(int valueToCheck, boolean recursive) {
Modified: trunk/MXQuery/src/ch/ethz/mxquery/iterators/TokenIterator.java
===================================================================
--- trunk/MXQuery/src/ch/ethz/mxquery/iterators/TokenIterator.java 2011-07-01 02:44:27 UTC (rev 4423)
+++ trunk/MXQuery/src/ch/ethz/mxquery/iterators/TokenIterator.java 2011-07-02 14:59:31 UTC (rev 4424)
@@ -60,8 +60,8 @@
import ch.ethz.mxquery.exceptions.MXQueryException;
import ch.ethz.mxquery.exceptions.QueryLocation;
import ch.ethz.mxquery.exceptions.StaticException;
+import ch.ethz.mxquery.model.Iterator;
import ch.ethz.mxquery.model.TokenBasedIterator;
-import ch.ethz.mxquery.model.Window;
import ch.ethz.mxquery.model.XDMIterator;
import ch.ethz.mxquery.util.KXmlSerializer;
@@ -327,7 +327,7 @@
serializer.attribute(null, "token", content);
return serializer;
}
- public Window getIterator(Context ctx) throws MXQueryException {
+ public Iterator getIterator(Context ctx) throws MXQueryException {
return WindowFactory.getNewWindow(context, this);
}
public boolean areOptionsSupported(int requiredOptions) {
Modified: trunk/MXQuery/src/ch/ethz/mxquery/iterators/XMLAttrIterator.java
===================================================================
--- trunk/MXQuery/src/ch/ethz/mxquery/iterators/XMLAttrIterator.java 2011-07-01 02:44:27 UTC (rev 4423)
+++ trunk/MXQuery/src/ch/ethz/mxquery/iterators/XMLAttrIterator.java 2011-07-02 14:59:31 UTC (rev 4424)
@@ -39,8 +39,8 @@
import ch.ethz.mxquery.exceptions.QueryLocation;
import ch.ethz.mxquery.exceptions.StaticException;
import ch.ethz.mxquery.exceptions.TypeException;
+import ch.ethz.mxquery.model.Iterator;
import ch.ethz.mxquery.model.TokenBasedIterator;
-import ch.ethz.mxquery.model.Window;
import ch.ethz.mxquery.model.XDMIterator;
import ch.ethz.mxquery.util.KXmlSerializer;
import ch.ethz.mxquery.util.Utils;
@@ -270,7 +270,7 @@
if (subIters != null && subIters.length > 1)
token = null;
}
- public Window getIterator(Context ctx) throws MXQueryException {
+ public Iterator getIterator(Context ctx) throws MXQueryException {
return WindowFactory.getNewWindow(context, this);
}
public boolean isExprParameter(int valueToCheck, boolean recursive) {
Modified: trunk/MXQuery/src/ch/ethz/mxquery/iterators/XMLContent.java
===================================================================
--- trunk/MXQuery/src/ch/ethz/mxquery/iterators/XMLContent.java 2011-07-01 02:44:27 UTC (rev 4423)
+++ trunk/MXQuery/src/ch/ethz/mxquery/iterators/XMLContent.java 2011-07-02 14:59:31 UTC (rev 4424)
@@ -41,7 +41,7 @@
import ch.ethz.mxquery.exceptions.QueryLocation;
import ch.ethz.mxquery.exceptions.StaticException;
import ch.ethz.mxquery.exceptions.TypeException;
-import ch.ethz.mxquery.model.Window;
+import ch.ethz.mxquery.model.Iterator;
import ch.ethz.mxquery.model.XDMIterator;
import ch.ethz.mxquery.util.KXmlSerializer;
import ch.ethz.mxquery.util.Set;
@@ -586,7 +586,7 @@
return (Source) copy(ctx, null, false, nestedPredCtxStack);
}
- public Window getIterator(Context ctx) throws MXQueryException {
+ public Iterator getIterator(Context ctx) throws MXQueryException {
return WindowFactory.getNewWindow(context, this);
}
Modified: trunk/MXQuery/src/ch/ethz/mxquery/iterators/update/TransformIterator.java
===================================================================
--- trunk/MXQuery/src/ch/ethz/mxquery/iterators/update/TransformIterator.java 2011-07-01 02:44:27 UTC (rev 4423)
+++ trunk/MXQuery/src/ch/ethz/mxquery/iterators/update/TransformIterator.java 2011-07-02 14:59:31 UTC (rev 4424)
@@ -82,7 +82,7 @@
*/
private void initializeCopyVars() throws MXQueryException {
for (int i = 0; i < this.subIters.length; i++) {
- Window itCopy = null;
+ Iterator itCopy = null;
try {
UpdateableStore newSource = context.getStores().createUpdateableStore(null,subIters[i],true, false);
newSource.materialize();
Modified: trunk/MXQuery/src/ch/ethz/mxquery/model/updatePrimitives/PendingUpdateList.java
===================================================================
--- trunk/MXQuery/src/ch/ethz/mxquery/model/updatePrimitives/PendingUpdateList.java 2011-07-01 02:44:27 UTC (rev 4423)
+++ trunk/MXQuery/src/ch/ethz/mxquery/model/updatePrimitives/PendingUpdateList.java 2011-07-02 14:59:31 UTC (rev 4424)
@@ -33,6 +33,7 @@
import ch.ethz.mxquery.exceptions.MXQueryException;
import ch.ethz.mxquery.exceptions.QueryLocation;
import ch.ethz.mxquery.exceptions.TypeException;
+import ch.ethz.mxquery.model.Iterator;
import ch.ethz.mxquery.model.Window;
import ch.ethz.mxquery.model.XDMIterator;
import ch.ethz.mxquery.util.LinkedList;
@@ -368,10 +369,12 @@
// if insert attribute or replace, get the node and its namespace definition
UpdateableStore sr = ((UpdatePrimitive)ops.elementAt(i)).getStore();
if (sr!=null) {
- Window rootIter = sr.getIterator(null);
- while (rootIter.hasNextItem()) {
- XDMIterator nItem = rootIter.nextItem();
- TokenInterface root = nItem.next();
+// Window rootIter = (Window) sr.getIterator(null);
+ Iterator rootIter = sr.getIterator(null);
+ for (TokenInterface root = rootIter.next();
+root != Token.END_SEQUENCE_TOKEN;root = rootIter.next()) {
+// XDMIterator nItem = rootIter.nextItem();
+// TokenInterface root = nItem.next();
if (root == Token.END_SEQUENCE_TOKEN || !(root instanceof NamedToken))
continue;
@@ -398,7 +401,7 @@
seenBindings.put(nm.getNamespacePrefix(), nm.getURI());
}
}
- nItem.close(false);
+// nItem.close(false);
}
rootIter.close(false);
} else {
Modified: trunk/MXQuery/src/ch/ethz/mxquery/sms/MMimpl/FIFOStore.java
===================================================================
--- trunk/MXQuery/src/ch/ethz/mxquery/sms/MMimpl/FIFOStore.java 2011-07-01 02:44:27 UTC (rev 4423)
+++ trunk/MXQuery/src/ch/ethz/mxquery/sms/MMimpl/FIFOStore.java 2011-07-02 14:59:31 UTC (rev 4424)
@@ -29,6 +29,7 @@
import ch.ethz.mxquery.datamodel.xdm.Token;
import ch.ethz.mxquery.datamodel.xdm.TokenInterface;
import ch.ethz.mxquery.exceptions.MXQueryException;
+import ch.ethz.mxquery.model.Iterator;
import ch.ethz.mxquery.model.Window;
import ch.ethz.mxquery.model.XDMIterator;
import ch.ethz.mxquery.sms.activeStore.ReadDataThread;
@@ -333,7 +334,7 @@
public int getCurrentTokenId(){
return currentToken.get();
}
- public Window getIterator(Context ctx) throws MXQueryException{
+ public Iterator getIterator(Context ctx) throws MXQueryException{
Window wnd = cont.getNewWindowIterator(1, Window.END_OF_STREAM_POSITION);
wnd.setContext(ctx, false);
return wnd;
Modified: trunk/MXQuery/src/ch/ethz/mxquery/sms/MMimpl/InPlaceStore.java
===================================================================
--- trunk/MXQuery/src/ch/ethz/mxquery/sms/MMimpl/InPlaceStore.java 2011-07-01 02:44:27 UTC (rev 4423)
+++ trunk/MXQuery/src/ch/ethz/mxquery/sms/MMimpl/InPlaceStore.java 2011-07-02 14:59:31 UTC (rev 4424)
@@ -21,6 +21,7 @@
import ch.ethz.mxquery.contextConfig.Context;
import ch.ethz.mxquery.datamodel.Source;
import ch.ethz.mxquery.exceptions.MXQueryException;
+import ch.ethz.mxquery.model.Iterator;
import ch.ethz.mxquery.model.Window;
import ch.ethz.mxquery.sms.interfaces.IndexUpdate;
import ch.ethz.mxquery.sms.interfaces.StreamStoreStatistics;
@@ -37,7 +38,7 @@
public int getMyId(){
return id;
}
- public Window getIterator(Context ctx) throws MXQueryException{
+ public Iterator getIterator(Context ctx) throws MXQueryException{
Window wnd = cont.getNewWindowIterator(1, Window.END_OF_STREAM_POSITION);
wnd.setContext(ctx, false);
return wnd;
Modified: trunk/MXQuery/src/ch/ethz/mxquery/sms/MMimpl/IndexRandomStore.java
===================================================================
--- trunk/MXQuery/src/ch/ethz/mxquery/sms/MMimpl/IndexRandomStore.java 2011-07-01 02:44:27 UTC (rev 4423)
+++ trunk/MXQuery/src/ch/ethz/mxquery/sms/MMimpl/IndexRandomStore.java 2011-07-02 14:59:31 UTC (rev 4424)
@@ -31,6 +31,7 @@
import ch.ethz.mxquery.datamodel.types.Type;
import ch.ethz.mxquery.datamodel.xdm.TokenInterface;
import ch.ethz.mxquery.exceptions.MXQueryException;
+import ch.ethz.mxquery.model.Iterator;
import ch.ethz.mxquery.model.Window;
import ch.ethz.mxquery.model.XDMIterator;
import ch.ethz.mxquery.opt.index.IndexSchema;
@@ -435,7 +436,7 @@
// TODO Auto-generated method stub
return null;
}
- public Window getIterator(Context ctx) throws MXQueryException{
+ public Iterator getIterator(Context ctx) throws MXQueryException{
Window wnd = cont.getNewWindowIterator(1, Window.END_OF_STREAM_POSITION);
wnd.setContext(ctx, false);
return wnd;
Modified: trunk/MXQuery/src/ch/ethz/mxquery/sms/MMimpl/LazyFIFOStore.java
===================================================================
--- trunk/MXQuery/src/ch/ethz/mxquery/sms/MMimpl/LazyFIFOStore.java 2011-07-01 02:44:27 UTC (rev 4423)
+++ trunk/MXQuery/src/ch/ethz/mxquery/sms/MMimpl/LazyFIFOStore.java 2011-07-02 14:59:31 UTC (rev 4424)
@@ -26,6 +26,7 @@
import ch.ethz.mxquery.datamodel.xdm.Token;
import ch.ethz.mxquery.datamodel.xdm.TokenInterface;
import ch.ethz.mxquery.exceptions.MXQueryException;
+import ch.ethz.mxquery.model.Iterator;
import ch.ethz.mxquery.model.Window;
import ch.ethz.mxquery.model.XDMIterator;
import ch.ethz.mxquery.sms.interfaces.StreamStoreStatistics;
@@ -403,7 +404,7 @@
return currentToken;
}
- public Window getIterator(Context ctx) throws MXQueryException{
+ public Iterator getIterator(Context ctx) throws MXQueryException{
Window wnd = cont.getNewWindowIterator(1, Window.END_OF_STREAM_POSITION);
wnd.setContext(ctx, false);
return wnd;
Modified: trunk/MXQuery/src/ch/ethz/mxquery/sms/MMimpl/UpdateTokenBuffer.java
===================================================================
--- trunk/MXQuery/src/ch/ethz/mxquery/sms/MMimpl/UpdateTokenBuffer.java 2011-07-01 02:44:27 UTC (rev 4423)
+++ trunk/MXQuery/src/ch/ethz/mxquery/sms/MMimpl/UpdateTokenBuffer.java 2011-07-02 14:59:31 UTC (rev 4424)
@@ -25,6 +25,7 @@
import ch.ethz.mxquery.datamodel.xdm.LongToken;
import ch.ethz.mxquery.datamodel.xdm.TokenInterface;
import ch.ethz.mxquery.exceptions.MXQueryException;
+import ch.ethz.mxquery.model.Iterator;
import ch.ethz.mxquery.model.Window;
import ch.ethz.mxquery.model.XDMIterator;
import ch.ethz.mxquery.sms.interfaces.StreamStore;
@@ -177,7 +178,7 @@
// TODO Auto-generated method stub
return null;
}
- public Window getIterator(Context ctx) throws MXQueryException{
+ public Iterator getIterator(Context ctx) throws MXQueryException{
Window wnd = cont.getNewWindowIterator(1, Window.END_OF_STREAM_POSITION);
wnd.setContext(ctx, false);
return wnd;
Modified: trunk/MXQuery/src/ch/ethz/mxquery/update/store/llImpl/LLStore.java
===================================================================
--- trunk/MXQuery/src/ch/ethz/mxquery/update/store/llImpl/LLStore.java 2011-07-01 02:44:27 UTC (rev 4423)
+++ trunk/MXQuery/src/ch/ethz/mxquery/update/store/llImpl/LLStore.java 2011-07-02 14:59:31 UTC (rev 4424)
@@ -43,6 +43,7 @@
import ch.ethz.mxquery.exceptions.QueryLocation;
import ch.ethz.mxquery.functions.fn.Doc;
import ch.ethz.mxquery.model.EmptySequenceIterator;
+import ch.ethz.mxquery.model.Iterator;
import ch.ethz.mxquery.model.Window;
import ch.ethz.mxquery.model.XDMIterator;
import ch.ethz.mxquery.model.updatePrimitives.UpdateableStore;
@@ -1076,7 +1077,7 @@
}
}
- public Window getIterator(Context ctx) throws MXQueryException{
+ public Iterator getIterator(Context ctx) throws MXQueryException{
Window wnd = new LLStoreIterator(null,this);
wnd.setContext(ctx, false);
return wnd;
Modified: trunk/MXQuery/src/ch/ethz/mxquery/update/store/llImpl/LLStoreIterator.java
===================================================================
--- trunk/MXQuery/src/ch/ethz/mxquery/update/store/llImpl/LLStoreIterator.java 2011-07-01 02:44:27 UTC (rev 4423)
+++ trunk/MXQuery/src/ch/ethz/mxquery/update/store/llImpl/LLStoreIterator.java 2011-07-02 14:59:31 UTC (rev 4424)
@@ -27,6 +27,7 @@
import ch.ethz.mxquery.exceptions.MXQueryException;
import ch.ethz.mxquery.exceptions.StaticException;
import ch.ethz.mxquery.model.EmptySequenceIterator;
+import ch.ethz.mxquery.model.Iterator;
import ch.ethz.mxquery.model.Window;
import ch.ethz.mxquery.model.XDMIterator;
import ch.ethz.mxquery.util.IntegerList;
@@ -258,7 +259,7 @@
ret.setContext(context,false);
return ret;
} else {
- return source.getNewStoreForSequence(startPosition, endPosition).getIterator(context);
+ return (Window) source.getNewStoreForSequence(startPosition, endPosition).getIterator(context);
}
}
@@ -287,7 +288,7 @@
* @return StoreIterator that points to the newly created source
* @throws MXQueryException
*/
- private Window createNewRefSource(LLToken llToken) throws MXQueryException {
+ private Iterator createNewRefSource(LLToken llToken) throws MXQueryException {
LLRefToken ref;
if (llToken instanceof LLRefToken) {
ref = new LLRefToken(((LLRefToken) llToken).getRef());
Modified: trunk/MXQuery/src/ch/ethz/mxquery/update/store/llImpl/LLStoreSet.java
===================================================================
--- trunk/MXQuery/src/ch/ethz/mxquery/update/store/llImpl/LLStoreSet.java 2011-07-01 02:44:27 UTC (rev 4423)
+++ trunk/MXQuery/src/ch/ethz/mxquery/update/store/llImpl/LLStoreSet.java 2011-07-02 14:59:31 UTC (rev 4424)
@@ -31,6 +31,7 @@
import ch.ethz.mxquery.exceptions.QueryLocation;
import ch.ethz.mxquery.exceptions.StaticException;
import ch.ethz.mxquery.model.DataflowAnalysis;
+import ch.ethz.mxquery.model.Iterator;
import ch.ethz.mxquery.model.Window;
import ch.ethz.mxquery.model.XDMIterator;
import ch.ethz.mxquery.model.updatePrimitives.ExtendedAxisStore;
@@ -338,7 +339,7 @@
try {
String encoding = "UTF-8";
- Window toSerialize = map.store.getIterator(new Context());
+ Iterator toSerialize = map.store.getIterator(new Context());
XDMSerializerSettings sets = new XDMSerializerSettings();
sets.setVersion("1.0");
sets.setEncoding(encoding);
Modified: trunk/MXQuery/src/ch/ethz/mxquery/xdmio/xmlAdapters/XDMImportAdapter.java
===================================================================
--- trunk/MXQuery/src/ch/ethz/mxquery/xdmio/xmlAdapters/XDMImportAdapter.java 2011-07-01 02:44:27 UTC (rev 4423)
+++ trunk/MXQuery/src/ch/ethz/mxquery/xdmio/xmlAdapters/XDMImportAdapter.java 2011-07-02 14:59:31 UTC (rev 4424)
@@ -59,7 +59,6 @@
import ch.ethz.mxquery.exceptions.MXQueryException;
import ch.ethz.mxquery.exceptions.QueryLocation;
import ch.ethz.mxquery.model.Iterator;
-import ch.ethz.mxquery.model.Window;
import ch.ethz.mxquery.model.XDMIterator;
import ch.ethz.mxquery.util.Stack;
import ch.ethz.mxquery.xdmio.XMLSource;
@@ -290,7 +289,7 @@
else
return false;
}
- public Window getIterator(Context ctx) throws MXQueryException {
+ public Iterator getIterator(Context ctx) throws MXQueryException {
return WindowFactory.getNewWindow(context, this);
}
public boolean isExprParameter(int valueToCheck, boolean recursive) {
Modified: trunk/MXQuery/src/examples/StreamLifecycleExample.java
===================================================================
--- trunk/MXQuery/src/examples/StreamLifecycleExample.java 2011-07-01 02:44:27 UTC (rev 4423)
+++ trunk/MXQuery/src/examples/StreamLifecycleExample.java 2011-07-02 14:59:31 UTC (rev 4424)
@@ -36,6 +36,7 @@
import ch.ethz.mxquery.datamodel.xdm.XDMScope;
import ch.ethz.mxquery.exceptions.MXQueryException;
import ch.ethz.mxquery.exceptions.QueryLocation;
+import ch.ethz.mxquery.model.Iterator;
import ch.ethz.mxquery.model.TokenSequenceIterator;
import ch.ethz.mxquery.model.Window;
import ch.ethz.mxquery.model.XDMIterator;
@@ -196,7 +197,7 @@
StreamStore sr = ctx.getStores().createStreamStore(
StoreFactory.RANDOM_FIFO, "example-stream");
- Window wnd = sr.getIterator(ctx);
+ Iterator wnd = sr.getIterator(ctx);
//Added by TSA: adjusting Gatekeeper to accept also coordinator as an additional
//parameter in its constructor
//Gatekeeper gk = new Gatekeeper(wnd,1,Window.END_OF_STREAM_NODE,coor);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <et...@us...> - 2011-07-01 02:44:34
|
Revision: 4423
http://mxquery.svn.sourceforge.net/mxquery/?rev=4423&view=rev
Author: etterth
Date: 2011-07-01 02:44:27 +0000 (Fri, 01 Jul 2011)
Log Message:
-----------
- Reverted last commit because of regression
Modified Paths:
--------------
trunk/MXQuery/src/ch/ethz/mxquery/contextConfig/Context.java
Modified: trunk/MXQuery/src/ch/ethz/mxquery/contextConfig/Context.java
===================================================================
--- trunk/MXQuery/src/ch/ethz/mxquery/contextConfig/Context.java 2011-07-01 01:47:05 UTC (rev 4422)
+++ trunk/MXQuery/src/ch/ethz/mxquery/contextConfig/Context.java 2011-07-01 02:44:27 UTC (rev 4423)
@@ -1562,7 +1562,7 @@
}
}
globalContext.parent = null;
- globalContext.namedValueMap.remove(BASE_URI);
+ //globalContext.namedValueMap.remove(BASE_URI);
} catch (MXQueryException err) {
throw new RuntimeException(err.toString());
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <et...@us...> - 2011-07-01 01:47:12
|
Revision: 4422
http://mxquery.svn.sourceforge.net/mxquery/?rev=4422&view=rev
Author: etterth
Date: 2011-07-01 01:47:05 +0000 (Fri, 01 Jul 2011)
Log Message:
-----------
- Fix for base-uri tests
Modified Paths:
--------------
trunk/MXQuery/src/ch/ethz/mxquery/contextConfig/Context.java
Modified: trunk/MXQuery/src/ch/ethz/mxquery/contextConfig/Context.java
===================================================================
--- trunk/MXQuery/src/ch/ethz/mxquery/contextConfig/Context.java 2011-06-30 20:38:14 UTC (rev 4421)
+++ trunk/MXQuery/src/ch/ethz/mxquery/contextConfig/Context.java 2011-07-01 01:47:05 UTC (rev 4422)
@@ -1562,6 +1562,7 @@
}
}
globalContext.parent = null;
+ globalContext.namedValueMap.remove(BASE_URI);
} catch (MXQueryException err) {
throw new RuntimeException(err.toString());
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <et...@us...> - 2011-06-30 20:38:21
|
Revision: 4421
http://mxquery.svn.sourceforge.net/mxquery/?rev=4421&view=rev
Author: etterth
Date: 2011-06-30 20:38:14 +0000 (Thu, 30 Jun 2011)
Log Message:
-----------
- Identity (hashCode, equals) for NodeToken added
Modified Paths:
--------------
trunk/MXQuery/xqib_src/ch/ethz/mxquery/update/store/domImpl/NodeToken.java
Modified: trunk/MXQuery/xqib_src/ch/ethz/mxquery/update/store/domImpl/NodeToken.java
===================================================================
--- trunk/MXQuery/xqib_src/ch/ethz/mxquery/update/store/domImpl/NodeToken.java 2011-06-30 17:25:33 UTC (rev 4420)
+++ trunk/MXQuery/xqib_src/ch/ethz/mxquery/update/store/domImpl/NodeToken.java 2011-06-30 20:38:14 UTC (rev 4421)
@@ -314,10 +314,22 @@
}
@Override
- public boolean equals(TokenInterface o) throws MXQueryException {
- // TODO Auto-generated method stub
+ public boolean equals(TokenInterface o) {
+ if (o == null)
return false;
+ NodeToken other = (NodeToken) o;
+ return other.node == this.node;
}
+
+ @Override
+ public boolean equals(Object obj) {
+ return this.equals((TokenInterface)obj);
+ }
+
+ @Override
+ public int hashCode() {
+ return this.node.hashCode();
+ }
@Override
public int compareTo(TokenInterface o) throws MXQueryException {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <et...@us...> - 2011-06-30 17:25:40
|
Revision: 4420
http://mxquery.svn.sourceforge.net/mxquery/?rev=4420&view=rev
Author: etterth
Date: 2011-06-30 17:25:33 +0000 (Thu, 30 Jun 2011)
Log Message:
-----------
- Added support for processing nodes
Modified Paths:
--------------
trunk/MXQuery/xqib_src/ch/ethz/mxquery/update/store/domImpl/NodeToken.java
trunk/MXQuery/xqib_src/ch/ethz/mxquery/util/browser/dom/Node.java
Added Paths:
-----------
trunk/MXQuery/xqib_src/ch/ethz/mxquery/update/store/domImpl/ProcessingNodeToken.java
Modified: trunk/MXQuery/xqib_src/ch/ethz/mxquery/update/store/domImpl/NodeToken.java
===================================================================
--- trunk/MXQuery/xqib_src/ch/ethz/mxquery/update/store/domImpl/NodeToken.java 2011-06-30 17:02:08 UTC (rev 4419)
+++ trunk/MXQuery/xqib_src/ch/ethz/mxquery/update/store/domImpl/NodeToken.java 2011-06-30 17:25:33 UTC (rev 4420)
@@ -40,14 +40,17 @@
//IE9crap
// case RealDOMNode.ATTRIBUTE_NODE:
// return new AttributeNodeToken((RealDOMNode) node);
- case Node.COMMENT_NODE:
- return new CommentNodeToken((Node) node);
+
case Node.ELEMENT_NODE:
return new ElementNodeToken((Node) node);
case Node.TEXT_NODE:
return new TextNodeToken((Node) node);
case Node.DOCUMENT_NODE:
return new DocumentNodeToken((Node) node);
+ case Node.COMMENT_NODE:
+ return new CommentNodeToken((Node) node);
+ case Node.PROCESSING_INSTRUCTION_NODE:
+ return new ProcessingNodeToken((Node) node);
case Node.DOCUMENT_TYPE_NODE:
default:
Added: trunk/MXQuery/xqib_src/ch/ethz/mxquery/update/store/domImpl/ProcessingNodeToken.java
===================================================================
--- trunk/MXQuery/xqib_src/ch/ethz/mxquery/update/store/domImpl/ProcessingNodeToken.java (rev 0)
+++ trunk/MXQuery/xqib_src/ch/ethz/mxquery/update/store/domImpl/ProcessingNodeToken.java 2011-06-30 17:25:33 UTC (rev 4420)
@@ -0,0 +1,39 @@
+package ch.ethz.mxquery.update.store.domImpl;
+
+import ch.ethz.mxquery.datamodel.XQName;
+import ch.ethz.mxquery.datamodel.types.Type;
+import ch.ethz.mxquery.datamodel.xdm.TokenInterface;
+import ch.ethz.mxquery.datamodel.xdm.XDMScope;
+import ch.ethz.mxquery.exceptions.MXQueryException;
+import ch.ethz.mxquery.util.browser.dom.Node;
+
+public class ProcessingNodeToken extends NodeToken {
+
+ protected ProcessingNodeToken(Node node) {
+ super(node);
+ }
+
+ @Override
+ public int getEventType() {
+ return Type.PROCESSING_INSTRUCTION;
+ }
+ @Override
+ public ProcessingNodeToken copy() {
+ return new ProcessingNodeToken(node);
+ }
+
+ @Override
+ public String getName() {
+ return node.getNodeName();
+ }
+
+ @Override
+ public String getLocal() {
+ return this.getName();
+ }
+
+ public String getValueAsString() {
+ return getLocal() +" "+node.getNodeValue();
+ }
+
+}
Modified: trunk/MXQuery/xqib_src/ch/ethz/mxquery/util/browser/dom/Node.java
===================================================================
--- trunk/MXQuery/xqib_src/ch/ethz/mxquery/util/browser/dom/Node.java 2011-06-30 17:02:08 UTC (rev 4419)
+++ trunk/MXQuery/xqib_src/ch/ethz/mxquery/util/browser/dom/Node.java 2011-06-30 17:25:33 UTC (rev 4420)
@@ -39,7 +39,7 @@
* The node is a {@link Document}.
*/
public final static short DOCUMENT_NODE = 9;
-
+ public final static short PROCESSING_INSTRUCTION_NODE = 7;
public final static short ATTRIBUTE_NODE = 2;
public final static short COMMENT_NODE = 8;
public final static short DOCUMENT_TYPE_NODE = 10;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <et...@us...> - 2011-06-30 17:02:18
|
Revision: 4419
http://mxquery.svn.sourceforge.net/mxquery/?rev=4419&view=rev
Author: etterth
Date: 2011-06-30 17:02:08 +0000 (Thu, 30 Jun 2011)
Log Message:
-----------
- Added module import testing
Modified Paths:
--------------
trunk/MXQuery/xqib_src/ch/ethz/mxqjs/test/JsXQueryTestCase.java
trunk/XQIB_Testing/XQTStoJsUnit.xsl
trunk/XQIB_Testing/build.xml
trunk/XQIB_Testing/src/ch/ethz/mxquery/testsuite/XQueryTestCase.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/Catalogclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Construct/ComputeCon/ComputeConAttrclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Construct/ComputeCon/ComputeConCommentclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Construct/ComputeCon/ComputeConElemclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Construct/ComputeCon/ComputeConPIclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Construct/ComputeCon/ConDocNodeclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Construct/DirectConElem/DirectConElemContentclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/FLWOR/ForExpr/ForExprWithclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/FLWOR/OrderbyExpr/OrderbyExprWithclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/SeqOp/SeqExceptclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/SeqOp/SeqIntersectclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/SeqOp/SeqUnionclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/QNameFunc/LocalNameFromQNameFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/QNameFunc/NamespaceURIFromQNameFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/OptionalFeatureErrors/CombinedErrorCodesclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/Optional/Modules/ModuleImportclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/Optional/SchemaImport/ConstructSIclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/Optional/SchemaImport/FLWORExprSIclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/Optional/SchemaImport/ForExprTypeSIclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/Optional/SchemaImport/MiscFunctionsclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/Optional/SchemaImport/NotationEQSIclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/Optional/SchemaImport/SchemaImportPrologclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/Optional/SchemaImport/SeqExprCastSIclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/Optional/SchemaValidation/ValidateExpressionclass.java
Modified: trunk/MXQuery/xqib_src/ch/ethz/mxqjs/test/JsXQueryTestCase.java
===================================================================
--- trunk/MXQuery/xqib_src/ch/ethz/mxqjs/test/JsXQueryTestCase.java 2011-06-30 14:18:19 UTC (rev 4418)
+++ trunk/MXQuery/xqib_src/ch/ethz/mxqjs/test/JsXQueryTestCase.java 2011-06-30 17:02:08 UTC (rev 4419)
@@ -62,6 +62,7 @@
private static native void n_setup(JsXQueryTestCase o) /*-{
o.addVariable = o....@ch....JsXQueryTestCase::addVariable(Ljava/lang/String;Ljava/lang/String;);
+ o.addModuleLocation = o....@ch....JsXQueryTestCase::addModuleLocation(Ljava/lang/String;Ljava/lang/String;);
o.execute = o....@ch....JsXQueryTestCase::execute();
o.getResult = o....@ch....JsXQueryTestCase::getResult();
o.getErrorCode = o....@ch....JsXQueryTestCase::getErrorCode();
@@ -94,6 +95,9 @@
try {
co.setSchemaAwareness(true);
+ for (NamespaceToUri module: moduleLocations) {
+ ctx.addModuleLocation(module.namespace, module.uri);
+ }
stat = comp.compile(ctx, query,co,null,null);
for (VariableWithUri var:variables){
Modified: trunk/XQIB_Testing/XQTStoJsUnit.xsl
===================================================================
--- trunk/XQIB_Testing/XQTStoJsUnit.xsl 2011-06-30 14:18:19 UTC (rev 4418)
+++ trunk/XQIB_Testing/XQTStoJsUnit.xsl 2011-06-30 17:02:08 UTC (rev 4419)
@@ -10,12 +10,12 @@
</xd:desc>
</xd:doc>
<xsl:variable name="outputpath">test/ch/ethz/mxquery</xsl:variable>
- <xsl:variable name="packageprefix">ch.ethz.mxquery.</xsl:variable>
+ <xsl:variable name="packageprefix">ch.ethz.mxquery</xsl:variable>
<xsl:variable name="testsuitepath"
>../MXQuery_Testing/tests</xsl:variable>
<xsl:variable name="executionpath"
>http://127.0.0.1:8090/test/tests</xsl:variable>
- <xsl:variable name="relativetestdir">tests/</xsl:variable>
+ <xsl:variable name="relativetestdir">http://127.0.0.1:8090/test/tests/</xsl:variable>
<xsl:template match="/">
<xsl:for-each select="test-suite/test-group">
<xsl:call-template name="test-group">
@@ -149,10 +149,10 @@
<xsl:param name="name"/>
<xsl:variable name="currentTestGroup" select="."/>
package <xsl:value-of select="$packageprefix"/><xsl:for-each
- select="ancestor::node()[local-name() = 'test-group']"><xsl:call-template
+ select="ancestor::node()[local-name() = 'test-group']"><xsl:if test="not(. is $currentTestGroup)"
+ >.</xsl:if><xsl:call-template
name="getJavaString"><xsl:with-param name="string" select="./@name"
- /></xsl:call-template><xsl:if test="empty(./child::node()[. is $currentTestGroup])"
- >.</xsl:if></xsl:for-each>;
+ /></xsl:call-template></xsl:for-each>;
import org.junit.Test;
import ch.ethz.mxquery.testsuite.XQueryTestBase;
import ch.ethz.mxquery.testsuite.XQueryTestCase;
@@ -167,10 +167,10 @@
String query = <xsl:call-template
name="getQuery"/>; <!-- module -->
XQueryTestCase testcase = new XQueryTestCase(driver,query); <xsl:for-each
- select="module">
+ select="module"><xsl:variable name="currentmodule" select="."/>
testcase.addModuleLocation("<xsl:value-of select="./@namespace"
/>", "<xsl:value-of
- select="concat($relativetestdir, 'TestSources/',./text(), '.xq')"/>"); </xsl:for-each>
+ select="concat($relativetestdir, root(.)//module[@ID = $currentmodule/text()]/@FileName, '.xq')"/>"); </xsl:for-each>
<!-- input-file -->
<xsl:for-each select="input-file"><xsl:variable name="sourceid" select="text()"/>
<xsl:variable name="source" select="//source[@ID = $sourceid]"/>
Modified: trunk/XQIB_Testing/build.xml
===================================================================
--- trunk/XQIB_Testing/build.xml 2011-06-30 14:18:19 UTC (rev 4418)
+++ trunk/XQIB_Testing/build.xml 2011-06-30 17:02:08 UTC (rev 4419)
@@ -90,10 +90,19 @@
<!--<pathelement location="${ECLIPSE_HOME}/plugins/org.hamcrest.core_1.1.0.v20090501071000.jar"/>-->
</path>
<property name="junit.output.dir" value="junit-out" />
+ <target name="aggregate">
+ <junitreport todir="${junit.output.dir}" tofile="report.xml">
+ <fileset dir="${junit.output.dir}">
+ <include name="TEST-*.xml"/>
+ </fileset>
+ <!--<report format="frames" todir="${junit.output.dir}" />-->
+ </junitreport>
+
+ </target>
<target name="testsuite">
<mkdir dir="${junit.output.dir}"/>
<junit fork="yes" printsummary="withOutAndErr">
- <formatter type="xml"/>
+ <formatter type="xml" />
<test name="ch.ethz.mxquery.Appendices.Annex_Eclass" todir="${junit.output.dir}"/>
<test name="ch.ethz.mxquery.Appendices.Appendix_A4class" todir="${junit.output.dir}"/>
<test name="ch.ethz.mxquery.Catalogclass" todir="${junit.output.dir}"/>
Modified: trunk/XQIB_Testing/src/ch/ethz/mxquery/testsuite/XQueryTestCase.java
===================================================================
--- trunk/XQIB_Testing/src/ch/ethz/mxquery/testsuite/XQueryTestCase.java 2011-06-30 14:18:19 UTC (rev 4418)
+++ trunk/XQIB_Testing/src/ch/ethz/mxquery/testsuite/XQueryTestCase.java 2011-06-30 17:02:08 UTC (rev 4419)
@@ -5,6 +5,7 @@
import org.openqa.selenium.remote.RemoteWebDriver;
+
public class XQueryTestCase {
class VariableWithUri {
@@ -61,6 +62,10 @@
driver.executeScript("window.testcase.addVariable(arguments[0],arguments[1])", new Object[] {var.name,var.uri});
}
+ for (NamespaceToUri module: moduleLocations) {
+ driver.executeScript("window.testcase.addModuleLocation(arguments[0],arguments[1])", new Object[] {module.namespace,module.uri});
+
+ }
driver.executeScript("window.testcase.execute()",new Object[0]);
}
Modified: trunk/XQIB_Testing/test/ch/ethz/mxquery/Catalogclass.java
===================================================================
--- trunk/XQIB_Testing/test/ch/ethz/mxquery/Catalogclass.java 2011-06-30 14:18:19 UTC (rev 4418)
+++ trunk/XQIB_Testing/test/ch/ethz/mxquery/Catalogclass.java 2011-06-30 17:02:08 UTC (rev 4419)
@@ -8,7 +8,7 @@
public void test_Catalog001() throws Exception{
String query = "(: Name: Catalog001 :)\n(: Description: test that most input files have variable references :)\n\n(: insert-start :)\ndeclare variable $input-context external;\n(: insert-end :)\n\n\n<missing-variable>{for $x in $input-context//*:input-file[count(@variable) = 0 and\n./text() != \"emptydoc\"] return string($x/../@name)}</missing-variable>";
XQueryTestCase testcase = new XQueryTestCase(driver,query);
- testcase.addSchemaMapping("http://www.w3.org/2005/02/query-test-XQTSCatalog", "tests/XQTSCatalog.xsd");
+ testcase.addSchemaMapping("http://www.w3.org/2005/02/query-test-XQTSCatalog", "http://127.0.0.1:8090/test/tests/XQTSCatalog.xsd");
testcase.addVariable("input-context",
"http://127.0.0.1:8090/test/tests/XQTSCatalog.xml", true);
testcase.execute();
@@ -26,7 +26,7 @@
public void test_Catalog002() throws Exception{
String query = "(: Name: Catalog002 :)\n(: Description: test all standard test cases have at least one output file :)\n\n(: insert-start :)\ndeclare variable $input-context external;\n(: insert-end :)\n\n<standard-no-outputfile>{$input-context//*:test-case[@scenario = \"standard\"][fn:count(*:output-file) = 0]/@name/string()}</standard-no-outputfile>\n";
XQueryTestCase testcase = new XQueryTestCase(driver,query);
- testcase.addSchemaMapping("http://www.w3.org/2005/02/query-test-XQTSCatalog", "tests/XQTSCatalog.xsd");
+ testcase.addSchemaMapping("http://www.w3.org/2005/02/query-test-XQTSCatalog", "http://127.0.0.1:8090/test/tests/XQTSCatalog.xsd");
testcase.addVariable("input-context",
"http://127.0.0.1:8090/test/tests/XQTSCatalog.xml", true);
testcase.execute();
@@ -44,7 +44,7 @@
public void test_Catalog003() throws Exception{
String query = "(: Name: Catalog003 :)\n(: Description: test all error test cases have at least one expected error :)\n\n(: insert-start :)\ndeclare variable $input-context external;\n(: insert-end :)\n\n<error-no-expected-error>{$input-context//*:test-case[@scenario = \"runtime-error\" or @scenario = \"parse-error\"][fn:count(*:expected-error) = 0 and fn:count(*:output-file[@compare = \"Inspect\"]) = 0]/@name/string()}</error-no-expected-error>";
XQueryTestCase testcase = new XQueryTestCase(driver,query);
- testcase.addSchemaMapping("http://www.w3.org/2005/02/query-test-XQTSCatalog", "tests/XQTSCatalog.xsd");
+ testcase.addSchemaMapping("http://www.w3.org/2005/02/query-test-XQTSCatalog", "http://127.0.0.1:8090/test/tests/XQTSCatalog.xsd");
testcase.addVariable("input-context",
"http://127.0.0.1:8090/test/tests/XQTSCatalog.xml", true);
testcase.execute();
Modified: trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Construct/ComputeCon/ComputeConAttrclass.java
===================================================================
--- trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Construct/ComputeCon/ComputeConAttrclass.java 2011-06-30 14:18:19 UTC (rev 4418)
+++ trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Construct/ComputeCon/ComputeConAttrclass.java 2011-06-30 17:02:08 UTC (rev 4419)
@@ -234,7 +234,7 @@
public void test_Constr_compattr_compname_8() throws Exception{
String query = "(: Name: Constr-compattr-compname-8 :)\n(: Written by: Andreas Behm :)\n(: Description: NCName as name :)\n\n(: insert-start :)\ndeclare variable $input-context external;\n(: insert-end :)\n\nelement elem {attribute {$input-context//*:NCName} {'text'}}\n";
XQueryTestCase testcase = new XQueryTestCase(driver,query);
- testcase.addSchemaMapping("http://www.w3.org/XQueryTest", "tests/TestSources/atomic.xsd");
+ testcase.addSchemaMapping("http://www.w3.org/XQueryTest", "http://127.0.0.1:8090/test/tests/TestSources/atomic.xsd");
testcase.addVariable("input-context",
"http://127.0.0.1:8090/test/tests/TestSources/atomic.xml", true);
testcase.execute();
Modified: trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Construct/ComputeCon/ComputeConCommentclass.java
===================================================================
--- trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Construct/ComputeCon/ComputeConCommentclass.java 2011-06-30 14:18:19 UTC (rev 4418)
+++ trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Construct/ComputeCon/ComputeConCommentclass.java 2011-06-30 17:02:08 UTC (rev 4419)
@@ -284,7 +284,7 @@
public void test_Constr_compcomment_dash_4() throws Exception{
String query = "(: Name: Constr-compcomment-dash-4 :)\n(: Written by: Andreas Behm :)\n(: Description: dash at the end of content - :)\n\n(: insert-start :)\ndeclare variable $input-context external;\n(: insert-end :)\n\ncomment {$input-context//*:test-case[@name=\"Constr-compcomment-dash-4\"]/*:description}\n";
XQueryTestCase testcase = new XQueryTestCase(driver,query);
- testcase.addSchemaMapping("http://www.w3.org/2005/02/query-test-XQTSCatalog", "tests/XQTSCatalog.xsd");
+ testcase.addSchemaMapping("http://www.w3.org/2005/02/query-test-XQTSCatalog", "http://127.0.0.1:8090/test/tests/XQTSCatalog.xsd");
testcase.addVariable("input-context",
"http://127.0.0.1:8090/test/tests/XQTSCatalog.xml", true);
testcase.execute();
@@ -381,7 +381,7 @@
public void test_Constr_compcomment_doubledash_4() throws Exception{
String query = "(: Name: Constr-compcomment-doubledash-4 :)\n(: Written by: Andreas Behm :)\n(: Description: double dash -- in content :)\n\n(: insert-start :)\ndeclare variable $input-context external;\n(: insert-end :)\n\ncomment {$input-context//*:test-case[@name=\"Constr-compcomment-doubledash-4\"]/*:description}\n";
XQueryTestCase testcase = new XQueryTestCase(driver,query);
- testcase.addSchemaMapping("http://www.w3.org/2005/02/query-test-XQTSCatalog", "tests/XQTSCatalog.xsd");
+ testcase.addSchemaMapping("http://www.w3.org/2005/02/query-test-XQTSCatalog", "http://127.0.0.1:8090/test/tests/XQTSCatalog.xsd");
testcase.addVariable("input-context",
"http://127.0.0.1:8090/test/tests/XQTSCatalog.xml", true);
testcase.execute();
Modified: trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Construct/ComputeCon/ComputeConElemclass.java
===================================================================
--- trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Construct/ComputeCon/ComputeConElemclass.java 2011-06-30 14:18:19 UTC (rev 4418)
+++ trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Construct/ComputeCon/ComputeConElemclass.java 2011-06-30 17:02:08 UTC (rev 4419)
@@ -234,7 +234,7 @@
public void test_Constr_compelem_compname_8() throws Exception{
String query = "(: Name: Constr-compelem-compname-8 :)\n(: Written by: Andreas Behm :)\n(: Description: NCName as name :)\n\n(: insert-start :)\ndeclare variable $input-context external;\n(: insert-end :)\n\nelement {$input-context//*:NCName} {'text'}\n";
XQueryTestCase testcase = new XQueryTestCase(driver,query);
- testcase.addSchemaMapping("http://www.w3.org/XQueryTest", "tests/TestSources/atomic.xsd");
+ testcase.addSchemaMapping("http://www.w3.org/XQueryTest", "http://127.0.0.1:8090/test/tests/TestSources/atomic.xsd");
testcase.addVariable("input-context",
"http://127.0.0.1:8090/test/tests/TestSources/atomic.xml", true);
testcase.execute();
Modified: trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Construct/ComputeCon/ComputeConPIclass.java
===================================================================
--- trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Construct/ComputeCon/ComputeConPIclass.java 2011-06-30 14:18:19 UTC (rev 4418)
+++ trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Construct/ComputeCon/ComputeConPIclass.java 2011-06-30 17:02:08 UTC (rev 4419)
@@ -217,7 +217,7 @@
public void test_Constr_comppi_compname_8() throws Exception{
String query = "(: Name: Constr-comppi-compname-8 :)\n(: Written by: Andreas Behm :)\n(: Description: NCName as name :)\n\n(: insert-start :)\ndeclare variable $input-context external;\n(: insert-end :)\n\nprocessing-instruction {$input-context//*:NCName} {'text'}\n";
XQueryTestCase testcase = new XQueryTestCase(driver,query);
- testcase.addSchemaMapping("http://www.w3.org/XQueryTest", "tests/TestSources/atomic.xsd");
+ testcase.addSchemaMapping("http://www.w3.org/XQueryTest", "http://127.0.0.1:8090/test/tests/TestSources/atomic.xsd");
testcase.addVariable("input-context",
"http://127.0.0.1:8090/test/tests/TestSources/atomic.xml", true);
testcase.execute();
@@ -235,7 +235,7 @@
public void test_Constr_comppi_compname_9() throws Exception{
String query = "(: Name: Constr-comppi-compname-9 :)\n(: Written by: Andreas Behm :)\n(: Description: QName as name :)\n\n(: insert-start :)\ndeclare variable $input-context external;\n(: insert-end :)\n\nprocessing-instruction {$input-context//*:QName} {'text'}\n";
XQueryTestCase testcase = new XQueryTestCase(driver,query);
- testcase.addSchemaMapping("http://www.w3.org/XQueryTest", "tests/TestSources/atomic.xsd");
+ testcase.addSchemaMapping("http://www.w3.org/XQueryTest", "http://127.0.0.1:8090/test/tests/TestSources/atomic.xsd");
testcase.addVariable("input-context",
"http://127.0.0.1:8090/test/tests/TestSources/atomic.xml", true);
testcase.execute();
Modified: trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Construct/ComputeCon/ConDocNodeclass.java
===================================================================
--- trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Construct/ComputeCon/ConDocNodeclass.java 2011-06-30 14:18:19 UTC (rev 4418)
+++ trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Construct/ComputeCon/ConDocNodeclass.java 2011-06-30 17:02:08 UTC (rev 4419)
@@ -229,7 +229,7 @@
public void test_Constr_docnode_constrmod_1() throws Exception{
String query = "(: Name: Constr-docnode-constrmod-1 :)\n(: Written by: Andreas Behm :)\n(: Description: strip IDREFS type :)\n\ndeclare construction strip;\n\n(: insert-start :)\ndeclare variable $input-context external;\n(: insert-end :)\n\nfn:count(fn:data((document {$input-context//*:idrefs})/*))\n";
XQueryTestCase testcase = new XQueryTestCase(driver,query);
- testcase.addSchemaMapping("http://www.w3.org/XQueryTest", "tests/TestSources/atomic.xsd");
+ testcase.addSchemaMapping("http://www.w3.org/XQueryTest", "http://127.0.0.1:8090/test/tests/TestSources/atomic.xsd");
testcase.addVariable("input-context",
"http://127.0.0.1:8090/test/tests/TestSources/atomic.xml", true);
testcase.execute();
@@ -247,7 +247,7 @@
public void test_Constr_docnode_constrmod_2() throws Exception{
String query = "(: Name: Constr-docnode-constrmod-2 :)\n(: Written by: Andreas Behm :)\n(: Description: preserve IDREFS type :)\n\ndeclare construction preserve;\n\n(: insert-start :)\ndeclare variable $input-context external;\n(: insert-end :)\n\nfn:count(fn:data((document {$input-context//*:idrefs})/*))\n";
XQueryTestCase testcase = new XQueryTestCase(driver,query);
- testcase.addSchemaMapping("http://www.w3.org/XQueryTest", "tests/TestSources/atomic.xsd");
+ testcase.addSchemaMapping("http://www.w3.org/XQueryTest", "http://127.0.0.1:8090/test/tests/TestSources/atomic.xsd");
testcase.addVariable("input-context",
"http://127.0.0.1:8090/test/tests/TestSources/atomic.xml", true);
testcase.execute();
@@ -265,7 +265,7 @@
public void test_Constr_docnode_constrmod_3() throws Exception{
String query = "(: Name: Constr-docnode-constrmod-3 :)\n(: Written by: Andreas Behm :)\n(: Description: strip decimal type :)\n\ndeclare construction strip;\n\n(: insert-start :)\ndeclare variable $input-context external;\n(: insert-end :)\n\n(document {$input-context//*:decimal})/* cast as xs:integer\n";
XQueryTestCase testcase = new XQueryTestCase(driver,query);
- testcase.addSchemaMapping("http://www.w3.org/XQueryTest", "tests/TestSources/atomic.xsd");
+ testcase.addSchemaMapping("http://www.w3.org/XQueryTest", "http://127.0.0.1:8090/test/tests/TestSources/atomic.xsd");
testcase.addVariable("input-context",
"http://127.0.0.1:8090/test/tests/TestSources/atomic.xml", true);
testcase.execute();
@@ -290,7 +290,7 @@
public void test_Constr_docnode_constrmod_4() throws Exception{
String query = "(: Name: Constr-docnode-constrmod-4 :)\n(: Written by: Andreas Behm :)\n(: Description: preserve decimal type :)\n\ndeclare construction preserve;\n\n(: insert-start :)\ndeclare variable $input-context external;\n(: insert-end :)\n\n(document {$input-context//*:decimal})/* cast as xs:integer\n\n";
XQueryTestCase testcase = new XQueryTestCase(driver,query);
- testcase.addSchemaMapping("http://www.w3.org/XQueryTest", "tests/TestSources/atomic.xsd");
+ testcase.addSchemaMapping("http://www.w3.org/XQueryTest", "http://127.0.0.1:8090/test/tests/TestSources/atomic.xsd");
testcase.addVariable("input-context",
"http://127.0.0.1:8090/test/tests/TestSources/atomic.xml", true);
testcase.execute();
Modified: trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Construct/DirectConElem/DirectConElemContentclass.java
===================================================================
--- trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Construct/DirectConElem/DirectConElemContentclass.java 2011-06-30 14:18:19 UTC (rev 4418)
+++ trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Construct/DirectConElem/DirectConElemContentclass.java 2011-06-30 17:02:08 UTC (rev 4419)
@@ -604,7 +604,7 @@
public void test_Constr_cont_constrmod_1() throws Exception{
String query = "(: Name: Constr-cont-constrmod-1 :)\n(: Written by: Andreas Behm :)\n(: Description: strip IDREFS type :)\n\ndeclare construction strip;\n\n(: insert-start :)\ndeclare variable $input-context external;\n(: insert-end :)\n\nfn:count(fn:data(<elem>{$input-context//*:idrefs}</elem>/*))\n";
XQueryTestCase testcase = new XQueryTestCase(driver,query);
- testcase.addSchemaMapping("http://www.w3.org/XQueryTest", "tests/TestSources/atomic.xsd");
+ testcase.addSchemaMapping("http://www.w3.org/XQueryTest", "http://127.0.0.1:8090/test/tests/TestSources/atomic.xsd");
testcase.addVariable("input-context",
"http://127.0.0.1:8090/test/tests/TestSources/atomic.xml", true);
testcase.execute();
@@ -622,7 +622,7 @@
public void test_Constr_cont_constrmod_2() throws Exception{
String query = "(: Name: Constr-cont-constrmod-2 :)\n(: Written by: Andreas Behm :)\n(: Description: preserve IDREFS type :)\n\ndeclare construction preserve;\n\n(: insert-start :)\ndeclare variable $input-context external;\n(: insert-end :)\n\nfn:count(fn:data(<elem>{$input-context//*:idrefs}</elem>/*))\n";
XQueryTestCase testcase = new XQueryTestCase(driver,query);
- testcase.addSchemaMapping("http://www.w3.org/XQueryTest", "tests/TestSources/atomic.xsd");
+ testcase.addSchemaMapping("http://www.w3.org/XQueryTest", "http://127.0.0.1:8090/test/tests/TestSources/atomic.xsd");
testcase.addVariable("input-context",
"http://127.0.0.1:8090/test/tests/TestSources/atomic.xml", true);
testcase.execute();
@@ -640,7 +640,7 @@
public void test_Constr_cont_constrmod_3() throws Exception{
String query = "(: Name: Constr-cont-constrmod-3 :)\n(: Written by: Andreas Behm :)\n(: Description: strip decimal type :)\n\ndeclare construction strip;\n\n(: insert-start :)\ndeclare variable $input-context external;\n(: insert-end :)\n\n<elem>{$input-context//*:decimal}</elem>/* cast as xs:integer\n";
XQueryTestCase testcase = new XQueryTestCase(driver,query);
- testcase.addSchemaMapping("http://www.w3.org/XQueryTest", "tests/TestSources/atomic.xsd");
+ testcase.addSchemaMapping("http://www.w3.org/XQueryTest", "http://127.0.0.1:8090/test/tests/TestSources/atomic.xsd");
testcase.addVariable("input-context",
"http://127.0.0.1:8090/test/tests/TestSources/atomic.xml", true);
testcase.execute();
@@ -665,7 +665,7 @@
public void test_Constr_cont_constrmod_4() throws Exception{
String query = "(: Name: Constr-cont-constrmod-4 :)\n(: Written by: Andreas Behm :)\n(: Description: preserve decimal type :)\n\ndeclare construction preserve;\n\n(: insert-start :)\ndeclare variable $input-context external;\n(: insert-end :)\n\n<elem>{$input-context//*:decimal}</elem>/* cast as xs:integer\n\n";
XQueryTestCase testcase = new XQueryTestCase(driver,query);
- testcase.addSchemaMapping("http://www.w3.org/XQueryTest", "tests/TestSources/atomic.xsd");
+ testcase.addSchemaMapping("http://www.w3.org/XQueryTest", "http://127.0.0.1:8090/test/tests/TestSources/atomic.xsd");
testcase.addVariable("input-context",
"http://127.0.0.1:8090/test/tests/TestSources/atomic.xml", true);
testcase.execute();
@@ -686,7 +686,7 @@
public void test_Constr_cont_constrmod_5() throws Exception{
String query = "(: Name: Constr-cont-constrmod-5 :)\n(: Written by: Andreas Behm :)\n(: Description: strip IDREFS type in attribute :)\n\ndeclare construction strip;\n\n(: insert-start :)\ndeclare variable $input-context external;\n(: insert-end :)\n\nfn:count(fn:data((<elem>{$input-context//*:idrefs/@*:attr}</elem>)/@*:attr))\n";
XQueryTestCase testcase = new XQueryTestCase(driver,query);
- testcase.addSchemaMapping("http://www.w3.org/XQueryTest", "tests/TestSources/atomic.xsd");
+ testcase.addSchemaMapping("http://www.w3.org/XQueryTest", "http://127.0.0.1:8090/test/tests/TestSources/atomic.xsd");
testcase.addVariable("input-context",
"http://127.0.0.1:8090/test/tests/TestSources/atomic.xml", true);
testcase.execute();
@@ -704,7 +704,7 @@
public void test_Constr_cont_constrmod_6() throws Exception{
String query = "(: Name: Constr-cont-constrmod-6 :)\n(: Written by: Andreas Behm :)\n(: Description: preserve IDREFS type in attribute :)\n\ndeclare construction preserve;\n\n(: insert-start :)\ndeclare variable $input-context external;\n(: insert-end :)\n\nfn:count(fn:data((<elem>{$input-context//*:idrefs/@*:attr}</elem>)/@*:attr))\n";
XQueryTestCase testcase = new XQueryTestCase(driver,query);
- testcase.addSchemaMapping("http://www.w3.org/XQueryTest", "tests/TestSources/atomic.xsd");
+ testcase.addSchemaMapping("http://www.w3.org/XQueryTest", "http://127.0.0.1:8090/test/tests/TestSources/atomic.xsd");
testcase.addVariable("input-context",
"http://127.0.0.1:8090/test/tests/TestSources/atomic.xml", true);
testcase.execute();
@@ -722,7 +722,7 @@
public void test_Constr_cont_constrmod_7() throws Exception{
String query = "(: Name: Constr-cont-constrmod-7 :)\n(: Written by: Andreas Behm :)\n(: Description: strip decimal type in attribute :)\n\ndeclare construction strip;\n\n(: insert-start :)\ndeclare variable $input-context external;\n(: insert-end :)\n\n(<elem>{$input-context//*:decimal/@*:attr}</elem>)/@*:attr cast as xs:integer\n";
XQueryTestCase testcase = new XQueryTestCase(driver,query);
- testcase.addSchemaMapping("http://www.w3.org/XQueryTest", "tests/TestSources/atomic.xsd");
+ testcase.addSchemaMapping("http://www.w3.org/XQueryTest", "http://127.0.0.1:8090/test/tests/TestSources/atomic.xsd");
testcase.addVariable("input-context",
"http://127.0.0.1:8090/test/tests/TestSources/atomic.xml", true);
testcase.execute();
@@ -747,7 +747,7 @@
public void test_Constr_cont_constrmod_8() throws Exception{
String query = "(: Name: Constr-cont-constrmod-8 :)\n(: Written by: Andreas Behm :)\n(: Description: preserve decimal type in attribute :)\n\ndeclare construction preserve;\n\n(: insert-start :)\ndeclare variable $input-context external;\n(: insert-end :)\n\n(<elem>{$input-context//*:decimal/@*:attr}</elem>)/@*:attr cast as xs:integer\n\n";
XQueryTestCase testcase = new XQueryTestCase(driver,query);
- testcase.addSchemaMapping("http://www.w3.org/XQueryTest", "tests/TestSources/atomic.xsd");
+ testcase.addSchemaMapping("http://www.w3.org/XQueryTest", "http://127.0.0.1:8090/test/tests/TestSources/atomic.xsd");
testcase.addVariable("input-context",
"http://127.0.0.1:8090/test/tests/TestSources/atomic.xml", true);
testcase.execute();
@@ -836,7 +836,7 @@
public void test_Constr_cont_nsmode_5() throws Exception{
String query = "(: Name: Constr-cont-nsmode-5 :)\n(: Written by: Andreas Behm :)\n(: Description: Copy namespace sensitive content :)\n\ndeclare copy-namespaces no-preserve, inherit;\ndeclare construction preserve;\n\n(: insert-start :)\ndeclare variable $input-context external;\n(: insert-end :)\n\n<new>{ $input-context//*:QName }</new>\n";
XQueryTestCase testcase = new XQueryTestCase(driver,query);
- testcase.addSchemaMapping("http://www.w3.org/XQueryTest", "tests/TestSources/atomic.xsd");
+ testcase.addSchemaMapping("http://www.w3.org/XQueryTest", "http://127.0.0.1:8090/test/tests/TestSources/atomic.xsd");
testcase.addVariable("input-context",
"http://127.0.0.1:8090/test/tests/TestSources/atomic.xml", true);
testcase.execute();
@@ -857,7 +857,7 @@
public void test_Constr_cont_nsmode_6() throws Exception{
String query = "(: Name: Constr-cont-nsmode-6 :)\n(: Written by: Andreas Behm :)\n(: Description: Copy namespace sensitive content :)\n\ndeclare copy-namespaces no-preserve, no-inherit;\ndeclare construction preserve;\n\n(: insert-start :)\ndeclare variable $input-context external;\n(: insert-end :)\n\n<new>{ $input-context//*:QName }</new>\n";
XQueryTestCase testcase = new XQueryTestCase(driver,query);
- testcase.addSchemaMapping("http://www.w3.org/XQueryTest", "tests/TestSources/atomic.xsd");
+ testcase.addSchemaMapping("http://www.w3.org/XQueryTest", "http://127.0.0.1:8090/test/tests/TestSources/atomic.xsd");
testcase.addVariable("input-context",
"http://127.0.0.1:8090/test/tests/TestSources/atomic.xml", true);
testcase.execute();
Modified: trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/FLWOR/ForExpr/ForExprWithclass.java
===================================================================
--- trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/FLWOR/ForExpr/ForExprWithclass.java 2011-06-30 14:18:19 UTC (rev 4418)
+++ trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/FLWOR/ForExpr/ForExprWithclass.java 2011-06-30 17:02:08 UTC (rev 4419)
@@ -165,7 +165,7 @@
public void test_ForExprType009() throws Exception{
String query = "(: Name: ForExprType009 :)\n(: Description: FLWOR with type expression matching a user defined type :)\n\ndeclare namespace xqt=\"http://www.w3.org/XQueryTestOrderBy\";\n\n(: insert-start :)\ndeclare variable $input-context external;\n(: insert-end :)\n\nfor $num as element(xqt:NegativeNumbers) in $input-context/xqt:DataValues/xqt:NegativeNumbers\nreturn $num";
XQueryTestCase testcase = new XQueryTestCase(driver,query);
- testcase.addSchemaMapping("http://www.w3.org/XQueryTestOrderBy", "tests/TestSources/orderData.xsd");
+ testcase.addSchemaMapping("http://www.w3.org/XQueryTestOrderBy", "http://127.0.0.1:8090/test/tests/TestSources/orderData.xsd");
testcase.addVariable("input-context",
"http://127.0.0.1:8090/test/tests/TestSources/orderData.xml", true);
testcase.execute();
@@ -183,7 +183,7 @@
public void test_ForExprType011() throws Exception{
String query = "(: Name: ForExprType011 :)\n(: Description: FLWOR with type expression referencing an unknown type :)\n\ndeclare namespace xqt=\"http://www.w3.org/XQueryTestOrderBy\";\n\n(: insert-start :)\ndeclare variable $input-context external;\n(: insert-end :)\n\nfor $num as xs:undefinedType in data( $input-context/xqt:DataValues/xqt:NegativeNumbers/xqt:orderData )\nreturn $num";
XQueryTestCase testcase = new XQueryTestCase(driver,query);
- testcase.addSchemaMapping("http://www.w3.org/XQueryTestOrderBy", "tests/TestSources/orderData.xsd");
+ testcase.addSchemaMapping("http://www.w3.org/XQueryTestOrderBy", "http://127.0.0.1:8090/test/tests/TestSources/orderData.xsd");
testcase.addVariable("input-context",
"http://127.0.0.1:8090/test/tests/TestSources/orderData.xml", true);
testcase.execute();
@@ -232,7 +232,7 @@
public void test_ForExprType013() throws Exception{
String query = "(: Name: ForExprType013 :)\n(: Description: Type declaration containing multiple 'as' keywords :)\n\ndeclare namespace xqt=\"http://www.w3.org/XQueryTestOrderBy\";\n\n(: insert-start :)\ndeclare variable $input-context external;\n(: insert-end :)\n\nfor $num as xs:decimal as xs:decimal in data( $input-context/xqt:DataValues/xqt:NegativeNumbers/xqt:orderData )\nreturn $num\n";
XQueryTestCase testcase = new XQueryTestCase(driver,query);
- testcase.addSchemaMapping("http://www.w3.org/XQueryTestOrderBy", "tests/TestSources/orderData.xsd");
+ testcase.addSchemaMapping("http://www.w3.org/XQueryTestOrderBy", "http://127.0.0.1:8090/test/tests/TestSources/orderData.xsd");
testcase.addVariable("input-context",
"http://127.0.0.1:8090/test/tests/TestSources/orderData.xml", true);
testcase.execute();
@@ -257,7 +257,7 @@
public void test_ForExprType014() throws Exception{
String query = "(: Name: ForExprType014 :)\n(: Description: Type expression value is void. This will never match anything bound to a variable by a FLWOR statement :)\n\ndeclare namespace xqt=\"http://www.w3.org/XQueryTestOrderBy\";\n\n(: insert-start :)\ndeclare variable $input-context external;\n(: insert-end :)\n\nfor $num as empty-sequence() in data( $input-context/xqt:DataValues/xqt:NegativeNumbers/xqt:orderData )\nreturn $num\n";
XQueryTestCase testcase = new XQueryTestCase(driver,query);
- testcase.addSchemaMapping("http://www.w3.org/XQueryTestOrderBy", "tests/TestSources/orderData.xsd");
+ testcase.addSchemaMapping("http://www.w3.org/XQueryTestOrderBy", "http://127.0.0.1:8090/test/tests/TestSources/orderData.xsd");
testcase.addVariable("input-context",
"http://127.0.0.1:8090/test/tests/TestSources/orderData.xml", true);
testcase.execute();
@@ -408,7 +408,7 @@
public void test_ForExprType022() throws Exception{
String query = "(: Name: ForExprType022 :)\n(: Description: FLWOR expressions with type declaration (attribute type). Simple attribute wildcard :)\n\n(: insert-start :)\ndeclare default element namespace \"http://typedecl\";\n\ndeclare variable $input-context external;\n(: insert-end :)\n\nfor $test as attribute(*) in ( $input-context/root/InterleaveType2/@integer, $input-context/root/InterleaveType2/@decimal )\nreturn data( $test )";
XQueryTestCase testcase = new XQueryTestCase(driver,query);
- testcase.addSchemaMapping("http://typedecl", "tests/TestSources/SpecialTypes.xsd");
+ testcase.addSchemaMapping("http://typedecl", "http://127.0.0.1:8090/test/tests/TestSources/SpecialTypes.xsd");
testcase.addVariable("input-context",
"http://127.0.0.1:8090/test/tests/TestSources/SpecialTypes.xml", true);
testcase.execute();
@@ -426,7 +426,7 @@
public void test_ForExprType023() throws Exception{
String query = "(: Name: ForExprType023 :)\n(: Description: FLWOR expressions with type declaration (attribute type). Simple attribute name test (no type) :)\n\n(: insert-start :)\ndeclare default element namespace \"http://typedecl\";\n\ndeclare variable $input-context external;\n(: insert-end :)\n\nfor $test as attribute(integer) in ( $input-context/root/InterleaveType2/@integer )\nreturn data( $test )\n";
XQueryTestCase testcase = new XQueryTestCase(driver,query);
- testcase.addSchemaMapping("http://typedecl", "tests/TestSources/SpecialTypes.xsd");
+ testcase.addSchemaMapping("http://typedecl", "http://127.0.0.1:8090/test/tests/TestSources/SpecialTypes.xsd");
testcase.addVariable("input-context",
"http://127.0.0.1:8090/test/tests/TestSources/SpecialTypes.xml", true);
testcase.execute();
@@ -444,7 +444,7 @@
public void test_ForExprType024() throws Exception{
String query = "(: Name: ForExprType024 :)\n(: Description: FLWOR expressions with type declaration (attribute type). anySimpleType attribute :)\n\n(: insert-start :)\ndeclare default element namespace \"http://typedecl\";\n\ndeclare variable $input-context external;\n(: insert-end :)\n\nfor $test as attribute(att, xs:anySimpleType) in $input-context/root/anyAtomicType/@att\nreturn data( $test )\n";
XQueryTestCase testcase = new XQueryTestCase(driver,query);
- testcase.addSchemaMapping("http://typedecl", "tests/TestSources/SpecialTypes.xsd");
+ testcase.addSchemaMapping("http://typedecl", "http://127.0.0.1:8090/test/tests/TestSources/SpecialTypes.xsd");
testcase.addVariable("input-context",
"http://127.0.0.1:8090/test/tests/TestSources/SpecialTypes.xml", true);
testcase.execute();
@@ -598,7 +598,7 @@
public void test_ForExprType036() throws Exception{
String query = "(: Name: ForExprType036 :)\n(: Description: FLWOR expressions with type declaration (element type). Simple element wildcard :)\n\n(: insert-start :)\ndeclare default element namespace \"http://typedecl\";\n\ndeclare variable $input-context external;\n(: insert-end :)\n\nfor $test as element(*) in $input-context/root/InterleaveType/*\nreturn $test";
XQueryTestCase testcase = new XQueryTestCase(driver,query);
- testcase.addSchemaMapping("http://typedecl", "tests/TestSources/SpecialTypes.xsd");
+ testcase.addSchemaMapping("http://typedecl", "http://127.0.0.1:8090/test/tests/TestSources/SpecialTypes.xsd");
testcase.addVariable("input-context",
"http://127.0.0.1:8090/test/tests/TestSources/SpecialTypes.xml", true);
testcase.execute();
@@ -616,7 +616,7 @@
public void test_ForExprType045() throws Exception{
String query = "(: Name: ForExprType045 :)\n(: Description: FLWOR expressions with type declaration. Unknown Type :)\n\nfor $test as xs:unknownType in ( 1, 2, 3)\nreturn $test";
XQueryTestCase testcase = new XQueryTestCase(driver,query);
- testcase.addSchemaMapping("http://typedecl", "tests/TestSources/SpecialTypes.xsd");
+ testcase.addSchemaMapping("http://typedecl", "http://127.0.0.1:8090/test/tests/TestSources/SpecialTypes.xsd");
testcase.addVariable("input-context",
"http://127.0.0.1:8090/test/tests/TestSources/SpecialTypes.xml", true);
testcase.execute();
@@ -641,7 +641,7 @@
public void test_ForExprType046() throws Exception{
String query = "(: Name: ForExprType046 :)\n(: Description: FLWOR expressions with type declaration. Attempt to promote xs:decimal | xs:double | xs:integer - no common subtype :)\n\nfor $test as xs:double in ( 1, 1e2, 0.3 )\nreturn $test";
XQueryTestCase testcase = new XQueryTestCase(driver,query);
- testcase.addSchemaMapping("http://typedecl", "tests/TestSources/SpecialTypes.xsd");
+ testcase.addSchemaMapping("http://typedecl", "http://127.0.0.1:8090/test/tests/TestSources/SpecialTypes.xsd");
testcase.addVariable("input-context",
"http://127.0.0.1:8090/test/tests/TestSources/SpecialTypes.xml", true);
testcase.execute();
@@ -666,7 +666,7 @@
public void test_ForExprType047() throws Exception{
String query = "(: Name: ForExprType047 :)\n(: Description: FLWOR expressions with type declaration. Test matching no atomic simple types :)\n\nfor $test as xs:NMTOKENS in ( xs:NMTOKEN(\"ab\"), xs:NMTOKEN(\"cd\") )\nreturn $test";
XQueryTestCase testcase = new XQueryTestCase(driver,query);
- testcase.addSchemaMapping("http://typedecl", "tests/TestSources/SpecialTypes.xsd");
+ testcase.addSchemaMapping("http://typedecl", "http://127.0.0.1:8090/test/tests/TestSources/SpecialTypes.xsd");
testcase.addVariable("input-context",
"http://127.0.0.1:8090/test/tests/TestSources/SpecialTypes.xml", true);
testcase.execute();
Modified: trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/FLWOR/OrderbyExpr/OrderbyExprWithclass.java
===================================================================
--- trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/FLWOR/OrderbyExpr/OrderbyExprWithclass.java 2011-06-30 14:18:19 UTC (rev 4418)
+++ trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/FLWOR/OrderbyExpr/OrderbyExprWithclass.java 2011-06-30 17:02:08 UTC (rev 4419)
@@ -8,7 +8,7 @@
public void test_orderBy1() throws Exception{
String query = "declare default element namespace \"http://www.w3.org/XQueryTestOrderBy\";\n(: name : orderBy1 :)\n(: description : Evaluation of \"order by\" clause with the \"order by\" clause of a FLWR expression set to \"$x \", where $x is a set of Strings and the ordering mode set to ascending :)\n\n(: insert-start :)\ndeclare variable $input-context1 external;\n(: insert-end :)\n\n<results> {\nfor $x in $input-context1/DataValues/Strings/orderData\n order by $x ascending return $x\n}\n</results>\n";
XQueryTestCase testcase = new XQueryTestCase(driver,query);
- testcase.addSchemaMapping("http://www.w3.org/XQueryTestOrderBy", "tests/TestSources/orderData.xsd");
+ testcase.addSchemaMapping("http://www.w3.org/XQueryTestOrderBy", "http://127.0.0.1:8090/test/tests/TestSources/orderData.xsd");
testcase.addVariable("input-context1",
"http://127.0.0.1:8090/test/tests/TestSources/orderData.xml", true);
testcase.execute();
@@ -26,7 +26,7 @@
public void test_orderBy2() throws Exception{
String query = "declare default element namespace \"http://www.w3.org/XQueryTestOrderBy\";\n(: name : orderBy2 :)\n(: description : Evaluation of \"order by\" clause with the \"order by\" clause of a FLWR expression set to \"$x \", where $x is a set of Strings and the ordering mode set to descending :)\n\n(: insert-start :)\ndeclare variable $input-context1 external;\n(: insert-end :)\n\n<results> {\nfor $x in $input-context1/DataValues/Strings/orderData\n order by $x descending return $x\n}\n</results>\n";
XQueryTestCase testcase = new XQueryTestCase(driver,query);
- testcase.addSchemaMapping("http://www.w3.org/XQueryTestOrderBy", "tests/TestSources/orderData.xsd");
+ testcase.addSchemaMapping("http://www.w3.org/XQueryTestOrderBy", "http://127.0.0.1:8090/test/tests/TestSources/orderData.xsd");
testcase.addVariable("input-context1",
"http://127.0.0.1:8090/test/tests/TestSources/orderData.xml", true);
testcase.execute();
@@ -44,7 +44,7 @@
public void test_orderBy3() throws Exception{
String query = "declare default element namespace \"http://www.w3.org/XQueryTestOrderBy\";\n(: name : orderBy3 :)\n(: description : Evaluation of \"order by\" clause with the \"order by\" clause of a FLWR expression set to \"concat($x,\"()\") \", where $x is a set of Strings and the ordering mode set to ascending :)\n\n(: insert-start :)\ndeclare variable $input-context1 external;\n(: insert-end :)\n\n<results> {\nfor $x in $input-context1/DataValues/Strings/orderData\n order by concat($x,\"()\") ascending return concat($x,\"()\")\n}\n</results>\n";
XQueryTestCase testcase = new XQueryTestCase(driver,query);
- testcase.addSchemaMapping("http://www.w3.org/XQueryTestOrderBy", "tests/TestSources/orderData.xsd");
+ testcase.addSchemaMapping("http://www.w3.org/XQueryTestOrderBy", "http://127.0.0.1:8090/test/tests/TestSources/orderData.xsd");
testcase.addVariable("input-context1",
"http://127.0.0.1:8090/test/tests/TestSources/orderData.xml", true);
testcase.execute();
@@ -62,7 +62,7 @@
public void test_orderBy4() throws Exception{
String query = "declare default element namespace \"http://www.w3.org/XQueryTestOrderBy\";\n(: name : orderBy4 :)\n(: description : Evaluation of \"order by\" clause with the \"order by\" clause of a FLWR expression set to \"concat($x,\"()\") \", where $x is a set of Strings and the ordering mode set to descending :)\n\n(: insert-start :)\ndeclare variable $input-context1 external;\n(: insert-end :)\n\n<results> {\nfor $x in $input-context1/DataValues/Strings/orderData\n order by concat($x,\"()\") descending return concat($x,\"()\")\n}\n</results>\n";
XQueryTestCase testcase = new XQueryTestCase(driver,query);
- testcase.addSchemaMapping("http://www.w3.org/XQueryTestOrderBy", "tests/TestSources/orderData.xsd");
+ testcase.addSchemaMapping("http://www.w3.org/XQueryTestOrderBy", "http://127.0.0.1:8090/test/tests/TestSources/orderData.xsd");
testcase.addVariable("input-context1",
"http://127.0.0.1:8090/test/tests/TestSources/orderData.xml", true);
testcase.execute();
@@ -80,7 +80,7 @@
public void test_orderBy5() throws Exception{
String query = "declare default element namespace \"http://www.w3.org/XQueryTestOrderBy\";\n(: name : orderBy5 :)\n(: description : Evaluation of \"order by\" clause with the \"order by\" clause of a FLWR expression set to \"concat($x,\"another String After\") \", where $x is a set of Strings and the ordering mode set to ascending :)\n\n(: insert-start :)\ndeclare variable $input-context1 external;\n(: insert-end :)\n\n<results> {\nfor $x in $input-context1/DataValues/Strings/orderData\n order by concat($x,\"another String After\") ascending return concat($x,\"another String After\")\n}\n</results>\n";
XQueryTestCase testcase = new XQueryTestCase(driver,query);
- testcase.addSchemaMapping("http://www.w3.org/XQueryTestOrderBy", "tests/TestSources/orderData.xsd");
+ testcase.addSchemaMapping("http://www.w3.org/XQueryTestOrderBy", "http://127.0.0.1:8090/test/tests/TestSources/orderData.xsd");
testcase.addVariable("input-context1",
"http://127.0.0.1:8090/test/tests/TestSources/orderData.xml", true);
testcase.execute();
@@ -98,7 +98,7 @@
public void test_orderBy6() throws Exception{
String query = "declare default element namespace \"http://www.w3.org/XQueryTestOrderBy\";\n(: name : orderBy6 :)\n(: description : Evaluation of \"order by\" clause with the \"order by\" clause of a FLWR expression set to \"concat($x,\"another String After\") \", where $x is a set of Strings and the ordering mode set to descending :)\n\n(: insert-start :)\ndeclare variable $input-context1 external;\n(: insert-end :)\n\n<results> {\nfor $x in $input-context1/DataValues/Strings/orderData\n order by concat($x,\"another String After\") descending return concat($x,\"another String After\")\n}\n</results>\n";
XQueryTestCase testcase = new XQueryTestCase(driver,query);
- testcase.addSchemaMapping("http://www.w3.org/XQueryTestOrderBy", "tests/TestSources/orderData.xsd");
+ testcase.addSchemaMapping("http://www.w3.org/XQueryTestOrderBy", "http://127.0.0.1:8090/test/tests/TestSources/orderData.xsd");
testcase.addVariable("input-context1",
"http://127.0.0.1:8090/test/tests/TestSources/orderData.xml", true);
testcase.execute();
@@ -116,7 +116,7 @@
public void test_orderBy7() throws Exception{
String query = "declare default element namespace \"http://www.w3.org/XQueryTestOrderBy\";\n(: name : orderBy7 :)\n(: description : Evaluation of \"order by\" clause with the \"order by\" clause of a FLWR expression set to \"concat($x,\"another String Before\") \", where $x is a set of Strings and the ordering mode set to ascending :)\n\n(: insert-start :)\ndeclare variable $input-context1 external;\n(: insert-end :)\n\n<results> {\nfor $x in $input-context1/DataValues/Strings/orderData\n order by concat($x,\"another String Before\") ascending return concat($x,\"another String Before\")\n}\n</results>\n";
XQueryTestCase testcase = new XQueryTestCase(driver,query);
- testcase.addSchemaMapping("http://www.w3.org/XQueryTestOrderBy", "tests/TestSources/orderData.xsd");
+ testcase.addSchemaMapping("http://www.w3.org/XQueryTestOrderBy", "http://127.0.0.1:8090/test/tests/TestSources/orderData.xsd");
testcase.addVariable("input-context1",
"http://127.0.0.1:8090/test/tests/TestSources/orderData.xml", true);
testcase.execute();
@@ -134,7 +134,7 @@
public void test_orderBy8() throws Exception{
String query = "declare default element namespace \"http://www.w3.org/XQueryTestOrderBy\";\n(: name : orderBy8 :)\n(: description : Evaluation of \"order by\" clause with the \"order by\" clause of a FLWR expression set to \"concat($x,\"another String Before\") \", where $x is a set of Strings and the ordering mode set to descending :)\n\n(: insert-start :)\ndeclare variable $input-context1 external;\n(: insert-end :)\n\n<results> {\nfor $x in $input-context1/DataValues/Strings/orderData\n order by concat($x,\"another String Before\") descending return concat($x,\"another String Before\")\n}\n</results>\n";
XQueryTestCase testcase = new XQueryTestCase(driver,query);
- testcase.addSchemaMapping("http://www.w3.org/XQueryTestOrderBy", "tests/TestSources/orderData.xsd");
+ testcase.addSchemaMapping("http://www.w3.org/XQueryTestOrderBy", "http://127.0.0.1:8090/test/tests/TestSources/orderData.xsd");
testcase.addVariable("input-context1",
"http://127.0.0.1:8090/test/tests/TestSources/orderData.xml", true);
testcase.execute();
@@ -152,7 +152,7 @@
public void test_orderBy9() throws Exception{
String query = "declare default element namespace \"http://www.w3.org/XQueryTestOrderBy\";\n(: name : orderBy9 :)\n(: description : Evaluation of \"order by\" clause with the \"order by\" clause of a FLWR expression set to \"concat($x,\"\") \", where $x is a set of Strings and the ordering mode set to descending :)\n\n(: insert-start :)\ndeclare variable $input-context1 external;\n(: insert-end :)\n\n<results> {\nfor $x in $input-context1/DataValues/Strings/orderData\n order by concat($x,\"\") descending return concat($x,\"\")\n}\n</results>\n";
XQueryTestCase testcase = new XQueryTestCase(driver,query);
- testcase.addSchemaMapping("http://www.w3.org/XQueryTestOrderBy", "tests/TestSources/orderData.xsd");
+ testcase.addSchemaMapping("http://www.w3.org/XQueryTestOrderBy", "http://127.0.0.1:8090/test/tests/TestSources/orderData.xsd");
testcase.addVariable("input-context1",
"http://127.0.0.1:8090/test/tests/TestSources/orderData.xml", true);
testcase.execute();
@@ -170,7 +170,7 @@
public void test_orderBy10() throws Exception{
String query = "declare default element namespace \"http://www.w3.org/XQueryTestOrderBy\";\n(: name : orderBy10 :)\n(: description : Evaluation of \"order by\" clause with the \"order by\" clause of a FLWR expression set to \"concat($x,\"\") \", where $x is a set of Strings and the ordering mode set to ascending :)\n\n(: insert-start :)\ndeclare variable $input-context1 external;\n(: insert-end :)\n\n<results> {\nfor $x in $input-context1/DataValues/Strings/orderData\n order by concat($x,\"\") ascending return concat($x,\"\")\n}\n</results>\n";
XQueryTestCase testcase = new XQueryTestCase(driver,query);
- testcase.addSchemaMapping("http://www.w3.org/XQueryTestOrderBy", "tests/TestSources/orderData.xsd");
+ testcase.addSchemaMapping("http://www.w3.org/XQueryTestOrderBy", "http://127.0.0.1:8090/test/tests/TestSources/orderData.xsd");
testcase.addVariable("input-context1",
"http://127.0.0.1:8090/test/tests/TestSources/orderData.xml", true);
testcase.execute();
@@ -188,7 +188,7 @@
public void test_orderBy11() throws Exception{
String query = "declare default element namespace \"http://www.w3.org/XQueryTestOrderBy\";\n(: name : orderBy11 :)\n(: description : Evaluation of \"order by\" clause with the \"order by\" clause of a FLWR expression set to \"concat(\"\",$x) \", where $x is a set of Strings and the ordering mode set to descending :)\n\n(: insert-start :)\ndeclare variable $input-context1 external;\n(: insert-end :)\n\n<results> {\nfor $x in $input-context1/DataValues/Strings/orderData\n order by concat(\"\",$x) descending return concat(\"\",$x)\n}\n</results>\n";
XQueryTestCase testcase = new XQueryTestCase(driver,query);
- testcase.addSchemaMapping("http://www.w3.org/XQueryTestOrderBy", "tests/TestSources/orderData.xsd");
+ testcase.addSchemaMapping("http://www.w3.org/XQueryTestOrderBy", "http://127.0.0.1:8090/test/tests/TestSources/orderData.xsd");
testcase.addVariabl...
[truncated message content] |
|
From: <et...@us...> - 2011-06-30 14:18:25
|
Revision: 4418
http://mxquery.svn.sourceforge.net/mxquery/?rev=4418&view=rev
Author: etterth
Date: 2011-06-30 14:18:19 +0000 (Thu, 30 Jun 2011)
Log Message:
-----------
- Fixed bugs in Double/Float printing
- added TypeAnnotation for NodeToken
Modified Paths:
--------------
trunk/MXQuery/xqib_src/ch/ethz/mxquery/datamodel/MXQueryDouble.java
trunk/MXQuery/xqib_src/ch/ethz/mxquery/datamodel/MXQueryFloat.java
trunk/MXQuery/xqib_src/ch/ethz/mxquery/update/store/domImpl/NodeToken.java
trunk/XQIB_Testing/src/ch/ethz/mxquery/testsuite/XQueryTestCase.java
Modified: trunk/MXQuery/xqib_src/ch/ethz/mxquery/datamodel/MXQueryDouble.java
===================================================================
--- trunk/MXQuery/xqib_src/ch/ethz/mxquery/datamodel/MXQueryDouble.java 2011-06-29 11:52:09 UTC (rev 4417)
+++ trunk/MXQuery/xqib_src/ch/ethz/mxquery/datamodel/MXQueryDouble.java 2011-06-30 14:18:19 UTC (rev 4418)
@@ -293,7 +293,8 @@
*/
protected static String toString(double value, String javaStrValue, boolean isNegativeZero) {
-
+
+ javaStrValue = javaStrValue.replace("e+", "E");
if (value==0.0) {
if (javaStrValue.charAt(0) == '-' || isNegativeZero) {
return "-0";
@@ -302,45 +303,65 @@
}
}
+ if (Double.isNaN(value) ) {
+ return "NaN";
+ }
if (Double.isInfinite(value)) {
return (value > 0 ? "INF" : "-INF");
}
- if (Double.isNaN(value)) {
- return "NaN";
- }
final double absval = Math.abs(value);
String s = javaStrValue;
-// if (absval < 1.0e-6 || absval >= 1.0e+6) {
-// if (s.indexOf('E')<0) {
-// // need to use scientific notation, but Java isn't using it
-// // (Java's cutoff is 1.0E7, while XPath's is 1.0E6)
-// // So we have for example -2000000.0 rather than -2.0e6
-// StringBuffer sb = new StringBuffer(32);
-// Matcher matcher = nonExponentialPattern.matcher(s);
-//
-// if (matcher.matches()) {
-// sb.append(matcher.group(1));
-// sb.append('.');
-// sb.append(matcher.group(2));
-// final String fraction = matcher.group(4);
-// if ("0".equals(fraction)) {
-// sb.append("E" + (matcher.group(2).length() + matcher.group(3).length()));
-// return sb.toString();
-// } else {
-// sb.append(matcher.group(3));
-// sb.append(matcher.group(4));
-// sb.append("E" + (matcher.group(2).length() + matcher.group(3).length()));
-// return sb.toString();
-// }
-// } else {
-// // fallback, this shouldn't happen
-// return s;
-// }
-// } else {
-// return s;
-// }
-// }
+ if (absval < 1.0e-6 || absval >= 1.0e+6) {
+ if (s.indexOf('E')<0) {
+ String sign;
+ if (s.charAt(0) == '-') {
+ sign = "-";
+ s = s.substring(1);
+ } else {
+ sign = "";
+ }
+ char firstchar = s.charAt(0);
+ s = s.substring(1);
+ int e = s.length();
+ while (s.endsWith("0") && s.length()>1) {
+ s = s.substring(0, s.length()-1);
+ }
+ return sign + firstchar + "." + s + "E" + e;
+ } else {
+ return s;
+ }
+ }
+// if (absval < 1.0e-6 || absval >= 1.0e+6) {
+// if (s.indexOf('E')<0) {
+// // need to use scientific notation, but Java isn't using it
+// // (Java's cutoff is 1.0E7, while XPath's is 1.0E6)
+// // So we have for example -2000000.0 rather than -2.0e6
+// StringBuffer sb = new StringBuffer(32);
+// Matcher matcher = nonExponentialPattern.matcher(s);
+//
+// if (matcher.matches()) {
+// sb.append(matcher.group(1));
+// sb.append('.');
+// sb.append(matcher.group(2));
+// final String fraction = matcher.group(4);
+// if ("0".equals(fraction)) {
+// sb.append("E" + (matcher.group(2).length() + matcher.group(3).length()));
+// return sb.toString();
+// } else {
+// sb.append(matcher.group(3));
+// sb.append(matcher.group(4));
+// sb.append("E" + (matcher.group(2).length() + matcher.group(3).length()));
+// return sb.toString();
+// }
+// } else {
+// // fallback, this shouldn't happen
+// return s;
+// }
+// } else {
+// return s;
+// }
+// }
int len = s.length();
if (s.endsWith("E0")) {
@@ -351,11 +372,12 @@
}
int e = s.indexOf('E');
if (e < 0) {
- // For some reason, Double.toString() in Java can return strings such as "0.0040"
- // so we remove any trailing zeros
- while (s.charAt(len - 1) == '0' && s.charAt(len - 2) != '.') {
- s = s.substring(0, --len);
- }
+ //This problem seems not to occur in JS
+// // For some reason, Double.toString() in Java can return strings such as "0.0040"
+// // so we remove any trailing zeros
+// while (s.charAt(len - 1) == '0' && s.charAt(len - 2) != '.') {
+// s = s.substring(0, --len);
+// }
return s;
}
Modified: trunk/MXQuery/xqib_src/ch/ethz/mxquery/datamodel/MXQueryFloat.java
===================================================================
--- trunk/MXQuery/xqib_src/ch/ethz/mxquery/datamodel/MXQueryFloat.java 2011-06-29 11:52:09 UTC (rev 4417)
+++ trunk/MXQuery/xqib_src/ch/ethz/mxquery/datamodel/MXQueryFloat.java 2011-06-30 14:18:19 UTC (rev 4418)
@@ -21,6 +21,7 @@
//import java.util.Locale;
//import ch.ethz.mxquery.util.browser.regex.Matcher;
//
+
import ch.ethz.mxquery.datamodel.types.Type;
import ch.ethz.mxquery.exceptions.DynamicException;
import ch.ethz.mxquery.exceptions.ErrorCodes;
@@ -78,7 +79,8 @@
}
try {
- val = Float.parseFloat(s);
+ //parseFloat is buggy in GWT
+ val = (float) Double.parseDouble(s);
} catch (NumberFormatException nfe) { throw new TypeException(ErrorCodes.F0023_INVALID_VALUE_FOR_CAST_CONSTRUCTOR, "Not a double value", null); }
if (val == 0.0)
negativeZero = isNegative;
@@ -334,110 +336,111 @@
}
- /**
- * Conversion of a double to a string
- * @param the actual double value
- * @param the double value converted to string using the Java conventions.
- * This value is adjusted as necessary to cater for the differences between the Java and XPath rules.
- * @return the value converted to a string, according to the XPath casting rules.
- */
-
- public static String toString(float val, String javaStrValue, boolean negativeZero) {
-
-
-
- if (val==0.0) {
- if (javaStrValue.charAt(0) == '-'|| negativeZero) {
- return "-0";
- } else {
- return "0";
- }
- }
-
- if (Float.isInfinite(val)) {
- return (val > 0 ? "INF" : "-INF");
- }
- if (Float.isNaN(val)) {
- return "NaN";
- }
-
- double value = roundForOutput(val);
-
- String s = javaStrValue;
- if (val != value)
- s = ""+value;
-
-// //final float absval = (float)Math.abs(val);
-// if ((val > 0 && (val < (1.0e-6)-5e-10 || val >= 1.0e+6))||
-// (val < 0 && (val > (-1.0e-6)+5e-10 || val <= -1.0e+6))) {
-// if (s.indexOf('E')<0) {
-// // need to use scientific notation, but Java isn't using it
-// // (Java's cutoff is 1.0E7, while XPath's is 1.0E6)
-// // So we have for example -2000000.0 rather than -2.0e6
-// StringBuffer sb = new StringBuffer(32);
-// Matcher matcher = nonExponentialPattern.matcher(s);
-//
-// if (matcher.matches()) {
-// sb.append(matcher.group(1));
-// sb.append('.');
-// sb.append(matcher.group(2));
-// final String fraction = matcher.group(4);
-// if ("0".equals(fraction)) {
-// sb.append("E" + (matcher.group(2).length() + matcher.group(3).length()));
-// return sb.toString();
-// } else {
-// sb.append(matcher.group(3));
-// sb.append(matcher.group(4));
-// sb.append("E" + (matcher.group(2).length() + matcher.group(3).length()));
-// return sb.toString();
-// }
-// } else {
-// // fallback, this shouldn't happen
-// return s;
-// }
+// /**
+// * Conversion of a double to a string
+// * @param the actual double value
+// * @param the double value converted to string using the Java conventions.
+// * This value is adjusted as necessary to cater for the differences between the Java and XPath rules.
+// * @return the value converted to a string, according to the XPath casting rules.
+// */
+//
+// public static String toString(float val, String javaStrValue, boolean negativeZero) {
+//
+//
+//
+// if (val==0.0) {
+// if (javaStrValue.charAt(0) == '-'|| negativeZero) {
+// return "-0";
// } else {
-// return s;
+// return "0";
// }
// }
-
- int len = s.length();
- if (s.endsWith("E0")) {
- s = s.substring(0, len - 2);
- }
- if (s.endsWith(".0")) {
- return s.substring(0, len - 2);
- }
- int e = s.indexOf('E');
- if (e < 0) {
- // For some reason, Double.toString() in Java can return strings such as "0.0040"
- // so we remove any trailing zeros
- while (s.charAt(len - 1) == '0' && s.charAt(len - 2) != '.') {
- s = s.substring(0, --len);
- }
- return s;
- }
-
- //-- E is present in the number
- int exp = Integer.parseInt(s.substring(e + 1));
- String sign;
- if (s.charAt(0) == '-') {
- sign = "-";
- s = s.substring(1);
- --e;
- } else {
- sign = "";
- }
- int nDigits = e - 2;
- if (exp >= nDigits) {
- return sign + s.substring(0, 1) + s.substring(2, e) + zeros(exp - nDigits);
- } else if (exp > 0) {
- return sign + s.substring(0, 1) + s.substring(2, 2 + exp) + '.' + s.substring(2 + exp, e);
- } else {
- while (s.charAt(e-1) == '0') e--;
- return sign + "0." + zeros(-1 - exp) + s.substring(0, 1) + s.substring(2, e);
- }
- //--
- }
+//
+// if (Float.isNaN(val)) {
+// return "NaN";
+// }
+// if (Float.isInfinite(val)) {
+// return (val > 0 ? "INF" : "-INF");
+// }
+//
+// Environment.log("float.toString1 " + val);
+// double value = roundForOutput(val);
+// Environment.log("float.toString2 " + val);
+// String s = javaStrValue;
+// if (val != value)
+// s = ""+value;
+//
+//// //final float absval = (float)Math.abs(val);
+//// if ((val > 0 && (val < (1.0e-6)-5e-10 || val >= 1.0e+6))||
+//// (val < 0 && (val > (-1.0e-6)+5e-10 || val <= -1.0e+6))) {
+//// if (s.indexOf('E')<0) {
+//// // need to use scientific notation, but Java isn't using it
+//// // (Java's cutoff is 1.0E7, while XPath's is 1.0E6)
+//// // So we have for example -2000000.0 rather than -2.0e6
+//// StringBuffer sb = new StringBuffer(32);
+//// Matcher matcher = nonExponentialPattern.matcher(s);
+////
+//// if (matcher.matches()) {
+//// sb.append(matcher.group(1));
+//// sb.append('.');
+//// sb.append(matcher.group(2));
+//// final String fraction = matcher.group(4);
+//// if ("0".equals(fraction)) {
+//// sb.append("E" + (matcher.group(2).length() + matcher.group(3).length()));
+//// return sb.toString();
+//// } else {
+//// sb.append(matcher.group(3));
+//// sb.append(matcher.group(4));
+//// sb.append("E" + (matcher.group(2).length() + matcher.group(3).length()));
+//// return sb.toString();
+//// }
+//// } else {
+//// // fallback, this shouldn't happen
+//// return s;
+//// }
+//// } else {
+//// return s;
+//// }
+//// }
+//
+// int len = s.length();
+// if (s.endsWith("E0")) {
+// s = s.substring(0, len - 2);
+// }
+// if (s.endsWith(".0")) {
+// return s.substring(0, len - 2);
+// }
+// int e = s.indexOf('E');
+// if (e < 0) {
+// // For some reason, Double.toString() in Java can return strings such as "0.0040"
+// // so we remove any trailing zeros
+// while (s.charAt(len - 1) == '0' && s.charAt(len - 2) != '.') {
+// s = s.substring(0, --len);
+// }
+// return s;
+// }
+//
+// //-- E is present in the number
+// int exp = Integer.parseInt(s.substring(e + 1));
+// String sign;
+// if (s.charAt(0) == '-') {
+// sign = "-";
+// s = s.substring(1);
+// --e;
+// } else {
+// sign = "";
+// }
+// int nDigits = e - 2;
+// if (exp >= nDigits) {
+// return sign + s.substring(0, 1) + s.substring(2, e) + zeros(exp - nDigits);
+// } else if (exp > 0) {
+// return sign + s.substring(0, 1) + s.substring(2, 2 + exp) + '.' + s.substring(2 + exp, e);
+// } else {
+// while (s.charAt(e-1) == '0') e--;
+// return sign + "0." + zeros(-1 - exp) + s.substring(0, 1) + s.substring(2, e);
+// }
+// //--
+// }
static String zeros(int n) {
char[] buf = new char[n];
@@ -452,15 +455,15 @@
public String toString() {
- return MXQueryFloat.toString(val, ""+val, negativeZero);
+ return MXQueryDouble.toString(val, ""+val, negativeZero);
}
- public String toTypedString(boolean isFloat) {
- if (isFloat)
- return MXQueryFloat.toString((float)val, ""+(float)val, negativeZero);
- else
- return MXQueryFloat.toString(val, ""+val, negativeZero);
- }
+// public String toTypedString(boolean isFloat) {
+// if (isFloat)
+// return MXQueryFloat.toString((float)val, ""+(float)val, negativeZero);
+// else
+// return MXQueryFloat.toString(val, ""+val, negativeZero);
+// }
// public String toFormatString(int digit) {
Modified: trunk/MXQuery/xqib_src/ch/ethz/mxquery/update/store/domImpl/NodeToken.java
===================================================================
--- trunk/MXQuery/xqib_src/ch/ethz/mxquery/update/store/domImpl/NodeToken.java 2011-06-29 11:52:09 UTC (rev 4417)
+++ trunk/MXQuery/xqib_src/ch/ethz/mxquery/update/store/domImpl/NodeToken.java 2011-06-30 14:18:19 UTC (rev 4418)
@@ -18,6 +18,7 @@
import ch.ethz.mxquery.datamodel.Namespace;
import ch.ethz.mxquery.datamodel.QName;
import ch.ethz.mxquery.datamodel.StructuralIdentifier;
+import ch.ethz.mxquery.datamodel.types.Type;
import ch.ethz.mxquery.datamodel.xdm.TokenInterface;
import ch.ethz.mxquery.datamodel.xdm.XDMScope;
import ch.ethz.mxquery.exceptions.MXQueryException;
@@ -85,12 +86,12 @@
if (other.node == this.node)
return 0;
short comp = this.node.compareDocumentPosition(other.node);
- if ((comp | Node.DOCUMENT_POSITION_PRECEDING) != 0 ||
- (comp | Node.DOCUMENT_POSITION_CONTAINS) != 0)//the other is parent
+ if ((comp & Node.DOCUMENT_POSITION_PRECEDING) != 0 ||
+ (comp & Node.DOCUMENT_POSITION_CONTAINS) != 0)//the other is parent
return -1;
- if ((comp | Node.DOCUMENT_POSITION_FOLLOWING) != 0 ||
- (comp | Node.DOCUMENT_POSITION_CONTAINED_BY) != 0)//the other is child
+ if ((comp & Node.DOCUMENT_POSITION_FOLLOWING) != 0 ||
+ (comp & Node.DOCUMENT_POSITION_CONTAINED_BY) != 0)//the other is child
return 1;
return -2;
@@ -153,7 +154,7 @@
@Override
public int getTypeAnnotation() {
- return 0;
+ return Type.UNTYPED;
}
public String getPrefix(){
Modified: trunk/XQIB_Testing/src/ch/ethz/mxquery/testsuite/XQueryTestCase.java
===================================================================
--- trunk/XQIB_Testing/src/ch/ethz/mxquery/testsuite/XQueryTestCase.java 2011-06-29 11:52:09 UTC (rev 4417)
+++ trunk/XQIB_Testing/src/ch/ethz/mxquery/testsuite/XQueryTestCase.java 2011-06-30 14:18:19 UTC (rev 4418)
@@ -78,7 +78,7 @@
public void addSchemaMapping(String namespace, String uri) {
schemas.add(new NamespaceToUri(namespace, uri));
- throw new UnsupportedOperationException("There is no schema support in XQIB");
+// throw new UnsupportedOperationException("There is no schema support in XQIB");
}
public void addInputQuery(String varname, String source) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <et...@us...> - 2011-06-29 11:52:22
|
Revision: 4417
http://mxquery.svn.sourceforge.net/mxquery/?rev=4417&view=rev
Author: etterth
Date: 2011-06-29 11:52:09 +0000 (Wed, 29 Jun 2011)
Log Message:
-----------
- Updated tests to also include errors
Modified Paths:
--------------
trunk/MXQuery/xqib_src/ch/ethz/mxqjs/test/JsXQueryTestCase.java
trunk/XQIB_Testing/.classpath
trunk/XQIB_Testing/XQTStoJsUnit.xsl
trunk/XQIB_Testing/build.xml
trunk/XQIB_Testing/src/ch/ethz/mxquery/testsuite/XQueryTestBase.java
trunk/XQIB_Testing/src/ch/ethz/mxquery/testsuite/XQueryTestCase.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/Appendices/Annex_Eclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/Appendices/Appendix_A4class.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/Catalogclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Basics/StaticContextclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Basics/Types/SequenceTypeSyntaxclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/CondExprclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Construct/ComputeCon/ComputeConAttrclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Construct/ComputeCon/ComputeConCommentclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Construct/ComputeCon/ComputeConElemclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Construct/ComputeCon/ComputeConPIclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Construct/ComputeCon/ConDocNodeclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Construct/ComputeCon/ConTextclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Construct/ConInScopeNamespaceclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Construct/DirectConElem/DirectConElemAttrclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Construct/DirectConElem/DirectConElemContentclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Construct/DirectConElem/DirectConElemNamespaceclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Construct/DirectConElem/DirectConElemWhitespaceclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Construct/DirectConElemclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Construct/DirectConOtherclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/ExtensionExpressionclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/FLWOR/ForExpr/ForExprPositionalVarclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/FLWOR/ForExpr/ForExprWithclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/FLWOR/ForExpr/ForExprWithoutclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/FLWOR/LetExpr/LetExprWithclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/FLWOR/LetExpr/LetExprWithoutclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/FLWOR/OrderbyExpr/OrderbyExprWithclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/FLWOR/OrderbyExpr/OrderbyExprWithoutclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/FLWOR/ReturnExprclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/FLWOR/WhereExprclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/LogicExprclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/DurationArith/DayTimeDurationAddclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/DurationArith/DayTimeDurationDivideDTDclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/DurationArith/DayTimeDurationDivideclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/DurationArith/DayTimeDurationMultiplyclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/DurationArith/DayTimeDurationSubtractclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/DurationArith/YearMonthDurationAddclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/DurationArith/YearMonthDurationDivideYMDclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/DurationArith/YearMonthDurationDivideclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/DurationArith/YearMonthDurationMultiplyclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/DurationArith/YearMonthDurationSubtractclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/DurationDateTimeArith/DateAddDTDclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/DurationDateTimeArith/DateAddYMDclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/DurationDateTimeArith/DateSubtractDTDclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/DurationDateTimeArith/DateSubtractYMDclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/DurationDateTimeArith/DateTimeAddDTDclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/DurationDateTimeArith/DateTimeSubtractDTDclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/DurationDateTimeArith/DateTimeSubtractYMDclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/DurationDateTimeArith/DatesSubtractclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/DurationDateTimeArith/TimeAddDTDclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/DurationDateTimeArith/TimeSubtractDTDclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/DurationDateTimeArith/TimeSubtractclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/DurationDateTimeArith/YearMonthDurationAddDTclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/DurationDateTimeArith/dateTimesSubtractclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/NumericOpr/NumericAddclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/NumericOpr/NumericDivideclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/NumericOpr/NumericIntegerDivideclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/NumericOpr/NumericModclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/NumericOpr/NumericMultiplyclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/NumericOpr/NumericSubtractclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/NumericOpr/NumericUnaryMinusclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/NumericOpr/NumericUnaryPlusclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/GenComprsn/GenCompEqclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/GenComprsn/GenCompGTEQclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/GenComprsn/GenCompGTclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/GenComprsn/GenCompLTEQclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/GenComprsn/GenCompLTclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/GenComprsn/GenCompNEclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/NodeComp/NodeAfterclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/NodeComp/NodeBeforeclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/NodeComp/NodeSameclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/AnyURIComp/AnyURIEqualclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/BinaryOp/Base64BinaryEQclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/BinaryOp/HexBinaryEQclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/BooleanOp/BooleanEqualclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/BooleanOp/BooleanGTclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/BooleanOp/BooleanLTclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/DurationDateTimeOp/DateEQclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/DurationDateTimeOp/DateGTclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/DurationDateTimeOp/DateLTclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/DurationDateTimeOp/DateTimeEQclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/DurationDateTimeOp/DateTimeGTclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/DurationDateTimeOp/DateTimeLTclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/DurationDateTimeOp/DayTimeDurationEQclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/DurationDateTimeOp/DayTimeDurationGTclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/DurationDateTimeOp/DayTimeDurationLTclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/DurationDateTimeOp/DurationEQclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/DurationDateTimeOp/TimeEQclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/DurationDateTimeOp/TimeGTclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/DurationDateTimeOp/TimeLTclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/DurationDateTimeOp/YearMonthDurationEQclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/DurationDateTimeOp/YearMonthDurationGTclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/DurationDateTimeOp/YearMonthDurationLTclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/DurationDateTimeOp/gDayEQclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/DurationDateTimeOp/gMonthDayEQclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/DurationDateTimeOp/gMonthEQclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/DurationDateTimeOp/gYearEQclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/DurationDateTimeOp/gYearMonthEQclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/NumericComp/NumericEqualclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/NumericComp/NumericGTclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/NumericComp/NumericLTclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/QNameOp/PrefixFromQNameclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/QNameOp/QNameEQclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/StringComp/StringEqualclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/StringComp/StringGTclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/StringComp/StringLTclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/ValCompTypeCheckingclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/SeqOp/SeqExceptclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/SeqOp/SeqIntersectclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/SeqOp/SeqUnionclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/OrderExprclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/PathExpr/AbbrAxesclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/PathExpr/PathExpressionsclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/PathExpr/Predicatesclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/PathExpr/Steps/Axesclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/PathExpr/Steps/NodeTestSection/NameTestclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/PathExpr/Steps/NodeTestSection/NodeTestclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/PathExpr/UnabbrAxesclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/PrimaryExpr/ContextExpr/ExternalContextExprclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/PrimaryExpr/ContextExpr/InternalContextExprclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/PrimaryExpr/FunctionCallExprclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/PrimaryExpr/Literalsclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/PrimaryExpr/ParenExprclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/PrologExpr/BaseURIPrologclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/PrologExpr/BoundarySpacePrologclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/PrologExpr/CollationPrologclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/PrologExpr/ConstructionPrologclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/PrologExpr/CopyNamespacesPrologclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/PrologExpr/DefaultNamespacePrologclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/PrologExpr/DefaultOrderingPrologclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/PrologExpr/EmptyOrderPrologclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/PrologExpr/FunctionPrologclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/PrologExpr/NamespacePrologclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/PrologExpr/OptionDeclarationPrologclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/PrologExpr/VariableProlog/ExternalVariablesWithclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/PrologExpr/VariableProlog/ExternalVariablesWithoutclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/PrologExpr/VariableProlog/InternalVariablesWithclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/PrologExpr/VariableProlog/InternalVariablesWithoutclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/PrologExpr/VersionPrologclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/QuantExpr/QuantExprWithclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/QuantExpr/QuantExprWithoutclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/SeqExpr/CombNodeSeqclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/SeqExpr/ConstructSeq/RangeExprclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/SeqExpr/ConstructSeq/commaOpclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/SeqExpr/FilterExprclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/XQueryCommentclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/seqExprTypes/SeqExprCastToDerivedParentsclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/seqExprTypes/SeqExprCastToDerivedclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/seqExprTypes/SeqExprCastWithinBranchclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/seqExprTypes/SeqExprCastableclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/seqExprTypes/SeqExprCastclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/seqExprTypes/SeqExprInstanceOfclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/seqExprTypes/SeqExprTreatclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/seqExprTypes/sequenceExprTypeswitchclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AccessorFunc/BaseURIFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AccessorFunc/DataFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AccessorFunc/DocumentURIFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AccessorFunc/NilledFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AccessorFunc/NodeNameFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AccessorFunc/StaticBaseURIFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AccessorFunc/StringFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/AssDisassStringFunc/CodepointToStringFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/AssDisassStringFunc/StringToCodepointFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/CompStringFunc/CodepointEqualclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/CompStringFunc/compareFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/GeneralStringFunc/ConcatFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/GeneralStringFunc/EncodeURIfuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/GeneralStringFunc/EscapeHTMLURIFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/GeneralStringFunc/IRIToURIfuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/GeneralStringFunc/LowerCaseFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/GeneralStringFunc/NormalizeSpaceFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/GeneralStringFunc/NormalizeUnicodeFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/GeneralStringFunc/StringJoinFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/GeneralStringFunc/StringLengthFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/GeneralStringFunc/SubstringFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/GeneralStringFunc/Surrogatesclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/GeneralStringFunc/TranslateFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/GeneralStringFunc/UpperCaseFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/MatchStringFunc/MatchesFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/MatchStringFunc/ReplaceFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/MatchStringFunc/TokenizeFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/SubstringStringFunc/ContainsFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/SubstringStringFunc/EndsWithFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/SubstringStringFunc/StartsWithFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/SubstringStringFunc/SubstringAfterFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/SubstringStringFunc/SubstringBeforeFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/BooleanFunc/FalseFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/BooleanFunc/NotFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/BooleanFunc/TrueFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/ConstructFunc/DateTimeFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/ContextFunc/ContextCurrentDateFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/ContextFunc/ContextCurrentDatetimeFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/ContextFunc/ContextCurrentTimeFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/ContextFunc/ContextDefaultCollationFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/ContextFunc/ContextImplicitTimezoneFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/ContextFunc/ContextLastFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/ContextFunc/ContextPositionFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/ComponentExtractionDDT/DayFromDateFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/ComponentExtractionDDT/DayFromDateTimeFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/ComponentExtractionDDT/DaysFromDurationFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/ComponentExtractionDDT/HoursFromDateTimeFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/ComponentExtractionDDT/HoursFromDurationFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/ComponentExtractionDDT/HoursFromTimeFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/ComponentExtractionDDT/MinutesFromDateTimeFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/ComponentExtractionDDT/MinutesFromDurationFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/ComponentExtractionDDT/MinutesFromTimeFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/ComponentExtractionDDT/MonthFromDateFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/ComponentExtractionDDT/MonthFromDateTimeFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/ComponentExtractionDDT/MonthsFromDurationFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/ComponentExtractionDDT/SecondsFromDateTimeFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/ComponentExtractionDDT/SecondsFromDurationFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/ComponentExtractionDDT/SecondsFromTimeFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/ComponentExtractionDDT/TimezoneFromDateFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/ComponentExtractionDDT/TimezoneFromDateTimeFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/ComponentExtractionDDT/TimezoneFromTimeFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/ComponentExtractionDDT/YearFromDateFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/ComponentExtractionDDT/YearFromDateTimeFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/ComponentExtractionDDT/YearsFromDurationFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/TimezoneFunction/AdjDateTimeToTimezoneFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/TimezoneFunction/AdjDateToTimezoneFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/TimezoneFunction/AdjTimeToTimezoneFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/ErrorFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/NodeFunc/NameFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/NodeFunc/NodeLangFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/NodeFunc/NodeLocalNameFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/NodeFunc/NodeNamespaceURIFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/NodeFunc/NodeNumberFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/NodeFunc/NodeRootFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/NumericFunc/ABSFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/NumericFunc/CeilingFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/NumericFunc/FloorFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/NumericFunc/RoundEvenFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/NumericFunc/RoundFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/QNameFunc/InScopePrefixesFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/QNameFunc/LocalNameFromQNameFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/QNameFunc/NamespaceURIForPrefixFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/QNameFunc/NamespaceURIFromQNameFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/QNameFunc/QNameConstructFunc/ExpandedQNameConstructFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/QNameFunc/QNameConstructFunc/ResolveQNameConstructFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/AggregateSeqFunc/SeqAVGFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/AggregateSeqFunc/SeqCountFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/AggregateSeqFunc/SeqMAXFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/AggregateSeqFunc/SeqMINFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/AggregateSeqFunc/SeqSUMFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/CardinalitySeqFunc/SeqExactlyOneFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/CardinalitySeqFunc/SeqOneOrMoreFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/CardinalitySeqFunc/SeqZeroOrOneFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/GeneralSeqFunc/SeqBooleanFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/GeneralSeqFunc/SeqDistinctValuesFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/GeneralSeqFunc/SeqEmptyFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/GeneralSeqFunc/SeqExistsFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/GeneralSeqFunc/SeqIndexOfFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/GeneralSeqFunc/SeqInsertBeforeFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/GeneralSeqFunc/SeqRemoveFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/GeneralSeqFunc/SeqReverseFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/GeneralSeqFunc/SeqSubsequenceFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/GeneralSeqFunc/SeqUnorderedFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/NodeSeqFunc/SeqCollectionFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/NodeSeqFunc/SeqDocAvailableFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/NodeSeqFunc/SeqDocFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/NodeSeqFunc/SeqIDFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/NodeSeqFunc/SeqIDREFFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/SeqDeepEqualFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/TraceFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/URIFunc/ResolveURIFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/OptionalFeatureErrors/CombinedErrorCodesclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/UseCase/UseCaseNSclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/UseCase/UseCasePARTSclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/UseCase/UseCaseRclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/UseCase/UseCaseSEQclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/UseCase/UseCaseSGMLclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/UseCase/UseCaseSTRINGclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/UseCase/UseCaseTREEclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/UseCase/UseCaseXMPclass.java
Added Paths:
-----------
trunk/XQIB_Testing/test/
trunk/XQIB_Testing/test/ch/ethz/mxquery/Optional/
trunk/XQIB_Testing/test/ch/ethz/mxquery/Optional/FullAxis/
trunk/XQIB_Testing/test/ch/ethz/mxquery/Optional/FullAxis/ancestorAxisclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/Optional/FullAxis/ancestor_or_selfAxisclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/Optional/FullAxis/followingAxisclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/Optional/FullAxis/following_siblingAxisclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/Optional/FullAxis/precedingAxisclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/Optional/FullAxis/preceding_siblingAxisclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/Optional/Modules/
trunk/XQIB_Testing/test/ch/ethz/mxquery/Optional/Modules/ModuleImportclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/Optional/SchemaImport/
trunk/XQIB_Testing/test/ch/ethz/mxquery/Optional/SchemaImport/ConstructSIclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/Optional/SchemaImport/FLWORExprSIclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/Optional/SchemaImport/ForExprTypeSIclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/Optional/SchemaImport/MiscFunctionsclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/Optional/SchemaImport/NotationEQSIclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/Optional/SchemaImport/NumericEqualSIclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/Optional/SchemaImport/SchemaImportPrologclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/Optional/SchemaImport/SeqExprCastSIclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/Optional/SchemaImport/UserDefinedSIclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/Optional/SchemaImport/versionPrologSIclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/Optional/SchemaValidation/
trunk/XQIB_Testing/test/ch/ethz/mxquery/Optional/SchemaValidation/ValidateExpressionclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/Optional/StaticTyping/
trunk/XQIB_Testing/test/ch/ethz/mxquery/Optional/StaticTyping/STFLWORExprclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/Optional/StaticTyping/STPathExpr/
trunk/XQIB_Testing/test/ch/ethz/mxquery/Optional/StaticTyping/STPathExpr/STSteps/
trunk/XQIB_Testing/test/ch/ethz/mxquery/Optional/StaticTyping/STPathExpr/STSteps/STAxesclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/Optional/TrivialEmbeddingclass.java
Removed Paths:
-------------
trunk/XQIB_Testing/junit/
trunk/XQIB_Testing/junit-out/
trunk/XQIB_Testing/lib/apache-tomcat-6.0.32/logs/
Modified: trunk/MXQuery/xqib_src/ch/ethz/mxqjs/test/JsXQueryTestCase.java
===================================================================
--- trunk/MXQuery/xqib_src/ch/ethz/mxqjs/test/JsXQueryTestCase.java 2011-06-29 02:36:40 UTC (rev 4416)
+++ trunk/MXQuery/xqib_src/ch/ethz/mxqjs/test/JsXQueryTestCase.java 2011-06-29 11:52:09 UTC (rev 4417)
@@ -49,6 +49,7 @@
// variables.add(new Variable(name, xdmIterator, hasSchema));
// }
private String query;
+ private String errorcode;
public static JsXQueryTestCase create(String query) {
return new JsXQueryTestCase(query);
@@ -63,6 +64,7 @@
o.addVariable = o....@ch....JsXQueryTestCase::addVariable(Ljava/lang/String;Ljava/lang/String;);
o.execute = o....@ch....JsXQueryTestCase::execute();
o.getResult = o....@ch....JsXQueryTestCase::getResult();
+ o.getErrorCode = o....@ch....JsXQueryTestCase::getErrorCode();
o.compareResult = o....@ch....JsXQueryTestCase::compareResult(Ljava/lang/String;Ljava/lang/String;);
}-*/;
@@ -93,11 +95,7 @@
co.setSchemaAwareness(true);
stat = comp.compile(ctx, query,co,null,null);
- }
- catch (Exception ex){
- throw ex;
- }
- try {
+
for (VariableWithUri var:variables){
//variables pass the fileid in the xml field
@@ -151,6 +149,7 @@
result = resultBuffer.toString();
}
catch (MXQueryException ex){
+ errorcode = ex.getErrorCode().getLocalPart();
// throw ex.getErrorCode().getLocalPart();
}
@@ -162,7 +161,11 @@
return result;
}
-
+
+ public String getErrorCode() {
+
+ return errorcode;
+ }
public void addSchemaMapping(String namespace, String uri) {
schemas.add(new NamespaceToUri(namespace, uri));
}
Modified: trunk/XQIB_Testing/.classpath
===================================================================
--- trunk/XQIB_Testing/.classpath 2011-06-29 02:36:40 UTC (rev 4416)
+++ trunk/XQIB_Testing/.classpath 2011-06-29 11:52:09 UTC (rev 4417)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
- <classpathentry kind="src" path="junit"/>
+ <classpathentry kind="src" path="test"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
<classpathentry kind="lib" path="lib/selenium-java-2.0rc3.jar"/>
Modified: trunk/XQIB_Testing/XQTStoJsUnit.xsl
===================================================================
--- trunk/XQIB_Testing/XQTStoJsUnit.xsl 2011-06-29 02:36:40 UTC (rev 4416)
+++ trunk/XQIB_Testing/XQTStoJsUnit.xsl 2011-06-29 11:52:09 UTC (rev 4417)
@@ -9,10 +9,10 @@
<xd:p/>
</xd:desc>
</xd:doc>
- <xsl:variable name="outputpath">junit/ch/ethz/mxquery</xsl:variable>
+ <xsl:variable name="outputpath">test/ch/ethz/mxquery</xsl:variable>
<xsl:variable name="packageprefix">ch.ethz.mxquery.</xsl:variable>
<xsl:variable name="testsuitepath"
- >file:xml/MXQuery_Testing/tests</xsl:variable>
+ >../MXQuery_Testing/tests</xsl:variable>
<xsl:variable name="executionpath"
>http://127.0.0.1:8090/test/tests</xsl:variable>
<xsl:variable name="relativetestdir">tests/</xsl:variable>
@@ -25,10 +25,6 @@
</xsl:template>
<xsl:template name="test-group">
<xsl:param name="currentpath"/>
- <xsl:choose>
-
- <xsl:when test="not(contains(../test-group[1]/@name, 'Schema'))">
-
<xsl:variable name="name">
<xsl:call-template name="getJavaString">
<xsl:with-param name="string" select="@name"/>
@@ -52,21 +48,48 @@
select="concat($currentpath, '/' , $name)"/>
</xsl:call-template>
</xsl:for-each>
- </xsl:when>
- </xsl:choose>
</xsl:template>
+ <xsl:template name="escapeandputintoquotations">
+ <xsl:param name="str"></xsl:param>
+ <xsl:variable name="escapebackslashes"
+ select="replace($str, '\\', '\\\\')"/>
+ <xsl:variable name="replacequots"
+ select="replace($escapebackslashes, '"', '\\"')"/>
+ <xsl:variable name="replaceRs" select="replace($replacequots, '
','')"/>
+<!-- <xsl:variable name="replaceNewlines" select="replace($replaceRs, '
','\\n" + 
"')"/>-->
+ <xsl:variable name="replaceNewlines" select="replace($replaceRs,'
','\\n')"/>"<xsl:value-of select="$replaceNewlines" disable-output-escaping="yes"/>"</xsl:template>
+
+
<xsl:template name="getFileContentsAsString">
<xsl:param name="filepath"/>
<xsl:variable name="cleanfilepath" select="replace($filepath, '/+', '/')"/>
- <xsl:variable name="escapebackslashes"
- select="replace(unparsed-text($cleanfilepath), '\\', '\\\\')"/>
- <xsl:variable name="replacequots"
- select="replace($escapebackslashes, '"','\\"')"/>
- <xsl:variable name="replaceRs" select="replace($replacequots, '
','')"/>
- <xsl:variable name="replaceNewliness" select="replace($replaceRs, '
','\\n" + 
"')"/>
- <xsl:value-of select="$replaceNewliness" disable-output-escaping="yes"/>
+
+ <xsl:variable name="justtext" select="unparsed-text($cleanfilepath)"/>
+ <xsl:variable name="escapedString">
+ <xsl:call-template name="escapeandputintoquotations">
+ <xsl:with-param name="str" select="$justtext"></xsl:with-param>
+ </xsl:call-template>
+ </xsl:variable>
+ <xsl:choose>
+ <xsl:when test="string-length($escapedString)> 60000">
+ new StringBuilder()
+ <xsl:analyze-string select="$justtext" regex="(.{{1,60000}})" flags="s">
+ <xsl:matching-substring
+ >.append(<xsl:call-template name="escapeandputintoquotations">
+ <xsl:with-param name="str" select="regex-group(1)"/>
+ </xsl:call-template>)
+ </xsl:matching-substring>
+
+ </xsl:analyze-string>
+ .toString()
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="$escapedString"></xsl:value-of>
+ </xsl:otherwise>
+ </xsl:choose>
+
</xsl:template>
<xsl:template name="getQuery">
@@ -94,15 +117,16 @@
</xsl:call-template>
</xsl:template>
+
<xsl:template name="getOutput"> {<xsl:variable name="filepath" select="./@FilePath"/>
- <xsl:for-each select="./output-file">"<xsl:call-template name="getFileContentsAsString">
- <xsl:with-param name="filepath">
- <xsl:value-of
- select="concat($testsuitepath, '/ExpectedTestResults/',
- $filepath, '/', ./text())"
- />
- </xsl:with-param>
- </xsl:call-template>"<xsl:if test="position() != last()">, </xsl:if>
+ <xsl:for-each select="./output-file"><xsl:call-template name="getFileContentsAsString">
+ <xsl:with-param name="filepath">
+ <xsl:value-of
+ select="concat($testsuitepath, '/ExpectedTestResults/',
+ $filepath, '/', ./text())"
+ />
+ </xsl:with-param>
+ </xsl:call-template><xsl:if test="position() != last()">, </xsl:if>
</xsl:for-each>} </xsl:template>
<xsl:template name="getVariable">
@@ -134,16 +158,14 @@
import ch.ethz.mxquery.testsuite.XQueryTestCase;
public class <xsl:value-of select="$name"/> extends XQueryTestBase{ <xsl:for-each
select="./test-case[@name != 'prolog-version-2']">
- <xsl:choose>
- <xsl:when test="@scenario = 'standard'">
<xsl:variable name="casename"><xsl:call-template name="getJavaString"
><xsl:with-param name="string" select="@name"
/></xsl:call-template></xsl:variable>
@Test
public void test_<xsl:value-of
select="$casename"/>() throws Exception{
- String query = "<xsl:call-template
- name="getQuery"/>"; <!-- module -->
+ String query = <xsl:call-template
+ name="getQuery"/>; <!-- module -->
XQueryTestCase testcase = new XQueryTestCase(driver,query); <xsl:for-each
select="module">
testcase.addModuleLocation("<xsl:value-of select="./@namespace"
@@ -176,7 +198,7 @@
<xsl:for-each select="input-URI"> testcase.addInputURI("<xsl:value-of
select="./@variable"/>", "'<xsl:call-template name="resolveURI"/>'"); </xsl:for-each>
<xsl:for-each select="input-query">testcase.addInputQuery("<xsl:value-of
- select="./@variable"/>", "<xsl:call-template name="getInputQuery"/>");
+ select="./@variable"/>", <xsl:call-template name="getInputQuery"/>);
</xsl:for-each>
testcase.execute();
<xsl:variable name="CompareType"><xsl:choose>
@@ -185,10 +207,37 @@
<xsl:otherwise>null</xsl:otherwise>
</xsl:choose>
</xsl:variable>
- testcase.assertXMLEqual(<xsl:value-of select="$CompareType"/>, new String[]<xsl:call-template name="getOutput"/>);
- };
+ <xsl:choose>
+ <xsl:when test="@scenario = 'standard'">
+ String[] expectedoutput = new String[]<xsl:call-template name="getOutput"/>;
+ String errorcode = testcase.getErrorCode();
+ if (errorcode != null){<xsl:for-each select="./expected-error">
+ if (errorcode.equals("<xsl:value-of select="./text()">
+ </xsl:value-of>"))
+ return;
+ </xsl:for-each>
+ throw new AssertionError(errorcode + " was thrown\nwhile " + expectedoutput[0] + "was expected");
+ }
+ testcase.assertXMLEqual(<xsl:value-of select="$CompareType"/>, expectedoutput);
</xsl:when>
+ <xsl:when test="@scenario=('runtime-error', 'parse-error')">
+ String errorcode = testcase.getErrorCode();
+ String[] errorcodes = {
+ <xsl:for-each select="./expected-error">
+ "<xsl:value-of select="text()"/>"
+ <xsl:if test="./following-sibling::expected-error">,</xsl:if>
+ </xsl:for-each>
+ };
+ if (errorcode == null)
+ throw new AssertionError("nothing was thrown\nwhile the error" + errorcodes[0] + "was expected");
+ for (String testcode:errorcodes){
+ if (errorcode.equals(testcode))
+ return;
+ }
+ throw new AssertionError(errorcode + " was thrown\nwhile the error" + errorcodes [0] + "was expected");
+ </xsl:when>
</xsl:choose>
+ };
</xsl:for-each>
}
</xsl:template>
Modified: trunk/XQIB_Testing/build.xml
===================================================================
--- trunk/XQIB_Testing/build.xml 2011-06-29 02:36:40 UTC (rev 4416)
+++ trunk/XQIB_Testing/build.xml 2011-06-29 11:52:09 UTC (rev 4417)
@@ -20,6 +20,48 @@
</java>
</target>
+ <property name="debuglevel" value="source,lines,vars"/>
+ <property name="target" value="1.6"/>
+ <property name="source" value="1.6"/>
+ <path id="XQIB_Testing.classpath">
+ <pathelement location="bin"/>
+ <path refid="JUnit 4.libraryclasspath"/>
+ <pathelement location="lib/selenium-java-2.0rc3.jar"/>
+ <pathelement location="lib/selenium-server-2.0rc3.jar"/>
+ <pathelement location="lib/selenium-server-standalone-2.0rc3.jar"/>
+ </path>
+ <target name="init">
+ <mkdir dir="bin"/>
+ <copy includeemptydirs="false" todir="bin">
+ <fileset dir="src">
+ <exclude name="**/*.launch"/>
+ <exclude name="**/*.java"/>
+ </fileset>
+ </copy>
+ <copy includeemptydirs="false" todir="bin">
+ <fileset dir="test">
+ <exclude name="**/*.launch"/>
+ <exclude name="**/*.java"/>
+ </fileset>
+ </copy>
+ </target>
+ <target name="clean">
+ <delete dir="bin"/>
+ </target>
+ <target depends="clean" name="cleanall"/>
+ <target depends="build-subprojects,build-project" name="build"/>
+ <target name="build-subprojects"/>
+ <target depends="init" name="build-project">
+ <echo message="${ant.project.name}: ${ant.file}"/>
+ <javac debug="true" debuglevel="${debuglevel}" destdir="bin" source="${source}" target="${target}">
+ <src path="src"/>
+ <classpath refid="XQIB_Testing.classpath"/>
+ </javac>
+ <javac debug="true" debuglevel="${debuglevel}" destdir="bin" source="${source}" target="${target}">
+ <src path="test"/>
+ <classpath refid="XQIB_Testing.classpath"/>
+ </javac>
+ </target>
<target name="getlib">
<get dest="${test.home}/xqib-js-nightly.zip" src="http://fifthelement.inf.ethz.ch:8081/job/MXQuery-XQIB/lastSuccessfulBuild/artifact/MXQuery/xqib-js-nightly.zip" />
<unzip dest="${test.home}">
@@ -28,7 +70,7 @@
</unzip>
</target>
- <target name="test">
+ <target name="test" depends="build">
<antcall target="getlib" />
<antcall target="tomcat-stop" />
<sleep seconds="2" />
@@ -46,294 +88,308 @@
<path id="JUnit 4.libraryclasspath">
<pathelement location="lib/junit.jar" />
<!--<pathelement location="${ECLIPSE_HOME}/plugins/org.hamcrest.core_1.1.0.v20090501071000.jar"/>-->
- </path>
- <path id="XQIB_Testing.classpath">
- <pathelement location="bin" />
- <path refid="JUnit 4.libraryclasspath" />
- <pathelement location="lib/selenium-java-2.0rc3.jar" />
- <pathelement location="lib/selenium-server-2.0rc3.jar" />
- <pathelement location="lib/selenium-server-standalone-2.0rc3.jar" />
</path>
<property name="junit.output.dir" value="junit-out" />
<target name="testsuite">
- <mkdir dir="${junit.output.dir}" />
- <junit printsummary="withOutAndErr">
- <formatter type="xml" />
- <test name="ch.ethz.mxquery.Appendices.Annex_Eclass" todir="${junit.output.dir}" />
- <test name="ch.ethz.mxquery.Appendices.Appendix_A4class" todir="${junit.output.dir}" />
- <test name="ch.ethz.mxquery.Catalogclass" todir="${junit.output.dir}" />
- <test name="ch.ethz.mxquery.MinimalConformance.Basics.StaticContextclass" todir="${junit.output.dir}" />
- <test name="ch.ethz.mxquery.MinimalConformance.Basics.Types.SequenceTypeSyntaxclass" todir="${junit.output.dir}" />
- <test name="ch.ethz.mxquery.MinimalConformance.Expressions.CondExprclass" todir="${junit.output.dir}" />
- <test name="ch.ethz.mxquery.MinimalConformance.Expressions.Construct.ComputeCon.ComputeConAttrclass" todir="${junit.output.dir}" />
- <test name="ch.ethz.mxquery.MinimalConformance.Expressions.Construct.ComputeCon.ComputeConCommentclass" todir="${junit.output.dir}" />
- <test name="ch.ethz.mxquery.MinimalConformance.Expressions.Construct.ComputeCon.ComputeConElemclass" todir="${junit.output.dir}" />
- <test name="ch.ethz.mxquery.MinimalConformance.Expressions.Construct.ComputeCon.ComputeConPIclass" todir="${junit.output.dir}" />
- <test name="ch.ethz.mxquery.MinimalConformance.Expressions.Construct.ComputeCon.ConDocNodeclass" todir="${junit.output.dir}" />
- <test name="ch.ethz.mxquery.MinimalConformance.Expressions.Construct.ComputeCon.ConTextclass" todir="${junit.output.dir}" />
- <test name="ch.ethz.mxquery.MinimalConformance.Expressions.Construct.ConInScopeNamespaceclass" todir="${junit.output.dir}" />
- <test name="ch.ethz.mxquery.MinimalConformance.Expressions.Construct.DirectConElem.DirectConElemAttrclass" todir="${junit.output.dir}" />
- <test name="ch.ethz.mxquery.MinimalConformance.Expressions.Construct.DirectConElem.DirectConElemContentclass" todir="${junit.output.dir}" />
- <test name="ch.ethz.mxquery.MinimalConformance.Expressions.Construct.DirectConElem.DirectConElemNamespaceclass" todir="${junit.output.dir}" />
- <test name="ch.ethz.mxquery.MinimalConformance.Expressions.Construct.DirectConElem.DirectConElemWhitespaceclass" todir="${junit.output.dir}" />
- <test name="ch.ethz.mxquery.MinimalConformance.Expressions.Construct.DirectConElemclass" todir="${junit.output.dir}" />
- <test name="ch.ethz.mxquery.MinimalConformance.Expressions.Construct.DirectConOtherclass" todir="${junit.output.dir}" />
- <test name="ch.ethz.mxquery.MinimalConformance.Expressions.ExtensionExpressionclass" todir="${junit.output.dir}" />
- <test name="ch.ethz.mxquery.MinimalConformance.Expressions.FLWOR.ForExpr.ForExprPositionalVarclass" todir="${junit.output.dir}" />
- <test name="ch.ethz.mxquery.MinimalConformance.Expressions.FLWOR.ForExpr.ForExprWithclass" todir="${junit.output.dir}" />
- <test name="ch.ethz.mxquery.MinimalConformance.Expressions.FLWOR.ForExpr.ForExprWithoutclass" todir="${junit.output.dir}" />
- <test name="ch.ethz.mxquery.MinimalConformance.Expressions.FLWOR.LetExpr.LetExprWithclass" todir="${junit.output.dir}" />
- <test name="ch.ethz.mxquery.MinimalConformance.Expressions.FLWOR.LetExpr.LetExprWithoutclass" todir="${junit.output.dir}" />
- <test name="ch.ethz.mxquery.MinimalConformance.Expressions.FLWOR.OrderbyExpr.OrderbyExprWithclass" todir="${junit.output.dir}" />
- <test name="ch.ethz.mxquery.MinimalConformance.Expressions.FLWOR.OrderbyExpr.OrderbyExprWithoutclass" todir="${junit.output.dir}" />
- <test name="ch.ethz.mxquery.MinimalConformance.Expressions.FLWOR.ReturnExprclass" todir="${junit.output.dir}" />
- <test name="ch.ethz.mxquery.MinimalConformance.Expressions.FLWOR.WhereExprclass" todir="${junit.output.dir}" />
- <test name="ch.ethz.mxquery.MinimalConformance.Expressions.LogicExprclass" todir="${junit.output.dir}" />
- <test name="ch.ethz.mxquery.MinimalConformance.Expressions.Operators.ArithExpr.DurationArith.DayTimeDurationAddclass" todir="${junit.output.dir}" />
- <test name="ch.ethz.mxquery.MinimalConformance.Expressions.Operators.ArithExpr.DurationArith.DayTimeDurationDivideDTDclass" todir="${junit.output.dir}" />
- <test name="ch.ethz.mxquery.MinimalConformance.Expressions.Operators.ArithExpr.DurationArith.DayTimeDurationDivideclass" todir="${junit.output.dir}" />
- <test name="ch.ethz.mxquery.MinimalConformance.Expressions.Operators.ArithExpr.DurationArith.DayTimeDurationMultiplyclass" todir="${junit.output.dir}" />
- <test name="ch.ethz.mxquery.MinimalConformance.Expressions.Operators.ArithExpr.DurationArith.DayTimeDurationSubtractclass" todir="${junit.output.dir}" />
- <test name="ch.ethz.mxquery.MinimalConformance.Expressions.Operators.ArithExpr.DurationArith.YearMonthDurationAddclass" todir="${junit.output.dir}" />
- <test name="ch.ethz.mxquery.MinimalConformance.Expressions.Operators.ArithExpr.DurationArith.YearMonthDurationDivideYMDclass" todir="${junit.output.dir}" />
- <test name="ch.ethz.mxquery.MinimalConformance.Expressions.Operators.ArithExpr.DurationArith.YearMonthDurationDivideclass" todir="${junit.output.dir}" />
- <test name="ch.ethz.mxquery.MinimalConformance.Expressions.Operators.ArithExpr.DurationArith.YearMonthDurationMultiplyclass" todir="${junit.output.dir}" />
- <test name="ch.ethz.mxquery.MinimalConformance.Expressions.Operators.ArithExpr.DurationArith.YearMonthDurationSubtractclass" todir="${junit.output.dir}" />
- <test name="ch.ethz.mxquery.MinimalConformance.Expressions.Operators.ArithExpr.DurationDateTimeArith.DateAddDTDclass" todir="${junit.output.dir}" />
- <test name="ch.ethz.mxquery.MinimalConformance.Expressions.Operators.ArithExpr.DurationDateTimeArith.DateAddYMDclass" todir="${junit.output.dir}" />
- <test name="ch.ethz.mxquery.MinimalConformance.Expressions.Operators.ArithExpr.DurationDateTimeArith.DateSubtractDTDclass" todir="${junit.output.dir}" />
- <test name="ch.ethz.mxquery.MinimalConformance.Expressions.Operators.ArithExpr.DurationDateTimeArith.DateSubtractYMDclass" todir="${junit.output.dir}" />
- <test name="ch.ethz.mxquery.MinimalConformance.Expressions.Operators.ArithExpr.DurationDateTimeArith.DateTimeAddDTDclass" todir="${junit.output.dir}" />
- <test name="ch.ethz.mxquery.MinimalConformance.Expressions.Operators.ArithExpr.DurationDateTimeArith.DateTimeSubtractDTDclass" todir="${junit.output.dir}" />
- <test name="ch.ethz.mxquery.MinimalConformance.Expressions.Operators.ArithExpr.DurationDateTimeArith.DateTimeSubtractYMDclass" todir="${junit.output.dir}" />
- <test name="ch.ethz.mxquery.MinimalConformance.Expressions.Operators.ArithExpr.DurationDateTimeArith.DatesSubtractclass" todir="${junit.output.dir}" />
- <test name="ch.ethz.mxquery.MinimalConformance.Expressions.Operators.ArithExpr.DurationDateTimeArith.TimeAddDTDclass" todir="${junit.output.dir}" />
- <test name="ch.ethz.mxquery.MinimalConformance.Expressions.Operators.ArithExpr.DurationDateTimeArith.TimeSubtractDTDclass" todir="${junit.output.dir}" />
- <test name="ch.ethz.mxquery.MinimalConformance.Expressions.Operators.ArithExpr.DurationDateTimeArith.TimeSubtractclass" todir="${junit.output.dir}" />
- <test name="ch.ethz.mxquery.MinimalConformance.Expressions.Operators.ArithExpr.DurationDateTimeArith.YearMonthDurationAddDTclass" todir="${junit.output.dir}" />
- <test name="ch.ethz.mxquery.MinimalConformance.Expressions.Operators.ArithExpr.DurationDateTimeArith.dateTimesSubtractclass" todir="${junit.output.dir}" />
- <test name="ch.ethz.mxquery.MinimalConformance.Expressions.Operators.ArithExpr.NumericOpr.NumericAddclass" todir="${junit.output.dir}" />
- <test name="ch.ethz.mxquery.MinimalConformance.Expressions.Operators.ArithExpr.NumericOpr.NumericDivideclass" todir="${junit.output.dir}" />
- <test name="ch.ethz.mxquery.MinimalConformance.Expressions.Operators.ArithExpr.NumericOpr.NumericIntegerDivideclass" todir="${junit.output.dir}" />
- <test name="ch.ethz.mxquery.MinimalConformance.Expressions.Operators.ArithExpr.NumericOpr.NumericModclass" todir="${junit.output.dir}" />
- <test name="ch.ethz.mxquery.MinimalConformance.Expressions.Operators.ArithExpr.NumericOpr.NumericMultiplyclass" todir="${junit.output.dir}" />
- <test name="ch.ethz.mxquery.MinimalConformance.Expressions.Operators.ArithExpr.NumericOpr.NumericSubtractclass" todir="${junit.output.dir}" />
- <test name="ch.ethz.mxquery.MinimalConformance.Expressions.Operators.ArithExpr.NumericOpr.NumericUnaryMinusclass" todir="${junit.output.dir}" />
- <test name="ch.ethz.mxquery.MinimalConformance.Expressions.Operators.ArithExpr.NumericOpr.NumericUnaryPlusclass" todir="${junit.output.dir}" />
- <test name="ch.ethz.mxquery.MinimalConformance.Expressions.Operators.CompExpr.GenComprsn.GenCompEqclass" todir="${junit.output.dir}" />
- <test name="ch.ethz.mxquery.MinimalConformance.Expressions.Operators.CompExpr.GenComprsn.GenCompGTEQclass" todir="${junit.output.dir}" />
- <test name="ch.ethz.mxquery.MinimalConformance.Expressions.Ope...
[truncated message content] |
|
From: <et...@us...> - 2011-06-29 02:36:53
|
Revision: 4416
http://mxquery.svn.sourceforge.net/mxquery/?rev=4416&view=rev
Author: etterth
Date: 2011-06-29 02:36:40 +0000 (Wed, 29 Jun 2011)
Log Message:
-----------
- added project for browser testing
Added Paths:
-----------
trunk/XQIB_Testing/
trunk/XQIB_Testing/.classpath
trunk/XQIB_Testing/.project
trunk/XQIB_Testing/.settings/
trunk/XQIB_Testing/.settings/org.eclipse.jdt.core.prefs
trunk/XQIB_Testing/XQTStoJsUnit.xsl
trunk/XQIB_Testing/browserhtmls/
trunk/XQIB_Testing/browserhtmls/MultiplicationTable.html
trunk/XQIB_Testing/build.xml
trunk/XQIB_Testing/junit/
trunk/XQIB_Testing/junit/ch/
trunk/XQIB_Testing/junit/ch/ethz/
trunk/XQIB_Testing/junit/ch/ethz/mxquery/
trunk/XQIB_Testing/junit/ch/ethz/mxquery/Appendices/
trunk/XQIB_Testing/junit/ch/ethz/mxquery/Appendices/Annex_Eclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/Appendices/Appendix_A4class.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/Catalogclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Basics/
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Basics/StaticContextclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Basics/Types/
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Basics/Types/SequenceTypeSyntaxclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/CondExprclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/Construct/
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/Construct/ComputeCon/
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/Construct/ComputeCon/ComputeConAttrclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/Construct/ComputeCon/ComputeConCommentclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/Construct/ComputeCon/ComputeConElemclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/Construct/ComputeCon/ComputeConPIclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/Construct/ComputeCon/ConDocNodeclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/Construct/ComputeCon/ConTextclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/Construct/ConInScopeNamespaceclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/Construct/DirectConElem/
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/Construct/DirectConElem/DirectConElemAttrclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/Construct/DirectConElem/DirectConElemContentclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/Construct/DirectConElem/DirectConElemNamespaceclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/Construct/DirectConElem/DirectConElemWhitespaceclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/Construct/DirectConElemclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/Construct/DirectConOtherclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/ExtensionExpressionclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/FLWOR/
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/FLWOR/ForExpr/
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/FLWOR/ForExpr/ForExprPositionalVarclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/FLWOR/ForExpr/ForExprWithclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/FLWOR/ForExpr/ForExprWithoutclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/FLWOR/LetExpr/
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/FLWOR/LetExpr/LetExprWithclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/FLWOR/LetExpr/LetExprWithoutclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/FLWOR/OrderbyExpr/
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/FLWOR/OrderbyExpr/OrderbyExprWithclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/FLWOR/OrderbyExpr/OrderbyExprWithoutclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/FLWOR/ReturnExprclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/FLWOR/WhereExprclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/LogicExprclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/DurationArith/
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/DurationArith/DayTimeDurationAddclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/DurationArith/DayTimeDurationDivideDTDclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/DurationArith/DayTimeDurationDivideclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/DurationArith/DayTimeDurationMultiplyclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/DurationArith/DayTimeDurationSubtractclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/DurationArith/YearMonthDurationAddclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/DurationArith/YearMonthDurationDivideYMDclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/DurationArith/YearMonthDurationDivideclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/DurationArith/YearMonthDurationMultiplyclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/DurationArith/YearMonthDurationSubtractclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/DurationDateTimeArith/
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/DurationDateTimeArith/DateAddDTDclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/DurationDateTimeArith/DateAddYMDclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/DurationDateTimeArith/DateSubtractDTDclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/DurationDateTimeArith/DateSubtractYMDclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/DurationDateTimeArith/DateTimeAddDTDclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/DurationDateTimeArith/DateTimeSubtractDTDclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/DurationDateTimeArith/DateTimeSubtractYMDclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/DurationDateTimeArith/DatesSubtractclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/DurationDateTimeArith/TimeAddDTDclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/DurationDateTimeArith/TimeSubtractDTDclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/DurationDateTimeArith/TimeSubtractclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/DurationDateTimeArith/YearMonthDurationAddDTclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/DurationDateTimeArith/dateTimesSubtractclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/NumericOpr/
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/NumericOpr/NumericAddclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/NumericOpr/NumericDivideclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/NumericOpr/NumericIntegerDivideclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/NumericOpr/NumericModclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/NumericOpr/NumericMultiplyclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/NumericOpr/NumericSubtractclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/NumericOpr/NumericUnaryMinusclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/NumericOpr/NumericUnaryPlusclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/GenComprsn/
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/GenComprsn/GenCompEqclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/GenComprsn/GenCompGTEQclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/GenComprsn/GenCompGTclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/GenComprsn/GenCompLTEQclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/GenComprsn/GenCompLTclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/GenComprsn/GenCompNEclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/NodeComp/
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/NodeComp/NodeAfterclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/NodeComp/NodeBeforeclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/NodeComp/NodeSameclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/AnyURIComp/
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/AnyURIComp/AnyURIEqualclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/BinaryOp/
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/BinaryOp/Base64BinaryEQclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/BinaryOp/HexBinaryEQclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/BooleanOp/
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/BooleanOp/BooleanEqualclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/BooleanOp/BooleanGTclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/BooleanOp/BooleanLTclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/DurationDateTimeOp/
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/DurationDateTimeOp/DateEQclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/DurationDateTimeOp/DateGTclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/DurationDateTimeOp/DateLTclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/DurationDateTimeOp/DateTimeEQclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/DurationDateTimeOp/DateTimeGTclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/DurationDateTimeOp/DateTimeLTclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/DurationDateTimeOp/DayTimeDurationEQclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/DurationDateTimeOp/DayTimeDurationGTclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/DurationDateTimeOp/DayTimeDurationLTclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/DurationDateTimeOp/DurationEQclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/DurationDateTimeOp/TimeEQclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/DurationDateTimeOp/TimeGTclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/DurationDateTimeOp/TimeLTclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/DurationDateTimeOp/YearMonthDurationEQclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/DurationDateTimeOp/YearMonthDurationGTclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/DurationDateTimeOp/YearMonthDurationLTclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/DurationDateTimeOp/gDayEQclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/DurationDateTimeOp/gMonthDayEQclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/DurationDateTimeOp/gMonthEQclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/DurationDateTimeOp/gYearEQclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/DurationDateTimeOp/gYearMonthEQclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/NumericComp/
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/NumericComp/NumericEqualclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/NumericComp/NumericGTclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/NumericComp/NumericLTclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/QNameOp/
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/QNameOp/PrefixFromQNameclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/QNameOp/QNameEQclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/StringComp/
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/StringComp/StringEqualclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/StringComp/StringGTclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/StringComp/StringLTclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/ValCompTypeCheckingclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/SeqOp/
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/SeqOp/SeqExceptclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/SeqOp/SeqIntersectclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/SeqOp/SeqUnionclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/OrderExprclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/PathExpr/
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/PathExpr/AbbrAxesclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/PathExpr/PathExpressionsclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/PathExpr/Predicatesclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/PathExpr/Steps/
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/PathExpr/Steps/Axesclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/PathExpr/Steps/NodeTestSection/
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/PathExpr/Steps/NodeTestSection/NameTestclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/PathExpr/Steps/NodeTestSection/NodeTestclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/PathExpr/UnabbrAxesclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/PrimaryExpr/
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/PrimaryExpr/ContextExpr/
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/PrimaryExpr/ContextExpr/ExternalContextExprclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/PrimaryExpr/ContextExpr/InternalContextExprclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/PrimaryExpr/FunctionCallExprclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/PrimaryExpr/Literalsclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/PrimaryExpr/ParenExprclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/PrologExpr/
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/PrologExpr/BaseURIPrologclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/PrologExpr/BoundarySpacePrologclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/PrologExpr/CollationPrologclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/PrologExpr/ConstructionPrologclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/PrologExpr/CopyNamespacesPrologclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/PrologExpr/DefaultNamespacePrologclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/PrologExpr/DefaultOrderingPrologclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/PrologExpr/EmptyOrderPrologclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/PrologExpr/FunctionPrologclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/PrologExpr/NamespacePrologclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/PrologExpr/OptionDeclarationPrologclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/PrologExpr/VariableProlog/
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/PrologExpr/VariableProlog/ExternalVariablesWithclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/PrologExpr/VariableProlog/ExternalVariablesWithoutclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/PrologExpr/VariableProlog/InternalVariablesWithclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/PrologExpr/VariableProlog/InternalVariablesWithoutclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/PrologExpr/VersionPrologclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/QuantExpr/
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/QuantExpr/QuantExprWithclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/QuantExpr/QuantExprWithoutclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/SeqExpr/
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/SeqExpr/CombNodeSeqclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/SeqExpr/ConstructSeq/
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/SeqExpr/ConstructSeq/RangeExprclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/SeqExpr/ConstructSeq/commaOpclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/SeqExpr/FilterExprclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/XQueryCommentclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/seqExprTypes/
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/seqExprTypes/SeqExprCastToDerivedParentsclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/seqExprTypes/SeqExprCastToDerivedclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/seqExprTypes/SeqExprCastWithinBranchclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/seqExprTypes/SeqExprCastableclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/seqExprTypes/SeqExprCastclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/seqExprTypes/SeqExprInstanceOfclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/seqExprTypes/SeqExprTreatclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Expressions/seqExprTypes/sequenceExprTypeswitchclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/AccessorFunc/
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/AccessorFunc/BaseURIFuncclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/AccessorFunc/DataFuncclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/AccessorFunc/DocumentURIFuncclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/AccessorFunc/NilledFuncclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/AccessorFunc/NodeNameFuncclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/AccessorFunc/StaticBaseURIFuncclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/AccessorFunc/StringFuncclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/AssDisassStringFunc/
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/AssDisassStringFunc/CodepointToStringFuncclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/AssDisassStringFunc/StringToCodepointFuncclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/CompStringFunc/
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/CompStringFunc/CodepointEqualclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/CompStringFunc/compareFuncclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/GeneralStringFunc/
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/GeneralStringFunc/ConcatFuncclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/GeneralStringFunc/EncodeURIfuncclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/GeneralStringFunc/EscapeHTMLURIFuncclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/GeneralStringFunc/IRIToURIfuncclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/GeneralStringFunc/LowerCaseFuncclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/GeneralStringFunc/NormalizeSpaceFuncclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/GeneralStringFunc/NormalizeUnicodeFuncclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/GeneralStringFunc/StringJoinFuncclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/GeneralStringFunc/StringLengthFuncclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/GeneralStringFunc/SubstringFuncclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/GeneralStringFunc/Surrogatesclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/GeneralStringFunc/TranslateFuncclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/GeneralStringFunc/UpperCaseFuncclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/MatchStringFunc/
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/MatchStringFunc/MatchesFuncclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/MatchStringFunc/ReplaceFuncclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/MatchStringFunc/TokenizeFuncclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/SubstringStringFunc/
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/SubstringStringFunc/ContainsFuncclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/SubstringStringFunc/EndsWithFuncclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/SubstringStringFunc/StartsWithFuncclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/SubstringStringFunc/SubstringAfterFuncclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/SubstringStringFunc/SubstringBeforeFuncclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/BooleanFunc/
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/BooleanFunc/FalseFuncclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/BooleanFunc/NotFuncclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/BooleanFunc/TrueFuncclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/ConstructFunc/
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/ConstructFunc/DateTimeFuncclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/ContextFunc/
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/ContextFunc/ContextCurrentDateFuncclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/ContextFunc/ContextCurrentDatetimeFuncclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/ContextFunc/ContextCurrentTimeFuncclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/ContextFunc/ContextDefaultCollationFuncclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/ContextFunc/ContextImplicitTimezoneFuncclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/ContextFunc/ContextLastFuncclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/ContextFunc/ContextPositionFuncclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/ComponentExtractionDDT/
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/ComponentExtractionDDT/DayFromDateFuncclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/ComponentExtractionDDT/DayFromDateTimeFuncclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/ComponentExtractionDDT/DaysFromDurationFuncclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/ComponentExtractionDDT/HoursFromDateTimeFuncclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/ComponentExtractionDDT/HoursFromDurationFuncclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/ComponentExtractionDDT/HoursFromTimeFuncclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/ComponentExtractionDDT/MinutesFromDateTimeFuncclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/ComponentExtractionDDT/MinutesFromDurationFuncclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/ComponentExtractionDDT/MinutesFromTimeFuncclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/ComponentExtractionDDT/MonthFromDateFuncclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/ComponentExtractionDDT/MonthFromDateTimeFuncclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/ComponentExtractionDDT/MonthsFromDurationFuncclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/ComponentExtractionDDT/SecondsFromDateTimeFuncclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/ComponentExtractionDDT/SecondsFromDurationFuncclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/ComponentExtractionDDT/SecondsFromTimeFuncclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/ComponentExtractionDDT/TimezoneFromDateFuncclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/ComponentExtractionDDT/TimezoneFromDateTimeFuncclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/ComponentExtractionDDT/TimezoneFromTimeFuncclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/ComponentExtractionDDT/YearFromDateFuncclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/ComponentExtractionDDT/YearFromDateTimeFuncclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/ComponentExtractionDDT/YearsFromDurationFuncclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/TimezoneFunction/
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/TimezoneFunction/AdjDateTimeToTimezoneFuncclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/TimezoneFunction/AdjDateToTimezoneFuncclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/TimezoneFunction/AdjTimeToTimezoneFuncclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/ErrorFuncclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/NodeFunc/
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/NodeFunc/NameFuncclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/NodeFunc/NodeLangFuncclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/NodeFunc/NodeLocalNameFuncclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/NodeFunc/NodeNamespaceURIFuncclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/NodeFunc/NodeNumberFuncclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/NodeFunc/NodeRootFuncclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/NumericFunc/
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/NumericFunc/ABSFuncclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/NumericFunc/CeilingFuncclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/NumericFunc/FloorFuncclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/NumericFunc/RoundEvenFuncclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/NumericFunc/RoundFuncclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/QNameFunc/
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/QNameFunc/InScopePrefixesFuncclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/QNameFunc/LocalNameFromQNameFuncclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/QNameFunc/NamespaceURIForPrefixFuncclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/QNameFunc/NamespaceURIFromQNameFuncclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/QNameFunc/QNameConstructFunc/
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/QNameFunc/QNameConstructFunc/ExpandedQNameConstructFuncclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/QNameFunc/QNameConstructFunc/ResolveQNameConstructFuncclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/AggregateSeqFunc/
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/AggregateSeqFunc/SeqAVGFuncclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/AggregateSeqFunc/SeqCountFuncclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/AggregateSeqFunc/SeqMAXFuncclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/AggregateSeqFunc/SeqMINFuncclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/AggregateSeqFunc/SeqSUMFuncclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/CardinalitySeqFunc/
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/CardinalitySeqFunc/SeqExactlyOneFuncclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/CardinalitySeqFunc/SeqOneOrMoreFuncclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/CardinalitySeqFunc/SeqZeroOrOneFuncclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/GeneralSeqFunc/
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/GeneralSeqFunc/SeqBooleanFuncclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/GeneralSeqFunc/SeqDistinctValuesFuncclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/GeneralSeqFunc/SeqEmptyFuncclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/GeneralSeqFunc/SeqExistsFuncclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/GeneralSeqFunc/SeqIndexOfFuncclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/GeneralSeqFunc/SeqInsertBeforeFuncclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/GeneralSeqFunc/SeqRemoveFuncclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/GeneralSeqFunc/SeqReverseFuncclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/GeneralSeqFunc/SeqSubsequenceFuncclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/GeneralSeqFunc/SeqUnorderedFuncclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/NodeSeqFunc/
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/NodeSeqFunc/SeqCollectionFuncclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/NodeSeqFunc/SeqDocAvailableFuncclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/NodeSeqFunc/SeqDocFuncclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/NodeSeqFunc/SeqIDFuncclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/NodeSeqFunc/SeqIDREFFuncclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/SeqDeepEqualFuncclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/TraceFuncclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/URIFunc/
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/Functions/URIFunc/ResolveURIFuncclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/OptionalFeatureErrors/
trunk/XQIB_Testing/junit/ch/ethz/mxquery/MinimalConformance/OptionalFeatureErrors/CombinedErrorCodesclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/UseCase/
trunk/XQIB_Testing/junit/ch/ethz/mxquery/UseCase/UseCaseNSclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/UseCase/UseCasePARTSclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/UseCase/UseCaseRclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/UseCase/UseCaseSEQclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/UseCase/UseCaseSGMLclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/UseCase/UseCaseSTRINGclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/UseCase/UseCaseTREEclass.java
trunk/XQIB_Testing/junit/ch/ethz/mxquery/UseCase/UseCaseXMPclass.java
trunk/XQIB_Testing/junit-out/
trunk/XQIB_Testing/junit-out/TEST-ch.ethz.mxquery.Appendices.Annex_Eclass.xml
trunk/XQIB_Testing/junit-out/TEST-ch.ethz.mxquery.Appendices.Appendix_A4class.xml
trunk/XQIB_Testing/junit-out/TEST-ch.ethz.mxquery.Catalogclass.xml
trunk/XQIB_Testing/junit-out/TEST-ch.ethz.mxquery.MinimalConformance.Basics.StaticContextclass.xml
trunk/XQIB_Testing/junit-out/TEST-ch.ethz.mxquery.MinimalConformance.Basics.Types.SequenceTypeSyntaxclass.xml
trunk/XQIB_Testing/junit-out/TEST-ch.ethz.mxquery.MinimalConformance.Expressions.CondExprclass.xml
trunk/XQIB_Testing/junit-out/TEST-ch.ethz.mxquery.MinimalConformance.Expressions.Construct.ComputeCon.ComputeConAttrclass.xml
trunk/XQIB_Testing/junit-out/TEST-ch.ethz.mxquery.browsertests.MultiplicationTable.xml
trunk/XQIB_Testing/lib/
trunk/XQIB_Testing/lib/apache-tomcat-6.0.32/
trunk/XQIB_Testing/lib/apache-tomcat-6.0.32/LICENSE
trunk/XQIB_Testing/lib/apache-tomcat-6.0.32/NOTICE
trunk/XQIB_Testing/lib/apache-tomcat-6.0.32/RELEASE-NOTES
trunk/XQIB_Testing/lib/apache-tomcat-6.0.32/RUNNING.txt
trunk/XQIB_Testing/lib/apache-tomcat-6.0.32/bin/
trunk/XQIB_Testing/lib/apache-tomcat-6.0.32/bin/bootstrap.jar
trunk/XQIB_Testing/lib/apache-tomcat-6.0.32/bin/catalina-tasks.xml
trunk/XQIB_Testing/lib/apache-tomcat-6.0.32/bin/catalina.bat
trunk/XQIB_Testing/lib/apache-tomcat-6.0.32/bin/catalina.sh
trunk/XQIB_Testing/lib/apache-tomcat-6.0.32/bin/commons-daemon-native.tar.gz
trunk/XQIB_Testing/lib/apache-tomcat-6.0.32/bin/commons-daemon.jar
trunk/XQIB_Testing/lib/apache-tomcat-6.0.32/bin/cpappend.bat
trunk/XQIB_Testing/lib/apache-tomcat-6.0.32/bin/digest.bat
trunk/XQIB_Testing/lib/apache-tomcat-6.0.32/bin/digest.sh
trunk/XQIB_Testing/lib/apache-tomcat-6.0.32/bin/setclasspath.bat
trunk/XQIB_Testing/lib/apache-tomcat-6.0.32/bin/setclasspath.sh
trunk/XQIB_Testing/lib/apache-tomcat-6.0.32/bin/shutdown.bat
trunk/XQIB_Testing/lib/apache-tomcat-6.0.32/bin/shutdown.sh
trunk/XQIB_Testing/lib/apache-tomcat-6.0.32/bin/startup.bat
trunk/XQIB_Testing/lib/apache-tomcat-6.0.32/bin/startup.sh
trunk/XQIB_Testing/lib/apache-tomcat-6.0.32/bin/tomcat-juli.jar
trunk/XQIB_Testing/lib/apache-tomcat-6.0.32/bin/tomcat-native.tar.gz
trunk/XQIB_Testing/lib/apache-tomcat-6.0.32/bin/tool-wrapper.bat
trunk/XQIB_Testing/lib/apache-tomcat-6.0.32/bin/tool-wrapper.sh
trunk/XQIB_Testing/lib/apache-tomcat-6.0.32/bin/version.bat
trunk/XQIB_Testing/lib/apache-tomcat-6.0.32/bin/version.sh
trunk/XQIB_Testing/lib/apache-tomcat-6.0.32/conf/
trunk/XQIB_Testing/lib/apache-tomcat-6.0.32/conf/Catalina/
trunk/XQIB_Testing/lib/apache-tomcat-6.0.32/conf/Catalina/localhost/
trunk/XQIB_Testing/lib/apache-tomcat-6.0.32/conf/catalina.policy
trunk/XQIB_Testing/lib/apache-tomcat-6.0.32/conf/catalina.properties
trunk/XQIB_Testing/lib/apache-tomcat-6.0.32/conf/context.xml
trunk/XQIB_Testing/lib/apache-tomcat-6.0.32/conf/logging.properties
trunk/XQIB_Testing/lib/apache-tomcat-6.0.32/conf/server.xml
trunk/XQIB_Testing/lib/apache-tomcat-6.0.32/conf/tomcat-users.xml
trunk/XQIB_Testing/lib/apache-tomcat-6.0.32/conf/web.xml
trunk/XQIB_Testing/lib/apache-tomcat-6.0.32/lib/
trunk/XQIB_Testing/lib/apache-tomcat-6.0.32/lib/annotations-api.jar
trunk/XQIB_Testing/lib/apache-tomcat-6.0.32/lib/catalina-ant.jar
trunk/XQIB_Testing/lib/apache-tomcat-6.0.32/lib/catalina-ha.jar
trunk/XQIB_Testing/lib/apache-tomcat-6.0.32/lib/catalina-tribes.jar
trunk/XQIB_Testing/lib/apache-tomcat-6.0.32/lib/catalina.jar
trunk/XQIB_Testing/lib/apache-tomcat-6.0.32/lib/ecj-3.3.1.jar
trunk/XQIB_Testing/lib/apache-tomcat-6.0.32/lib/el-api.jar
trunk/XQIB_Testing/lib/apache-tomcat-6.0.32/lib/jasper-el.jar
trunk/XQIB_Testing/lib/apache-tomcat-6.0.32/lib/jasper.jar
trunk/XQIB_Testing/lib/apache-tomcat-6.0.32/lib/jsp-api.jar
trunk/XQIB_Testing/lib/apache-tomcat-6.0.32/lib/servlet-api.jar
trunk/XQIB_Testing/lib/apache-tomcat-6.0.32/lib/tomcat-coyote.jar
trunk/XQIB_Testing/lib/apache-tomcat-6.0.32/lib/tomcat-dbcp.jar
trunk/XQIB_Testing/lib/apache-tomcat-6.0.32/lib/tomcat-i18n-es.jar
trunk/XQIB_Testing/lib/apache-tomcat-6.0.32/lib/tomcat-i18n-fr.jar
trunk/XQIB_Testing/lib/apache-tomcat-6.0.32/lib/tomcat-i18n-ja.jar
trunk/XQIB_Testing/lib/apache-tomcat-6.0.32/logs/
trunk/XQIB_Testing/lib/apache-tomcat-6.0.32/logs/catalina.2011-06-24.log
trunk/XQIB_Testing/lib/apache-tomcat-6.0.32/logs/catalina.2011-06-26.log
trunk/XQIB_Testing/lib/apache-tomcat-6.0.32/logs/catalina.2011-06-29.log
trunk/XQIB_Testing/lib/apache-tomcat-6.0.32/logs/catalina.out
trunk/XQIB_Testing/lib/apache-tomcat-6.0.32/logs/host-manager.2011-06-24.log
trunk/XQIB_Testing/lib/apache-tomcat-6.0.32/logs/host-manager.2011-06-26.log
trunk/XQIB_Testing/lib/apache-tomcat-6.0.32/logs/host-manager.2011-06-29.log
trunk/XQIB_Testing/lib/apache-tomcat-6.0.32/logs/localhost.2011-06-24.log
trunk/XQIB_Testing/lib/apache-tomcat-6.0.32/logs/localhost.2011-06-26.log
trunk/XQIB_Testing/lib/apache-tomcat-6.0.32/logs/localhost.2011-06-29.log
trunk/XQIB_Testing/lib/apache-tomcat-6.0.32/logs/manager.2011-06-24.log
trunk/XQIB_Testing/lib/apache-tomcat-6.0.32/logs/manager.2011-06-26.log
trunk/XQIB_Testing/lib/apache-tomcat-6.0.32/logs/manager.2011-06-29.log
trunk/XQIB_Testing/lib/apache-tomcat-6.0.32/work/
trunk/XQIB_Testing/lib/apache-tomcat-6.0.32/work/Catalina/
trunk/XQIB_Testing/lib/apache-tomcat-6.0.32/work/Catalina/localhost/
trunk/XQIB_Testing/lib/apache-tomcat-6.0.32/work/Catalina/localhost/a/
trunk/XQIB_Testing/lib/apache-tomcat-6.0.32/work/Catalina/localhost/test/
trunk/XQIB_Testing/lib/selenium-java-2.0rc3.jar
trunk/XQIB_Testing/lib/selenium-server-2.0rc3.jar
trunk/XQIB_Testing/lib/selenium-server-standalone-2.0rc3.jar
trunk/XQIB_Testing/src/
trunk/XQIB_Testing/src/ch/
trunk/XQIB_Testing/src/ch/ethz/
trunk/XQIB_Testing/src/ch/ethz/mxquery/
trunk/XQIB_Testing/src/ch/ethz/mxquery/browsertests/
trunk/XQIB_Testing/src/ch/ethz/mxquery/browsertests/MultiplicationTable.java
trunk/XQIB_Testing/src/ch/ethz/mxquery/testsuite/
trunk/XQIB_Testing/src/ch/ethz/mxquery/testsuite/XQueryTestBase.java
trunk/XQIB_Testing/src/ch/ethz/mxquery/testsuite/XQueryTestCase.java
trunk/XQIB_Testing/webapps/
trunk/XQIB_Testing/webapps/a/
trunk/XQIB_Testing/webapps/a/index.html
trunk/XQIB_Testing/webapps/test/
trunk/XQIB_Testing/webapps/test/test.html
trunk/XQIB_Testing/webapps/test/tests/
trunk/XQIB_Testing/webapps/test/tests/ReportingResults/
trunk/XQIB_Testing/webapps/test/tests/ReportingResults/Build.xml
trunk/XQIB_Testing/webapps/test/tests/ReportingResults/Results.xml
trunk/XQIB_Testing/webapps/test/tests/ReportingResults/XQTSReport.html
trunk/XQIB_Testing/webapps/test/tests/ReportingResults/XQTSReportSimple.html
trunk/XQIB_Testing/webapps/test/tests/ReportingResults/XQTSResult.xsd
trunk/XQIB_Testing/webapps/test/tests/ReportingResults/XQTSResults.xsl
trunk/XQIB_Testing/webapps/test/tests/ReportingResults/XQTSSampleResult.xml
trunk/XQIB_Testing/webapps/test/tests/TestSources/
trunk/XQIB_Testing/webapps/test/tests/TestSources/DupNode.xml
trunk/XQIB_Testing/webapps/test/tests/TestSources/MixNS.xml
trunk/XQIB_Testing/webapps/test/tests/TestSources/QName-schema.xsd
trunk/XQIB_Testing/webapps/test/tests/TestSources/QName-source.xml
trunk/XQIB_Testing/webapps/test/tests/TestSources/SpecialTypes.xml
trunk/XQIB_Testing/webapps/test/tests/TestSources/SpecialTypes.xsd
trunk/XQIB_Testing/webapps/test/tests/TestSources/TopMany.xml
trunk/XQIB_Testing/webapps/test/tests/TestSources/Tree1Child.xml
trunk/XQIB_Testing/webapps/test/tests/TestSources/Tree1Text.xml
trunk/XQIB_Testing/webapps/test/tests/TestSources/TreeCompass.xml
trunk/XQIB_Testing/webapps/test/tests/TestSources/TreeEmpty.xml
trunk/XQIB_Testing/webapps/test/tests/TestSources/TreeRepeat.xml
trunk/XQIB_Testing/webapps/test/tests/TestSources/TreeStack.xml
trunk/XQIB_Testing/webapps/test/tests/TestSources/TreeTrunc.xml
trunk/XQIB_Testing/webapps/test/tests/TestSources/acme_corp.xml
trunk/XQIB_Testing/webapps/test/tests/TestSources/atomic.xml
trunk/XQIB_Testing/webapps/test/tests/TestSources/atomic.xsd
trunk/XQIB_Testing/webapps/test/tests/TestSources/atomicns.xml
trunk/XQIB_Testing/webapps/test/tests/TestSources/auction.xml
trunk/XQIB_Testing/webapps/test/tests/TestSources/bib.dtd
trunk/XQIB_Testing/webapps/test/tests/TestSources/bib.xml
trunk/XQIB_Testing/webapps/test/tests/TestSources/bib2.xml
trunk/XQIB_Testing/webapps/test/tests/TestSources/bids-dtd.dtd
trunk/XQIB_Testing/webapps/test/tests/TestSources/bids.xml
trunk/XQIB_Testing/webapps/test/tests/TestSources/book.dtd
trunk/XQIB_Testing/webapps/test/tests/TestSources/book.xml
trunk/XQIB_Testing/webapps/test/tests/TestSources/books.dtd
trunk/XQIB_Testing/webapps/test/tests/TestSources/books.xml
trunk/XQIB_Testing/webapps/test/tests/TestSources/company-data.xml
trunk/XQIB_Testing/webapps/test/tests/TestSources/company.dtd
trunk/XQIB_Testing/webapps/test/tests/TestSources/context-lib.xq
trunk/XQIB_Testing/webapps/test/tests/TestSources/emptydoc.xml
trunk/XQIB_Testing/webapps/test/tests/TestSources/emptyns-lib.xq
trunk/XQIB_Testing/webapps/test/tests/TestSources/entityRef.xml
trunk/XQIB_Testing/webapps/test/tests/TestSources/examples.xml
trunk/XQIB_Testing/webapps/test/tests/TestSources/examples.xsd
trunk/XQIB_Testing/webapps/test/tests/TestSources/fsx.xml
trunk/XQIB_Testing/webapps/test/tests/TestSources/fsx_NS.xml
trunk/XQIB_Testing/webapps/test/tests/TestSources/id.xml
trunk/XQIB_Testing/webapps/test/tests/TestSources/id.xsd
trunk/XQIB_Testing/webapps/test/tests/TestSources/iddtd.dtd
trunk/XQIB_Testing/webapps/test/tests/TestSources/iddtd.xml
trunk/XQIB_Testing/webapps/test/tests/TestSources/inscope.xml
trunk/XQIB_Testing/webapps/test/tests/TestSources/ipo.xml
trunk/XQIB_Testing/webapps/test/tests/TestSources/items-dtd.dtd
trunk/XQIB_Testing/webapps/test/tests/TestSources/items.xml
trunk/XQIB_Testing/webapps/test/tests/TestSources/lang.xml
trunk/XQIB_Testing/webapps/test/tests/TestSources/listunion.xsd
trunk/XQIB_Testing/webapps/test/tests/TestSources/module1-lib.xq
trunk/XQIB_Testing/webapps/test/tests/TestSources/module2-lib.xq
trunk/XQIB_Testing/webapps/test/tests/TestSources/moduleDefs-lib.xq
trunk/XQIB_Testing/webapps/test/tests/TestSources/modulesdiffns-lib.xq
trunk/XQIB_Testing/webapps/test/tests/TestSources/notation.xml
trunk/XQIB_Testing/webapps/test/tests/TestSources/notationschema.xsd
trunk/XQIB_Testing/webapps/test/tests/TestSources/nsmode.xml
trunk/XQIB_Testing/webapps/test/tests/TestSources/nw_Customers.xml
trunk/XQIB_Testing/webapps/test/tests/TestSources/orderData.xml
trunk/XQIB_Testing/webapps/test/tests/TestSources/orderData.xsd
trunk/XQIB_Testing/webapps/test/tests/TestSources/orders
trunk/XQIB_Testing/webapps/test/tests/TestSources/partlist.dtd
trunk/XQIB_Testing/webapps/test/tests/TestSources/partlist.xml
trunk/XQIB_Testing/webapps/test/tests/TestSources/partsid.dtd
trunk/XQIB_Testing/webapps/test/tests/TestSources/postals.xml
trunk/XQIB_Testing/webapps/test/tests/TestSources/prices.dtd
trunk/XQIB_Testing/webapps/test/tests/TestSources/prices.xml
trunk/XQIB_Testing/webapps/test/tests/TestSources/report.dtd
trunk/XQIB_Testing/webapps/test/tests/TestSources/report1.dtd
trunk/XQIB_Testing/webapps/test/tests/TestSources/report1.xml
trunk/XQIB_Testing/webapps/test/tests/TestSources/reviews.dtd
trunk/XQIB_Testing/webapps/test/tests/TestSources/reviews.xml
trunk/XQIB_Testing/webapps/test/tests/TestSources/sgml.xml
trunk/XQIB_Testing/webapps/test/tests/TestSources/simple.xsd
trunk/XQIB_Testing/webapps/test/tests/TestSources/staff.xml
trunk/XQIB_Testing/webapps/test/tests/TestSources/string-data.dtd
trunk/XQIB_Testing/webapps/test/tests/TestSources/string.dtd
trunk/XQIB_Testing/webapps/test/tests/TestSources/string.xml
trunk/XQIB_Testing/webapps/test/tests/TestSources/strong-data.xml
trunk/XQIB_Testing/webapps/test/tests/TestSources/strong-queries-results-q12.xml
trunk/XQIB_Testing/webapps/test/tests/TestSources/strong-queries-results-q12.xsd
trunk/XQIB_Testing/webapps/test/tests/TestSources/strong-queries-results-q2.xsd
trunk/XQIB_Testing/webapps/test/tests/TestSources/strong-queries-results-q3.xsd
trunk/XQIB_Testing/webapps/test/tests/TestSources/strong-schema.xsd
trunk/XQIB_Testing/webapps/test/tests/TestSources/test1-lib.xq
trunk/XQIB_Testing/webapps/test/tests/TestSources/test1a-lib.xq
trunk/XQIB_Testing/webapps/test/tests/TestSources/test1c1-lib.xq
trunk/XQIB_Testing/webapps/test/tests/TestSources/test1collide1-lib.xq
trunk/XQIB_Testing/webapps/test/tests/TestSources/test1collide2-lib.xq
trunk/XQIB_Testing/webapps/test/tests/TestSources/test2-lib.xq
trunk/XQIB_Testing/webapps/test/tests/TestSources/test2c1-lib.xq
trunk/XQIB_Testing/webapps/test/tests/TestSources/textWithSpaces.xml
trunk/XQIB_Testing/webapps/test/tests/TestSources/userdefined.xsd
trunk/XQIB_Testing/webapps/test/tests/TestSources/users-dtd.dtd
trunk/XQIB_Testing/webapps/test/tests/TestSources/users.xml
trunk/XQIB_Testing/webapps/test/tests/TestSources/works-mod.xml
trunk/XQIB_Testing/webapps/test/tests/TestSources/works.xml
trunk/XQIB_Testing/webapps/test/tests/TestSources/xq311A.xml
trunk/XQIB_Testing/webapps/test/tests/TestSources/xq311B.xml
trunk/XQIB_Testing/webapps/test/tests/TestSources/zips.xml
trunk/XQIB_Testing/webapps/test/tests/TestSuiteDocumentation/
trunk/XQIB_Testing/webapps/test/tests/TestSuiteDocumentation/Guidelines for Running the XML Query Test Suite.html
trunk/XQIB_Testing/webapps/test/tests/TestSuiteDocumentation/Guidelines for Submitting XQTS Test Results.html
trunk/XQIB_Testing/webapps/test/tests/TestSuiteDocumentation/Guidelines for Test Submission.html
trunk/XQIB_Testing/webapps/test/tests/XQTSCatalog.xml
trunk/XQIB_Testing/webapps/test/tests/XQTSCatalog.xsd
trunk/XQIB_Testing/webapps/test/tests/XQTSCatalog.xsl
trunk/XQIB_Testing/webapps/test/tests/XQTSCatalogSubmission.xml
trunk/XQIB_Testing/webapps/test/tests/release_notes.html
Added: trunk/XQIB_Testing/.classpath
===================================================================
--- trunk/XQIB_Testing/.classpath (rev 0)
+++ trunk/XQIB_Testing/.classpath 2011-06-29 02:36:40 UTC (rev 4416)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="src" path="junit"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
+ <classpathentry kind="lib" path="lib/selenium-java-2.0rc3.jar"/>
+ <classpathentry kind="lib" path="lib/selenium-server-2.0rc3.jar"/>
+ <classpathentry kind="lib" path="lib/selenium-server-standalone-2.0rc3.jar"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Added: trunk/XQIB_Testing/.project
===================================================================
--- trunk/XQIB_Testing/.project (rev 0)
+++ trunk/XQIB_Testing/.project 2011-06-29 02:36:40 UTC (rev 4416)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>XQIB_Testing</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
Added: trunk/XQIB_Testing/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/XQIB_Testing/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ trunk/XQIB_Testing/.settings/org.eclipse.jdt.core.prefs 2011-06-29 02:36:40 UTC (rev 4416)
@@ -0,0 +1,12 @@
+#Fri Jun 24 00:47:47 CEST 2011
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
Added: trunk/XQIB_Testing/XQTStoJsUnit.xsl
===================================================================
--- trunk/XQIB_Testing/XQTStoJsUnit.xsl (rev 0)
+++ trunk/XQIB_Testing/XQTStoJsUnit.xsl 2011-06-29 02:36:40 UTC (rev 4416)
@@ -0,0 +1,195 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ xmlns:xd="http://www.oxygenxml.com/ns/doc/xsl" exclude-result-prefixes="xd" version="2.0"
+ xpath-default-namespace="http://www.w3.org/2005/02/query-test-XQTSCatalog">
+ <xd:doc scope="stylesheet">
+ <xd:desc>
+ <xd:p><xd:b>Created on:</xd:b> Oct 27, 2010</xd:p>
+ <xd:p><xd:b>Author:</xd:b> To</xd:p>
+ <xd:p/>
+ </xd:desc>
+ </xd:doc>
+ <xsl:variable name="outputpath">junit/ch/ethz/mxquery</xsl:variable>
+ <xsl:variable name="packageprefix">ch.ethz.mxquery.</xsl:variable>
+ <xsl:variable name="testsuitepath"
+ >file:xml/MXQuery_Testing/tests</xsl:variable>
+ <xsl:variable name="executionpath"
+ >http://127.0.0.1:8090/test/tests</xsl:variable>
+ <xsl:variable name="relativetestdir">tests/</xsl:variable>
+ <xsl:template match="/">
+ <xsl:for-each select="test-suite/test-group">
+ <xsl:call-template name="test-group">
+ <xsl:with-param name="currentpath" select="$outputpath"/>
+ </xsl:call-template>
+ </xsl:for-each>
+ </xsl:template>
+ <xsl:template name="test-group">
+ <xsl:param name="currentpath"/>
+ <xsl:choose>
+
+ <xsl:when test="not(contains(../test-group[1]/@name, 'Schema'))">
+
+ <xsl:variable name="name">
+ <xsl:call-template name="getJavaString">
+ <xsl:with-param name="string" select="@name"/>
+ </xsl:call-template>
+ </xsl:variable>
+ <xsl:choose>
+ <xsl:when test="./test-case">
+ <xsl:variable name="classname" select="concat($name, 'class')"></xsl:variable>
+ <xsl:result-document href="{$currentpath}/{$classname}.java" method="text">
+ <xsl:call-template name="createJava">
+ <xsl:with-param name="name" select="$classname"/>
+ </xsl:call-template>
+ </xsl:result-document>
+ </xsl:when>
+
+
+ </...
[truncated message content] |
|
From: <et...@us...> - 2011-06-27 23:47:36
|
Revision: 4415
http://mxquery.svn.sourceforge.net/mxquery/?rev=4415&view=rev
Author: etterth
Date: 2011-06-27 23:47:29 +0000 (Mon, 27 Jun 2011)
Log Message:
-----------
- Fix for Double printing
- Fix for Calendar <-> Date year conversion
- Testing Environment added (automated testing coming soon)
Modified Paths:
--------------
trunk/MXQuery/xqib_src/ch/ethz/mxquery/datamodel/MXQueryDouble.java
trunk/MXQuery/xqib_src/ch/ethz/mxquery/util/browser/util/Calendar.java
Added Paths:
-----------
trunk/MXQuery/xqib_src/ch/ethz/mxqjs/test/JsXQueryTestCase.java
trunk/MXQuery/xqib_src/ch/ethz/mxqjs/test/TestResourceManager.java
trunk/MXQuery/xqib_src/ch/ethz/mxqjs/test/TestValidator.java
Added: trunk/MXQuery/xqib_src/ch/ethz/mxqjs/test/JsXQueryTestCase.java
===================================================================
--- trunk/MXQuery/xqib_src/ch/ethz/mxqjs/test/JsXQueryTestCase.java (rev 0)
+++ trunk/MXQuery/xqib_src/ch/ethz/mxqjs/test/JsXQueryTestCase.java 2011-06-27 23:47:29 UTC (rev 4415)
@@ -0,0 +1,182 @@
+package ch.ethz.mxqjs.test;
+
+import java.util.HashMap;
+import java.util.Vector;
+
+import com.google.gwt.xml.client.XMLParser;
+import com.google.gwt.xml.client.Document;
+
+import ch.ethz.mxquery.contextConfig.CompilerOptions;
+import ch.ethz.mxquery.contextConfig.Context;
+import ch.ethz.mxquery.datamodel.MXQueryDateTime;
+import ch.ethz.mxquery.datamodel.QName;
+import ch.ethz.mxquery.exceptions.MXQueryException;
+import ch.ethz.mxquery.exceptions.QueryLocation;
+import ch.ethz.mxquery.iterators.TokenIterator;
+import ch.ethz.mxquery.model.XDMIterator;
+import ch.ethz.mxquery.query.PreparedStatement;
+import ch.ethz.mxquery.query.XQCompiler;
+import ch.ethz.mxquery.query.impl.CompilerImpl;
+import ch.ethz.mxquery.xdmio.XDMSerializer;
+import ch.ethz.mxquery.xdmio.XDMSerializerSettings;
+import ch.ethz.mxquery.xdmio.xmlAdapters.NonValidatingDOMAdapter;
+
+public class JsXQueryTestCase {
+
+ class VariableWithUri {
+
+ public VariableWithUri(String name, String uri, boolean hasSchema){
+ this.name = name; this.uri = uri;this.hasSchema = hasSchema;
+ }
+ public String name;
+ public String uri;
+ public boolean hasSchema;
+ }
+ class NamespaceToUri {
+ public NamespaceToUri(String namespace, String uri){
+ this.namespace = namespace; this.uri = uri;
+ }
+ String namespace;
+ String uri;
+ }
+ protected Vector<VariableWithUri> variables = new Vector<JsXQueryTestCase.VariableWithUri>();
+ protected Vector<NamespaceToUri> schemas = new Vector<JsXQueryTestCase.NamespaceToUri>();
+ protected Vector<NamespaceToUri> inputURIs = new Vector<JsXQueryTestCase.NamespaceToUri>();
+ protected Vector<NamespaceToUri> moduleLocations = new Vector<JsXQueryTestCase.NamespaceToUri>();
+ protected Vector<VariableWithUri> inputQueries = new Vector<VariableWithUri>();
+ String result;
+// public void addVariable(String name, XDMIterator xdmIterator, boolean hasSchema) {
+// variables.add(new Variable(name, xdmIterator, hasSchema));
+// }
+ private String query;
+
+ public static JsXQueryTestCase create(String query) {
+ return new JsXQueryTestCase(query);
+ }
+
+ public JsXQueryTestCase(String query) {
+ this.query = query;
+ n_setup(this);
+ }
+
+ private static native void n_setup(JsXQueryTestCase o) /*-{
+ o.addVariable = o....@ch....JsXQueryTestCase::addVariable(Ljava/lang/String;Ljava/lang/String;);
+ o.execute = o....@ch....JsXQueryTestCase::execute();
+ o.getResult = o....@ch....JsXQueryTestCase::getResult();
+ o.compareResult = o....@ch....JsXQueryTestCase::compareResult(Ljava/lang/String;Ljava/lang/String;);
+ }-*/;
+
+ public boolean compareResult(String strtocompare, String comparisontype) {
+ if (comparisontype == null)
+ comparisontype = "Text";
+ try {
+
+ TestValidator.assertXMLEqual(comparisontype, new String[] {strtocompare}, this.getResult());
+ }
+ catch (AssertionError ex) {
+ return false;
+ }
+ return true;
+ }
+
+ public void addVariable(String name, String xml) {
+ variables.add(new VariableWithUri(name, xml, false));
+ }
+ public void execute() throws Exception {
+
+ XQCompiler comp = new CompilerImpl();
+ PreparedStatement stat;
+ CompilerOptions co = new CompilerOptions();
+ Context ctx = new Context();
+
+ try {
+ co.setSchemaAwareness(true);
+
+ stat = comp.compile(ctx, query,co,null,null);
+ }
+ catch (Exception ex){
+ throw ex;
+ }
+ try {
+ for (VariableWithUri var:variables){
+
+ //variables pass the fileid in the xml field
+ if (var.name.equals(Context.CONTEXT_ITEM.toString())) {
+ com.google.gwt.xml.client.Document xmldoc = XMLParser.parse(var.uri);
+ NonValidatingDOMAdapter resource = new NonValidatingDOMAdapter((Context)stat.getContext(), QueryLocation.OUTSIDE_QUERY_LOC, xmldoc);
+ stat.setContextItem(resource);
+ }
+ else {
+
+ System.out.println("useslow");
+ stat.addExternalResource(new QName(var.name), TestResourceManager.getFile(var.uri));
+
+ }
+ }
+
+// // add external queries!
+//
+// for (VariableWithString inq:inputQueries) {
+//
+//
+// XQCompiler inComp = new CompilerImpl();
+// Context inCtx = new Context();
+//
+// PreparedStatement inStat = inComp.compile(inCtx, inq.xml,co,null,null);
+//
+// XDMIterator iter = inStat.evaluate();
+// stat.addExternalResource(new QName(inq.name), iter);
+// }
+//
+// // add input URIs
+//
+// for (NamespaceToUri inu:inputURIs) {
+// stat.addExternalResource(new QName(inu.namespace), new TokenIterator(ctx, inu.uri, null));
+// }
+
+
+ XDMIterator resultiter = stat.evaluate();
+// ctx.setCurrentTime(new MXQueryDateTime("2005-12-05T05:00:00"));
+
+ StringBuffer resultBuffer = new StringBuffer();
+ // StringBuffer storeBuffer = new StringBuffer();
+ XDMSerializerSettings ser = stat.getOutputSettings();
+ if (ser == null)
+ ser = new XDMSerializerSettings();
+ ser.setOmitXMLDeclaration(true);
+ XDMSerializer ip = new XDMSerializer(ser);
+ resultBuffer.append(ip.eventsToXML(resultiter));
+
+ resultiter.close(false);
+ result = resultBuffer.toString();
+ }
+ catch (MXQueryException ex){
+// throw ex.getErrorCode().getLocalPart();
+ }
+
+
+ }
+ protected static HashMap<String, XDMIterator> generatediters = new HashMap<String, XDMIterator>();
+
+ public String getResult() {
+
+ return result;
+ }
+
+ public void addSchemaMapping(String namespace, String uri) {
+ schemas.add(new NamespaceToUri(namespace, uri));
+ }
+
+ public void addInputQuery(String varname, String source) {
+ inputQueries.add(new VariableWithUri(varname, source, false));
+ }
+
+ public void addInputURI(String namespace, String uri) {
+ inputURIs.add(new NamespaceToUri(namespace, uri));
+ }
+
+ public void addModuleLocation(String namespace, String uri) {
+ moduleLocations.add(new NamespaceToUri(namespace, uri));
+ }
+
+}
Added: trunk/MXQuery/xqib_src/ch/ethz/mxqjs/test/TestResourceManager.java
===================================================================
--- trunk/MXQuery/xqib_src/ch/ethz/mxqjs/test/TestResourceManager.java (rev 0)
+++ trunk/MXQuery/xqib_src/ch/ethz/mxqjs/test/TestResourceManager.java 2011-06-27 23:47:29 UTC (rev 4415)
@@ -0,0 +1,19 @@
+package ch.ethz.mxqjs.test;
+
+import ch.ethz.mxquery.iterators.browser.NodeStoreIterator;
+import ch.ethz.mxquery.model.XDMIterator;
+import ch.ethz.mxquery.util.browser.SyncXmlHttpRequest;
+import ch.ethz.mxquery.util.browser.SyncXmlHttpRequestWrapper;
+import ch.ethz.mxquery.util.browser.dom.Document;
+
+public class TestResourceManager {
+
+ public static XDMIterator getFile(String uri) {
+ SyncXmlHttpRequestWrapper xhr = new SyncXmlHttpRequestWrapper();
+ xhr.setUrl(uri);
+ xhr.send();
+ Document doc = xhr.responseAsXML();
+ return new NodeStoreIterator(doc);
+ }
+
+}
Added: trunk/MXQuery/xqib_src/ch/ethz/mxqjs/test/TestValidator.java
===================================================================
--- trunk/MXQuery/xqib_src/ch/ethz/mxqjs/test/TestValidator.java (rev 0)
+++ trunk/MXQuery/xqib_src/ch/ethz/mxqjs/test/TestValidator.java 2011-06-27 23:47:29 UTC (rev 4415)
@@ -0,0 +1,159 @@
+package ch.ethz.mxqjs.test;
+
+import ch.ethz.mxquery.util.browser.dom.Attribute;
+import ch.ethz.mxquery.util.browser.dom.Document;
+import ch.ethz.mxquery.util.browser.dom.Element;
+import ch.ethz.mxquery.util.browser.dom.Node;
+
+import com.google.gwt.core.client.JavaScriptObject;
+
+public class TestValidator {
+ public static void assertXMLEqual(String comparetype, String[] strings,
+ String test) throws AssertionError {
+ for (String str : strings) {
+ if (str.equals(test)) {
+ return;
+ }
+ if (str.replace('"', '\'').equals(test)) {
+ return;
+ }
+ if (str.equals(test.replace('"', '\''))) {
+ return;
+ }
+ // 1/0 is INF in JS
+ if ("NaN".equals(str)) {
+ if ("-INF".equals(test) || "INF".equals(test))
+ return;
+ }
+ //there is no -0 in JS
+ if ("-0".equals(str)) {
+ if ("0".equals(test))
+ return;
+ }
+ }
+ if (comparetype.equals("XML")) {
+ Document testdoc = parseDocument(test);
+ for (String str : strings) {
+ Document otherdoc = parseDocument(str);
+ if (xmlEqual(testdoc, otherdoc, testdoc)) {
+ return;
+ }
+ }
+ }
+
+ throw new AssertionError();
+ }
+
+ private static native Document parseDocument(String str) /*-{
+ var parser=new DOMParser();
+ return parser.parseFromString(str,"text/xml");
+ }-*/;
+
+ private static boolean xmlEqual(Node testnode, Node othernode, Node teststart) {
+ if (testnode == null) {
+ return othernode == null;
+ }
+ if (othernode == null)
+ return false;
+
+ if (testnode.getNodeType() != othernode.getNodeType())
+ return false;
+ if (testnode.getNodeType() == Node.DOCUMENT_NODE) {
+ return xmlEqual(((Document) testnode).getDocumentElement(),
+ ((Document) othernode).getDocumentElement(), ((Document) testnode).getDocumentElement());
+ }
+ // compare value types
+ if (testnode.getNodeType() == Node.TEXT_NODE
+ || testnode.getNodeType() == Node.COMMENT_NODE) {
+
+ if (!valueEqual(testnode, othernode))
+ return false;
+ }
+
+ if (testnode.getNodeType() == Node.ELEMENT_NODE) {
+ if (!qNameEqual(testnode, othernode))
+ return false;
+
+ if (!attributesEqual((Element) othernode, (Element) testnode)
+ || !attributesEqual((Element) testnode, (Element) othernode))
+ return false;
+ }
+
+ // walk the DOM
+ if (testnode.hasChildNodes()) {
+ return xmlEqual(testnode.getFirstChild(),
+ othernode.getFirstChild(), teststart);
+ }
+ if (testnode.getNextSibling() != null)
+ return xmlEqual(testnode.getNextSibling(),
+ othernode.getNextSibling(), teststart);
+ while (testnode.hasParentElement()) {
+ testnode = testnode.getParentNode();
+ othernode = othernode.getParentNode();
+ if (testnode == teststart) {// we came back to the beginning
+ return true;
+ }
+ if (testnode.getNextSibling() != null)
+ return xmlEqual(testnode.getNextSibling(),
+ othernode.getNextSibling(), teststart);
+ }
+ if (testnode == teststart) {// we came back to the beginning
+ return true;
+ }
+
+ return false;
+ }
+
+ protected static boolean valueEqual(Node testnode, Node othernode) {
+
+ return testnode.getNodeValue().equals(othernode.getNodeValue());
+ }
+
+ protected static boolean qNameEqual(Node testnode, Node othernode) {
+ if (testnode == null) {
+ return othernode == null;
+ }
+ if (othernode == null)
+ return false;
+ if (!stringEqual(testnode.getNameSpaceURI(),
+ othernode.getNameSpaceURI()))
+ return false;
+ if (!stringEqual(testnode.getPrefix(), othernode.getPrefix()))
+ return false;
+ return true;
+ }
+
+ private static boolean stringEqual(String s1, String s2) {
+ if (s1 == null) {
+ return s2 == null;
+ }
+ if (s2 == null)
+ return false;
+ return s1.equals(s2);
+ }
+
+ /**
+ * tests if all the attributes in testnode are in othernode and compares
+ * them
+ *
+ * @param othernode
+ * @param testnode
+ * @return
+ */
+ private static boolean attributesEqual(Element othernode, Element testnode) {
+ for (Attribute attribute : testnode.getAttributes()) {
+ if (attribute.getNodeName().startsWith("xmlns")) {
+ continue;
+ }
+ Node otherattr = othernode.getAttributeNodeNS(
+ attribute.getNameSpaceURI(), attribute.getLocalName());
+
+ if (!qNameEqual(attribute, otherattr))
+ return false;
+ if (!valueEqual(attribute, otherattr))
+ return false;
+
+ }
+ return true;
+ }
+}
Modified: trunk/MXQuery/xqib_src/ch/ethz/mxquery/datamodel/MXQueryDouble.java
===================================================================
--- trunk/MXQuery/xqib_src/ch/ethz/mxquery/datamodel/MXQueryDouble.java 2011-06-20 16:06:40 UTC (rev 4414)
+++ trunk/MXQuery/xqib_src/ch/ethz/mxquery/datamodel/MXQueryDouble.java 2011-06-27 23:47:29 UTC (rev 4415)
@@ -292,8 +292,8 @@
* @return the value converted to a string, according to the XPath casting rules.
*/
- public static String toString(double value, String javaStrValue, boolean isNegativeZero) {
-
+ protected static String toString(double value, String javaStrValue, boolean isNegativeZero) {
+
if (value==0.0) {
if (javaStrValue.charAt(0) == '-' || isNegativeZero) {
return "-0";
@@ -394,7 +394,7 @@
public String toString() {
- return MXQueryDouble.toString(val, ""+val, negativeZero);
+ return MXQueryDouble.toString(val, ""+val, negativeZero).replace("e+", "E");
}
// public String toFormatString(int digit) {
Modified: trunk/MXQuery/xqib_src/ch/ethz/mxquery/util/browser/util/Calendar.java
===================================================================
--- trunk/MXQuery/xqib_src/ch/ethz/mxquery/util/browser/util/Calendar.java 2011-06-20 16:06:40 UTC (rev 4414)
+++ trunk/MXQuery/xqib_src/ch/ethz/mxquery/util/browser/util/Calendar.java 2011-06-27 23:47:29 UTC (rev 4415)
@@ -72,7 +72,7 @@
this.localDateTime.seconds = newdate.getSeconds();
this.localDateTime.minutes = newdate.getMinutes();
this.localDateTime.month = newdate.getMonth();
- this.localDateTime.year = newdate.getYear();
+ this.localDateTime.year = newdate.getYear() + 1900;
ensureDateCalculated();
this.localDateTime.milliseconds = (int) (newdate.getTime() - this.calculatedDate.getTime());
ensureDateCalculated();
@@ -308,7 +308,7 @@
// return era;
case YEAR:
- return localDateTime.year + 1900;
+ return localDateTime.year;
case MONTH:
@@ -806,7 +806,7 @@
Date datewithoutms = new Date(
- localDateTime.year,
+ localDateTime.year - 1900,
localDateTime.month,
localDateTime.date,
localDateTime.hourOfDay,
@@ -816,7 +816,7 @@
// Date class does not have milliseconds manipulation.
Date datewithms = new Date(datewithoutms.getTime() + localDateTime.milliseconds);
- localDateTime.year = datewithms.getYear();
+ localDateTime.year = datewithms.getYear() + 1900;
localDateTime.month = datewithms.getMonth();
localDateTime.date = datewithms.getDate();
localDateTime.hourOfDay = datewithms.getHours();
@@ -835,7 +835,7 @@
// Add time zone to the LocalDateTime to construct a real Date (thus with timezone)
//TODO, take into account overridden tz value
calculatedDate = Calendar.createDate(/*era,*/
- localDateTime.year,
+ localDateTime.year - 1900,
localDateTime.month,
localDateTime.date,
localDateTime.hourOfDay,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
1 message has been excluded from this view by a project administrator.
