[Zorba-coders] [Merge] lp:~zorba-coders/zorba/fix_assert_xml into lp:zorba

2013-02-25 Thread Sorin Marian Nasoi
Sorin Marian Nasoi has proposed merging lp:~zorba-coders/zorba/fix_assert_xml 
into lp:zorba.

Commit message:
Fix FOTS driver bug that caused assert-xml file=SOME_URI/ to be interpreted 
as assert-xml/.

Requested reviews:
  Sorin Marian Nasoi (sorin.marian.nasoi)

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/fix_assert_xml/+merge/150353

Fix FOTS driver bug that caused assert-xml file=SOME_URI/ to be interpreted 
as assert-xml/.
-- 
https://code.launchpad.net/~zorba-coders/zorba/fix_assert_xml/+merge/150353
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'test/fots_driver/evaluate.xq'
--- test/fots_driver/evaluate.xq	2013-02-22 07:31:48 +
+++ test/fots_driver/evaluate.xq	2013-02-25 15:49:24 +
@@ -51,17 +51,21 @@
  : Checks if the result matches the assertions.
  : @param $result actual result.
  : @param $expResult expected result.
+ : @param $testSetBaseURI the URI of the directory that contains the file of the
+  associated test set.
  : @return the results of assertion evaluations.
  :)
 declare %ann:sequential function eval:result(
-  $result as item()*,
-  $expResult  as element()
+  $result as item()*,
+  $expResult  as element(),
+  $testSetBaseURI as xs:anyURI
 ) as element()*
 {
   let $err := eval:check-assertion($result,
$expResult,
(),
-   )
+   ,
+   $testSetBaseURI)
   return if (empty($err))
   then ()
   else
@@ -78,20 +82,24 @@
  : @param $expResult expected result.
  : @param $code err:code.
  : @param $errorDescription err:description.
+ : @param $testSetBaseURI the URI of the directory that contains the file of the
+  associated test set.
  : @return the results of error evaluation.
  :)
 declare %ann:sequential function eval:error(
   $result   as item()*,
   $expResultas element(),
   $code as xs:QName?,
-  $errorDescription as xs:string?
+  $errorDescription as xs:string?,
+  $testSetBaseURI   as xs:anyURI
 ) as element()*
 {
   if (empty($result))
   then
 let $err := eval:error-code($code,
 $errorDescription,
-$expResult)
+$expResult,
+$testSetBaseURI)
 return
   if (empty($err))
   then ()
@@ -114,7 +122,8 @@
 declare %private %ann:sequential function eval:error-code(
   $code as xs:QName?,
   $errorDescription as xs:string?,
-  $expResultas element()
+  $expResultas element(),
+  $testSetBaseURI   as xs:anyURI
 ) as xs:string*
 {
   let $assertName := local-name($expResult)
@@ -136,7 +145,8 @@
   then eval:check-assertion((),
 $expResult,
 $code,
-$errorDescription)
+$errorDescription,
+$testSetBaseURI)
   else concat(Expected result, found error ,
   local-name-from-QName($code),
- ,
@@ -147,7 +157,8 @@
   $result   as item()*,
   $expResultas element(),
   $code as xs:QName?,
-  $errorDescription as xs:string?
+  $errorDescription as xs:string?,
+  $testSetBaseURI   as xs:anyURI
 ) as xs:string*
 {
   let $test := local-name($expResult)
@@ -156,12 +167,14 @@
   return eval:assert-all-of($result,
 $expResult,
 $code,
-$errorDescription)
+$errorDescription,
+$testSetBaseURI)
 case 'any-of'
   return eval:assert-any-of($result,
 $expResult,
 $code,
-$errorDescription)
+$errorDescription,
+$testSetBaseURI)
 case 'assert'
   return eval:assert($result,
  $expResult)
@@ -183,10 +196,12 @@
  $expResult)
 case 'assert-xml'
   return eval:assert-xml($result,
- $expResult)
+ $expResult,
+ $testSetBaseURI)
 case 'assert-serialization-error'
   return eval:assert-serialization-error($result,
- $expResult)
+ $expResult,
+ $testSetBaseURI)
 case 'assert-string-value'
   return eval:assert-string-value($result,
   $expResult)
