VXQUERY-191: Fixed sort order for XQTS text results used String.CASE_INSENSITIVE comparitor Author: Menaka
Project: http://git-wip-us.apache.org/repos/asf/vxquery/repo Commit: http://git-wip-us.apache.org/repos/asf/vxquery/commit/7de1fbaa Tree: http://git-wip-us.apache.org/repos/asf/vxquery/tree/7de1fbaa Diff: http://git-wip-us.apache.org/repos/asf/vxquery/diff/7de1fbaa Branch: refs/heads/master Commit: 7de1fbaa3196edd00ee4a2ad670862b85076638d Parents: 015c5f6 Author: Steven Jacobs <[email protected]> Authored: Wed May 18 14:03:56 2016 -0700 Committer: Steven Jacobs <[email protected]> Committed: Wed May 18 14:03:56 2016 -0700 ---------------------------------------------------------------------- .../apt/development_update_xqts_results.apt | 14 +- src/site/apt/user_running_tests.apt | 4 +- vxquery-xtest/pom.xml | 2 +- vxquery-xtest/results/xqts.txt | 34992 ++++++++--------- .../vxquery/xtest/LineFileReporterImpl.java | 11 + .../apache/vxquery/xtest/ResultFileSorter.java | 101 + .../java/org/apache/vxquery/xtest/XTest.java | 7 +- 7 files changed, 17616 insertions(+), 17515 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/vxquery/blob/7de1fbaa/src/site/apt/development_update_xqts_results.apt ---------------------------------------------------------------------- diff --git a/src/site/apt/development_update_xqts_results.apt b/src/site/apt/development_update_xqts_results.apt index 50b36d8..289d28e 100644 --- a/src/site/apt/development_update_xqts_results.apt +++ b/src/site/apt/development_update_xqts_results.apt @@ -39,17 +39,5 @@ rm vxquery-xtest/results/xqts.txt * Generate the new XQTS result file and save it in the text format. ---------------------------------------- -sh ./vxquery-xtest/target/appassembler/bin/xtest -catalog vxquery-xtest/test-suites/xqts/XQTSCatalog.xml -textreport vxquery-xtest/results/xqts_temp.txt ----------------------------------------- - - * Sort the results so they can be compared with previous results. - ----------------------------------------- -sort -V vxquery-xtest/results/xqts_temp.txt --output=vxquery-xtest/results/xqts.txt ----------------------------------------- - - * Clean up (remove) the temporary results files. - ----------------------------------------- -rm vxquery-xtest/results/xqts_temp.txt +sh ./vxquery-xtest/target/appassembler/bin/xtest -catalog vxquery-xtest/test-suites/xqts/XQTSCatalog.xml -textreport vxquery-xtest/results/xqts.txt ---------------------------------------- http://git-wip-us.apache.org/repos/asf/vxquery/blob/7de1fbaa/src/site/apt/user_running_tests.apt ---------------------------------------------------------------------- diff --git a/src/site/apt/user_running_tests.apt b/src/site/apt/user_running_tests.apt index c117785..9bd9e3a 100644 --- a/src/site/apt/user_running_tests.apt +++ b/src/site/apt/user_running_tests.apt @@ -79,10 +79,10 @@ $ mkdir -p vxquery-xtest/test-suites $ cd vxquery-xtest/test-suites ---------------------------------------- - * Get the archive {{{http://dev.w3.org/2006/xquery-test-suite/PublicPagesStagingArea/XQTS_1_0_3.zip}XQTS_1_0_3.zip}} (e.g. using wget), + * Get the archive {{{http://dev.w3.org/2006/xquery-test-suite/PublicPagesStagingArea/XQTS_1_0_3.zip}XQTS_1_0_3.zip}} (e.g. using curl), ---------------------------------------- -$ wget http://dev.w3.org/2006/xquery-test-suite/PublicPagesStagingArea/XQTS_1_0_3.zip +$ curl -O https://dev.w3.org/2006/xquery-test-suite/PublicPagesStagingArea/XQTS_1_0_3.zip ---------------------------------------- * unpack it, http://git-wip-us.apache.org/repos/asf/vxquery/blob/7de1fbaa/vxquery-xtest/pom.xml ---------------------------------------------------------------------- diff --git a/vxquery-xtest/pom.xml b/vxquery-xtest/pom.xml index 59da063..0c563e7 100644 --- a/vxquery-xtest/pom.xml +++ b/vxquery-xtest/pom.xml @@ -159,7 +159,7 @@ <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-dataflow-std</artifactId> </dependency> - + <dependency> <groupId>org.mortbay.jetty</groupId> <artifactId>jetty</artifactId>
