Repository: vxquery Updated Branches: refs/heads/master 1f831267a -> 0361e4f20
http://git-wip-us.apache.org/repos/asf/vxquery/blob/0361e4f2/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/TestCaseResult.java ---------------------------------------------------------------------- diff --git a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/TestCaseResult.java b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/TestCaseResult.java index 48e4f00..1ef9f2c 100644 --- a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/TestCaseResult.java +++ b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/TestCaseResult.java @@ -57,9 +57,10 @@ public class TestCaseResult { public void compare() { String eErr = testCase.getExpectedError(); + File[] resFiles = testCase.getExpectedResultFiles(); report = "No result file found"; state = State.NO_RESULT_FILE; - if (eErr != null) { + if (eErr != null && !(!error() && resFiles.length > 0)) { if (userError()) { String aErr = String.valueOf(((SystemException) error).getCode()); if (eErr.equals(aErr)) { @@ -85,7 +86,6 @@ public class TestCaseResult { report = "Expected result, Got failure: " + error; state = State.EXPECTED_RESULT_GOT_FAILURE; } else { - File[] resFiles = testCase.getExpectedResultFiles(); for (int i = 0; i < resFiles.length; ++i) { File resFile = resFiles[i]; String expResult = slurpFile(resFile); http://git-wip-us.apache.org/repos/asf/vxquery/blob/0361e4f2/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/TestRunner.java ---------------------------------------------------------------------- diff --git a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/TestRunner.java b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/TestRunner.java index 8cf65b4..524562a 100644 --- a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/TestRunner.java +++ b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/TestRunner.java @@ -175,5 +175,6 @@ public class TestRunner { } public void close() throws Exception { + // TODO add a close statement for the hyracks connection. } } http://git-wip-us.apache.org/repos/asf/vxquery/blob/0361e4f2/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/VXQueryCheckXQTSTest.java ---------------------------------------------------------------------- diff --git a/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/VXQueryCheckXQTSTest.java b/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/VXQueryCheckXQTSTest.java new file mode 100644 index 0000000..7c4e43c --- /dev/null +++ b/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/VXQueryCheckXQTSTest.java @@ -0,0 +1,56 @@ +/* +* 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 VXQueryCheckXQTSTest extends AbstractXQueryTest { + + private static String XQTS_CATALOG = StringUtils.join(new String[] { "test-suites", "xqts", "XQTSCatalog.xml" }, + File.separator); + + public VXQueryCheckXQTSTest(TestCase tc) throws Exception { + super(tc); + } + + @Parameters(name = "VXQueryCheckXQTSTest {index}: {0}") + 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 = XQTS_CATALOG; + options.previousTestResults = StringUtils.join(new String[] { "results", "xqts.txt" }, File.separator); + return options; + } + + @Override + protected XTestOptions getTestOptions() { + return getOptions(); + } + +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/0361e4f2/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 1de0e2b..25baed9 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 @@ -44,7 +44,6 @@ public class XQTSTest extends AbstractXQueryTest { public static XTestOptions getOptions() { XTestOptions options = getDefaultTestOptions(); options.catalog = XQTS_CATALOG; - options.previousTestResults = StringUtils.join(new String[] { "results", "xqts.txt" }, File.separator); return options; }
