Repository: vxquery Updated Branches: refs/heads/master 3e40e5a71 -> 7fc0d93b4
http://git-wip-us.apache.org/repos/asf/vxquery/blob/7fc0d93b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/XTestOptions.java ---------------------------------------------------------------------- diff --git a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/XTestOptions.java b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/XTestOptions.java index 53403f2..80fdd65 100644 --- a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/XTestOptions.java +++ b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/XTestOptions.java @@ -17,63 +17,63 @@ package org.apache.vxquery.xtest; import org.kohsuke.args4j.Option; public class XTestOptions { - @Option(name = "-O", required = false, usage = "Optimization level") + @Option(name = "-O", required = false, usage = "Optimization level. (default: Full Optimization)") int optimizationLevel = Integer.MAX_VALUE; - @Option(name = "-frameSize", required = false, usage = "Setting frame size") + @Option(name = "-frame-size", required = false, usage = "Setting frame size. (default: 65,536)") int frameSize = 65536; - @Option(name = "-port", required = false, usage = "Port for web server to listen on") + @Option(name = "-port", required = false, usage = "Port for web server to listen on.") int port; - @Option(name = "-catalog", required = true, usage = "Test catalog XML") + @Option(name = "-catalog", required = true, usage = "Test catalog XML.") String catalog; - @Option(name = "-threads", required = false, usage = "Number of threads") + @Option(name = "-threads", required = false, usage = "Number of threads. (default: 1)") int threads; - @Option(name = "-include", required = false, usage = "Include filter regular expression") + @Option(name = "-include", required = false, usage = "Include filter regular expression.") String include; - @Option(name = "-exclude", required = false, usage = "Exclude filter regular expression") + @Option(name = "-exclude", required = false, usage = "Exclude filter regular expression.") String exclude; - @Option(name = "-previous-test-results", required = false, usage = "File path to previous test results (text report output file)") + @Option(name = "-previous-test-results", required = false, usage = "File path to previous test results. (text report output file)") String previousTestResults; @Option(name = "-v", required = false, usage = "Verbose") boolean verbose; - @Option(name = "-keepalive", required = false, usage = "Milliseconds to keep server alive after tests have completed") + @Option(name = "-keepalive", required = false, usage = "Milliseconds to keep server alive after tests have completed.") long keepalive; - @Option(name = "-textreport", required = false, usage = "Text report output file") + @Option(name = "-textreport", required = false, usage = "Text report output file.") String diffable; - @Option(name = "-xmlreport", required = false, usage = "XML report output file") + @Option(name = "-xmlreport", required = false, usage = "XML report output file.") String xmlReport; - @Option(name = "-htmlreport", required = false, usage = "HTML report output file") + @Option(name = "-htmlreport", required = false, usage = "HTML report output file.") String htmlReport; - @Option(name = "-showquery", usage = "Show query string") + @Option(name = "-showquery", usage = "Show query string.") boolean showQuery; - @Option(name = "-showast", usage = "Show abstract syntax tree") + @Option(name = "-showast", usage = "Show abstract syntax tree.") boolean showAST; - @Option(name = "-showtet", usage = "Show translated expression tree") + @Option(name = "-showtet", usage = "Show translated expression tree.") boolean showTET; - @Option(name = "-showoet", usage = "Show optimized expression tree") + @Option(name = "-showoet", usage = "Show optimized expression tree.") boolean showOET; - @Option(name = "-showrp", usage = "Show runtime plan") + @Option(name = "-showrp", usage = "Show runtime plan.") boolean showRP; - @Option(name = "-compileonly", usage = "Compile the query and stop") + @Option(name = "-compileonly", usage = "Compile the query and stop.") boolean compileOnly; - @Option(name = "-showresult", usage = "Show query result") + @Option(name = "-showresult", usage = "Show query result.") boolean showResult; } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/vxquery/blob/7fc0d93b/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/AbstractXQueryTest.java ---------------------------------------------------------------------- diff --git a/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/AbstractXQueryTest.java b/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/AbstractXQueryTest.java index 9cae8e8..12a91a9 100644 --- a/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/AbstractXQueryTest.java +++ b/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/AbstractXQueryTest.java @@ -30,7 +30,7 @@ public abstract class AbstractXQueryTest { private TestRunner tr; protected abstract XTestOptions getTestOptions(); - + protected static XTestOptions getDefaultTestOptions() { XTestOptions opts = new XTestOptions(); opts.verbose = false; @@ -40,10 +40,6 @@ public abstract class AbstractXQueryTest { return opts; } - protected static void setCatalogToTestOptions(XTestOptions opts, String catalog) { - opts.catalog = catalog; - } - public AbstractXQueryTest(TestCase tc) throws Exception { this.tc = tc; tr = new TestRunner(getTestOptions()); http://git-wip-us.apache.org/repos/asf/vxquery/blob/7fc0d93b/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/VXQueryTest.java ---------------------------------------------------------------------- diff --git a/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/VXQueryTest.java b/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/VXQueryTest.java index 91adbbf..3704d07 100644 --- a/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/VXQueryTest.java +++ b/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/VXQueryTest.java @@ -25,7 +25,7 @@ import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; @RunWith(Parameterized.class) -public class VXQueryTest extends AbstractXQueryTest{ +public class VXQueryTest extends AbstractXQueryTest { private static String VXQUERY_CATALOG = StringUtils.join(new String[] { "src", "test", "resources", "VXQueryCatalog.xml" }, File.separator); @@ -43,7 +43,7 @@ public class VXQueryTest extends AbstractXQueryTest{ public static XTestOptions getOptions() { XTestOptions options = getDefaultTestOptions(); - setCatalogToTestOptions(options, VXQUERY_CATALOG); + options.catalog = VXQUERY_CATALOG; return options; } http://git-wip-us.apache.org/repos/asf/vxquery/blob/7fc0d93b/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/VXQueryXMarkTest.java ---------------------------------------------------------------------- diff --git a/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/VXQueryXMarkTest.java b/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/VXQueryXMarkTest.java new file mode 100644 index 0000000..ac35a0c --- /dev/null +++ b/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/VXQueryXMarkTest.java @@ -0,0 +1,55 @@ +/* +* Licensed to the Apache Software Foundation (ASF) under one or more +* contributor license agreements. See the NOTICE file distributed with +* this work for additional information regarding copyright ownership. +* The ASF licenses this file to You under the Apache License, Version 2.0 +* (the "License"); you may not use this file except in compliance with +* the License. You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ +package org.apache.vxquery.xtest; + +import java.io.File; +import java.util.Collection; + +import org.apache.commons.lang3.StringUtils; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; +import org.junit.runners.Parameterized.Parameters; + +@RunWith(Parameterized.class) +public class VXQueryXMarkTest extends AbstractXQueryTest { + + private static String VXQUERY_XMARK_CATALOG = StringUtils.join(new String[] { "src", "test", "resources", + "VXQueryXMarkCatalog.xml" }, File.separator); + + public VXQueryXMarkTest(TestCase tc) throws Exception { + super(tc); + } + + @Parameters + public static Collection<Object[]> tests() throws Exception { + JUnitTestCaseFactory jtcf_vxquery = new JUnitTestCaseFactory(getOptions()); + Collection<Object[]> tests = jtcf_vxquery.getList(); + return tests; + } + + public static XTestOptions getOptions() { + XTestOptions options = getDefaultTestOptions(); + options.catalog = VXQUERY_XMARK_CATALOG; + return options; + } + + @Override + protected XTestOptions getTestOptions() { + return getOptions(); + } + +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/7fc0d93b/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/XMarkTest.java ---------------------------------------------------------------------- diff --git a/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/XMarkTest.java b/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/XMarkTest.java index 0e7838f..0753a79 100644 --- a/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/XMarkTest.java +++ b/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/XMarkTest.java @@ -28,7 +28,7 @@ import org.junit.runners.Parameterized.Parameters; public class XMarkTest extends AbstractXQueryTest { private static String XMARK_CATALOG = StringUtils.join(new String[] { "src", "test", "resources", - "VXQueryXMarkCatalog.xml" }, File.separator); + "XMarkCatalog.xml" }, File.separator); public XMarkTest(TestCase tc) throws Exception { super(tc); @@ -43,7 +43,8 @@ public class XMarkTest extends AbstractXQueryTest { public static XTestOptions getOptions() { XTestOptions options = getDefaultTestOptions(); - setCatalogToTestOptions(options, XMARK_CATALOG); + options.catalog = XMARK_CATALOG; + options.frameSize = (int) Math.pow(2, 23); return options; } http://git-wip-us.apache.org/repos/asf/vxquery/blob/7fc0d93b/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/XQTSTest.java ---------------------------------------------------------------------- diff --git a/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/XQTSTest.java b/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/XQTSTest.java index 68f00a3..0dc356b 100644 --- a/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/XQTSTest.java +++ b/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/XQTSTest.java @@ -43,7 +43,7 @@ public class XQTSTest extends AbstractXQueryTest { public static XTestOptions getOptions() { XTestOptions options = getDefaultTestOptions(); - setCatalogToTestOptions(options, XQTS_CATALOG); + options.catalog = XQTS_CATALOG; options.previousTestResults = StringUtils.join(new String[] { "results", "xqts.txt" }, File.separator); return options; } http://git-wip-us.apache.org/repos/asf/vxquery/blob/7fc0d93b/vxquery-xtest/src/test/resources/Queries/XQuery/XMark/Modified/q08.xq ---------------------------------------------------------------------- diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/XMark/Modified/q08.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/XMark/Modified/q08.xq index 1f0045a..dc1af0e 100644 --- a/vxquery-xtest/src/test/resources/Queries/XQuery/XMark/Modified/q08.xq +++ b/vxquery-xtest/src/test/resources/Queries/XQuery/XMark/Modified/q08.xq @@ -22,7 +22,7 @@ for $p in collection($collection1)/site/people/person let $a := count( let $collection2 := "closed_auctions" for $t in collection($collection2)/site/closed_auctions/closed_auction - where $t/buyer/@person = $p/@id + where $t/buyer/@person eq $p/@id return $t ) return <item person="{$p/name/text()}">{$a}</item>
