From: <et...@us...> - 2011-06-29 11:52:22
|
Revision: 4417 http://mxquery.svn.sourceforge.net/mxquery/?rev=4417&view=rev Author: etterth Date: 2011-06-29 11:52:09 +0000 (Wed, 29 Jun 2011) Log Message: ----------- - Updated tests to also include errors Modified Paths: -------------- trunk/MXQuery/xqib_src/ch/ethz/mxqjs/test/JsXQueryTestCase.java trunk/XQIB_Testing/.classpath trunk/XQIB_Testing/XQTStoJsUnit.xsl trunk/XQIB_Testing/build.xml trunk/XQIB_Testing/src/ch/ethz/mxquery/testsuite/XQueryTestBase.java trunk/XQIB_Testing/src/ch/ethz/mxquery/testsuite/XQueryTestCase.java trunk/XQIB_Testing/test/ch/ethz/mxquery/Appendices/Annex_Eclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/Appendices/Appendix_A4class.java trunk/XQIB_Testing/test/ch/ethz/mxquery/Catalogclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Basics/StaticContextclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Basics/Types/SequenceTypeSyntaxclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/CondExprclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Construct/ComputeCon/ComputeConAttrclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Construct/ComputeCon/ComputeConCommentclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Construct/ComputeCon/ComputeConElemclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Construct/ComputeCon/ComputeConPIclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Construct/ComputeCon/ConDocNodeclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Construct/ComputeCon/ConTextclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Construct/ConInScopeNamespaceclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Construct/DirectConElem/DirectConElemAttrclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Construct/DirectConElem/DirectConElemContentclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Construct/DirectConElem/DirectConElemNamespaceclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Construct/DirectConElem/DirectConElemWhitespaceclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Construct/DirectConElemclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Construct/DirectConOtherclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/ExtensionExpressionclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/FLWOR/ForExpr/ForExprPositionalVarclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/FLWOR/ForExpr/ForExprWithclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/FLWOR/ForExpr/ForExprWithoutclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/FLWOR/LetExpr/LetExprWithclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/FLWOR/LetExpr/LetExprWithoutclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/FLWOR/OrderbyExpr/OrderbyExprWithclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/FLWOR/OrderbyExpr/OrderbyExprWithoutclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/FLWOR/ReturnExprclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/FLWOR/WhereExprclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/LogicExprclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/DurationArith/DayTimeDurationAddclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/DurationArith/DayTimeDurationDivideDTDclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/DurationArith/DayTimeDurationDivideclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/DurationArith/DayTimeDurationMultiplyclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/DurationArith/DayTimeDurationSubtractclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/DurationArith/YearMonthDurationAddclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/DurationArith/YearMonthDurationDivideYMDclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/DurationArith/YearMonthDurationDivideclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/DurationArith/YearMonthDurationMultiplyclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/DurationArith/YearMonthDurationSubtractclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/DurationDateTimeArith/DateAddDTDclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/DurationDateTimeArith/DateAddYMDclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/DurationDateTimeArith/DateSubtractDTDclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/DurationDateTimeArith/DateSubtractYMDclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/DurationDateTimeArith/DateTimeAddDTDclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/DurationDateTimeArith/DateTimeSubtractDTDclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/DurationDateTimeArith/DateTimeSubtractYMDclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/DurationDateTimeArith/DatesSubtractclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/DurationDateTimeArith/TimeAddDTDclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/DurationDateTimeArith/TimeSubtractDTDclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/DurationDateTimeArith/TimeSubtractclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/DurationDateTimeArith/YearMonthDurationAddDTclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/DurationDateTimeArith/dateTimesSubtractclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/NumericOpr/NumericAddclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/NumericOpr/NumericDivideclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/NumericOpr/NumericIntegerDivideclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/NumericOpr/NumericModclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/NumericOpr/NumericMultiplyclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/NumericOpr/NumericSubtractclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/NumericOpr/NumericUnaryMinusclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/NumericOpr/NumericUnaryPlusclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/GenComprsn/GenCompEqclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/GenComprsn/GenCompGTEQclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/GenComprsn/GenCompGTclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/GenComprsn/GenCompLTEQclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/GenComprsn/GenCompLTclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/GenComprsn/GenCompNEclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/NodeComp/NodeAfterclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/NodeComp/NodeBeforeclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/NodeComp/NodeSameclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/AnyURIComp/AnyURIEqualclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/BinaryOp/Base64BinaryEQclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/BinaryOp/HexBinaryEQclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/BooleanOp/BooleanEqualclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/BooleanOp/BooleanGTclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/BooleanOp/BooleanLTclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/DurationDateTimeOp/DateEQclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/DurationDateTimeOp/DateGTclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/DurationDateTimeOp/DateLTclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/DurationDateTimeOp/DateTimeEQclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/DurationDateTimeOp/DateTimeGTclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/DurationDateTimeOp/DateTimeLTclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/DurationDateTimeOp/DayTimeDurationEQclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/DurationDateTimeOp/DayTimeDurationGTclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/DurationDateTimeOp/DayTimeDurationLTclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/DurationDateTimeOp/DurationEQclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/DurationDateTimeOp/TimeEQclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/DurationDateTimeOp/TimeGTclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/DurationDateTimeOp/TimeLTclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/DurationDateTimeOp/YearMonthDurationEQclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/DurationDateTimeOp/YearMonthDurationGTclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/DurationDateTimeOp/YearMonthDurationLTclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/DurationDateTimeOp/gDayEQclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/DurationDateTimeOp/gMonthDayEQclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/DurationDateTimeOp/gMonthEQclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/DurationDateTimeOp/gYearEQclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/DurationDateTimeOp/gYearMonthEQclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/NumericComp/NumericEqualclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/NumericComp/NumericGTclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/NumericComp/NumericLTclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/QNameOp/PrefixFromQNameclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/QNameOp/QNameEQclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/StringComp/StringEqualclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/StringComp/StringGTclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/StringComp/StringLTclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/ValCompTypeCheckingclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/SeqOp/SeqExceptclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/SeqOp/SeqIntersectclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/SeqOp/SeqUnionclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/OrderExprclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/PathExpr/AbbrAxesclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/PathExpr/PathExpressionsclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/PathExpr/Predicatesclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/PathExpr/Steps/Axesclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/PathExpr/Steps/NodeTestSection/NameTestclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/PathExpr/Steps/NodeTestSection/NodeTestclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/PathExpr/UnabbrAxesclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/PrimaryExpr/ContextExpr/ExternalContextExprclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/PrimaryExpr/ContextExpr/InternalContextExprclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/PrimaryExpr/FunctionCallExprclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/PrimaryExpr/Literalsclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/PrimaryExpr/ParenExprclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/PrologExpr/BaseURIPrologclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/PrologExpr/BoundarySpacePrologclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/PrologExpr/CollationPrologclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/PrologExpr/ConstructionPrologclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/PrologExpr/CopyNamespacesPrologclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/PrologExpr/DefaultNamespacePrologclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/PrologExpr/DefaultOrderingPrologclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/PrologExpr/EmptyOrderPrologclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/PrologExpr/FunctionPrologclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/PrologExpr/NamespacePrologclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/PrologExpr/OptionDeclarationPrologclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/PrologExpr/VariableProlog/ExternalVariablesWithclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/PrologExpr/VariableProlog/ExternalVariablesWithoutclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/PrologExpr/VariableProlog/InternalVariablesWithclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/PrologExpr/VariableProlog/InternalVariablesWithoutclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/PrologExpr/VersionPrologclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/QuantExpr/QuantExprWithclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/QuantExpr/QuantExprWithoutclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/SeqExpr/CombNodeSeqclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/SeqExpr/ConstructSeq/RangeExprclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/SeqExpr/ConstructSeq/commaOpclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/SeqExpr/FilterExprclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/XQueryCommentclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/seqExprTypes/SeqExprCastToDerivedParentsclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/seqExprTypes/SeqExprCastToDerivedclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/seqExprTypes/SeqExprCastWithinBranchclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/seqExprTypes/SeqExprCastableclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/seqExprTypes/SeqExprCastclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/seqExprTypes/SeqExprInstanceOfclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/seqExprTypes/SeqExprTreatclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/seqExprTypes/sequenceExprTypeswitchclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AccessorFunc/BaseURIFuncclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AccessorFunc/DataFuncclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AccessorFunc/DocumentURIFuncclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AccessorFunc/NilledFuncclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AccessorFunc/NodeNameFuncclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AccessorFunc/StaticBaseURIFuncclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AccessorFunc/StringFuncclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/AssDisassStringFunc/CodepointToStringFuncclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/AssDisassStringFunc/StringToCodepointFuncclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/CompStringFunc/CodepointEqualclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/CompStringFunc/compareFuncclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/GeneralStringFunc/ConcatFuncclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/GeneralStringFunc/EncodeURIfuncclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/GeneralStringFunc/EscapeHTMLURIFuncclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/GeneralStringFunc/IRIToURIfuncclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/GeneralStringFunc/LowerCaseFuncclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/GeneralStringFunc/NormalizeSpaceFuncclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/GeneralStringFunc/NormalizeUnicodeFuncclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/GeneralStringFunc/StringJoinFuncclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/GeneralStringFunc/StringLengthFuncclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/GeneralStringFunc/SubstringFuncclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/GeneralStringFunc/Surrogatesclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/GeneralStringFunc/TranslateFuncclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/GeneralStringFunc/UpperCaseFuncclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/MatchStringFunc/MatchesFuncclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/MatchStringFunc/ReplaceFuncclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/MatchStringFunc/TokenizeFuncclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/SubstringStringFunc/ContainsFuncclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/SubstringStringFunc/EndsWithFuncclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/SubstringStringFunc/StartsWithFuncclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/SubstringStringFunc/SubstringAfterFuncclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/SubstringStringFunc/SubstringBeforeFuncclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/BooleanFunc/FalseFuncclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/BooleanFunc/NotFuncclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/BooleanFunc/TrueFuncclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/ConstructFunc/DateTimeFuncclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/ContextFunc/ContextCurrentDateFuncclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/ContextFunc/ContextCurrentDatetimeFuncclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/ContextFunc/ContextCurrentTimeFuncclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/ContextFunc/ContextDefaultCollationFuncclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/ContextFunc/ContextImplicitTimezoneFuncclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/ContextFunc/ContextLastFuncclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/ContextFunc/ContextPositionFuncclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/ComponentExtractionDDT/DayFromDateFuncclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/ComponentExtractionDDT/DayFromDateTimeFuncclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/ComponentExtractionDDT/DaysFromDurationFuncclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/ComponentExtractionDDT/HoursFromDateTimeFuncclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/ComponentExtractionDDT/HoursFromDurationFuncclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/ComponentExtractionDDT/HoursFromTimeFuncclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/ComponentExtractionDDT/MinutesFromDateTimeFuncclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/ComponentExtractionDDT/MinutesFromDurationFuncclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/ComponentExtractionDDT/MinutesFromTimeFuncclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/ComponentExtractionDDT/MonthFromDateFuncclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/ComponentExtractionDDT/MonthFromDateTimeFuncclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/ComponentExtractionDDT/MonthsFromDurationFuncclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/ComponentExtractionDDT/SecondsFromDateTimeFuncclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/ComponentExtractionDDT/SecondsFromDurationFuncclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/ComponentExtractionDDT/SecondsFromTimeFuncclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/ComponentExtractionDDT/TimezoneFromDateFuncclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/ComponentExtractionDDT/TimezoneFromDateTimeFuncclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/ComponentExtractionDDT/TimezoneFromTimeFuncclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/ComponentExtractionDDT/YearFromDateFuncclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/ComponentExtractionDDT/YearFromDateTimeFuncclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/ComponentExtractionDDT/YearsFromDurationFuncclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/TimezoneFunction/AdjDateTimeToTimezoneFuncclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/TimezoneFunction/AdjDateToTimezoneFuncclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/TimezoneFunction/AdjTimeToTimezoneFuncclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/ErrorFuncclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/NodeFunc/NameFuncclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/NodeFunc/NodeLangFuncclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/NodeFunc/NodeLocalNameFuncclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/NodeFunc/NodeNamespaceURIFuncclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/NodeFunc/NodeNumberFuncclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/NodeFunc/NodeRootFuncclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/NumericFunc/ABSFuncclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/NumericFunc/CeilingFuncclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/NumericFunc/FloorFuncclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/NumericFunc/RoundEvenFuncclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/NumericFunc/RoundFuncclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/QNameFunc/InScopePrefixesFuncclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/QNameFunc/LocalNameFromQNameFuncclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/QNameFunc/NamespaceURIForPrefixFuncclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/QNameFunc/NamespaceURIFromQNameFuncclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/QNameFunc/QNameConstructFunc/ExpandedQNameConstructFuncclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/QNameFunc/QNameConstructFunc/ResolveQNameConstructFuncclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/AggregateSeqFunc/SeqAVGFuncclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/AggregateSeqFunc/SeqCountFuncclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/AggregateSeqFunc/SeqMAXFuncclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/AggregateSeqFunc/SeqMINFuncclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/AggregateSeqFunc/SeqSUMFuncclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/CardinalitySeqFunc/SeqExactlyOneFuncclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/CardinalitySeqFunc/SeqOneOrMoreFuncclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/CardinalitySeqFunc/SeqZeroOrOneFuncclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/GeneralSeqFunc/SeqBooleanFuncclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/GeneralSeqFunc/SeqDistinctValuesFuncclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/GeneralSeqFunc/SeqEmptyFuncclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/GeneralSeqFunc/SeqExistsFuncclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/GeneralSeqFunc/SeqIndexOfFuncclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/GeneralSeqFunc/SeqInsertBeforeFuncclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/GeneralSeqFunc/SeqRemoveFuncclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/GeneralSeqFunc/SeqReverseFuncclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/GeneralSeqFunc/SeqSubsequenceFuncclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/GeneralSeqFunc/SeqUnorderedFuncclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/NodeSeqFunc/SeqCollectionFuncclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/NodeSeqFunc/SeqDocAvailableFuncclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/NodeSeqFunc/SeqDocFuncclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/NodeSeqFunc/SeqIDFuncclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/NodeSeqFunc/SeqIDREFFuncclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/SeqDeepEqualFuncclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/TraceFuncclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/URIFunc/ResolveURIFuncclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/OptionalFeatureErrors/CombinedErrorCodesclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/UseCase/UseCaseNSclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/UseCase/UseCasePARTSclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/UseCase/UseCaseRclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/UseCase/UseCaseSEQclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/UseCase/UseCaseSGMLclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/UseCase/UseCaseSTRINGclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/UseCase/UseCaseTREEclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/UseCase/UseCaseXMPclass.java Added Paths: ----------- trunk/XQIB_Testing/test/ trunk/XQIB_Testing/test/ch/ethz/mxquery/Optional/ trunk/XQIB_Testing/test/ch/ethz/mxquery/Optional/FullAxis/ trunk/XQIB_Testing/test/ch/ethz/mxquery/Optional/FullAxis/ancestorAxisclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/Optional/FullAxis/ancestor_or_selfAxisclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/Optional/FullAxis/followingAxisclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/Optional/FullAxis/following_siblingAxisclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/Optional/FullAxis/precedingAxisclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/Optional/FullAxis/preceding_siblingAxisclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/Optional/Modules/ trunk/XQIB_Testing/test/ch/ethz/mxquery/Optional/Modules/ModuleImportclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/Optional/SchemaImport/ trunk/XQIB_Testing/test/ch/ethz/mxquery/Optional/SchemaImport/ConstructSIclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/Optional/SchemaImport/FLWORExprSIclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/Optional/SchemaImport/ForExprTypeSIclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/Optional/SchemaImport/MiscFunctionsclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/Optional/SchemaImport/NotationEQSIclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/Optional/SchemaImport/NumericEqualSIclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/Optional/SchemaImport/SchemaImportPrologclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/Optional/SchemaImport/SeqExprCastSIclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/Optional/SchemaImport/UserDefinedSIclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/Optional/SchemaImport/versionPrologSIclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/Optional/SchemaValidation/ trunk/XQIB_Testing/test/ch/ethz/mxquery/Optional/SchemaValidation/ValidateExpressionclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/Optional/StaticTyping/ trunk/XQIB_Testing/test/ch/ethz/mxquery/Optional/StaticTyping/STFLWORExprclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/Optional/StaticTyping/STPathExpr/ trunk/XQIB_Testing/test/ch/ethz/mxquery/Optional/StaticTyping/STPathExpr/STSteps/ trunk/XQIB_Testing/test/ch/ethz/mxquery/Optional/StaticTyping/STPathExpr/STSteps/STAxesclass.java trunk/XQIB_Testing/test/ch/ethz/mxquery/Optional/TrivialEmbeddingclass.java Removed Paths: ------------- trunk/XQIB_Testing/junit/ trunk/XQIB_Testing/junit-out/ trunk/XQIB_Testing/lib/apache-tomcat-6.0.32/logs/ Modified: trunk/MXQuery/xqib_src/ch/ethz/mxqjs/test/JsXQueryTestCase.java =================================================================== --- trunk/MXQuery/xqib_src/ch/ethz/mxqjs/test/JsXQueryTestCase.java 2011-06-29 02:36:40 UTC (rev 4416) +++ trunk/MXQuery/xqib_src/ch/ethz/mxqjs/test/JsXQueryTestCase.java 2011-06-29 11:52:09 UTC (rev 4417) @@ -49,6 +49,7 @@ // variables.add(new Variable(name, xdmIterator, hasSchema)); // } private String query; + private String errorcode; public static JsXQueryTestCase create(String query) { return new JsXQueryTestCase(query); @@ -63,6 +64,7 @@ o.addVariable = o.@ch.ethz.mxqjs.test.JsXQueryTestCase::addVariable(Ljava/lang/String;Ljava/lang/String;); o.execute = o.@ch.ethz.mxqjs.test.JsXQueryTestCase::execute(); o.getResult = o.@ch.ethz.mxqjs.test.JsXQueryTestCase::getResult(); + o.getErrorCode = o.@ch.ethz.mxqjs.test.JsXQueryTestCase::getErrorCode(); o.compareResult = o.@ch.ethz.mxqjs.test.JsXQueryTestCase::compareResult(Ljava/lang/String;Ljava/lang/String;); }-*/; @@ -93,11 +95,7 @@ co.setSchemaAwareness(true); stat = comp.compile(ctx, query,co,null,null); - } - catch (Exception ex){ - throw ex; - } - try { + for (VariableWithUri var:variables){ //variables pass the fileid in the xml field @@ -151,6 +149,7 @@ result = resultBuffer.toString(); } catch (MXQueryException ex){ + errorcode = ex.getErrorCode().getLocalPart(); // throw ex.getErrorCode().getLocalPart(); } @@ -162,7 +161,11 @@ return result; } - + + public String getErrorCode() { + + return errorcode; + } public void addSchemaMapping(String namespace, String uri) { schemas.add(new NamespaceToUri(namespace, uri)); } Modified: trunk/XQIB_Testing/.classpath =================================================================== --- trunk/XQIB_Testing/.classpath 2011-06-29 02:36:40 UTC (rev 4416) +++ trunk/XQIB_Testing/.classpath 2011-06-29 11:52:09 UTC (rev 4417) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" path="src"/> - <classpathentry kind="src" path="junit"/> + <classpathentry kind="src" path="test"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/> <classpathentry kind="lib" path="lib/selenium-java-2.0rc3.jar"/> Modified: trunk/XQIB_Testing/XQTStoJsUnit.xsl =================================================================== --- trunk/XQIB_Testing/XQTStoJsUnit.xsl 2011-06-29 02:36:40 UTC (rev 4416) +++ trunk/XQIB_Testing/XQTStoJsUnit.xsl 2011-06-29 11:52:09 UTC (rev 4417) @@ -9,10 +9,10 @@ <xd:p/> </xd:desc> </xd:doc> - <xsl:variable name="outputpath">junit/ch/ethz/mxquery</xsl:variable> + <xsl:variable name="outputpath">test/ch/ethz/mxquery</xsl:variable> <xsl:variable name="packageprefix">ch.ethz.mxquery.</xsl:variable> <xsl:variable name="testsuitepath" - >file:xml/MXQuery_Testing/tests</xsl:variable> + >../MXQuery_Testing/tests</xsl:variable> <xsl:variable name="executionpath" >http://127.0.0.1:8090/test/tests</xsl:variable> <xsl:variable name="relativetestdir">tests/</xsl:variable> @@ -25,10 +25,6 @@ </xsl:template> <xsl:template name="test-group"> <xsl:param name="currentpath"/> - <xsl:choose> - - <xsl:when test="not(contains(../test-group[1]/@name, 'Schema'))"> - <xsl:variable name="name"> <xsl:call-template name="getJavaString"> <xsl:with-param name="string" select="@name"/> @@ -52,21 +48,48 @@ select="concat($currentpath, '/' , $name)"/> </xsl:call-template> </xsl:for-each> - </xsl:when> - </xsl:choose> </xsl:template> + <xsl:template name="escapeandputintoquotations"> + <xsl:param name="str"></xsl:param> + <xsl:variable name="escapebackslashes" + select="replace($str, '\\', '\\\\')"/> + <xsl:variable name="replacequots" + select="replace($escapebackslashes, '"', '\\"')"/> + <xsl:variable name="replaceRs" select="replace($replacequots, '
','')"/> +<!-- <xsl:variable name="replaceNewlines" select="replace($replaceRs, '
','\\n" + 
"')"/>--> + <xsl:variable name="replaceNewlines" select="replace($replaceRs,'
','\\n')"/>"<xsl:value-of select="$replaceNewlines" disable-output-escaping="yes"/>"</xsl:template> + + <xsl:template name="getFileContentsAsString"> <xsl:param name="filepath"/> <xsl:variable name="cleanfilepath" select="replace($filepath, '/+', '/')"/> - <xsl:variable name="escapebackslashes" - select="replace(unparsed-text($cleanfilepath), '\\', '\\\\')"/> - <xsl:variable name="replacequots" - select="replace($escapebackslashes, '"','\\"')"/> - <xsl:variable name="replaceRs" select="replace($replacequots, '
','')"/> - <xsl:variable name="replaceNewliness" select="replace($replaceRs, '
','\\n" + 
"')"/> - <xsl:value-of select="$replaceNewliness" disable-output-escaping="yes"/> + + <xsl:variable name="justtext" select="unparsed-text($cleanfilepath)"/> + <xsl:variable name="escapedString"> + <xsl:call-template name="escapeandputintoquotations"> + <xsl:with-param name="str" select="$justtext"></xsl:with-param> + </xsl:call-template> + </xsl:variable> + <xsl:choose> + <xsl:when test="string-length($escapedString)> 60000"> + new StringBuilder() + <xsl:analyze-string select="$justtext" regex="(.{{1,60000}})" flags="s"> + <xsl:matching-substring + >.append(<xsl:call-template name="escapeandputintoquotations"> + <xsl:with-param name="str" select="regex-group(1)"/> + </xsl:call-template>) + </xsl:matching-substring> + + </xsl:analyze-string> + .toString() + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="$escapedString"></xsl:value-of> + </xsl:otherwise> + </xsl:choose> + </xsl:template> <xsl:template name="getQuery"> @@ -94,15 +117,16 @@ </xsl:call-template> </xsl:template> + <xsl:template name="getOutput"> {<xsl:variable name="filepath" select="./@FilePath"/> - <xsl:for-each select="./output-file">"<xsl:call-template name="getFileContentsAsString"> - <xsl:with-param name="filepath"> - <xsl:value-of - select="concat($testsuitepath, '/ExpectedTestResults/', - $filepath, '/', ./text())" - /> - </xsl:with-param> - </xsl:call-template>"<xsl:if test="position() != last()">, </xsl:if> + <xsl:for-each select="./output-file"><xsl:call-template name="getFileContentsAsString"> + <xsl:with-param name="filepath"> + <xsl:value-of + select="concat($testsuitepath, '/ExpectedTestResults/', + $filepath, '/', ./text())" + /> + </xsl:with-param> + </xsl:call-template><xsl:if test="position() != last()">, </xsl:if> </xsl:for-each>} </xsl:template> <xsl:template name="getVariable"> @@ -134,16 +158,14 @@ import ch.ethz.mxquery.testsuite.XQueryTestCase; public class <xsl:value-of select="$name"/> extends XQueryTestBase{ <xsl:for-each select="./test-case[@name != 'prolog-version-2']"> - <xsl:choose> - <xsl:when test="@scenario = 'standard'"> <xsl:variable name="casename"><xsl:call-template name="getJavaString" ><xsl:with-param name="string" select="@name" /></xsl:call-template></xsl:variable> @Test public void test_<xsl:value-of select="$casename"/>() throws Exception{ - String query = "<xsl:call-template - name="getQuery"/>"; <!-- module --> + String query = <xsl:call-template + name="getQuery"/>; <!-- module --> XQueryTestCase testcase = new XQueryTestCase(driver,query); <xsl:for-each select="module"> testcase.addModuleLocation("<xsl:value-of select="./@namespace" @@ -176,7 +198,7 @@ <xsl:for-each select="input-URI"> testcase.addInputURI("<xsl:value-of select="./@variable"/>", "'<xsl:call-template name="resolveURI"/>'"); </xsl:for-each> <xsl:for-each select="input-query">testcase.addInputQuery("<xsl:value-of - select="./@variable"/>", "<xsl:call-template name="getInputQuery"/>"); + select="./@variable"/>", <xsl:call-template name="getInputQuery"/>); </xsl:for-each> testcase.execute(); <xsl:variable name="CompareType"><xsl:choose> @@ -185,10 +207,37 @@ <xsl:otherwise>null</xsl:otherwise> </xsl:choose> </xsl:variable> - testcase.assertXMLEqual(<xsl:value-of select="$CompareType"/>, new String[]<xsl:call-template name="getOutput"/>); - }; + <xsl:choose> + <xsl:when test="@scenario = 'standard'"> + String[] expectedoutput = new String[]<xsl:call-template name="getOutput"/>; + String errorcode = testcase.getErrorCode(); + if (errorcode != null){<xsl:for-each select="./expected-error"> + if (errorcode.equals("<xsl:value-of select="./text()"> + </xsl:value-of>")) + return; + </xsl:for-each> + throw new AssertionError(errorcode + " was thrown\nwhile " + expectedoutput[0] + "was expected"); + } + testcase.assertXMLEqual(<xsl:value-of select="$CompareType"/>, expectedoutput); </xsl:when> + <xsl:when test="@scenario=('runtime-error', 'parse-error')"> + String errorcode = testcase.getErrorCode(); + String[] errorcodes = { + <xsl:for-each select="./expected-error"> + "<xsl:value-of select="text()"/>" + <xsl:if test="./following-sibling::expected-error">,</xsl:if> + </xsl:for-each> + }; + if (errorcode == null) + throw new AssertionError("nothing was thrown\nwhile the error" + errorcodes[0] + "was expected"); + for (String testcode:errorcodes){ + if (errorcode.equals(testcode)) + return; + } + throw new AssertionError(errorcode + " was thrown\nwhile the error" + errorcodes [0] + "was expected"); + </xsl:when> </xsl:choose> + }; </xsl:for-each> } </xsl:template> Modified: trunk/XQIB_Testing/build.xml =================================================================== --- trunk/XQIB_Testing/build.xml 2011-06-29 02:36:40 UTC (rev 4416) +++ trunk/XQIB_Testing/build.xml 2011-06-29 11:52:09 UTC (rev 4417) @@ -20,6 +20,48 @@ </java> </target> + <property name="debuglevel" value="source,lines,vars"/> + <property name="target" value="1.6"/> + <property name="source" value="1.6"/> + <path id="XQIB_Testing.classpath"> + <pathelement location="bin"/> + <path refid="JUnit 4.libraryclasspath"/> + <pathelement location="lib/selenium-java-2.0rc3.jar"/> + <pathelement location="lib/selenium-server-2.0rc3.jar"/> + <pathelement location="lib/selenium-server-standalone-2.0rc3.jar"/> + </path> + <target name="init"> + <mkdir dir="bin"/> + <copy includeemptydirs="false" todir="bin"> + <fileset dir="src"> + <exclude name="**/*.launch"/> + <exclude name="**/*.java"/> + </fileset> + </copy> + <copy includeemptydirs="false" todir="bin"> + <fileset dir="test"> + <exclude name="**/*.launch"/> + <exclude name="**/*.java"/> + </fileset> + </copy> + </target> + <target name="clean"> + <delete dir="bin"/> + </target> + <target depends="clean" name="cleanall"/> + <target depends="build-subprojects,build-project" name="build"/> + <target name="build-subprojects"/> + <target depends="init" name="build-project"> + <echo message="${ant.project.name}: ${ant.file}"/> + <javac debug="true" debuglevel="${debuglevel}" destdir="bin" source="${source}" target="${target}"> + <src path="src"/> + <classpath refid="XQIB_Testing.classpath"/> + </javac> + <javac debug="true" debuglevel="${debuglevel}" destdir="bin" source="${source}" target="${target}"> + <src path="test"/> + <classpath refid="XQIB_Testing.classpath"/> + </javac> + </target> <target name="getlib"> <get dest="${test.home}/xqib-js-nightly.zip" src="http://fifthelement.inf.ethz.ch:8081/job/MXQuery-XQIB/lastSuccessfulBuild/artifact/MXQuery/xqib-js-nightly.zip" /> <unzip dest="${test.home}"> @@ -28,7 +70,7 @@ </unzip> </target> - <target name="test"> + <target name="test" depends="build"> <antcall target="getlib" /> <antcall target="tomcat-stop" /> <sleep seconds="2" /> @@ -46,294 +88,308 @@ <path id="JUnit 4.libraryclasspath"> <pathelement location="lib/junit.jar" /> <!--<pathelement location="${ECLIPSE_HOME}/plugins/org.hamcrest.core_1.1.0.v20090501071000.jar"/>--> - </path> - <path id="XQIB_Testing.classpath"> - <pathelement location="bin" /> - <path refid="JUnit 4.libraryclasspath" /> - <pathelement location="lib/selenium-java-2.0rc3.jar" /> - <pathelement location="lib/selenium-server-2.0rc3.jar" /> - <pathelement location="lib/selenium-server-standalone-2.0rc3.jar" /> </path> <property name="junit.output.dir" value="junit-out" /> <target name="testsuite"> - <mkdir dir="${junit.output.dir}" /> - <junit printsummary="withOutAndErr"> - <formatter type="xml" /> - <test name="ch.ethz.mxquery.Appendices.Annex_Eclass" todir="${junit.output.dir}" /> - <test name="ch.ethz.mxquery.Appendices.Appendix_A4class" todir="${junit.output.dir}" /> - <test name="ch.ethz.mxquery.Catalogclass" todir="${junit.output.dir}" /> - <test name="ch.ethz.mxquery.MinimalConformance.Basics.StaticContextclass" todir="${junit.output.dir}" /> - <test name="ch.ethz.mxquery.MinimalConformance.Basics.Types.SequenceTypeSyntaxclass" todir="${junit.output.dir}" /> - <test name="ch.ethz.mxquery.MinimalConformance.Expressions.CondExprclass" todir="${junit.output.dir}" /> - <test name="ch.ethz.mxquery.MinimalConformance.Expressions.Construct.ComputeCon.ComputeConAttrclass" todir="${junit.output.dir}" /> - <test name="ch.ethz.mxquery.MinimalConformance.Expressions.Construct.ComputeCon.ComputeConCommentclass" todir="${junit.output.dir}" /> - <test name="ch.ethz.mxquery.MinimalConformance.Expressions.Construct.ComputeCon.ComputeConElemclass" todir="${junit.output.dir}" /> - <test name="ch.ethz.mxquery.MinimalConformance.Expressions.Construct.ComputeCon.ComputeConPIclass" todir="${junit.output.dir}" /> - <test name="ch.ethz.mxquery.MinimalConformance.Expressions.Construct.ComputeCon.ConDocNodeclass" todir="${junit.output.dir}" /> - <test name="ch.ethz.mxquery.MinimalConformance.Expressions.Construct.ComputeCon.ConTextclass" todir="${junit.output.dir}" /> - <test name="ch.ethz.mxquery.MinimalConformance.Expressions.Construct.ConInScopeNamespaceclass" todir="${junit.output.dir}" /> - <test name="ch.ethz.mxquery.MinimalConformance.Expressions.Construct.DirectConElem.DirectConElemAttrclass" todir="${junit.output.dir}" /> - <test name="ch.ethz.mxquery.MinimalConformance.Expressions.Construct.DirectConElem.DirectConElemContentclass" todir="${junit.output.dir}" /> - <test name="ch.ethz.mxquery.MinimalConformance.Expressions.Construct.DirectConElem.DirectConElemNamespaceclass" todir="${junit.output.dir}" /> - <test name="ch.ethz.mxquery.MinimalConformance.Expressions.Construct.DirectConElem.DirectConElemWhitespaceclass" todir="${junit.output.dir}" /> - <test name="ch.ethz.mxquery.MinimalConformance.Expressions.Construct.DirectConElemclass" todir="${junit.output.dir}" /> - <test name="ch.ethz.mxquery.MinimalConformance.Expressions.Construct.DirectConOtherclass" todir="${junit.output.dir}" /> - <test name="ch.ethz.mxquery.MinimalConformance.Expressions.ExtensionExpressionclass" todir="${junit.output.dir}" /> - <test name="ch.ethz.mxquery.MinimalConformance.Expressions.FLWOR.ForExpr.ForExprPositionalVarclass" todir="${junit.output.dir}" /> - <test name="ch.ethz.mxquery.MinimalConformance.Expressions.FLWOR.ForExpr.ForExprWithclass" todir="${junit.output.dir}" /> - <test name="ch.ethz.mxquery.MinimalConformance.Expressions.FLWOR.ForExpr.ForExprWithoutclass" todir="${junit.output.dir}" /> - <test name="ch.ethz.mxquery.MinimalConformance.Expressions.FLWOR.LetExpr.LetExprWithclass" todir="${junit.output.dir}" /> - <test name="ch.ethz.mxquery.MinimalConformance.Expressions.FLWOR.LetExpr.LetExprWithoutclass" todir="${junit.output.dir}" /> - <test name="ch.ethz.mxquery.MinimalConformance.Expressions.FLWOR.OrderbyExpr.OrderbyExprWithclass" todir="${junit.output.dir}" /> - <test name="ch.ethz.mxquery.MinimalConformance.Expressions.FLWOR.OrderbyExpr.OrderbyExprWithoutclass" todir="${junit.output.dir}" /> - <test name="ch.ethz.mxquery.MinimalConformance.Expressions.FLWOR.ReturnExprclass" todir="${junit.output.dir}" /> - <test name="ch.ethz.mxquery.MinimalConformance.Expressions.FLWOR.WhereExprclass" todir="${junit.output.dir}" /> - <test name="ch.ethz.mxquery.MinimalConformance.Expressions.LogicExprclass" todir="${junit.output.dir}" /> - <test name="ch.ethz.mxquery.MinimalConformance.Expressions.Operators.ArithExpr.DurationArith.DayTimeDurationAddclass" todir="${junit.output.dir}" /> - <test name="ch.ethz.mxquery.MinimalConformance.Expressions.Operators.ArithExpr.DurationArith.DayTimeDurationDivideDTDclass" todir="${junit.output.dir}" /> - <test name="ch.ethz.mxquery.MinimalConformance.Expressions.Operators.ArithExpr.DurationArith.DayTimeDurationDivideclass" todir="${junit.output.dir}" /> - <test name="ch.ethz.mxquery.MinimalConformance.Expressions.Operators.ArithExpr.DurationArith.DayTimeDurationMultiplyclass" todir="${junit.output.dir}" /> - <test name="ch.ethz.mxquery.MinimalConformance.Expressions.Operators.ArithExpr.DurationArith.DayTimeDurationSubtractclass" todir="${junit.output.dir}" /> - <test name="ch.ethz.mxquery.MinimalConformance.Expressions.Operators.ArithExpr.DurationArith.YearMonthDurationAddclass" todir="${junit.output.dir}" /> - <test name="ch.ethz.mxquery.MinimalConformance.Expressions.Operators.ArithExpr.DurationArith.YearMonthDurationDivideYMDclass" todir="${junit.output.dir}" /> - <test name="ch.ethz.mxquery.MinimalConformance.Expressions.Operators.ArithExpr.DurationArith.YearMonthDurationDivideclass" todir="${junit.output.dir}" /> - <test name="ch.ethz.mxquery.MinimalConformance.Expressions.Operators.ArithExpr.DurationArith.YearMonthDurationMultiplyclass" todir="${junit.output.dir}" /> - <test name="ch.ethz.mxquery.MinimalConformance.Expressions.Operators.ArithExpr.DurationArith.YearMonthDurationSubtractclass" todir="${junit.output.dir}" /> - <test name="ch.ethz.mxquery.MinimalConformance.Expressions.Operators.ArithExpr.DurationDateTimeArith.DateAddDTDclass" todir="${junit.output.dir}" /> - <test name="ch.ethz.mxquery.MinimalConformance.Expressions.Operators.ArithExpr.DurationDateTimeArith.DateAddYMDclass" todir="${junit.output.dir}" /> - <test name="ch.ethz.mxquery.MinimalConformance.Expressions.Operators.ArithExpr.DurationDateTimeArith.DateSubtractDTDclass" todir="${junit.output.dir}" /> - <test name="ch.ethz.mxquery.MinimalConformance.Expressions.Operators.ArithExpr.DurationDateTimeArith.DateSubtractYMDclass" todir="${junit.output.dir}" /> - <test name="ch.ethz.mxquery.MinimalConformance.Expressions.Operators.ArithExpr.DurationDateTimeArith.DateTimeAddDTDclass" todir="${junit.output.dir}" /> - <test name="ch.ethz.mxquery.MinimalConformance.Expressions.Operators.ArithExpr.DurationDateTimeArith.DateTimeSubtractDTDclass" todir="${junit.output.dir}" /> - <test name="ch.ethz.mxquery.MinimalConformance.Expressions.Operators.ArithExpr.DurationDateTimeArith.DateTimeSubtractYMDclass" todir="${junit.output.dir}" /> - <test name="ch.ethz.mxquery.MinimalConformance.Expressions.Operators.ArithExpr.DurationDateTimeArith.DatesSubtractclass" todir="${junit.output.dir}" /> - <test name="ch.ethz.mxquery.MinimalConformance.Expressions.Operators.ArithExpr.DurationDateTimeArith.TimeAddDTDclass" todir="${junit.output.dir}" /> - <test name="ch.ethz.mxquery.MinimalConformance.Expressions.Operators.ArithExpr.DurationDateTimeArith.TimeSubtractDTDclass" todir="${junit.output.dir}" /> - <test name="ch.ethz.mxquery.MinimalConformance.Expressions.Operators.ArithExpr.DurationDateTimeArith.TimeSubtractclass" todir="${junit.output.dir}" /> - <test name="ch.ethz.mxquery.MinimalConformance.Expressions.Operators.ArithExpr.DurationDateTimeArith.YearMonthDurationAddDTclass" todir="${junit.output.dir}" /> - <test name="ch.ethz.mxquery.MinimalConformance.Expressions.Operators.ArithExpr.DurationDateTimeArith.dateTimesSubtractclass" todir="${junit.output.dir}" /> - <test name="ch.ethz.mxquery.MinimalConformance.Expressions.Operators.ArithExpr.NumericOpr.NumericAddclass" todir="${junit.output.dir}" /> - <test name="ch.ethz.mxquery.MinimalConformance.Expressions.Operators.ArithExpr.NumericOpr.NumericDivideclass" todir="${junit.output.dir}" /> - <test name="ch.ethz.mxquery.MinimalConformance.Expressions.Operators.ArithExpr.NumericOpr.NumericIntegerDivideclass" todir="${junit.output.dir}" /> - <test name="ch.ethz.mxquery.MinimalConformance.Expressions.Operators.ArithExpr.NumericOpr.NumericModclass" todir="${junit.output.dir}" /> - <test name="ch.ethz.mxquery.MinimalConformance.Expressions.Operators.ArithExpr.NumericOpr.NumericMultiplyclass" todir="${junit.output.dir}" /> - <test name="ch.ethz.mxquery.MinimalConformance.Expressions.Operators.ArithExpr.NumericOpr.NumericSubtractclass" todir="${junit.output.dir}" /> - <test name="ch.ethz.mxquery.MinimalConformance.Expressions.Operators.ArithExpr.NumericOpr.NumericUnaryMinusclass" todir="${junit.output.dir}" /> - <test name="ch.ethz.mxquery.MinimalConformance.Expressions.Operators.ArithExpr.NumericOpr.NumericUnaryPlusclass" todir="${junit.output.dir}" /> - <test name="ch.ethz.mxquery.MinimalConformance.Expressions.Operators.CompExpr.GenComprsn.GenCompEqclass" todir="${junit.output.dir}" /> - <test name="ch.ethz.mxquery.MinimalConformance.Expressions.Operators.CompExpr.GenComprsn.GenCompGTEQclass" todir="${junit.output.dir}" /> - <test name="ch.ethz.mxquery.MinimalConformance.Expressions.Ope... [truncated message content] |