Merging Riyafa's change with master.
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/functions/builtin-functions.xml b/vxquery-core/src/main/java/org/apache/vxquery/functions/builtin-functions.xml
index 27f0768..8f777a5 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/functions/builtin-functions.xml
+++ b/vxquery-core/src/main/java/org/apache/vxquery/functions/builtin-functions.xml
@@ -1191,4 +1191,18 @@
<return type="js:null"/>
<runtime type="scalar" class="org.apache.vxquery.runtime.functions.json.JnNullScalarEvaluatorFactory"/>
</function>
+
+ <!-- libjn:descendant-arrays($sequence as item()*) as array()* -->
+ <function name="libjn:descendant-arrays">
+ <param name="sequence" type="item()*"/>
+ <return type="json-item()*"/>
+ <runtime type="scalar" class="org.apache.vxquery.runtime.functions.json.LibjnDescendantArraysScalarEvaluatorFactory"/>
+ </function>
+
+ <!-- libjn:flatten($sequence as item()*) as item()* -->
+ <function name="libjn:flatten">
+ <param name="sequence" type="item()*"/>
+ <return type="item()*"/>
+ <runtime type="scalar" class="org.apache.vxquery.runtime.functions.json.LibjnFlattenScalarEvaluatorFactory"/>
+ </function>
</functions>
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/json/LibjnDescendantArraysScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/json/LibjnDescendantArraysScalarEvaluatorFactory.java
new file mode 100644
index 0000000..7896555
--- /dev/null
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/json/LibjnDescendantArraysScalarEvaluatorFactory.java
@@ -0,0 +1,139 @@
+/*
+ * 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.runtime.functions.json;
+
+import java.io.IOException;
+
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.vxquery.datamodel.accessors.SequencePointable;
+import org.apache.vxquery.datamodel.accessors.TaggedValuePointable;
+import org.apache.vxquery.datamodel.accessors.jsonitem.ArrayPointable;
+import org.apache.vxquery.datamodel.accessors.jsonitem.ObjectPointable;
+import org.apache.vxquery.datamodel.builders.sequence.SequenceBuilder;
+import org.apache.vxquery.datamodel.values.ValueTag;
+import org.apache.vxquery.datamodel.values.XDMConstants;
+import org.apache.vxquery.exceptions.ErrorCode;
+import org.apache.vxquery.exceptions.SystemException;
+import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluator;
+import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluatorFactory;
+
+public class LibjnDescendantArraysScalarEvaluatorFactory extends AbstractTaggedValueArgumentScalarEvaluatorFactory {
+
+ private static final long serialVersionUID = 1L;
+
+ public LibjnDescendantArraysScalarEvaluatorFactory(IScalarEvaluatorFactory[] args) {
+ super(args);
+ }
+
+ @Override
+ protected IScalarEvaluator createEvaluator(IHyracksTaskContext ctx, IScalarEvaluator[] args)
+ throws AlgebricksException {
+ final SequencePointable sp = (SequencePointable) SequencePointable.FACTORY.createPointable();
+ final ArrayPointable ap = (ArrayPointable) ArrayPointable.FACTORY.createPointable();
+ final ObjectPointable op = (ObjectPointable) ObjectPointable.FACTORY.createPointable();
+ final UTF8StringPointable stringp = (UTF8StringPointable) UTF8StringPointable.FACTORY.createPointable();
+ final SequenceBuilder sb = new SequenceBuilder();
+ final ArrayBackedValueStorage abvs = new ArrayBackedValueStorage();
+
+ return new AbstractTaggedValueArgumentScalarEvaluator(args) {
+
+ @Override
+ protected void evaluate(TaggedValuePointable[] args, IPointable result) throws SystemException {
+ abvs.reset();
+ sb.reset(abvs);
+ TaggedValuePointable tvp = args[0];
+ if (tvp.getTag() == ValueTag.SEQUENCE_TAG) {
+ TaggedValuePointable tempTvp = ppool.takeOne(TaggedValuePointable.class);
+ tvp.getValue(sp);
+ int size = sp.getEntryCount();
+ for (int i = 0; i < size; i++) {
+ sp.getEntry(i, tempTvp);
+ if (tempTvp.getTag() == ValueTag.ARRAY_TAG) {
+ nested(tempTvp, ap);
+ }
+ if (tempTvp.getTag() == ValueTag.OBJECT_TAG) {
+ insideObject(tempTvp);
+ }
+ }
+ ppool.giveBack(tempTvp);
+ } else if (tvp.getTag() == ValueTag.ARRAY_TAG) {
+ nested(tvp, ap);
+ } else if (tvp.getTag() == ValueTag.OBJECT_TAG) {
+ insideObject(tvp);
+ } else {
+ XDMConstants.setEmptySequence(tvp);
+ }
+ try {
+ sb.finish();
+ result.set(abvs);
+ } catch (IOException e) {
+ throw new SystemException(ErrorCode.SYSE0001, e);
+ }
+ }
+
+ public void nested(TaggedValuePointable tvp, ArrayPointable ap) throws SystemException {
+ TaggedValuePointable tempTvp = ppool.takeOne(TaggedValuePointable.class);
+ ArrayPointable tempAp = ppool.takeOne(ArrayPointable.class);
+ appendSequence(tvp, ap);
+ int size = ap.getEntryCount();
+ for (int i = 0; i < size; i++) {
+
+ ap.getEntry(i, tempTvp);
+ if (tempTvp.getTag() == ValueTag.ARRAY_TAG) {
+ nested(tempTvp, tempAp);
+ }
+ }
+ ppool.giveBack(tempTvp);
+ ppool.giveBack(tempAp);
+ }
+
+ public void appendSequence(TaggedValuePointable tvp, ArrayPointable ap) throws SystemException {
+ tvp.getValue(ap);
+ try {
+ sb.addItem(tvp);
+ } catch (IOException e) {
+ throw new SystemException(ErrorCode.SYSE0001, e);
+ }
+ }
+
+ public void insideObject(TaggedValuePointable tvp) throws SystemException {
+ tvp.getValue(op);
+ TaggedValuePointable tempTvp = ppool.takeOne(TaggedValuePointable.class);
+ try {
+ op.getKeys(tvp);
+ tvp.getValue(stringp);
+ op.getValue(stringp, tempTvp);
+ } catch (IOException e1) {
+ throw new SystemException(ErrorCode.SYSE0001, e1);
+ }
+ if (tempTvp.getTag() == ValueTag.OBJECT_TAG) {
+ insideObject(tempTvp);
+ } else {
+ nested(tempTvp, ap);
+ }
+ ppool.giveBack(tempTvp);
+ }
+ };
+ }
+
+}
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/json/LibjnFlattenScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/json/LibjnFlattenScalarEvaluatorFactory.java
new file mode 100644
index 0000000..2e3e901
--- /dev/null
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/json/LibjnFlattenScalarEvaluatorFactory.java
@@ -0,0 +1,107 @@
+/*
+ * 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.runtime.functions.json;
+
+import java.io.IOException;
+
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.vxquery.datamodel.accessors.SequencePointable;
+import org.apache.vxquery.datamodel.accessors.TaggedValuePointable;
+import org.apache.vxquery.datamodel.accessors.jsonitem.ArrayPointable;
+import org.apache.vxquery.datamodel.builders.sequence.SequenceBuilder;
+import org.apache.vxquery.datamodel.values.ValueTag;
+import org.apache.vxquery.exceptions.ErrorCode;
+import org.apache.vxquery.exceptions.SystemException;
+import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluator;
+import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluatorFactory;
+
+public class LibjnFlattenScalarEvaluatorFactory extends AbstractTaggedValueArgumentScalarEvaluatorFactory {
+
+ private static final long serialVersionUID = 1L;
+
+ public LibjnFlattenScalarEvaluatorFactory(IScalarEvaluatorFactory[] args) {
+ super(args);
+ }
+
+ @Override
+ protected IScalarEvaluator createEvaluator(IHyracksTaskContext ctx, IScalarEvaluator[] args)
+ throws AlgebricksException {
+ final SequencePointable sp = (SequencePointable) SequencePointable.FACTORY.createPointable();
+ final SequenceBuilder sb = new SequenceBuilder();
+ final ArrayBackedValueStorage abvs = new ArrayBackedValueStorage();
+
+ return new AbstractTaggedValueArgumentScalarEvaluator(args) {
+
+ @Override
+ protected void evaluate(TaggedValuePointable[] args, IPointable result) throws SystemException {
+ abvs.reset();
+ sb.reset(abvs);
+ TaggedValuePointable tvp = args[0];
+ if (tvp.getTag() == ValueTag.SEQUENCE_TAG) {
+ TaggedValuePointable tempTvp = ppool.takeOne(TaggedValuePointable.class);
+ tvp.getValue(sp);
+ int size = sp.getEntryCount();
+ for (int i = 0; i < size; i++) {
+ sp.getEntry(i, tempTvp);
+ flatten(tempTvp);
+ }
+ ppool.giveBack(tempTvp);
+ } else {
+ flatten(tvp);
+ }
+ try {
+ sb.finish();
+ result.set(abvs);
+ } catch (IOException e) {
+ throw new SystemException(ErrorCode.SYSE0001, e);
+ }
+ }
+
+ public void loopInsideArray(TaggedValuePointable tvp) throws SystemException {
+ TaggedValuePointable tempTvp = ppool.takeOne(TaggedValuePointable.class);
+ ArrayPointable ap = ppool.takeOne(ArrayPointable.class);
+ tvp.getValue(ap);
+ int size = ap.getEntryCount();
+ for (int i = 0; i < size; i++) {
+ ap.getEntry(i, tempTvp);
+ flatten(tempTvp);
+ }
+ ppool.giveBack(tempTvp);
+ ppool.giveBack(ap);
+ }
+
+ public void flatten(TaggedValuePointable tvp) throws SystemException {
+ if (tvp.getTag() == ValueTag.ARRAY_TAG) {
+ loopInsideArray(tvp);
+ } else {
+ try {
+ sb.addItem(tvp);
+ } catch (IOException e) {
+ throw new SystemException(ErrorCode.SYSE0001, e);
+ }
+ }
+ }
+
+ };
+ }
+
+}
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/jsonitem/SimpleObjectUnionScalarEvaluator.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/jsonitem/SimpleObjectUnionScalarEvaluator.java
index 960cea4..4eaf8f7 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/jsonitem/SimpleObjectUnionScalarEvaluator.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/jsonitem/SimpleObjectUnionScalarEvaluator.java
@@ -64,7 +64,7 @@
op.getKeys(tempTvp);
addPairs(tempTvp, tempValue);
}
- } else {
+ } else if (arg.getTag() == ValueTag.OBJECT_TAG) {
op = (ObjectPointable) ObjectPointable.FACTORY.createPointable();
arg.getValue(op);
addPairs(tempTvp, tempValue);
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/util/ArithmeticHelper.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/util/ArithmeticHelper.java
index 1647364..a90f108 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/util/ArithmeticHelper.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/util/ArithmeticHelper.java
@@ -61,7 +61,8 @@
castToDouble = new CastToDoubleOperation();
}
- public void compute(TaggedValuePointable tvp1, TaggedValuePointable tvp2, IPointable result) throws SystemException {
+ public void compute(TaggedValuePointable tvp1, TaggedValuePointable tvp2, IPointable result)
+ throws SystemException {
abvs.reset();
try {
int tid1 = getBaseTypeForArithmetics(tvp1.getTag());
diff --git a/vxquery-xtest/results/xqts.txt b/vxquery-xtest/results/xqts.txt
index 1d9fc6d..b209c39 100644
--- a/vxquery-xtest/results/xqts.txt
+++ b/vxquery-xtest/results/xqts.txt
@@ -109,7 +109,7 @@
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-45, EXPECTED_ERROR_GOT_RESULT
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-46, EXPECTED_ERROR_GOT_RESULT
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-47, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-48, EXPECTED_ERROR_GOT_RESULT
+Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-48, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-49, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-5, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-50, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
@@ -414,7 +414,7 @@
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-22, EXPECTED_RESULT_GOT_ERROR
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-23, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-24, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-25, EXPECTED_ERROR_GOT_RESULT
+Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-25, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-26, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-27, EXPECTED_RESULT_GOT_ERROR
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-28, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
@@ -468,7 +468,7 @@
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-73, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-74, EXPECTED_ERROR_GOT_RESULT
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-75, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
-Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-76, EXPECTED_ERROR_GOT_RESULT
+Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-76, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-77, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-78, EXPECTED_RESULT_GOT_FAILURE
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-79, EXPECTED_ERROR_GOT_FAILURE
@@ -542,7 +542,7 @@
Construct/DirectConOther//K2-DirectConOther-45, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/DirectConOther//K2-DirectConOther-46, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/DirectConOther//K2-DirectConOther-47, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Construct/DirectConOther//K2-DirectConOther-48, EXPECTED_ERROR_GOT_RESULT
+Construct/DirectConOther//K2-DirectConOther-48, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/DirectConOther//K2-DirectConOther-49, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/DirectConOther//K2-DirectConOther-5, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConOther//K2-DirectConOther-50, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
@@ -559,9 +559,9 @@
Construct/DirectConOther//K2-DirectConOther-60, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/DirectConOther//K2-DirectConOther-61, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConOther//K2-DirectConOther-62, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConOther//K2-DirectConOther-63, EXPECTED_ERROR_GOT_RESULT
-Construct/DirectConOther//K2-DirectConOther-64, EXPECTED_ERROR_GOT_RESULT
-Construct/DirectConOther//K2-DirectConOther-65, EXPECTED_ERROR_GOT_RESULT
+Construct/DirectConOther//K2-DirectConOther-63, EXPECTED_RESULT_GOT_SAME_RESULT
+Construct/DirectConOther//K2-DirectConOther-64, EXPECTED_RESULT_GOT_SAME_RESULT
+Construct/DirectConOther//K2-DirectConOther-65, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/DirectConOther//K2-DirectConOther-66, EXPECTED_RESULT_GOT_ERROR
Construct/DirectConOther//K2-DirectConOther-67, EXPECTED_RESULT_GOT_ERROR
Construct/DirectConOther//K2-DirectConOther-68, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
@@ -638,7 +638,7 @@
Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-enclexpr-3, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-enclexpr-4, EXPECTED_RESULT_GOT_FAILURE
Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-id-1, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-id-2, EXPECTED_ERROR_GOT_RESULT
+Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-id-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-name-1, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-name-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-name-3, EXPECTED_ERROR_GOT_SAME_ERROR
@@ -832,7 +832,7 @@
Expressions/Construct/DirectConElem//Constr-elem-empty-1, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/DirectConElem//Constr-elem-empty-2, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/DirectConElem//Constr-elem-empty-3, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/Construct/DirectConElem//Constr-elem-empty-4, EXPECTED_ERROR_GOT_RESULT
+Expressions/Construct/DirectConElem//Constr-elem-empty-4, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/Construct/DirectConElem//Constr-elem-empty-5, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/DirectConElem//Constr-elem-matchtag-1, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/Construct/DirectConElem//Constr-elem-matchtag-2, EXPECTED_ERROR_GOT_SAME_ERROR
@@ -857,7 +857,7 @@
Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-entref-1, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-entref-2, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-id-1, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-id-2, EXPECTED_ERROR_GOT_RESULT
+Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-id-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-nsdecl-1, EXPECTED_RESULT_GOT_FAILURE
Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-nsdecl-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-nspre-1, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
@@ -1042,7 +1042,7 @@
Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-tag-8, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-tag-9, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-xmlspace-1, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-xmlspace-2, EXPECTED_ERROR_GOT_RESULT
+Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-xmlspace-2, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/DirectConOther//Constr-comment-1, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/DirectConOther//Constr-comment-2, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/DirectConOther//Constr-comment-3, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -1107,7 +1107,7 @@
Expressions/ContextExpr/InternalContextExpr//internalcontextitem-6, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/ContextExpr/InternalContextExpr//internalcontextitem-7, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/ContextExpr/InternalContextExpr//internalcontextitem-8, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/ContextExpr/InternalContextExpr//internalcontextitem-9, EXPECTED_ERROR_GOT_RESULT
+Expressions/ContextExpr/InternalContextExpr//internalcontextitem-9, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/exprSeqTypes/SeqExprCast//CastAs001, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/exprSeqTypes/SeqExprCast//CastAs002, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/exprSeqTypes/SeqExprCast//CastAs003, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -1276,7 +1276,7 @@
Expressions/exprSeqTypes/SeqExprCast//CastAs166, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/exprSeqTypes/SeqExprCast//CastAs167, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/exprSeqTypes/SeqExprCast//CastAs168, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/exprSeqTypes/SeqExprCast//CastAs169, EXPECTED_ERROR_GOT_RESULT
+Expressions/exprSeqTypes/SeqExprCast//CastAs169, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/exprSeqTypes/SeqExprCast//CastAs170, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/exprSeqTypes/SeqExprCast//CastAs171, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/exprSeqTypes/SeqExprCast//CastAs172, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -1311,7 +1311,7 @@
Expressions/exprSeqTypes/SeqExprCast//CastAs201, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/exprSeqTypes/SeqExprCast//CastAs202, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/exprSeqTypes/SeqExprCast//CastAs203, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/exprSeqTypes/SeqExprCast//CastAs204, EXPECTED_ERROR_GOT_RESULT
+Expressions/exprSeqTypes/SeqExprCast//CastAs204, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/exprSeqTypes/SeqExprCast//CastAs205, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/exprSeqTypes/SeqExprCast//CastAs206, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/exprSeqTypes/SeqExprCast//CastAs207, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -1754,7 +1754,7 @@
Expressions/exprSeqTypes/SeqExprCast//CastAs644, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/exprSeqTypes/SeqExprCast//CastAs645, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/exprSeqTypes/SeqExprCast//CastAs646, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/exprSeqTypes/SeqExprCast//CastAs647, EXPECTED_ERROR_GOT_RESULT
+Expressions/exprSeqTypes/SeqExprCast//CastAs647, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/exprSeqTypes/SeqExprCast//CastAs648, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/exprSeqTypes/SeqExprCast//CastAs649, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/exprSeqTypes/SeqExprCast//CastAs650, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -1777,11 +1777,11 @@
Expressions/exprSeqTypes/SeqExprCast//CastAs667, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/exprSeqTypes/SeqExprCast//CastAs668, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/exprSeqTypes/SeqExprCast//CastAs669, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/exprSeqTypes/SeqExprCast//CastAs670, EXPECTED_ERROR_GOT_RESULT
+Expressions/exprSeqTypes/SeqExprCast//CastAs670, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/exprSeqTypes/SeqExprCast//CastAs671, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/exprSeqTypes/SeqExprCast//CastAs672, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/exprSeqTypes/SeqExprCast//CastAs673, EXPECTED_ERROR_GOT_RESULT
-Expressions/exprSeqTypes/SeqExprCast//CastFOCA0001-1, EXPECTED_ERROR_GOT_RESULT
+Expressions/exprSeqTypes/SeqExprCast//CastFOCA0001-1, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/exprSeqTypes/SeqExprCast//CastFOCA0003-1, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/exprSeqTypes/SeqExprCast//casthc1, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/exprSeqTypes/SeqExprCast//casthc10, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -2316,7 +2316,7 @@
Expressions/exprSeqTypes/SeqExprCast//K-SeqExprCast-1437, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/exprSeqTypes/SeqExprCast//K-SeqExprCast-1438, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/exprSeqTypes/SeqExprCast//K-SeqExprCast-1439, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/exprSeqTypes/SeqExprCast//K-SeqExprCast-144, EXPECTED_ERROR_GOT_RESULT
+Expressions/exprSeqTypes/SeqExprCast//K-SeqExprCast-144, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/exprSeqTypes/SeqExprCast//K-SeqExprCast-1440, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/exprSeqTypes/SeqExprCast//K-SeqExprCast-1441, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/exprSeqTypes/SeqExprCast//K-SeqExprCast-1442, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -4243,11 +4243,11 @@
Expressions/exprSeqTypes/SeqExprInstanceOf//K-SeqExprInstanceOf-9, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/exprSeqTypes/SeqExprTreat//K-SeqExprTreat-1, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/exprSeqTypes/SeqExprTreat//K-SeqExprTreat-10, EXPECTED_ERROR_GOT_FAILURE
-Expressions/exprSeqTypes/SeqExprTreat//K-SeqExprTreat-11, EXPECTED_ERROR_GOT_RESULT
-Expressions/exprSeqTypes/SeqExprTreat//K-SeqExprTreat-12, EXPECTED_ERROR_GOT_RESULT
-Expressions/exprSeqTypes/SeqExprTreat//K-SeqExprTreat-13, EXPECTED_ERROR_GOT_RESULT
+Expressions/exprSeqTypes/SeqExprTreat//K-SeqExprTreat-11, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/exprSeqTypes/SeqExprTreat//K-SeqExprTreat-12, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/exprSeqTypes/SeqExprTreat//K-SeqExprTreat-13, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/exprSeqTypes/SeqExprTreat//K-SeqExprTreat-14, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/exprSeqTypes/SeqExprTreat//K-SeqExprTreat-15, EXPECTED_ERROR_GOT_RESULT
+Expressions/exprSeqTypes/SeqExprTreat//K-SeqExprTreat-15, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/exprSeqTypes/SeqExprTreat//K-SeqExprTreat-16, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/exprSeqTypes/SeqExprTreat//K-SeqExprTreat-17, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/exprSeqTypes/SeqExprTreat//K-SeqExprTreat-2, EXPECTED_ERROR_GOT_SAME_ERROR
@@ -4383,7 +4383,7 @@
Expressions/FLWORExpr/ForExpr//ForExpr031, EXPECTED_ERROR_GOT_RESULT
Expressions/FLWORExpr/ForExpr/ForExprPositionalVar//K-ForExprPositionalVar-1, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/FLWORExpr/ForExpr/ForExprPositionalVar//K-ForExprPositionalVar-10, EXPECTED_RESULT_GOT_ERROR
-Expressions/FLWORExpr/ForExpr/ForExprPositionalVar//K-ForExprPositionalVar-11, EXPECTED_ERROR_GOT_RESULT
+Expressions/FLWORExpr/ForExpr/ForExprPositionalVar//K-ForExprPositionalVar-11, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/FLWORExpr/ForExpr/ForExprPositionalVar//K-ForExprPositionalVar-12, EXPECTED_RESULT_GOT_ERROR
Expressions/FLWORExpr/ForExpr/ForExprPositionalVar//K-ForExprPositionalVar-13, EXPECTED_RESULT_GOT_ERROR
Expressions/FLWORExpr/ForExpr/ForExprPositionalVar//K-ForExprPositionalVar-14, EXPECTED_RESULT_GOT_ERROR
@@ -4397,8 +4397,8 @@
Expressions/FLWORExpr/ForExpr/ForExprPositionalVar//K-ForExprPositionalVar-21, EXPECTED_RESULT_GOT_ERROR
Expressions/FLWORExpr/ForExpr/ForExprPositionalVar//K-ForExprPositionalVar-22, EXPECTED_RESULT_GOT_ERROR
Expressions/FLWORExpr/ForExpr/ForExprPositionalVar//K-ForExprPositionalVar-23, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/FLWORExpr/ForExpr/ForExprPositionalVar//K-ForExprPositionalVar-24, EXPECTED_ERROR_GOT_RESULT
-Expressions/FLWORExpr/ForExpr/ForExprPositionalVar//K-ForExprPositionalVar-25, EXPECTED_ERROR_GOT_RESULT
+Expressions/FLWORExpr/ForExpr/ForExprPositionalVar//K-ForExprPositionalVar-24, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/FLWORExpr/ForExpr/ForExprPositionalVar//K-ForExprPositionalVar-25, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/FLWORExpr/ForExpr/ForExprPositionalVar//K-ForExprPositionalVar-26, EXPECTED_RESULT_GOT_ERROR
Expressions/FLWORExpr/ForExpr/ForExprPositionalVar//K-ForExprPositionalVar-27, EXPECTED_RESULT_GOT_ERROR
Expressions/FLWORExpr/ForExpr/ForExprPositionalVar//K-ForExprPositionalVar-28, EXPECTED_RESULT_GOT_ERROR
@@ -4420,11 +4420,11 @@
Expressions/FLWORExpr/ForExpr/ForExprWithout//K-ForExprWithout-15, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/FLWORExpr/ForExpr/ForExprWithout//K-ForExprWithout-16, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/FLWORExpr/ForExpr/ForExprWithout//K-ForExprWithout-17, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/FLWORExpr/ForExpr/ForExprWithout//K-ForExprWithout-18, EXPECTED_ERROR_GOT_RESULT
-Expressions/FLWORExpr/ForExpr/ForExprWithout//K-ForExprWithout-19, EXPECTED_ERROR_GOT_RESULT
+Expressions/FLWORExpr/ForExpr/ForExprWithout//K-ForExprWithout-18, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/FLWORExpr/ForExpr/ForExprWithout//K-ForExprWithout-19, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/FLWORExpr/ForExpr/ForExprWithout//K-ForExprWithout-2, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/FLWORExpr/ForExpr/ForExprWithout//K-ForExprWithout-20, EXPECTED_ERROR_GOT_RESULT
-Expressions/FLWORExpr/ForExpr/ForExprWithout//K-ForExprWithout-21, EXPECTED_ERROR_GOT_RESULT
+Expressions/FLWORExpr/ForExpr/ForExprWithout//K-ForExprWithout-20, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/FLWORExpr/ForExpr/ForExprWithout//K-ForExprWithout-21, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/FLWORExpr/ForExpr/ForExprWithout//K-ForExprWithout-22, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/FLWORExpr/ForExpr/ForExprWithout//K-ForExprWithout-23, EXPECTED_RESULT_GOT_ERROR
Expressions/FLWORExpr/ForExpr/ForExprWithout//K-ForExprWithout-24, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -4773,15 +4773,15 @@
Expressions/FLWORExpr/WhereExpr//WhereExpr002, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/FLWORExpr/WhereExpr//WhereExpr003, EXPECTED_RESULT_GOT_FAILURE
Expressions/FLWORExpr/WhereExpr//WhereExpr004, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/WhereExpr//WhereExpr005, EXPECTED_ERROR_GOT_RESULT
+Expressions/FLWORExpr/WhereExpr//WhereExpr005, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/FLWORExpr/WhereExpr//WhereExpr006, EXPECTED_RESULT_GOT_FAILURE
Expressions/FLWORExpr/WhereExpr//WhereExpr007, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/WhereExpr//WhereExpr008, EXPECTED_ERROR_GOT_RESULT
+Expressions/FLWORExpr/WhereExpr//WhereExpr008, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/FLWORExpr/WhereExpr//WhereExpr009, EXPECTED_RESULT_GOT_FAILURE
Expressions/FLWORExpr/WhereExpr//WhereExpr010, EXPECTED_ERROR_GOT_FAILURE
Expressions/FLWORExpr/WhereExpr//WhereExpr013, EXPECTED_RESULT_GOT_FAILURE
Expressions/FLWORExpr/WhereExpr//WhereExpr014, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/WhereExpr//WhereExpr015, EXPECTED_ERROR_GOT_RESULT
+Expressions/FLWORExpr/WhereExpr//WhereExpr015, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/FLWORExpr/WhereExpr//WhereExpr016, EXPECTED_RESULT_GOT_FAILURE
Expressions/FLWORExpr/WhereExpr//WhereExpr017, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/FLWORExpr/WhereExpr//WhereExpr018, EXPECTED_ERROR_GOT_SAME_ERROR
@@ -4906,7 +4906,7 @@
Expressions/LogicExpr//K-LogicExpr-43, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/LogicExpr//K-LogicExpr-44, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/LogicExpr//K-LogicExpr-45, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/LogicExpr//K-LogicExpr-46, EXPECTED_ERROR_GOT_RESULT
+Expressions/LogicExpr//K-LogicExpr-46, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/LogicExpr//K-LogicExpr-5, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/LogicExpr//K-LogicExpr-6, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/LogicExpr//K-LogicExpr-7, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -4977,9 +4977,9 @@
Expressions/LogicExpr//op-logical-and-063, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/LogicExpr//op-logical-and-064, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/LogicExpr//op-logical-and-065, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-066, EXPECTED_ERROR_GOT_RESULT
+Expressions/LogicExpr//op-logical-and-066, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/LogicExpr//op-logical-and-067, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-068, EXPECTED_ERROR_GOT_RESULT
+Expressions/LogicExpr//op-logical-and-068, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/LogicExpr//op-logical-and-069, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/LogicExpr//op-logical-and-070, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/LogicExpr//op-logical-and-071, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
@@ -5136,9 +5136,9 @@
Expressions/LogicExpr//op-logical-or-063, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/LogicExpr//op-logical-or-064, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/LogicExpr//op-logical-or-065, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-066, EXPECTED_ERROR_GOT_RESULT
+Expressions/LogicExpr//op-logical-or-066, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/LogicExpr//op-logical-or-067, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-068, EXPECTED_ERROR_GOT_RESULT
+Expressions/LogicExpr//op-logical-or-068, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/LogicExpr//op-logical-or-069, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/LogicExpr//op-logical-or-070, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/LogicExpr//op-logical-or-071, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
@@ -5861,7 +5861,7 @@
Expressions/Operators/ArithExpr/NumericOpr/NumericAdd//K-NumericAdd-38, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/Operators/ArithExpr/NumericOpr/NumericAdd//K-NumericAdd-39, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
Expressions/Operators/ArithExpr/NumericOpr/NumericAdd//K-NumericAdd-4, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Operators/ArithExpr/NumericOpr/NumericAdd//K-NumericAdd-40, EXPECTED_ERROR_GOT_RESULT
+Expressions/Operators/ArithExpr/NumericOpr/NumericAdd//K-NumericAdd-40, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/ArithExpr/NumericOpr/NumericAdd//K-NumericAdd-41, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
Expressions/Operators/ArithExpr/NumericOpr/NumericAdd//K-NumericAdd-42, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/Operators/ArithExpr/NumericOpr/NumericAdd//K-NumericAdd-43, EXPECTED_ERROR_GOT_SAME_ERROR
@@ -5872,20 +5872,20 @@
Expressions/Operators/ArithExpr/NumericOpr/NumericAdd//K-NumericAdd-48, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/ArithExpr/NumericOpr/NumericAdd//K-NumericAdd-49, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/ArithExpr/NumericOpr/NumericAdd//K-NumericAdd-5, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Operators/ArithExpr/NumericOpr/NumericAdd//K-NumericAdd-50, EXPECTED_ERROR_GOT_RESULT
-Expressions/Operators/ArithExpr/NumericOpr/NumericAdd//K-NumericAdd-51, EXPECTED_ERROR_GOT_RESULT
-Expressions/Operators/ArithExpr/NumericOpr/NumericAdd//K-NumericAdd-52, EXPECTED_ERROR_GOT_RESULT
-Expressions/Operators/ArithExpr/NumericOpr/NumericAdd//K-NumericAdd-53, EXPECTED_ERROR_GOT_RESULT
-Expressions/Operators/ArithExpr/NumericOpr/NumericAdd//K-NumericAdd-54, EXPECTED_ERROR_GOT_RESULT
-Expressions/Operators/ArithExpr/NumericOpr/NumericAdd//K-NumericAdd-55, EXPECTED_ERROR_GOT_RESULT
-Expressions/Operators/ArithExpr/NumericOpr/NumericAdd//K-NumericAdd-56, EXPECTED_ERROR_GOT_RESULT
-Expressions/Operators/ArithExpr/NumericOpr/NumericAdd//K-NumericAdd-57, EXPECTED_ERROR_GOT_RESULT
-Expressions/Operators/ArithExpr/NumericOpr/NumericAdd//K-NumericAdd-58, EXPECTED_ERROR_GOT_RESULT
+Expressions/Operators/ArithExpr/NumericOpr/NumericAdd//K-NumericAdd-50, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Operators/ArithExpr/NumericOpr/NumericAdd//K-NumericAdd-51, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Operators/ArithExpr/NumericOpr/NumericAdd//K-NumericAdd-52, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Operators/ArithExpr/NumericOpr/NumericAdd//K-NumericAdd-53, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Operators/ArithExpr/NumericOpr/NumericAdd//K-NumericAdd-54, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Operators/ArithExpr/NumericOpr/NumericAdd//K-NumericAdd-55, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Operators/ArithExpr/NumericOpr/NumericAdd//K-NumericAdd-56, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Operators/ArithExpr/NumericOpr/NumericAdd//K-NumericAdd-57, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Operators/ArithExpr/NumericOpr/NumericAdd//K-NumericAdd-58, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/ArithExpr/NumericOpr/NumericAdd//K-NumericAdd-59, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/ArithExpr/NumericOpr/NumericAdd//K-NumericAdd-6, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/ArithExpr/NumericOpr/NumericAdd//K-NumericAdd-60, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Operators/ArithExpr/NumericOpr/NumericAdd//K-NumericAdd-61, EXPECTED_ERROR_GOT_RESULT
-Expressions/Operators/ArithExpr/NumericOpr/NumericAdd//K-NumericAdd-62, EXPECTED_ERROR_GOT_RESULT
+Expressions/Operators/ArithExpr/NumericOpr/NumericAdd//K-NumericAdd-61, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Operators/ArithExpr/NumericOpr/NumericAdd//K-NumericAdd-62, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/ArithExpr/NumericOpr/NumericAdd//K-NumericAdd-63, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/Operators/ArithExpr/NumericOpr/NumericAdd//K-NumericAdd-64, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/Operators/ArithExpr/NumericOpr/NumericAdd//K-NumericAdd-65, EXPECTED_ERROR_GOT_SAME_ERROR
@@ -5923,7 +5923,7 @@
Expressions/Operators/ArithExpr/NumericOpr/NumericAdd//op-numeric-addlng2args-2, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/ArithExpr/NumericOpr/NumericAdd//op-numeric-addlng2args-3, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/ArithExpr/NumericOpr/NumericAdd//op-numeric-addlng2args-4, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Operators/ArithExpr/NumericOpr/NumericAdd//op-numeric-addmix2args-1, EXPECTED_ERROR_GOT_RESULT
+Expressions/Operators/ArithExpr/NumericOpr/NumericAdd//op-numeric-addmix2args-1, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/ArithExpr/NumericOpr/NumericAdd//op-numeric-addmix2args-2, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/Operators/ArithExpr/NumericOpr/NumericAdd//op-numeric-addmix2args-3, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/ArithExpr/NumericOpr/NumericAdd//op-numeric-addmix2args-4, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -5996,12 +5996,12 @@
Expressions/Operators/ArithExpr/NumericOpr/NumericDivide//K-NumericDivide-36, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/Operators/ArithExpr/NumericOpr/NumericDivide//K-NumericDivide-37, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/Operators/ArithExpr/NumericOpr/NumericDivide//K-NumericDivide-38, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/Operators/ArithExpr/NumericOpr/NumericDivide//K-NumericDivide-39, EXPECTED_ERROR_GOT_RESULT
+Expressions/Operators/ArithExpr/NumericOpr/NumericDivide//K-NumericDivide-39, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/ArithExpr/NumericOpr/NumericDivide//K-NumericDivide-4, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Operators/ArithExpr/NumericOpr/NumericDivide//K-NumericDivide-40, EXPECTED_ERROR_GOT_RESULT
-Expressions/Operators/ArithExpr/NumericOpr/NumericDivide//K-NumericDivide-41, EXPECTED_ERROR_GOT_RESULT
-Expressions/Operators/ArithExpr/NumericOpr/NumericDivide//K-NumericDivide-42, EXPECTED_ERROR_GOT_RESULT
-Expressions/Operators/ArithExpr/NumericOpr/NumericDivide//K-NumericDivide-43, EXPECTED_ERROR_GOT_RESULT
+Expressions/Operators/ArithExpr/NumericOpr/NumericDivide//K-NumericDivide-40, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Operators/ArithExpr/NumericOpr/NumericDivide//K-NumericDivide-41, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Operators/ArithExpr/NumericOpr/NumericDivide//K-NumericDivide-42, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Operators/ArithExpr/NumericOpr/NumericDivide//K-NumericDivide-43, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/ArithExpr/NumericOpr/NumericDivide//K-NumericDivide-5, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/ArithExpr/NumericOpr/NumericDivide//K-NumericDivide-6, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/ArithExpr/NumericOpr/NumericDivide//K-NumericDivide-7, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -6037,7 +6037,7 @@
Expressions/Operators/ArithExpr/NumericOpr/NumericDivide//op-numeric-dividelng2args-3, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/ArithExpr/NumericOpr/NumericDivide//op-numeric-dividelng2args-4, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/Operators/ArithExpr/NumericOpr/NumericDivide//op-numeric-dividelng2args-5, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Operators/ArithExpr/NumericOpr/NumericDivide//op-numeric-dividemix2args-1, EXPECTED_ERROR_GOT_RESULT
+Expressions/Operators/ArithExpr/NumericOpr/NumericDivide//op-numeric-dividemix2args-1, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/ArithExpr/NumericOpr/NumericDivide//op-numeric-dividemix2args-2, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/Operators/ArithExpr/NumericOpr/NumericDivide//op-numeric-dividemix2args-3, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/ArithExpr/NumericOpr/NumericDivide//op-numeric-dividemix2args-4, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -6118,8 +6118,8 @@
Expressions/Operators/ArithExpr/NumericOpr/NumericIntegerDivide//K-NumericIntegerDivide-5, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/ArithExpr/NumericOpr/NumericIntegerDivide//K-NumericIntegerDivide-50, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/Operators/ArithExpr/NumericOpr/NumericIntegerDivide//K-NumericIntegerDivide-51, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/Operators/ArithExpr/NumericOpr/NumericIntegerDivide//K-NumericIntegerDivide-52, EXPECTED_ERROR_GOT_RESULT
-Expressions/Operators/ArithExpr/NumericOpr/NumericIntegerDivide//K-NumericIntegerDivide-53, EXPECTED_ERROR_GOT_RESULT
+Expressions/Operators/ArithExpr/NumericOpr/NumericIntegerDivide//K-NumericIntegerDivide-52, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Operators/ArithExpr/NumericOpr/NumericIntegerDivide//K-NumericIntegerDivide-53, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/ArithExpr/NumericOpr/NumericIntegerDivide//K-NumericIntegerDivide-6, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/ArithExpr/NumericOpr/NumericIntegerDivide//K-NumericIntegerDivide-7, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/ArithExpr/NumericOpr/NumericIntegerDivide//K-NumericIntegerDivide-8, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -6155,7 +6155,7 @@
Expressions/Operators/ArithExpr/NumericOpr/NumericIntegerDivide//op-numeric-integer-dividelng2args-3, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/ArithExpr/NumericOpr/NumericIntegerDivide//op-numeric-integer-dividelng2args-4, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/ArithExpr/NumericOpr/NumericIntegerDivide//op-numeric-integer-dividelng2args-5, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Operators/ArithExpr/NumericOpr/NumericIntegerDivide//op-numeric-integer-dividemix2args-1, EXPECTED_ERROR_GOT_RESULT
+Expressions/Operators/ArithExpr/NumericOpr/NumericIntegerDivide//op-numeric-integer-dividemix2args-1, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/ArithExpr/NumericOpr/NumericIntegerDivide//op-numeric-integer-dividemix2args-10, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
Expressions/Operators/ArithExpr/NumericOpr/NumericIntegerDivide//op-numeric-integer-dividemix2args-2, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/Operators/ArithExpr/NumericOpr/NumericIntegerDivide//op-numeric-integer-dividemix2args-3, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -6210,8 +6210,8 @@
Expressions/Operators/ArithExpr/NumericOpr/NumericMod//K-NumericMod-25, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/Operators/ArithExpr/NumericOpr/NumericMod//K-NumericMod-26, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/ArithExpr/NumericOpr/NumericMod//K-NumericMod-27, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Operators/ArithExpr/NumericOpr/NumericMod//K-NumericMod-28, EXPECTED_ERROR_GOT_RESULT
-Expressions/Operators/ArithExpr/NumericOpr/NumericMod//K-NumericMod-29, EXPECTED_ERROR_GOT_RESULT
+Expressions/Operators/ArithExpr/NumericOpr/NumericMod//K-NumericMod-28, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Operators/ArithExpr/NumericOpr/NumericMod//K-NumericMod-29, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/ArithExpr/NumericOpr/NumericMod//K-NumericMod-3, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/ArithExpr/NumericOpr/NumericMod//K-NumericMod-4, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/ArithExpr/NumericOpr/NumericMod//K-NumericMod-5, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -6228,7 +6228,7 @@
Expressions/Operators/ArithExpr/NumericOpr/NumericMod//op-numeric-modintg2args-1, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/ArithExpr/NumericOpr/NumericMod//op-numeric-modintg2args-2, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/ArithExpr/NumericOpr/NumericMod//op-numeric-modlng2args-1, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Operators/ArithExpr/NumericOpr/NumericMod//op-numeric-modmix2args-1, EXPECTED_ERROR_GOT_RESULT
+Expressions/Operators/ArithExpr/NumericOpr/NumericMod//op-numeric-modmix2args-1, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/ArithExpr/NumericOpr/NumericMod//op-numeric-modmix2args-2, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/Operators/ArithExpr/NumericOpr/NumericMod//op-numeric-modmix2args-3, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/ArithExpr/NumericOpr/NumericMod//op-numeric-modmix2args-4, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -6274,8 +6274,8 @@
Expressions/Operators/ArithExpr/NumericOpr/NumericMultiply//K-NumericMultiply-3, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/ArithExpr/NumericOpr/NumericMultiply//K-NumericMultiply-30, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/ArithExpr/NumericOpr/NumericMultiply//K-NumericMultiply-31, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Operators/ArithExpr/NumericOpr/NumericMultiply//K-NumericMultiply-32, EXPECTED_ERROR_GOT_RESULT
-Expressions/Operators/ArithExpr/NumericOpr/NumericMultiply//K-NumericMultiply-33, EXPECTED_ERROR_GOT_RESULT
+Expressions/Operators/ArithExpr/NumericOpr/NumericMultiply//K-NumericMultiply-32, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Operators/ArithExpr/NumericOpr/NumericMultiply//K-NumericMultiply-33, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/ArithExpr/NumericOpr/NumericMultiply//K-NumericMultiply-4, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/ArithExpr/NumericOpr/NumericMultiply//K-NumericMultiply-5, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/ArithExpr/NumericOpr/NumericMultiply//K-NumericMultiply-6, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -6298,7 +6298,7 @@
Expressions/Operators/ArithExpr/NumericOpr/NumericMultiply//op-numeric-multiplyflt2args-3, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/ArithExpr/NumericOpr/NumericMultiply//op-numeric-multiplyflt2args-4, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/ArithExpr/NumericOpr/NumericMultiply//op-numeric-multiplyflt2args-5, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Operators/ArithExpr/NumericOpr/NumericMultiply//op-numeric-multiplymix2args-1, EXPECTED_ERROR_GOT_RESULT
+Expressions/Operators/ArithExpr/NumericOpr/NumericMultiply//op-numeric-multiplymix2args-1, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/ArithExpr/NumericOpr/NumericMultiply//op-numeric-multiplymix2args-2, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/Operators/ArithExpr/NumericOpr/NumericMultiply//op-numeric-multiplymix2args-3, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/ArithExpr/NumericOpr/NumericMultiply//op-numeric-multiplymix2args-4, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -6350,17 +6350,17 @@
Expressions/Operators/ArithExpr/NumericOpr/NumericSubtract//K-NumericSubtract-26, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/Operators/ArithExpr/NumericOpr/NumericSubtract//K-NumericSubtract-27, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/ArithExpr/NumericOpr/NumericSubtract//K-NumericSubtract-28, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Operators/ArithExpr/NumericOpr/NumericSubtract//K-NumericSubtract-29, EXPECTED_ERROR_GOT_RESULT
+Expressions/Operators/ArithExpr/NumericOpr/NumericSubtract//K-NumericSubtract-29, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/ArithExpr/NumericOpr/NumericSubtract//K-NumericSubtract-3, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Operators/ArithExpr/NumericOpr/NumericSubtract//K-NumericSubtract-30, EXPECTED_ERROR_GOT_RESULT
-Expressions/Operators/ArithExpr/NumericOpr/NumericSubtract//K-NumericSubtract-31, EXPECTED_ERROR_GOT_RESULT
+Expressions/Operators/ArithExpr/NumericOpr/NumericSubtract//K-NumericSubtract-30, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Operators/ArithExpr/NumericOpr/NumericSubtract//K-NumericSubtract-31, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/ArithExpr/NumericOpr/NumericSubtract//K-NumericSubtract-32, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/ArithExpr/NumericOpr/NumericSubtract//K-NumericSubtract-33, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/ArithExpr/NumericOpr/NumericSubtract//K-NumericSubtract-34, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/ArithExpr/NumericOpr/NumericSubtract//K-NumericSubtract-35, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Operators/ArithExpr/NumericOpr/NumericSubtract//K-NumericSubtract-36, EXPECTED_ERROR_GOT_RESULT
-Expressions/Operators/ArithExpr/NumericOpr/NumericSubtract//K-NumericSubtract-37, EXPECTED_ERROR_GOT_RESULT
-Expressions/Operators/ArithExpr/NumericOpr/NumericSubtract//K-NumericSubtract-38, EXPECTED_ERROR_GOT_RESULT
+Expressions/Operators/ArithExpr/NumericOpr/NumericSubtract//K-NumericSubtract-36, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Operators/ArithExpr/NumericOpr/NumericSubtract//K-NumericSubtract-37, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Operators/ArithExpr/NumericOpr/NumericSubtract//K-NumericSubtract-38, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/ArithExpr/NumericOpr/NumericSubtract//K-NumericSubtract-4, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/ArithExpr/NumericOpr/NumericSubtract//K-NumericSubtract-5, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/ArithExpr/NumericOpr/NumericSubtract//K-NumericSubtract-6, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -6398,7 +6398,7 @@
Expressions/Operators/ArithExpr/NumericOpr/NumericSubtract//op-numeric-subtractlng2args-3, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/ArithExpr/NumericOpr/NumericSubtract//op-numeric-subtractlng2args-4, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/ArithExpr/NumericOpr/NumericSubtract//op-numeric-subtractlng2args-5, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Operators/ArithExpr/NumericOpr/NumericSubtract//op-numeric-subtractmix2args-1, EXPECTED_ERROR_GOT_RESULT
+Expressions/Operators/ArithExpr/NumericOpr/NumericSubtract//op-numeric-subtractmix2args-1, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/ArithExpr/NumericOpr/NumericSubtract//op-numeric-subtractmix2args-2, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/Operators/ArithExpr/NumericOpr/NumericSubtract//op-numeric-subtractmix2args-3, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/ArithExpr/NumericOpr/NumericSubtract//op-numeric-subtractmix2args-4, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -6648,7 +6648,7 @@
Expressions/Operators/CompExpr/GenComprsn/GenCompEq//generalexpression98, EXPECTED_RESULT_GOT_FAILURE
Expressions/Operators/CompExpr/GenComprsn/GenCompEq//generalexpression99, EXPECTED_RESULT_GOT_FAILURE
Expressions/Operators/CompExpr/GenComprsn/GenCompEq//K-GenCompEq-1, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Operators/CompExpr/GenComprsn/GenCompEq//K-GenCompEq-10, EXPECTED_ERROR_GOT_RESULT
+Expressions/Operators/CompExpr/GenComprsn/GenCompEq//K-GenCompEq-10, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/CompExpr/GenComprsn/GenCompEq//K-GenCompEq-11, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/CompExpr/GenComprsn/GenCompEq//K-GenCompEq-12, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/CompExpr/GenComprsn/GenCompEq//K-GenCompEq-13, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -6672,10 +6672,10 @@
Expressions/Operators/CompExpr/GenComprsn/GenCompEq//K-GenCompEq-3, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/CompExpr/GenComprsn/GenCompEq//K-GenCompEq-30, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/Operators/CompExpr/GenComprsn/GenCompEq//K-GenCompEq-31, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/Operators/CompExpr/GenComprsn/GenCompEq//K-GenCompEq-32, EXPECTED_ERROR_GOT_RESULT
-Expressions/Operators/CompExpr/GenComprsn/GenCompEq//K-GenCompEq-33, EXPECTED_ERROR_GOT_RESULT
-Expressions/Operators/CompExpr/GenComprsn/GenCompEq//K-GenCompEq-34, EXPECTED_ERROR_GOT_RESULT
-Expressions/Operators/CompExpr/GenComprsn/GenCompEq//K-GenCompEq-35, EXPECTED_ERROR_GOT_RESULT
+Expressions/Operators/CompExpr/GenComprsn/GenCompEq//K-GenCompEq-32, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Operators/CompExpr/GenComprsn/GenCompEq//K-GenCompEq-33, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Operators/CompExpr/GenComprsn/GenCompEq//K-GenCompEq-34, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Operators/CompExpr/GenComprsn/GenCompEq//K-GenCompEq-35, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/CompExpr/GenComprsn/GenCompEq//K-GenCompEq-36, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/CompExpr/GenComprsn/GenCompEq//K-GenCompEq-37, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/CompExpr/GenComprsn/GenCompEq//K-GenCompEq-38, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -6705,7 +6705,7 @@
Expressions/Operators/CompExpr/GenComprsn/GenCompEq//K-GenCompEq-6, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/CompExpr/GenComprsn/GenCompEq//K-GenCompEq-7, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/CompExpr/GenComprsn/GenCompEq//K-GenCompEq-8, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Operators/CompExpr/GenComprsn/GenCompEq//K-GenCompEq-9, EXPECTED_ERROR_GOT_RESULT
+Expressions/Operators/CompExpr/GenComprsn/GenCompEq//K-GenCompEq-9, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/CompExpr/GenComprsn/GenCompGT//generalexpression397, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/CompExpr/GenComprsn/GenCompGT//generalexpression398, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/CompExpr/GenComprsn/GenCompGT//generalexpression399, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -8275,7 +8275,7 @@
Expressions/Operators/CompExpr/ValComp/NumericComp/NumericEqual//K-NumericEqual-7, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/CompExpr/ValComp/NumericComp/NumericEqual//K-NumericEqual-8, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/CompExpr/ValComp/NumericComp/NumericEqual//K-NumericEqual-9, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Operators/CompExpr/ValComp/NumericComp/NumericEqual//op-numeric-equal-emptyseq, EXPECTED_ERROR_GOT_RESULT
+Expressions/Operators/CompExpr/ValComp/NumericComp/NumericEqual//op-numeric-equal-emptyseq, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/CompExpr/ValComp/NumericComp/NumericEqual//op-numeric-equaldbl2args-1, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/CompExpr/ValComp/NumericComp/NumericEqual//op-numeric-equaldbl2args-10, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/CompExpr/ValComp/NumericComp/NumericEqual//op-numeric-equaldbl2args-2, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -8721,9 +8721,9 @@
Expressions/Operators/CompExpr/ValComp/ValCompTypeChecking//K-ValCompTypeChecking-10, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/Operators/CompExpr/ValComp/ValCompTypeChecking//K-ValCompTypeChecking-11, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/Operators/CompExpr/ValComp/ValCompTypeChecking//K-ValCompTypeChecking-12, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/Operators/CompExpr/ValComp/ValCompTypeChecking//K-ValCompTypeChecking-13, EXPECTED_ERROR_GOT_RESULT
-Expressions/Operators/CompExpr/ValComp/ValCompTypeChecking//K-ValCompTypeChecking-14, EXPECTED_ERROR_GOT_RESULT
-Expressions/Operators/CompExpr/ValComp/ValCompTypeChecking//K-ValCompTypeChecking-15, EXPECTED_ERROR_GOT_RESULT
+Expressions/Operators/CompExpr/ValComp/ValCompTypeChecking//K-ValCompTypeChecking-13, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Operators/CompExpr/ValComp/ValCompTypeChecking//K-ValCompTypeChecking-14, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Operators/CompExpr/ValComp/ValCompTypeChecking//K-ValCompTypeChecking-15, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/CompExpr/ValComp/ValCompTypeChecking//K-ValCompTypeChecking-16, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/Operators/CompExpr/ValComp/ValCompTypeChecking//K-ValCompTypeChecking-17, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/Operators/CompExpr/ValComp/ValCompTypeChecking//K-ValCompTypeChecking-18, EXPECTED_ERROR_GOT_SAME_ERROR
@@ -9213,9 +9213,9 @@
Expressions/PathExpr/Steps/Axes//Axes093, EXPECTED_ERROR_GOT_FAILURE
Expressions/PathExpr/Steps/Axes//Axes094, EXPECTED_ERROR_GOT_FAILURE
Expressions/PathExpr/Steps/Axes//Axes095, EXPECTED_ERROR_GOT_FAILURE
-Expressions/PathExpr/Steps/Axes//Axes096, EXPECTED_ERROR_GOT_RESULT
-Expressions/PathExpr/Steps/Axes//Axes097, EXPECTED_ERROR_GOT_RESULT
-Expressions/PathExpr/Steps/Axes//Axes098, EXPECTED_ERROR_GOT_RESULT
+Expressions/PathExpr/Steps/Axes//Axes096, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/PathExpr/Steps/Axes//Axes097, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/PathExpr/Steps/Axes//Axes098, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/PathExpr/Steps/Axes//Axes099, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
Expressions/PathExpr/Steps/Axes//Axes100, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
Expressions/PathExpr/Steps/Axes//Axes101, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
@@ -9425,8 +9425,8 @@
Expressions/PrimaryExpr/Literals//K2-Literals-39, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/PrimaryExpr/Literals//K2-Literals-4, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/PrimaryExpr/Literals//K2-Literals-5, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/PrimaryExpr/Literals//K2-Literals-6, EXPECTED_ERROR_GOT_RESULT
-Expressions/PrimaryExpr/Literals//K2-Literals-7, EXPECTED_ERROR_GOT_RESULT
+Expressions/PrimaryExpr/Literals//K2-Literals-6, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/PrimaryExpr/Literals//K2-Literals-7, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/PrimaryExpr/Literals//K2-Literals-8, EXPECTED_ERROR_GOT_RESULT
Expressions/PrimaryExpr/Literals//K2-Literals-9, EXPECTED_ERROR_GOT_RESULT
Expressions/PrimaryExpr/Literals//Literals001, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -9527,7 +9527,7 @@
Expressions/PrologExpr/BaseURIProlog//base-URI-15, EXPECTED_RESULT_GOT_ERROR
Expressions/PrologExpr/BaseURIProlog//base-URI-18, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
Expressions/PrologExpr/BaseURIProlog//base-URI-19, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
-Expressions/PrologExpr/BaseURIProlog//base-URI-2, EXPECTED_ERROR_GOT_RESULT
+Expressions/PrologExpr/BaseURIProlog//base-URI-2, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/PrologExpr/BaseURIProlog//base-URI-20, EXPECTED_RESULT_GOT_ERROR
Expressions/PrologExpr/BaseURIProlog//base-URI-21, EXPECTED_RESULT_GOT_ERROR
Expressions/PrologExpr/BaseURIProlog//base-URI-22, EXPECTED_RESULT_GOT_ERROR
@@ -9538,9 +9538,9 @@
Expressions/PrologExpr/BaseURIProlog//base-uri-27, EXPECTED_RESULT_GOT_ERROR
Expressions/PrologExpr/BaseURIProlog//base-uri-28, EXPECTED_RESULT_GOT_ERROR
Expressions/PrologExpr/BaseURIProlog//base-uri-29, EXPECTED_RESULT_GOT_ERROR
-Expressions/PrologExpr/BaseURIProlog//base-URI-3, EXPECTED_ERROR_GOT_RESULT
+Expressions/PrologExpr/BaseURIProlog//base-URI-3, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/PrologExpr/BaseURIProlog//base-URI-4, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/PrologExpr/BaseURIProlog//base-URI-5, EXPECTED_ERROR_GOT_RESULT
+Expressions/PrologExpr/BaseURIProlog//base-URI-5, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/PrologExpr/BaseURIProlog//base-URI-6, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/PrologExpr/BaseURIProlog//base-URI-7, EXPECTED_RESULT_GOT_ERROR
Expressions/PrologExpr/BaseURIProlog//base-URI-8, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
@@ -9758,7 +9758,7 @@
Expressions/PrologExpr/FunctionProlog//K-FunctionProlog-12, EXPECTED_ERROR_GOT_RESULT
Expressions/PrologExpr/FunctionProlog//K-FunctionProlog-13, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/PrologExpr/FunctionProlog//K-FunctionProlog-14, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
-Expressions/PrologExpr/FunctionProlog//K-FunctionProlog-15, EXPECTED_ERROR_GOT_RESULT
+Expressions/PrologExpr/FunctionProlog//K-FunctionProlog-15, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/PrologExpr/FunctionProlog//K-FunctionProlog-16, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/PrologExpr/FunctionProlog//K-FunctionProlog-17, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/PrologExpr/FunctionProlog//K-FunctionProlog-18, EXPECTED_RESULT_GOT_ERROR
@@ -9778,7 +9778,7 @@
Expressions/PrologExpr/FunctionProlog//K-FunctionProlog-30, EXPECTED_RESULT_GOT_ERROR
Expressions/PrologExpr/FunctionProlog//K-FunctionProlog-31, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/PrologExpr/FunctionProlog//K-FunctionProlog-32, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/PrologExpr/FunctionProlog//K-FunctionProlog-33, EXPECTED_ERROR_GOT_RESULT
+Expressions/PrologExpr/FunctionProlog//K-FunctionProlog-33, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/PrologExpr/FunctionProlog//K-FunctionProlog-34, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/PrologExpr/FunctionProlog//K-FunctionProlog-35, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/PrologExpr/FunctionProlog//K-FunctionProlog-36, EXPECTED_ERROR_GOT_FAILURE
@@ -9916,7 +9916,7 @@
Expressions/PrologExpr/VariableProlog/InternalVariablesWith//K-InternalVariablesWith-2, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/PrologExpr/VariableProlog/InternalVariablesWith//K-InternalVariablesWith-20, EXPECTED_ERROR_GOT_FAILURE
Expressions/PrologExpr/VariableProlog/InternalVariablesWith//K-InternalVariablesWith-3, EXPECTED_ERROR_GOT_FAILURE
-Expressions/PrologExpr/VariableProlog/InternalVariablesWith//K-InternalVariablesWith-4, EXPECTED_ERROR_GOT_RESULT
+Expressions/PrologExpr/VariableProlog/InternalVariablesWith//K-InternalVariablesWith-4, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/PrologExpr/VariableProlog/InternalVariablesWith//K-InternalVariablesWith-5, EXPECTED_ERROR_GOT_FAILURE
Expressions/PrologExpr/VariableProlog/InternalVariablesWith//K-InternalVariablesWith-6, EXPECTED_ERROR_GOT_RESULT
Expressions/PrologExpr/VariableProlog/InternalVariablesWith//K-InternalVariablesWith-7, EXPECTED_ERROR_GOT_SAME_ERROR
@@ -10008,7 +10008,7 @@
Expressions/PrologExpr/VariableProlog/InternalVariablesWithout//VarDecl061, EXPECTED_RESULT_GOT_FAILURE
Expressions/PrologExpr/VariableProlog/InternalVariablesWithout//VarDecl062, EXPECTED_RESULT_GOT_FAILURE
Expressions/PrologExpr/VariableProlog/InternalVariablesWithout//vardeclerr, EXPECTED_ERROR_GOT_FAILURE
-Expressions/PrologExpr/VersionProlog//K-VersionProlog-1, EXPECTED_ERROR_GOT_RESULT
+Expressions/PrologExpr/VersionProlog//K-VersionProlog-1, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/PrologExpr/VersionProlog//K-VersionProlog-2, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/PrologExpr/VersionProlog//K-VersionProlog-3, EXPECTED_ERROR_GOT_RESULT
Expressions/PrologExpr/VersionProlog//K-VersionProlog-4, EXPECTED_ERROR_GOT_RESULT
@@ -10023,12 +10023,12 @@
Expressions/PrologExpr/VersionProlog//prolog-version-5, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/PrologExpr/VersionProlog//prolog-version-6, EXPECTED_RESULT_GOT_FAILURE
Expressions/PrologExpr/VersionProlog//prolog-version-7, EXPECTED_RESULT_GOT_FAILURE
-Expressions/PrologExpr/VersionProlog//prolog-version-9, EXPECTED_ERROR_GOT_RESULT
-Expressions/PrologExpr/VersionProlog//version_declaration-001, EXPECTED_ERROR_GOT_RESULT
-Expressions/PrologExpr/VersionProlog//version_declaration-002, EXPECTED_ERROR_GOT_RESULT
+Expressions/PrologExpr/VersionProlog//prolog-version-9, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/PrologExpr/VersionProlog//version_declaration-001, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/PrologExpr/VersionProlog//version_declaration-002, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/PrologExpr/VersionProlog//version_declaration-003, EXPECTED_ERROR_GOT_FAILURE
Expressions/PrologExpr/VersionProlog//version_declaration-004, EXPECTED_ERROR_GOT_FAILURE
-Expressions/PrologExpr/VersionProlog//version_declaration-006, EXPECTED_ERROR_GOT_RESULT
+Expressions/PrologExpr/VersionProlog//version_declaration-006, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/PrologExpr/VersionProlog//version_declaration-007, EXPECTED_ERROR_GOT_RESULT
Expressions/PrologExpr/VersionProlog//version_declaration-008, EXPECTED_ERROR_GOT_RESULT
Expressions/PrologExpr/VersionProlog//version_declaration-009, EXPECTED_ERROR_GOT_SAME_ERROR
@@ -10275,7 +10275,7 @@
Expressions/SeqExpr/ConstructSeq/commaOp//sequenceexpressionhc7, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/SeqExpr/ConstructSeq/commaOp//sequenceexpressionhc8, EXPECTED_RESULT_GOT_FAILURE
Expressions/SeqExpr/ConstructSeq/commaOp//sequenceexpressionhc9, EXPECTED_RESULT_GOT_FAILURE
-Expressions/SeqExpr/ConstructSeq/RangeExpr//K-RangeExpr-1, EXPECTED_ERROR_GOT_RESULT
+Expressions/SeqExpr/ConstructSeq/RangeExpr//K-RangeExpr-1, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/SeqExpr/ConstructSeq/RangeExpr//K-RangeExpr-10, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/SeqExpr/ConstructSeq/RangeExpr//K-RangeExpr-11, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/SeqExpr/ConstructSeq/RangeExpr//K-RangeExpr-12, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -10325,7 +10325,7 @@
Expressions/SeqExpr/FilterExpr//filterexpressionhc2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/SeqExpr/FilterExpr//filterexpressionhc20, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/SeqExpr/FilterExpr//filterexpressionhc21, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/SeqExpr/FilterExpr//filterexpressionhc22, EXPECTED_ERROR_GOT_RESULT
+Expressions/SeqExpr/FilterExpr//filterexpressionhc22, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/SeqExpr/FilterExpr//filterexpressionhc3, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/SeqExpr/FilterExpr//filterexpressionhc4, EXPECTED_RESULT_GOT_ERROR
Expressions/SeqExpr/FilterExpr//filterexpressionhc5, EXPECTED_RESULT_GOT_FAILURE
@@ -10356,7 +10356,7 @@
Expressions/SeqExpr/FilterExpr//K-FilterExpr-28, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/SeqExpr/FilterExpr//K-FilterExpr-29, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/SeqExpr/FilterExpr//K-FilterExpr-3, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/SeqExpr/FilterExpr//K-FilterExpr-30, EXPECTED_ERROR_GOT_RESULT
+Expressions/SeqExpr/FilterExpr//K-FilterExpr-30, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/SeqExpr/FilterExpr//K-FilterExpr-31, EXPECTED_RESULT_GOT_ERROR
Expressions/SeqExpr/FilterExpr//K-FilterExpr-32, EXPECTED_RESULT_GOT_ERROR
Expressions/SeqExpr/FilterExpr//K-FilterExpr-33, EXPECTED_RESULT_GOT_ERROR
@@ -10376,18 +10376,18 @@
Expressions/SeqExpr/FilterExpr//K-FilterExpr-46, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/SeqExpr/FilterExpr//K-FilterExpr-47, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/SeqExpr/FilterExpr//K-FilterExpr-48, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/SeqExpr/FilterExpr//K-FilterExpr-49, EXPECTED_ERROR_GOT_RESULT
+Expressions/SeqExpr/FilterExpr//K-FilterExpr-49, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/SeqExpr/FilterExpr//K-FilterExpr-5, EXPECTED_ERROR_GOT_RESULT
Expressions/SeqExpr/FilterExpr//K-FilterExpr-50, EXPECTED_RESULT_GOT_ERROR
-Expressions/SeqExpr/FilterExpr//K-FilterExpr-51, EXPECTED_ERROR_GOT_RESULT
-Expressions/SeqExpr/FilterExpr//K-FilterExpr-52, EXPECTED_ERROR_GOT_RESULT
+Expressions/SeqExpr/FilterExpr//K-FilterExpr-51, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/SeqExpr/FilterExpr//K-FilterExpr-52, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/SeqExpr/FilterExpr//K-FilterExpr-53, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/SeqExpr/FilterExpr//K-FilterExpr-54, EXPECTED_ERROR_GOT_RESULT
-Expressions/SeqExpr/FilterExpr//K-FilterExpr-55, EXPECTED_ERROR_GOT_RESULT
-Expressions/SeqExpr/FilterExpr//K-FilterExpr-56, EXPECTED_ERROR_GOT_RESULT
-Expressions/SeqExpr/FilterExpr//K-FilterExpr-57, EXPECTED_ERROR_GOT_RESULT
-Expressions/SeqExpr/FilterExpr//K-FilterExpr-58, EXPECTED_ERROR_GOT_RESULT
-Expressions/SeqExpr/FilterExpr//K-FilterExpr-59, EXPECTED_ERROR_GOT_RESULT
+Expressions/SeqExpr/FilterExpr//K-FilterExpr-54, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/SeqExpr/FilterExpr//K-FilterExpr-55, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/SeqExpr/FilterExpr//K-FilterExpr-56, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/SeqExpr/FilterExpr//K-FilterExpr-57, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/SeqExpr/FilterExpr//K-FilterExpr-58, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/SeqExpr/FilterExpr//K-FilterExpr-59, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/SeqExpr/FilterExpr//K-FilterExpr-6, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/SeqExpr/FilterExpr//K-FilterExpr-60, EXPECTED_RESULT_GOT_ERROR
Expressions/SeqExpr/FilterExpr//K-FilterExpr-61, EXPECTED_RESULT_GOT_ERROR
@@ -10406,20 +10406,20 @@
Expressions/SeqExpr/FilterExpr//K-FilterExpr-73, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/SeqExpr/FilterExpr//K-FilterExpr-74, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/SeqExpr/FilterExpr//K-FilterExpr-75, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/SeqExpr/FilterExpr//K-FilterExpr-76, EXPECTED_ERROR_GOT_RESULT
-Expressions/SeqExpr/FilterExpr//K-FilterExpr-77, EXPECTED_ERROR_GOT_RESULT
+Expressions/SeqExpr/FilterExpr//K-FilterExpr-76, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/SeqExpr/FilterExpr//K-FilterExpr-77, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/SeqExpr/FilterExpr//K-FilterExpr-78, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/SeqExpr/FilterExpr//K-FilterExpr-79, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/SeqExpr/FilterExpr//K-FilterExpr-8, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/SeqExpr/FilterExpr//K-FilterExpr-80, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/SeqExpr/FilterExpr//K-FilterExpr-81, EXPECTED_RESULT_GOT_ERROR
-Expressions/SeqExpr/FilterExpr//K-FilterExpr-82, EXPECTED_ERROR_GOT_RESULT
+Expressions/SeqExpr/FilterExpr//K-FilterExpr-82, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/SeqExpr/FilterExpr//K-FilterExpr-83, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
-Expressions/SeqExpr/FilterExpr//K-FilterExpr-84, EXPECTED_ERROR_GOT_RESULT
-Expressions/SeqExpr/FilterExpr//K-FilterExpr-85, EXPECTED_ERROR_GOT_RESULT
+Expressions/SeqExpr/FilterExpr//K-FilterExpr-84, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/SeqExpr/FilterExpr//K-FilterExpr-85, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/SeqExpr/FilterExpr//K-FilterExpr-86, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/SeqExpr/FilterExpr//K-FilterExpr-87, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/SeqExpr/FilterExpr//K-FilterExpr-88, EXPECTED_ERROR_GOT_RESULT
+Expressions/SeqExpr/FilterExpr//K-FilterExpr-88, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/SeqExpr/FilterExpr//K-FilterExpr-89, EXPECTED_RESULT_GOT_ERROR
Expressions/SeqExpr/FilterExpr//K-FilterExpr-9, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/SeqExpr/FilterExpr//K-FilterExpr-90, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
@@ -10533,8 +10533,8 @@
exprSeqTypes/ExtensionExpression//K2-ExtensionExpression-7, EXPECTED_ERROR_GOT_SAME_ERROR
exprSeqTypes/ExtensionExpression//K2-ExtensionExpression-8, EXPECTED_ERROR_GOT_SAME_ERROR
exprSeqTypes/ExtensionExpression//K2-ExtensionExpression-9, EXPECTED_ERROR_GOT_SAME_ERROR
-exprSeqTypes/PrologExpr/BaseURIProlog//K2-BaseURIProlog-1, EXPECTED_ERROR_GOT_RESULT
-exprSeqTypes/PrologExpr/BaseURIProlog//K2-BaseURIProlog-2, EXPECTED_ERROR_GOT_RESULT
+exprSeqTypes/PrologExpr/BaseURIProlog//K2-BaseURIProlog-1, EXPECTED_RESULT_GOT_SAME_RESULT
+exprSeqTypes/PrologExpr/BaseURIProlog//K2-BaseURIProlog-2, EXPECTED_RESULT_GOT_SAME_RESULT
exprSeqTypes/PrologExpr/BaseURIProlog//K2-BaseURIProlog-3, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
exprSeqTypes/PrologExpr/BaseURIProlog//K2-BaseURIProlog-4, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
exprSeqTypes/PrologExpr/BaseURIProlog//K2-BaseURIProlog-5, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
@@ -10579,7 +10579,7 @@
exprSeqTypes/PrologExpr/FunctionProlog//K2-FunctionProlog-13, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
exprSeqTypes/PrologExpr/FunctionProlog//K2-FunctionProlog-14, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
exprSeqTypes/PrologExpr/FunctionProlog//K2-FunctionProlog-15, EXPECTED_RESULT_GOT_FAILURE
-exprSeqTypes/PrologExpr/FunctionProlog//K2-FunctionProlog-16, EXPECTED_ERROR_GOT_RESULT
+exprSeqTypes/PrologExpr/FunctionProlog//K2-FunctionProlog-16, EXPECTED_RESULT_GOT_SAME_RESULT
exprSeqTypes/PrologExpr/FunctionProlog//K2-FunctionProlog-17, EXPECTED_RESULT_GOT_ERROR
exprSeqTypes/PrologExpr/FunctionProlog//K2-FunctionProlog-18, EXPECTED_RESULT_GOT_ERROR
exprSeqTypes/PrologExpr/FunctionProlog//K2-FunctionProlog-19, EXPECTED_RESULT_GOT_ERROR
@@ -10630,7 +10630,7 @@
exprSeqTypes/PrologExpr/NamespaceProlog//K2-NamespaceProlog-8, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
exprSeqTypes/PrologExpr/NamespaceProlog//K2-NamespaceProlog-9, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
exprSeqTypes/PrologExpr/VariableProlog/ExternalVariablesWith//K2-ExternalVariablesWith-1, EXPECTED_ERROR_GOT_RESULT
-exprSeqTypes/PrologExpr/VariableProlog/ExternalVariablesWith//K2-ExternalVariablesWith-10, EXPECTED_ERROR_GOT_RESULT
+exprSeqTypes/PrologExpr/VariableProlog/ExternalVariablesWith//K2-ExternalVariablesWith-10, EXPECTED_RESULT_GOT_SAME_RESULT
exprSeqTypes/PrologExpr/VariableProlog/ExternalVariablesWith//K2-ExternalVariablesWith-11, EXPECTED_ERROR_GOT_SAME_ERROR
exprSeqTypes/PrologExpr/VariableProlog/ExternalVariablesWith//K2-ExternalVariablesWith-12, EXPECTED_ERROR_GOT_FAILURE
exprSeqTypes/PrologExpr/VariableProlog/ExternalVariablesWith//K2-ExternalVariablesWith-13, EXPECTED_ERROR_GOT_FAILURE
@@ -10655,7 +10655,7 @@
exprSeqTypes/PrologExpr/VariableProlog/ExternalVariablesWith//K2-ExternalVariablesWith-6, EXPECTED_ERROR_GOT_RESULT
exprSeqTypes/PrologExpr/VariableProlog/ExternalVariablesWith//K2-ExternalVariablesWith-7, EXPECTED_ERROR_GOT_FAILURE
exprSeqTypes/PrologExpr/VariableProlog/ExternalVariablesWith//K2-ExternalVariablesWith-8, EXPECTED_ERROR_GOT_FAILURE
-exprSeqTypes/PrologExpr/VariableProlog/ExternalVariablesWith//K2-ExternalVariablesWith-9, EXPECTED_ERROR_GOT_RESULT
+exprSeqTypes/PrologExpr/VariableProlog/ExternalVariablesWith//K2-ExternalVariablesWith-9, EXPECTED_RESULT_GOT_SAME_RESULT
exprSeqTypes/PrologExpr/VariableProlog/ExternalVariablesWithout//K2-ExternalVariablesWithout-1, EXPECTED_ERROR_GOT_RESULT
exprSeqTypes/PrologExpr/VariableProlog/ExternalVariablesWithout//K2-ExternalVariablesWithout-10, EXPECTED_RESULT_GOT_ERROR
exprSeqTypes/PrologExpr/VariableProlog/ExternalVariablesWithout//K2-ExternalVariablesWithout-11, EXPECTED_RESULT_GOT_ERROR
@@ -10674,13 +10674,13 @@
exprSeqTypes/PrologExpr/VariableProlog/ExternalVariablesWithout//K2-ExternalVariablesWithout-3, EXPECTED_ERROR_GOT_RESULT
exprSeqTypes/PrologExpr/VariableProlog/ExternalVariablesWithout//K2-ExternalVariablesWithout-4, EXPECTED_ERROR_GOT_FAILURE
exprSeqTypes/PrologExpr/VariableProlog/ExternalVariablesWithout//K2-ExternalVariablesWithout-5, EXPECTED_ERROR_GOT_FAILURE
-exprSeqTypes/PrologExpr/VariableProlog/ExternalVariablesWithout//K2-ExternalVariablesWithout-6, EXPECTED_ERROR_GOT_RESULT
-exprSeqTypes/PrologExpr/VariableProlog/ExternalVariablesWithout//K2-ExternalVariablesWithout-7, EXPECTED_ERROR_GOT_RESULT
+exprSeqTypes/PrologExpr/VariableProlog/ExternalVariablesWithout//K2-ExternalVariablesWithout-6, EXPECTED_RESULT_GOT_SAME_RESULT
+exprSeqTypes/PrologExpr/VariableProlog/ExternalVariablesWithout//K2-ExternalVariablesWithout-7, EXPECTED_RESULT_GOT_SAME_RESULT
exprSeqTypes/PrologExpr/VariableProlog/ExternalVariablesWithout//K2-ExternalVariablesWithout-8, EXPECTED_RESULT_GOT_FAILURE
exprSeqTypes/PrologExpr/VariableProlog/ExternalVariablesWithout//K2-ExternalVariablesWithout-9, EXPECTED_RESULT_GOT_FAILURE
exprSeqTypes/PrologExpr/VariableProlog/InternalVariablesWithout//K2-InternalVariablesWithout-1, EXPECTED_ERROR_GOT_FAILURE
exprSeqTypes/PrologExpr/VariableProlog/InternalVariablesWithout//K2-InternalVariablesWithout-10, EXPECTED_RESULT_GOT_ERROR
-exprSeqTypes/PrologExpr/VariableProlog/InternalVariablesWithout//K2-InternalVariablesWithout-11, EXPECTED_ERROR_GOT_RESULT
+exprSeqTypes/PrologExpr/VariableProlog/InternalVariablesWithout//K2-InternalVariablesWithout-11, EXPECTED_RESULT_GOT_SAME_RESULT
exprSeqTypes/PrologExpr/VariableProlog/InternalVariablesWithout//K2-InternalVariablesWithout-12, EXPECTED_ERROR_GOT_FAILURE
exprSeqTypes/PrologExpr/VariableProlog/InternalVariablesWithout//K2-InternalVariablesWithout-13, EXPECTED_RESULT_GOT_ERROR
exprSeqTypes/PrologExpr/VariableProlog/InternalVariablesWithout//K2-InternalVariablesWithout-14, EXPECTED_ERROR_GOT_FAILURE
@@ -10818,7 +10818,7 @@
exprSeqTypes/SeqExprCast//K2-SeqExprCast-204, EXPECTED_ERROR_GOT_RESULT
exprSeqTypes/SeqExprCast//K2-SeqExprCast-205, EXPECTED_ERROR_GOT_RESULT
exprSeqTypes/SeqExprCast//K2-SeqExprCast-206, EXPECTED_ERROR_GOT_RESULT
-exprSeqTypes/SeqExprCast//K2-SeqExprCast-207, EXPECTED_ERROR_GOT_RESULT
+exprSeqTypes/SeqExprCast//K2-SeqExprCast-207, EXPECTED_RESULT_GOT_SAME_RESULT
exprSeqTypes/SeqExprCast//K2-SeqExprCast-208, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
exprSeqTypes/SeqExprCast//K2-SeqExprCast-209, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
exprSeqTypes/SeqExprCast//K2-SeqExprCast-21, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -10832,7 +10832,7 @@
exprSeqTypes/SeqExprCast//K2-SeqExprCast-217, EXPECTED_ERROR_GOT_SAME_ERROR
exprSeqTypes/SeqExprCast//K2-SeqExprCast-218, EXPECTED_ERROR_GOT_SAME_ERROR
exprSeqTypes/SeqExprCast//K2-SeqExprCast-219, EXPECTED_ERROR_GOT_SAME_ERROR
-exprSeqTypes/SeqExprCast//K2-SeqExprCast-22, EXPECTED_ERROR_GOT_RESULT
+exprSeqTypes/SeqExprCast//K2-SeqExprCast-22, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
exprSeqTypes/SeqExprCast//K2-SeqExprCast-220, EXPECTED_ERROR_GOT_SAME_ERROR
exprSeqTypes/SeqExprCast//K2-SeqExprCast-221, EXPECTED_RESULT_GOT_SAME_RESULT
exprSeqTypes/SeqExprCast//K2-SeqExprCast-222, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -11056,7 +11056,7 @@
exprSeqTypes/SeqExprCast//K2-SeqExprCast-419, EXPECTED_RESULT_GOT_SAME_RESULT
exprSeqTypes/SeqExprCast//K2-SeqExprCast-42, EXPECTED_RESULT_GOT_SAME_RESULT
exprSeqTypes/SeqExprCast//K2-SeqExprCast-420, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-exprSeqTypes/SeqExprCast//K2-SeqExprCast-421, EXPECTED_ERROR_GOT_RESULT
+exprSeqTypes/SeqExprCast//K2-SeqExprCast-421, EXPECTED_RESULT_GOT_SAME_RESULT
exprSeqTypes/SeqExprCast//K2-SeqExprCast-422, EXPECTED_ERROR_GOT_RESULT
exprSeqTypes/SeqExprCast//K2-SeqExprCast-423, EXPECTED_ERROR_GOT_RESULT
exprSeqTypes/SeqExprCast//K2-SeqExprCast-424, EXPECTED_ERROR_GOT_RESULT
@@ -11361,7 +11361,7 @@
FLWORExpr/ForExpr/ForExprPositionalVar//K2-ForExprPositionalVar-4, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
FLWORExpr/ForExpr/ForExprWith//K2-ForExprWith-1, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
FLWORExpr/ForExpr/ForExprWithout//K2-ForExprWithout-1, EXPECTED_ERROR_GOT_SAME_ERROR
-FLWORExpr/ForExpr/ForExprWithout//K2-ForExprWithout-10, EXPECTED_ERROR_GOT_RESULT
+FLWORExpr/ForExpr/ForExprWithout//K2-ForExprWithout-10, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
FLWORExpr/ForExpr/ForExprWithout//K2-ForExprWithout-11, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
FLWORExpr/ForExpr/ForExprWithout//K2-ForExprWithout-12, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
FLWORExpr/ForExpr/ForExprWithout//K2-ForExprWithout-13, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -11415,7 +11415,7 @@
FLWORExpr/LetExpr/LetExprWithout//K2-LetExprWithout-16, EXPECTED_RESULT_GOT_ERROR
FLWORExpr/LetExpr/LetExprWithout//K2-LetExprWithout-17, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
FLWORExpr/LetExpr/LetExprWithout//K2-LetExprWithout-18, EXPECTED_RESULT_GOT_ERROR
-FLWORExpr/LetExpr/LetExprWithout//K2-LetExprWithout-19, EXPECTED_ERROR_GOT_RESULT
+FLWORExpr/LetExpr/LetExprWithout//K2-LetExprWithout-19, EXPECTED_RESULT_GOT_SAME_RESULT
FLWORExpr/LetExpr/LetExprWithout//K2-LetExprWithout-2, EXPECTED_RESULT_GOT_ERROR
FLWORExpr/LetExpr/LetExprWithout//K2-LetExprWithout-20, EXPECTED_RESULT_GOT_FAILURE
FLWORExpr/LetExpr/LetExprWithout//K2-LetExprWithout-21, EXPECTED_RESULT_GOT_FAILURE
@@ -11427,7 +11427,7 @@
FLWORExpr/LetExpr/LetExprWithout//K2-LetExprWithout-3, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
FLWORExpr/LetExpr/LetExprWithout//K2-LetExprWithout-4, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
FLWORExpr/LetExpr/LetExprWithout//K2-LetExprWithout-5, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
-FLWORExpr/LetExpr/LetExprWithout//K2-LetExprWithout-6, EXPECTED_ERROR_GOT_RESULT
+FLWORExpr/LetExpr/LetExprWithout//K2-LetExprWithout-6, EXPECTED_RESULT_GOT_SAME_RESULT
FLWORExpr/LetExpr/LetExprWithout//K2-LetExprWithout-7, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
FLWORExpr/LetExpr/LetExprWithout//K2-LetExprWithout-8, EXPECTED_ERROR_GOT_SAME_ERROR
FLWORExpr/LetExpr/LetExprWithout//K2-LetExprWithout-9, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
@@ -11441,29 +11441,29 @@
FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-16, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-17, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-18, EXPECTED_RESULT_GOT_SAME_RESULT
-FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-19, EXPECTED_ERROR_GOT_RESULT
+FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-19, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-2, EXPECTED_ERROR_GOT_RESULT
-FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-20, EXPECTED_ERROR_GOT_RESULT
+FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-20, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-21, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-22, EXPECTED_ERROR_GOT_RESULT
-FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-23, EXPECTED_ERROR_GOT_RESULT
-FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-24, EXPECTED_ERROR_GOT_RESULT
-FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-25, EXPECTED_ERROR_GOT_RESULT
-FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-26, EXPECTED_ERROR_GOT_RESULT
-FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-27, EXPECTED_ERROR_GOT_RESULT
-FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-28, EXPECTED_ERROR_GOT_RESULT
-FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-29, EXPECTED_ERROR_GOT_RESULT
+FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-22, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-23, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-24, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-25, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-26, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-27, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-28, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-29, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-3, EXPECTED_ERROR_GOT_RESULT
-FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-30, EXPECTED_ERROR_GOT_RESULT
-FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-31, EXPECTED_ERROR_GOT_RESULT
-FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-32, EXPECTED_ERROR_GOT_RESULT
-FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-33, EXPECTED_ERROR_GOT_RESULT
-FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-34, EXPECTED_ERROR_GOT_RESULT
-FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-35, EXPECTED_ERROR_GOT_RESULT
-FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-36, EXPECTED_ERROR_GOT_RESULT
-FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-37, EXPECTED_ERROR_GOT_RESULT
+FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-30, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-31, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-32, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-33, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-34, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-35, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-36, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-37, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-38, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-39, EXPECTED_ERROR_GOT_RESULT
+FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-39, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-4, EXPECTED_ERROR_GOT_RESULT
FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-40, EXPECTED_ERROR_GOT_RESULT
FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-41, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
@@ -11478,8 +11478,8 @@
FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-5, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-6, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-7, EXPECTED_ERROR_GOT_SAME_ERROR
-FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-8, EXPECTED_ERROR_GOT_RESULT
-FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-9, EXPECTED_ERROR_GOT_RESULT
+FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-8, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-9, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
FLWORExpr/ReturnExpr//K2-ReturnExpr-1, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
FLWORExpr/WhereExpr//K2-WhereExpr-1, EXPECTED_ERROR_GOT_SAME_ERROR
FLWORExpr/WhereExpr//K2-WhereExpr-2, EXPECTED_ERROR_GOT_SAME_ERROR
@@ -11897,11 +11897,11 @@
Functions/AllStringFunc/AssDisassStringFunc/CodepointToStringFunc//fn-codepoints-to-string1args-4, EXPECTED_ERROR_GOT_SAME_ERROR
Functions/AllStringFunc/AssDisassStringFunc/CodepointToStringFunc//K-CodepointToStringFunc-1, EXPECTED_ERROR_GOT_SAME_ERROR
Functions/AllStringFunc/AssDisassStringFunc/CodepointToStringFunc//K-CodepointToStringFunc-10, EXPECTED_RESULT_GOT_SAME_RESULT
-Functions/AllStringFunc/AssDisassStringFunc/CodepointToStringFunc//K-CodepointToStringFunc-11, EXPECTED_ERROR_GOT_RESULT
-Functions/AllStringFunc/AssDisassStringFunc/CodepointToStringFunc//K-CodepointToStringFunc-12, EXPECTED_ERROR_GOT_RESULT
+Functions/AllStringFunc/AssDisassStringFunc/CodepointToStringFunc//K-CodepointToStringFunc-11, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Functions/AllStringFunc/AssDisassStringFunc/CodepointToStringFunc//K-CodepointToStringFunc-12, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Functions/AllStringFunc/AssDisassStringFunc/CodepointToStringFunc//K-CodepointToStringFunc-13, EXPECTED_RESULT_GOT_SAME_RESULT
-Functions/AllStringFunc/AssDisassStringFunc/CodepointToStringFunc//K-CodepointToStringFunc-14, EXPECTED_ERROR_GOT_RESULT
-Functions/AllStringFunc/AssDisassStringFunc/CodepointToStringFunc//K-CodepointToStringFunc-15, EXPECTED_ERROR_GOT_RESULT
+Functions/AllStringFunc/AssDisassStringFunc/CodepointToStringFunc//K-CodepointToStringFunc-14, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Functions/AllStringFunc/AssDisassStringFunc/CodepointToStringFunc//K-CodepointToStringFunc-15, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Functions/AllStringFunc/AssDisassStringFunc/CodepointToStringFunc//K-CodepointToStringFunc-16, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/AllStringFunc/AssDisassStringFunc/CodepointToStringFunc//K-CodepointToStringFunc-17, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/AllStringFunc/AssDisassStringFunc/CodepointToStringFunc//K-CodepointToStringFunc-18, EXPECTED_RESULT_GOT_ERROR
@@ -11922,7 +11922,7 @@
Functions/AllStringFunc/AssDisassStringFunc/CodepointToStringFunc//K-CodepointToStringFunc-5, EXPECTED_ERROR_GOT_RESULT
Functions/AllStringFunc/AssDisassStringFunc/CodepointToStringFunc//K-CodepointToStringFunc-6, EXPECTED_ERROR_GOT_SAME_ERROR
Functions/AllStringFunc/AssDisassStringFunc/CodepointToStringFunc//K-CodepointToStringFunc-7, EXPECTED_ERROR_GOT_FAILURE
-Functions/AllStringFunc/AssDisassStringFunc/CodepointToStringFunc//K-CodepointToStringFunc-8, EXPECTED_ERROR_GOT_RESULT
+Functions/AllStringFunc/AssDisassStringFunc/CodepointToStringFunc//K-CodepointToStringFunc-8, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Functions/AllStringFunc/AssDisassStringFunc/CodepointToStringFunc//K-CodepointToStringFunc-9, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/AllStringFunc/AssDisassStringFunc/StringToCodepointFunc//fn-string-to-codepoints-1, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/AllStringFunc/AssDisassStringFunc/StringToCodepointFunc//fn-string-to-codepoints-10, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -12029,7 +12029,7 @@
Functions/AllStringFunc/CompStringFunc/CompareFunc//K-compareFunc-12, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/AllStringFunc/CompStringFunc/CompareFunc//K-compareFunc-13, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/AllStringFunc/CompStringFunc/CompareFunc//K-compareFunc-14, EXPECTED_RESULT_GOT_SAME_RESULT
-Functions/AllStringFunc/CompStringFunc/CompareFunc//K-compareFunc-15, EXPECTED_ERROR_GOT_RESULT
+Functions/AllStringFunc/CompStringFunc/CompareFunc//K-compareFunc-15, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/AllStringFunc/CompStringFunc/CompareFunc//K-compareFunc-2, EXPECTED_ERROR_GOT_SAME_ERROR
Functions/AllStringFunc/CompStringFunc/CompareFunc//K-compareFunc-3, EXPECTED_ERROR_GOT_SAME_ERROR
Functions/AllStringFunc/CompStringFunc/CompareFunc//K-compareFunc-4, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -13117,7 +13117,7 @@
Functions/ContextFunc/ContextCurrentDatetimeFunc//fn-current-dateTime-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Functions/ContextFunc/ContextCurrentDatetimeFunc//fn-current-dateTime-20, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/ContextFunc/ContextCurrentDatetimeFunc//fn-current-dateTime-21, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Functions/ContextFunc/ContextCurrentDatetimeFunc//fn-current-dateTime-22, EXPECTED_RESULT_GOT_SAME_RESULT
+Functions/ContextFunc/ContextCurrentDatetimeFunc//fn-current-dateTime-22, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Functions/ContextFunc/ContextCurrentDatetimeFunc//fn-current-dateTime-23, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Functions/ContextFunc/ContextCurrentDatetimeFunc//fn-current-dateTime-24, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Functions/ContextFunc/ContextCurrentDatetimeFunc//fn-current-dateTime-3, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
@@ -13183,15 +13183,15 @@
Functions/ContextFunc/ContextImplicitTimezoneFunc//K-ContextImplicitTimezoneFunc-2, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/ContextFunc/ContextImplicitTimezoneFunc//K-ContextImplicitTimezoneFunc-3, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/ContextFunc/ContextLastFunc//K-ContextLastFunc-1, EXPECTED_ERROR_GOT_FAILURE
-Functions/ContextFunc/ContextLastFunc//K-ContextLastFunc-10, EXPECTED_ERROR_GOT_RESULT
+Functions/ContextFunc/ContextLastFunc//K-ContextLastFunc-10, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Functions/ContextFunc/ContextLastFunc//K-ContextLastFunc-11, EXPECTED_RESULT_GOT_ERROR
Functions/ContextFunc/ContextLastFunc//K-ContextLastFunc-12, EXPECTED_RESULT_GOT_ERROR
Functions/ContextFunc/ContextLastFunc//K-ContextLastFunc-13, EXPECTED_RESULT_GOT_ERROR
Functions/ContextFunc/ContextLastFunc//K-ContextLastFunc-14, EXPECTED_RESULT_GOT_ERROR
-Functions/ContextFunc/ContextLastFunc//K-ContextLastFunc-15, EXPECTED_ERROR_GOT_RESULT
-Functions/ContextFunc/ContextLastFunc//K-ContextLastFunc-16, EXPECTED_ERROR_GOT_RESULT
-Functions/ContextFunc/ContextLastFunc//K-ContextLastFunc-17, EXPECTED_ERROR_GOT_RESULT
-Functions/ContextFunc/ContextLastFunc//K-ContextLastFunc-18, EXPECTED_ERROR_GOT_RESULT
+Functions/ContextFunc/ContextLastFunc//K-ContextLastFunc-15, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Functions/ContextFunc/ContextLastFunc//K-ContextLastFunc-16, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Functions/ContextFunc/ContextLastFunc//K-ContextLastFunc-17, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Functions/ContextFunc/ContextLastFunc//K-ContextLastFunc-18, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Functions/ContextFunc/ContextLastFunc//K-ContextLastFunc-19, EXPECTED_RESULT_GOT_ERROR
Functions/ContextFunc/ContextLastFunc//K-ContextLastFunc-2, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/ContextFunc/ContextLastFunc//K-ContextLastFunc-20, EXPECTED_RESULT_GOT_ERROR
@@ -13208,9 +13208,9 @@
Functions/ContextFunc/ContextLastFunc//K-ContextLastFunc-4, EXPECTED_RESULT_GOT_ERROR
Functions/ContextFunc/ContextLastFunc//K-ContextLastFunc-5, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/ContextFunc/ContextLastFunc//K-ContextLastFunc-6, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Functions/ContextFunc/ContextLastFunc//K-ContextLastFunc-7, EXPECTED_ERROR_GOT_RESULT
-Functions/ContextFunc/ContextLastFunc//K-ContextLastFunc-8, EXPECTED_ERROR_GOT_RESULT
-Functions/ContextFunc/ContextLastFunc//K-ContextLastFunc-9, EXPECTED_ERROR_GOT_RESULT
+Functions/ContextFunc/ContextLastFunc//K-ContextLastFunc-7, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Functions/ContextFunc/ContextLastFunc//K-ContextLastFunc-8, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Functions/ContextFunc/ContextLastFunc//K-ContextLastFunc-9, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Functions/ContextFunc/ContextLastFunc//last-1, EXPECTED_RESULT_GOT_FAILURE
Functions/ContextFunc/ContextLastFunc//last-10, EXPECTED_RESULT_GOT_FAILURE
Functions/ContextFunc/ContextLastFunc//last-11, EXPECTED_RESULT_GOT_FAILURE
@@ -14389,7 +14389,7 @@
Functions/NodeSeqFunc/SeqDocAvailableFunc//fn-doc-available-5, EXPECTED_RESULT_GOT_ERROR
Functions/NodeSeqFunc/SeqDocAvailableFunc//fn-doc-available-6, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/NodeSeqFunc/SeqDocAvailableFunc//fn-doc-available-7, EXPECTED_RESULT_GOT_SAME_RESULT
-Functions/NodeSeqFunc/SeqDocAvailableFunc//K2-SeqDocAvailableFunc-1, EXPECTED_ERROR_GOT_RESULT
+Functions/NodeSeqFunc/SeqDocAvailableFunc//K2-SeqDocAvailableFunc-1, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/NodeSeqFunc/SeqDocFunc//fn-doc-1, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
Functions/NodeSeqFunc/SeqDocFunc//fn-doc-15, EXPECTED_RESULT_GOT_ERROR
Functions/NodeSeqFunc/SeqDocFunc//fn-doc-16, EXPECTED_RESULT_GOT_ERROR
@@ -14767,15 +14767,15 @@
Functions/NumericFunc/FloorFunc//K2-FloorFunc-9, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/NumericFunc/RoundEvenFunc//fn-round-half-to-even-1, EXPECTED_RESULT_GOT_FAILURE
Functions/NumericFunc/RoundEvenFunc//fn-round-half-to-even-2, EXPECTED_RESULT_GOT_FAILURE
-Functions/NumericFunc/RoundEvenFunc//fn-round-half-to-evendbl1args-1, EXPECTED_ERROR_GOT_RESULT
+Functions/NumericFunc/RoundEvenFunc//fn-round-half-to-evendbl1args-1, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Functions/NumericFunc/RoundEvenFunc//fn-round-half-to-evendbl1args-2, EXPECTED_RESULT_GOT_SAME_RESULT
-Functions/NumericFunc/RoundEvenFunc//fn-round-half-to-evendbl1args-3, EXPECTED_ERROR_GOT_RESULT
+Functions/NumericFunc/RoundEvenFunc//fn-round-half-to-evendbl1args-3, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Functions/NumericFunc/RoundEvenFunc//fn-round-half-to-evendec1args-1, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/NumericFunc/RoundEvenFunc//fn-round-half-to-evendec1args-2, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/NumericFunc/RoundEvenFunc//fn-round-half-to-evendec1args-3, EXPECTED_RESULT_GOT_SAME_RESULT
-Functions/NumericFunc/RoundEvenFunc//fn-round-half-to-evenflt1args-1, EXPECTED_ERROR_GOT_RESULT
+Functions/NumericFunc/RoundEvenFunc//fn-round-half-to-evenflt1args-1, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/NumericFunc/RoundEvenFunc//fn-round-half-to-evenflt1args-2, EXPECTED_RESULT_GOT_SAME_RESULT
-Functions/NumericFunc/RoundEvenFunc//fn-round-half-to-evenflt1args-3, EXPECTED_ERROR_GOT_RESULT
+Functions/NumericFunc/RoundEvenFunc//fn-round-half-to-evenflt1args-3, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/NumericFunc/RoundEvenFunc//fn-round-half-to-evenint1args-1, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/NumericFunc/RoundEvenFunc//fn-round-half-to-evenint1args-2, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/NumericFunc/RoundEvenFunc//fn-round-half-to-evenint1args-3, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -15324,7 +15324,7 @@
Functions/SeqFunc/AggregateSeqFunc/SeqAVGFunc//fn-avgflt1args-1, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/SeqFunc/AggregateSeqFunc/SeqAVGFunc//fn-avgflt1args-2, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/SeqFunc/AggregateSeqFunc/SeqAVGFunc//fn-avgflt1args-3, EXPECTED_RESULT_GOT_SAME_RESULT
-Functions/SeqFunc/AggregateSeqFunc/SeqAVGFunc//fn-avgflt2args-1, EXPECTED_ERROR_GOT_RESULT
+Functions/SeqFunc/AggregateSeqFunc/SeqAVGFunc//fn-avgflt2args-1, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/SeqFunc/AggregateSeqFunc/SeqAVGFunc//fn-avgflt2args-2, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/SeqFunc/AggregateSeqFunc/SeqAVGFunc//fn-avgflt2args-3, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/SeqFunc/AggregateSeqFunc/SeqAVGFunc//fn-avgflt2args-4, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -15691,7 +15691,7 @@
Functions/SeqFunc/AggregateSeqFunc/SeqMAXFunc//K2-SeqMAXFunc-3, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Functions/SeqFunc/AggregateSeqFunc/SeqMAXFunc//K2-SeqMAXFunc-4, EXPECTED_ERROR_GOT_RESULT
Functions/SeqFunc/AggregateSeqFunc/SeqMAXFunc//K2-SeqMAXFunc-5, EXPECTED_ERROR_GOT_SAME_ERROR
-Functions/SeqFunc/AggregateSeqFunc/SeqMAXFunc//K2-SeqMAXFunc-6, EXPECTED_ERROR_GOT_RESULT
+Functions/SeqFunc/AggregateSeqFunc/SeqMAXFunc//K2-SeqMAXFunc-6, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/SeqFunc/AggregateSeqFunc/SeqMAXFunc//K2-SeqMAXFunc-7, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/SeqFunc/AggregateSeqFunc/SeqMINFunc//fn-min-1, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
Functions/SeqFunc/AggregateSeqFunc/SeqMINFunc//fn-min-10, EXPECTED_RESULT_GOT_FAILURE
@@ -15868,7 +15868,7 @@
Functions/SeqFunc/AggregateSeqFunc/SeqMINFunc//K2-SeqMINFunc-2, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/SeqFunc/AggregateSeqFunc/SeqMINFunc//K2-SeqMINFunc-3, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Functions/SeqFunc/AggregateSeqFunc/SeqMINFunc//K2-SeqMINFunc-4, EXPECTED_ERROR_GOT_RESULT
-Functions/SeqFunc/AggregateSeqFunc/SeqMINFunc//K2-SeqMINFunc-5, EXPECTED_ERROR_GOT_RESULT
+Functions/SeqFunc/AggregateSeqFunc/SeqMINFunc//K2-SeqMINFunc-5, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/SeqFunc/AggregateSeqFunc/SeqMINFunc//K2-SeqMINFunc-6, EXPECTED_ERROR_GOT_SAME_ERROR
Functions/SeqFunc/AggregateSeqFunc/SeqMINFunc//K2-SeqMINFunc-7, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Functions/SeqFunc/AggregateSeqFunc/SeqMINFunc//K2-SeqMINFunc-8, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -15890,12 +15890,12 @@
Functions/SeqFunc/AggregateSeqFunc/SeqSUMFunc//fn-sumdbl2args-2, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/SeqFunc/AggregateSeqFunc/SeqSUMFunc//fn-sumdbl2args-3, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/SeqFunc/AggregateSeqFunc/SeqSUMFunc//fn-sumdbl2args-4, EXPECTED_RESULT_GOT_SAME_RESULT
-Functions/SeqFunc/AggregateSeqFunc/SeqSUMFunc//fn-sumdbl3args-1, EXPECTED_ERROR_GOT_RESULT
+Functions/SeqFunc/AggregateSeqFunc/SeqSUMFunc//fn-sumdbl3args-1, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/SeqFunc/AggregateSeqFunc/SeqSUMFunc//fn-sumdbl3args-2, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/SeqFunc/AggregateSeqFunc/SeqSUMFunc//fn-sumdbl3args-3, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/SeqFunc/AggregateSeqFunc/SeqSUMFunc//fn-sumdbl3args-4, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/SeqFunc/AggregateSeqFunc/SeqSUMFunc//fn-sumdbl3args-5, EXPECTED_RESULT_GOT_SAME_RESULT
-Functions/SeqFunc/AggregateSeqFunc/SeqSUMFunc//fn-sumdbl3args-6, EXPECTED_ERROR_GOT_RESULT
+Functions/SeqFunc/AggregateSeqFunc/SeqSUMFunc//fn-sumdbl3args-6, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/SeqFunc/AggregateSeqFunc/SeqSUMFunc//fn-sumdec1args-1, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/SeqFunc/AggregateSeqFunc/SeqSUMFunc//fn-sumdec1args-2, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/SeqFunc/AggregateSeqFunc/SeqSUMFunc//fn-sumdec1args-3, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -15914,12 +15914,12 @@
Functions/SeqFunc/AggregateSeqFunc/SeqSUMFunc//fn-sumflt2args-2, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/SeqFunc/AggregateSeqFunc/SeqSUMFunc//fn-sumflt2args-3, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/SeqFunc/AggregateSeqFunc/SeqSUMFunc//fn-sumflt2args-4, EXPECTED_RESULT_GOT_SAME_RESULT
-Functions/SeqFunc/AggregateSeqFunc/SeqSUMFunc//fn-sumflt3args-1, EXPECTED_ERROR_GOT_RESULT
+Functions/SeqFunc/AggregateSeqFunc/SeqSUMFunc//fn-sumflt3args-1, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/SeqFunc/AggregateSeqFunc/SeqSUMFunc//fn-sumflt3args-2, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/SeqFunc/AggregateSeqFunc/SeqSUMFunc//fn-sumflt3args-3, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/SeqFunc/AggregateSeqFunc/SeqSUMFunc//fn-sumflt3args-4, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/SeqFunc/AggregateSeqFunc/SeqSUMFunc//fn-sumflt3args-5, EXPECTED_RESULT_GOT_SAME_RESULT
-Functions/SeqFunc/AggregateSeqFunc/SeqSUMFunc//fn-sumflt3args-6, EXPECTED_ERROR_GOT_RESULT
+Functions/SeqFunc/AggregateSeqFunc/SeqSUMFunc//fn-sumflt3args-6, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/SeqFunc/AggregateSeqFunc/SeqSUMFunc//fn-sumint1args-1, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/SeqFunc/AggregateSeqFunc/SeqSUMFunc//fn-sumint1args-2, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/SeqFunc/AggregateSeqFunc/SeqSUMFunc//fn-sumint1args-3, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -16431,15 +16431,15 @@
Functions/SeqFunc/GeneralSeqFunc/SeqDistinctValuesFunc//K-SeqDistinctValuesFunc-11, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Functions/SeqFunc/GeneralSeqFunc/SeqDistinctValuesFunc//K-SeqDistinctValuesFunc-12, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Functions/SeqFunc/GeneralSeqFunc/SeqDistinctValuesFunc//K-SeqDistinctValuesFunc-13, EXPECTED_RESULT_GOT_ERROR
-Functions/SeqFunc/GeneralSeqFunc/SeqDistinctValuesFunc//K-SeqDistinctValuesFunc-14, EXPECTED_ERROR_GOT_RESULT
+Functions/SeqFunc/GeneralSeqFunc/SeqDistinctValuesFunc//K-SeqDistinctValuesFunc-14, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/SeqFunc/GeneralSeqFunc/SeqDistinctValuesFunc//K-SeqDistinctValuesFunc-15, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/SeqFunc/GeneralSeqFunc/SeqDistinctValuesFunc//K-SeqDistinctValuesFunc-2, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
Functions/SeqFunc/GeneralSeqFunc/SeqDistinctValuesFunc//K-SeqDistinctValuesFunc-3, EXPECTED_ERROR_GOT_SAME_ERROR
Functions/SeqFunc/GeneralSeqFunc/SeqDistinctValuesFunc//K-SeqDistinctValuesFunc-4, EXPECTED_RESULT_GOT_SAME_RESULT
-Functions/SeqFunc/GeneralSeqFunc/SeqDistinctValuesFunc//K-SeqDistinctValuesFunc-5, EXPECTED_ERROR_GOT_RESULT
+Functions/SeqFunc/GeneralSeqFunc/SeqDistinctValuesFunc//K-SeqDistinctValuesFunc-5, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/SeqFunc/GeneralSeqFunc/SeqDistinctValuesFunc//K-SeqDistinctValuesFunc-6, EXPECTED_RESULT_GOT_ERROR
-Functions/SeqFunc/GeneralSeqFunc/SeqDistinctValuesFunc//K-SeqDistinctValuesFunc-7, EXPECTED_ERROR_GOT_RESULT
-Functions/SeqFunc/GeneralSeqFunc/SeqDistinctValuesFunc//K-SeqDistinctValuesFunc-8, EXPECTED_ERROR_GOT_RESULT
+Functions/SeqFunc/GeneralSeqFunc/SeqDistinctValuesFunc//K-SeqDistinctValuesFunc-7, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Functions/SeqFunc/GeneralSeqFunc/SeqDistinctValuesFunc//K-SeqDistinctValuesFunc-8, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Functions/SeqFunc/GeneralSeqFunc/SeqDistinctValuesFunc//K-SeqDistinctValuesFunc-9, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Functions/SeqFunc/GeneralSeqFunc/SeqDistinctValuesFunc//K2-SeqDistinctValuesFunc-1, EXPECTED_ERROR_GOT_RESULT
Functions/SeqFunc/GeneralSeqFunc/SeqEmptyFunc//fn-emptydbl1args-1, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -16656,8 +16656,8 @@
Functions/SeqFunc/GeneralSeqFunc/SeqRemoveFunc//K-SeqRemoveFunc-11, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/SeqFunc/GeneralSeqFunc/SeqRemoveFunc//K-SeqRemoveFunc-12, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/SeqFunc/GeneralSeqFunc/SeqRemoveFunc//K-SeqRemoveFunc-13, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
-Functions/SeqFunc/GeneralSeqFunc/SeqRemoveFunc//K-SeqRemoveFunc-14, EXPECTED_ERROR_GOT_RESULT
-Functions/SeqFunc/GeneralSeqFunc/SeqRemoveFunc//K-SeqRemoveFunc-15, EXPECTED_ERROR_GOT_RESULT
+Functions/SeqFunc/GeneralSeqFunc/SeqRemoveFunc//K-SeqRemoveFunc-14, EXPECTED_RESULT_GOT_SAME_RESULT
+Functions/SeqFunc/GeneralSeqFunc/SeqRemoveFunc//K-SeqRemoveFunc-15, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/SeqFunc/GeneralSeqFunc/SeqRemoveFunc//K-SeqRemoveFunc-16, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
Functions/SeqFunc/GeneralSeqFunc/SeqRemoveFunc//K-SeqRemoveFunc-17, EXPECTED_ERROR_GOT_SAME_ERROR
Functions/SeqFunc/GeneralSeqFunc/SeqRemoveFunc//K-SeqRemoveFunc-18, EXPECTED_ERROR_GOT_SAME_ERROR
@@ -16670,7 +16670,7 @@
Functions/SeqFunc/GeneralSeqFunc/SeqRemoveFunc//K-SeqRemoveFunc-24, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Functions/SeqFunc/GeneralSeqFunc/SeqRemoveFunc//K-SeqRemoveFunc-3, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/SeqFunc/GeneralSeqFunc/SeqRemoveFunc//K-SeqRemoveFunc-4, EXPECTED_RESULT_GOT_SAME_RESULT
-Functions/SeqFunc/GeneralSeqFunc/SeqRemoveFunc//K-SeqRemoveFunc-5, EXPECTED_ERROR_GOT_RESULT
+Functions/SeqFunc/GeneralSeqFunc/SeqRemoveFunc//K-SeqRemoveFunc-5, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/SeqFunc/GeneralSeqFunc/SeqRemoveFunc//K-SeqRemoveFunc-6, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/SeqFunc/GeneralSeqFunc/SeqRemoveFunc//K-SeqRemoveFunc-7, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/SeqFunc/GeneralSeqFunc/SeqRemoveFunc//K-SeqRemoveFunc-8, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -16728,10 +16728,10 @@
Functions/SeqFunc/GeneralSeqFunc/SeqReverseFunc//K-SeqReverseFunc-2, EXPECTED_ERROR_GOT_SAME_ERROR
Functions/SeqFunc/GeneralSeqFunc/SeqReverseFunc//K-SeqReverseFunc-20, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/SeqFunc/GeneralSeqFunc/SeqReverseFunc//K-SeqReverseFunc-21, EXPECTED_RESULT_GOT_SAME_RESULT
-Functions/SeqFunc/GeneralSeqFunc/SeqReverseFunc//K-SeqReverseFunc-3, EXPECTED_ERROR_GOT_RESULT
+Functions/SeqFunc/GeneralSeqFunc/SeqReverseFunc//K-SeqReverseFunc-3, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/SeqFunc/GeneralSeqFunc/SeqReverseFunc//K-SeqReverseFunc-4, EXPECTED_RESULT_GOT_SAME_RESULT
-Functions/SeqFunc/GeneralSeqFunc/SeqReverseFunc//K-SeqReverseFunc-5, EXPECTED_ERROR_GOT_RESULT
-Functions/SeqFunc/GeneralSeqFunc/SeqReverseFunc//K-SeqReverseFunc-6, EXPECTED_ERROR_GOT_RESULT
+Functions/SeqFunc/GeneralSeqFunc/SeqReverseFunc//K-SeqReverseFunc-5, EXPECTED_RESULT_GOT_SAME_RESULT
+Functions/SeqFunc/GeneralSeqFunc/SeqReverseFunc//K-SeqReverseFunc-6, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/SeqFunc/GeneralSeqFunc/SeqReverseFunc//K-SeqReverseFunc-7, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/SeqFunc/GeneralSeqFunc/SeqReverseFunc//K-SeqReverseFunc-8, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/SeqFunc/GeneralSeqFunc/SeqReverseFunc//K-SeqReverseFunc-9, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -16798,7 +16798,7 @@
Functions/SeqFunc/GeneralSeqFunc/SeqSubsequenceFunc//K-SeqSubsequenceFunc-37, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/SeqFunc/GeneralSeqFunc/SeqSubsequenceFunc//K-SeqSubsequenceFunc-38, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/SeqFunc/GeneralSeqFunc/SeqSubsequenceFunc//K-SeqSubsequenceFunc-39, EXPECTED_RESULT_GOT_SAME_RESULT
-Functions/SeqFunc/GeneralSeqFunc/SeqSubsequenceFunc//K-SeqSubsequenceFunc-4, EXPECTED_ERROR_GOT_RESULT
+Functions/SeqFunc/GeneralSeqFunc/SeqSubsequenceFunc//K-SeqSubsequenceFunc-4, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/SeqFunc/GeneralSeqFunc/SeqSubsequenceFunc//K-SeqSubsequenceFunc-40, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/SeqFunc/GeneralSeqFunc/SeqSubsequenceFunc//K-SeqSubsequenceFunc-41, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/SeqFunc/GeneralSeqFunc/SeqSubsequenceFunc//K-SeqSubsequenceFunc-42, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -16847,7 +16847,7 @@
Functions/SeqFunc/GeneralSeqFunc/SeqUnorderedFunc//K-SeqUnorderedFunc-3, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/SeqFunc/GeneralSeqFunc/SeqUnorderedFunc//K-SeqUnorderedFunc-4, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/SeqFunc/GeneralSeqFunc/SeqUnorderedFunc//K-SeqUnorderedFunc-5, EXPECTED_RESULT_GOT_SAME_RESULT
-Functions/SeqFunc/GeneralSeqFunc/SeqUnorderedFunc//K-SeqUnorderedFunc-6, EXPECTED_ERROR_GOT_RESULT
+Functions/SeqFunc/GeneralSeqFunc/SeqUnorderedFunc//K-SeqUnorderedFunc-6, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/SeqFunc/GeneralSeqFunc/SeqUnorderedFunc//K-SeqUnorderedFunc-7, EXPECTED_RESULT_GOT_ERROR
Functions/SeqFunc/GeneralSeqFunc/SeqUnorderedFunc//K-SeqUnorderedFunc-8, EXPECTED_ERROR_GOT_SAME_ERROR
Functions/SeqFunc/HeadTailFunc//head-001, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
@@ -17092,7 +17092,7 @@
Functions/TraceFunc//fn-trace-16, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/TraceFunc//fn-trace-17, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Functions/TraceFunc//fn-trace-18, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Functions/TraceFunc//fn-trace-19, EXPECTED_ERROR_GOT_RESULT
+Functions/TraceFunc//fn-trace-19, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/TraceFunc//fn-trace-2, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/TraceFunc//fn-trace-20, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/TraceFunc//fn-trace-21, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
@@ -17107,7 +17107,7 @@
Functions/TraceFunc//K-TraceFunc-2, EXPECTED_ERROR_GOT_SAME_ERROR
Functions/TraceFunc//K-TraceFunc-3, EXPECTED_ERROR_GOT_SAME_ERROR
Functions/TraceFunc//K-TraceFunc-4, EXPECTED_RESULT_GOT_SAME_RESULT
-Functions/TraceFunc//K-TraceFunc-5, EXPECTED_ERROR_GOT_RESULT
+Functions/TraceFunc//K-TraceFunc-5, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/TraceFunc//K-TraceFunc-6, EXPECTED_ERROR_GOT_SAME_ERROR
Functions/URIFunc/ResolveURIFunc//fn-resolve-uri-1, EXPECTED_RESULT_GOT_ERROR
Functions/URIFunc/ResolveURIFunc//fn-resolve-uri-10, EXPECTED_RESULT_GOT_ERROR
@@ -18433,7 +18433,7 @@
Operators/CompExpr/GenComprsn/GenCompEq//K2-GenCompEq-4, EXPECTED_RESULT_GOT_FAILURE
Operators/CompExpr/GenComprsn/GenCompEq//K2-GenCompEq-5, EXPECTED_RESULT_GOT_FAILURE
Operators/CompExpr/GenComprsn/GenCompEq//K2-GenCompEq-6, EXPECTED_RESULT_GOT_FAILURE
-Operators/CompExpr/GenComprsn/GenCompEq//K2-GenCompEq-7, EXPECTED_ERROR_GOT_RESULT
+Operators/CompExpr/GenComprsn/GenCompEq//K2-GenCompEq-7, EXPECTED_RESULT_GOT_SAME_RESULT
Operators/CompExpr/GenComprsn/GenCompEq//K2-GenCompEq-8, EXPECTED_ERROR_GOT_FAILURE
Operators/CompExpr/GenComprsn/GenCompLT//K2-GenCompLT-1, EXPECTED_RESULT_GOT_SAME_RESULT
Operators/CompExpr/GenComprsn/GenCompLT//K2-GenCompLT-2, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -18709,11 +18709,11 @@
Optional/Serialization//K2-Serialization-4, EXPECTED_ERROR_GOT_FAILURE
Optional/Serialization//K2-Serialization-5, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Optional/Serialization//K2-Serialization-6, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Optional/Serialization//K2-Serialization-7, EXPECTED_ERROR_GOT_RESULT
-Optional/Serialization//K2-Serialization-8, EXPECTED_ERROR_GOT_RESULT
+Optional/Serialization//K2-Serialization-7, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Optional/Serialization//K2-Serialization-8, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Optional/Serialization//K2-Serialization-9, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-OptionalFeatureErrors/CombinedErrorCodes//combined-errors-1, EXPECTED_ERROR_GOT_RESULT
-OptionalFeatureErrors/CombinedErrorCodes//combined-errors-2, EXPECTED_ERROR_GOT_RESULT
+OptionalFeatureErrors/CombinedErrorCodes//combined-errors-1, EXPECTED_RESULT_GOT_SAME_RESULT
+OptionalFeatureErrors/CombinedErrorCodes//combined-errors-2, EXPECTED_RESULT_GOT_SAME_RESULT
OptionalFeatureErrors/CombinedErrorCodes//combined-errors-3, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
OptionalFeatureErrors/CombinedErrorCodes//combined-errors-4, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
OptionalFeatureErrors/CombinedErrorCodes//K-CombinedErrorCodes-1, EXPECTED_ERROR_GOT_RESULT
@@ -18745,7 +18745,7 @@
PathExpr/Steps//K2-Steps-11, EXPECTED_ERROR_GOT_SAME_ERROR
PathExpr/Steps//K2-Steps-12, EXPECTED_ERROR_GOT_FAILURE
PathExpr/Steps//K2-Steps-13, EXPECTED_RESULT_GOT_SAME_RESULT
-PathExpr/Steps//K2-Steps-14, EXPECTED_ERROR_GOT_RESULT
+PathExpr/Steps//K2-Steps-14, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
PathExpr/Steps//K2-Steps-15, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
PathExpr/Steps//K2-Steps-16, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
PathExpr/Steps//K2-Steps-17, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
@@ -18853,14 +18853,14 @@
PathExpr/Steps/Axes//K2-Axes-52, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
PathExpr/Steps/Axes//K2-Axes-53, EXPECTED_ERROR_GOT_RESULT
PathExpr/Steps/Axes//K2-Axes-54, EXPECTED_ERROR_GOT_SAME_ERROR
-PathExpr/Steps/Axes//K2-Axes-55, EXPECTED_ERROR_GOT_RESULT
-PathExpr/Steps/Axes//K2-Axes-56, EXPECTED_ERROR_GOT_RESULT
+PathExpr/Steps/Axes//K2-Axes-55, EXPECTED_RESULT_GOT_SAME_RESULT
+PathExpr/Steps/Axes//K2-Axes-56, EXPECTED_RESULT_GOT_SAME_RESULT
PathExpr/Steps/Axes//K2-Axes-57, EXPECTED_RESULT_GOT_FAILURE
PathExpr/Steps/Axes//K2-Axes-58, EXPECTED_RESULT_GOT_FAILURE
PathExpr/Steps/Axes//K2-Axes-59, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
PathExpr/Steps/Axes//K2-Axes-6, EXPECTED_ERROR_GOT_SAME_ERROR
-PathExpr/Steps/Axes//K2-Axes-60, EXPECTED_ERROR_GOT_RESULT
-PathExpr/Steps/Axes//K2-Axes-61, EXPECTED_ERROR_GOT_RESULT
+PathExpr/Steps/Axes//K2-Axes-60, EXPECTED_RESULT_GOT_SAME_RESULT
+PathExpr/Steps/Axes//K2-Axes-61, EXPECTED_RESULT_GOT_SAME_RESULT
PathExpr/Steps/Axes//K2-Axes-62, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
PathExpr/Steps/Axes//K2-Axes-63, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
PathExpr/Steps/Axes//K2-Axes-64, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
@@ -18894,7 +18894,7 @@
PathExpr/Steps/Axes//K2-Axes-9, EXPECTED_ERROR_GOT_SAME_ERROR
PathExpr/Steps/Axes//K2-Axes-90, EXPECTED_ERROR_GOT_SAME_ERROR
PathExpr/Steps/Axes//K2-Axes-91, EXPECTED_ERROR_GOT_SAME_ERROR
-PathExpr/Steps/Axes//K2-Axes-92, EXPECTED_ERROR_GOT_RESULT
+PathExpr/Steps/Axes//K2-Axes-92, EXPECTED_RESULT_GOT_SAME_RESULT
PathExpr/Steps/Axes//K2-Axes-93, EXPECTED_ERROR_GOT_SAME_ERROR
PathExpr/Steps/Axes//K2-Axes-94, EXPECTED_ERROR_GOT_FAILURE
PathExpr/Steps/Axes//K2-Axes-95, EXPECTED_ERROR_GOT_SAME_ERROR
@@ -18945,28 +18945,28 @@
PathExpr/Steps/NodeTestSection/NameTest//K2-NameTest-46, EXPECTED_ERROR_GOT_SAME_ERROR
PathExpr/Steps/NodeTestSection/NameTest//K2-NameTest-47, EXPECTED_RESULT_GOT_FAILURE
PathExpr/Steps/NodeTestSection/NameTest//K2-NameTest-48, EXPECTED_RESULT_GOT_FAILURE
-PathExpr/Steps/NodeTestSection/NameTest//K2-NameTest-49, EXPECTED_ERROR_GOT_RESULT
+PathExpr/Steps/NodeTestSection/NameTest//K2-NameTest-49, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
PathExpr/Steps/NodeTestSection/NameTest//K2-NameTest-5, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
PathExpr/Steps/NodeTestSection/NameTest//K2-NameTest-50, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
-PathExpr/Steps/NodeTestSection/NameTest//K2-NameTest-51, EXPECTED_ERROR_GOT_RESULT
-PathExpr/Steps/NodeTestSection/NameTest//K2-NameTest-52, EXPECTED_ERROR_GOT_RESULT
-PathExpr/Steps/NodeTestSection/NameTest//K2-NameTest-53, EXPECTED_ERROR_GOT_RESULT
-PathExpr/Steps/NodeTestSection/NameTest//K2-NameTest-54, EXPECTED_ERROR_GOT_RESULT
-PathExpr/Steps/NodeTestSection/NameTest//K2-NameTest-55, EXPECTED_ERROR_GOT_RESULT
+PathExpr/Steps/NodeTestSection/NameTest//K2-NameTest-51, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+PathExpr/Steps/NodeTestSection/NameTest//K2-NameTest-52, EXPECTED_RESULT_GOT_SAME_RESULT
+PathExpr/Steps/NodeTestSection/NameTest//K2-NameTest-53, EXPECTED_RESULT_GOT_SAME_RESULT
+PathExpr/Steps/NodeTestSection/NameTest//K2-NameTest-54, EXPECTED_RESULT_GOT_SAME_RESULT
+PathExpr/Steps/NodeTestSection/NameTest//K2-NameTest-55, EXPECTED_RESULT_GOT_SAME_RESULT
PathExpr/Steps/NodeTestSection/NameTest//K2-NameTest-56, EXPECTED_ERROR_GOT_FAILURE
PathExpr/Steps/NodeTestSection/NameTest//K2-NameTest-57, EXPECTED_ERROR_GOT_FAILURE
PathExpr/Steps/NodeTestSection/NameTest//K2-NameTest-58, EXPECTED_ERROR_GOT_FAILURE
PathExpr/Steps/NodeTestSection/NameTest//K2-NameTest-59, EXPECTED_ERROR_GOT_FAILURE
PathExpr/Steps/NodeTestSection/NameTest//K2-NameTest-6, EXPECTED_ERROR_GOT_SAME_ERROR
PathExpr/Steps/NodeTestSection/NameTest//K2-NameTest-60, EXPECTED_ERROR_GOT_FAILURE
-PathExpr/Steps/NodeTestSection/NameTest//K2-NameTest-61, EXPECTED_ERROR_GOT_RESULT
-PathExpr/Steps/NodeTestSection/NameTest//K2-NameTest-62, EXPECTED_ERROR_GOT_RESULT
+PathExpr/Steps/NodeTestSection/NameTest//K2-NameTest-61, EXPECTED_RESULT_GOT_SAME_RESULT
+PathExpr/Steps/NodeTestSection/NameTest//K2-NameTest-62, EXPECTED_RESULT_GOT_SAME_RESULT
PathExpr/Steps/NodeTestSection/NameTest//K2-NameTest-63, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
PathExpr/Steps/NodeTestSection/NameTest//K2-NameTest-64, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
PathExpr/Steps/NodeTestSection/NameTest//K2-NameTest-65, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
PathExpr/Steps/NodeTestSection/NameTest//K2-NameTest-66, EXPECTED_ERROR_GOT_SAME_ERROR
PathExpr/Steps/NodeTestSection/NameTest//K2-NameTest-67, EXPECTED_ERROR_GOT_SAME_ERROR
-PathExpr/Steps/NodeTestSection/NameTest//K2-NameTest-68, EXPECTED_ERROR_GOT_RESULT
+PathExpr/Steps/NodeTestSection/NameTest//K2-NameTest-68, EXPECTED_RESULT_GOT_SAME_RESULT
PathExpr/Steps/NodeTestSection/NameTest//K2-NameTest-69, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
PathExpr/Steps/NodeTestSection/NameTest//K2-NameTest-7, EXPECTED_ERROR_GOT_SAME_ERROR
PathExpr/Steps/NodeTestSection/NameTest//K2-NameTest-70, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
@@ -18992,7 +18992,7 @@
PathExpr/Steps/NodeTestSection/NameTest//K2-NameTest-89, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
PathExpr/Steps/NodeTestSection/NameTest//K2-NameTest-9, EXPECTED_ERROR_GOT_SAME_ERROR
PathExpr/Steps/NodeTestSection/NameTest//K2-NameTest-90, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
-PathExpr/Steps/NodeTestSection/NodeTest//K2-NodeTest-1, EXPECTED_ERROR_GOT_RESULT
+PathExpr/Steps/NodeTestSection/NodeTest//K2-NodeTest-1, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
PathExpr/Steps/NodeTestSection/NodeTest//K2-NodeTest-10, EXPECTED_ERROR_GOT_SAME_ERROR
PathExpr/Steps/NodeTestSection/NodeTest//K2-NodeTest-11, EXPECTED_ERROR_GOT_SAME_ERROR
PathExpr/Steps/NodeTestSection/NodeTest//K2-NodeTest-12, EXPECTED_ERROR_GOT_SAME_ERROR
@@ -19005,7 +19005,7 @@
PathExpr/Steps/NodeTestSection/NodeTest//K2-NodeTest-19, EXPECTED_ERROR_GOT_FAILURE
PathExpr/Steps/NodeTestSection/NodeTest//K2-NodeTest-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
PathExpr/Steps/NodeTestSection/NodeTest//K2-NodeTest-20, EXPECTED_ERROR_GOT_FAILURE
-PathExpr/Steps/NodeTestSection/NodeTest//K2-NodeTest-21, EXPECTED_ERROR_GOT_RESULT
+PathExpr/Steps/NodeTestSection/NodeTest//K2-NodeTest-21, EXPECTED_RESULT_GOT_SAME_RESULT
PathExpr/Steps/NodeTestSection/NodeTest//K2-NodeTest-22, EXPECTED_ERROR_GOT_SAME_ERROR
PathExpr/Steps/NodeTestSection/NodeTest//K2-NodeTest-23, EXPECTED_ERROR_GOT_SAME_ERROR
PathExpr/Steps/NodeTestSection/NodeTest//K2-NodeTest-24, EXPECTED_ERROR_GOT_SAME_ERROR
@@ -19278,7 +19278,7 @@
SeqExpr/FilterExpr//K2-FilterExpr-1, EXPECTED_RESULT_GOT_FAILURE
SeqExpr/FilterExpr//K2-FilterExpr-2, EXPECTED_RESULT_GOT_FAILURE
SeqExpr/FilterExpr//K2-FilterExpr-3, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-SeqExpr/FilterExpr//K2-FilterExpr-4, EXPECTED_ERROR_GOT_RESULT
+SeqExpr/FilterExpr//K2-FilterExpr-4, EXPECTED_RESULT_GOT_SAME_RESULT
SeqExpr/FilterExpr//K2-FilterExpr-5, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
SeqExpr/FilterExpr//K2-FilterExpr-6, EXPECTED_RESULT_GOT_ERROR
SeqExpr/FilterExpr//K2-FilterExpr-7, EXPECTED_RESULT_GOT_FAILURE
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 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 @@
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);
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 void close() throws Exception {
+ // TODO add a close statement for the hyracks connection.
}
}
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();
+ }
+
+}
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 static XTestOptions getOptions() {
XTestOptions options = getDefaultTestOptions();
options.catalog = XQTS_CATALOG;
- options.previousTestResults = StringUtils.join(new String[] { "results", "xqts.txt" }, File.separator);
return options;
}
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/Json/Libraries/descendant_arrays.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/Json/Libraries/descendant_arrays.txt
new file mode 100644
index 0000000..4ce97f8
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/Json/Libraries/descendant_arrays.txt
@@ -0,0 +1,3 @@
+[1,2]
+[[{"foo":"bar","bar":"foo"}]]
+[{"foo":"bar","bar":"foo"}]
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/Json/Libraries/descendant_arrays2.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/Json/Libraries/descendant_arrays2.txt
new file mode 100644
index 0000000..69ce1ea
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/Json/Libraries/descendant_arrays2.txt
@@ -0,0 +1,4 @@
+[1,2]
+[[{"foo":"bar","bar":"foo"}],[1,2]]
+[{"foo":"bar","bar":"foo"}]
+[1,2]
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/Json/Libraries/flatten.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/Json/Libraries/flatten.txt
new file mode 100644
index 0000000..1674b85
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/Json/Libraries/flatten.txt
@@ -0,0 +1,9 @@
+{"foo":{"bar":[1,2]}}
+1
+2
+{"foo":"bar","bar":"foo"}
+3
+4
+true
+1
+null
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/Json/Functions/arithmetic1.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/Json/Functions/arithmetic1.xq
new file mode 100644
index 0000000..f071f44
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/Json/Functions/arithmetic1.xq
@@ -0,0 +1,19 @@
+(: 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. :)
+
+(: Changes to arithmetic operation semantics :)
+null + 1
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/Json/Functions/arithmetic2.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/Json/Functions/arithmetic2.xq
new file mode 100644
index 0000000..e006645
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/Json/Functions/arithmetic2.xq
@@ -0,0 +1,19 @@
+(: 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. :)
+
+(: Changes to arithmetic operation semantics :)
+null * 1
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/Json/Functions/arithmetic3.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/Json/Functions/arithmetic3.xq
new file mode 100644
index 0000000..d9554bd
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/Json/Functions/arithmetic3.xq
@@ -0,0 +1,19 @@
+(: 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. :)
+
+(: Changes to arithmetic operation semantics :)
+null div 1
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/Json/Functions/arithmetic4.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/Json/Functions/arithmetic4.xq
new file mode 100644
index 0000000..8c199eb
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/Json/Functions/arithmetic4.xq
@@ -0,0 +1,19 @@
+(: 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. :)
+
+(: Changes to arithmetic operation semantics :)
+null - 1
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/Json/Functions/arithmetic5.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/Json/Functions/arithmetic5.xq
new file mode 100644
index 0000000..a4f874f
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/Json/Functions/arithmetic5.xq
@@ -0,0 +1,19 @@
+(: 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. :)
+
+(: Changes to arithmetic operation semantics :)
+1 + null
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/Json/Functions/arithmetic6.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/Json/Functions/arithmetic6.xq
new file mode 100644
index 0000000..7be787f
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/Json/Functions/arithmetic6.xq
@@ -0,0 +1,19 @@
+(: 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. :)
+
+(: Changes to arithmetic operation semantics :)
+1 * null
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/Json/Functions/arithmetic7.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/Json/Functions/arithmetic7.xq
new file mode 100644
index 0000000..52928c4
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/Json/Functions/arithmetic7.xq
@@ -0,0 +1,19 @@
+(: 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. :)
+
+(: Changes to arithmetic operation semantics :)
+1 div null
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/Json/Functions/arithmetic8.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/Json/Functions/arithmetic8.xq
new file mode 100644
index 0000000..c85fcb6
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/Json/Functions/arithmetic8.xq
@@ -0,0 +1,19 @@
+(: 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. :)
+
+(: Changes to arithmetic operation semantics :)
+1 - null
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/Json/Libraries/descendant_arrays.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/Json/Libraries/descendant_arrays.xq
new file mode 100644
index 0000000..3f48494
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/Json/Libraries/descendant_arrays.xq
@@ -0,0 +1,24 @@
+(: 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. :)
+
+(: JSONiq libjn:descendant_arrays :)
+(
+ libjn:descendant-arrays(({ "foo" : { "bar" : [ 1, 2 ] } },
+ [ [ { "foo" : "bar", "bar" : "foo" } ] ],true(),
+ 1,
+ jn:null()))
+)
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/Json/Libraries/descendant_arrays2.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/Json/Libraries/descendant_arrays2.xq
new file mode 100644
index 0000000..17aedfc
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/Json/Libraries/descendant_arrays2.xq
@@ -0,0 +1,24 @@
+(: 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. :)
+
+(: JSONiq libjn:descendant_arrays :)
+(
+ libjn:descendant-arrays(({ "foo" : { "bar" : [ 1, 2 ] } },
+ [ [ { "foo" : "bar", "bar" : "foo" } ],[1,2] ],true(),
+ 1,
+ jn:null()))
+)
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/Json/Libraries/flatten.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/Json/Libraries/flatten.xq
new file mode 100644
index 0000000..98106c6
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/Json/Libraries/flatten.xq
@@ -0,0 +1,29 @@
+(: 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. :)
+
+(: JSONiq libjn:flatten :)
+(
+ libjn:flatten(
+ (
+ { "foo" : { "bar" : [ 1, 2 ] } },
+ [ 1, 2, [ { "foo" : "bar", "bar" : "foo" } ], 3, 4 ],
+ true(),
+ 1,
+ jn:null()
+ )
+)
+)
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/Json/Object/q17_object.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/Json/Object/q17_object.xq
new file mode 100644
index 0000000..77dcc2c
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/Json/Object/q17_object.xq
@@ -0,0 +1,20 @@
+(: 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. :)
+
+(: Json Object Query :)
+(: Issue VXQUERY-212 :)
+{| { "Captain" : "Kirk" , 123456 : "NUM"} , { "Captain" : "Soft"} |}
\ No newline at end of file
diff --git a/vxquery-xtest/src/test/resources/VXQueryCatalog.xml b/vxquery-xtest/src/test/resources/VXQueryCatalog.xml
index 0ac46f4..e8a3a43 100644
--- a/vxquery-xtest/src/test/resources/VXQueryCatalog.xml
+++ b/vxquery-xtest/src/test/resources/VXQueryCatalog.xml
@@ -50,297 +50,290 @@
<!ENTITY JsonObjectNavigationQueries SYSTEM "cat/JsonObjectNavigationQueries.xml">
<!ENTITY JsonArrayNavigationQueries SYSTEM "cat/JsonArrayNavigationQueries.xml">
<!ENTITY JsonParserQueries SYSTEM "cat/JsonParserQueries.xml">
+<!ENTITY LibrariesInJSONiq SYSTEM "cat/LibrariesInJSONiq.xml">
<!ENTITY TraceQuery SYSTEM "cat/TraceQuery.xml">
]>
-<test-suite xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- CatalogDesignDate="2014-04-01"
- version="0.0.1"
- SourceOffsetPath="./"
- ResultOffsetPath="ExpectedTestResults/"
- XQueryQueryOffsetPath="Queries/XQuery/"
- XQueryXQueryOffsetPath="Queries/XQueryX/"
- XQueryFileExtension=".xq"
- XQueryXFileExtension=".xqx"
- xsi:schemaLocation="http://www.w3.org/2005/02/query-test-XQTSCatalog XQTSCatalog.xsd">
- <test-suite-info>
- <title>VXQuery Test Suite</title>
- <description>
- Test Suite for VXQuery.
- </description>
- </test-suite-info>
- <sources>
- <source ID="VXQueryCatalog" FileName="VXQueryCatalog.xml" Creator="VXQuery team">
- <description last-mod="2014-04-02">VXQuery Test Suite Catalog</description>
- </source>
- <source ID="ghcnd" FileName="TestSources/ghcnd" Creator="Preston Carman">
- <description last-mod="2014-04-02">Collection of files</description>
- </source>
- <source ID="ghcnd_half_1" FileName="TestSources/ghcnd/half_1" Creator="Preston Carman">
- <description last-mod="2014-04-02">Collection of files</description>
- </source>
- <source ID="ghcnd_half_2" FileName="TestSources/ghcnd/half_2" Creator="Preston Carman">
- <description last-mod="2014-04-02">Collection of files</description>
- </source>
- <source ID="ghcnd_quarter_1" FileName="TestSources/ghcnd/half_1/quarter_1" Creator="Preston Carman">
- <description last-mod="2014-04-02">Collection of files</description>
- </source>
- <source ID="ghcnd_quarter_2" FileName="TestSources/ghcnd/half_1/quarter_2" Creator="Preston Carman">
- <description last-mod="2014-04-02">Collection of files</description>
- </source>
- <source ID="ghcnd_quarter_3" FileName="TestSources/ghcnd/half_2/quarter_3" Creator="Preston Carman">
- <description last-mod="2014-04-02">Collection of files</description>
- </source>
- <source ID="ghcnd_quarter_4" FileName="TestSources/ghcnd/half_2/quarter_4" Creator="Preston Carman">
- <description last-mod="2014-04-02">Collection of files</description>
- </source>
- <source ID="jsonCollection" FileName="TestSources/jsonCollection" Creator="Christina Pavlopoulou">
- <description last-mod="2016-07-12">Collection of files</description>
- </source>
- <source ID="json_half_1" FileName="TestSources/jsonCollection/half_1" Creator="Christina Pavlopoulou">
- <description last-mod="2016-07-12">Collection of files</description>
- </source>
- <source ID="json_half_2" FileName="TestSources/jsonCollection/half_2" Creator="Christina Pavlopoulou">
- <description last-mod="2016-07-12">Collection of files</description>
- </source>
- <source ID="json_quarter_1" FileName="TestSources/jsonCollection/half_1/quarter_1" Creator="Christina Pavlopoulou">
- <description last-mod="2016-07-12">Collection of files</description>
- </source>
- <source ID="json_quarter_2" FileName="TestSources/jsonCollection/half_1/quarter_2" Creator="Christina Pavlopoulou">
- <description last-mod="2016-07-12">Collection of files</description>
- </source>
- <source ID="json_quarter_3" FileName="TestSources/jsonCollection/half_2/quarter_3" Creator="Christina Pavlopoulou">
- <description last-mod="2016-07-12">Collection of files</description>
- </source>
- <source ID="json_quarter_4" FileName="TestSources/jsonCollection/half_2/quarter_4" Creator="Christina Pavlopoulou">
- <description last-mod="2016-07-12">Collection of files</description>
- </source>
- <source ID="station_xml_file" FileName="TestSources/ghcnd/half_1/quarter_1/stations/US000000001.xml"
- Creator="Shivani Mall">
- <description last-mod="2015-06-26">File</description>
- </source>
- <source ID="array_json_file" FileName="TestSources/json/array/array.json"
- Creator="Christina Pavlopoulou">
- <description last-mod="2016-07-02">File</description>
- </source>
- <source ID="int_json_file" FileName="TestSources/json/atomic_int.json"
- Creator="Christina Pavlopoulou">
- <description last-mod="2016-07-02">File</description>
- </source>
- <source ID="double_json_file" FileName="TestSources/json/atomic_double.json"
- Creator="Christina Pavlopoulou">
- <description last-mod="2016-07-02">File</description>
- </source>
- <source ID="string_json_file" FileName="TestSources/json/atomic_string.json"
- Creator="Christina Pavlopoulou">
- <description last-mod="2016-07-02">File</description>
- </source>
- <source ID="nested_arrays_json_file" FileName="TestSources/json/array/nested_array.json"
- Creator="Christina Pavlopoulou">
- <description last-mod="2016-07-02">File</description>
- </source>
- <source ID="object_json_file" FileName="TestSources/json/object/object.json"
- Creator="Christina Pavlopoulou">
- <description last-mod="2016-07-02">File</description>
- </source>
- <source ID="nested_object_json_file" FileName="TestSources/json/object/nested_object.json"
- Creator="Christina Pavlopoulou">
- <description last-mod="2016-07-02">File</description>
- </source>
- <source ID="nested_object_array_json_file" FileName="TestSources/json/object/nested_object_array.json"
- Creator="Christina Pavlopoulou">
- <description last-mod="2016-07-02">File</description>
- </source>
- <source ID="nested_array_object_json_file" FileName="TestSources/json/array/nested_array_object.json"
- Creator="Christina Pavlopoulou">
- <description last-mod="2016-07-05">File</description>
- </source>
- </sources>
- <test-group name="SingleQuery" featureOwner="Preston Carman">
- <GroupInfo>
- <title>Single Query</title>
- <description/>
- </GroupInfo>
- <test-group name="SingleTestAdd" featureOwner="Preston Carman">
- <GroupInfo>
- <title>Single Test Add</title>
+<test-suite xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" CatalogDesignDate="2014-04-01" version="0.0.1" SourceOffsetPath="./" ResultOffsetPath="ExpectedTestResults/" XQueryQueryOffsetPath="Queries/XQuery/" XQueryXQueryOffsetPath="Queries/XQueryX/" XQueryFileExtension=".xq" XQueryXFileExtension=".xqx" xsi:schemaLocation="http://www.w3.org/2005/02/query-test-XQTSCatalog XQTSCatalog.xsd">
+ <test-suite-info>
+ <title>VXQuery Test Suite</title>
+ <description>
+ Test Suite for VXQuery.
+ </description>
+ </test-suite-info>
+ <sources>
+ <source ID="VXQueryCatalog" FileName="VXQueryCatalog.xml" Creator="VXQuery team">
+ <description last-mod="2014-04-02">VXQuery Test Suite Catalog</description>
+ </source>
+ <source ID="ghcnd" FileName="TestSources/ghcnd" Creator="Preston Carman">
+ <description last-mod="2014-04-02">Collection of files</description>
+ </source>
+ <source ID="ghcnd_half_1" FileName="TestSources/ghcnd/half_1" Creator="Preston Carman">
+ <description last-mod="2014-04-02">Collection of files</description>
+ </source>
+ <source ID="ghcnd_half_2" FileName="TestSources/ghcnd/half_2" Creator="Preston Carman">
+ <description last-mod="2014-04-02">Collection of files</description>
+ </source>
+ <source ID="ghcnd_quarter_1" FileName="TestSources/ghcnd/half_1/quarter_1" Creator="Preston Carman">
+ <description last-mod="2014-04-02">Collection of files</description>
+ </source>
+ <source ID="ghcnd_quarter_2" FileName="TestSources/ghcnd/half_1/quarter_2" Creator="Preston Carman">
+ <description last-mod="2014-04-02">Collection of files</description>
+ </source>
+ <source ID="ghcnd_quarter_3" FileName="TestSources/ghcnd/half_2/quarter_3" Creator="Preston Carman">
+ <description last-mod="2014-04-02">Collection of files</description>
+ </source>
+ <source ID="ghcnd_quarter_4" FileName="TestSources/ghcnd/half_2/quarter_4" Creator="Preston Carman">
+ <description last-mod="2014-04-02">Collection of files</description>
+ </source>
+ <source ID="jsonCollection" FileName="TestSources/jsonCollection" Creator="Christina Pavlopoulou">
+ <description last-mod="2016-07-12">Collection of files</description>
+ </source>
+ <source ID="json_half_1" FileName="TestSources/jsonCollection/half_1" Creator="Christina Pavlopoulou">
+ <description last-mod="2016-07-12">Collection of files</description>
+ </source>
+ <source ID="json_half_2" FileName="TestSources/jsonCollection/half_2" Creator="Christina Pavlopoulou">
+ <description last-mod="2016-07-12">Collection of files</description>
+ </source>
+ <source ID="json_quarter_1" FileName="TestSources/jsonCollection/half_1/quarter_1" Creator="Christina Pavlopoulou">
+ <description last-mod="2016-07-12">Collection of files</description>
+ </source>
+ <source ID="json_quarter_2" FileName="TestSources/jsonCollection/half_1/quarter_2" Creator="Christina Pavlopoulou">
+ <description last-mod="2016-07-12">Collection of files</description>
+ </source>
+ <source ID="json_quarter_3" FileName="TestSources/jsonCollection/half_2/quarter_3" Creator="Christina Pavlopoulou">
+ <description last-mod="2016-07-12">Collection of files</description>
+ </source>
+ <source ID="json_quarter_4" FileName="TestSources/jsonCollection/half_2/quarter_4" Creator="Christina Pavlopoulou">
+ <description last-mod="2016-07-12">Collection of files</description>
+ </source>
+ <source ID="station_xml_file" FileName="TestSources/ghcnd/half_1/quarter_1/stations/US000000001.xml" Creator="Shivani Mall">
+ <description last-mod="2015-06-26">File</description>
+ </source>
+ <source ID="array_json_file" FileName="TestSources/json/array/array.json" Creator="Christina Pavlopoulou">
+ <description last-mod="2016-07-02">File</description>
+ </source>
+ <source ID="int_json_file" FileName="TestSources/json/atomic_int.json" Creator="Christina Pavlopoulou">
+ <description last-mod="2016-07-02">File</description>
+ </source>
+ <source ID="double_json_file" FileName="TestSources/json/atomic_double.json" Creator="Christina Pavlopoulou">
+ <description last-mod="2016-07-02">File</description>
+ </source>
+ <source ID="string_json_file" FileName="TestSources/json/atomic_string.json" Creator="Christina Pavlopoulou">
+ <description last-mod="2016-07-02">File</description>
+ </source>
+ <source ID="nested_arrays_json_file" FileName="TestSources/json/array/nested_array.json" Creator="Christina Pavlopoulou">
+ <description last-mod="2016-07-02">File</description>
+ </source>
+ <source ID="object_json_file" FileName="TestSources/json/object/object.json" Creator="Christina Pavlopoulou">
+ <description last-mod="2016-07-02">File</description>
+ </source>
+ <source ID="nested_object_json_file" FileName="TestSources/json/object/nested_object.json" Creator="Christina Pavlopoulou">
+ <description last-mod="2016-07-02">File</description>
+ </source>
+ <source ID="nested_object_array_json_file" FileName="TestSources/json/object/nested_object_array.json" Creator="Christina Pavlopoulou">
+ <description last-mod="2016-07-02">File</description>
+ </source>
+ <source ID="nested_array_object_json_file" FileName="TestSources/json/array/nested_array_object.json" Creator="Christina Pavlopoulou">
+ <description last-mod="2016-07-05">File</description>
+ </source>
+ </sources>
+ <test-group name="SingleQuery" featureOwner="Preston Carman">
+ <GroupInfo>
+ <title>Single Query</title>
<description/>
- </GroupInfo>
+ </GroupInfo>
+ <test-group name="SingleTestAdd" featureOwner="Preston Carman">
+ <GroupInfo>
+ <title>Single Test Add</title>
+ <description/>
+ </GroupInfo>
&SingleQuery;
- </test-group>
- <test-group name="SingleTestList" featureOwner="Preston Carman">
- <GroupInfo>
- <title>Single Test List</title>
- <description/>
- </GroupInfo>
+ </test-group>
+ <test-group name="SingleTestList" featureOwner="Preston Carman">
+ <GroupInfo>
+ <title>Single Test List</title>
+ <description/>
+ </GroupInfo>
&SingleAlternateQuery;
- </test-group>
- </test-group>
- <test-group name="AggregatePartitionQueries" featureOwner="Preston Carman">
- <GroupInfo>
- <title>Aggregate Partition Queries</title>
- <description/>
- </GroupInfo>
- <test-group name="AggregateParallelExecutionTests" featureOwner="Preston Carman">
- <GroupInfo>
- <title>Aggregate Parallel Execution Tests</title>
+ </test-group>
+ </test-group>
+ <test-group name="AggregatePartitionQueries" featureOwner="Preston Carman">
+ <GroupInfo>
+ <title>Aggregate Partition Queries</title>
<description/>
- </GroupInfo>
+ </GroupInfo>
+ <test-group name="AggregateParallelExecutionTests" featureOwner="Preston Carman">
+ <GroupInfo>
+ <title>Aggregate Parallel Execution Tests</title>
+ <description/>
+ </GroupInfo>
&AggregatePartition1Queries;
&AggregatePartition2Queries;
&AggregatePartition4Queries;
- </test-group>
- </test-group>
- <test-group name="FunctionsAndOperatorsOnNumericsQueries" featureOwner="Preston Carman">
- <GroupInfo>
- <title>Functions And Operators On Numerics Queries</title>
- <description/>
- </GroupInfo>
- <test-group name="FunctionsAndOperatorsOnNumericsExecutionTests" featureOwner="Preston Carman">
- <GroupInfo>
- <title>Functions And Operators On Numerics Execution Tests</title>
+ </test-group>
+ </test-group>
+ <test-group name="FunctionsAndOperatorsOnNumericsQueries" featureOwner="Preston Carman">
+ <GroupInfo>
+ <title>Functions And Operators On Numerics Queries</title>
<description/>
- </GroupInfo>
+ </GroupInfo>
+ <test-group name="FunctionsAndOperatorsOnNumericsExecutionTests" featureOwner="Preston Carman">
+ <GroupInfo>
+ <title>Functions And Operators On Numerics Execution Tests</title>
+ <description/>
+ </GroupInfo>
&FunctionsAndOperatorsOnNumericsQueries;
- </test-group>
- </test-group>
- <test-group name="FunctionsAndOperatorsThatGenerateSequencesQueries" featureOwner="Shivani Mall">
- <GroupInfo>
- <title>Functions And Operators That Generate Sequences Queries</title>
- <description/>
- </GroupInfo>
- <test-group name="FunctionsAndOperatorsThatGenerateSequencesTests" featureOwner="Shivani Mall">
- <GroupInfo>
- <title>Functions And Operators That Generate Sequences Execution Tests</title>
+ </test-group>
+ </test-group>
+ <test-group name="FunctionsAndOperatorsThatGenerateSequencesQueries" featureOwner="Shivani Mall">
+ <GroupInfo>
+ <title>Functions And Operators That Generate Sequences Queries</title>
<description/>
- </GroupInfo>
+ </GroupInfo>
+ <test-group name="FunctionsAndOperatorsThatGenerateSequencesTests" featureOwner="Shivani Mall">
+ <GroupInfo>
+ <title>Functions And Operators That Generate Sequences Execution Tests</title>
+ <description/>
+ </GroupInfo>
&FunctionsAndOperatorsThatGenerateSequences;
- </test-group>
- </test-group>
- <test-group name="GhcndPartitionQueries" featureOwner="Preston Carman">
- <GroupInfo>
- <title>GHCND Partition Queries</title>
- <description/>
- </GroupInfo>
- <test-group name="ParallelExecutionTests" featureOwner="Preston Carman">
- <GroupInfo>
- <title>Parallel Execution Tests</title>
+ </test-group>
+ </test-group>
+ <test-group name="GhcndPartitionQueries" featureOwner="Preston Carman">
+ <GroupInfo>
+ <title>GHCND Partition Queries</title>
<description/>
- </GroupInfo>
+ </GroupInfo>
+ <test-group name="ParallelExecutionTests" featureOwner="Preston Carman">
+ <GroupInfo>
+ <title>Parallel Execution Tests</title>
+ <description/>
+ </GroupInfo>
&GhcndPartition1Queries;
&GhcndPartition2Queries;
&GhcndPartition4Queries;
- </test-group>
- </test-group>
- <test-group name="GhcndCountPartitionQueries" featureOwner="Preston Carman">
- <GroupInfo>
- <title>GHCND Count Partition Queries</title>
- <description/>
- </GroupInfo>
- <test-group name="CountParallelExecutionTests" featureOwner="Preston Carman">
- <GroupInfo>
- <title>Parallel Execution Tests</title>
+ </test-group>
+ </test-group>
+ <test-group name="GhcndCountPartitionQueries" featureOwner="Preston Carman">
+ <GroupInfo>
+ <title>GHCND Count Partition Queries</title>
<description/>
- </GroupInfo>
+ </GroupInfo>
+ <test-group name="CountParallelExecutionTests" featureOwner="Preston Carman">
+ <GroupInfo>
+ <title>Parallel Execution Tests</title>
+ <description/>
+ </GroupInfo>
&GhcndCountPartition1Queries;
&GhcndCountPartition2Queries;
&GhcndCountPartition4Queries;
- </test-group>
- </test-group>
- <test-group name="GhcndRecordsPartitionQueries" featureOwner="Preston Carman">
- <GroupInfo>
- <title>GHCND Records Partition Queries</title>
- <description/>
- </GroupInfo>
- <test-group name="RecordsParallelExecutionTests" featureOwner="Preston Carman">
- <GroupInfo>
- <title>Records Parallel Execution Tests</title>
+ </test-group>
+ </test-group>
+ <test-group name="GhcndRecordsPartitionQueries" featureOwner="Preston Carman">
+ <GroupInfo>
+ <title>GHCND Records Partition Queries</title>
<description/>
- </GroupInfo>
+ </GroupInfo>
+ <test-group name="RecordsParallelExecutionTests" featureOwner="Preston Carman">
+ <GroupInfo>
+ <title>Records Parallel Execution Tests</title>
+ <description/>
+ </GroupInfo>
&GhcndRecordsPartition1Queries;
&GhcndRecordsPartition2Queries;
&GhcndRecordsPartition4Queries;
- </test-group>
- </test-group>
- <test-group name="HDFSAggregateQueries" featureOwner="Efi Kaltirimidou">
- <GroupInfo>
- <title>Aggregate Partition Queries in HDFS</title>
- <description/>
- </GroupInfo>
- <test-group name="CollectionReadFromHDFSAggregateTests" featureOwner="Efi Kaltirimidou">
- <GroupInfo>
- <title>Aggregate HDFS Execution Tests</title>
+ </test-group>
+ </test-group>
+ <test-group name="HDFSAggregateQueries" featureOwner="Efi Kaltirimidou">
+ <GroupInfo>
+ <title>Aggregate Partition Queries in HDFS</title>
<description/>
- </GroupInfo>
+ </GroupInfo>
+ <test-group name="CollectionReadFromHDFSAggregateTests" featureOwner="Efi Kaltirimidou">
+ <GroupInfo>
+ <title>Aggregate HDFS Execution Tests</title>
+ <description/>
+ </GroupInfo>
&HDFSAggregateQueries;
- </test-group>
- </test-group>
- <test-group name="IndexingQueries" featureOwner="Steven Jacobs">
- <GroupInfo>
- <title>Indexing Queries</title>
- <description/>
- </GroupInfo>
- <test-group name="IndexingTests" featureOwner="Steven Jacobs">
- <GroupInfo>
- <title>Indexing Execution Tests</title>
+ </test-group>
+ </test-group>
+ <test-group name="IndexingQueries" featureOwner="Steven Jacobs">
+ <GroupInfo>
+ <title>Indexing Queries</title>
<description/>
- </GroupInfo>
+ </GroupInfo>
+ <test-group name="IndexingTests" featureOwner="Steven Jacobs">
+ <GroupInfo>
+ <title>Indexing Execution Tests</title>
+ <description/>
+ </GroupInfo>
&IndexingQueries;
- </test-group>
- </test-group>
- <test-group name="JsoniqQueries" featureOwner="Christina Pavlopoulou">
- <GroupInfo>
- <title>Jsoniq Queries</title>
- <description/>
- </GroupInfo>
- <test-group name="JsoniqTesting" featureOwner="Christina Pavlopoulou">
- <GroupInfo>
- <title>Json Constructor Tests</title>
+ </test-group>
+ </test-group>
+ <test-group name="JsoniqQueries" featureOwner="Christina Pavlopoulou">
+ <GroupInfo>
+ <title>Jsoniq Queries</title>
<description/>
- </GroupInfo>
+ </GroupInfo>
+ <test-group name="JsoniqTesting" featureOwner="Christina Pavlopoulou">
+ <GroupInfo>
+ <title>Json Constructor Tests</title>
+ <description/>
+ </GroupInfo>
&JsonArrayQueries;
&JsonObjectQueries;
- </test-group>
- </test-group>
- <test-group name="FunctionsInJSONiq" featureOwner="Riyafa Abdul Hameed">
- <GroupInfo>
- <title>Functions in JSONiq</title>
- <description>The functions extended and newly created for JSONiq</description>
- </GroupInfo>
- <test-group name="FunctionsInJSONiqTesting" featureOwner="Riyafa Abdul Hameed">
- <GroupInfo>
- <title>Tests for functions in JSONiq</title>
- </GroupInfo>
+ </test-group>
+ </test-group>
+ <test-group name="FunctionsInJSONiq" featureOwner="Riyafa Abdul Hameed">
+ <GroupInfo>
+ <title>Functions in JSONiq</title>
+ <description>The functions extended and newly created for JSONiq</description>
+ </GroupInfo>
+ <test-group name="FunctionsInJSONiqTesting" featureOwner="Riyafa Abdul Hameed">
+ <GroupInfo>
+ <title>Tests for functions in JSONiq</title>
+ </GroupInfo>
&FunctionsInJSONiq;
- </test-group>
- </test-group>
- <test-group name="JsonNavigation" featureOwner="Riyafa Abdul Hameed">
- <GroupInfo>
- <title>Json navigation queries</title>
- <description>Json navigation tests</description>
- </GroupInfo>
- <test-group name="JsonNavigationTesting" featureOwner="Riyafa Abdul Hameed">
- <GroupInfo>
- <title>Json navigation tests</title>
- </GroupInfo>
+ </test-group>
+ </test-group>
+ <test-group name="JsonNavigation" featureOwner="Riyafa Abdul Hameed">
+ <GroupInfo>
+ <title>Json navigation queries</title>
+ <description>Json navigation tests</description>
+ </GroupInfo>
+ <test-group name="JsonNavigationTesting" featureOwner="Riyafa Abdul Hameed">
+ <GroupInfo>
+ <title>Json navigation tests</title>
+ </GroupInfo>
&JsonObjectNavigationQueries;
&JsonArrayNavigationQueries;
&JsonParserQueries;
- </test-group>
- </test-group>
- <test-group name="TraceQuery" featureOwner="Christina Pavlopoulou">
- <GroupInfo>
- <title>Trace Function Queries</title>
- <description/>
- </GroupInfo>
- <test-group name="TraceTesting" featureOwner="Christina Pavlopoulou">
- <GroupInfo>
- <title>Trace Function Tests</title>
+ </test-group>
+ </test-group>
+ <test-group name="TraceQuery" featureOwner="Christina Pavlopoulou">
+ <GroupInfo>
+ <title>Trace Function Queries</title>
<description/>
- </GroupInfo>
+ </GroupInfo>
+ <test-group name="TraceTesting" featureOwner="Christina Pavlopoulou">
+ <GroupInfo>
+ <title>Trace Function Tests</title>
+ <description/>
+ </GroupInfo>
&TraceQuery;
- </test-group>
- </test-group>
-</test-suite>
\ No newline at end of file
+ </test-group>
+ </test-group>
+ <test-group name="LibrariesInJSONiq" featureOwner="Christina Pavlopoulou">
+ <GroupInfo>
+ <title>Libraries in JSONiq</title>
+ <description>Libraries created for JSONiq</description>
+ </GroupInfo>
+ <test-group name="LibrariesInJSONiqTesting" featureOwner="Christina Pavlopoulou">
+ <GroupInfo>
+ <title>Tests for libraries in JSONiq</title>
+ </GroupInfo>
+ &LibrariesInJSONiq;
+ </test-group>
+ </test-group>
+</test-suite>
diff --git a/vxquery-xtest/src/test/resources/cat/FunctionsInJSONiq.xml b/vxquery-xtest/src/test/resources/cat/FunctionsInJSONiq.xml
index 3a145ed..0713ce2 100644
--- a/vxquery-xtest/src/test/resources/cat/FunctionsInJSONiq.xml
+++ b/vxquery-xtest/src/test/resources/cat/FunctionsInJSONiq.xml
@@ -96,4 +96,44 @@
<query name="general_comparison" date="2016-07-19"/>
<output-file compare="Text">general_comparison.txt</output-file>
</test-case>
+ <test-case name="changes-to-arithmetic-operation-semantics" FilePath="Json/Functions/" Creator="Riyafa Abdul Hameed">
+ <description>Changes to arithmetic operation semantics</description>
+ <query name="arithmetic1" date="2016-07-19"/>
+ <expected-error>XPTY0004</expected-error>
+ </test-case>
+ <test-case name="changes-to-arithmetic-operation-semantics" FilePath="Json/Functions/" Creator="Riyafa Abdul Hameed">
+ <description>Changes to arithmetic operation semantics</description>
+ <query name="arithmetic2" date="2016-07-26"/>
+ <expected-error>XPTY0004</expected-error>
+ </test-case>
+ <test-case name="changes-to-arithmetic-operation-semantics" FilePath="Json/Functions/" Creator="Riyafa Abdul Hameed">
+ <description>Changes to arithmetic operation semantics</description>
+ <query name="arithmetic3" date="2016-07-26"/>
+ <expected-error>XPTY0004</expected-error>
+ </test-case>
+ <test-case name="changes-to-arithmetic-operation-semantics" FilePath="Json/Functions/" Creator="Riyafa Abdul Hameed">
+ <description>Changes to arithmetic operation semantics</description>
+ <query name="arithmetic4" date="2016-07-26"/>
+ <expected-error>XPTY0004</expected-error>
+ </test-case>
+ <test-case name="changes-to-arithmetic-operation-semantics" FilePath="Json/Functions/" Creator="Riyafa Abdul Hameed">
+ <description>Changes to arithmetic operation semantics</description>
+ <query name="arithmetic5" date="2016-07-19"/>
+ <expected-error>XPTY0004</expected-error>
+ </test-case>
+ <test-case name="changes-to-arithmetic-operation-semantics" FilePath="Json/Functions/" Creator="Riyafa Abdul Hameed">
+ <description>Changes to arithmetic operation semantics</description>
+ <query name="arithmetic6" date="2016-07-26"/>
+ <expected-error>XPTY0004</expected-error>
+ </test-case>
+ <test-case name="changes-to-arithmetic-operation-semantics" FilePath="Json/Functions/" Creator="Riyafa Abdul Hameed">
+ <description>Changes to arithmetic operation semantics</description>
+ <query name="arithmetic7" date="2016-07-26"/>
+ <expected-error>XPTY0004</expected-error>
+ </test-case>
+ <test-case name="changes-to-arithmetic-operation-semantics" FilePath="Json/Functions/" Creator="Riyafa Abdul Hameed">
+ <description>Changes to arithmetic operation semantics</description>
+ <query name="arithmetic8" date="2016-07-26"/>
+ <expected-error>XPTY0004</expected-error>
+ </test-case>
</test-group>
\ No newline at end of file
diff --git a/vxquery-xtest/src/test/resources/cat/JsonObjectQueries.xml b/vxquery-xtest/src/test/resources/cat/JsonObjectQueries.xml
index 1968853..fcb01e7 100644
--- a/vxquery-xtest/src/test/resources/cat/JsonObjectQueries.xml
+++ b/vxquery-xtest/src/test/resources/cat/JsonObjectQueries.xml
@@ -100,4 +100,9 @@
<query name="q16_object" date="2016-07-16"/>
<output-file compare="Text">q16_object.txt</output-file>
</test-case>
+ <test-case name="json-object-q17" FilePath="Json/Object/" Creator="Riyafa Abdul Hameed">
+ <description>Object.</description>
+ <query name="q17_object" date="2016-07-26"/>
+ <expected-error>JNDY0003</expected-error>
+ </test-case>
</test-group>
\ No newline at end of file
diff --git a/vxquery-xtest/src/test/resources/cat/LibrariesInJSONiq.xml b/vxquery-xtest/src/test/resources/cat/LibrariesInJSONiq.xml
new file mode 100644
index 0000000..4c18447
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/cat/LibrariesInJSONiq.xml
@@ -0,0 +1,38 @@
+<!--
+ 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.
+-->
+
+<test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="JsonArrayQueries" featureOwner="VXQuery">
+ <GroupInfo>
+ <title>Json Libraries</title>
+ <description/>
+ </GroupInfo>
+ <test-case name="descendant-arrays" FilePath="Json/Libraries/" Creator="Christina Pavlopoulou">
+ <description>Json Libraries.</description>
+ <query name="descendant_arrays" date="2016-07-18"/>
+ <output-file compare="Text">descendant_arrays.txt</output-file>
+ </test-case>
+ <test-case name="descendant-arrays2" FilePath="Json/Libraries/" Creator="Christina Pavlopoulou">
+ <description>Json Libraries.</description>
+ <query name="descendant_arrays2" date="2016-07-19"/>
+ <output-file compare="Text">descendant_arrays2.txt</output-file>
+ </test-case>
+ <test-case name="flatten" FilePath="Json/Libraries/" Creator="Christina Pavlopoulou">
+ <description>Json Libraries.</description>
+ <query name="flatten" date="2016-07-20"/>
+ <output-file compare="Text">flatten.txt</output-file>
+ </test-case>
+</test-group>