@@ -202,7 +217,8 @@
   return eval:error($result,
 $expResult,
 $code,
-

Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/fix_assert_xml into lp:zorba

2013-02-25 Thread Sorin Marian Nasoi
Review: Approve


-- 
https://code.launchpad.net/~zorba-coders/zorba/fix_assert_xml/+merge/150353
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp


[Zorba-coders] [Merge] lp:~zorba-coders/zorba/fix_assert_xml into lp:zorba

2013-02-25 Thread Sorin Marian Nasoi
The proposal to merge lp:~zorba-coders/zorba/fix_assert_xml into lp:zorba has 
been updated.

Status: Needs review = Approved

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/fix_assert_xml/+merge/150353
-- 
https://code.launchpad.net/~zorba-coders/zorba/fix_assert_xml/+merge/150353
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp


[Zorba-coders] [Merge] lp:~zorba-coders/zorba/fix_assert_xml into lp:zorba

2013-02-25 Thread Sorin Marian Nasoi
The proposal to merge lp:~zorba-coders/zorba/fix_assert_xml into lp:zorba has 
been updated.

Description changed to:

Fix FOTS driver bug that caused assert-xml file=SOME_URI/ to be interpreted 
as assert-xml/.

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/fix_assert_xml/+merge/150353
-- 
https://code.launchpad.net/~zorba-coders/zorba/fix_assert_xml/+merge/150353
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp


Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/fix_assert_xml into lp:zorba

2013-02-25 Thread Zorba Build Bot
The attempt to merge lp:~zorba-coders/zorba/fix_assert_xml into lp:zorba 
failed. Below is the output from the failed tests.


CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 
(message):
  Validation queue job fix_assert_xml-2013-02-25T15-49-41.664Z is finished.
  The final status was:

  

  8 tests did not succeed - changes not commited.


Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake

-- 
https://code.launchpad.net/~zorba-coders/zorba/fix_assert_xml/+merge/150353
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp


[Zorba-coders] [Merge] lp:~zorba-coders/zorba/fix_assert_xml into lp:zorba

2013-02-25 Thread Zorba Build Bot
Validation queue starting for merge proposal.
Log at: 
http://zorbatest.lambda.nu:8080/remotequeue/fix_assert_xml-2013-02-25T15-49-41.664Z/log.html
-- 
https://code.launchpad.net/~zorba-coders/zorba/fix_assert_xml/+merge/150353
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp


[Zorba-coders] [Merge] lp:~zorba-coders/zorba/fix_assert_xml into lp:zorba

2013-02-25 Thread Zorba Build Bot
The proposal to merge lp:~zorba-coders/zorba/fix_assert_xml into lp:zorba has 
been updated.

Status: Approved = Needs review

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/fix_assert_xml/+merge/150353
-- 
https://code.launchpad.net/~zorba-coders/zorba/fix_assert_xml/+merge/150353
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp


Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/fix_assert_xml into lp:zorba

2013-02-25 Thread Sorin Marian Nasoi
Review: Approve


-- 
https://code.launchpad.net/~zorba-coders/zorba/fix_assert_xml/+merge/150353
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp


Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/fix_assert_xml into lp:zorba

2013-02-25 Thread Zorba Build Bot
There are additional revisions which have not been approved in review. Please 
seek review and approval of these new revisions.
-- 
https://code.launchpad.net/~zorba-coders/zorba/fix_assert_xml/+merge/150353
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp


[Zorba-coders] [Merge] lp:~zorba-coders/zorba/fix_assert_xml into lp:zorba

2013-02-25 Thread Zorba Build Bot
The proposal to merge lp:~zorba-coders/zorba/fix_assert_xml into lp:zorba has 
been updated.

Status: Approved = Needs review

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/fix_assert_xml/+merge/150353
-- 
https://code.launchpad.net/~zorba-coders/zorba/fix_assert_xml/+merge/150353
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp


Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/fix_assert_xml into lp:zorba

2013-02-25 Thread Sorin Marian Nasoi
Review: Approve


-- 
https://code.launchpad.net/~zorba-coders/zorba/fix_assert_xml/+merge/150353
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp


[Zorba-coders] [Merge] lp:~zorba-coders/zorba/fix_assert_xml into lp:zorba

2013-02-25 Thread Sorin Marian Nasoi
The proposal to merge lp:~zorba-coders/zorba/fix_assert_xml into lp:zorba has 
been updated.

Status: Needs review = Approved

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/fix_assert_xml/+merge/150353
-- 
https://code.launchpad.net/~zorba-coders/zorba/fix_assert_xml/+merge/150353
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp


[Zorba-coders] [Merge] lp:~zorba-coders/zorba/fix_assert_xml into lp:zorba

2013-02-25 Thread Zorba Build Bot
Validation queue starting for merge proposal.
Log at: 
http://zorbatest.lambda.nu:8080/remotequeue/fix_assert_xml-2013-02-25T16-22-43.29Z/log.html
-- 
https://code.launchpad.net/~zorba-coders/zorba/fix_assert_xml/+merge/150353
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp


[Zorba-coders] [Merge] lp:~zorba-coders/zorba/fix_assert_xml into lp:zorba

2013-02-25 Thread Sorin Marian Nasoi
The proposal to merge lp:~zorba-coders/zorba/fix_assert_xml into lp:zorba has 
been updated.

Commit Message changed to:

Fix FOTS driver bug that caused assert-xml file=SOME_URI/ to be interpreted 
as assert-xml/.
This fixes 37 test cases.

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/fix_assert_xml/+merge/150353
-- 
https://code.launchpad.net/~zorba-coders/zorba/fix_assert_xml/+merge/150353
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp


[Zorba-coders] [Merge] lp:~zorba-coders/zorba/fix_assert_xml into lp:zorba

2013-02-25 Thread Sorin Marian Nasoi
The proposal to merge lp:~zorba-coders/zorba/fix_assert_xml into lp:zorba has 
been updated.

Description changed to:

Fix FOTS driver bug that caused assert-xml file=SOME_URI/ to be interpreted 
as assert-xml/.
This fixes 37 test cases.

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/fix_assert_xml/+merge/150353
-- 
https://code.launchpad.net/~zorba-coders/zorba/fix_assert_xml/+merge/150353
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp


[Zorba-coders] [Merge] lp:~zorba-coders/zorba/fix_assert_xml into lp:zorba

2013-02-25 Thread Zorba Build Bot
The proposal to merge lp:~zorba-coders/zorba/fix_assert_xml into lp:zorba has 
been updated.

Status: Approved = Needs review

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/fix_assert_xml/+merge/150353
-- 
https://code.launchpad.net/~zorba-coders/zorba/fix_assert_xml/+merge/150353
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp


Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/fix_assert_xml into lp:zorba

2013-02-25 Thread Zorba Build Bot
The attempt to merge lp:~zorba-coders/zorba/fix_assert_xml into lp:zorba 
failed. Below is the output from the failed tests.


CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 
(message):
  Validation queue job fix_assert_xml-2013-02-25T16-22-43.29Z is finished.
  The final status was:

  

  1 tests did not succeed - changes not commited.


Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake

-- 
https://code.launchpad.net/~zorba-coders/zorba/fix_assert_xml/+merge/150353
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp


Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/fix_assert_xml into lp:zorba

2013-02-25 Thread Chris Hillery
Review: Approve


-- 
https://code.launchpad.net/~zorba-coders/zorba/fix_assert_xml/+merge/150353
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp


[Zorba-coders] [Merge] lp:~zorba-coders/zorba/fix_assert_xml into lp:zorba

2013-02-25 Thread Chris Hillery
The proposal to merge lp:~zorba-coders/zorba/fix_assert_xml into lp:zorba has 
been updated.

Status: Needs review = Approved

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/fix_assert_xml/+merge/150353
-- 
https://code.launchpad.net/~zorba-coders/zorba/fix_assert_xml/+merge/150353
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp


[Zorba-coders] [Merge] lp:~zorba-coders/zorba/fix_assert_xml into lp:zorba

2013-02-25 Thread Zorba Build Bot
Validation queue starting for merge proposal.
Log at: 
http://zorbatest.lambda.nu:8080/remotequeue/fix_assert_xml-2013-02-26T01-02-48.091Z/log.html
-- 
https://code.launchpad.net/~zorba-coders/zorba/fix_assert_xml/+merge/150353
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp


[Zorba-coders] [Merge] lp:~zorba-coders/zorba/fix_assert_xml into lp:zorba

2013-02-25 Thread Zorba Build Bot
Validation queue job fix_assert_xml-2013-02-26T01-02-48.091Z is finished. The 
final status was:

All tests succeeded!
-- 
https://code.launchpad.net/~zorba-coders/zorba/fix_assert_xml/+merge/150353
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp


[Zorba-coders] [Merge] lp:~zorba-coders/zorba/fix_assert_xml into lp:zorba

2013-02-25 Thread noreply
The proposal to merge lp:~zorba-coders/zorba/fix_assert_xml into lp:zorba has 
been updated.

Status: Approved = Merged

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/fix_assert_xml/+merge/150353
-- 
https://code.launchpad.net/~zorba-coders/zorba/fix_assert_xml/+merge/150353
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp