Merge lp:~zorba-coders/zorba/bug-1134008 into lp:zorba

[Chris Hillery]

Set the base-uri of all nodes produced by fn:doc() to be the document retrieval URI, as required by XML Base spec.

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-1134008-2013-05-02T00-22-41.491Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-1134008-2013-05-02T00-25-39.206Z/log.html

[Zorba Build Bot (zorba-buildbot)]

The attempt to merge lp:~zorba-coders/zorba/bug-1134008 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 bug-1134008-2013-05-02T00-25-39.206Z 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

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-1134008-2013-05-02T04-55-43.961Z/log.html

[Zorba Build Bot (zorba-buildbot)]

The attempt to merge lp:~zorba-coders/zorba/bug-1134008 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 bug-1134008-2013-05-02T04-55-43.961Z 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

[Chris Hillery (ceejatec)]

review: Approve

[Chris Hillery (ceejatec)]

Catalog002 needs to be marked as EXPECTED_FOTS_FAILURE. Also it and Catalog010 and Catalog011 can be associated with bug 1172273. After making that change, this can be merged.

[lp:~zorba-coders/zorba/bug-1134008]

11428. By sorin.marian.nasoi <email address hidden> on 2013-05-02

merged lp:zorba trunk.

11429. By sorin.marian.nasoi <email address hidden> on 2013-05-02

- fixed bug that caused 'comment' node to be wrong when run with 'ctestMode' set to 'true'. Please note that this issue did not impact the FOTS reporting since the reports are generated with 'ctestMode' set to 'false'.
- added EXPECTED_FOTS_FAILURE for 'Catalog002' test-case.

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-1134008-2013-05-02T20-19-39.258Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job bug-1134008-2013-05-02T20-19-39.258Z is finished. The final status was:

All tests succeeded!

[Zorba Build Bot (zorba-buildbot)]

Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1, Needs Information < 1, Resubmit < 1. Got: 1 Approve, 1 Pending.

[lp:~zorba-coders/zorba/bug-1134008]

11430. By sorin.marian.nasoi <email address hidden> on 2013-05-02

- added LP bug number for the 3 remaining failures in 'app-CatalogCheck' test-set

[Sorin Marian Nasoi (sorin.marian.nasoi)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-1134008-2013-05-03T07-17-48.644Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job bug-1134008-2013-05-03T07-17-48.644Z is finished. The final status was:

All tests succeeded!

=== modified file 'src/runtime/sequences/sequences_impl.cpp'
--- src/runtime/sequences/sequences_impl.cpp	2013-04-30 23:57:10 +0000
+++ src/runtime/sequences/sequences_impl.cpp	2013-05-02 20:59:26 +0000
@@ -1895,6 +1895,7 @@
   store::LoadProperties lLoadProperties;
   lLoadProperties.setStoreDocument(true);
   lLoadProperties.setDTDValidate( aSctx->is_feature_set( feature::dtd ) );
+  lLoadProperties.setBaseUri(lNormUri);
 
   // Resolve URI to a stream
   zstring lErrorMessage;
@@ -1927,8 +1928,7 @@
   try
   {
     store::Store& lStore = GENV.getStore();
-    zstring lBaseUri = aSctx->get_base_uri();
-    oResult = lStore.loadDocument(lBaseUri, lNormUri, *lStream, lLoadProperties);
+    oResult = lStore.loadDocument(lNormUri, lNormUri, *lStream, lLoadProperties);
     fillTime(t0, t0user, aPlanState);
   }
   catch (ZorbaException& e)
 
=== modified file 'test/fots/CMakeLists.txt'
--- test/fots/CMakeLists.txt	2013-05-02 01:21:38 +0000
+++ test/fots/CMakeLists.txt	2013-05-02 20:59:26 +0000
@@ -157,19 +157,9 @@
 
 # This test passes on the old and new RQ machines, but fails for Sorin.
 #EXPECTED_FOTS_FAILURE (fn-normalize-unicode fn-normalize-unicode-11 0)
-
-EXPECTED_FOTS_FAILURE (app-CatalogCheck Catalog001 0)
-EXPECTED_FOTS_FAILURE (app-CatalogCheck Catalog002 0)
-EXPECTED_FOTS_FAILURE (app-CatalogCheck Catalog003 0)
-EXPECTED_FOTS_FAILURE (app-CatalogCheck Catalog004 0)
-EXPECTED_FOTS_FAILURE (app-CatalogCheck Catalog005 0)
-EXPECTED_FOTS_FAILURE (app-CatalogCheck Catalog006 0)
-EXPECTED_FOTS_FAILURE (app-CatalogCheck Catalog007 0)
-EXPECTED_FOTS_FAILURE (app-CatalogCheck Catalog008 0)
-EXPECTED_FOTS_FAILURE (app-CatalogCheck Catalog009 0)
-EXPECTED_FOTS_FAILURE (app-CatalogCheck Catalog010 0)
-EXPECTED_FOTS_FAILURE (app-CatalogCheck Catalog011 0)
-EXPECTED_FOTS_FAILURE (app-CatalogCheck Catalog012 0)
+EXPECTED_FOTS_FAILURE (app-CatalogCheck Catalog002 1172273)
+EXPECTED_FOTS_FAILURE (app-CatalogCheck Catalog010 1172273)
+EXPECTED_FOTS_FAILURE (app-CatalogCheck Catalog011 1172273)
 EXPECTED_FOTS_FAILURE (fn-available-environment-variables fn-available-environment-variables-011 0)
 EXPECTED_FOTS_FAILURE (fn-deep-equal K2-SeqDeepEqualFunc-36 0)
 EXPECTED_FOTS_FAILURE (fn-deep-equal K2-SeqDeepEqualFunc-37 0)
 
=== modified file 'test/fots_driver/fots-driver.xq'
--- test/fots_driver/fots-driver.xq	2013-05-01 22:22:26 +0000
+++ test/fots_driver/fots-driver.xq	2013-05-02 20:59:26 +0000
@@ -941,7 +941,7 @@
                    $env,
                    $duration,
                    $verbose,
-                   if(not($checkPass) and $ctestMode)
+                   if(not($checkPass) and ($ctestMode and exists($expFailureTC)))
                    then "Test case passed but it is marked with EXPECTED_FOTS_FAILURE in test/fots/CMakeLists.txt"
                    else ())
   }
 
=== added file 'test/rbkt/ExpQueryResults/zorba/uris/doc-base-uri.xml.res'
--- test/rbkt/ExpQueryResults/zorba/uris/doc-base-uri.xml.res	1970-01-01 00:00:00 +0000
+++ test/rbkt/ExpQueryResults/zorba/uris/doc-base-uri.xml.res	2013-05-02 20:59:26 +0000
@@ -0,0 +1,1 @@
+true
 
=== added file 'test/rbkt/ExpQueryResults/zorba/uris/file-base-uri.xml.res'
--- test/rbkt/ExpQueryResults/zorba/uris/file-base-uri.xml.res	1970-01-01 00:00:00 +0000
+++ test/rbkt/ExpQueryResults/zorba/uris/file-base-uri.xml.res	2013-05-02 20:59:26 +0000
@@ -0,0 +1,1 @@
+true
 
=== added file 'test/rbkt/Queries/zorba/uris/doc-base-uri.xq'
--- test/rbkt/Queries/zorba/uris/doc-base-uri.xq	1970-01-01 00:00:00 +0000
+++ test/rbkt/Queries/zorba/uris/doc-base-uri.xq	2013-05-02 20:59:26 +0000
@@ -0,0 +1,4 @@
+(: The base-uri of a document node should be the retrieval URI. :)
+let $uri := fn:resolve-uri( "input.xml", fn:static-base-uri() )
+let $doc := fn:doc($uri)
+return (fn:base-uri($doc) eq $uri)
 
=== added file 'test/rbkt/Queries/zorba/uris/file-base-uri.xq'
--- test/rbkt/Queries/zorba/uris/file-base-uri.xq	1970-01-01 00:00:00 +0000
+++ test/rbkt/Queries/zorba/uris/file-base-uri.xq	2013-05-02 20:59:26 +0000
@@ -0,0 +1,9 @@
+import module namespace file="http://expath.org/ns/file";
+import module namespace x="http://www.zorba-xquery.com/modules/xml";
+import schema namespace opt="http://www.zorba-xquery.com/modules/xml-options";
+
+let $uri := fn:resolve-uri( "input.xml", fn:static-base-uri() )
+let $content := file:read-text($uri)
+let $doc := x:parse($content,
+     <opt:options><opt:base-uri opt:value="{$uri}"/></opt:options>)
+return (fn:base-uri($doc) eq $uri)
 
=== added file 'test/rbkt/Queries/zorba/uris/input.xml'
--- test/rbkt/Queries/zorba/uris/input.xml	1970-01-01 00:00:00 +0000
+++ test/rbkt/Queries/zorba/uris/input.xml	2013-05-02 20:59:26 +0000
@@ -0,0 +1,1 @@
+<a/>